Big UI and navigation Rewrite

new navigation add some color to the apps redesign menus new settings menu new quick settings code clean up size reduction by converting navigation images to font and more...
author: Joaquim <joaquim.org@gmail.com> 2021-04-04 03:08:51 +0100
committer: Joaquim <joaquim.org@gmail.com> 2021-04-04 03:08:51 +0100
commit: 1d3742e14f09316a1d795527713eb8f9742f0ffb (patch)
tree: 6bc6343538506b68256aa057121e063d22f8ed1a /src/displayapp/icons
parent: 58a2d000c4d49d96121894d6dd6bb861d7564bea (diff)
397 files changed, 7758 insertions, 9724 deletions
diff --git a/src/displayapp/icons/navigation/.c b/src/displayapp/icons/navigation/.c
deleted file mode 100644
index 3bfa1c66..00000000
--- a/src/displayapp/icons/navigation/.c
+++ /dev/null
@@ -1,93 +0,0 @@
-#if defined(LV_LVGL_H_INCLUDE_SIMPLE)
-#include "lvgl.h"
-#else
-#include "../lvgl/lvgl.h"
-#endif
-
-
-#ifndef LV_ATTRIBUTE_MEM_ALIGN
-#define LV_ATTRIBUTE_MEM_ALIGN
-#endif
-
-#ifndef LV_ATTRIBUTE_IMG_
-#define LV_ATTRIBUTE_IMG_
-#endif
-
-const LV_ATTRIBUTE_MEM_ALIGN LV_ATTRIBUTE_LARGE_CONST LV_ATTRIBUTE_IMG_ uint8_t _map[] = {
-  0x04, 0x02, 0x04, 0xff, 	/*Color of index 0*/
-  0xfc, 0xfe, 0xfc, 0xff, 	/*Color of index 1*/
-
-  0x00, 0x00, 0x00, 0x0f, 0xff, 0xff, 0xf8, 0x00, 
-  0x00, 0x00, 0x00, 0x3f, 0xff, 0xff, 0xfc, 0x00, 
-  0x00, 0x00, 0x00, 0x7f, 0xff, 0xff, 0xff, 0x00, 
-  0x00, 0x00, 0x01, 0xff, 0xff, 0xff, 0xff, 0x80, 
-  0x00, 0x00, 0x03, 0xff, 0xff, 0xff, 0xff, 0xc0, 
-  0x00, 0x00, 0x07, 0xff, 0xff, 0xff, 0xff, 0xe0, 
-  0x00, 0x00, 0x07, 0xff, 0xff, 0xff, 0xff, 0xf0, 
-  0x00, 0x00, 0x0f, 0xff, 0xff, 0xff, 0xff, 0xf8, 
-  0x00, 0x00, 0x1f, 0xff, 0xff, 0xff, 0xff, 0xf8, 
-  0x00, 0x00, 0x1f, 0xff, 0xff, 0xff, 0xff, 0xfc, 
-  0x00, 0x00, 0x3f, 0xff, 0xff, 0x7f, 0xff, 0xfe, 
-  0x00, 0x00, 0x3f, 0xff, 0xf0, 0x0f, 0xff, 0xfe, 
-  0x00, 0x00, 0x7f, 0xff, 0xe0, 0x03, 0xff, 0xfe, 
-  0x00, 0x00, 0x7f, 0xff, 0x80, 0x01, 0xff, 0xfe, 
-  0x00, 0x00, 0x7f, 0xff, 0x00, 0x00, 0xff, 0xfe, 
-  0x00, 0x00, 0xff, 0xfe, 0x00, 0x00, 0x7f, 0xfe, 
-  0x00, 0x00, 0xff, 0xfc, 0x00, 0x00, 0x3f, 0xfe, 
-  0x00, 0x00, 0xff, 0xfc, 0x00, 0x00, 0x1f, 0xfe, 
-  0x00, 0x00, 0xff, 0xf8, 0x00, 0x00, 0x1f, 0xfe, 
-  0x00, 0x00, 0xff, 0xf8, 0x00, 0x00, 0x0f, 0xfe, 
-  0x00, 0x00, 0xff, 0xf0, 0x00, 0x00, 0x0f, 0xfe, 
-  0x00, 0x00, 0xff, 0xf0, 0x00, 0x00, 0x0f, 0xfe, 
-  0x00, 0x00, 0xff, 0xf0, 0x00, 0x00, 0x0f, 0xfe, 
-  0x00, 0x00, 0xff, 0xf0, 0x00, 0x00, 0x07, 0xfe, 
-  0x00, 0x00, 0xff, 0xf0, 0x00, 0x00, 0x07, 0xfe, 
-  0x00, 0x00, 0xff, 0xf0, 0x00, 0x00, 0x07, 0xfe, 
-  0x00, 0x00, 0xff, 0xf0, 0x00, 0x00, 0x07, 0xfe, 
-  0x00, 0x00, 0xff, 0xf0, 0x00, 0x00, 0x07, 0xfe, 
-  0x00, 0x00, 0xff, 0xf0, 0x00, 0x00, 0x07, 0xfe, 
-  0x00, 0x00, 0xff, 0xf0, 0x00, 0x00, 0x07, 0xfe, 
-  0x00, 0x00, 0xff, 0xf0, 0x00, 0x00, 0x07, 0xfe, 
-  0x00, 0x00, 0xff, 0xf0, 0x00, 0x00, 0x07, 0xfe, 
-  0x00, 0x00, 0xff, 0xf0, 0x00, 0x00, 0x07, 0xfe, 
-  0x7c, 0x00, 0xff, 0xf0, 0x03, 0xf0, 0x07, 0xfe, 
-  0x7f, 0x00, 0xff, 0xf0, 0x1f, 0xf0, 0x07, 0xfe, 
-  0x7f, 0xc0, 0xff, 0xf0, 0x7f, 0xf0, 0x07, 0xfe, 
-  0x7f, 0xf8, 0xff, 0xf1, 0xff, 0xf0, 0x07, 0xfe, 
-  0x7f, 0xfe, 0xff, 0xf7, 0xff, 0xf0, 0x07, 0xfe, 
-  0x7f, 0xff, 0xff, 0xff, 0xff, 0xf0, 0x07, 0xfe, 
-  0x7f, 0xff, 0xff, 0xff, 0xff, 0xf0, 0x07, 0xfe, 
-  0x7f, 0xff, 0xff, 0xff, 0xff, 0xe0, 0x07, 0xfe, 
-  0x7f, 0xff, 0xff, 0xff, 0xff, 0xe0, 0x07, 0xfe, 
-  0x3f, 0xff, 0xff, 0xff, 0xff, 0xc0, 0x07, 0xfe, 
-  0x3f, 0xff, 0xff, 0xff, 0xff, 0x80, 0x07, 0xfe, 
-  0x1f, 0xff, 0xff, 0xff, 0xff, 0x00, 0x07, 0xfe, 
-  0x0f, 0xff, 0xff, 0xff, 0xff, 0x00, 0x07, 0xfe, 
-  0x07, 0xff, 0xff, 0xff, 0xfe, 0x00, 0x07, 0xfe, 
-  0x03, 0xff, 0xff, 0xff, 0xfc, 0x00, 0x07, 0xfe, 
-  0x03, 0xff, 0xff, 0xff, 0xf8, 0x00, 0x07, 0xfe, 
-  0x01, 0xff, 0xff, 0xff, 0xf0, 0x00, 0x07, 0xfe, 
-  0x00, 0xff, 0xff, 0xff, 0xf0, 0x00, 0x07, 0xfe, 
-  0x00, 0x7f, 0xff, 0xff, 0xe0, 0x00, 0x07, 0xfe, 
-  0x00, 0x7f, 0xff, 0xff, 0xc0, 0x00, 0x07, 0xfe, 
-  0x00, 0x3f, 0xff, 0xff, 0x80, 0x00, 0x07, 0xfe, 
-  0x00, 0x1f, 0xff, 0xff, 0x80, 0x00, 0x07, 0xfe, 
-  0x00, 0x0f, 0xff, 0xff, 0x00, 0x00, 0x07, 0xfe, 
-  0x00, 0x07, 0xff, 0xfe, 0x00, 0x00, 0x07, 0xfe, 
-  0x00, 0x07, 0xff, 0xfc, 0x00, 0x00, 0x07, 0xfe, 
-  0x00, 0x03, 0xff, 0xfc, 0x00, 0x00, 0x07, 0xfe, 
-  0x00, 0x01, 0xff, 0xf8, 0x00, 0x00, 0x07, 0xfe, 
-  0x00, 0x00, 0xff, 0xf0, 0x00, 0x00, 0x07, 0xfe, 
-  0x00, 0x00, 0xff, 0xe0, 0x00, 0x00, 0x07, 0xfe, 
-  0x00, 0x00, 0x7f, 0xc0, 0x00, 0x00, 0x07, 0xfe, 
-  0x00, 0x00, 0x3f, 0xc0, 0x00, 0x00, 0x07, 0xfe, 
-};
-
-const lv_img_dsc_t  = {
-  .header.always_zero = 0,
-  .header.w = 64,
-  .header.h = 64,
-  .data_size = 520,
-  .header.cf = LV_IMG_CF_INDEXED_1BIT,
-  .data = _map,
-};
diff --git a/src/displayapp/icons/navigation/arrive-left-white.svg b/src/displayapp/icons/navigation/arrive-left-white.svg
deleted file mode 100644
index 567bdbd3..00000000
--- a/src/displayapp/icons/navigation/arrive-left-white.svg
+++ /dev/null
@@ -1,4 +0,0 @@
-<svg id="WORKING_ICONS" data-name="WORKING ICONS" xmlns="http://www.w3.org/2000/svg" width="20" height="20" viewBox="0 0 20 20">
-  <title>direction</title>
-  <path fill="#ffffff" d="M3,12a2,2,0,1,1,2-2A2,2,0,0,1,3,12Zm10.00293-.96332a4.05782,4.05782,0,0,1,3.98877,4.07324H17v1.37775A0.51232,0.51232,0,0,0,17.51233,17h0.97534A0.51232,0.51232,0,0,0,19,16.48767V15H18.98615a6.05607,6.05607,0,0,0-5.9834-5.96332l-0.011-.00183,0.00012,0.02008H12V9.04584a0.35757,0.35757,0,0,1-.37738-0.54242l1.34375-2.95184a0.38659,0.38659,0,0,0-.62354-0.40942L6,10.04584l6.34283,4.90369a0.3866,0.3866,0,0,0,.62354-0.40942l-1.34375-2.95184A0.35757,0.35757,0,0,1,12,11.04584v0.00909h1"/>
-</svg>
diff --git a/src/displayapp/icons/navigation/arrive-left.c b/src/displayapp/icons/navigation/arrive-left.c
deleted file mode 100644
index ea45fded..00000000
--- a/src/displayapp/icons/navigation/arrive-left.c
+++ /dev/null
@@ -1,96 +0,0 @@
-#if defined(LV_LVGL_H_INCLUDE_SIMPLE)
-#include "lvgl.h"
-#else
-#include "lvgl/lvgl.h"
-#endif
-
-
-#ifndef LV_ATTRIBUTE_MEM_ALIGN
-#define LV_ATTRIBUTE_MEM_ALIGN
-#endif
-
-#ifndef LV_ATTRIBUTE_IMG_ARRIVE_LEFT
-#define LV_ATTRIBUTE_IMG_ARRIVE_LEFT
-#endif
-
-const LV_ATTRIBUTE_MEM_ALIGN LV_ATTRIBUTE_LARGE_CONST LV_ATTRIBUTE_IMG_ARRIVE_LEFT uint8_t arrive_left_map[] = {
-  0x04, 0x02, 0x04, 0xff, 	/*Color of index 0*/
-  0xfc, 0xfe, 0xfc, 0xff, 	/*Color of index 1*/
-
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x0f, 0xf8, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x3f, 0xf8, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x7f, 0xf8, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0xff, 0xf8, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x03, 0xff, 0xf0, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x07, 0xff, 0xf0, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x0f, 0xff, 0xe0, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x3f, 0xff, 0xe0, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x7f, 0xff, 0xc0, 0x00, 0x00,
-  0x3f, 0xf8, 0x00, 0xff, 0xff, 0xc0, 0x00, 0x00,
-  0xff, 0xfc, 0x03, 0xff, 0xff, 0xc0, 0x00, 0x00,
-  0xff, 0xfe, 0x07, 0xff, 0xff, 0x80, 0x00, 0x00,
-  0xff, 0xff, 0x0f, 0xff, 0xff, 0xff, 0x80, 0x00,
-  0xff, 0xff, 0x1f, 0xff, 0xff, 0xff, 0xf0, 0x00,
-  0xff, 0xff, 0x7f, 0xff, 0xff, 0xff, 0xfe, 0x00,
-  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00,
-  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xc0,
-  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xe0,
-  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xf0,
-  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xf8,
-  0xff, 0xff, 0x7f, 0xff, 0xff, 0xff, 0xff, 0xf8,
-  0xff, 0xff, 0x1f, 0xff, 0xff, 0xff, 0xff, 0xfc,
-  0xff, 0xfe, 0x0f, 0xff, 0xff, 0xff, 0xff, 0xfe,
-  0xff, 0xfe, 0x07, 0xff, 0xff, 0x8f, 0xff, 0xfe,
-  0xff, 0xfc, 0x03, 0xff, 0xff, 0xc1, 0xff, 0xff,
-  0x3f, 0xf8, 0x00, 0xff, 0xff, 0xc0, 0x7f, 0xff,
-  0x00, 0x00, 0x00, 0x7f, 0xff, 0xc0, 0x3f, 0xff,
-  0x00, 0x00, 0x00, 0x3f, 0xff, 0xe0, 0x1f, 0xff,
-  0x00, 0x00, 0x00, 0x0f, 0xff, 0xe0, 0x0f, 0xff,
-  0x00, 0x00, 0x00, 0x07, 0xff, 0xe0, 0x07, 0xff,
-  0x00, 0x00, 0x00, 0x03, 0xff, 0xf0, 0x07, 0xff,
-  0x00, 0x00, 0x00, 0x01, 0xff, 0xf8, 0x07, 0xff,
-  0x00, 0x00, 0x00, 0x00, 0x7f, 0xf8, 0x03, 0xff,
-  0x00, 0x00, 0x00, 0x00, 0x3f, 0xf8, 0x03, 0xff,
-  0x00, 0x00, 0x00, 0x00, 0x0f, 0xf8, 0x03, 0xff,
-  0x00, 0x00, 0x00, 0x00, 0x07, 0xf8, 0x01, 0xff,
-  0x00, 0x00, 0x00, 0x00, 0x03, 0xf0, 0x01, 0xff,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0xff,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0xff,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0xff,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0xff,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0xff,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-};
-
-const lv_img_dsc_t arrive_left = {
-      {
-        LV_IMG_CF_INDEXED_1BIT,
-        0,
-        0,
-        64,
-        64
-    },
-    520,
-arrive_left_map,
-};
diff --git a/src/displayapp/icons/navigation/arrive-left.png b/src/displayapp/icons/navigation/arrive-left.png
deleted file mode 100644
index 6eefd498..00000000
--- a/src/displayapp/icons/navigation/arrive-left.png
+++ /dev/null
diff --git a/src/displayapp/icons/navigation/arrive-right-white.svg b/src/displayapp/icons/navigation/arrive-right-white.svg
deleted file mode 100644
index 0be60d3e..00000000
--- a/src/displayapp/icons/navigation/arrive-right-white.svg
+++ /dev/null
@@ -1,4 +0,0 @@
-<svg id="WORKING_ICONS" data-name="WORKING ICONS" xmlns="http://www.w3.org/2000/svg" width="20" height="20" viewBox="0 0 20 20">
-  <title>direction</title>
-  <path fill="#ffffff" d="M15,10a2,2,0,1,1,2,2A2,2,0,0,1,15,10ZM7,11.05493H8V11.04584a0.35757,0.35757,0,0,1,.37738.54242L7.03363,14.5401a0.3866,0.3866,0,0,0,.62354.40942L14,10.04584,7.65717,5.14215a0.38659,0.38659,0,0,0-.62354.40942L8.37738,8.50342A0.35757,0.35757,0,0,1,8,9.04584V9.05493H7.00818L7.0083,9.03485l-0.011.00183A6.05607,6.05607,0,0,0,1.01385,15H1v1.48767A0.51232,0.51232,0,0,0,1.51233,17H2.48767A0.51232,0.51232,0,0,0,3,16.48767V15.10992H3.0083a4.05782,4.05782,0,0,1,3.98877-4.07324"/>
-</svg>
diff --git a/src/displayapp/icons/navigation/arrive-right.c b/src/displayapp/icons/navigation/arrive-right.c
deleted file mode 100644
index da752bcc..00000000
--- a/src/displayapp/icons/navigation/arrive-right.c
+++ /dev/null
@@ -1,96 +0,0 @@
-#if defined(LV_LVGL_H_INCLUDE_SIMPLE)
-#include "lvgl.h"
-#else
-#include "lvgl/lvgl.h"
-#endif
-
-
-#ifndef LV_ATTRIBUTE_MEM_ALIGN
-#define LV_ATTRIBUTE_MEM_ALIGN
-#endif
-
-#ifndef LV_ATTRIBUTE_IMG_ARRIVE_RIGHT
-#define LV_ATTRIBUTE_IMG_ARRIVE_RIGHT
-#endif
-
-const LV_ATTRIBUTE_MEM_ALIGN LV_ATTRIBUTE_LARGE_CONST LV_ATTRIBUTE_IMG_ARRIVE_RIGHT uint8_t arrive_right_map[] = {
-  0x04, 0x02, 0x04, 0xff, 	/*Color of index 0*/
-  0xfc, 0xfe, 0xfc, 0xff, 	/*Color of index 1*/
-
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x1f, 0xf0, 0x00, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x1f, 0xfc, 0x00, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x1f, 0xfe, 0x00, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x1f, 0xff, 0x00, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x0f, 0xff, 0xc0, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x0f, 0xff, 0xe0, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x07, 0xff, 0xf0, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x07, 0xff, 0xfc, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x03, 0xff, 0xfe, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x03, 0xff, 0xff, 0x00, 0x1f, 0xfc, 
-  0x00, 0x00, 0x03, 0xff, 0xff, 0xc0, 0x3f, 0xff, 
-  0x00, 0x00, 0x01, 0xff, 0xff, 0xe0, 0x7f, 0xff, 
-  0x00, 0x01, 0xff, 0xff, 0xff, 0xf0, 0xff, 0xff, 
-  0x00, 0x0f, 0xff, 0xff, 0xff, 0xf8, 0xff, 0xff, 
-  0x00, 0x7f, 0xff, 0xff, 0xff, 0xfe, 0xff, 0xff, 
-  0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
-  0x03, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
-  0x07, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
-  0x0f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
-  0x1f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
-  0x1f, 0xff, 0xff, 0xff, 0xff, 0xfe, 0xff, 0xff, 
-  0x3f, 0xff, 0xff, 0xff, 0xff, 0xf8, 0xff, 0xff, 
-  0x7f, 0xff, 0xff, 0xff, 0xff, 0xf0, 0x7f, 0xff, 
-  0x7f, 0xff, 0xf1, 0xff, 0xff, 0xe0, 0x7f, 0xff, 
-  0xff, 0xff, 0x83, 0xff, 0xff, 0xc0, 0x3f, 0xff, 
-  0xff, 0xfe, 0x03, 0xff, 0xff, 0x00, 0x1f, 0xfc, 
-  0xff, 0xfc, 0x03, 0xff, 0xfe, 0x00, 0x00, 0x00, 
-  0xff, 0xf8, 0x07, 0xff, 0xfc, 0x00, 0x00, 0x00, 
-  0xff, 0xf0, 0x07, 0xff, 0xf0, 0x00, 0x00, 0x00, 
-  0xff, 0xe0, 0x07, 0xff, 0xe0, 0x00, 0x00, 0x00, 
-  0xff, 0xe0, 0x0f, 0xff, 0xc0, 0x00, 0x00, 0x00, 
-  0xff, 0xc0, 0x1f, 0xff, 0x80, 0x00, 0x00, 0x00, 
-  0xff, 0xc0, 0x1f, 0xfe, 0x00, 0x00, 0x00, 0x00, 
-  0xff, 0xc0, 0x1f, 0xfc, 0x00, 0x00, 0x00, 0x00, 
-  0xff, 0xc0, 0x1f, 0xf0, 0x00, 0x00, 0x00, 0x00, 
-  0xff, 0x80, 0x1f, 0xe0, 0x00, 0x00, 0x00, 0x00, 
-  0xff, 0x80, 0x0f, 0xc0, 0x00, 0x00, 0x00, 0x00, 
-  0xff, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0xff, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0xff, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0xff, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0xff, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-};
-
-const lv_img_dsc_t arrive_right = {
-      {
-        LV_IMG_CF_INDEXED_1BIT,
-        0,
-        0,
-        64,
-        64
-    },
-    520,
-arrive_right_map,
-};
diff --git a/src/displayapp/icons/navigation/arrive-right.png b/src/displayapp/icons/navigation/arrive-right.png
deleted file mode 100644
index 5aae5637..00000000
--- a/src/displayapp/icons/navigation/arrive-right.png
+++ /dev/null
diff --git a/src/displayapp/icons/navigation/arrive-straight-white.svg b/src/displayapp/icons/navigation/arrive-straight-white.svg
deleted file mode 100644
index 0d20f9ce..00000000
--- a/src/displayapp/icons/navigation/arrive-straight-white.svg
+++ /dev/null
@@ -1,4 +0,0 @@
-<svg id="WORKING_ICONS" data-name="WORKING ICONS" xmlns="http://www.w3.org/2000/svg" width="20" height="20" viewBox="0 0 20 20">
-  <title>direction</title>
-  <path fill="#ffffff" d="M10,5a2,2,0,1,1,2-2A2,2,0,0,1,10,5Zm4.91284,8.35114L10.00916,7.0083,5.10547,13.35114a0.38659,0.38659,0,0,0,.40942.62354l2.95184-1.34375A0.35542,0.35542,0,0,1,9.00769,13H9v5.50006A0.49992,0.49992,0,0,0,9.49994,19h1.00012A0.49992,0.49992,0,0,0,11,18.50006V13.0083h0.00916a0.35757,0.35757,0,0,1,.54242-0.37738l2.95184,1.34375A0.3866,0.3866,0,0,0,14.91284,13.35114Z"/>
-</svg>
diff --git a/src/displayapp/icons/navigation/arrive-straight.c b/src/displayapp/icons/navigation/arrive-straight.c
deleted file mode 100644
index 4345f619..00000000
--- a/src/displayapp/icons/navigation/arrive-straight.c
+++ /dev/null
@@ -1,96 +0,0 @@
-#if defined(LV_LVGL_H_INCLUDE_SIMPLE)
-#include "lvgl.h"
-#else
-#include "lvgl/lvgl.h"
-#endif
-
-
-#ifndef LV_ATTRIBUTE_MEM_ALIGN
-#define LV_ATTRIBUTE_MEM_ALIGN
-#endif
-
-#ifndef LV_ATTRIBUTE_IMG_ARRIVE_STRAIGHT
-#define LV_ATTRIBUTE_IMG_ARRIVE_STRAIGHT
-#endif
-
-const LV_ATTRIBUTE_MEM_ALIGN LV_ATTRIBUTE_LARGE_CONST LV_ATTRIBUTE_IMG_ARRIVE_STRAIGHT uint8_t arrive_straight_map[] = {
-  0x04, 0x02, 0x04, 0xff, 	/*Color of index 0*/
-  0xfc, 0xfe, 0xfc, 0xff, 	/*Color of index 1*/
-
-  0x00, 0x00, 0x00, 0x7f, 0xfe, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0xff, 0xff, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x01, 0xff, 0xff, 0x80, 0x00, 0x00, 
-  0x00, 0x00, 0x01, 0xff, 0xff, 0x80, 0x00, 0x00, 
-  0x00, 0x00, 0x01, 0xff, 0xff, 0x80, 0x00, 0x00, 
-  0x00, 0x00, 0x01, 0xff, 0xff, 0x80, 0x00, 0x00, 
-  0x00, 0x00, 0x01, 0xff, 0xff, 0x80, 0x00, 0x00, 
-  0x00, 0x00, 0x01, 0xff, 0xff, 0x80, 0x00, 0x00, 
-  0x00, 0x00, 0x01, 0xff, 0xff, 0x80, 0x00, 0x00, 
-  0x00, 0x00, 0x01, 0xff, 0xff, 0x80, 0x00, 0x00, 
-  0x00, 0x00, 0x01, 0xff, 0xff, 0x80, 0x00, 0x00, 
-  0x00, 0x00, 0x01, 0xff, 0xff, 0x80, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0xff, 0xff, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0xff, 0xff, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x7f, 0xfe, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x1f, 0xf8, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x03, 0xc0, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x07, 0xe0, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x0f, 0xf0, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x0f, 0xf0, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x1f, 0xf8, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x3f, 0xfc, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x7f, 0xfe, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0xff, 0xff, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0xff, 0xff, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x01, 0xff, 0xff, 0x80, 0x00, 0x00, 
-  0x00, 0x00, 0x03, 0xff, 0xff, 0xc0, 0x00, 0x00, 
-  0x00, 0x00, 0x07, 0xff, 0xff, 0xe0, 0x00, 0x00, 
-  0x00, 0x00, 0x07, 0xff, 0xff, 0xe0, 0x00, 0x00, 
-  0x00, 0x00, 0x0f, 0xff, 0xff, 0xf0, 0x00, 0x00, 
-  0x00, 0x00, 0x1f, 0xff, 0xff, 0xf8, 0x00, 0x00, 
-  0x00, 0x00, 0x3f, 0xff, 0xff, 0xfc, 0x00, 0x00, 
-  0x00, 0x00, 0x3f, 0xff, 0xff, 0xfc, 0x00, 0x00, 
-  0x00, 0x00, 0x7f, 0xff, 0xff, 0xfe, 0x00, 0x00, 
-  0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 
-  0x00, 0x01, 0xff, 0xff, 0xff, 0xff, 0x80, 0x00, 
-  0x00, 0x03, 0xff, 0xff, 0xff, 0xff, 0xc0, 0x00, 
-  0x00, 0x03, 0xff, 0xff, 0xff, 0xff, 0xc0, 0x00, 
-  0x00, 0x03, 0xff, 0xff, 0xff, 0xff, 0xc0, 0x00, 
-  0x00, 0x03, 0xff, 0xff, 0xff, 0xff, 0xc0, 0x00, 
-  0x00, 0x03, 0xff, 0xff, 0xff, 0xff, 0xc0, 0x00, 
-  0x00, 0x03, 0xff, 0xff, 0xff, 0xff, 0xc0, 0x00, 
-  0x00, 0x03, 0xfe, 0x3f, 0xfc, 0x7f, 0xc0, 0x00, 
-  0x00, 0x03, 0xfc, 0x3f, 0xfc, 0x3f, 0xc0, 0x00, 
-  0x00, 0x03, 0xe0, 0x3f, 0xfc, 0x07, 0xc0, 0x00, 
-  0x00, 0x00, 0x00, 0x3f, 0xfc, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x3f, 0xfc, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x3f, 0xfc, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x3f, 0xfc, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x3f, 0xfc, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x3f, 0xfc, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x3f, 0xfc, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x3f, 0xfc, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x3f, 0xfc, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x3f, 0xfc, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x3f, 0xfc, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x3f, 0xfc, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x3f, 0xfc, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x3f, 0xfc, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x3f, 0xfc, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x3f, 0xfc, 0x00, 0x00, 0x00, 
-};
-
-const lv_img_dsc_t arrive_straight = {
-      {
-        LV_IMG_CF_INDEXED_1BIT,
-        0,
-        0,
-        64,
-        64
-    },
-    520,
-arrive_straight_map,
-};
diff --git a/src/displayapp/icons/navigation/arrive-straight.png b/src/displayapp/icons/navigation/arrive-straight.png
deleted file mode 100644
index c5e2e462..00000000
--- a/src/displayapp/icons/navigation/arrive-straight.png
+++ /dev/null
diff --git a/src/displayapp/icons/navigation/arrive-white.svg b/src/displayapp/icons/navigation/arrive-white.svg
deleted file mode 100644
index 0d20f9ce..00000000
--- a/src/displayapp/icons/navigation/arrive-white.svg
+++ /dev/null
@@ -1,4 +0,0 @@
-<svg id="WORKING_ICONS" data-name="WORKING ICONS" xmlns="http://www.w3.org/2000/svg" width="20" height="20" viewBox="0 0 20 20">
-  <title>direction</title>
-  <path fill="#ffffff" d="M10,5a2,2,0,1,1,2-2A2,2,0,0,1,10,5Zm4.91284,8.35114L10.00916,7.0083,5.10547,13.35114a0.38659,0.38659,0,0,0,.40942.62354l2.95184-1.34375A0.35542,0.35542,0,0,1,9.00769,13H9v5.50006A0.49992,0.49992,0,0,0,9.49994,19h1.00012A0.49992,0.49992,0,0,0,11,18.50006V13.0083h0.00916a0.35757,0.35757,0,0,1,.54242-0.37738l2.95184,1.34375A0.3866,0.3866,0,0,0,14.91284,13.35114Z"/>
-</svg>
diff --git a/src/displayapp/icons/navigation/arrive.c b/src/displayapp/icons/navigation/arrive.c
deleted file mode 100644
index c53b48f1..00000000
--- a/src/displayapp/icons/navigation/arrive.c
+++ /dev/null
@@ -1,96 +0,0 @@
-#if defined(LV_LVGL_H_INCLUDE_SIMPLE)
-#include "lvgl.h"
-#else
-#include "lvgl/lvgl.h"
-#endif
-
-
-#ifndef LV_ATTRIBUTE_MEM_ALIGN
-#define LV_ATTRIBUTE_MEM_ALIGN
-#endif
-
-#ifndef LV_ATTRIBUTE_IMG_ARRIVE
-#define LV_ATTRIBUTE_IMG_ARRIVE
-#endif
-
-const LV_ATTRIBUTE_MEM_ALIGN LV_ATTRIBUTE_LARGE_CONST LV_ATTRIBUTE_IMG_ARRIVE uint8_t arrive_map[] = {
-  0x04, 0x02, 0x04, 0xff, 	/*Color of index 0*/
-  0xfc, 0xfe, 0xfc, 0xff, 	/*Color of index 1*/
-
-  0x00, 0x00, 0x00, 0x7f, 0xfe, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0xff, 0xff, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x01, 0xff, 0xff, 0x80, 0x00, 0x00, 
-  0x00, 0x00, 0x01, 0xff, 0xff, 0x80, 0x00, 0x00, 
-  0x00, 0x00, 0x01, 0xff, 0xff, 0x80, 0x00, 0x00, 
-  0x00, 0x00, 0x01, 0xff, 0xff, 0x80, 0x00, 0x00, 
-  0x00, 0x00, 0x01, 0xff, 0xff, 0x80, 0x00, 0x00, 
-  0x00, 0x00, 0x01, 0xff, 0xff, 0x80, 0x00, 0x00, 
-  0x00, 0x00, 0x01, 0xff, 0xff, 0x80, 0x00, 0x00, 
-  0x00, 0x00, 0x01, 0xff, 0xff, 0x80, 0x00, 0x00, 
-  0x00, 0x00, 0x01, 0xff, 0xff, 0x80, 0x00, 0x00, 
-  0x00, 0x00, 0x01, 0xff, 0xff, 0x80, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0xff, 0xff, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0xff, 0xff, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x7f, 0xfe, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x1f, 0xf8, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x03, 0xc0, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x07, 0xe0, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x0f, 0xf0, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x0f, 0xf0, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x1f, 0xf8, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x3f, 0xfc, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x7f, 0xfe, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0xff, 0xff, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0xff, 0xff, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x01, 0xff, 0xff, 0x80, 0x00, 0x00, 
-  0x00, 0x00, 0x03, 0xff, 0xff, 0xc0, 0x00, 0x00, 
-  0x00, 0x00, 0x07, 0xff, 0xff, 0xe0, 0x00, 0x00, 
-  0x00, 0x00, 0x07, 0xff, 0xff, 0xe0, 0x00, 0x00, 
-  0x00, 0x00, 0x0f, 0xff, 0xff, 0xf0, 0x00, 0x00, 
-  0x00, 0x00, 0x1f, 0xff, 0xff, 0xf8, 0x00, 0x00, 
-  0x00, 0x00, 0x3f, 0xff, 0xff, 0xfc, 0x00, 0x00, 
-  0x00, 0x00, 0x3f, 0xff, 0xff, 0xfc, 0x00, 0x00, 
-  0x00, 0x00, 0x7f, 0xff, 0xff, 0xfe, 0x00, 0x00, 
-  0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 
-  0x00, 0x01, 0xff, 0xff, 0xff, 0xff, 0x80, 0x00, 
-  0x00, 0x03, 0xff, 0xff, 0xff, 0xff, 0xc0, 0x00, 
-  0x00, 0x03, 0xff, 0xff, 0xff, 0xff, 0xc0, 0x00, 
-  0x00, 0x03, 0xff, 0xff, 0xff, 0xff, 0xc0, 0x00, 
-  0x00, 0x03, 0xff, 0xff, 0xff, 0xff, 0xc0, 0x00, 
-  0x00, 0x03, 0xff, 0xff, 0xff, 0xff, 0xc0, 0x00, 
-  0x00, 0x03, 0xff, 0xff, 0xff, 0xff, 0xc0, 0x00, 
-  0x00, 0x03, 0xfe, 0x3f, 0xfc, 0x7f, 0xc0, 0x00, 
-  0x00, 0x03, 0xfc, 0x3f, 0xfc, 0x3f, 0xc0, 0x00, 
-  0x00, 0x03, 0xe0, 0x3f, 0xfc, 0x07, 0xc0, 0x00, 
-  0x00, 0x00, 0x00, 0x3f, 0xfc, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x3f, 0xfc, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x3f, 0xfc, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x3f, 0xfc, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x3f, 0xfc, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x3f, 0xfc, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x3f, 0xfc, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x3f, 0xfc, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x3f, 0xfc, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x3f, 0xfc, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x3f, 0xfc, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x3f, 0xfc, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x3f, 0xfc, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x3f, 0xfc, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x3f, 0xfc, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x3f, 0xfc, 0x00, 0x00, 0x00, 
-};
-
-const lv_img_dsc_t arrive = {
-      {
-        LV_IMG_CF_INDEXED_1BIT,
-        0,
-        0,
-        64,
-        64
-    },
-    520,
-arrive_map,
-};
diff --git a/src/displayapp/icons/navigation/arrive.png b/src/displayapp/icons/navigation/arrive.png
deleted file mode 100644
index cb3dec0c..00000000
--- a/src/displayapp/icons/navigation/arrive.png
+++ /dev/null
diff --git a/src/displayapp/icons/navigation/arrive.svg b/src/displayapp/icons/navigation/arrive.svg
new file mode 100644
index 00000000..dfaacf83
--- /dev/null
+++ b/src/displayapp/icons/navigation/arrive.svg
@@ -0,0 +1,58 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   inkscape:version="1.0 (4035a4fb49, 2020-05-01)"
+   sodipodi:docname="arrive.svg"
+   version="1.1"
+   viewBox="0 0 20 20"
+   height="20"
+   width="20"
+   data-name="WORKING ICONS"
+   id="WORKING_ICONS">
+  <metadata
+     id="metadata11">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs9" />
+  <sodipodi:namedview
+     inkscape:current-layer="WORKING_ICONS"
+     inkscape:window-maximized="1"
+     inkscape:window-y="22"
+     inkscape:window-x="-8"
+     inkscape:cy="15.027627"
+     inkscape:cx="9.8645323"
+     inkscape:zoom="21.5"
+     showgrid="false"
+     id="namedview7"
+     inkscape:window-height="1027"
+     inkscape:window-width="1920"
+     inkscape:pageshadow="2"
+     inkscape:pageopacity="0"
+     guidetolerance="10"
+     gridtolerance="10"
+     objecttolerance="10"
+     borderopacity="1"
+     bordercolor="#666666"
+     pagecolor="#ffffff" />
+  <title
+     id="title2">direction</title>
+  <path
+     style="stroke-width:1.05409"
+     id="path4"
+     d="m 9.990842,4.4444444 a 2,2.2222222 0 1 1 2,-2.2222222 2,2.2222222 0 0 1 -2,2.2222222 z m 4.91284,9.2790446 -4.90368,-7.0476001 -4.90369,7.0476001 a 0.38659,0.42954444 0 0 0 0.40942,0.692822 l 2.95184,-1.493055 a 0.35542,0.39491111 0 0 1 0.54096,0.410077 h -0.00769 v 6.111178 A 0.49992,0.55546667 0 0 0 9.490782,20 h 1.00012 a 0.49992,0.55546667 0 0 0 0.49994,-0.555489 v -6.101955 h 0.0092 a 0.35757,0.3973 0 0 1 0.54242,-0.419312 l 2.95184,1.493056 a 0.3866,0.42955556 0 0 0 0.40942,-0.692811 z"
+     fill="#000000" />
+</svg>
diff --git a/src/displayapp/icons/navigation/arrive_left.svg b/src/displayapp/icons/navigation/arrive_left.svg
new file mode 100644
index 00000000..c28e700a
--- /dev/null
+++ b/src/displayapp/icons/navigation/arrive_left.svg
@@ -0,0 +1,58 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   inkscape:version="1.0 (4035a4fb49, 2020-05-01)"
+   sodipodi:docname="arrive_left.svg"
+   version="1.1"
+   viewBox="0 0 20 20"
+   height="20"
+   width="20"
+   data-name="WORKING ICONS"
+   id="WORKING_ICONS">
+  <metadata
+     id="metadata11">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs9" />
+  <sodipodi:namedview
+     inkscape:current-layer="WORKING_ICONS"
+     inkscape:window-maximized="1"
+     inkscape:window-y="22"
+     inkscape:window-x="-8"
+     inkscape:cy="12.384776"
+     inkscape:cx="11.145089"
+     inkscape:zoom="21.5"
+     showgrid="false"
+     id="namedview7"
+     inkscape:window-height="1027"
+     inkscape:window-width="1920"
+     inkscape:pageshadow="2"
+     inkscape:pageopacity="0"
+     guidetolerance="10"
+     gridtolerance="10"
+     objecttolerance="10"
+     borderopacity="1"
+     bordercolor="#666666"
+     pagecolor="#ffffff" />
+  <title
+     id="title2">direction</title>
+  <path
+     style="stroke-width:1.11111"
+     id="path4"
+     d="M 2.2222222,11.085944 A 2.2222222,2.2222222 0 1 1 4.4444444,8.8637218 2.2222222,2.2222222 0 0 1 2.2222222,11.085944 Z M 13.336589,10.015589 a 4.5086889,4.5086889 0 0 1 4.431967,4.525822 h 0.0092 v 1.530833 a 0.56924444,0.56924444 0 0 0 0.569255,0.569256 h 1.083711 A 0.56924444,0.56924444 0 0 0 20,16.072244 V 14.419278 H 19.98461 A 6.7289667,6.7289667 0 0 0 13.336389,7.7933663 l -0.01222,-0.00203 1.33e-4,0.022311 h -1.102078 v -0.0101 A 0.3973,0.3973 0 0 1 11.802911,7.2008552 L 13.295967,3.921033 A 0.42954444,0.42954444 0 0 0 12.603144,3.4661219 L 5.5555556,8.9146548 12.603144,14.3632 a 0.42955556,0.42955556 0 0 0 0.692823,-0.454911 l -1.493056,-3.279822 a 0.3973,0.3973 0 0 1 0.419311,-0.6027 v 0.0101 h 1.111111"
+     fill="#000000" />
+</svg>
diff --git a/src/displayapp/icons/navigation/arrive_right.svg b/src/displayapp/icons/navigation/arrive_right.svg
new file mode 100644
index 00000000..52032a1c
--- /dev/null
+++ b/src/displayapp/icons/navigation/arrive_right.svg
@@ -0,0 +1,58 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   inkscape:version="1.0 (4035a4fb49, 2020-05-01)"
+   sodipodi:docname="arrive_right.svg"
+   version="1.1"
+   viewBox="0 0 20 20"
+   height="20"
+   width="20"
+   data-name="WORKING ICONS"
+   id="WORKING_ICONS">
+  <metadata
+     id="metadata11">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs9" />
+  <sodipodi:namedview
+     inkscape:current-layer="WORKING_ICONS"
+     inkscape:window-maximized="1"
+     inkscape:window-y="22"
+     inkscape:window-x="-8"
+     inkscape:cy="15.150233"
+     inkscape:cx="-2.2735076"
+     inkscape:zoom="21.5"
+     showgrid="false"
+     id="namedview7"
+     inkscape:window-height="1027"
+     inkscape:window-width="1920"
+     inkscape:pageshadow="2"
+     inkscape:pageopacity="0"
+     guidetolerance="10"
+     gridtolerance="10"
+     objecttolerance="10"
+     borderopacity="1"
+     bordercolor="#666666"
+     pagecolor="#ffffff" />
+  <title
+     id="title2">direction</title>
+  <path
+     style="stroke-width:1.11111"
+     id="path4"
+     d="M 15.555556,8.8637269 A 2.2222222,2.2222222 0 1 1 17.777778,11.085949 2.2222222,2.2222222 0 0 1 15.555556,8.8637269 Z M 6.6666665,10.035872 h 1.1111111 v -0.0101 a 0.3973,0.3973 0 0 1 0.4193111,0.602689 l -1.4930556,3.279822 a 0.42955556,0.42955556 0 0 0 0.6928223,0.454911 L 14.444444,8.9146609 7.3968554,3.466116 A 0.42954444,0.42954444 0 0 0 6.7040331,3.9210271 L 8.1970887,7.2008604 A 0.3973,0.3973 0 0 1 7.7777776,7.8035493 v 0.0101 H 6.6757554 l 1.333e-4,-0.022311 -0.012222,0.00203 A 6.7289667,6.7289667 0 0 0 0.0153887,14.419283 H -1.999413e-7 v 1.652966 A 0.56924444,0.56924444 0 0 0 0.5692554,16.641505 H 1.6529665 A 0.56924444,0.56924444 0 0 0 2.222222,16.072249 v -1.530833 h 0.00922 a 4.5086889,4.5086889 0 0 1 4.4319689,-4.525822"
+     fill="#000000" />
+</svg>
diff --git a/src/displayapp/icons/navigation/arrive_straight.svg b/src/displayapp/icons/navigation/arrive_straight.svg
new file mode 100644
index 00000000..1fa4126a
--- /dev/null
+++ b/src/displayapp/icons/navigation/arrive_straight.svg
@@ -0,0 +1,58 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   inkscape:version="1.0 (4035a4fb49, 2020-05-01)"
+   sodipodi:docname="arrive_straight.svg"
+   version="1.1"
+   viewBox="0 0 20 20"
+   height="20"
+   width="20"
+   data-name="WORKING ICONS"
+   id="WORKING_ICONS">
+  <metadata
+     id="metadata11">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs9" />
+  <sodipodi:namedview
+     inkscape:current-layer="WORKING_ICONS"
+     inkscape:window-maximized="1"
+     inkscape:window-y="22"
+     inkscape:window-x="-8"
+     inkscape:cy="13.311136"
+     inkscape:cx="7.9300748"
+     inkscape:zoom="21.5"
+     showgrid="false"
+     id="namedview7"
+     inkscape:window-height="1027"
+     inkscape:window-width="1920"
+     inkscape:pageshadow="2"
+     inkscape:pageopacity="0"
+     guidetolerance="10"
+     gridtolerance="10"
+     objecttolerance="10"
+     borderopacity="1"
+     bordercolor="#666666"
+     pagecolor="#ffffff" />
+  <title
+     id="title2">direction</title>
+  <path
+     style="stroke-width:1.11111"
+     id="path4"
+     d="M 9.9898459,4.4444444 A 2.2222222,2.2222222 0 1 1 12.212068,2.2222222 2.2222222,2.2222222 0 0 1 9.9898459,4.4444444 Z M 15.448557,13.723489 10.000024,6.6758889 4.551479,13.723489 a 0.42954444,0.42954444 0 0 0 0.4549111,0.692822 l 3.2798222,-1.493055 a 0.39491111,0.39491111 0 0 1 0.6010667,0.410077 h -0.00854 v 6.111178 A 0.55546667,0.55546667 0 0 0 9.4342234,20 h 1.1112446 a 0.55546667,0.55546667 0 0 0 0.555489,-0.555489 v -6.101955 h 0.01018 a 0.3973,0.3973 0 0 1 0.602689,-0.419312 l 3.279822,1.493056 a 0.42955556,0.42955556 0 0 0 0.454911,-0.692811 z"
+     fill="#000000" />
+</svg>
diff --git a/src/displayapp/icons/navigation/close-white.svg b/src/displayapp/icons/navigation/close-white.svg
deleted file mode 100644
index 928004f4..00000000
--- a/src/displayapp/icons/navigation/close-white.svg
+++ /dev/null
@@ -1,4 +0,0 @@
-<svg id="WORKING_ICONS" data-name="WORKING ICONS" xmlns="http://www.w3.org/2000/svg" width="20" height="20" viewBox="0 0 20 20">
-  <title>direction</title>
-  <path fill="#ffffff" d="M17.35551,4.05855L11.76558,9.64848a0.49713,0.49713,0,0,0,0,.703l5.58993,5.58993a0.49713,0.49713,0,0,1,0,.703l-0.711.711a0.49713,0.49713,0,0,1-.703,0l-5.58993-5.58993a0.49713,0.49713,0,0,0-.703,0L4.05855,17.35551a0.49713,0.49713,0,0,1-.703,0l-0.711-.711a0.49713,0.49713,0,0,1,0-.703l5.58993-5.58993a0.49713,0.49713,0,0,0,0-.703L2.64449,4.05855a0.49713,0.49713,0,0,1,0-.703l0.711-.711a0.49713,0.49713,0,0,1,.703,0L9.64848,8.23442a0.49713,0.49713,0,0,0,.703,0l5.58993-5.58993a0.49713,0.49713,0,0,1,.703,0l0.711,0.711A0.49713,0.49713,0,0,1,17.35551,4.05855Z"/>
-</svg>
diff --git a/src/displayapp/icons/navigation/close.c b/src/displayapp/icons/navigation/close.c
deleted file mode 100644
index cea764b4..00000000
--- a/src/displayapp/icons/navigation/close.c
+++ /dev/null
@@ -1,96 +0,0 @@
-#if defined(LV_LVGL_H_INCLUDE_SIMPLE)
-#include "lvgl.h"
-#else
-#include "lvgl/lvgl.h"
-#endif
-
-
-#ifndef LV_ATTRIBUTE_MEM_ALIGN
-#define LV_ATTRIBUTE_MEM_ALIGN
-#endif
-
-#ifndef LV_ATTRIBUTE_IMG_CLOSE
-#define LV_ATTRIBUTE_IMG_CLOSE
-#endif
-
-const LV_ATTRIBUTE_MEM_ALIGN LV_ATTRIBUTE_LARGE_CONST LV_ATTRIBUTE_IMG_CLOSE uint8_t close_map[] = {
-  0x04, 0x02, 0x04, 0xff, 	/*Color of index 0*/
-  0xfc, 0xfe, 0xfc, 0xff, 	/*Color of index 1*/
-
-  0xff, 0xc0, 0x00, 0x00, 0x00, 0x00, 0x03, 0xff, 
-  0xff, 0xe0, 0x00, 0x00, 0x00, 0x00, 0x07, 0xff, 
-  0xff, 0xf0, 0x00, 0x00, 0x00, 0x00, 0x0f, 0xff, 
-  0xff, 0xf8, 0x00, 0x00, 0x00, 0x00, 0x1f, 0xff, 
-  0xff, 0xfc, 0x00, 0x00, 0x00, 0x00, 0x3f, 0xff, 
-  0xff, 0xfe, 0x00, 0x00, 0x00, 0x00, 0x7f, 0xff, 
-  0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 
-  0xff, 0xff, 0x80, 0x00, 0x00, 0x01, 0xff, 0xff, 
-  0xff, 0xff, 0xe0, 0x00, 0x00, 0x07, 0xff, 0xff, 
-  0xff, 0xff, 0xf0, 0x00, 0x00, 0x0f, 0xff, 0xff, 
-  0x7f, 0xff, 0xf8, 0x00, 0x00, 0x1f, 0xff, 0xfe, 
-  0x3f, 0xff, 0xfc, 0x00, 0x00, 0x3f, 0xff, 0xfc, 
-  0x1f, 0xff, 0xfe, 0x00, 0x00, 0x7f, 0xff, 0xf8, 
-  0x0f, 0xff, 0xff, 0x00, 0x00, 0xff, 0xff, 0xf0, 
-  0x07, 0xff, 0xff, 0x00, 0x00, 0xff, 0xff, 0xe0, 
-  0x03, 0xff, 0xff, 0x80, 0x01, 0xff, 0xff, 0xc0, 
-  0x01, 0xff, 0xff, 0xc0, 0x03, 0xff, 0xff, 0x80, 
-  0x00, 0xff, 0xff, 0xe0, 0x07, 0xff, 0xff, 0x00, 
-  0x00, 0xff, 0xff, 0xf0, 0x0f, 0xff, 0xff, 0x00, 
-  0x00, 0x7f, 0xff, 0xf8, 0x1f, 0xff, 0xfe, 0x00, 
-  0x00, 0x3f, 0xff, 0xfc, 0x3f, 0xff, 0xfc, 0x00, 
-  0x00, 0x1f, 0xff, 0xfe, 0x7f, 0xff, 0xf8, 0x00, 
-  0x00, 0x0f, 0xff, 0xff, 0xff, 0xff, 0xf0, 0x00, 
-  0x00, 0x07, 0xff, 0xff, 0xff, 0xff, 0xe0, 0x00, 
-  0x00, 0x01, 0xff, 0xff, 0xff, 0xff, 0x80, 0x00, 
-  0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 
-  0x00, 0x00, 0x7f, 0xff, 0xff, 0xfe, 0x00, 0x00, 
-  0x00, 0x00, 0x3f, 0xff, 0xff, 0xfc, 0x00, 0x00, 
-  0x00, 0x00, 0x1f, 0xff, 0xff, 0xf8, 0x00, 0x00, 
-  0x00, 0x00, 0x0f, 0xff, 0xff, 0xf0, 0x00, 0x00, 
-  0x00, 0x00, 0x07, 0xff, 0xff, 0xe0, 0x00, 0x00, 
-  0x00, 0x00, 0x03, 0xff, 0xff, 0xc0, 0x00, 0x00, 
-  0x00, 0x00, 0x03, 0xff, 0xff, 0xc0, 0x00, 0x00, 
-  0x00, 0x00, 0x07, 0xff, 0xff, 0xe0, 0x00, 0x00, 
-  0x00, 0x00, 0x0f, 0xff, 0xff, 0xf0, 0x00, 0x00, 
-  0x00, 0x00, 0x1f, 0xff, 0xff, 0xf8, 0x00, 0x00, 
-  0x00, 0x00, 0x3f, 0xff, 0xff, 0xfc, 0x00, 0x00, 
-  0x00, 0x00, 0x7f, 0xff, 0xff, 0xfe, 0x00, 0x00, 
-  0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 
-  0x00, 0x01, 0xff, 0xff, 0xff, 0xff, 0x80, 0x00, 
-  0x00, 0x07, 0xff, 0xff, 0xff, 0xff, 0xe0, 0x00, 
-  0x00, 0x0f, 0xff, 0xff, 0xff, 0xff, 0xf0, 0x00, 
-  0x00, 0x1f, 0xff, 0xfe, 0x7f, 0xff, 0xf8, 0x00, 
-  0x00, 0x3f, 0xff, 0xfc, 0x3f, 0xff, 0xfc, 0x00, 
-  0x00, 0x7f, 0xff, 0xf8, 0x1f, 0xff, 0xfe, 0x00, 
-  0x00, 0xff, 0xff, 0xf0, 0x0f, 0xff, 0xff, 0x00, 
-  0x00, 0xff, 0xff, 0xe0, 0x07, 0xff, 0xff, 0x00, 
-  0x01, 0xff, 0xff, 0xc0, 0x03, 0xff, 0xff, 0x80, 
-  0x03, 0xff, 0xff, 0x80, 0x01, 0xff, 0xff, 0xc0, 
-  0x07, 0xff, 0xff, 0x00, 0x00, 0xff, 0xff, 0xe0, 
-  0x0f, 0xff, 0xff, 0x00, 0x00, 0xff, 0xff, 0xf0, 
-  0x1f, 0xff, 0xfe, 0x00, 0x00, 0x7f, 0xff, 0xf8, 
-  0x3f, 0xff, 0xfc, 0x00, 0x00, 0x3f, 0xff, 0xfc, 
-  0x7f, 0xff, 0xf8, 0x00, 0x00, 0x1f, 0xff, 0xfe, 
-  0xff, 0xff, 0xf0, 0x00, 0x00, 0x0f, 0xff, 0xff, 
-  0xff, 0xff, 0xe0, 0x00, 0x00, 0x07, 0xff, 0xff, 
-  0xff, 0xff, 0x80, 0x00, 0x00, 0x01, 0xff, 0xff, 
-  0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 
-  0xff, 0xfe, 0x00, 0x00, 0x00, 0x00, 0x7f, 0xff, 
-  0xff, 0xfc, 0x00, 0x00, 0x00, 0x00, 0x3f, 0xff, 
-  0xff, 0xf8, 0x00, 0x00, 0x00, 0x00, 0x1f, 0xff, 
-  0xff, 0xf0, 0x00, 0x00, 0x00, 0x00, 0x0f, 0xff, 
-  0xff, 0xe0, 0x00, 0x00, 0x00, 0x00, 0x07, 0xff, 
-  0xff, 0xc0, 0x00, 0x00, 0x00, 0x00, 0x03, 0xff, 
-};
-
-const lv_img_dsc_t close = {
-      {
-        LV_IMG_CF_INDEXED_1BIT,
-        0,
-        0,
-        64,
-        64
-    },
-    520,
-close_map,
-};
diff --git a/src/displayapp/icons/navigation/close.png b/src/displayapp/icons/navigation/close.png
deleted file mode 100644
index f79b86bc..00000000
--- a/src/displayapp/icons/navigation/close.png
+++ /dev/null
diff --git a/src/displayapp/icons/navigation/close.svg b/src/displayapp/icons/navigation/close.svg
new file mode 100644
index 00000000..4e288723
--- /dev/null
+++ b/src/displayapp/icons/navigation/close.svg
@@ -0,0 +1,58 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   inkscape:version="1.0 (4035a4fb49, 2020-05-01)"
+   sodipodi:docname="close.svg"
+   version="1.1"
+   viewBox="0 0 20 20"
+   height="20"
+   width="20"
+   data-name="WORKING ICONS"
+   id="WORKING_ICONS">
+  <metadata
+     id="metadata11">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs9" />
+  <sodipodi:namedview
+     inkscape:current-layer="WORKING_ICONS"
+     inkscape:window-maximized="1"
+     inkscape:window-y="22"
+     inkscape:window-x="-8"
+     inkscape:cy="14.778983"
+     inkscape:cx="4.2598846"
+     inkscape:zoom="15.202796"
+     showgrid="false"
+     id="namedview7"
+     inkscape:window-height="1027"
+     inkscape:window-width="1920"
+     inkscape:pageshadow="2"
+     inkscape:pageopacity="0"
+     guidetolerance="10"
+     gridtolerance="10"
+     objecttolerance="10"
+     borderopacity="1"
+     bordercolor="#666666"
+     pagecolor="#ffffff" />
+  <title
+     id="title2">direction</title>
+  <path
+     style="stroke-width:1.33314"
+     id="path4"
+     d="M 19.805919,2.0792199 12.353764,9.531375 a 0.6627435,0.6627435 0 0 0 0,0.937197 l 7.452155,7.452155 a 0.6627435,0.6627435 0 0 1 0,0.937197 l -0.947862,0.947862 a 0.6627435,0.6627435 0 0 1 -0.937197,0 l -7.452155,-7.452155 a 0.6627435,0.6627435 0 0 0 -0.9371971,0 l -7.4522881,7.452288 a 0.6627435,0.6627435 0 0 1 -0.9371968,0 L 0.194161,18.858057 a 0.6627435,0.6627435 0 0 1 0,-0.937197 l 7.4521549,-7.452155 a 0.6627435,0.6627435 0 0 0 0,-0.937197 L 0.194081,2.0792199 a 0.6627435,0.6627435 0 0 1 0,-0.9371968 l 0.947862,-0.947862 a 0.6627435,0.6627435 0 0 1 0.9371968,0 L 9.5313749,7.646236 a 0.6627435,0.6627435 0 0 0 0.9371971,0 l 7.452155,-7.4521549 a 0.6627435,0.6627435 0 0 1 0.937197,0 l 0.947862,0.947862 a 0.6627435,0.6627435 0 0 1 1.33e-4,0.9372768 z"
+     fill="#000000" />
+</svg>
diff --git a/src/displayapp/icons/navigation/continue-left-white.svg b/src/displayapp/icons/navigation/continue-left-white.svg
deleted file mode 100644
index 3cb455d9..00000000
--- a/src/displayapp/icons/navigation/continue-left-white.svg
+++ /dev/null
@@ -1,4 +0,0 @@
-<svg id="WORKING_ICONS" data-name="WORKING ICONS" xmlns="http://www.w3.org/2000/svg" width="20" height="20" viewBox="0 0 20 20">
-  <title>direction</title>
-  <path fill="#ffffff" d="M10,5.97986l0.011,0.00183A6.06019,6.06019,0,0,1,16,12.05493V16H15.99689l0.002,1.50317A0.49614,0.49614,0,0,1,15.50269,18H14.49622A0.49622,0.49622,0,0,1,14,17.50378V12.05493a4.05782,4.05782,0,0,0-3.98877-4.07324H8.01245a0.3576,0.3576,0,0,0-.37738.54248L8.97882,11.476a0.38659,0.38659,0,0,1-.62354.40942L2.0083,7l6.347-4.922a0.38659,0.38659,0,0,1,.62354.40942L7.63507,5.43927a0.35757,0.35757,0,0,0,.37738.54242H10"/>
-</svg>
diff --git a/src/displayapp/icons/navigation/continue-left.c b/src/displayapp/icons/navigation/continue-left.c
deleted file mode 100644
index 30bda4d7..00000000
--- a/src/displayapp/icons/navigation/continue-left.c
+++ /dev/null
@@ -1,96 +0,0 @@
-#if defined(LV_LVGL_H_INCLUDE_SIMPLE)
-#include "lvgl.h"
-#else
-#include "lvgl/lvgl.h"
-#endif
-
-
-#ifndef LV_ATTRIBUTE_MEM_ALIGN
-#define LV_ATTRIBUTE_MEM_ALIGN
-#endif
-
-#ifndef LV_ATTRIBUTE_IMG_CONTINUE_LEFT
-#define LV_ATTRIBUTE_IMG_CONTINUE_LEFT
-#endif
-
-const LV_ATTRIBUTE_MEM_ALIGN LV_ATTRIBUTE_LARGE_CONST LV_ATTRIBUTE_IMG_CONTINUE_LEFT uint8_t continue_left_map[] = {
-  0x04, 0x02, 0x04, 0xff, 	/*Color of index 0*/
-  0xfc, 0xfe, 0xfc, 0xff, 	/*Color of index 1*/
-
-  0x00, 0x00, 0x00, 0x7f, 0xc0, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0xff, 0xc0, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x01, 0xff, 0xc0, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x07, 0xff, 0xc0, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x0f, 0xff, 0xc0, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x3f, 0xff, 0x80, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x7f, 0xff, 0x80, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 
-  0x00, 0x01, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 
-  0x00, 0x07, 0xff, 0xfe, 0x00, 0x00, 0x00, 0x00, 
-  0x00, 0x0f, 0xff, 0xfe, 0x00, 0x00, 0x00, 0x00, 
-  0x00, 0x1f, 0xff, 0xfc, 0x00, 0x00, 0x00, 0x00, 
-  0x00, 0x7f, 0xff, 0xfc, 0x00, 0x00, 0x00, 0x00, 
-  0x00, 0xff, 0xff, 0xfc, 0x00, 0x00, 0x00, 0x00, 
-  0x01, 0xff, 0xff, 0xff, 0xff, 0xc0, 0x00, 0x00, 
-  0x03, 0xff, 0xff, 0xff, 0xff, 0xfc, 0x00, 0x00, 
-  0x0f, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 
-  0x0f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xc0, 0x00, 
-  0x0f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xe0, 0x00, 
-  0x0f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xf8, 0x00, 
-  0x0f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfc, 0x00, 
-  0x0f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfe, 0x00, 
-  0x0f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 
-  0x0f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x80, 
-  0x07, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xc0, 
-  0x03, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xc0, 
-  0x00, 0xff, 0xff, 0xfc, 0x07, 0xff, 0xff, 0xe0, 
-  0x00, 0x7f, 0xff, 0xfc, 0x00, 0xff, 0xff, 0xf0, 
-  0x00, 0x3f, 0xff, 0xfc, 0x00, 0x3f, 0xff, 0xf0, 
-  0x00, 0x1f, 0xff, 0xfe, 0x00, 0x1f, 0xff, 0xf0, 
-  0x00, 0x07, 0xff, 0xfe, 0x00, 0x07, 0xff, 0xf0, 
-  0x00, 0x03, 0xff, 0xff, 0x00, 0x03, 0xff, 0xf0, 
-  0x00, 0x00, 0xff, 0xff, 0x00, 0x01, 0xff, 0xf0, 
-  0x00, 0x00, 0x7f, 0xff, 0x80, 0x01, 0xff, 0xf0, 
-  0x00, 0x00, 0x3f, 0xff, 0x80, 0x00, 0xff, 0xf0, 
-  0x00, 0x00, 0x1f, 0xff, 0xc0, 0x00, 0x7f, 0xf0, 
-  0x00, 0x00, 0x07, 0xff, 0xc0, 0x00, 0x7f, 0xf0, 
-  0x00, 0x00, 0x03, 0xff, 0xc0, 0x00, 0x7f, 0xf0, 
-  0x00, 0x00, 0x00, 0xff, 0xc0, 0x00, 0x3f, 0xf0, 
-  0x00, 0x00, 0x00, 0x7f, 0xc0, 0x00, 0x3f, 0xf0, 
-  0x00, 0x00, 0x00, 0x3f, 0xc0, 0x00, 0x3f, 0xf0, 
-  0x00, 0x00, 0x00, 0x1f, 0xc0, 0x00, 0x3f, 0xf0, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3f, 0xf0, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3f, 0xf0, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3f, 0xf0, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3f, 0xf0, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3f, 0xf0, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3f, 0xf0, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3f, 0xf0, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3f, 0xf0, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3f, 0xf0, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3f, 0xf0, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3f, 0xf0, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3f, 0xf0, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3f, 0xf0, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3f, 0xf0, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3f, 0xf0, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3f, 0xf0, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3f, 0xf0, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3f, 0xf0, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3f, 0xf0, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3f, 0xf0, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3f, 0xf0, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3f, 0xf0, 
-};
-
-const lv_img_dsc_t continue_left = {
-      {
-        LV_IMG_CF_INDEXED_1BIT,
-        0,
-        0,
-        64,
-        64
-    },
-    520,
-continue_left_map,
-};
diff --git a/src/displayapp/icons/navigation/continue-left.png b/src/displayapp/icons/navigation/continue-left.png
deleted file mode 100644
index 521df96a..00000000
--- a/src/displayapp/icons/navigation/continue-left.png
+++ /dev/null
diff --git a/src/displayapp/icons/navigation/continue-right-white.svg b/src/displayapp/icons/navigation/continue-right-white.svg
deleted file mode 100644
index 98967557..00000000
--- a/src/displayapp/icons/navigation/continue-right-white.svg
+++ /dev/null
@@ -1,4 +0,0 @@
-<svg id="WORKING_ICONS" data-name="WORKING ICONS" xmlns="http://www.w3.org/2000/svg" width="20" height="20" viewBox="0 0 20 20">
-  <title>direction</title>
-  <path fill="#ffffff" d="M9.98877,7.98169A4.05782,4.05782,0,0,0,6,12.05493v5.44885A0.49622,0.49622,0,0,1,5.50378,18H4.49731a0.49614,0.49614,0,0,1-.49615-0.49683L4.00311,16H4V12.05493A6.06019,6.06019,0,0,1,9.989,5.98169L10,5.97986V5.98169h1.98755a0.35757,0.35757,0,0,0,.37738-0.54242L11.02118,2.48743A0.38659,0.38659,0,0,1,11.64471,2.078L17.9917,7l-6.347,4.88544a0.38659,0.38659,0,0,1-.62354-0.40942l1.34375-2.95184a0.3576,0.3576,0,0,0-.37738-0.54248H9.98877Z"/>
-</svg>
diff --git a/src/displayapp/icons/navigation/continue-right.c b/src/displayapp/icons/navigation/continue-right.c
deleted file mode 100644
index 4d4402f3..00000000
--- a/src/displayapp/icons/navigation/continue-right.c
+++ /dev/null
@@ -1,96 +0,0 @@
-#if defined(LV_LVGL_H_INCLUDE_SIMPLE)
-#include "lvgl.h"
-#else
-#include "lvgl/lvgl.h"
-#endif
-
-
-#ifndef LV_ATTRIBUTE_MEM_ALIGN
-#define LV_ATTRIBUTE_MEM_ALIGN
-#endif
-
-#ifndef LV_ATTRIBUTE_IMG_CONTINUE_RIGHT
-#define LV_ATTRIBUTE_IMG_CONTINUE_RIGHT
-#endif
-
-const LV_ATTRIBUTE_MEM_ALIGN LV_ATTRIBUTE_LARGE_CONST LV_ATTRIBUTE_IMG_CONTINUE_RIGHT uint8_t continue_right_map[] = {
-  0x04, 0x02, 0x04, 0xff, 	/*Color of index 0*/
-  0xfc, 0xfe, 0xfc, 0xff, 	/*Color of index 1*/
-
-  0x00, 0x00, 0x00, 0x03, 0xfe, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x03, 0xff, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x03, 0xff, 0xc0, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x03, 0xff, 0xe0, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x03, 0xff, 0xf0, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x01, 0xff, 0xfc, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x01, 0xff, 0xfe, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0x80, 0x00, 
-  0x00, 0x00, 0x00, 0x00, 0x7f, 0xff, 0xe0, 0x00, 
-  0x00, 0x00, 0x00, 0x00, 0x7f, 0xff, 0xf0, 0x00, 
-  0x00, 0x00, 0x00, 0x00, 0x3f, 0xff, 0xf8, 0x00, 
-  0x00, 0x00, 0x00, 0x00, 0x3f, 0xff, 0xfe, 0x00, 
-  0x00, 0x00, 0x00, 0x00, 0x3f, 0xff, 0xff, 0x00, 
-  0x00, 0x00, 0x03, 0xff, 0xff, 0xff, 0xff, 0x80, 
-  0x00, 0x00, 0x3f, 0xff, 0xff, 0xff, 0xff, 0xc0, 
-  0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xf0, 
-  0x00, 0x03, 0xff, 0xff, 0xff, 0xff, 0xff, 0xf0, 
-  0x00, 0x07, 0xff, 0xff, 0xff, 0xff, 0xff, 0xf0, 
-  0x00, 0x1f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xf0, 
-  0x00, 0x3f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xf0, 
-  0x00, 0x7f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xf0, 
-  0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xf0, 
-  0x01, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xf0, 
-  0x03, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xe0, 
-  0x03, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xc0, 
-  0x07, 0xff, 0xff, 0xe0, 0x3f, 0xff, 0xff, 0x00, 
-  0x0f, 0xff, 0xff, 0x00, 0x3f, 0xff, 0xfe, 0x00, 
-  0x0f, 0xff, 0xfc, 0x00, 0x3f, 0xff, 0xfc, 0x00, 
-  0x0f, 0xff, 0xf8, 0x00, 0x7f, 0xff, 0xf8, 0x00, 
-  0x0f, 0xff, 0xe0, 0x00, 0x7f, 0xff, 0xe0, 0x00, 
-  0x0f, 0xff, 0xc0, 0x00, 0xff, 0xff, 0xc0, 0x00, 
-  0x0f, 0xff, 0x80, 0x00, 0xff, 0xff, 0x00, 0x00, 
-  0x0f, 0xff, 0x80, 0x01, 0xff, 0xfe, 0x00, 0x00, 
-  0x0f, 0xff, 0x00, 0x01, 0xff, 0xfc, 0x00, 0x00, 
-  0x0f, 0xfe, 0x00, 0x03, 0xff, 0xf8, 0x00, 0x00, 
-  0x0f, 0xfe, 0x00, 0x03, 0xff, 0xf0, 0x00, 0x00, 
-  0x0f, 0xfe, 0x00, 0x03, 0xff, 0xc0, 0x00, 0x00, 
-  0x0f, 0xfc, 0x00, 0x03, 0xff, 0x00, 0x00, 0x00, 
-  0x0f, 0xfc, 0x00, 0x03, 0xfe, 0x00, 0x00, 0x00, 
-  0x0f, 0xfc, 0x00, 0x03, 0xfc, 0x00, 0x00, 0x00, 
-  0x0f, 0xfc, 0x00, 0x03, 0xf8, 0x00, 0x00, 0x00, 
-  0x0f, 0xfc, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x0f, 0xfc, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x0f, 0xfc, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x0f, 0xfc, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x0f, 0xfc, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x0f, 0xfc, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x0f, 0xfc, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x0f, 0xfc, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x0f, 0xfc, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x0f, 0xfc, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x0f, 0xfc, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x0f, 0xfc, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x0f, 0xfc, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x0f, 0xfc, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x0f, 0xfc, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x0f, 0xfc, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x0f, 0xfc, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x0f, 0xfc, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x0f, 0xfc, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x0f, 0xfc, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x0f, 0xfc, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x0f, 0xfc, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-};
-
-const lv_img_dsc_t continue_right = {
-      {
-        LV_IMG_CF_INDEXED_1BIT,
-        0,
-        0,
-        64,
-        64
-    },
-    520,
-continue_right_map,
-};
diff --git a/src/displayapp/icons/navigation/continue-right.png b/src/displayapp/icons/navigation/continue-right.png
deleted file mode 100644
index ad4731c5..00000000
--- a/src/displayapp/icons/navigation/continue-right.png
+++ /dev/null
diff --git a/src/displayapp/icons/navigation/continue-slight-left-white.svg b/src/displayapp/icons/navigation/continue-slight-left-white.svg
deleted file mode 100644
index 7ae2013c..00000000
--- a/src/displayapp/icons/navigation/continue-slight-left-white.svg
+++ /dev/null
@@ -1,4 +0,0 @@
-<svg id="WORKING_ICONS" data-name="WORKING ICONS" xmlns="http://www.w3.org/2000/svg" width="20" height="20" viewBox="0 0 20 20">
-  <title>direction</title>
-  <path fill="#ffffff" d="M14.9859,14.043v3.46082A0.49621,0.49621,0,0,1,14.48974,18H13.48321a0.49614,0.49614,0,0,1-.49615-0.49683l0.0047-3.60767a5.21819,5.21819,0,0,0-1.665-4.144L8.87854,7.68585a0.35758,0.35758,0,0,0-.6405.16266l-0.91821,3.1106A0.38663,0.38663,0,0,1,6.58044,10.86L5,3l8.00476,0.44965a0.38658,0.38658,0,0,1,.20294.71777L10.25878,5.51758a0.3576,0.3576,0,0,0-.07019.6571l2.45746,2.07385A7.25158,7.25158,0,0,1,14.9859,14.043Z"/>
-</svg>
diff --git a/src/displayapp/icons/navigation/continue-slight-left.c b/src/displayapp/icons/navigation/continue-slight-left.c
deleted file mode 100644
index 10b55946..00000000
--- a/src/displayapp/icons/navigation/continue-slight-left.c
+++ /dev/null
@@ -1,96 +0,0 @@
-#if defined(LV_LVGL_H_INCLUDE_SIMPLE)
-#include "lvgl.h"
-#else
-#include "lvgl/lvgl.h"
-#endif
-
-
-#ifndef LV_ATTRIBUTE_MEM_ALIGN
-#define LV_ATTRIBUTE_MEM_ALIGN
-#endif
-
-#ifndef LV_ATTRIBUTE_IMG_CONTINUE_SLIGHT_LEFT
-#define LV_ATTRIBUTE_IMG_CONTINUE_SLIGHT_LEFT
-#endif
-
-const LV_ATTRIBUTE_MEM_ALIGN LV_ATTRIBUTE_LARGE_CONST LV_ATTRIBUTE_IMG_CONTINUE_SLIGHT_LEFT uint8_t continue_slight_left_map[] = {
-  0x04, 0x02, 0x04, 0xff, 	/*Color of index 0*/
-  0xfc, 0xfe, 0xfc, 0xff, 	/*Color of index 1*/
-
-  0x00, 0x1f, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 
-  0x00, 0x1f, 0xff, 0xff, 0xff, 0xff, 0x80, 0x00, 
-  0x00, 0x1f, 0xff, 0xff, 0xff, 0xff, 0x80, 0x00, 
-  0x00, 0x1f, 0xff, 0xff, 0xff, 0xff, 0x80, 0x00, 
-  0x00, 0x1f, 0xff, 0xff, 0xff, 0xff, 0x80, 0x00, 
-  0x00, 0x1f, 0xff, 0xff, 0xff, 0xff, 0x80, 0x00, 
-  0x00, 0x1f, 0xff, 0xff, 0xff, 0xff, 0x80, 0x00, 
-  0x00, 0x1f, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 
-  0x00, 0x1f, 0xff, 0xff, 0xff, 0xf8, 0x00, 0x00, 
-  0x00, 0x1f, 0xff, 0xff, 0xff, 0xe0, 0x00, 0x00, 
-  0x00, 0x1f, 0xff, 0xff, 0xff, 0x80, 0x00, 0x00, 
-  0x00, 0x1f, 0xff, 0xff, 0xfc, 0x00, 0x00, 0x00, 
-  0x00, 0x1f, 0xff, 0xff, 0xf0, 0x00, 0x00, 0x00, 
-  0x00, 0x0f, 0xff, 0xff, 0xfc, 0x00, 0x00, 0x00, 
-  0x00, 0x0f, 0xff, 0xff, 0xfc, 0x00, 0x00, 0x00, 
-  0x00, 0x0f, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 
-  0x00, 0x0f, 0xff, 0xff, 0xff, 0x80, 0x00, 0x00, 
-  0x00, 0x0f, 0xff, 0xff, 0xff, 0xc0, 0x00, 0x00, 
-  0x00, 0x07, 0xff, 0xff, 0xff, 0xe0, 0x00, 0x00, 
-  0x00, 0x07, 0xff, 0xff, 0xff, 0xf8, 0x00, 0x00, 
-  0x00, 0x07, 0xff, 0xff, 0xff, 0xfc, 0x00, 0x00, 
-  0x00, 0x07, 0xff, 0xff, 0xff, 0xfe, 0x00, 0x00, 
-  0x00, 0x07, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 
-  0x00, 0x03, 0xff, 0xff, 0xff, 0xff, 0x80, 0x00, 
-  0x00, 0x03, 0xff, 0xc7, 0xff, 0xff, 0x80, 0x00, 
-  0x00, 0x03, 0xff, 0xc3, 0xff, 0xff, 0xc0, 0x00, 
-  0x00, 0x03, 0xff, 0xc1, 0xff, 0xff, 0xe0, 0x00, 
-  0x00, 0x03, 0xff, 0x80, 0xff, 0xff, 0xe0, 0x00, 
-  0x00, 0x01, 0xff, 0x80, 0x7f, 0xff, 0xf0, 0x00, 
-  0x00, 0x01, 0xff, 0x80, 0x1f, 0xff, 0xf8, 0x00, 
-  0x00, 0x01, 0xff, 0x80, 0x0f, 0xff, 0xf8, 0x00, 
-  0x00, 0x01, 0xff, 0x00, 0x07, 0xff, 0xf8, 0x00, 
-  0x00, 0x01, 0xff, 0x00, 0x03, 0xff, 0xfc, 0x00, 
-  0x00, 0x00, 0xff, 0x00, 0x01, 0xff, 0xfc, 0x00, 
-  0x00, 0x00, 0xfe, 0x00, 0x01, 0xff, 0xfc, 0x00, 
-  0x00, 0x00, 0xfe, 0x00, 0x00, 0xff, 0xfc, 0x00, 
-  0x00, 0x00, 0xfe, 0x00, 0x00, 0x7f, 0xfc, 0x00, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x7f, 0xfc, 0x00, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x3f, 0xfc, 0x00, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x3f, 0xfc, 0x00, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x3f, 0xfc, 0x00, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x1f, 0xfc, 0x00, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x1f, 0xfc, 0x00, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x1f, 0xfc, 0x00, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x1f, 0xfc, 0x00, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x1f, 0xfc, 0x00, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x1f, 0xfc, 0x00, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x1f, 0xfc, 0x00, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x1f, 0xfc, 0x00, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x1f, 0xfc, 0x00, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x1f, 0xfc, 0x00, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x1f, 0xfc, 0x00, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x1f, 0xfc, 0x00, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x1f, 0xfc, 0x00, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x1f, 0xfc, 0x00, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x1f, 0xfc, 0x00, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x1f, 0xfc, 0x00, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x1f, 0xfc, 0x00, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x1f, 0xfc, 0x00, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x1f, 0xfc, 0x00, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x1f, 0xfc, 0x00, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x1f, 0xfc, 0x00, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x1f, 0xfc, 0x00, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x1f, 0xfc, 0x00, 
-};
-
-const lv_img_dsc_t continue_slight_left = {
-      {
-        LV_IMG_CF_INDEXED_1BIT,
-        0,
-        0,
-        64,
-        64
-    },
-    520,
-continue_slight_left_map,
-};
diff --git a/src/displayapp/icons/navigation/continue-slight-left.png b/src/displayapp/icons/navigation/continue-slight-left.png
deleted file mode 100644
index 31b13c95..00000000
--- a/src/displayapp/icons/navigation/continue-slight-left.png
+++ /dev/null
diff --git a/src/displayapp/icons/navigation/continue-slight-right-white.svg b/src/displayapp/icons/navigation/continue-slight-right-white.svg
deleted file mode 100644
index 46090067..00000000
--- a/src/displayapp/icons/navigation/continue-slight-right-white.svg
+++ /dev/null
@@ -1,4 +0,0 @@
-<svg id="WORKING_ICONS" data-name="WORKING ICONS" xmlns="http://www.w3.org/2000/svg" width="20" height="20" viewBox="0 0 20 20">
-  <title>direction</title>
-  <path fill="#ffffff" d="M7.35395,8.24854L9.81141,6.17468a0.3576,0.3576,0,0,0-.07019-0.6571L6.7923,4.16742a0.38658,0.38658,0,0,1,.20294-0.71777L15,3l-1.58044,7.86a0.38663,0.38663,0,0,1-.73938.09912L11.762,7.84851a0.35758,0.35758,0,0,0-.6405-0.16266L8.67328,9.75146a5.21819,5.21819,0,0,0-1.665,4.144l0.0047,3.60767A0.49614,0.49614,0,0,1,6.51679,18H5.51026a0.49621,0.49621,0,0,1-.49615-0.49622V14.043A7.25157,7.25157,0,0,1,7.35395,8.24854Z"/>
-</svg>
diff --git a/src/displayapp/icons/navigation/continue-slight-right.c b/src/displayapp/icons/navigation/continue-slight-right.c
deleted file mode 100644
index a352c961..00000000
--- a/src/displayapp/icons/navigation/continue-slight-right.c
+++ /dev/null
@@ -1,96 +0,0 @@
-#if defined(LV_LVGL_H_INCLUDE_SIMPLE)
-#include "lvgl.h"
-#else
-#include "lvgl/lvgl.h"
-#endif
-
-
-#ifndef LV_ATTRIBUTE_MEM_ALIGN
-#define LV_ATTRIBUTE_MEM_ALIGN
-#endif
-
-#ifndef LV_ATTRIBUTE_IMG_CONTINUE_SLIGHT_RIGHT
-#define LV_ATTRIBUTE_IMG_CONTINUE_SLIGHT_RIGHT
-#endif
-
-const LV_ATTRIBUTE_MEM_ALIGN LV_ATTRIBUTE_LARGE_CONST LV_ATTRIBUTE_IMG_CONTINUE_SLIGHT_RIGHT uint8_t continue_slight_right_map[] = {
-  0x04, 0x02, 0x04, 0xff, 	/*Color of index 0*/
-  0xfc, 0xfe, 0xfc, 0xff, 	/*Color of index 1*/
-
-  0x00, 0x00, 0x7f, 0xff, 0xff, 0xff, 0xfc, 0x00, 
-  0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xfc, 0x00, 
-  0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xfc, 0x00, 
-  0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xfc, 0x00, 
-  0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xfc, 0x00, 
-  0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xfc, 0x00, 
-  0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xfc, 0x00, 
-  0x00, 0x00, 0x3f, 0xff, 0xff, 0xff, 0xfc, 0x00, 
-  0x00, 0x00, 0x0f, 0xff, 0xff, 0xff, 0xfc, 0x00, 
-  0x00, 0x00, 0x03, 0xff, 0xff, 0xff, 0xfc, 0x00, 
-  0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xfc, 0x00, 
-  0x00, 0x00, 0x00, 0x1f, 0xff, 0xff, 0xfc, 0x00, 
-  0x00, 0x00, 0x00, 0x07, 0xff, 0xff, 0xfc, 0x00, 
-  0x00, 0x00, 0x00, 0x1f, 0xff, 0xff, 0xf8, 0x00, 
-  0x00, 0x00, 0x00, 0x1f, 0xff, 0xff, 0xf8, 0x00, 
-  0x00, 0x00, 0x00, 0x7f, 0xff, 0xff, 0xf8, 0x00, 
-  0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xf8, 0x00, 
-  0x00, 0x00, 0x01, 0xff, 0xff, 0xff, 0xf8, 0x00, 
-  0x00, 0x00, 0x03, 0xff, 0xff, 0xff, 0xf0, 0x00, 
-  0x00, 0x00, 0x0f, 0xff, 0xff, 0xff, 0xf0, 0x00, 
-  0x00, 0x00, 0x1f, 0xff, 0xff, 0xff, 0xf0, 0x00, 
-  0x00, 0x00, 0x3f, 0xff, 0xff, 0xff, 0xf0, 0x00, 
-  0x00, 0x00, 0x7f, 0xff, 0xff, 0xff, 0xf0, 0x00, 
-  0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xe0, 0x00, 
-  0x00, 0x00, 0xff, 0xff, 0xf1, 0xff, 0xe0, 0x00, 
-  0x00, 0x01, 0xff, 0xff, 0xe1, 0xff, 0xe0, 0x00, 
-  0x00, 0x03, 0xff, 0xff, 0xc1, 0xff, 0xe0, 0x00, 
-  0x00, 0x03, 0xff, 0xff, 0x80, 0xff, 0xe0, 0x00, 
-  0x00, 0x07, 0xff, 0xff, 0x00, 0xff, 0xc0, 0x00, 
-  0x00, 0x0f, 0xff, 0xfc, 0x00, 0xff, 0xc0, 0x00, 
-  0x00, 0x0f, 0xff, 0xf8, 0x00, 0xff, 0xc0, 0x00, 
-  0x00, 0x0f, 0xff, 0xf0, 0x00, 0x7f, 0xc0, 0x00, 
-  0x00, 0x1f, 0xff, 0xe0, 0x00, 0x7f, 0xc0, 0x00, 
-  0x00, 0x1f, 0xff, 0xc0, 0x00, 0x7f, 0x80, 0x00, 
-  0x00, 0x1f, 0xff, 0xc0, 0x00, 0x3f, 0x80, 0x00, 
-  0x00, 0x1f, 0xff, 0x80, 0x00, 0x3f, 0x80, 0x00, 
-  0x00, 0x1f, 0xff, 0x00, 0x00, 0x3f, 0x80, 0x00, 
-  0x00, 0x1f, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x00, 0x1f, 0xfe, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x00, 0x1f, 0xfe, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x00, 0x1f, 0xfe, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x00, 0x1f, 0xfc, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x00, 0x1f, 0xfc, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x00, 0x1f, 0xfc, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x00, 0x1f, 0xfc, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x00, 0x1f, 0xfc, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x00, 0x1f, 0xfc, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x00, 0x1f, 0xfc, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x00, 0x1f, 0xfc, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x00, 0x1f, 0xfc, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x00, 0x1f, 0xfc, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x00, 0x1f, 0xfc, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x00, 0x1f, 0xfc, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x00, 0x1f, 0xfc, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x00, 0x1f, 0xfc, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x00, 0x1f, 0xfc, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x00, 0x1f, 0xfc, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x00, 0x1f, 0xfc, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x00, 0x1f, 0xfc, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x00, 0x1f, 0xfc, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x00, 0x1f, 0xfc, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x00, 0x1f, 0xfc, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x00, 0x1f, 0xfc, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x00, 0x1f, 0xfc, 0x00, 0x00, 0x00, 0x00, 0x00, 
-};
-
-const lv_img_dsc_t continue_slight_right = {
-      {
-        LV_IMG_CF_INDEXED_1BIT,
-        0,
-        0,
-        64,
-        64
-    },
-    520,
-continue_slight_right_map,
-};
diff --git a/src/displayapp/icons/navigation/continue-slight-right.png b/src/displayapp/icons/navigation/continue-slight-right.png
deleted file mode 100644
index 499fae90..00000000
--- a/src/displayapp/icons/navigation/continue-slight-right.png
+++ /dev/null
diff --git a/src/displayapp/icons/navigation/continue-straight-white.svg b/src/displayapp/icons/navigation/continue-straight-white.svg
deleted file mode 100644
index 08531119..00000000
--- a/src/displayapp/icons/navigation/continue-straight-white.svg
+++ /dev/null
@@ -1,4 +0,0 @@
-<svg id="WORKING_ICONS" data-name="WORKING ICONS" xmlns="http://www.w3.org/2000/svg" width="20" height="20" viewBox="0 0 20 20">
-  <title>direction</title>
-  <path fill="#ffffff" d="M14.50342,8.96637L11.55157,7.62262A0.35755,0.35755,0,0,0,11.00916,8v9.49652A0.50346,0.50346,0,0,1,10.50568,18h-0.993a0.50346,0.50346,0,0,1-.50348-0.50348V8a0.35756,0.35756,0,0,0-.54242-0.37738L5.51489,8.96637a0.38659,0.38659,0,0,1-.40942-0.62354L10.00916,2l4.90369,6.34283A0.3866,0.3866,0,0,1,14.50342,8.96637Z"/>
-</svg>
diff --git a/src/displayapp/icons/navigation/continue-straight.c b/src/displayapp/icons/navigation/continue-straight.c
deleted file mode 100644
index 0c13621b..00000000
--- a/src/displayapp/icons/navigation/continue-straight.c
+++ /dev/null
@@ -1,96 +0,0 @@
-#if defined(LV_LVGL_H_INCLUDE_SIMPLE)
-#include "lvgl.h"
-#else
-#include "lvgl/lvgl.h"
-#endif
-
-
-#ifndef LV_ATTRIBUTE_MEM_ALIGN
-#define LV_ATTRIBUTE_MEM_ALIGN
-#endif
-
-#ifndef LV_ATTRIBUTE_IMG_CONTINUE_STRAIGHT
-#define LV_ATTRIBUTE_IMG_CONTINUE_STRAIGHT
-#endif
-
-const LV_ATTRIBUTE_MEM_ALIGN LV_ATTRIBUTE_LARGE_CONST LV_ATTRIBUTE_IMG_CONTINUE_STRAIGHT uint8_t continue_straight_map[] = {
-  0x04, 0x02, 0x04, 0xff, 	/*Color of index 0*/
-  0xfc, 0xfe, 0xfc, 0xff, 	/*Color of index 1*/
-
-  0x00, 0x00, 0x00, 0x0f, 0xf0, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x1f, 0xf8, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x1f, 0xf8, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x3f, 0xfc, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x7f, 0xfe, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0xff, 0xff, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x01, 0xff, 0xff, 0x80, 0x00, 0x00, 
-  0x00, 0x00, 0x01, 0xff, 0xff, 0x80, 0x00, 0x00, 
-  0x00, 0x00, 0x03, 0xff, 0xff, 0xc0, 0x00, 0x00, 
-  0x00, 0x00, 0x07, 0xff, 0xff, 0xe0, 0x00, 0x00, 
-  0x00, 0x00, 0x07, 0xff, 0xff, 0xf0, 0x00, 0x00, 
-  0x00, 0x00, 0x0f, 0xff, 0xff, 0xf0, 0x00, 0x00, 
-  0x00, 0x00, 0x1f, 0xff, 0xff, 0xf8, 0x00, 0x00, 
-  0x00, 0x00, 0x3f, 0xff, 0xff, 0xfc, 0x00, 0x00, 
-  0x00, 0x00, 0x7f, 0xff, 0xff, 0xfe, 0x00, 0x00, 
-  0x00, 0x00, 0x7f, 0xff, 0xff, 0xfe, 0x00, 0x00, 
-  0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 
-  0x00, 0x01, 0xff, 0xff, 0xff, 0xff, 0x80, 0x00, 
-  0x00, 0x03, 0xff, 0xff, 0xff, 0xff, 0xc0, 0x00, 
-  0x00, 0x03, 0xff, 0xff, 0xff, 0xff, 0xc0, 0x00, 
-  0x00, 0x07, 0xff, 0xff, 0xff, 0xff, 0xe0, 0x00, 
-  0x00, 0x0f, 0xff, 0xff, 0xff, 0xff, 0xf0, 0x00, 
-  0x00, 0x0f, 0xff, 0xff, 0xff, 0xff, 0xf0, 0x00, 
-  0x00, 0x0f, 0xff, 0xff, 0xff, 0xff, 0xf0, 0x00, 
-  0x00, 0x0f, 0xff, 0xff, 0xff, 0xff, 0xf0, 0x00, 
-  0x00, 0x0f, 0xff, 0xff, 0xff, 0xff, 0xf0, 0x00, 
-  0x00, 0x0f, 0xfe, 0x3f, 0xfc, 0x7f, 0xf0, 0x00, 
-  0x00, 0x0f, 0xf8, 0x3f, 0xfc, 0x1f, 0xf0, 0x00, 
-  0x00, 0x0f, 0xe0, 0x3f, 0xfc, 0x07, 0xf0, 0x00, 
-  0x00, 0x0f, 0x80, 0x3f, 0xfc, 0x01, 0xf0, 0x00, 
-  0x00, 0x00, 0x00, 0x3f, 0xfc, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x3f, 0xfc, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x3f, 0xfc, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x3f, 0xfc, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x3f, 0xfc, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x3f, 0xfc, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x3f, 0xfc, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x3f, 0xfc, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x3f, 0xfc, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x3f, 0xfc, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x3f, 0xfc, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x3f, 0xfc, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x3f, 0xfc, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x3f, 0xfc, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x3f, 0xfc, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x3f, 0xfc, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x3f, 0xfc, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x3f, 0xfc, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x3f, 0xfc, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x3f, 0xfc, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x3f, 0xfc, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x3f, 0xfc, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x3f, 0xfc, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x3f, 0xfc, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x3f, 0xfc, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x3f, 0xfc, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x3f, 0xfc, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x3f, 0xfc, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x3f, 0xfc, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x3f, 0xfc, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x3f, 0xfc, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x3f, 0xfc, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x3f, 0xfc, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x3f, 0xfc, 0x00, 0x00, 0x00, 
-};
-
-const lv_img_dsc_t continue_straight = {
-      {
-        LV_IMG_CF_INDEXED_1BIT,
-        0,
-        0,
-        64,
-        64
-    },
-    520,
-continue_straight_map,
-};
diff --git a/src/displayapp/icons/navigation/continue-straight.png b/src/displayapp/icons/navigation/continue-straight.png
deleted file mode 100644
index 98b444c3..00000000
--- a/src/displayapp/icons/navigation/continue-straight.png
+++ /dev/null
diff --git a/src/displayapp/icons/navigation/continue-uturn-white.svg b/src/displayapp/icons/navigation/continue-uturn-white.svg
deleted file mode 100644
index b2c8a120..00000000
--- a/src/displayapp/icons/navigation/continue-uturn-white.svg
+++ /dev/null
@@ -1,4 +0,0 @@
-<svg id="WORKING_ICONS" data-name="WORKING ICONS" xmlns="http://www.w3.org/2000/svg" width="20" height="20" viewBox="0 0 20 20">
-  <title>direction</title>
-  <path fill="#ffffff" d="M17.00909,8v9.49652A0.50346,0.50346,0,0,1,16.50562,18h-0.993a0.50346,0.50346,0,0,1-.50348-0.50348V8a3.5,3.5,0,1,0-7,0v4H8a0.35757,0.35757,0,0,0,.54242.37738l2.95184-1.34375a0.3866,0.3866,0,0,1,.40942.62354L7,18,2.09625,11.65717a0.3866,0.3866,0,0,1,.40942-0.62354l2.95184,1.34375A0.3576,0.3576,0,0,0,6,12H6.00909V8A5.5,5.5,0,1,1,17.00909,8Z"/>
-</svg>
diff --git a/src/displayapp/icons/navigation/continue-uturn.c b/src/displayapp/icons/navigation/continue-uturn.c
deleted file mode 100644
index ffd8ffbb..00000000
--- a/src/displayapp/icons/navigation/continue-uturn.c
+++ /dev/null
@@ -1,96 +0,0 @@
-#if defined(LV_LVGL_H_INCLUDE_SIMPLE)
-#include "lvgl.h"
-#else
-#include "lvgl/lvgl.h"
-#endif
-
-
-#ifndef LV_ATTRIBUTE_MEM_ALIGN
-#define LV_ATTRIBUTE_MEM_ALIGN
-#endif
-
-#ifndef LV_ATTRIBUTE_IMG_CONTINUE_UTURN
-#define LV_ATTRIBUTE_IMG_CONTINUE_UTURN
-#endif
-
-const LV_ATTRIBUTE_MEM_ALIGN LV_ATTRIBUTE_LARGE_CONST LV_ATTRIBUTE_IMG_CONTINUE_UTURN uint8_t continue_uturn_map[] = {
-  0x04, 0x02, 0x04, 0xff, 	/*Color of index 0*/
-  0xfc, 0xfe, 0xfc, 0xff, 	/*Color of index 1*/
-
-  0x00, 0x00, 0x00, 0x0f, 0xff, 0xff, 0xf8, 0x00, 
-  0x00, 0x00, 0x00, 0x3f, 0xff, 0xff, 0xfc, 0x00, 
-  0x00, 0x00, 0x00, 0x7f, 0xff, 0xff, 0xff, 0x00, 
-  0x00, 0x00, 0x01, 0xff, 0xff, 0xff, 0xff, 0x80, 
-  0x00, 0x00, 0x03, 0xff, 0xff, 0xff, 0xff, 0xc0, 
-  0x00, 0x00, 0x07, 0xff, 0xff, 0xff, 0xff, 0xe0, 
-  0x00, 0x00, 0x07, 0xff, 0xff, 0xff, 0xff, 0xf0, 
-  0x00, 0x00, 0x0f, 0xff, 0xff, 0xff, 0xff, 0xf8, 
-  0x00, 0x00, 0x1f, 0xff, 0xff, 0xff, 0xff, 0xf8, 
-  0x00, 0x00, 0x1f, 0xff, 0xff, 0xff, 0xff, 0xfc, 
-  0x00, 0x00, 0x3f, 0xff, 0xff, 0x7f, 0xff, 0xfe, 
-  0x00, 0x00, 0x3f, 0xff, 0xf8, 0x0f, 0xff, 0xfe, 
-  0x00, 0x00, 0x7f, 0xff, 0xe0, 0x03, 0xff, 0xfe, 
-  0x00, 0x00, 0x7f, 0xff, 0x80, 0x01, 0xff, 0xfe, 
-  0x00, 0x00, 0x7f, 0xff, 0x00, 0x00, 0xff, 0xfe, 
-  0x00, 0x00, 0x7f, 0xfe, 0x00, 0x00, 0x7f, 0xfe, 
-  0x00, 0x00, 0xff, 0xfc, 0x00, 0x00, 0x3f, 0xfe, 
-  0x00, 0x00, 0xff, 0xfc, 0x00, 0x00, 0x1f, 0xfe, 
-  0x00, 0x00, 0xff, 0xf8, 0x00, 0x00, 0x1f, 0xfe, 
-  0x00, 0x00, 0xff, 0xf8, 0x00, 0x00, 0x0f, 0xfe, 
-  0x00, 0x00, 0xff, 0xf8, 0x00, 0x00, 0x0f, 0xfe, 
-  0x00, 0x00, 0xff, 0xf0, 0x00, 0x00, 0x0f, 0xfe, 
-  0x00, 0x00, 0xff, 0xf0, 0x00, 0x00, 0x07, 0xfe, 
-  0x00, 0x00, 0xff, 0xf0, 0x00, 0x00, 0x07, 0xfe, 
-  0x00, 0x00, 0xff, 0xf0, 0x00, 0x00, 0x07, 0xfe, 
-  0x00, 0x00, 0xff, 0xf0, 0x00, 0x00, 0x07, 0xfe, 
-  0x00, 0x00, 0xff, 0xf0, 0x00, 0x00, 0x07, 0xfe, 
-  0x00, 0x00, 0xff, 0xf0, 0x00, 0x00, 0x07, 0xfe, 
-  0x00, 0x00, 0xff, 0xf0, 0x00, 0x00, 0x07, 0xfe, 
-  0x00, 0x00, 0xff, 0xf0, 0x00, 0x00, 0x07, 0xfe, 
-  0x00, 0x00, 0xff, 0xf0, 0x00, 0x00, 0x07, 0xfe, 
-  0x00, 0x00, 0xff, 0xf0, 0x00, 0x00, 0x07, 0xfe, 
-  0x00, 0x00, 0xff, 0xf0, 0x00, 0x00, 0x07, 0xfe, 
-  0x7c, 0x00, 0xff, 0xf0, 0x03, 0xf0, 0x07, 0xfe, 
-  0x7f, 0x00, 0xff, 0xf0, 0x1f, 0xf0, 0x07, 0xfe, 
-  0x7f, 0xc0, 0xff, 0xf0, 0x7f, 0xf0, 0x07, 0xfe, 
-  0x7f, 0xf8, 0xff, 0xf1, 0xff, 0xf0, 0x07, 0xfe, 
-  0x7f, 0xfe, 0xff, 0xf7, 0xff, 0xf0, 0x07, 0xfe, 
-  0x7f, 0xff, 0xff, 0xff, 0xff, 0xf0, 0x07, 0xfe, 
-  0x7f, 0xff, 0xff, 0xff, 0xff, 0xf0, 0x07, 0xfe, 
-  0x7f, 0xff, 0xff, 0xff, 0xff, 0xe0, 0x07, 0xfe, 
-  0x7f, 0xff, 0xff, 0xff, 0xff, 0xe0, 0x07, 0xfe, 
-  0x3f, 0xff, 0xff, 0xff, 0xff, 0xc0, 0x07, 0xfe, 
-  0x3f, 0xff, 0xff, 0xff, 0xff, 0x80, 0x07, 0xfe, 
-  0x1f, 0xff, 0xff, 0xff, 0xff, 0x00, 0x07, 0xfe, 
-  0x0f, 0xff, 0xff, 0xff, 0xff, 0x00, 0x07, 0xfe, 
-  0x07, 0xff, 0xff, 0xff, 0xfe, 0x00, 0x07, 0xfe, 
-  0x03, 0xff, 0xff, 0xff, 0xfc, 0x00, 0x07, 0xfe, 
-  0x03, 0xff, 0xff, 0xff, 0xf8, 0x00, 0x07, 0xfe, 
-  0x01, 0xff, 0xff, 0xff, 0xf8, 0x00, 0x07, 0xfe, 
-  0x00, 0xff, 0xff, 0xff, 0xf0, 0x00, 0x07, 0xfe, 
-  0x00, 0x7f, 0xff, 0xff, 0xe0, 0x00, 0x07, 0xfe, 
-  0x00, 0x7f, 0xff, 0xff, 0xc0, 0x00, 0x07, 0xfe, 
-  0x00, 0x3f, 0xff, 0xff, 0x80, 0x00, 0x07, 0xfe, 
-  0x00, 0x1f, 0xff, 0xff, 0x80, 0x00, 0x07, 0xfe, 
-  0x00, 0x0f, 0xff, 0xff, 0x00, 0x00, 0x07, 0xfe, 
-  0x00, 0x07, 0xff, 0xfe, 0x00, 0x00, 0x07, 0xfe, 
-  0x00, 0x07, 0xff, 0xfc, 0x00, 0x00, 0x07, 0xfe, 
-  0x00, 0x03, 0xff, 0xfc, 0x00, 0x00, 0x07, 0xfe, 
-  0x00, 0x01, 0xff, 0xf8, 0x00, 0x00, 0x07, 0xfe, 
-  0x00, 0x00, 0xff, 0xf0, 0x00, 0x00, 0x07, 0xfe, 
-  0x00, 0x00, 0xff, 0xe0, 0x00, 0x00, 0x07, 0xfe, 
-  0x00, 0x00, 0x7f, 0xc0, 0x00, 0x00, 0x07, 0xfe, 
-  0x00, 0x00, 0x3f, 0xc0, 0x00, 0x00, 0x07, 0xfe, 
-};
-
-const lv_img_dsc_t continue_uturn = {
-      {
-        LV_IMG_CF_INDEXED_1BIT,
-        0,
-        0,
-        64,
-        64
-    },
-    520,
-continue_uturn_map,
-};
diff --git a/src/displayapp/icons/navigation/continue-uturn.png b/src/displayapp/icons/navigation/continue-uturn.png
deleted file mode 100644
index c5adcec3..00000000
--- a/src/displayapp/icons/navigation/continue-uturn.png
+++ /dev/null
diff --git a/src/displayapp/icons/navigation/continue-white.svg b/src/displayapp/icons/navigation/continue-white.svg
deleted file mode 100644
index 08531119..00000000
--- a/src/displayapp/icons/navigation/continue-white.svg
+++ /dev/null
@@ -1,4 +0,0 @@
-<svg id="WORKING_ICONS" data-name="WORKING ICONS" xmlns="http://www.w3.org/2000/svg" width="20" height="20" viewBox="0 0 20 20">
-  <title>direction</title>
-  <path fill="#ffffff" d="M14.50342,8.96637L11.55157,7.62262A0.35755,0.35755,0,0,0,11.00916,8v9.49652A0.50346,0.50346,0,0,1,10.50568,18h-0.993a0.50346,0.50346,0,0,1-.50348-0.50348V8a0.35756,0.35756,0,0,0-.54242-0.37738L5.51489,8.96637a0.38659,0.38659,0,0,1-.40942-0.62354L10.00916,2l4.90369,6.34283A0.3866,0.3866,0,0,1,14.50342,8.96637Z"/>
-</svg>
diff --git a/src/displayapp/icons/navigation/continue.c b/src/displayapp/icons/navigation/continue.c
deleted file mode 100644
index 7412cc9c..00000000
--- a/src/displayapp/icons/navigation/continue.c
+++ /dev/null
@@ -1,96 +0,0 @@
-#if defined(LV_LVGL_H_INCLUDE_SIMPLE)
-#include "lvgl.h"
-#else
-#include "lvgl/lvgl.h"
-#endif
-
-
-#ifndef LV_ATTRIBUTE_MEM_ALIGN
-#define LV_ATTRIBUTE_MEM_ALIGN
-#endif
-
-#ifndef LV_ATTRIBUTE_IMG_CONTINUE
-#define LV_ATTRIBUTE_IMG_CONTINUE
-#endif
-
-const LV_ATTRIBUTE_MEM_ALIGN LV_ATTRIBUTE_LARGE_CONST LV_ATTRIBUTE_IMG_CONTINUE uint8_t continue_map[] = {
-  0x04, 0x02, 0x04, 0xff, 	/*Color of index 0*/
-  0xfc, 0xfe, 0xfc, 0xff, 	/*Color of index 1*/
-
-  0x00, 0x00, 0x00, 0x0f, 0xf0, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x1f, 0xf8, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x1f, 0xf8, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x3f, 0xfc, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x7f, 0xfe, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0xff, 0xff, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x01, 0xff, 0xff, 0x80, 0x00, 0x00,
-  0x00, 0x00, 0x01, 0xff, 0xff, 0x80, 0x00, 0x00,
-  0x00, 0x00, 0x03, 0xff, 0xff, 0xc0, 0x00, 0x00,
-  0x00, 0x00, 0x07, 0xff, 0xff, 0xe0, 0x00, 0x00,
-  0x00, 0x00, 0x07, 0xff, 0xff, 0xf0, 0x00, 0x00,
-  0x00, 0x00, 0x0f, 0xff, 0xff, 0xf0, 0x00, 0x00,
-  0x00, 0x00, 0x1f, 0xff, 0xff, 0xf8, 0x00, 0x00,
-  0x00, 0x00, 0x3f, 0xff, 0xff, 0xfc, 0x00, 0x00,
-  0x00, 0x00, 0x7f, 0xff, 0xff, 0xfe, 0x00, 0x00,
-  0x00, 0x00, 0x7f, 0xff, 0xff, 0xfe, 0x00, 0x00,
-  0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00,
-  0x00, 0x01, 0xff, 0xff, 0xff, 0xff, 0x80, 0x00,
-  0x00, 0x03, 0xff, 0xff, 0xff, 0xff, 0xc0, 0x00,
-  0x00, 0x03, 0xff, 0xff, 0xff, 0xff, 0xc0, 0x00,
-  0x00, 0x07, 0xff, 0xff, 0xff, 0xff, 0xe0, 0x00,
-  0x00, 0x0f, 0xff, 0xff, 0xff, 0xff, 0xf0, 0x00,
-  0x00, 0x0f, 0xff, 0xff, 0xff, 0xff, 0xf0, 0x00,
-  0x00, 0x0f, 0xff, 0xff, 0xff, 0xff, 0xf0, 0x00,
-  0x00, 0x0f, 0xff, 0xff, 0xff, 0xff, 0xf0, 0x00,
-  0x00, 0x0f, 0xff, 0xff, 0xff, 0xff, 0xf0, 0x00,
-  0x00, 0x0f, 0xfe, 0x3f, 0xfc, 0x7f, 0xf0, 0x00,
-  0x00, 0x0f, 0xf8, 0x3f, 0xfc, 0x1f, 0xf0, 0x00,
-  0x00, 0x0f, 0xe0, 0x3f, 0xfc, 0x07, 0xf0, 0x00,
-  0x00, 0x0f, 0x80, 0x3f, 0xfc, 0x01, 0xf0, 0x00,
-  0x00, 0x00, 0x00, 0x3f, 0xfc, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x3f, 0xfc, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x3f, 0xfc, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x3f, 0xfc, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x3f, 0xfc, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x3f, 0xfc, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x3f, 0xfc, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x3f, 0xfc, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x3f, 0xfc, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x3f, 0xfc, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x3f, 0xfc, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x3f, 0xfc, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x3f, 0xfc, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x3f, 0xfc, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x3f, 0xfc, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x3f, 0xfc, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x3f, 0xfc, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x3f, 0xfc, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x3f, 0xfc, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x3f, 0xfc, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x3f, 0xfc, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x3f, 0xfc, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x3f, 0xfc, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x3f, 0xfc, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x3f, 0xfc, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x3f, 0xfc, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x3f, 0xfc, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x3f, 0xfc, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x3f, 0xfc, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x3f, 0xfc, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x3f, 0xfc, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x3f, 0xfc, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x3f, 0xfc, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x3f, 0xfc, 0x00, 0x00, 0x00,
-};
-
-const lv_img_dsc_t continue_icon = {
-      {
-        LV_IMG_CF_INDEXED_1BIT,
-        0,
-        0,
-        64,
-        64
-    },
-    520,
-continue_map,
-};
diff --git a/src/displayapp/icons/navigation/continue.png b/src/displayapp/icons/navigation/continue.png
deleted file mode 100644
index 6ebd48ec..00000000
--- a/src/displayapp/icons/navigation/continue.png
+++ /dev/null
diff --git a/src/displayapp/icons/navigation/continue.svg b/src/displayapp/icons/navigation/continue.svg
new file mode 100644
index 00000000..6d3d2ae1
--- /dev/null
+++ b/src/displayapp/icons/navigation/continue.svg
@@ -0,0 +1,58 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   inkscape:version="1.0 (4035a4fb49, 2020-05-01)"
+   sodipodi:docname="continue.svg"
+   version="1.1"
+   viewBox="0 0 20 20"
+   height="20"
+   width="20"
+   data-name="WORKING ICONS"
+   id="WORKING_ICONS">
+  <metadata
+     id="metadata11">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs9" />
+  <sodipodi:namedview
+     inkscape:current-layer="WORKING_ICONS"
+     inkscape:window-maximized="1"
+     inkscape:window-y="22"
+     inkscape:window-x="-8"
+     inkscape:cy="16.43079"
+     inkscape:cx="14.864151"
+     inkscape:zoom="21.5"
+     showgrid="false"
+     id="namedview7"
+     inkscape:window-height="1027"
+     inkscape:window-width="1920"
+     inkscape:pageshadow="2"
+     inkscape:pageopacity="0"
+     guidetolerance="10"
+     gridtolerance="10"
+     objecttolerance="10"
+     borderopacity="1"
+     bordercolor="#666666"
+     pagecolor="#ffffff" />
+  <title
+     id="title2">direction</title>
+  <path
+     style="stroke-width:1.25"
+     id="path4"
+     d="M 15.617836,8.707962 11.928024,7.028275 A 0.4469375,0.4469375 0 0 0 11.250011,7.5 V 19.37065 A 0.629325,0.629325 0 0 1 10.620661,20 H 9.3794106 a 0.629325,0.629325 0 0 1 -0.62935,-0.62935 V 7.5 A 0.44695,0.44695 0 0 0 8.0720358,7.028275 L 4.3821733,8.707962 A 0.4832375,0.4832375 0 0 1 3.8703983,7.9285375 L 10.000011,0 16.129624,7.9285375 A 0.48325,0.48325 0 0 1 15.617836,8.707962 Z"
+     fill="#000000" />
+</svg>
diff --git a/src/displayapp/icons/navigation/continue_left.svg b/src/displayapp/icons/navigation/continue_left.svg
new file mode 100644
index 00000000..47eef8bc
--- /dev/null
+++ b/src/displayapp/icons/navigation/continue_left.svg
@@ -0,0 +1,58 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   inkscape:version="1.0 (4035a4fb49, 2020-05-01)"
+   sodipodi:docname="continue_left.svg"
+   version="1.1"
+   viewBox="0 0 20 20"
+   height="20"
+   width="20"
+   data-name="WORKING ICONS"
+   id="WORKING_ICONS">
+  <metadata
+     id="metadata11">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs9" />
+  <sodipodi:namedview
+     inkscape:current-layer="WORKING_ICONS"
+     inkscape:window-maximized="1"
+     inkscape:window-y="22"
+     inkscape:window-x="-8"
+     inkscape:cy="12.051802"
+     inkscape:cx="9.084877"
+     inkscape:zoom="30.405592"
+     showgrid="false"
+     id="namedview7"
+     inkscape:window-height="1027"
+     inkscape:window-width="1920"
+     inkscape:pageshadow="2"
+     inkscape:pageopacity="0"
+     guidetolerance="10"
+     gridtolerance="10"
+     objecttolerance="10"
+     borderopacity="1"
+     bordercolor="#666666"
+     pagecolor="#ffffff" />
+  <title
+     id="title2">direction</title>
+  <path
+     style="stroke-width:1.24853"
+     id="path4"
+     d="m 11.243339,4.9925164 0.01373,0.00228 a 7.5663193,7.5663193 0 0 1 7.477437,7.5826126 v 4.925532 h -0.0039 l 0.0025,1.87675 a 0.61944488,0.61944488 0 0 1 -0.61952,0.620306 H 16.856998 A 0.61954476,0.61954476 0 0 1 16.237453,19.380458 V 12.577414 A 5.0663035,5.0663035 0 0 0 11.25736,7.491858 H 8.761827 A 0.44647376,0.44647376 0 0 0 8.2906573,8.1691592 L 9.9683672,11.854603 A 0.48266859,0.48266859 0 0 1 9.18986,12.365776 L 1.2654752,6.2661901 9.189885,0.12093333 a 0.48266859,0.48266859 0 0 1 0.7785072,0.5111725 L 8.2906573,4.3175744 A 0.4464363,0.4464363 0 0 0 8.761827,4.9948012 h 2.481512"
+     fill="#000000" />
+</svg>
diff --git a/src/displayapp/icons/navigation/continue_right.svg b/src/displayapp/icons/navigation/continue_right.svg
new file mode 100644
index 00000000..701c6a48
--- /dev/null
+++ b/src/displayapp/icons/navigation/continue_right.svg
@@ -0,0 +1,58 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   inkscape:version="1.0 (4035a4fb49, 2020-05-01)"
+   sodipodi:docname="continue_right.svg"
+   version="1.1"
+   viewBox="0 0 20 20"
+   height="20"
+   width="20"
+   data-name="WORKING ICONS"
+   id="WORKING_ICONS">
+  <metadata
+     id="metadata11">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs9" />
+  <sodipodi:namedview
+     inkscape:current-layer="WORKING_ICONS"
+     inkscape:window-maximized="1"
+     inkscape:window-y="22"
+     inkscape:window-x="-8"
+     inkscape:cy="12.793465"
+     inkscape:cx="10.886253"
+     inkscape:zoom="21.5"
+     showgrid="false"
+     id="namedview7"
+     inkscape:window-height="1027"
+     inkscape:window-width="1920"
+     inkscape:pageshadow="2"
+     inkscape:pageopacity="0"
+     guidetolerance="10"
+     gridtolerance="10"
+     objecttolerance="10"
+     borderopacity="1"
+     bordercolor="#666666"
+     pagecolor="#ffffff" />
+  <title
+     id="title2">direction</title>
+  <path
+     style="stroke-width:1.24853"
+     id="path4"
+     d="M 8.7426433,7.4918486 A 5.0663062,5.0663062 0 0 0 3.7625481,12.577407 v 6.803048 A 0.61954509,0.61954509 0 0 1 3.143003,20 H 1.886396 A 0.6194452,0.6194452 0 0 1 1.2669383,19.379693 l 0.00243,-1.876751 h -0.00388 v -4.925535 a 7.5663233,7.5663233 0 0 1 7.477442,-7.5826165 l 0.01373,-0.00228 v 0.00228 h 2.4815137 a 0.44643653,0.44643653 0 0 0 0.47117,-0.6772271 L 10.031633,0.63210537 a 0.48266885,0.48266885 0 0 1 0.778495,-0.5111853 L 18.73453,6.2661801 10.810116,12.365794 A 0.48266885,0.48266885 0 0 1 10.031608,11.854621 L 11.709319,8.169163 A 0.44647399,0.44647399 0 0 0 11.238149,7.4918611 H 8.7426393 Z"
+     fill="#000000" />
+</svg>
diff --git a/src/displayapp/icons/navigation/continue_slight_left.svg b/src/displayapp/icons/navigation/continue_slight_left.svg
new file mode 100644
index 00000000..7203f015
--- /dev/null
+++ b/src/displayapp/icons/navigation/continue_slight_left.svg
@@ -0,0 +1,58 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   inkscape:version="1.0 (4035a4fb49, 2020-05-01)"
+   sodipodi:docname="continue_slight_left.svg"
+   version="1.1"
+   viewBox="0 0 20 20"
+   height="20"
+   width="20"
+   data-name="WORKING ICONS"
+   id="WORKING_ICONS">
+  <metadata
+     id="metadata11">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs9" />
+  <sodipodi:namedview
+     inkscape:current-layer="WORKING_ICONS"
+     inkscape:window-maximized="1"
+     inkscape:window-y="22"
+     inkscape:window-x="-8"
+     inkscape:cy="22.774268"
+     inkscape:cx="16.936746"
+     inkscape:zoom="15.202796"
+     showgrid="false"
+     id="namedview7"
+     inkscape:window-height="1027"
+     inkscape:window-width="1920"
+     inkscape:pageshadow="2"
+     inkscape:pageopacity="0"
+     guidetolerance="10"
+     gridtolerance="10"
+     objecttolerance="10"
+     borderopacity="1"
+     bordercolor="#666666"
+     pagecolor="#ffffff" />
+  <title
+     id="title2">direction</title>
+  <path
+     style="stroke-width:1.33333"
+     id="path4"
+     d="m 16.648074,14.724 v 4.614427 A 0.66161333,0.66161333 0 0 1 15.986528,20 h -1.34204 a 0.66152,0.66152 0 0 1 -0.661534,-0.66244 l 0.0063,-4.810227 A 6.9575867,6.9575867 0 0 0 11.769221,9.002 L 8.5049277,6.2478 A 0.47677333,0.47677333 0 0 0 7.6509274,6.46468 l -1.22428,4.147467 A 0.51550667,0.51550667 0 0 1 5.440794,10.48 L 3.3335407,0 14.006554,0.5995333 A 0.51544,0.51544 0 0 1 14.277141,1.55656 l -3.931893,1.8002133 a 0.4768,0.4768 0 0 0 -0.09359,0.8761334 L 13.528274,6.99804 a 9.6687733,9.6687733 0 0 1 3.1198,7.72596 z"
+     fill="#000000" />
+</svg>
diff --git a/src/displayapp/icons/navigation/continue_slight_right.svg b/src/displayapp/icons/navigation/continue_slight_right.svg
new file mode 100644
index 00000000..8973971d
--- /dev/null
+++ b/src/displayapp/icons/navigation/continue_slight_right.svg
@@ -0,0 +1,58 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   inkscape:version="1.0 (4035a4fb49, 2020-05-01)"
+   sodipodi:docname="continue_slight_right.svg"
+   version="1.1"
+   viewBox="0 0 20 20"
+   height="20"
+   width="20"
+   data-name="WORKING ICONS"
+   id="WORKING_ICONS">
+  <metadata
+     id="metadata11">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs9" />
+  <sodipodi:namedview
+     inkscape:current-layer="WORKING_ICONS"
+     inkscape:window-maximized="1"
+     inkscape:window-y="22"
+     inkscape:window-x="-8"
+     inkscape:cy="14.169382"
+     inkscape:cx="9.932647"
+     inkscape:zoom="21.5"
+     showgrid="false"
+     id="namedview7"
+     inkscape:window-height="1027"
+     inkscape:window-width="1920"
+     inkscape:pageshadow="2"
+     inkscape:pageopacity="0"
+     guidetolerance="10"
+     gridtolerance="10"
+     objecttolerance="10"
+     borderopacity="1"
+     bordercolor="#666666"
+     pagecolor="#ffffff" />
+  <title
+     id="title2">direction</title>
+  <path
+     style="stroke-width:1.33333"
+     id="path4"
+     d="M 6.4717198,6.9980533 9.7483327,4.2329067 A 0.4768,0.4768 0 0 0 9.6547467,3.3567733 L 5.7228532,1.55656 A 0.51544,0.51544 0 0 1 5.9934398,0.5995333 L 16.666453,0 14.5592,10.48 a 0.51550667,0.51550667 0 0 1 -0.98584,0.13216 L 12.34912,6.46468 A 0.47677333,0.47677333 0 0 0 11.49512,6.2478 L 8.2308265,9.001947 a 6.9575867,6.9575867 0 0 0 -2.22,5.525333 l 0.00627,4.810227 A 0.66152,0.66152 0 0 1 5.3555065,20 h -1.34204 A 0.66161333,0.66161333 0 0 1 3.3519332,19.338373 V 14.724 A 9.66876,9.66876 0 0 1 6.4717198,6.9980533 Z"
+     fill="#000000" />
+</svg>
diff --git a/src/displayapp/icons/navigation/continue_straight.svg b/src/displayapp/icons/navigation/continue_straight.svg
new file mode 100644
index 00000000..d7b90b22
--- /dev/null
+++ b/src/displayapp/icons/navigation/continue_straight.svg
@@ -0,0 +1,58 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   inkscape:version="1.0 (4035a4fb49, 2020-05-01)"
+   sodipodi:docname="continue_straight.svg"
+   version="1.1"
+   viewBox="0 0 20 20"
+   height="20"
+   width="20"
+   data-name="WORKING ICONS"
+   id="WORKING_ICONS">
+  <metadata
+     id="metadata11">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs9" />
+  <sodipodi:namedview
+     inkscape:current-layer="WORKING_ICONS"
+     inkscape:window-maximized="1"
+     inkscape:window-y="22"
+     inkscape:window-x="-8"
+     inkscape:cy="11.493095"
+     inkscape:cx="9.9711014"
+     inkscape:zoom="30.405592"
+     showgrid="false"
+     id="namedview7"
+     inkscape:window-height="1027"
+     inkscape:window-width="1920"
+     inkscape:pageshadow="2"
+     inkscape:pageopacity="0"
+     guidetolerance="10"
+     gridtolerance="10"
+     objecttolerance="10"
+     borderopacity="1"
+     bordercolor="#666666"
+     pagecolor="#ffffff" />
+  <title
+     id="title2">direction</title>
+  <path
+     style="stroke-width:1.25"
+     id="path4"
+     d="M 15.617836,8.707962 11.928024,7.028275 A 0.4469375,0.4469375 0 0 0 11.250011,7.5 V 19.37065 A 0.629325,0.629325 0 0 1 10.620661,20 H 9.3794106 a 0.629325,0.629325 0 0 1 -0.62935,-0.62935 V 7.5 A 0.44695,0.44695 0 0 0 8.0720358,7.028275 L 4.3821733,8.707962 A 0.4832375,0.4832375 0 0 1 3.8703983,7.9285375 L 10.000011,0 16.129624,7.9285375 A 0.48325,0.48325 0 0 1 15.617836,8.707962 Z"
+     fill="#000000" />
+</svg>
diff --git a/src/displayapp/icons/navigation/continue_uturn.svg b/src/displayapp/icons/navigation/continue_uturn.svg
new file mode 100644
index 00000000..47267bc9
--- /dev/null
+++ b/src/displayapp/icons/navigation/continue_uturn.svg
@@ -0,0 +1,58 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   inkscape:version="1.0 (4035a4fb49, 2020-05-01)"
+   sodipodi:docname="continue_uturn.svg"
+   version="1.1"
+   viewBox="0 0 20 20"
+   height="20"
+   width="20"
+   data-name="WORKING ICONS"
+   id="WORKING_ICONS">
+  <metadata
+     id="metadata11">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs9" />
+  <sodipodi:namedview
+     inkscape:current-layer="WORKING_ICONS"
+     inkscape:window-maximized="1"
+     inkscape:window-y="22"
+     inkscape:window-x="-8"
+     inkscape:cy="11.022162"
+     inkscape:cx="6.3791168"
+     inkscape:zoom="15.202796"
+     showgrid="false"
+     id="namedview7"
+     inkscape:window-height="1027"
+     inkscape:window-width="1920"
+     inkscape:pageshadow="2"
+     inkscape:pageopacity="0"
+     guidetolerance="10"
+     gridtolerance="10"
+     objecttolerance="10"
+     borderopacity="1"
+     bordercolor="#666666"
+     pagecolor="#ffffff" />
+  <title
+     id="title2">direction</title>
+  <path
+     style="stroke-width:1.29032"
+     id="path4"
+     d="M 19.683663,7.0967743 V 19.350348 A 0.64962581,0.64962581 0 0 1 19.034024,20 h -1.28129 A 0.64962581,0.64962581 0 0 1 17.103082,19.350348 V 7.0967743 a 4.516129,4.516129 0 1 0 -9.032258,0 V 12.258065 H 8.059031 a 0.46138065,0.46138065 0 0 0 0.6998966,0.486941 l 3.8088254,-1.733871 a 0.49883871,0.49883871 0 0 1 0.528284,0.804568 L 6.7687079,20 0.44128852,11.815703 a 0.49883871,0.49883871 0 0 1 0.5282839,-0.804568 l 3.80882578,1.733871 a 0.46141935,0.46141935 0 0 0 0.6999871,-0.486941 h 0.011729 V 7.0967743 a 7.0967744,7.0967744 0 1 1 14.1935487,0 z"
+     fill="#000000" />
+</svg>
diff --git a/src/displayapp/icons/navigation/depart-left-white.svg b/src/displayapp/icons/navigation/depart-left-white.svg
deleted file mode 100644
index 935674e4..00000000
--- a/src/displayapp/icons/navigation/depart-left-white.svg
+++ /dev/null
@@ -1,4 +0,0 @@
-<svg id="WORKING_ICONS" data-name="WORKING ICONS" xmlns="http://www.w3.org/2000/svg" width="20" height="20" viewBox="0 0 20 20">
-  <title>direction</title>
-  <path fill="#ffffff" d="M15,19a2,2,0,1,1,2-2A2,2,0,0,1,15,19ZM10.00293,8.03668a4.05782,4.05782,0,0,1,3.98877,4.07324H14v1.37775A0.51232,0.51232,0,0,0,14.51233,14h0.97534A0.51232,0.51232,0,0,0,16,13.48767V12H15.98615a6.05607,6.05607,0,0,0-5.9834-5.96332l-0.011-.00183L9.99182,6.05493H9V6.04584a0.35757,0.35757,0,0,1-.37738-0.54242L9.96637,2.55157a0.38659,0.38659,0,0,0-.62354-0.40942L3,7.04584l6.34283,4.90369a0.3866,0.3866,0,0,0,.62354-0.40942L8.62262,8.58826A0.35757,0.35757,0,0,1,9,8.04584V8.05493h1"/>
-</svg>
diff --git a/src/displayapp/icons/navigation/depart-left.c b/src/displayapp/icons/navigation/depart-left.c
deleted file mode 100644
index c48c805e..00000000
--- a/src/displayapp/icons/navigation/depart-left.c
+++ /dev/null
@@ -1,96 +0,0 @@
-#if defined(LV_LVGL_H_INCLUDE_SIMPLE)
-#include "lvgl.h"
-#else
-#include "lvgl/lvgl.h"
-#endif
-
-
-#ifndef LV_ATTRIBUTE_MEM_ALIGN
-#define LV_ATTRIBUTE_MEM_ALIGN
-#endif
-
-#ifndef LV_ATTRIBUTE_IMG_DEPART_LEFT
-#define LV_ATTRIBUTE_IMG_DEPART_LEFT
-#endif
-
-const LV_ATTRIBUTE_MEM_ALIGN LV_ATTRIBUTE_LARGE_CONST LV_ATTRIBUTE_IMG_DEPART_LEFT uint8_t depart_left_map[] = {
-  0x04, 0x02, 0x04, 0xff, 	/*Color of index 0*/
-  0xfc, 0xfe, 0xfc, 0xff, 	/*Color of index 1*/
-
-  0x00, 0x00, 0x00, 0x3f, 0xc0, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0xff, 0xc0, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x01, 0xff, 0xc0, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x03, 0xff, 0xc0, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x0f, 0xff, 0xc0, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x1f, 0xff, 0xc0, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x3f, 0xff, 0x80, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0xff, 0xff, 0x80, 0x00, 0x00, 0x00, 
-  0x00, 0x01, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 
-  0x00, 0x03, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 
-  0x00, 0x0f, 0xff, 0xfe, 0x00, 0x00, 0x00, 0x00, 
-  0x00, 0x1f, 0xff, 0xfe, 0x00, 0x00, 0x00, 0x00, 
-  0x00, 0x3f, 0xff, 0xfc, 0x00, 0x00, 0x00, 0x00, 
-  0x00, 0xff, 0xff, 0xff, 0xfe, 0x00, 0x00, 0x00, 
-  0x01, 0xff, 0xff, 0xff, 0xff, 0xc0, 0x00, 0x00, 
-  0x03, 0xff, 0xff, 0xff, 0xff, 0xf0, 0x00, 0x00, 
-  0x03, 0xff, 0xff, 0xff, 0xff, 0xfc, 0x00, 0x00, 
-  0x03, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 
-  0x03, 0xff, 0xff, 0xff, 0xff, 0xff, 0x80, 0x00, 
-  0x03, 0xff, 0xff, 0xff, 0xff, 0xff, 0xc0, 0x00, 
-  0x03, 0xff, 0xff, 0xff, 0xff, 0xff, 0xe0, 0x00, 
-  0x03, 0xff, 0xff, 0xff, 0xff, 0xff, 0xf0, 0x00, 
-  0x03, 0xff, 0xff, 0xff, 0xff, 0xff, 0xf8, 0x00, 
-  0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xf8, 0x00, 
-  0x00, 0x7f, 0xff, 0xff, 0xff, 0xff, 0xfc, 0x00, 
-  0x00, 0x3f, 0xff, 0xfe, 0x1f, 0xff, 0xfe, 0x00, 
-  0x00, 0x0f, 0xff, 0xfe, 0x03, 0xff, 0xfe, 0x00, 
-  0x00, 0x07, 0xff, 0xfe, 0x01, 0xff, 0xfe, 0x00, 
-  0x00, 0x03, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 
-  0x00, 0x01, 0xff, 0xff, 0x80, 0x7f, 0xff, 0x00, 
-  0x00, 0x00, 0xff, 0xff, 0x80, 0x3f, 0xff, 0x00, 
-  0x00, 0x00, 0x3f, 0xff, 0x80, 0x1f, 0xff, 0x80, 
-  0x00, 0x00, 0x1f, 0xff, 0xc0, 0x0f, 0xff, 0x80, 
-  0x00, 0x00, 0x0f, 0xff, 0xc0, 0x0f, 0xff, 0x80, 
-  0x00, 0x00, 0x03, 0xff, 0xc0, 0x07, 0xff, 0x80, 
-  0x00, 0x00, 0x01, 0xff, 0xc0, 0x07, 0xff, 0x80, 
-  0x00, 0x00, 0x00, 0xff, 0xc0, 0x07, 0xff, 0x80, 
-  0x00, 0x00, 0x00, 0x3f, 0xc0, 0x07, 0xff, 0x80, 
-  0x00, 0x00, 0x00, 0x1f, 0xc0, 0x07, 0xff, 0x80, 
-  0x00, 0x00, 0x00, 0x0f, 0xc0, 0x07, 0xff, 0x80, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0xff, 0x80, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0xff, 0x80, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0xff, 0x80, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0xff, 0x80, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0xff, 0x80, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0xff, 0x80, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0xff, 0x80, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0xff, 0x80, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0xff, 0xc0, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x0f, 0xff, 0xe0, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x1f, 0xff, 0xe0, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x3f, 0xff, 0xe0, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x3f, 0xff, 0xe0, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x3f, 0xff, 0xe0, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x3f, 0xff, 0xe0, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x3f, 0xff, 0xe0, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x3f, 0xff, 0xe0, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x3f, 0xff, 0xe0, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x3f, 0xff, 0xe0, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x3f, 0xff, 0xe0, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x3f, 0xff, 0xe0, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x3f, 0xff, 0xe0, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x1f, 0xff, 0xe0, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x0f, 0xff, 0xe0, 
-};
-
-const lv_img_dsc_t depart_left = {
-      {
-        LV_IMG_CF_INDEXED_1BIT,
-        0,
-        0,
-        64,
-        64
-    },
-    520,
-depart_left_map,
-};
diff --git a/src/displayapp/icons/navigation/depart-left.png b/src/displayapp/icons/navigation/depart-left.png
deleted file mode 100644
index 971b4664..00000000
--- a/src/displayapp/icons/navigation/depart-left.png
+++ /dev/null
diff --git a/src/displayapp/icons/navigation/depart-right-white.svg b/src/displayapp/icons/navigation/depart-right-white.svg
deleted file mode 100644
index 3ec82a79..00000000
--- a/src/displayapp/icons/navigation/depart-right-white.svg
+++ /dev/null
@@ -1,4 +0,0 @@
-<svg id="WORKING_ICONS" data-name="WORKING ICONS" xmlns="http://www.w3.org/2000/svg" width="20" height="20" viewBox="0 0 20 20">
-  <title>direction</title>
-  <path fill="#ffffff" d="M3,17a2,2,0,1,1,2,2A2,2,0,0,1,3,17Zm7-8.94507h1V8.04584a0.35757,0.35757,0,0,1,.37738.54242L10.03363,11.5401a0.3866,0.3866,0,0,0,.62354.40942L17,7.04584,10.65717,2.14215a0.38659,0.38659,0,0,0-.62354.40942l1.34375,2.95184A0.35757,0.35757,0,0,1,11,6.04584V6.05493H10.00818l0.00012-.02008-0.011.00183A6.05607,6.05607,0,0,0,4.01385,12H4v1.48767A0.51232,0.51232,0,0,0,4.51233,14H5.48767A0.51232,0.51232,0,0,0,6,13.48767V12.10992H6.0083A4.05782,4.05782,0,0,1,9.99707,8.03668"/>
-</svg>
diff --git a/src/displayapp/icons/navigation/depart-right.c b/src/displayapp/icons/navigation/depart-right.c
deleted file mode 100644
index 190c321e..00000000
--- a/src/displayapp/icons/navigation/depart-right.c
+++ /dev/null
@@ -1,96 +0,0 @@
-#if defined(LV_LVGL_H_INCLUDE_SIMPLE)
-#include "lvgl.h"
-#else
-#include "lvgl/lvgl.h"
-#endif
-
-
-#ifndef LV_ATTRIBUTE_MEM_ALIGN
-#define LV_ATTRIBUTE_MEM_ALIGN
-#endif
-
-#ifndef LV_ATTRIBUTE_IMG_DEPART_RIGHT
-#define LV_ATTRIBUTE_IMG_DEPART_RIGHT
-#endif
-
-const LV_ATTRIBUTE_MEM_ALIGN LV_ATTRIBUTE_LARGE_CONST LV_ATTRIBUTE_IMG_DEPART_RIGHT uint8_t depart_right_map[] = {
-  0x04, 0x02, 0x04, 0xff, 	/*Color of index 0*/
-  0xfc, 0xfe, 0xfc, 0xff, 	/*Color of index 1*/
-
-  0x00, 0x00, 0x00, 0x01, 0xfe, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x01, 0xff, 0x80, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x01, 0xff, 0xc0, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x01, 0xff, 0xe0, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x01, 0xff, 0xf8, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x01, 0xff, 0xfc, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x00, 0xff, 0xfe, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0x80, 0x00, 
-  0x00, 0x00, 0x00, 0x00, 0x7f, 0xff, 0xc0, 0x00, 
-  0x00, 0x00, 0x00, 0x00, 0x7f, 0xff, 0xe0, 0x00, 
-  0x00, 0x00, 0x00, 0x00, 0x3f, 0xff, 0xf8, 0x00, 
-  0x00, 0x00, 0x00, 0x00, 0x3f, 0xff, 0xfc, 0x00, 
-  0x00, 0x00, 0x00, 0x00, 0x1f, 0xff, 0xfe, 0x00, 
-  0x00, 0x00, 0x00, 0x3f, 0xff, 0xff, 0xff, 0x80, 
-  0x00, 0x00, 0x01, 0xff, 0xff, 0xff, 0xff, 0xc0, 
-  0x00, 0x00, 0x07, 0xff, 0xff, 0xff, 0xff, 0xe0, 
-  0x00, 0x00, 0x1f, 0xff, 0xff, 0xff, 0xff, 0xe0, 
-  0x00, 0x00, 0x7f, 0xff, 0xff, 0xff, 0xff, 0xe0, 
-  0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xe0, 
-  0x00, 0x01, 0xff, 0xff, 0xff, 0xff, 0xff, 0xe0, 
-  0x00, 0x03, 0xff, 0xff, 0xff, 0xff, 0xff, 0xe0, 
-  0x00, 0x07, 0xff, 0xff, 0xff, 0xff, 0xff, 0xe0, 
-  0x00, 0x0f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xe0, 
-  0x00, 0x0f, 0xff, 0xff, 0xff, 0xff, 0xff, 0x80, 
-  0x00, 0x1f, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 
-  0x00, 0x3f, 0xff, 0xfc, 0x3f, 0xff, 0xfe, 0x00, 
-  0x00, 0x3f, 0xff, 0xe0, 0x3f, 0xff, 0xf8, 0x00, 
-  0x00, 0x3f, 0xff, 0xc0, 0x3f, 0xff, 0xf0, 0x00, 
-  0x00, 0x7f, 0xff, 0x80, 0x7f, 0xff, 0xe0, 0x00, 
-  0x00, 0x7f, 0xff, 0x00, 0xff, 0xff, 0xc0, 0x00, 
-  0x00, 0x7f, 0xfe, 0x00, 0xff, 0xff, 0x80, 0x00, 
-  0x00, 0xff, 0xfc, 0x00, 0xff, 0xfe, 0x00, 0x00, 
-  0x00, 0xff, 0xf8, 0x01, 0xff, 0xfc, 0x00, 0x00, 
-  0x00, 0xff, 0xf8, 0x01, 0xff, 0xf8, 0x00, 0x00, 
-  0x00, 0xff, 0xf0, 0x01, 0xff, 0xe0, 0x00, 0x00, 
-  0x00, 0xff, 0xf0, 0x01, 0xff, 0xc0, 0x00, 0x00, 
-  0x00, 0xff, 0xf0, 0x01, 0xff, 0x80, 0x00, 0x00, 
-  0x00, 0xff, 0xf0, 0x01, 0xfe, 0x00, 0x00, 0x00, 
-  0x00, 0xff, 0xf0, 0x01, 0xfc, 0x00, 0x00, 0x00, 
-  0x00, 0xff, 0xf0, 0x01, 0xf8, 0x00, 0x00, 0x00, 
-  0x00, 0xff, 0xe0, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x00, 0xff, 0xe0, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x00, 0xff, 0xe0, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x00, 0xff, 0xe0, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x00, 0xff, 0xe0, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x00, 0xff, 0xe0, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x00, 0xff, 0xe0, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x00, 0xff, 0xe0, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x01, 0xff, 0xf0, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x03, 0xff, 0xf8, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x03, 0xff, 0xfc, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x03, 0xff, 0xfe, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x03, 0xff, 0xfe, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x03, 0xff, 0xfe, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x03, 0xff, 0xfe, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x03, 0xff, 0xfe, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x03, 0xff, 0xfe, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x03, 0xff, 0xfe, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x03, 0xff, 0xfe, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x03, 0xff, 0xfe, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x03, 0xff, 0xfe, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x03, 0xff, 0xfe, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x03, 0xff, 0xfc, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x03, 0xff, 0xf8, 0x00, 0x00, 0x00, 0x00, 0x00, 
-};
-
-const lv_img_dsc_t depart_right = {
-      {
-        LV_IMG_CF_INDEXED_1BIT,
-        0,
-        0,
-        64,
-        64
-    },
-    520,
-depart_right_map,
-};
diff --git a/src/displayapp/icons/navigation/depart-right.png b/src/displayapp/icons/navigation/depart-right.png
deleted file mode 100644
index 474c7d17..00000000
--- a/src/displayapp/icons/navigation/depart-right.png
+++ /dev/null
diff --git a/src/displayapp/icons/navigation/depart-straight-white.svg b/src/displayapp/icons/navigation/depart-straight-white.svg
deleted file mode 100644
index 63ddd33f..00000000
--- a/src/displayapp/icons/navigation/depart-straight-white.svg
+++ /dev/null
@@ -1,4 +0,0 @@
-<svg id="WORKING_ICONS" data-name="WORKING ICONS" xmlns="http://www.w3.org/2000/svg" width="20" height="20" viewBox="0 0 20 20">
-  <title>direction</title>
-  <path fill="#ffffff" d="M10,19a2,2,0,1,1,2-2A2,2,0,0,1,10,19ZM14.91284,7.34283L10.00916,1,5.10547,7.34283a0.38659,0.38659,0,0,0,.40942.62354L8.46674,6.62262a0.35542,0.35542,0,0,1,.541.36908H9v5.50006a0.49992,0.49992,0,0,0,.49994.49994h1.00012A0.49992,0.49992,0,0,0,11,12.49176V7h0.00916a0.35757,0.35757,0,0,1,.54242-0.37738l2.95184,1.34375A0.3866,0.3866,0,0,0,14.91284,7.34283Z"/>
-</svg>
diff --git a/src/displayapp/icons/navigation/depart-straight.c b/src/displayapp/icons/navigation/depart-straight.c
deleted file mode 100644
index 8be9069a..00000000
--- a/src/displayapp/icons/navigation/depart-straight.c
+++ /dev/null
@@ -1,96 +0,0 @@
-#if defined(LV_LVGL_H_INCLUDE_SIMPLE)
-#include "lvgl.h"
-#else
-#include "lvgl/lvgl.h"
-#endif
-
-
-#ifndef LV_ATTRIBUTE_MEM_ALIGN
-#define LV_ATTRIBUTE_MEM_ALIGN
-#endif
-
-#ifndef LV_ATTRIBUTE_IMG_DEPART_STRAIGHT
-#define LV_ATTRIBUTE_IMG_DEPART_STRAIGHT
-#endif
-
-const LV_ATTRIBUTE_MEM_ALIGN LV_ATTRIBUTE_LARGE_CONST LV_ATTRIBUTE_IMG_DEPART_STRAIGHT uint8_t depart_straight_map[] = {
-  0x04, 0x02, 0x04, 0xff, 	/*Color of index 0*/
-  0xfc, 0xfe, 0xfc, 0xff, 	/*Color of index 1*/
-
-  0x00, 0x00, 0x00, 0x0f, 0xf0, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x0f, 0xf0, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x1f, 0xfc, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x3f, 0xfc, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x7f, 0xfe, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0xff, 0xff, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0xff, 0xff, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x01, 0xff, 0xff, 0x80, 0x00, 0x00, 
-  0x00, 0x00, 0x03, 0xff, 0xff, 0xc0, 0x00, 0x00, 
-  0x00, 0x00, 0x07, 0xff, 0xff, 0xe0, 0x00, 0x00, 
-  0x00, 0x00, 0x0f, 0xff, 0xff, 0xf0, 0x00, 0x00, 
-  0x00, 0x00, 0x0f, 0xff, 0xff, 0xf0, 0x00, 0x00, 
-  0x00, 0x00, 0x1f, 0xff, 0xff, 0xf8, 0x00, 0x00, 
-  0x00, 0x00, 0x3f, 0xff, 0xff, 0xfc, 0x00, 0x00, 
-  0x00, 0x00, 0x7f, 0xff, 0xff, 0xfe, 0x00, 0x00, 
-  0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 
-  0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 
-  0x00, 0x01, 0xff, 0xff, 0xff, 0xff, 0x80, 0x00, 
-  0x00, 0x03, 0xff, 0xff, 0xff, 0xff, 0xc0, 0x00, 
-  0x00, 0x03, 0xff, 0xff, 0xff, 0xff, 0xc0, 0x00, 
-  0x00, 0x03, 0xff, 0xff, 0xff, 0xff, 0xc0, 0x00, 
-  0x00, 0x03, 0xff, 0xff, 0xff, 0xff, 0xc0, 0x00, 
-  0x00, 0x03, 0xff, 0xff, 0xff, 0xff, 0xc0, 0x00, 
-  0x00, 0x03, 0xff, 0xbf, 0xfd, 0xff, 0xc0, 0x00, 
-  0x00, 0x03, 0xfe, 0x3f, 0xfc, 0x7f, 0xc0, 0x00, 
-  0x00, 0x03, 0xf8, 0x3f, 0xfc, 0x1f, 0xc0, 0x00, 
-  0x00, 0x03, 0xc0, 0x3f, 0xfc, 0x03, 0xc0, 0x00, 
-  0x00, 0x00, 0x00, 0x3f, 0xfc, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x3f, 0xfc, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x3f, 0xfc, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x3f, 0xfc, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x3f, 0xfc, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x3f, 0xfc, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x3f, 0xfc, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x3f, 0xfc, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x3f, 0xfc, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x3f, 0xfc, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x3f, 0xfc, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x3f, 0xfc, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x3f, 0xfc, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x3f, 0xfc, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x3f, 0xfc, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x3f, 0xfc, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x1f, 0xf8, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x0f, 0xf0, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x1f, 0xf8, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x7f, 0xfe, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0xff, 0xff, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0xff, 0xff, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x01, 0xff, 0xff, 0x80, 0x00, 0x00, 
-  0x00, 0x00, 0x01, 0xff, 0xff, 0x80, 0x00, 0x00, 
-  0x00, 0x00, 0x01, 0xff, 0xff, 0x80, 0x00, 0x00, 
-  0x00, 0x00, 0x01, 0xff, 0xff, 0x80, 0x00, 0x00, 
-  0x00, 0x00, 0x01, 0xff, 0xff, 0x80, 0x00, 0x00, 
-  0x00, 0x00, 0x01, 0xff, 0xff, 0x80, 0x00, 0x00, 
-  0x00, 0x00, 0x01, 0xff, 0xff, 0x80, 0x00, 0x00, 
-  0x00, 0x00, 0x01, 0xff, 0xff, 0x80, 0x00, 0x00, 
-  0x00, 0x00, 0x01, 0xff, 0xff, 0x80, 0x00, 0x00, 
-  0x00, 0x00, 0x01, 0xff, 0xff, 0x80, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0xff, 0xff, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x7f, 0xfe, 0x00, 0x00, 0x00, 
-};
-
-const lv_img_dsc_t depart_straight = {
-      {
-        LV_IMG_CF_INDEXED_1BIT,
-        0,
-        0,
-        64,
-        64
-    },
-    520,
-depart_straight_map,
-};
diff --git a/src/displayapp/icons/navigation/depart-straight.png b/src/displayapp/icons/navigation/depart-straight.png
deleted file mode 100644
index 3bc5b05e..00000000
--- a/src/displayapp/icons/navigation/depart-straight.png
+++ /dev/null
diff --git a/src/displayapp/icons/navigation/depart-white.svg b/src/displayapp/icons/navigation/depart-white.svg
deleted file mode 100644
index 0794251c..00000000
--- a/src/displayapp/icons/navigation/depart-white.svg
+++ /dev/null
@@ -1,4 +0,0 @@
-<svg id="WORKING_ICONS" data-name="WORKING ICONS" xmlns="http://www.w3.org/2000/svg" width="20" height="20" viewBox="0 0 20 20">
-  <title>direction</title>
-  <path fill="#ffffff" d="M9.98172,19a2,2,0,1,1,2-2A2,2,0,0,1,9.98172,19ZM14.89456,7.34283L9.99087,1,5.08719,7.34283a0.38659,0.38659,0,0,0,.40942.62354L8.44845,6.62262a0.35542,0.35542,0,0,1,.541.36908H8.98172v5.50006a0.49992,0.49992,0,0,0,.49994.49994h1.00012a0.49992,0.49992,0,0,0,.49994-0.49994V7h0.00916a0.35757,0.35757,0,0,1,.54242-0.37738l2.95184,1.34375A0.3866,0.3866,0,0,0,14.89456,7.34283Z"/>
-</svg>
diff --git a/src/displayapp/icons/navigation/depart.c b/src/displayapp/icons/navigation/depart.c
deleted file mode 100644
index cf7f4c5b..00000000
--- a/src/displayapp/icons/navigation/depart.c
+++ /dev/null
@@ -1,96 +0,0 @@
-#if defined(LV_LVGL_H_INCLUDE_SIMPLE)
-#include "lvgl.h"
-#else
-#include "lvgl/lvgl.h"
-#endif
-
-
-#ifndef LV_ATTRIBUTE_MEM_ALIGN
-#define LV_ATTRIBUTE_MEM_ALIGN
-#endif
-
-#ifndef LV_ATTRIBUTE_IMG_DEPART
-#define LV_ATTRIBUTE_IMG_DEPART
-#endif
-
-const LV_ATTRIBUTE_MEM_ALIGN LV_ATTRIBUTE_LARGE_CONST LV_ATTRIBUTE_IMG_DEPART uint8_t depart_map[] = {
-  0x04, 0x02, 0x04, 0xff, 	/*Color of index 0*/
-  0xfc, 0xfe, 0xfc, 0xff, 	/*Color of index 1*/
-
-  0x00, 0x00, 0x00, 0x0f, 0xf0, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x0f, 0xf0, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x3f, 0xf8, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x3f, 0xfc, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x7f, 0xfe, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0xff, 0xff, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0xff, 0xff, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x01, 0xff, 0xff, 0x80, 0x00, 0x00, 
-  0x00, 0x00, 0x03, 0xff, 0xff, 0xc0, 0x00, 0x00, 
-  0x00, 0x00, 0x07, 0xff, 0xff, 0xe0, 0x00, 0x00, 
-  0x00, 0x00, 0x0f, 0xff, 0xff, 0xf0, 0x00, 0x00, 
-  0x00, 0x00, 0x0f, 0xff, 0xff, 0xf0, 0x00, 0x00, 
-  0x00, 0x00, 0x1f, 0xff, 0xff, 0xf8, 0x00, 0x00, 
-  0x00, 0x00, 0x3f, 0xff, 0xff, 0xfc, 0x00, 0x00, 
-  0x00, 0x00, 0x7f, 0xff, 0xff, 0xfe, 0x00, 0x00, 
-  0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 
-  0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 
-  0x00, 0x01, 0xff, 0xff, 0xff, 0xff, 0x80, 0x00, 
-  0x00, 0x03, 0xff, 0xff, 0xff, 0xff, 0xc0, 0x00, 
-  0x00, 0x03, 0xff, 0xff, 0xff, 0xff, 0xc0, 0x00, 
-  0x00, 0x03, 0xff, 0xff, 0xff, 0xff, 0xc0, 0x00, 
-  0x00, 0x03, 0xff, 0xff, 0xff, 0xff, 0xc0, 0x00, 
-  0x00, 0x03, 0xff, 0xff, 0xff, 0xff, 0xc0, 0x00, 
-  0x00, 0x03, 0xff, 0xbf, 0xfd, 0xff, 0xc0, 0x00, 
-  0x00, 0x03, 0xfe, 0x3f, 0xfc, 0x7f, 0xc0, 0x00, 
-  0x00, 0x03, 0xf8, 0x3f, 0xfc, 0x1f, 0xc0, 0x00, 
-  0x00, 0x03, 0xc0, 0x3f, 0xfc, 0x03, 0xc0, 0x00, 
-  0x00, 0x00, 0x00, 0x3f, 0xfc, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x3f, 0xfc, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x3f, 0xfc, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x3f, 0xfc, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x3f, 0xfc, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x3f, 0xfc, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x3f, 0xfc, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x3f, 0xfc, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x3f, 0xfc, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x3f, 0xfc, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x3f, 0xfc, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x3f, 0xfc, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x3f, 0xfc, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x3f, 0xfc, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x3f, 0xfc, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x3f, 0xfc, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x1f, 0xf8, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x0f, 0xf0, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x1f, 0xf8, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x7f, 0xfe, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0xff, 0xff, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0xff, 0xff, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x01, 0xff, 0xff, 0x80, 0x00, 0x00, 
-  0x00, 0x00, 0x01, 0xff, 0xff, 0x80, 0x00, 0x00, 
-  0x00, 0x00, 0x01, 0xff, 0xff, 0x80, 0x00, 0x00, 
-  0x00, 0x00, 0x01, 0xff, 0xff, 0x80, 0x00, 0x00, 
-  0x00, 0x00, 0x01, 0xff, 0xff, 0x80, 0x00, 0x00, 
-  0x00, 0x00, 0x01, 0xff, 0xff, 0x80, 0x00, 0x00, 
-  0x00, 0x00, 0x01, 0xff, 0xff, 0x80, 0x00, 0x00, 
-  0x00, 0x00, 0x01, 0xff, 0xff, 0x80, 0x00, 0x00, 
-  0x00, 0x00, 0x01, 0xff, 0xff, 0x80, 0x00, 0x00, 
-  0x00, 0x00, 0x01, 0xff, 0xff, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0xff, 0xff, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x7f, 0xfe, 0x00, 0x00, 0x00, 
-};
-
-const lv_img_dsc_t depart = {
-      {
-        LV_IMG_CF_INDEXED_1BIT,
-        0,
-        0,
-        64,
-        64
-    },
-    520,
-depart_map,
-};
diff --git a/src/displayapp/icons/navigation/depart.png b/src/displayapp/icons/navigation/depart.png
deleted file mode 100644
index ef86ae25..00000000
--- a/src/displayapp/icons/navigation/depart.png
+++ /dev/null
diff --git a/src/displayapp/icons/navigation/depart.svg b/src/displayapp/icons/navigation/depart.svg
new file mode 100644
index 00000000..a87924d6
--- /dev/null
+++ b/src/displayapp/icons/navigation/depart.svg
@@ -0,0 +1,58 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   inkscape:version="1.0 (4035a4fb49, 2020-05-01)"
+   sodipodi:docname="depart.svg"
+   version="1.1"
+   viewBox="0 0 20 20"
+   height="20"
+   width="20"
+   data-name="WORKING ICONS"
+   id="WORKING_ICONS">
+  <metadata
+     id="metadata11">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs9" />
+  <sodipodi:namedview
+     inkscape:current-layer="WORKING_ICONS"
+     inkscape:window-maximized="1"
+     inkscape:window-y="22"
+     inkscape:window-x="-8"
+     inkscape:cy="9.8236635"
+     inkscape:cx="5.9275026"
+     inkscape:zoom="21.5"
+     showgrid="false"
+     id="namedview7"
+     inkscape:window-height="1027"
+     inkscape:window-width="1920"
+     inkscape:pageshadow="2"
+     inkscape:pageopacity="0"
+     guidetolerance="10"
+     gridtolerance="10"
+     objecttolerance="10"
+     borderopacity="1"
+     bordercolor="#666666"
+     pagecolor="#ffffff" />
+  <title
+     id="title2">direction</title>
+  <path
+     style="stroke-width:1.11111"
+     id="path4"
+     d="M 9.9898408,20 A 2.2222222,2.2222222 0 1 1 12.212063,17.777778 2.2222222,2.2222222 0 0 1 9.9898408,20 Z M 15.448552,7.0475889 10.000007,0 4.5514739,7.0475889 a 0.42954445,0.42954445 0 0 0 0.454911,0.6928222 L 8.2862072,6.2473555 a 0.39491111,0.39491111 0 0 1 0.6011111,0.410089 h -0.00859 v 6.1111775 a 0.55546667,0.55546667 0 0 0 0.5554889,0.555489 h 1.1112448 a 0.55546667,0.55546667 0 0 0 0.555489,-0.555489 V 6.6666667 h 0.01017 a 0.3973,0.3973 0 0 1 0.602701,-0.4193112 l 3.279823,1.4930556 a 0.42955555,0.42955555 0 0 0 0.454907,-0.6928222 z"
+     fill="#000000" />
+</svg>
diff --git a/src/displayapp/icons/navigation/depart_left.svg b/src/displayapp/icons/navigation/depart_left.svg
new file mode 100644
index 00000000..2f93e53f
--- /dev/null
+++ b/src/displayapp/icons/navigation/depart_left.svg
@@ -0,0 +1,58 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   inkscape:version="1.0 (4035a4fb49, 2020-05-01)"
+   sodipodi:docname="depart_left.svg"
+   version="1.1"
+   viewBox="0 0 20 20"
+   height="20"
+   width="20"
+   data-name="WORKING ICONS"
+   id="WORKING_ICONS">
+  <metadata
+     id="metadata11">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs9" />
+  <sodipodi:namedview
+     inkscape:current-layer="WORKING_ICONS"
+     inkscape:window-maximized="1"
+     inkscape:window-y="22"
+     inkscape:window-x="-8"
+     inkscape:cy="20.366049"
+     inkscape:cx="11.48454"
+     inkscape:zoom="15.202796"
+     showgrid="false"
+     id="namedview7"
+     inkscape:window-height="1027"
+     inkscape:window-width="1920"
+     inkscape:pageshadow="2"
+     inkscape:pageopacity="0"
+     guidetolerance="10"
+     gridtolerance="10"
+     objecttolerance="10"
+     borderopacity="1"
+     bordercolor="#666666"
+     pagecolor="#ffffff" />
+  <title
+     id="title2">direction</title>
+  <path
+     style="stroke-width:1.17961"
+     id="path4"
+     d="M 15.898067,20 A 2.3592266,2.3592266 0 1 1 18.257293,17.640774 2.3592266,2.3592266 0 0 1 15.898067,20 Z M 10.003456,7.0675219 a 4.7866585,4.7866585 0 0 1 4.705207,4.8048481 h 0.0098 v 1.625212 a 0.60433949,0.60433949 0 0 0 0.604352,0.604352 h 1.150524 A 0.60433949,0.60433949 0 0 0 17.07769,13.497582 V 11.742707 H 17.06135 A 7.1438208,7.1438208 0 0 0 10.003244,4.7082953 l -0.01298,-0.00216 8.3e-5,0.023687 H 8.820387 V 4.7191006 A 0.42179433,0.42179433 0 0 1 8.3752244,4.0792547 L 9.96033,0.59721319 A 0.45602671,0.45602671 0 0 0 9.224794,0.11425589 L 1.742707,5.8987139 9.224794,11.683172 A 0.45603851,0.45603851 0 0 0 9.96033,11.200215 L 8.3752244,7.7181731 A 0.42179433,0.42179433 0 0 1 8.820387,7.0783272 v 0.010723 H 10"
+     fill="#000000" />
+</svg>
diff --git a/src/displayapp/icons/navigation/depart_right.svg b/src/displayapp/icons/navigation/depart_right.svg
new file mode 100644
index 00000000..81f6fe8f
--- /dev/null
+++ b/src/displayapp/icons/navigation/depart_right.svg
@@ -0,0 +1,58 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   inkscape:version="1.0 (4035a4fb49, 2020-05-01)"
+   sodipodi:docname="depart_right.svg"
+   version="1.1"
+   viewBox="0 0 20 20"
+   height="20"
+   width="20"
+   data-name="WORKING ICONS"
+   id="WORKING_ICONS">
+  <metadata
+     id="metadata11">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs9" />
+  <sodipodi:namedview
+     inkscape:current-layer="WORKING_ICONS"
+     inkscape:window-maximized="1"
+     inkscape:window-y="22"
+     inkscape:window-x="-8"
+     inkscape:cy="11.499285"
+     inkscape:cx="12.071449"
+     inkscape:zoom="21.5"
+     showgrid="false"
+     id="namedview7"
+     inkscape:window-height="1027"
+     inkscape:window-width="1920"
+     inkscape:pageshadow="2"
+     inkscape:pageopacity="0"
+     guidetolerance="10"
+     gridtolerance="10"
+     objecttolerance="10"
+     borderopacity="1"
+     bordercolor="#666666"
+     pagecolor="#ffffff" />
+  <title
+     id="title2">direction</title>
+  <path
+     style="stroke-width:1.17961"
+     id="path4"
+     d="M 1.742707,17.640774 A 2.3592266,2.3592266 0 1 1 4.1019336,20 2.3592266,2.3592266 0 0 1 1.742707,17.640774 Z M 10,7.0890499 h 1.179613 v -0.010723 a 0.42179433,0.42179433 0 0 1 0.445163,0.6398459 l -1.585105,3.4820302 a 0.45603851,0.45603851 0 0 0 0.735536,0.482957 L 18.257293,5.8987139 10.775207,0.11425589 a 0.45602671,0.45602671 0 0 0 -0.735536,0.4829573 l 1.585105,3.48202971 a 0.42179433,0.42179433 0 0 1 -0.445163,0.6398577 v 0.010723 h -1.169964 l 1.42e-4,-0.023687 -0.01298,0.00216 A 7.1438208,7.1438208 0 0 0 2.938658,11.742707 H 2.92232 v 1.754875 a 0.60433949,0.60433949 0 0 0 0.6043513,0.604352 h 1.150524 A 0.60433949,0.60433949 0 0 0 5.2815466,13.497582 V 11.87237 h 0.00979 A 4.7866585,4.7866585 0 0 1 9.996544,7.0675219"
+     fill="#000000" />
+</svg>
diff --git a/src/displayapp/icons/navigation/depart_straight.svg b/src/displayapp/icons/navigation/depart_straight.svg
new file mode 100644
index 00000000..5e35e45a
--- /dev/null
+++ b/src/displayapp/icons/navigation/depart_straight.svg
@@ -0,0 +1,58 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   inkscape:version="1.0 (4035a4fb49, 2020-05-01)"
+   sodipodi:docname="depart_straight.svg"
+   version="1.1"
+   viewBox="0 0 20 20"
+   height="20"
+   width="20"
+   data-name="WORKING ICONS"
+   id="WORKING_ICONS">
+  <metadata
+     id="metadata11">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs9" />
+  <sodipodi:namedview
+     inkscape:current-layer="WORKING_ICONS"
+     inkscape:window-maximized="1"
+     inkscape:window-y="22"
+     inkscape:window-x="-8"
+     inkscape:cy="18.998181"
+     inkscape:cx="4.2213531"
+     inkscape:zoom="15.202796"
+     showgrid="false"
+     id="namedview7"
+     inkscape:window-height="1027"
+     inkscape:window-width="1920"
+     inkscape:pageshadow="2"
+     inkscape:pageopacity="0"
+     guidetolerance="10"
+     gridtolerance="10"
+     objecttolerance="10"
+     borderopacity="1"
+     bordercolor="#666666"
+     pagecolor="#ffffff" />
+  <title
+     id="title2">direction</title>
+  <path
+     style="stroke-width:1.11111"
+     id="path4"
+     d="M 9.9898405,20 A 2.2222222,2.2222222 0 1 1 12.212062,17.777778 2.2222222,2.2222222 0 0 1 9.9898405,20 Z M 15.448551,7.0475889 10.000018,0 4.5514736,7.0475889 A 0.42954444,0.42954444 0 0 0 5.0063847,7.7404111 L 8.286218,6.2473556 a 0.39491111,0.39491111 0 0 1 0.6011111,0.4100888 h -0.0086 v 6.1111776 a 0.55546667,0.55546667 0 0 0 0.5554889,0.555489 h 1.111244 a 0.55546667,0.55546667 0 0 0 0.555489,-0.555489 V 6.6666667 h 0.01018 A 0.3973,0.3973 0 0 1 11.71382,6.2473556 l 3.279822,1.4930555 a 0.42955556,0.42955556 0 0 0 0.454909,-0.6928222 z"
+     fill="#000000" />
+</svg>
diff --git a/src/displayapp/icons/navigation/end-of-road-left-white.svg b/src/displayapp/icons/navigation/end-of-road-left-white.svg
deleted file mode 100644
index 3eca7bb9..00000000
--- a/src/displayapp/icons/navigation/end-of-road-left-white.svg
+++ /dev/null
@@ -1,4 +0,0 @@
-<svg id="WORKING_ICONS" data-name="WORKING ICONS" xmlns="http://www.w3.org/2000/svg" width="20" height="20" viewBox="0 0 20 20">
-  <title>direction</title>
-  <path fill="#ffffff" d="M16.50354,6.2A0.29678,0.29678,0,0,1,16.8,6.49646V7.50354A0.29678,0.29678,0,0,1,16.50354,7.8H7.2V6.2h9.30353m0-.2H7V8h9.50354A0.49645,0.49645,0,0,0,17,7.50354V6.49646A0.49645,0.49645,0,0,0,16.50354,6h0ZM10,5.98169H8.01245a0.35757,0.35757,0,0,1-.37738-0.54242L8.97882,2.48743A0.38659,0.38659,0,0,0,8.35529,2.078L2.0083,7l6.347,4.88544A0.38659,0.38659,0,0,0,8.97882,11.476L7.63507,8.52417a0.3576,0.3576,0,0,1,.37738-0.54248h1.99878A4.05782,4.05782,0,0,1,14,12.05493v5.44885A0.49622,0.49622,0,0,0,14.49622,18h1.00647a0.49614,0.49614,0,0,0,.49615-0.49683L15.99689,16H16V12.05493a6.06019,6.06019,0,0,0-5.989-6.07324L10,5.97986"/>
-</svg>
diff --git a/src/displayapp/icons/navigation/end-of-road-left.c b/src/displayapp/icons/navigation/end-of-road-left.c
deleted file mode 100644
index a30650af..00000000
--- a/src/displayapp/icons/navigation/end-of-road-left.c
+++ /dev/null
@@ -1,96 +0,0 @@
-#if defined(LV_LVGL_H_INCLUDE_SIMPLE)
-#include "lvgl.h"
-#else
-#include "lvgl/lvgl.h"
-#endif
-
-
-#ifndef LV_ATTRIBUTE_MEM_ALIGN
-#define LV_ATTRIBUTE_MEM_ALIGN
-#endif
-
-#ifndef LV_ATTRIBUTE_IMG_END_OF_ROAD_LEFT
-#define LV_ATTRIBUTE_IMG_END_OF_ROAD_LEFT
-#endif
-
-const LV_ATTRIBUTE_MEM_ALIGN LV_ATTRIBUTE_LARGE_CONST LV_ATTRIBUTE_IMG_END_OF_ROAD_LEFT uint8_t end_of_road_left_map[] = {
-  0x04, 0x02, 0x04, 0xff, 	/*Color of index 0*/
-  0xfc, 0xfe, 0xfc, 0xff, 	/*Color of index 1*/
-
-  0x00, 0x00, 0x01, 0xff, 0x00, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x03, 0xff, 0x00, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x07, 0xff, 0x00, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x1f, 0xff, 0x00, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x3f, 0xff, 0x00, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0xff, 0xfe, 0x00, 0x00, 0x00, 0x00, 
-  0x00, 0x01, 0xff, 0xfe, 0x00, 0x00, 0x00, 0x00, 
-  0x00, 0x03, 0xff, 0xfc, 0x00, 0x00, 0x00, 0x00, 
-  0x00, 0x07, 0xff, 0xfc, 0x00, 0x00, 0x00, 0x00, 
-  0x00, 0x1f, 0xff, 0xf8, 0x00, 0x00, 0x00, 0x00, 
-  0x00, 0x3f, 0xff, 0xf8, 0x00, 0x00, 0x00, 0x00, 
-  0x00, 0x7f, 0xff, 0xf0, 0x00, 0x00, 0x00, 0x00, 
-  0x01, 0xff, 0xff, 0xf0, 0x00, 0x00, 0x00, 0x00, 
-  0x03, 0xff, 0xff, 0xf0, 0x00, 0x00, 0x00, 0x00, 
-  0x07, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfc, 
-  0x0f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfc, 
-  0x3f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfc, 
-  0x3f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfc, 
-  0x3f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfc, 
-  0x3f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xe0, 0x1c, 
-  0x3f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xf0, 0x1c, 
-  0x3f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfc, 
-  0x3f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfc, 
-  0x3f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfc, 
-  0x1f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfc, 
-  0x0f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfc, 
-  0x03, 0xff, 0xff, 0xe0, 0x1f, 0xff, 0xff, 0x80, 
-  0x01, 0xff, 0xff, 0xf0, 0x03, 0xff, 0xff, 0x80, 
-  0x00, 0xff, 0xff, 0xf0, 0x00, 0xff, 0xff, 0xc0, 
-  0x00, 0x7f, 0xff, 0xf8, 0x00, 0x7f, 0xff, 0xc0, 
-  0x00, 0x1f, 0xff, 0xf8, 0x00, 0x1f, 0xff, 0xc0, 
-  0x00, 0x0f, 0xff, 0xfc, 0x00, 0x0f, 0xff, 0xe0, 
-  0x00, 0x03, 0xff, 0xfc, 0x00, 0x07, 0xff, 0xe0, 
-  0x00, 0x01, 0xff, 0xfe, 0x00, 0x07, 0xff, 0xe0, 
-  0x00, 0x00, 0xff, 0xfe, 0x00, 0x03, 0xff, 0xf0, 
-  0x00, 0x00, 0x7f, 0xff, 0x00, 0x03, 0xff, 0xf0, 
-  0x00, 0x00, 0x1f, 0xff, 0x00, 0x01, 0xff, 0xf0, 
-  0x00, 0x00, 0x0f, 0xff, 0x00, 0x01, 0xff, 0xf0, 
-  0x00, 0x00, 0x03, 0xff, 0x00, 0x01, 0xff, 0xf0, 
-  0x00, 0x00, 0x01, 0xff, 0x00, 0x00, 0xff, 0xf0, 
-  0x00, 0x00, 0x00, 0xff, 0x00, 0x00, 0xff, 0xf0, 
-  0x00, 0x00, 0x00, 0x7f, 0x00, 0x00, 0xff, 0xf0, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xf0, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xf0, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xf0, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xf0, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xf0, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xf0, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xf0, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xf0, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xf0, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xf0, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xf0, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xf0, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xf0, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xf0, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xf0, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xf0, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xf0, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xf0, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xf0, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xf0, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xf0, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xf0, 
-};
-
-const lv_img_dsc_t end_of_road_left = {
-      {
-        LV_IMG_CF_INDEXED_1BIT,
-        0,
-        0,
-        64,
-        64
-    },
-    520,
-end_of_road_left_map,
-};
diff --git a/src/displayapp/icons/navigation/end-of-road-left.png b/src/displayapp/icons/navigation/end-of-road-left.png
deleted file mode 100644
index 6b10d486..00000000
--- a/src/displayapp/icons/navigation/end-of-road-left.png
+++ /dev/null
diff --git a/src/displayapp/icons/navigation/end-of-road-right-white.svg b/src/displayapp/icons/navigation/end-of-road-right-white.svg
deleted file mode 100644
index d8670e3a..00000000
--- a/src/displayapp/icons/navigation/end-of-road-right-white.svg
+++ /dev/null
@@ -1,4 +0,0 @@
-<svg id="WORKING_ICONS" data-name="WORKING ICONS" xmlns="http://www.w3.org/2000/svg" width="20" height="20" viewBox="0 0 20 20">
-  <title>direction</title>
-  <path fill="#ffffff" d="M12.8,6.2V7.8H2.50119A0.30152,0.30152,0,0,1,2.2,7.49882V6.50118A0.30152,0.30152,0,0,1,2.50119,6.2H12.8M13,6H2.50119A0.50119,0.50119,0,0,0,2,6.50118V7.49882A0.50119,0.50119,0,0,0,2.50119,8H13V6h0ZM10,7.98169h1.98755a0.3576,0.3576,0,0,1,.37738.54248L11.02118,11.476a0.38659,0.38659,0,0,0,.62354.40942L17.9917,7l-6.347-4.922a0.38659,0.38659,0,0,0-.62354.40942l1.34375,2.95184a0.35757,0.35757,0,0,1-.37738.54242H10V5.97986l-0.011.00183A6.06019,6.06019,0,0,0,4,12.05493V16H4.00311l-0.002,1.50317A0.49614,0.49614,0,0,0,4.49731,18H5.50378A0.49622,0.49622,0,0,0,6,17.50378V12.05493A4.05782,4.05782,0,0,1,9.98877,7.98169H10Z"/>
-</svg>
diff --git a/src/displayapp/icons/navigation/end-of-road-right.c b/src/displayapp/icons/navigation/end-of-road-right.c
deleted file mode 100644
index c3d5f071..00000000
--- a/src/displayapp/icons/navigation/end-of-road-right.c
+++ /dev/null
@@ -1,96 +0,0 @@
-#if defined(LV_LVGL_H_INCLUDE_SIMPLE)
-#include "lvgl.h"
-#else
-#include "lvgl/lvgl.h"
-#endif
-
-
-#ifndef LV_ATTRIBUTE_MEM_ALIGN
-#define LV_ATTRIBUTE_MEM_ALIGN
-#endif
-
-#ifndef LV_ATTRIBUTE_IMG_END_OF_ROAD_RIGHT
-#define LV_ATTRIBUTE_IMG_END_OF_ROAD_RIGHT
-#endif
-
-const LV_ATTRIBUTE_MEM_ALIGN LV_ATTRIBUTE_LARGE_CONST LV_ATTRIBUTE_IMG_END_OF_ROAD_RIGHT uint8_t end_of_road_right_map[] = {
-  0x04, 0x02, 0x04, 0xff, 	/*Color of index 0*/
-  0xfc, 0xfe, 0xfc, 0xff, 	/*Color of index 1*/
-
-  0x00, 0x00, 0x00, 0x00, 0x3f, 0xe0, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x00, 0x3f, 0xf0, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x00, 0x3f, 0xfc, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x00, 0x3f, 0xfe, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x00, 0x3f, 0xff, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x00, 0x1f, 0xff, 0xc0, 0x00, 
-  0x00, 0x00, 0x00, 0x00, 0x1f, 0xff, 0xe0, 0x00, 
-  0x00, 0x00, 0x00, 0x00, 0x0f, 0xff, 0xf0, 0x00, 
-  0x00, 0x00, 0x00, 0x00, 0x0f, 0xff, 0xf8, 0x00, 
-  0x00, 0x00, 0x00, 0x00, 0x07, 0xff, 0xfe, 0x00, 
-  0x00, 0x00, 0x00, 0x00, 0x07, 0xff, 0xff, 0x00, 
-  0x00, 0x00, 0x00, 0x00, 0x03, 0xff, 0xff, 0x80, 
-  0x00, 0x00, 0x00, 0x00, 0x03, 0xff, 0xff, 0xe0, 
-  0x00, 0x00, 0x00, 0x00, 0x03, 0xff, 0xff, 0xf0, 
-  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xf8, 
-  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfc, 
-  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
-  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
-  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
-  0xe0, 0x01, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
-  0xe0, 0x03, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
-  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
-  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
-  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
-  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfe, 
-  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfc, 
-  0x00, 0x7f, 0xff, 0xfe, 0x03, 0xff, 0xff, 0xf0, 
-  0x00, 0xff, 0xff, 0xf0, 0x03, 0xff, 0xff, 0xe0, 
-  0x00, 0xff, 0xff, 0xc0, 0x03, 0xff, 0xff, 0xc0, 
-  0x00, 0xff, 0xff, 0x80, 0x07, 0xff, 0xff, 0x80, 
-  0x01, 0xff, 0xfe, 0x00, 0x07, 0xff, 0xfe, 0x00, 
-  0x01, 0xff, 0xfc, 0x00, 0x0f, 0xff, 0xfc, 0x00, 
-  0x01, 0xff, 0xf8, 0x00, 0x0f, 0xff, 0xf0, 0x00, 
-  0x03, 0xff, 0xf8, 0x00, 0x1f, 0xff, 0xe0, 0x00, 
-  0x03, 0xff, 0xf0, 0x00, 0x1f, 0xff, 0xc0, 0x00, 
-  0x03, 0xff, 0xe0, 0x00, 0x3f, 0xff, 0x80, 0x00, 
-  0x03, 0xff, 0xe0, 0x00, 0x3f, 0xff, 0x00, 0x00, 
-  0x03, 0xff, 0xe0, 0x00, 0x3f, 0xfc, 0x00, 0x00, 
-  0x03, 0xff, 0xc0, 0x00, 0x3f, 0xf0, 0x00, 0x00, 
-  0x03, 0xff, 0xc0, 0x00, 0x3f, 0xe0, 0x00, 0x00, 
-  0x03, 0xff, 0xc0, 0x00, 0x3f, 0xc0, 0x00, 0x00, 
-  0x03, 0xff, 0xc0, 0x00, 0x3f, 0x80, 0x00, 0x00, 
-  0x03, 0xff, 0xc0, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x03, 0xff, 0xc0, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x03, 0xff, 0xc0, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x03, 0xff, 0xc0, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x03, 0xff, 0xc0, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x03, 0xff, 0xc0, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x03, 0xff, 0xc0, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x03, 0xff, 0xc0, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x03, 0xff, 0xc0, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x03, 0xff, 0xc0, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x03, 0xff, 0xc0, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x03, 0xff, 0xc0, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x03, 0xff, 0xc0, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x03, 0xff, 0xc0, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x03, 0xff, 0xc0, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x03, 0xff, 0xc0, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x03, 0xff, 0xc0, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x03, 0xff, 0xc0, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x03, 0xff, 0xc0, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x03, 0xff, 0xc0, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x03, 0xff, 0xc0, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x03, 0xff, 0xc0, 0x00, 0x00, 0x00, 0x00, 0x00, 
-};
-
-const lv_img_dsc_t end_of_road_right = {
-      {
-        LV_IMG_CF_INDEXED_1BIT,
-        0,
-        0,
-        64,
-        64
-    },
-    520,
-end_of_road_right_map,
-};
diff --git a/src/displayapp/icons/navigation/end-of-road-right.png b/src/displayapp/icons/navigation/end-of-road-right.png
deleted file mode 100644
index 9f1dbbc7..00000000
--- a/src/displayapp/icons/navigation/end-of-road-right.png
+++ /dev/null
diff --git a/src/displayapp/icons/navigation/end_of_road_left.svg b/src/displayapp/icons/navigation/end_of_road_left.svg
new file mode 100644
index 00000000..a9a9a34a
--- /dev/null
+++ b/src/displayapp/icons/navigation/end_of_road_left.svg
@@ -0,0 +1,58 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   inkscape:version="1.0 (4035a4fb49, 2020-05-01)"
+   sodipodi:docname="end_of_road_left.svg"
+   version="1.1"
+   viewBox="0 0 20 20"
+   height="20"
+   width="20"
+   data-name="WORKING ICONS"
+   id="WORKING_ICONS">
+  <metadata
+     id="metadata11">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs9" />
+  <sodipodi:namedview
+     inkscape:current-layer="WORKING_ICONS"
+     inkscape:window-maximized="1"
+     inkscape:window-y="22"
+     inkscape:window-x="-8"
+     inkscape:cy="10.847693"
+     inkscape:cx="11.627956"
+     inkscape:zoom="30.405592"
+     showgrid="false"
+     id="namedview7"
+     inkscape:window-height="1027"
+     inkscape:window-width="1920"
+     inkscape:pageshadow="2"
+     inkscape:pageopacity="0"
+     guidetolerance="10"
+     gridtolerance="10"
+     objecttolerance="10"
+     borderopacity="1"
+     bordercolor="#666666"
+     pagecolor="#ffffff" />
+  <title
+     id="title2">direction</title>
+  <path
+     style="stroke-width:1.24853"
+     id="path4"
+     d="m 18.738941,5.2673572 a 0.37053845,0.37053845 0 0 1 0.370139,0.3701389 v 1.2573686 a 0.37053845,0.37053845 0 0 1 -0.370139,0.370139 H 7.1232018 V 5.2673572 H 18.738929 m 0,-0.2497058 H 6.873496 V 7.5147095 H 18.738941 A 0.61983225,0.61983225 0 0 0 19.358786,6.8948647 V 5.6374961 A 0.61983225,0.61983225 0 0 0 18.738941,5.0176514 v 0 z M 10.619083,4.9947908 H 8.1375692 A 0.44643653,0.44643653 0 0 1 7.6663993,4.3175637 L 9.3441105,0.63210575 A 0.48266885,0.48266885 0 0 0 8.5656149,0.12092045 L 0.6412135,6.2661804 8.5656274,12.365794 A 0.48266885,0.48266885 0 0 0 9.3441105,11.854596 L 7.6663993,8.1691513 A 0.44647399,0.44647399 0 0 1 8.1375692,7.4918489 h 2.4955348 a 5.0663062,5.0663062 0 0 1 4.980095,5.0855581 v 6.803048 A 0.61954509,0.61954509 0 0 0 16.232744,20 h 1.256607 a 0.6194452,0.6194452 0 0 0 0.619458,-0.620307 l -0.0024,-1.876751 h 0.0039 V 12.577407 A 7.5663233,7.5663233 0 0 0 10.632816,4.9947908 l -0.01373,-0.00228"
+     fill="#000000" />
+</svg>
diff --git a/src/displayapp/icons/navigation/end_of_road_right.svg b/src/displayapp/icons/navigation/end_of_road_right.svg
new file mode 100644
index 00000000..e0fdf3ca
--- /dev/null
+++ b/src/displayapp/icons/navigation/end_of_road_right.svg
@@ -0,0 +1,58 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   inkscape:version="1.0 (4035a4fb49, 2020-05-01)"
+   sodipodi:docname="end_of_road_right.svg"
+   version="1.1"
+   viewBox="0 0 20 20"
+   height="20"
+   width="20"
+   data-name="WORKING ICONS"
+   id="WORKING_ICONS">
+  <metadata
+     id="metadata11">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs9" />
+  <sodipodi:namedview
+     inkscape:current-layer="WORKING_ICONS"
+     inkscape:window-maximized="1"
+     inkscape:window-y="22"
+     inkscape:window-x="-8"
+     inkscape:cy="11.579791"
+     inkscape:cx="10.443112"
+     inkscape:zoom="30.405592"
+     showgrid="false"
+     id="namedview7"
+     inkscape:window-height="1027"
+     inkscape:window-width="1920"
+     inkscape:pageshadow="2"
+     inkscape:pageopacity="0"
+     guidetolerance="10"
+     gridtolerance="10"
+     objecttolerance="10"
+     borderopacity="1"
+     bordercolor="#666666"
+     pagecolor="#ffffff" />
+  <title
+     id="title2">direction</title>
+  <path
+     style="stroke-width:1.24853"
+     id="path4"
+     d="M 13.501061,5.2673669 V 7.2650123 H 0.6427039 A 0.37645628,0.37645628 0 0 1 0.2666597,6.8889806 V 5.6433987 A 0.37645628,0.37645628 0 0 1 0.6427039,5.2673669 H 13.501061 M 13.750766,5.0176612 H 0.6427039 A 0.62574995,0.62574995 0 0 0 0.016954,5.6433987 V 6.8889806 A 0.62574995,0.62574995 0 0 0 0.6427039,7.514718 H 13.750766 Z m -3.745585,2.4741963 h 2.481513 a 0.44647376,0.44647376 0 0 1 0.471169,0.6773012 l -1.67771,3.6854443 a 0.48266859,0.48266859 0 0 0 0.778508,0.511173 l 7.924385,-6.0995864 -7.92441,-6.14525677 a 0.48266859,0.48266859 0 0 0 -0.778508,0.5111725 l 1.67771,3.68545607 a 0.4464363,0.4464363 0 0 1 -0.471169,0.6772268 h -2.481488 v -0.00227 l -0.01373,0.00228 A 7.5663193,7.5663193 0 0 0 2.5140148,12.577412 v 4.925531 h 0.00388 l -0.0025,1.87675 a 0.61944488,0.61944488 0 0 0 0.6195198,0.620306 H 4.3915228 A 0.61954476,0.61954476 0 0 0 5.0110676,19.380458 V 12.577414 A 5.0663035,5.0663035 0 0 1 9.99116,7.4918575 Z"
+     fill="#000000" />
+</svg>
diff --git a/src/displayapp/icons/navigation/ferry-white.svg b/src/displayapp/icons/navigation/ferry-white.svg
deleted file mode 100644
index 5c7df87e..00000000
--- a/src/displayapp/icons/navigation/ferry-white.svg
+++ /dev/null
@@ -1,4 +0,0 @@
-<svg id="WORKING_ICONS" data-name="WORKING ICONS" xmlns="http://www.w3.org/2000/svg" width="20" height="20" viewBox="0 0 20 20">
-  <title>ferry</title>
-  <path fill="#ffffff" d="m 7.3995155,14.184682 c 0.8083073,0.01079 1.5892915,0.293603 2.2170029,0.802914 l 0.3115788,0.275628 0.059919,0 0.3714978,-0.335547 c 1.17645,-0.972485 2.850946,-1.060086 4.122427,-0.215708 l 2.708339,-5.3208066 -1.79757,-1.1983797 0,-4.2542487 C 15.336866,2.9798301 14.555162,2.2242515 13.59514,2.2008831 l -0.59919,0 c 0.0411,-0.6207608 -0.4289,-1.1572754 -1.049661,-1.1983799 -0.04949,-0.00324 -0.09923,-0.00324 -0.148719,0 l -3.5951399,0 c -0.6207608,-0.041104 -1.1572755,0.4289002 -1.1983799,1.049661 -0.00324,0.049493 -0.00324,0.099226 0,0.1487189 l -0.59919,0 C 5.4448381,2.2242511 4.6631348,2.9798301 4.6072903,3.938534 l 0,4.2542487 -1.7975698,1.1983797 2.6963548,5.4286606 C 6.0624831,14.429271 6.720154,14.208649 7.3995155,14.184682 Z M 5.8056702,3.938534 c 0.012583,-0.3108597 0.2747886,-0.552573 0.5855285,-0.53999 0.00455,2.397e-4 0.00911,4.794e-4 0.013661,7.19e-4 l 7.1902793,0 c 0.310381,-0.020492 0.578698,0.2143902 0.59919,0.5247706 0.0017,0.024807 0.0017,0.049613 0,0.074419 l 0,3.5951398 L 9.9999999,5.1968329 5.8056702,7.5336738 c 0,0 0,-3.5951398 0,-3.5951398 z m 11.9837988,12.642908 0,1.19838 c -0.314695,0.02325 -0.607459,0.16969 -0.814898,0.407449 -0.325599,0.345493 -0.74036,0.594276 -1.19838,0.719028 -0.736644,0.217506 -1.533326,0.05093 -2.121133,-0.443401 l -0.467367,-0.419433 c -0.364667,-0.36263 -0.953551,-0.36263 -1.318218,0 -0.167773,0.143806 -0.323562,0.299595 -0.503319,0.443401 -0.878174,0.701771 -2.1347949,0.666299 -2.9719831,-0.08389 l -0.4673682,-0.41943 c -0.343216,-0.299834 -0.8551639,-0.299834 -1.1983799,0 C 6.5007306,18.163303 6.297006,18.367028 6.0693138,18.546785 5.2252949,19.17174 4.0641846,19.14214 3.253121,18.474885 L 2.8816233,18.151319 C 2.7082177,17.952748 2.4708186,17.821286 2.2105305,17.779822 l 0,-1.19838 c 0.3097812,-0.03835 0.6237567,0.02025 0.8987849,0.167773 0.3333893,0.206361 0.6500013,0.438727 0.9467202,0.69506 0.2457877,0.267838 0.6168061,0.382283 0.9706877,0.299595 0.1348177,-0.03991 0.2608873,-0.104978 0.3714978,-0.191741 0.1917408,-0.143805 0.3475302,-0.311578 0.5392709,-0.467368 0.8515688,-0.705606 2.0844621,-0.705606 2.9360308,0 0.1917408,0.15579 0.3714978,0.335547 0.5632386,0.491336 0.343216,0.299835 0.8551636,0.299835 1.1983796,0 0.191741,-0.155789 0.371498,-0.335546 0.563239,-0.491336 0.853606,-0.712197 2.094409,-0.712197 2.948015,0 0.179757,0.15579 0.34753,0.323563 0.527287,0.467368 0.343216,0.299835 0.855164,0.299835 1.19838,0 L 16.4353,17.060794 c 0.382882,-0.31062 0.861155,-0.479951 1.354169,-0.479352 z"/>
-</svg>
diff --git a/src/displayapp/icons/navigation/ferry.c b/src/displayapp/icons/navigation/ferry.c
deleted file mode 100644
index d4783511..00000000
--- a/src/displayapp/icons/navigation/ferry.c
+++ /dev/null
@@ -1,96 +0,0 @@
-#if defined(LV_LVGL_H_INCLUDE_SIMPLE)
-#include "lvgl.h"
-#else
-#include "lvgl/lvgl.h"
-#endif
-
-
-#ifndef LV_ATTRIBUTE_MEM_ALIGN
-#define LV_ATTRIBUTE_MEM_ALIGN
-#endif
-
-#ifndef LV_ATTRIBUTE_IMG_FERRY
-#define LV_ATTRIBUTE_IMG_FERRY
-#endif
-
-const LV_ATTRIBUTE_MEM_ALIGN LV_ATTRIBUTE_LARGE_CONST LV_ATTRIBUTE_IMG_FERRY uint8_t ferry_map[] = {
-  0x04, 0x02, 0x04, 0xff, 	/*Color of index 0*/
-  0xfc, 0xfe, 0xfc, 0xff, 	/*Color of index 1*/
-
-  0x00, 0x00, 0x0f, 0xff, 0xff, 0xf0, 0x00, 0x00, 
-  0x00, 0x00, 0x1f, 0xff, 0xff, 0xf8, 0x00, 0x00, 
-  0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 
-  0x00, 0x03, 0xff, 0xff, 0xff, 0xff, 0xc0, 0x00, 
-  0x00, 0x0f, 0xff, 0xff, 0xff, 0xff, 0xf0, 0x00, 
-  0x00, 0x0f, 0xff, 0xff, 0xff, 0xff, 0xf0, 0x00, 
-  0x00, 0x1f, 0xff, 0xff, 0xff, 0xff, 0xf8, 0x00, 
-  0x00, 0x1f, 0xff, 0xff, 0xff, 0xff, 0xf8, 0x00, 
-  0x00, 0x1f, 0xff, 0xff, 0xff, 0xff, 0xf8, 0x00, 
-  0x00, 0x1f, 0xff, 0xff, 0xff, 0xff, 0xf8, 0x00, 
-  0x00, 0x1f, 0xff, 0xff, 0xff, 0xff, 0xf8, 0x00, 
-  0x00, 0x1f, 0xe0, 0x00, 0x00, 0x07, 0xf8, 0x00, 
-  0x00, 0x1f, 0xe0, 0x00, 0x00, 0x07, 0xf8, 0x00, 
-  0x00, 0x1f, 0xe0, 0x07, 0xe0, 0x07, 0xf8, 0x00, 
-  0x00, 0x1f, 0xe0, 0x0f, 0xf0, 0x07, 0xf8, 0x00, 
-  0x00, 0x1f, 0xe0, 0x7f, 0xfc, 0x07, 0xf8, 0x00, 
-  0x00, 0x1f, 0xe0, 0xff, 0xff, 0x07, 0xf8, 0x00, 
-  0x00, 0x1f, 0xe3, 0xff, 0xff, 0xc7, 0xf8, 0x00, 
-  0x00, 0x1f, 0xef, 0xff, 0xff, 0xf7, 0xf8, 0x00, 
-  0x00, 0x1f, 0xff, 0xff, 0xff, 0xff, 0xf8, 0x00, 
-  0x00, 0x1f, 0xff, 0xff, 0xff, 0xff, 0xf8, 0x00, 
-  0x00, 0x1f, 0xff, 0xff, 0xff, 0xff, 0xf8, 0x00, 
-  0x00, 0x1f, 0xff, 0xff, 0xff, 0xff, 0xf8, 0x00, 
-  0x00, 0x1f, 0xff, 0xff, 0xff, 0xff, 0xf8, 0x00, 
-  0x00, 0x7f, 0xff, 0xff, 0xff, 0xff, 0xfe, 0x00, 
-  0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 
-  0x03, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xc0, 
-  0x07, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xe0, 
-  0x0f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xf0, 
-  0x0f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xf0, 
-  0x0f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xf0, 
-  0x0f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xf0, 
-  0x07, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xe0, 
-  0x07, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xe0, 
-  0x03, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xc0, 
-  0x03, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xc0, 
-  0x01, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x80, 
-  0x01, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x80, 
-  0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 
-  0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 
-  0x00, 0x7f, 0xff, 0xff, 0xff, 0xff, 0xfe, 0x00, 
-  0x00, 0x7f, 0xff, 0xff, 0xff, 0xff, 0xfe, 0x00, 
-  0x00, 0x3f, 0xff, 0xff, 0xff, 0xff, 0xfc, 0x00, 
-  0x00, 0x3f, 0xff, 0xff, 0xff, 0xff, 0xfc, 0x00, 
-  0x00, 0x1f, 0xff, 0xff, 0xff, 0xff, 0xf8, 0x00, 
-  0x00, 0x1f, 0xff, 0xff, 0xff, 0xff, 0xf8, 0x00, 
-  0x00, 0x0f, 0xff, 0xff, 0xff, 0xff, 0xf0, 0x00, 
-  0x00, 0x0f, 0xff, 0xff, 0xff, 0xff, 0xf0, 0x00, 
-  0x00, 0x07, 0xff, 0xff, 0xff, 0xff, 0xe0, 0x00, 
-  0x00, 0x07, 0xf8, 0x7f, 0xfc, 0x0f, 0xc0, 0x00, 
-  0x00, 0x03, 0xe0, 0x1f, 0xf8, 0x03, 0xc0, 0x00, 
-  0x00, 0x00, 0x00, 0x0f, 0xe0, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x03, 0xc0, 0x00, 0x00, 0x00, 
-  0x0f, 0x00, 0x1f, 0xe0, 0x07, 0xfc, 0x00, 0xf0, 
-  0x0f, 0xc0, 0xff, 0xf8, 0x1f, 0xff, 0x03, 0xf0, 
-  0x0f, 0xf1, 0xff, 0xfc, 0x3f, 0xff, 0x8f, 0xf0, 
-  0x0f, 0xfb, 0xff, 0xff, 0xff, 0xff, 0xdf, 0xf0, 
-  0x0f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xf0, 
-  0x0f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xf0, 
-  0x0f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xf0, 
-  0x0f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xf0, 
-  0x0f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xf0, 
-  0x0f, 0xff, 0xfd, 0xff, 0xff, 0x3f, 0xff, 0xe0, 
-  0x07, 0xff, 0xf8, 0xff, 0xff, 0x3f, 0xff, 0xc0, 
-};
-
-const lv_img_dsc_t ferry = {
-      {
-        LV_IMG_CF_INDEXED_1BIT,
-        0,
-        0,
-        64,
-        64
-    },
-    520,
-ferry_map,
-};
diff --git a/src/displayapp/icons/navigation/ferry.png b/src/displayapp/icons/navigation/ferry.png
deleted file mode 100644
index c938fccb..00000000
--- a/src/displayapp/icons/navigation/ferry.png
+++ /dev/null
diff --git a/src/displayapp/icons/navigation/ferry.svg b/src/displayapp/icons/navigation/ferry.svg
new file mode 100644
index 00000000..ed31b058
--- /dev/null
+++ b/src/displayapp/icons/navigation/ferry.svg
@@ -0,0 +1,59 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   inkscape:version="1.0 (4035a4fb49, 2020-05-01)"
+   sodipodi:docname="ferry.svg"
+   version="1.1"
+   viewBox="0 0 20 20"
+   height="20"
+   width="20"
+   data-name="WORKING ICONS"
+   id="WORKING_ICONS">
+  <metadata
+     id="metadata11">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title>ferry</dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs9" />
+  <sodipodi:namedview
+     inkscape:current-layer="WORKING_ICONS"
+     inkscape:window-maximized="1"
+     inkscape:window-y="22"
+     inkscape:window-x="-8"
+     inkscape:cy="10.712074"
+     inkscape:cx="10.100196"
+     inkscape:zoom="30.405592"
+     showgrid="false"
+     id="namedview7"
+     inkscape:window-height="1027"
+     inkscape:window-width="1920"
+     inkscape:pageshadow="2"
+     inkscape:pageopacity="0"
+     guidetolerance="10"
+     gridtolerance="10"
+     objecttolerance="10"
+     borderopacity="1"
+     bordercolor="#666666"
+     pagecolor="#ffffff" />
+  <title
+     id="title2">ferry</title>
+  <path
+     style="fill:#000000;stroke-width:1.11112"
+     id="path4"
+     d="m 7.1105735,14.649646 c 0.8981192,0.01199 1.7658794,0.326226 2.4633365,0.892126 l 0.3461986,0.306254 h 0.066576 l 0.4127764,-0.372831 c 1.307167,-1.080538 3.167717,-1.177872 4.580474,-0.239674 L 17.9892,9.323513 15.991901,7.9919801 V 3.2650373 C 15.929851,2.1998108 15.061292,1.360279 13.9946,1.3343141 h -0.665766 c 0.04567,-0.68973413 -0.476555,-1.28586139 -1.16629,-1.33153304 -0.05498,-0.003599395 -0.110256,-0.003599395 -0.165243,0 H 8.0027008 C 7.3129666,-0.04289005 6.7168393,0.47933681 6.6711677,1.1690709 c -0.0036,0.054992 -0.0036,0.1102512 0,0.1652432 H 6.005401 C 4.9387099,1.3602786 4.0701507,2.1998108 4.0081012,3.2650373 V 7.9919801 L 2.0108016,9.323513 5.0067512,15.355358 C 5.6249821,14.921412 6.3557275,14.676276 7.1105735,14.649646 Z M 5.3396344,3.2650373 c 0.013981,-0.3453996 0.3053206,-0.61397 0.6505871,-0.5999889 0.00506,2.664e-4 0.010117,5.327e-4 0.015179,7.989e-4 h 7.9891985 c 0.344868,-0.022769 0.642997,0.2382113 0.665767,0.5830784 0.0019,0.027563 0.0019,0.055126 0,0.082688 V 7.3262131 L 10,4.6631471 5.3396344,7.2596369 c 0,0 0,-3.9945996 0,-3.9945996 z M 18.654965,17.312712 v 1.331534 c -0.34966,0.02583 -0.674953,0.188545 -0.905441,0.452721 -0.361777,0.383881 -0.822623,0.660307 -1.331534,0.79892 -0.818494,0.241673 -1.703695,0.0566 -2.356815,-0.492667 L 13.54188,18.937183 c -0.405185,-0.402923 -1.059501,-0.402923 -1.464687,0 -0.186414,0.159784 -0.359514,0.332883 -0.559244,0.492668 -0.975748,0.779745 -2.3719938,0.740331 -3.3022029,-0.09322 l -0.519298,-0.466028 c -0.3813509,-0.333149 -0.950182,-0.333149 -1.331533,0 -0.2529915,0.19973 -0.479352,0.426091 -0.7323433,0.625821 -0.9377988,0.694394 -2.2279213,0.661505 -3.129103,-0.07988 L 2.0906936,19.057019 C 1.8980207,18.836386 1.634244,18.690316 1.345035,18.644246 v -1.331534 c 0.3442014,-0.04261 0.6930629,0.0225 0.9986498,0.186414 0.3704324,0.22929 0.7222236,0.487476 1.0519113,0.772289 0.2730974,0.297599 0.68534,0.42476 1.0785418,0.332884 0.1497975,-0.04434 0.2898747,-0.116642 0.4127753,-0.213045 0.2130454,-0.159784 0.3861446,-0.346198 0.5991899,-0.519298 0.9461874,-0.784007 2.3160688,-0.784007 3.2622562,0 0.2130453,0.1731 0.4127753,0.372831 0.6258206,0.545929 0.3813512,0.33315 0.9501811,0.33315 1.3315331,0 0.213046,-0.173098 0.412776,-0.372829 0.62582,-0.545929 0.948451,-0.79133 2.327122,-0.79133 3.275574,0 0.199729,0.1731 0.386144,0.359514 0.585874,0.519298 0.381351,0.333149 0.950182,0.333149 1.331532,0 l 0.625821,-0.545928 c 0.425424,-0.345134 0.956839,-0.533279 1.504631,-0.532614 z"
+     fill="#ffffff" />
+</svg>
diff --git a/src/displayapp/icons/navigation/flag-white.svg b/src/displayapp/icons/navigation/flag-white.svg
deleted file mode 100644
index b5f0e7d9..00000000
--- a/src/displayapp/icons/navigation/flag-white.svg
+++ /dev/null
@@ -1,4 +0,0 @@
-<svg id="WORKING_ICONS" data-name="WORKING ICONS" xmlns="http://www.w3.org/2000/svg" width="20" height="20" viewBox="0 0 20 20">
-  <title>direction</title>
-  <path fill="#ffffff" d="M3.5,18h0A0.5,0.5,0,0,1,3,17.5V3.5A0.5,0.5,0,0,1,3.5,3h0a0.5,0.5,0,0,1,.5.5v14A0.5,0.5,0,0,1,3.5,18ZM13.33333,7L17,3H6v8H17Z"/>
-</svg>
diff --git a/src/displayapp/icons/navigation/flag.c b/src/displayapp/icons/navigation/flag.c
deleted file mode 100644
index 164583c4..00000000
--- a/src/displayapp/icons/navigation/flag.c
+++ /dev/null
@@ -1,96 +0,0 @@
-#if defined(LV_LVGL_H_INCLUDE_SIMPLE)
-#include "lvgl.h"
-#else
-#include "lvgl/lvgl.h"
-#endif
-
-
-#ifndef LV_ATTRIBUTE_MEM_ALIGN
-#define LV_ATTRIBUTE_MEM_ALIGN
-#endif
-
-#ifndef LV_ATTRIBUTE_IMG_FLAG
-#define LV_ATTRIBUTE_IMG_FLAG
-#endif
-
-const LV_ATTRIBUTE_MEM_ALIGN LV_ATTRIBUTE_LARGE_CONST LV_ATTRIBUTE_IMG_FLAG uint8_t flag_map[] = {
-  0x04, 0x02, 0x04, 0xff, 	/*Color of index 0*/
-  0xfc, 0xfe, 0xfc, 0xff, 	/*Color of index 1*/
-
-  0x3f, 0x07, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfc, 
-  0x3f, 0x07, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfc, 
-  0x3f, 0x07, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfc, 
-  0x3f, 0x07, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfc, 
-  0x3f, 0x07, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfc, 
-  0x3f, 0x07, 0xff, 0xff, 0xff, 0xff, 0xff, 0xf8, 
-  0x3f, 0x07, 0xff, 0xff, 0xff, 0xff, 0xff, 0xf0, 
-  0x3f, 0x07, 0xff, 0xff, 0xff, 0xff, 0xff, 0xe0, 
-  0x3f, 0x07, 0xff, 0xff, 0xff, 0xff, 0xff, 0xc0, 
-  0x3f, 0x07, 0xff, 0xff, 0xff, 0xff, 0xff, 0x80, 
-  0x3f, 0x07, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 
-  0x3f, 0x07, 0xff, 0xff, 0xff, 0xff, 0xfe, 0x00, 
-  0x3f, 0x07, 0xff, 0xff, 0xff, 0xff, 0xfc, 0x00, 
-  0x3f, 0x07, 0xff, 0xff, 0xff, 0xff, 0xf8, 0x00, 
-  0x3f, 0x07, 0xff, 0xff, 0xff, 0xff, 0xf0, 0x00, 
-  0x3f, 0x07, 0xff, 0xff, 0xff, 0xff, 0xf0, 0x00, 
-  0x3f, 0x07, 0xff, 0xff, 0xff, 0xff, 0xe0, 0x00, 
-  0x3f, 0x07, 0xff, 0xff, 0xff, 0xff, 0xc0, 0x00, 
-  0x3f, 0x07, 0xff, 0xff, 0xff, 0xff, 0xe0, 0x00, 
-  0x3f, 0x07, 0xff, 0xff, 0xff, 0xff, 0xf0, 0x00, 
-  0x3f, 0x07, 0xff, 0xff, 0xff, 0xff, 0xf8, 0x00, 
-  0x3f, 0x07, 0xff, 0xff, 0xff, 0xff, 0xfc, 0x00, 
-  0x3f, 0x07, 0xff, 0xff, 0xff, 0xff, 0xfe, 0x00, 
-  0x3f, 0x07, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 
-  0x3f, 0x07, 0xff, 0xff, 0xff, 0xff, 0xff, 0x80, 
-  0x3f, 0x07, 0xff, 0xff, 0xff, 0xff, 0xff, 0xc0, 
-  0x3f, 0x07, 0xff, 0xff, 0xff, 0xff, 0xff, 0xe0, 
-  0x3f, 0x07, 0xff, 0xff, 0xff, 0xff, 0xff, 0xf0, 
-  0x3f, 0x07, 0xff, 0xff, 0xff, 0xff, 0xff, 0xf0, 
-  0x3f, 0x07, 0xff, 0xff, 0xff, 0xff, 0xff, 0xf8, 
-  0x3f, 0x07, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfc, 
-  0x3f, 0x07, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfc, 
-  0x3f, 0x07, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfc, 
-  0x3f, 0x07, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfc, 
-  0x3f, 0x07, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfc, 
-  0x3f, 0x07, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfc, 
-  0x3f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x3f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x3f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x3f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x3f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x3f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x3f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x3f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x3f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x3f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x3f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x3f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x3f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x3f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x3f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x3f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x3f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x3f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x3f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x3f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x3f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x3f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x3f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x3f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x3f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x3f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x3f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x3f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-};
-
-const lv_img_dsc_t flag = {
-      {
-        LV_IMG_CF_INDEXED_1BIT,
-        0,
-        0,
-        64,
-        64
-    },
-    520,
-flag_map,
-};
diff --git a/src/displayapp/icons/navigation/flag.png b/src/displayapp/icons/navigation/flag.png
deleted file mode 100644
index 22842cfe..00000000
--- a/src/displayapp/icons/navigation/flag.png
+++ /dev/null
diff --git a/src/displayapp/icons/navigation/flag.svg b/src/displayapp/icons/navigation/flag.svg
new file mode 100644
index 00000000..3d3391bd
--- /dev/null
+++ b/src/displayapp/icons/navigation/flag.svg
@@ -0,0 +1,58 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   inkscape:version="1.0 (4035a4fb49, 2020-05-01)"
+   sodipodi:docname="flag.svg"
+   version="1.1"
+   viewBox="0 0 20 20"
+   height="20"
+   width="20"
+   data-name="WORKING ICONS"
+   id="WORKING_ICONS">
+  <metadata
+     id="metadata11">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs9" />
+  <sodipodi:namedview
+     inkscape:current-layer="WORKING_ICONS"
+     inkscape:window-maximized="1"
+     inkscape:window-y="22"
+     inkscape:window-x="-8"
+     inkscape:cy="12.657235"
+     inkscape:cx="11.254072"
+     inkscape:zoom="21.5"
+     showgrid="false"
+     id="namedview7"
+     inkscape:window-height="1027"
+     inkscape:window-width="1920"
+     inkscape:pageshadow="2"
+     inkscape:pageopacity="0"
+     guidetolerance="10"
+     gridtolerance="10"
+     objecttolerance="10"
+     borderopacity="1"
+     bordercolor="#666666"
+     pagecolor="#ffffff" />
+  <title
+     id="title2">direction</title>
+  <path
+     style="stroke-width:1.33333"
+     id="path4"
+     d="m 1.3333332,20 v 0 A 0.66666667,0.66666667 0 0 1 0.6666665,19.333333 V 0.6666667 A 0.66666667,0.66666667 0 0 1 1.3333332,0 V 0 A 0.66666667,0.66666667 0 0 1 1.9999998,0.6666667 V 19.333333 A 0.66666667,0.66666667 0 0 1 1.3333332,20 Z M 14.44444,5.3333333 19.333334,0 H 4.6666665 V 10.666667 H 19.333334 Z"
+     fill="#000000" />
+</svg>
diff --git a/src/displayapp/icons/navigation/fork-left-white.svg b/src/displayapp/icons/navigation/fork-left-white.svg
deleted file mode 100644
index 7b6b6327..00000000
--- a/src/displayapp/icons/navigation/fork-left-white.svg
+++ /dev/null
@@ -1,4 +0,0 @@
-<svg id="WORKING_ICONS" data-name="WORKING ICONS" xmlns="http://www.w3.org/2000/svg" width="20" height="20" viewBox="0 0 20 20">
-  <title>direction</title>
-  <path fill="#ffffff" d="M17.73611,6.57682a0.30465,0.30465,0,0,1,.23032.10507l0.649,0.74859a0.30457,0.30457,0,0,1-.03369.43226L16.5213,9.60119a5.4089,5.4089,0,0,0-1.73306,4.29459l0.0047,3.60769A0.29612,0.29612,0,0,1,14.4968,17.8H13.49033a0.29657,0.29657,0,0,1-.29623-0.29622l-0.00058-3.47624A6.99129,6.99129,0,0,1,15.463,8.40138l2.077-1.75275a0.30475,0.30475,0,0,1,.1962-0.07182m0-.2a0.50269,0.50269,0,0,0-.32516.119L15.334,8.24854A7.25157,7.25157,0,0,0,12.99411,14.043v3.46082A0.49622,0.49622,0,0,0,13.49033,18H14.4968a0.49614,0.49614,0,0,0,.49615-0.49681l-0.0047-3.60767a5.2182,5.2182,0,0,1,1.665-4.14405L18.71066,8.0156a0.50455,0.50455,0,0,0,.05585-0.71613l-0.649-.74859a0.50345,0.50345,0,0,0-.38147-0.17406h0ZM9.00078,5.98169H7.01323a0.35757,0.35757,0,0,1-.37738-0.54242L7.9796,2.48743A0.38659,0.38659,0,0,0,7.35606,2.078L1.00908,7l6.347,4.88544A0.38659,0.38659,0,0,0,7.9796,11.476L6.63585,8.52417a0.3576,0.3576,0,0,1,.37738-0.54248H9.012a4.05782,4.05782,0,0,1,3.98877,4.07324v5.44885A0.49622,0.49622,0,0,0,13.497,18h1.00647a0.49614,0.49614,0,0,0,.49615-0.49683L14.99766,16h0.00311V12.05493a6.06019,6.06019,0,0,0-5.989-6.07324l-0.011-.00183"/>
-</svg>
diff --git a/src/displayapp/icons/navigation/fork-left.c b/src/displayapp/icons/navigation/fork-left.c
deleted file mode 100644
index 1640a228..00000000
--- a/src/displayapp/icons/navigation/fork-left.c
+++ /dev/null
@@ -1,96 +0,0 @@
-#if defined(LV_LVGL_H_INCLUDE_SIMPLE)
-#include "lvgl.h"
-#else
-#include "lvgl/lvgl.h"
-#endif
-
-
-#ifndef LV_ATTRIBUTE_MEM_ALIGN
-#define LV_ATTRIBUTE_MEM_ALIGN
-#endif
-
-#ifndef LV_ATTRIBUTE_IMG_FORK_LEFT
-#define LV_ATTRIBUTE_IMG_FORK_LEFT
-#endif
-
-const LV_ATTRIBUTE_MEM_ALIGN LV_ATTRIBUTE_LARGE_CONST LV_ATTRIBUTE_IMG_FORK_LEFT uint8_t fork_left_map[] = {
-  0x04, 0x02, 0x04, 0xff, 	/*Color of index 0*/
-  0xfc, 0xfe, 0xfc, 0xff, 	/*Color of index 1*/
-
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x3f, 0xe0, 0x00, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x7f, 0xe0, 0x00, 0x00, 0x00, 0x00, 
-  0x00, 0x01, 0xff, 0xe0, 0x00, 0x00, 0x00, 0x00, 
-  0x00, 0x01, 0xff, 0xe0, 0x00, 0x00, 0x00, 0x00, 
-  0x00, 0x07, 0xff, 0xe0, 0x00, 0x00, 0x00, 0x00, 
-  0x00, 0x0f, 0xff, 0xc0, 0x00, 0x00, 0x00, 0x00, 
-  0x00, 0x3f, 0xff, 0xc0, 0x00, 0x00, 0x00, 0x00, 
-  0x00, 0x3f, 0xff, 0x80, 0x00, 0x00, 0x00, 0x00, 
-  0x00, 0xff, 0xff, 0x80, 0x00, 0x00, 0x00, 0x00, 
-  0x03, 0xff, 0xff, 0x80, 0x00, 0x00, 0x00, 0x00, 
-  0x07, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x0f, 0xff, 0xfe, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x1f, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 
-  0x7f, 0xff, 0xff, 0xff, 0xf8, 0x00, 0x00, 0x00, 
-  0xff, 0xff, 0xff, 0xff, 0xfe, 0x00, 0x00, 0xfe, 
-  0xff, 0xff, 0xff, 0xff, 0xff, 0xc0, 0x01, 0xff, 
-  0xff, 0xff, 0xff, 0xff, 0xff, 0xe0, 0x03, 0xff, 
-  0xff, 0xff, 0xff, 0xff, 0xff, 0xf0, 0x0f, 0xff, 
-  0xff, 0xff, 0xff, 0xff, 0xff, 0xf8, 0x0f, 0xff, 
-  0xff, 0xff, 0xff, 0xff, 0xff, 0xfe, 0x3f, 0xff, 
-  0xff, 0xff, 0xff, 0xff, 0xff, 0xfe, 0x7f, 0xff, 
-  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
-  0x7f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x7f, 
-  0x1f, 0xff, 0xfe, 0x0f, 0xff, 0xff, 0xff, 0xff, 
-  0x0f, 0xff, 0xfe, 0x01, 0xff, 0xff, 0xff, 0xff, 
-  0x03, 0xff, 0xff, 0x00, 0x3f, 0xff, 0xff, 0xfe, 
-  0x03, 0xff, 0xff, 0x00, 0x1f, 0xff, 0xff, 0xfc, 
-  0x00, 0xff, 0xff, 0x80, 0x07, 0xff, 0xff, 0xf0, 
-  0x00, 0x7f, 0xff, 0x80, 0x07, 0xff, 0xff, 0xe0, 
-  0x00, 0x1f, 0xff, 0xc0, 0x03, 0xff, 0xff, 0xc0, 
-  0x00, 0x0f, 0xff, 0xc0, 0x01, 0xff, 0xff, 0x80, 
-  0x00, 0x07, 0xff, 0xe0, 0x01, 0xff, 0xff, 0x00, 
-  0x00, 0x01, 0xff, 0xe0, 0x00, 0xff, 0xfe, 0x00, 
-  0x00, 0x00, 0xff, 0xe0, 0x00, 0xff, 0xfe, 0x00, 
-  0x00, 0x00, 0x7f, 0xe0, 0x00, 0x7f, 0xfc, 0x00, 
-  0x00, 0x00, 0x3f, 0xe0, 0x00, 0x7f, 0xfc, 0x00, 
-  0x00, 0x00, 0x0f, 0xe0, 0x00, 0x7f, 0xf8, 0x00, 
-  0x00, 0x00, 0x07, 0xc0, 0x00, 0x7f, 0xf8, 0x00, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x7f, 0xf0, 0x00, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x7f, 0xf0, 0x00, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x7f, 0xf0, 0x00, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x7f, 0xf0, 0x00, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x7f, 0xf0, 0x00, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x7f, 0xf0, 0x00, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x7f, 0xf0, 0x00, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x7f, 0xf0, 0x00, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x7f, 0xf0, 0x00, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x7f, 0xf0, 0x00, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x7f, 0xf0, 0x00, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x7f, 0xf0, 0x00, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x7f, 0xf0, 0x00, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x7f, 0xf0, 0x00, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x7f, 0xf0, 0x00, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x7f, 0xf0, 0x00, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x7f, 0xf0, 0x00, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x7f, 0xf0, 0x00, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x7f, 0xf0, 0x00, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-};
-
-const lv_img_dsc_t fork_left = {
-      {
-        LV_IMG_CF_INDEXED_1BIT,
-        0,
-        0,
-        64,
-        64
-    },
-    520,
-fork_left_map,
-};
diff --git a/src/displayapp/icons/navigation/fork-left.png b/src/displayapp/icons/navigation/fork-left.png
deleted file mode 100644
index 1459b359..00000000
--- a/src/displayapp/icons/navigation/fork-left.png
+++ /dev/null
diff --git a/src/displayapp/icons/navigation/fork-right-white.svg b/src/displayapp/icons/navigation/fork-right-white.svg
deleted file mode 100644
index 99e7e565..00000000
--- a/src/displayapp/icons/navigation/fork-right-white.svg
+++ /dev/null
@@ -1,4 +0,0 @@
-<svg id="WORKING_ICONS" data-name="WORKING ICONS" xmlns="http://www.w3.org/2000/svg" width="20" height="20" viewBox="0 0 20 20">
-  <title>direction</title>
-  <path fill="#ffffff" d="M2.27386,6.57682A0.30457,0.30457,0,0,1,2.47,6.64864L4.544,8.39882A7.00218,7.00218,0,0,1,6.81586,14.043v3.46088A0.29651,0.29651,0,0,1,6.51968,17.8H5.51318A0.29613,0.29613,0,0,1,5.217,17.50343L5.22079,13.9146a5.42,5.42,0,0,0-1.73517-4.316L1.42825,7.86274a0.30461,0.30461,0,0,1-.03372-0.43226l0.649-.74859a0.30466,0.30466,0,0,1,.23035-0.10507m0-.2a0.50345,0.50345,0,0,0-.38147.17406l-0.649.74859a0.50458,0.50458,0,0,0,.05588.71613L3.35666,9.75146a5.2182,5.2182,0,0,1,1.665,4.14405L5.017,17.50317A0.49617,0.49617,0,0,0,5.51318,18h1.0065a0.49616,0.49616,0,0,0,.49615-0.49615V14.043A7.25157,7.25157,0,0,0,4.676,8.24854L2.599,6.49579a0.50264,0.50264,0,0,0-.32516-0.119h0ZM11.0083,7.98169h1.98755a0.3576,0.3576,0,0,1,.37738.54248L12.02948,11.476a0.38659,0.38659,0,0,0,.62354.40942L19,7,12.653,2.078a0.38659,0.38659,0,0,0-.62354.40942l1.34375,2.95184a0.35757,0.35757,0,0,1-.37738.54242H11.0083V5.97986l-0.011.00183a6.06019,6.06019,0,0,0-5.989,6.07324V16H5.01141l-0.002,1.50317A0.49614,0.49614,0,0,0,5.50562,18H6.51208a0.49622,0.49622,0,0,0,.49622-0.49622V12.05493a4.05782,4.05782,0,0,1,3.98877-4.07324H11.0083Z"/>
-</svg>
diff --git a/src/displayapp/icons/navigation/fork-right.c b/src/displayapp/icons/navigation/fork-right.c
deleted file mode 100644
index 162b53dd..00000000
--- a/src/displayapp/icons/navigation/fork-right.c
+++ /dev/null
@@ -1,96 +0,0 @@
-#if defined(LV_LVGL_H_INCLUDE_SIMPLE)
-#include "lvgl.h"
-#else
-#include "lvgl/lvgl.h"
-#endif
-
-
-#ifndef LV_ATTRIBUTE_MEM_ALIGN
-#define LV_ATTRIBUTE_MEM_ALIGN
-#endif
-
-#ifndef LV_ATTRIBUTE_IMG_FORK_RIGHT
-#define LV_ATTRIBUTE_IMG_FORK_RIGHT
-#endif
-
-const LV_ATTRIBUTE_MEM_ALIGN LV_ATTRIBUTE_LARGE_CONST LV_ATTRIBUTE_IMG_FORK_RIGHT uint8_t fork_right_map[] = {
-  0x04, 0x02, 0x04, 0xff, 	/*Color of index 0*/
-  0xfc, 0xfe, 0xfc, 0xff, 	/*Color of index 1*/
-
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x00, 0x07, 0xfc, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x00, 0x07, 0xfe, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x00, 0x07, 0xff, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x00, 0x07, 0xff, 0xc0, 0x00, 
-  0x00, 0x00, 0x00, 0x00, 0x07, 0xff, 0xe0, 0x00, 
-  0x00, 0x00, 0x00, 0x00, 0x03, 0xff, 0xf0, 0x00, 
-  0x00, 0x00, 0x00, 0x00, 0x03, 0xff, 0xfc, 0x00, 
-  0x00, 0x00, 0x00, 0x00, 0x03, 0xff, 0xfe, 0x00, 
-  0x00, 0x00, 0x00, 0x00, 0x01, 0xff, 0xff, 0x00, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xc0, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xe0, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xf0, 
-  0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xf8, 
-  0x00, 0x00, 0x00, 0x3f, 0xff, 0xff, 0xff, 0xfe, 
-  0x7f, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 
-  0xff, 0x80, 0x03, 0xff, 0xff, 0xff, 0xff, 0xff, 
-  0xff, 0xc0, 0x07, 0xff, 0xff, 0xff, 0xff, 0xff, 
-  0xff, 0xe0, 0x0f, 0xff, 0xff, 0xff, 0xff, 0xff, 
-  0xff, 0xf0, 0x3f, 0xff, 0xff, 0xff, 0xff, 0xff, 
-  0xff, 0xfc, 0x7f, 0xff, 0xff, 0xff, 0xff, 0xff, 
-  0xff, 0xfe, 0x7f, 0xff, 0xff, 0xff, 0xff, 0xff, 
-  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
-  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfe, 
-  0xff, 0xff, 0xff, 0xff, 0xf0, 0x7f, 0xff, 0xf8, 
-  0xff, 0xbf, 0xff, 0xff, 0x00, 0xff, 0xff, 0xf0, 
-  0x7f, 0xff, 0xff, 0xfc, 0x00, 0xff, 0xff, 0xe0, 
-  0x3f, 0xff, 0xff, 0xf8, 0x00, 0xff, 0xff, 0xc0, 
-  0x1f, 0xf7, 0xff, 0xf0, 0x01, 0xff, 0xff, 0x00, 
-  0x0f, 0xff, 0xff, 0xe0, 0x03, 0xff, 0xfe, 0x00, 
-  0x03, 0xff, 0xff, 0xc0, 0x03, 0xff, 0xf8, 0x00, 
-  0x01, 0xff, 0xff, 0x80, 0x03, 0xff, 0xf0, 0x00, 
-  0x00, 0xff, 0xff, 0x00, 0x07, 0xff, 0xe0, 0x00, 
-  0x00, 0xff, 0xff, 0x00, 0x07, 0xff, 0x80, 0x00, 
-  0x00, 0x7f, 0xff, 0x00, 0x07, 0xff, 0x00, 0x00, 
-  0x00, 0x3f, 0xfe, 0x00, 0x07, 0xfe, 0x00, 0x00, 
-  0x00, 0x3f, 0xfe, 0x00, 0x07, 0xfc, 0x00, 0x00, 
-  0x00, 0x1f, 0xfe, 0x00, 0x07, 0xf0, 0x00, 0x00, 
-  0x00, 0x1f, 0xfe, 0x00, 0x03, 0xe0, 0x00, 0x00, 
-  0x00, 0x1f, 0xfe, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x00, 0x0f, 0xfe, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x00, 0x0f, 0xfe, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x00, 0x0f, 0xfe, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x00, 0x0f, 0xfe, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x00, 0x0f, 0xfe, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x00, 0x0f, 0xfe, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x00, 0x0f, 0xfe, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x00, 0x0f, 0xfe, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x00, 0x0f, 0xfe, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x00, 0x0f, 0xfe, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x00, 0x0f, 0xfe, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x00, 0x0f, 0xfe, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x00, 0x0f, 0xfe, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x00, 0x0f, 0xfe, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x00, 0x0f, 0xfe, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x00, 0x0f, 0xfe, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x00, 0x0f, 0xfe, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x00, 0x0f, 0xfe, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-};
-
-const lv_img_dsc_t fork_right = {
-      {
-        LV_IMG_CF_INDEXED_1BIT,
-        0,
-        0,
-        64,
-        64
-    },
-    520,
-fork_right_map,
-};
diff --git a/src/displayapp/icons/navigation/fork-right.png b/src/displayapp/icons/navigation/fork-right.png
deleted file mode 100644
index c1d655be..00000000
--- a/src/displayapp/icons/navigation/fork-right.png
+++ /dev/null
diff --git a/src/displayapp/icons/navigation/fork-slight-left-white.svg b/src/displayapp/icons/navigation/fork-slight-left-white.svg
deleted file mode 100644
index f19e01b4..00000000
--- a/src/displayapp/icons/navigation/fork-slight-left-white.svg
+++ /dev/null
@@ -1,4 +0,0 @@
-<svg id="WORKING_ICONS" data-name="WORKING ICONS" xmlns="http://www.w3.org/2000/svg" width="20" height="20" viewBox="0 0 20 20">
-  <title>direction</title>
-  <path fill="#ffffff" d="M15.75607,6.57682a0.30471,0.30471,0,0,1,.23035.10507l0.649,0.74859a0.30457,0.30457,0,0,1-.03369.43226L14.54129,9.60119a5.4089,5.4089,0,0,0-1.73306,4.29459l0.0047,3.60769a0.29613,0.29613,0,0,1-.29614.29654H11.51031a0.29657,0.29657,0,0,1-.29623-0.29622L11.2135,14.02754a6.99129,6.99129,0,0,1,2.26944-5.62616l2.077-1.75275a0.30461,0.30461,0,0,1,.19617-0.07182m0-.2a0.50263,0.50263,0,0,0-.32516.119l-2.077,1.75275A7.25157,7.25157,0,0,0,11.0141,14.043v3.46082A0.49622,0.49622,0,0,0,11.51031,18h1.00647a0.49616,0.49616,0,0,0,.49615-0.49681l-0.0047-3.60767a5.2182,5.2182,0,0,1,1.665-4.14405L16.73065,8.0156a0.50458,0.50458,0,0,0,.05585-0.71613l-0.649-.74859a0.50345,0.50345,0,0,0-.38147-0.17406h0Zm-5.11,1.87171L8.18859,6.17468a0.3576,0.3576,0,0,1,.07019-0.6571L11.2077,4.16742a0.38658,0.38658,0,0,0-.20294-0.71777L3,3l1.58044,7.86a0.38663,0.38663,0,0,0,.73938.09912L6.238,7.84851a0.35758,0.35758,0,0,1,.6405-0.16266L9.32672,9.75146a5.21819,5.21819,0,0,1,1.665,4.144l-0.0047,3.60767A0.49614,0.49614,0,0,0,11.48321,18h1.00653a0.49621,0.49621,0,0,0,.49615-0.49622V14.043A7.25158,7.25158,0,0,0,10.64605,8.24854Z"/>
-</svg>
diff --git a/src/displayapp/icons/navigation/fork-slight-left.c b/src/displayapp/icons/navigation/fork-slight-left.c
deleted file mode 100644
index 5b8e194f..00000000
--- a/src/displayapp/icons/navigation/fork-slight-left.c
+++ /dev/null
@@ -1,96 +0,0 @@
-#if defined(LV_LVGL_H_INCLUDE_SIMPLE)
-#include "lvgl.h"
-#else
-#include "lvgl/lvgl.h"
-#endif
-
-
-#ifndef LV_ATTRIBUTE_MEM_ALIGN
-#define LV_ATTRIBUTE_MEM_ALIGN
-#endif
-
-#ifndef LV_ATTRIBUTE_IMG_FORK_SLIGHT_LEFT
-#define LV_ATTRIBUTE_IMG_FORK_SLIGHT_LEFT
-#endif
-
-const LV_ATTRIBUTE_MEM_ALIGN LV_ATTRIBUTE_LARGE_CONST LV_ATTRIBUTE_IMG_FORK_SLIGHT_LEFT uint8_t fork_slight_left_map[] = {
-  0x04, 0x02, 0x04, 0xff, 	/*Color of index 0*/
-  0xfc, 0xfe, 0xfc, 0xff, 	/*Color of index 1*/
-
-  0x3f, 0xff, 0xff, 0xff, 0xfe, 0x00, 0x00, 0x00, 
-  0x3f, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 
-  0x3f, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 
-  0x3f, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 
-  0x3f, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 
-  0x3f, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 
-  0x3f, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 
-  0x3f, 0xff, 0xff, 0xff, 0xfe, 0x00, 0x00, 0x00, 
-  0x3f, 0xff, 0xff, 0xff, 0xf0, 0x00, 0x00, 0x00, 
-  0x3f, 0xff, 0xff, 0xff, 0xc0, 0x00, 0x00, 0x00, 
-  0x3f, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 
-  0x3f, 0xff, 0xff, 0xfc, 0x00, 0x00, 0x00, 0x00, 
-  0x3f, 0xff, 0xff, 0xe0, 0x00, 0x00, 0x03, 0xe0, 
-  0x1f, 0xff, 0xff, 0xf8, 0x00, 0x00, 0x07, 0xf8, 
-  0x1f, 0xff, 0xff, 0xfc, 0x00, 0x00, 0x0f, 0xf8, 
-  0x1f, 0xff, 0xff, 0xfe, 0x00, 0x00, 0x1f, 0xfc, 
-  0x1f, 0xff, 0xff, 0xff, 0x00, 0x00, 0x3f, 0xfc, 
-  0x1f, 0xff, 0xff, 0xff, 0x80, 0x00, 0xff, 0xfc, 
-  0x0f, 0xff, 0xff, 0xff, 0xc0, 0x01, 0xff, 0xfc, 
-  0x0f, 0xff, 0xff, 0xff, 0xf0, 0x03, 0xff, 0x7c, 
-  0x0f, 0xff, 0xff, 0xff, 0xf8, 0x07, 0xfe, 0x7c, 
-  0x0f, 0xff, 0xff, 0xff, 0xfc, 0x1f, 0xfd, 0xfc, 
-  0x0f, 0xff, 0xff, 0xff, 0xfe, 0x1f, 0xf3, 0xfc, 
-  0x07, 0xff, 0xff, 0xff, 0xff, 0x3f, 0xe7, 0xfc, 
-  0x07, 0xff, 0xcf, 0xff, 0xff, 0xff, 0xcf, 0xfc, 
-  0x07, 0xff, 0x87, 0xff, 0xff, 0xff, 0x9f, 0xf8, 
-  0x07, 0xff, 0x83, 0xff, 0xff, 0xff, 0x7f, 0xe0, 
-  0x07, 0xff, 0x81, 0xff, 0xff, 0xfe, 0xff, 0xc0, 
-  0x03, 0xff, 0x00, 0x7f, 0xff, 0xfd, 0xff, 0x80, 
-  0x03, 0xff, 0x00, 0x3f, 0xff, 0xfb, 0xff, 0x00, 
-  0x03, 0xff, 0x00, 0x1f, 0xff, 0xf3, 0xfe, 0x00, 
-  0x03, 0xfe, 0x00, 0x0f, 0xff, 0xff, 0xfc, 0x00, 
-  0x03, 0xfe, 0x00, 0x07, 0xff, 0xff, 0xf8, 0x00, 
-  0x01, 0xfe, 0x00, 0x03, 0xff, 0xff, 0xe0, 0x00, 
-  0x01, 0xfc, 0x00, 0x03, 0xff, 0xff, 0xe0, 0x00, 
-  0x01, 0xfc, 0x00, 0x01, 0xff, 0xff, 0xc0, 0x00, 
-  0x01, 0xfc, 0x00, 0x00, 0xff, 0xff, 0xc0, 0x00, 
-  0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0x80, 0x00, 
-  0x00, 0x00, 0x00, 0x00, 0x7f, 0xff, 0x80, 0x00, 
-  0x00, 0x00, 0x00, 0x00, 0x7f, 0xff, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x00, 0x7f, 0xff, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x00, 0x3f, 0xff, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x00, 0x3f, 0xfe, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x00, 0x3f, 0xfe, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x00, 0x3f, 0xfe, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x00, 0x3f, 0xfe, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x00, 0x3f, 0xfe, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x00, 0x3f, 0xfe, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x00, 0x3f, 0xfe, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x00, 0x3f, 0xfe, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x00, 0x3f, 0xfe, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x00, 0x3f, 0xfe, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x00, 0x3f, 0xfe, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x00, 0x3f, 0xfe, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x00, 0x3f, 0xfe, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x00, 0x3f, 0xfe, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x00, 0x3f, 0xfe, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x00, 0x3f, 0xfe, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x00, 0x3f, 0xfe, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x00, 0x3f, 0xfe, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x00, 0x3f, 0xfe, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x00, 0x3f, 0xfe, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x00, 0x3f, 0xfe, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x00, 0x3f, 0xfe, 0x00, 0x00, 
-};
-
-const lv_img_dsc_t fork_slight_left = {
-      {
-        LV_IMG_CF_INDEXED_1BIT,
-        0,
-        0,
-        64,
-        64
-    },
-    520,
-fork_slight_left_map,
-};
diff --git a/src/displayapp/icons/navigation/fork-slight-left.png b/src/displayapp/icons/navigation/fork-slight-left.png
deleted file mode 100644
index c61bf0e5..00000000
--- a/src/displayapp/icons/navigation/fork-slight-left.png
+++ /dev/null
diff --git a/src/displayapp/icons/navigation/fork-slight-right-white.svg b/src/displayapp/icons/navigation/fork-slight-right-white.svg
deleted file mode 100644
index 25ac5752..00000000
--- a/src/displayapp/icons/navigation/fork-slight-right-white.svg
+++ /dev/null
@@ -1,4 +0,0 @@
-<svg id="WORKING_ICONS" data-name="WORKING ICONS" xmlns="http://www.w3.org/2000/svg" width="20" height="20" viewBox="0 0 20 20">
-  <title>direction</title>
-  <path fill="#ffffff" d="M4.26865,6.57682a0.30457,0.30457,0,0,1,.19617.07182l2.074,1.75018A7.00218,7.00218,0,0,1,8.81064,14.043v3.46088A0.29651,0.29651,0,0,1,8.51447,17.8H7.50793a0.29612,0.29612,0,0,1-.29614-0.29655L7.21558,13.9146a5.42,5.42,0,0,0-1.73517-4.316L3.423,7.86274a0.30454,0.30454,0,0,1-.03372-0.43226l0.649-.74859a0.30466,0.30466,0,0,1,.23035-0.10507m0-.2a0.50345,0.50345,0,0,0-.38147.17406l-0.649.74859a0.50455,0.50455,0,0,0,.05588.71613L5.35144,9.75146a5.2182,5.2182,0,0,1,1.665,4.14405l-0.0047,3.60767A0.49614,0.49614,0,0,0,7.50793,18H8.51447a0.49616,0.49616,0,0,0,.49615-0.49615V14.043A7.25157,7.25157,0,0,0,6.67078,8.24854l-2.077-1.75275a0.50264,0.50264,0,0,0-.32516-0.119h0ZM7.0141,14.043v3.46082A0.49621,0.49621,0,0,0,7.51025,18H8.51678a0.49614,0.49614,0,0,0,.49615-0.49683l-0.0047-3.60767a5.21819,5.21819,0,0,1,1.665-4.144l2.44818-2.06561a0.35758,0.35758,0,0,1,.6405.16266l0.91821,3.1106A0.38663,0.38663,0,0,0,15.41956,10.86L17,3l-8.00476.44965a0.38658,0.38658,0,0,0-.20294.71777l2.94891,1.35016a0.3576,0.3576,0,0,1,.07019.6571L9.35394,8.24854A7.25157,7.25157,0,0,0,7.0141,14.043Z"/>
-</svg>
diff --git a/src/displayapp/icons/navigation/fork-slight-right.c b/src/displayapp/icons/navigation/fork-slight-right.c
deleted file mode 100644
index f2c4dec2..00000000
--- a/src/displayapp/icons/navigation/fork-slight-right.c
+++ /dev/null
@@ -1,96 +0,0 @@
-#if defined(LV_LVGL_H_INCLUDE_SIMPLE)
-#include "lvgl.h"
-#else
-#include "lvgl/lvgl.h"
-#endif
-
-
-#ifndef LV_ATTRIBUTE_MEM_ALIGN
-#define LV_ATTRIBUTE_MEM_ALIGN
-#endif
-
-#ifndef LV_ATTRIBUTE_IMG_FORK_SLIGHT_RIGHT
-#define LV_ATTRIBUTE_IMG_FORK_SLIGHT_RIGHT
-#endif
-
-const LV_ATTRIBUTE_MEM_ALIGN LV_ATTRIBUTE_LARGE_CONST LV_ATTRIBUTE_IMG_FORK_SLIGHT_RIGHT uint8_t fork_slight_right_map[] = {
-  0x04, 0x02, 0x04, 0xff, 	/*Color of index 0*/
-  0xfc, 0xfe, 0xfc, 0xff, 	/*Color of index 1*/
-
-  0x00, 0x00, 0x00, 0x7f, 0xff, 0xff, 0xff, 0xfc, 
-  0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xfc, 
-  0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xfc, 
-  0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xfc, 
-  0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xfc, 
-  0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xfc, 
-  0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xfc, 
-  0x00, 0x00, 0x00, 0x3f, 0xff, 0xff, 0xff, 0xfc, 
-  0x00, 0x00, 0x00, 0x0f, 0xff, 0xff, 0xff, 0xfc, 
-  0x00, 0x00, 0x00, 0x03, 0xff, 0xff, 0xff, 0xfc, 
-  0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xfc, 
-  0x00, 0x00, 0x00, 0x00, 0x3f, 0xff, 0xff, 0xfc, 
-  0x07, 0xc0, 0x00, 0x00, 0x07, 0xff, 0xff, 0xfc, 
-  0x1f, 0xe0, 0x00, 0x00, 0x1f, 0xff, 0xff, 0xf8, 
-  0x1f, 0xf0, 0x00, 0x00, 0x3f, 0xff, 0xff, 0xf8, 
-  0x3f, 0xf8, 0x00, 0x00, 0x7f, 0xff, 0xff, 0xf8, 
-  0x3f, 0xfc, 0x00, 0x00, 0xff, 0xff, 0xff, 0xf8, 
-  0x3f, 0xff, 0x00, 0x01, 0xff, 0xff, 0xff, 0xf8, 
-  0x3f, 0xff, 0x80, 0x03, 0xff, 0xff, 0xff, 0xf0, 
-  0x3e, 0xff, 0xc0, 0x0f, 0xff, 0xff, 0xff, 0xf0, 
-  0x3f, 0x7f, 0xf0, 0x1f, 0xff, 0xff, 0xff, 0xf0, 
-  0x3f, 0xbf, 0xf8, 0x3f, 0xff, 0xff, 0xff, 0xf0, 
-  0x3f, 0xcf, 0xfc, 0x7f, 0xff, 0xff, 0xff, 0xf0, 
-  0x3f, 0xe7, 0xfc, 0xff, 0xff, 0xff, 0xff, 0xe0, 
-  0x3f, 0xf3, 0xff, 0xff, 0xff, 0xf3, 0xff, 0xe0, 
-  0x0f, 0xfd, 0xff, 0xff, 0xff, 0xe1, 0xff, 0xe0, 
-  0x07, 0xfe, 0xff, 0xff, 0xff, 0xc1, 0xff, 0xe0, 
-  0x03, 0xff, 0x7f, 0xff, 0xff, 0x81, 0xff, 0xe0, 
-  0x01, 0xff, 0xbf, 0xff, 0xfe, 0x00, 0xff, 0xc0, 
-  0x00, 0xff, 0xdf, 0xff, 0xfc, 0x00, 0xff, 0xc0, 
-  0x00, 0x7f, 0xcf, 0xff, 0xf8, 0x00, 0xff, 0xc0, 
-  0x00, 0x1f, 0xff, 0xff, 0xf0, 0x00, 0x7f, 0xc0, 
-  0x00, 0x1f, 0xff, 0xff, 0xe0, 0x00, 0x7f, 0xc0, 
-  0x00, 0x07, 0xff, 0xff, 0xc0, 0x00, 0x7f, 0x80, 
-  0x00, 0x07, 0xff, 0xff, 0xc0, 0x00, 0x3f, 0x80, 
-  0x00, 0x03, 0xff, 0xff, 0x80, 0x00, 0x3f, 0x80, 
-  0x00, 0x03, 0xff, 0xff, 0x00, 0x00, 0x3f, 0x80, 
-  0x00, 0x01, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 
-  0x00, 0x01, 0xff, 0xfe, 0x00, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0xff, 0xfe, 0x00, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0xff, 0xfe, 0x00, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0xff, 0xfc, 0x00, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x7f, 0xfc, 0x00, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x7f, 0xfc, 0x00, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x7f, 0xfc, 0x00, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x7f, 0xfc, 0x00, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x7f, 0xfc, 0x00, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x7f, 0xfc, 0x00, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x7f, 0xfc, 0x00, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x7f, 0xfc, 0x00, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x7f, 0xfc, 0x00, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x7f, 0xfc, 0x00, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x7f, 0xfc, 0x00, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x7f, 0xfc, 0x00, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x7f, 0xfc, 0x00, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x7f, 0xfc, 0x00, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x7f, 0xfc, 0x00, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x7f, 0xfc, 0x00, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x7f, 0xfc, 0x00, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x7f, 0xfc, 0x00, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x7f, 0xfc, 0x00, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x7f, 0xfc, 0x00, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x7f, 0xfc, 0x00, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x7f, 0xfc, 0x00, 0x00, 0x00, 0x00, 
-};
-
-const lv_img_dsc_t fork_slight_right = {
-      {
-        LV_IMG_CF_INDEXED_1BIT,
-        0,
-        0,
-        64,
-        64
-    },
-    520,
-fork_slight_right_map,
-};
diff --git a/src/displayapp/icons/navigation/fork-slight-right.png b/src/displayapp/icons/navigation/fork-slight-right.png
deleted file mode 100644
index f6a942fd..00000000
--- a/src/displayapp/icons/navigation/fork-slight-right.png
+++ /dev/null
diff --git a/src/displayapp/icons/navigation/fork-straight-white.svg b/src/displayapp/icons/navigation/fork-straight-white.svg
deleted file mode 100644
index 128c5944..00000000
--- a/src/displayapp/icons/navigation/fork-straight-white.svg
+++ /dev/null
@@ -1,4 +0,0 @@
-<svg id="WORKING_ICONS" data-name="WORKING ICONS" xmlns="http://www.w3.org/2000/svg" width="20" height="20" viewBox="0 0 20 20">
-  <title>direction</title>
-  <path fill="#ffffff" d="M17.75607,6.59766a0.30466,0.30466,0,0,1,.23035.10507l0.649,0.74859a0.30457,0.30457,0,0,1-.03369.43226L16.54129,9.622a5.4089,5.4089,0,0,0-1.73306,4.29459l0.0047,3.60769a0.29613,0.29613,0,0,1-.29614.29654H13.51031a0.29657,0.29657,0,0,1-.29623-0.29622L13.2135,14.04838a6.99129,6.99129,0,0,1,2.26944-5.62616l2.077-1.75275a0.30461,0.30461,0,0,1,.19617-0.07182m0-.2a0.50264,0.50264,0,0,0-.32516.119l-2.077,1.75275A7.25157,7.25157,0,0,0,13.0141,14.0638v3.46082a0.49622,0.49622,0,0,0,.49622.49622h1.00647a0.49616,0.49616,0,0,0,.49615-0.49681l-0.0047-3.60767a5.2182,5.2182,0,0,1,1.665-4.14405l2.05737-1.73586A0.50455,0.50455,0,0,0,18.7865,7.3203l-0.649-.74859a0.50345,0.50345,0,0,0-.38147-0.17406h0ZM2.24393,6.57682a0.30457,0.30457,0,0,1,.19617.07182l2.074,1.75018A7.00218,7.00218,0,0,1,6.78592,14.043v3.46088A0.29651,0.29651,0,0,1,6.48975,17.8H5.48322a0.29613,0.29613,0,0,1-.29614-0.29655L5.19086,13.9146a5.42,5.42,0,0,0-1.73517-4.316L1.39832,7.86274a0.30457,0.30457,0,0,1-.03369-0.43226l0.649-.74859a0.30466,0.30466,0,0,1,.23035-0.10507m0-.2a0.50345,0.50345,0,0,0-.38147.17406l-0.649.74859a0.50455,0.50455,0,0,0,.05585.71613L3.32672,9.75146a5.2182,5.2182,0,0,1,1.665,4.14405l-0.0047,3.60767A0.49616,0.49616,0,0,0,5.48322,18H6.48975a0.49616,0.49616,0,0,0,.49615-0.49615V14.043A7.25157,7.25157,0,0,0,4.64606,8.24854l-2.077-1.75275a0.50264,0.50264,0,0,0-.32516-0.119h0Zm12.66891,1.966L10.00916,2,5.10547,8.34283a0.38659,0.38659,0,0,0,.40942.62354L8.46674,7.62262A0.35756,0.35756,0,0,1,9.00916,8v9.49652A0.50346,0.50346,0,0,0,9.51263,18h0.993a0.50346,0.50346,0,0,0,.50348-0.50348V8a0.35755,0.35755,0,0,1,.54242-0.37738l2.95184,1.34375A0.3866,0.3866,0,0,0,14.91284,8.34283Z"/>
-</svg>
diff --git a/src/displayapp/icons/navigation/fork-straight.c b/src/displayapp/icons/navigation/fork-straight.c
deleted file mode 100644
index e8df2070..00000000
--- a/src/displayapp/icons/navigation/fork-straight.c
+++ /dev/null
@@ -1,96 +0,0 @@
-#if defined(LV_LVGL_H_INCLUDE_SIMPLE)
-#include "lvgl.h"
-#else
-#include "lvgl/lvgl.h"
-#endif
-
-
-#ifndef LV_ATTRIBUTE_MEM_ALIGN
-#define LV_ATTRIBUTE_MEM_ALIGN
-#endif
-
-#ifndef LV_ATTRIBUTE_IMG_FORK_STRAIGHT
-#define LV_ATTRIBUTE_IMG_FORK_STRAIGHT
-#endif
-
-const LV_ATTRIBUTE_MEM_ALIGN LV_ATTRIBUTE_LARGE_CONST LV_ATTRIBUTE_IMG_FORK_STRAIGHT uint8_t fork_straight_map[] = {
-  0x04, 0x02, 0x04, 0xff, 	/*Color of index 0*/
-  0xfc, 0xfe, 0xfc, 0xff, 	/*Color of index 1*/
-
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x0f, 0xf0, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x1f, 0xf8, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x3f, 0xfc, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x3f, 0xfc, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x7f, 0xfe, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0xff, 0xff, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x01, 0xff, 0xff, 0x80, 0x00, 0x00, 
-  0x00, 0x00, 0x01, 0xff, 0xff, 0x80, 0x00, 0x00, 
-  0x00, 0x00, 0x03, 0xff, 0xff, 0xc0, 0x00, 0x00, 
-  0x00, 0x00, 0x07, 0xff, 0xff, 0xe0, 0x00, 0x00, 
-  0x00, 0x00, 0x0f, 0xff, 0xff, 0xf0, 0x00, 0x00, 
-  0x00, 0x00, 0x0f, 0xff, 0xff, 0xf8, 0x00, 0x00, 
-  0x00, 0x00, 0x1f, 0xff, 0xff, 0xf8, 0x00, 0x00, 
-  0x3e, 0x00, 0x3f, 0xff, 0xff, 0xfc, 0x00, 0x00, 
-  0x7f, 0x00, 0x7f, 0xff, 0xff, 0xfe, 0x00, 0xfe, 
-  0xff, 0x80, 0xff, 0xff, 0xff, 0xff, 0x01, 0xff, 
-  0xff, 0xc0, 0xff, 0xff, 0xff, 0xff, 0x03, 0xff, 
-  0xff, 0xf1, 0xff, 0xff, 0xff, 0xff, 0x8f, 0xff, 
-  0xff, 0xfb, 0xff, 0xff, 0xff, 0xff, 0xdf, 0xff, 
-  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
-  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
-  0xfd, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xbf, 
-  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
-  0xff, 0xff, 0xff, 0xbf, 0xfd, 0xff, 0xff, 0xff, 
-  0xff, 0xff, 0xfe, 0x3f, 0xfc, 0x7f, 0xff, 0xff, 
-  0x3f, 0xff, 0xf0, 0x3f, 0xfc, 0x0f, 0xff, 0xfe, 
-  0x3f, 0xff, 0xf0, 0x3f, 0xfc, 0x0f, 0xff, 0xfc, 
-  0x0f, 0xff, 0xf0, 0x3f, 0xfc, 0x0f, 0xff, 0xf0, 
-  0x07, 0xff, 0xf8, 0x3f, 0xfc, 0x1f, 0xff, 0xe0, 
-  0x03, 0xff, 0xf8, 0x3f, 0xfc, 0x1f, 0xff, 0xc0, 
-  0x01, 0xff, 0xfc, 0x3f, 0xfc, 0x3f, 0xff, 0x80, 
-  0x00, 0xfe, 0xfc, 0x3f, 0xfc, 0x3f, 0x7f, 0x00, 
-  0x00, 0x7f, 0xfc, 0x3f, 0xfc, 0x3f, 0xfe, 0x00, 
-  0x00, 0x3f, 0x7e, 0x3f, 0xfc, 0x7e, 0xfe, 0x00, 
-  0x00, 0x3f, 0x7e, 0x3f, 0xfc, 0x7e, 0xfc, 0x00, 
-  0x00, 0x3f, 0x7e, 0x3f, 0xfc, 0x7e, 0xfc, 0x00, 
-  0x00, 0x1f, 0xbe, 0x3f, 0xfc, 0x7d, 0xf8, 0x00, 
-  0x00, 0x1f, 0xbe, 0x3f, 0xfc, 0x7d, 0xf8, 0x00, 
-  0x00, 0x0f, 0xbe, 0x3f, 0xfc, 0x7d, 0xf0, 0x00, 
-  0x00, 0x0f, 0xbe, 0x3f, 0xfc, 0x7d, 0xf0, 0x00, 
-  0x00, 0x0f, 0xbe, 0x3f, 0xfc, 0x7d, 0xf0, 0x00, 
-  0x00, 0x0f, 0xbe, 0x3f, 0xfc, 0x7d, 0xf0, 0x00, 
-  0x00, 0x0f, 0xbe, 0x3f, 0xfc, 0x7d, 0xf0, 0x00, 
-  0x00, 0x0f, 0xbe, 0x3f, 0xfc, 0x7d, 0xf0, 0x00, 
-  0x00, 0x0f, 0xbe, 0x3f, 0xfc, 0x7d, 0xf0, 0x00, 
-  0x00, 0x0f, 0xbe, 0x3f, 0xfc, 0x7d, 0xf0, 0x00, 
-  0x00, 0x0f, 0xbe, 0x3f, 0xfc, 0x7d, 0xf0, 0x00, 
-  0x00, 0x0f, 0xbe, 0x3f, 0xfc, 0x7d, 0xf0, 0x00, 
-  0x00, 0x0f, 0xbe, 0x3f, 0xfc, 0x7d, 0xf0, 0x00, 
-  0x00, 0x0f, 0xbe, 0x3f, 0xfc, 0x7d, 0xf0, 0x00, 
-  0x00, 0x0f, 0xbe, 0x3f, 0xfc, 0x7d, 0xf0, 0x00, 
-  0x00, 0x0f, 0xbe, 0x3f, 0xfc, 0x7d, 0xf0, 0x00, 
-  0x00, 0x0f, 0xbe, 0x3f, 0xfc, 0x7d, 0xf0, 0x00, 
-  0x00, 0x0f, 0xbe, 0x3f, 0xfc, 0x7d, 0xf0, 0x00, 
-  0x00, 0x0f, 0xfe, 0x3f, 0xfc, 0x7f, 0xf0, 0x00, 
-  0x00, 0x0f, 0xfe, 0x3f, 0xfc, 0x7f, 0xf0, 0x00, 
-  0x00, 0x0f, 0xfe, 0x3f, 0xfc, 0x7f, 0xf0, 0x00, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-};
-
-const lv_img_dsc_t fork_straight = {
-      {
-        LV_IMG_CF_INDEXED_1BIT,
-        0,
-        0,
-        64,
-        64
-    },
-    520,
-fork_straight_map,
-};
diff --git a/src/displayapp/icons/navigation/fork-straight.png b/src/displayapp/icons/navigation/fork-straight.png
deleted file mode 100644
index f0f5a7d6..00000000
--- a/src/displayapp/icons/navigation/fork-straight.png
+++ /dev/null
diff --git a/src/displayapp/icons/navigation/fork-white.svg b/src/displayapp/icons/navigation/fork-white.svg
deleted file mode 100644
index 0192689c..00000000
--- a/src/displayapp/icons/navigation/fork-white.svg
+++ /dev/null
@@ -1,4 +0,0 @@
-<svg id="WORKING_ICONS" data-name="WORKING ICONS" xmlns="http://www.w3.org/2000/svg" width="20" height="20" viewBox="0 0 20 20">
-  <title>direction</title>
-  <path fill="#ffffff" d="M19,3l-1.58044,7.86a0.38663,0.38663,0,0,1-.73938.09912L15.762,7.84851a0.35758,0.35758,0,0,0-.6405-0.16266L12.67328,9.75146a5.21819,5.21819,0,0,0-1.665,4.144l0.0047,3.60767A0.49614,0.49614,0,0,1,10.51678,18H9.48322a0.49614,0.49614,0,0,1-.49615-0.49683l0.0047-3.60767a5.21819,5.21819,0,0,0-1.665-4.144L4.87854,7.68585a0.35758,0.35758,0,0,0-.6405.16266l-0.91821,3.1106A0.38663,0.38663,0,0,1,2.58044,10.86L1,3,9.00476,3.44965a0.38658,0.38658,0,0,1,.20294.71777L6.25879,5.51758a0.3576,0.3576,0,0,0-.07019.6571L8.64606,8.24854A6.64064,6.64064,0,0,1,10,9.89148a6.64064,6.64064,0,0,1,1.35394-1.64294L13.8114,6.17468a0.3576,0.3576,0,0,0-.07019-0.6571L10.7923,4.16742a0.38658,0.38658,0,0,1,.20294-0.71777Z"/>
-</svg>
diff --git a/src/displayapp/icons/navigation/fork.c b/src/displayapp/icons/navigation/fork.c
deleted file mode 100644
index 60d4df96..00000000
--- a/src/displayapp/icons/navigation/fork.c
+++ /dev/null
@@ -1,96 +0,0 @@
-#if defined(LV_LVGL_H_INCLUDE_SIMPLE)
-#include "lvgl.h"
-#else
-#include "lvgl/lvgl.h"
-#endif
-
-
-#ifndef LV_ATTRIBUTE_MEM_ALIGN
-#define LV_ATTRIBUTE_MEM_ALIGN
-#endif
-
-#ifndef LV_ATTRIBUTE_IMG_FORK
-#define LV_ATTRIBUTE_IMG_FORK
-#endif
-
-const LV_ATTRIBUTE_MEM_ALIGN LV_ATTRIBUTE_LARGE_CONST LV_ATTRIBUTE_IMG_FORK uint8_t fork_map[] = {
-  0x04, 0x02, 0x04, 0xff, 	/*Color of index 0*/
-  0xfc, 0xfe, 0xfc, 0xff, 	/*Color of index 1*/
-
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
-  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
-  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
-  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
-  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
-  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
-  0xff, 0xff, 0xff, 0xfe, 0x3f, 0xff, 0xff, 0xff, 
-  0xff, 0xff, 0xff, 0xf0, 0x0f, 0xff, 0xff, 0xff, 
-  0xff, 0xff, 0xff, 0xc0, 0x03, 0xff, 0xff, 0xff, 
-  0xff, 0xff, 0xff, 0x00, 0x00, 0xff, 0xff, 0xff, 
-  0xff, 0xff, 0xfc, 0x00, 0x00, 0x3f, 0xff, 0xff, 
-  0xff, 0xff, 0xfe, 0x00, 0x00, 0x7f, 0xff, 0xff, 
-  0xff, 0xff, 0xff, 0x00, 0x00, 0xff, 0xff, 0xff, 
-  0xff, 0xff, 0xff, 0x80, 0x01, 0xff, 0xff, 0xff, 
-  0x7f, 0xff, 0xff, 0xe0, 0x07, 0xff, 0xff, 0xfe, 
-  0x7f, 0xff, 0xff, 0xf0, 0x0f, 0xff, 0xff, 0xfe, 
-  0x7f, 0xff, 0xff, 0xf8, 0x1f, 0xff, 0xff, 0xfe, 
-  0x7f, 0xff, 0xff, 0xfc, 0x3f, 0xff, 0xff, 0xfe, 
-  0x3f, 0xff, 0xff, 0xfe, 0x7f, 0xff, 0xff, 0xfc, 
-  0x3f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfc, 
-  0x3f, 0xfb, 0xff, 0xff, 0xff, 0xff, 0xdf, 0xfc, 
-  0x3f, 0xf9, 0xff, 0xff, 0xff, 0xff, 0x9f, 0xfc, 
-  0x3f, 0xf8, 0x7f, 0xff, 0xff, 0xfe, 0x1f, 0xfc, 
-  0x3f, 0xf0, 0x3f, 0xff, 0xff, 0xfc, 0x0f, 0xfc, 
-  0x1f, 0xf0, 0x1f, 0xff, 0xff, 0xf8, 0x0f, 0xf8, 
-  0x1f, 0xf0, 0x0f, 0xff, 0xff, 0xf0, 0x0f, 0xf8, 
-  0x1f, 0xe0, 0x07, 0xff, 0xff, 0xe0, 0x07, 0xf8, 
-  0x1f, 0xe0, 0x03, 0xff, 0xff, 0xc0, 0x07, 0xf8, 
-  0x0f, 0xe0, 0x01, 0xff, 0xff, 0x80, 0x07, 0xf0, 
-  0x0f, 0xe0, 0x00, 0xff, 0xff, 0x00, 0x07, 0xf0, 
-  0x0f, 0xc0, 0x00, 0xff, 0xff, 0x00, 0x03, 0xf0, 
-  0x00, 0x00, 0x00, 0x7f, 0xfe, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x7f, 0xfe, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x3f, 0xfc, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x3f, 0xfc, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x3f, 0xfc, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x3f, 0xfc, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x3f, 0xfc, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x3f, 0xfc, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x3f, 0xfc, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x3f, 0xfc, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x3f, 0xfc, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x3f, 0xfc, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x3f, 0xfc, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x3f, 0xfc, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x3f, 0xfc, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x3f, 0xfc, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x3f, 0xfc, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x3f, 0xfc, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x3f, 0xfc, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x3f, 0xfc, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x3f, 0xfc, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x3f, 0xfc, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-};
-
-const lv_img_dsc_t fork = {
-      {
-        LV_IMG_CF_INDEXED_1BIT,
-        0,
-        0,
-        64,
-        64
-    },
-    520,
-fork_map,
-};
diff --git a/src/displayapp/icons/navigation/fork.png b/src/displayapp/icons/navigation/fork.png
deleted file mode 100644
index 5a8e4db9..00000000
--- a/src/displayapp/icons/navigation/fork.png
+++ /dev/null
diff --git a/src/displayapp/icons/navigation/fork.svg b/src/displayapp/icons/navigation/fork.svg
new file mode 100644
index 00000000..8689ca36
--- /dev/null
+++ b/src/displayapp/icons/navigation/fork.svg
@@ -0,0 +1,58 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   inkscape:version="1.0 (4035a4fb49, 2020-05-01)"
+   sodipodi:docname="fork.svg"
+   version="1.1"
+   viewBox="0 0 20 20"
+   height="20"
+   width="20"
+   data-name="WORKING ICONS"
+   id="WORKING_ICONS">
+  <metadata
+     id="metadata11">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs9" />
+  <sodipodi:namedview
+     inkscape:current-layer="WORKING_ICONS"
+     inkscape:window-maximized="1"
+     inkscape:window-y="22"
+     inkscape:window-x="-8"
+     inkscape:cy="14.142136"
+     inkscape:cx="11.485662"
+     inkscape:zoom="21.5"
+     showgrid="false"
+     id="namedview7"
+     inkscape:window-height="1027"
+     inkscape:window-width="1920"
+     inkscape:pageshadow="2"
+     inkscape:pageopacity="0"
+     guidetolerance="10"
+     gridtolerance="10"
+     objecttolerance="10"
+     borderopacity="1"
+     bordercolor="#666666"
+     pagecolor="#ffffff" />
+  <title
+     id="title2">direction</title>
+  <path
+     style="stroke-width:1.11111"
+     id="path4"
+     d="m 20,1.6666665 -1.756044,8.7333325 a 0.42958889,0.42958889 0 0 1 -0.821534,0.110134 l -1.0202,-3.4562332 A 0.39731111,0.39731111 0 0 0 15.690556,6.8731665 l -2.720245,2.295122 a 5.7979889,5.7979889 0 0 0 -1.85,4.6044445 l 0.0052,4.008522 A 0.55126667,0.55126667 0 0 1 10.5742,18.333333 H 9.4258 A 0.55126667,0.55126667 0 0 1 8.8745222,17.781299 l 0.00522,-4.008522 a 5.7979889,5.7979889 0 0 0 -1.85,-4.6044435 L 4.3094889,6.8731665 A 0.39731111,0.39731111 0 0 0 3.5978222,7.0538998 L 2.5775889,10.510122 A 0.42958889,0.42958889 0 0 1 1.7560444,10.399999 L 0,1.6666665 8.8941778,2.1662776 A 0.42953333,0.42953333 0 0 1 9.119667,2.9637998 L 5.8431,4.4639776 A 0.39733333,0.39733333 0 0 0 5.7651111,5.1940887 L 8.4956222,7.4983776 A 7.3784889,7.3784889 0 0 1 10,9.3238665 7.3784889,7.3784889 0 0 1 11.504378,7.4983776 L 14.234889,5.1940887 A 0.39733333,0.39733333 0 0 0 14.1569,4.4639776 L 10.880333,2.9637998 a 0.42953333,0.42953333 0 0 1 0.225489,-0.7975222 z"
+     fill="#000000" />
+</svg>
diff --git a/src/displayapp/icons/navigation/fork_left.svg b/src/displayapp/icons/navigation/fork_left.svg
new file mode 100644
index 00000000..024e9f91
--- /dev/null
+++ b/src/displayapp/icons/navigation/fork_left.svg
@@ -0,0 +1,58 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   inkscape:version="1.0 (4035a4fb49, 2020-05-01)"
+   sodipodi:docname="fork_left.svg"
+   version="1.1"
+   viewBox="0 0 20 20"
+   height="20"
+   width="20"
+   data-name="WORKING ICONS"
+   id="WORKING_ICONS">
+  <metadata
+     id="metadata11">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs9" />
+  <sodipodi:namedview
+     inkscape:current-layer="WORKING_ICONS"
+     inkscape:window-maximized="1"
+     inkscape:window-y="22"
+     inkscape:window-x="-8"
+     inkscape:cy="12.194055"
+     inkscape:cx="11.458416"
+     inkscape:zoom="21.5"
+     showgrid="false"
+     id="namedview7"
+     inkscape:window-height="1027"
+     inkscape:window-width="1920"
+     inkscape:pageshadow="2"
+     inkscape:pageopacity="0"
+     guidetolerance="10"
+     gridtolerance="10"
+     objecttolerance="10"
+     borderopacity="1"
+     bordercolor="#666666"
+     pagecolor="#ffffff" />
+  <title
+     id="title2">direction</title>
+  <path
+     style="stroke-width:1.11852"
+     id="path4"
+     d="m 18.709557,6.1816503 a 0.34075743,0.34075743 0 0 1 0.257618,0.117523 l 0.72592,0.8373137 a 0.34066795,0.34066795 0 0 1 -0.03768,0.4834919 l -2.304646,1.9444924 a 6.0499684,6.0499684 0 0 0 -1.938464,4.8035897 l 0.0053,4.035277 a 0.33121645,0.33121645 0 0 1 -0.331239,0.331675 h -1.125757 a 0.33171978,0.33171978 0 0 1 -0.33134,-0.331328 l -6.49e-4,-3.888248 a 7.8199049,7.8199049 0 0 1 2.538415,-6.2929779 l 2.323169,-1.9604878 a 0.34086928,0.34086928 0 0 1 0.219453,-0.080332 m 0,-0.2237042 a 0.56226933,0.56226933 0 0 0 -0.363698,0.133104 L 16.022746,8.0515043 A 8.1110335,8.1110335 0 0 0 13.40553,14.532729 v 3.871 a 0.5550325,0.5550325 0 0 0 0.555033,0.554988 h 1.125757 a 0.55494302,0.55494302 0 0 0 0.554955,-0.555692 l -0.0053,-4.035255 A 5.8366664,5.8366664 0 0 1 17.498312,9.7325633 L 19.799568,7.790956 a 0.56434978,0.56434978 0 0 0 0.06247,-0.8010064 L 19.136161,6.1526359 A 0.56311941,0.56311941 0 0 0 18.709478,5.9579461 v 0 z M 8.9389061,5.5159849 H 6.7157896 A 0.39994956,0.39994956 0 0 1 6.2936822,4.9092767 L 7.7966948,1.6075816 A 0.43240904,0.43240904 0 0 0 7.0992522,1.1496256 L 2.155426e-5,6.6549861 7.0992746,12.119453 A 0.43240904,0.43240904 0 0 0 7.7966948,11.661486 L 6.2936822,8.3598023 A 0.39998312,0.39998312 0 0 1 6.7157896,7.753027 h 2.2356663 a 4.538757,4.538757 0 0 1 4.4615231,4.556004 v 6.094654 a 0.5550325,0.5550325 0 0 0 0.555044,0.555032 h 1.125758 a 0.55494302,0.55494302 0 0 0 0.554954,-0.555715 l -0.0022,-1.681327 h 0.0035 V 12.309031 A 6.7784499,6.7784499 0 0 0 8.9511986,5.5159849 l -0.012304,-0.00205"
+     fill="#000000" />
+</svg>
diff --git a/src/displayapp/icons/navigation/fork_right.svg b/src/displayapp/icons/navigation/fork_right.svg
new file mode 100644
index 00000000..533cdf5e
--- /dev/null
+++ b/src/displayapp/icons/navigation/fork_right.svg
@@ -0,0 +1,58 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   inkscape:version="1.0 (4035a4fb49, 2020-05-01)"
+   sodipodi:docname="fork_right.svg"
+   version="1.1"
+   viewBox="0 0 20 20"
+   height="20"
+   width="20"
+   data-name="WORKING ICONS"
+   id="WORKING_ICONS">
+  <metadata
+     id="metadata11">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs9" />
+  <sodipodi:namedview
+     inkscape:current-layer="WORKING_ICONS"
+     inkscape:window-maximized="1"
+     inkscape:window-y="22"
+     inkscape:window-x="-8"
+     inkscape:cy="14.755168"
+     inkscape:cx="10.164237"
+     inkscape:zoom="21.5"
+     showgrid="false"
+     id="namedview7"
+     inkscape:window-height="1027"
+     inkscape:window-width="1920"
+     inkscape:pageshadow="2"
+     inkscape:pageopacity="0"
+     guidetolerance="10"
+     gridtolerance="10"
+     objecttolerance="10"
+     borderopacity="1"
+     bordercolor="#666666"
+     pagecolor="#ffffff" />
+  <title
+     id="title2">direction</title>
+  <path
+     style="stroke-width:1.11858"
+     id="path4"
+     d="m 1.2905552,6.1814629 a 0.34068443,0.34068443 0 0 1 0.2193973,0.080336 l 2.3199249,1.9577078 a 7.8324646,7.8324646 0 0 1 2.5412462,6.3134403 v 3.871254 A 0.33166872,0.33166872 0 0 1 6.039824,18.735434 H 4.9139781 A 0.33124366,0.33124366 0 0 1 4.5826785,18.403698 l 0.00424,-4.014376 A 6.0626773,6.0626773 0 0 0 2.6459998,9.5615506 L 0.34467691,7.6198611 A 0.34072918,0.34072918 0 0 1 0.30695851,7.1363458 L 1.0329138,6.2989916 A 0.34078511,0.34078511 0 0 1 1.2905776,6.1814629 m 0,-0.223715 A 0.56314666,0.56314666 0 0 0 0.86387471,6.1524471 l -0.7259553,0.8373541 a 0.56441065,0.56441065 0 0 0 0.062506,0.8010453 L 2.5017484,9.7325366 A 5.8369489,5.8369489 0 0 1 4.364176,14.367968 l -0.00521,4.035439 a 0.55500343,0.55500343 0 0 0 0.5550146,0.555742 h 1.1258459 a 0.55499225,0.55499225 0 0 0 0.554981,-0.554981 V 14.532947 A 8.111426,8.111426 0 0 0 3.9775293,8.0514074 L 1.6542487,6.0908248 A 0.56224062,0.56224062 0 0 0 1.2905328,5.9577143 v 0 z m 9.7701054,1.7951677 h 2.223224 a 0.40000248,0.40000248 0 0 1 0.422128,0.6068046 l -1.503086,3.3018438 a 0.43242997,0.43242997 0 0 0 0.697477,0.457967 L 20,6.6548215 12.900403,1.1491946 a 0.43242997,0.43242997 0 0 0 -0.697476,0.4579671 l 1.503085,3.3018549 a 0.39996892,0.39996892 0 0 1 -0.422128,0.6067375 h -2.223201 v -0.00204 l -0.01231,0.00205 A 6.778778,6.778778 0 0 0 4.3492319,12.309141 v 4.412857 h 0.00348 l -0.00224,1.681409 A 0.55496988,0.55496988 0 0 0 4.90552,18.959149 h 1.1258012 a 0.55505936,0.55505936 0 0 0 0.5550594,-0.55506 V 12.309141 A 4.5389766,4.5389766 0 0 1 11.048119,7.7529156 Z"
+     fill="#000000" />
+</svg>
diff --git a/src/displayapp/icons/navigation/fork_slight_left.svg b/src/displayapp/icons/navigation/fork_slight_left.svg
new file mode 100644
index 00000000..24e75486
--- /dev/null
+++ b/src/displayapp/icons/navigation/fork_slight_left.svg
@@ -0,0 +1,58 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   inkscape:version="1.0 (4035a4fb49, 2020-05-01)"
+   sodipodi:docname="fork_slight_left.svg"
+   version="1.1"
+   viewBox="0 0 20 20"
+   height="20"
+   width="20"
+   data-name="WORKING ICONS"
+   id="WORKING_ICONS">
+  <metadata
+     id="metadata11">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs9" />
+  <sodipodi:namedview
+     inkscape:current-layer="WORKING_ICONS"
+     inkscape:window-maximized="1"
+     inkscape:window-y="22"
+     inkscape:window-x="-8"
+     inkscape:cy="12.698104"
+     inkscape:cx="11.049728"
+     inkscape:zoom="21.5"
+     showgrid="false"
+     id="namedview7"
+     inkscape:window-height="1027"
+     inkscape:window-width="1920"
+     inkscape:pageshadow="2"
+     inkscape:pageopacity="0"
+     guidetolerance="10"
+     gridtolerance="10"
+     objecttolerance="10"
+     borderopacity="1"
+     bordercolor="#666666"
+     pagecolor="#ffffff" />
+  <title
+     id="title2">direction</title>
+  <path
+     style="stroke-width:1.33333"
+     id="path4"
+     d="m 17.734901,4.7690933 a 0.40628,0.40628 0 0 1 0.307134,0.1400934 l 0.865333,0.99812 a 0.40609333,0.40609333 0 0 1 -0.04492,0.5763466 L 16.115195,8.801587 a 7.2118667,7.2118667 0 0 0 -2.310747,5.72612 l 0.0063,4.810253 a 0.39484,0.39484 0 0 1 -0.394854,0.395387 h -1.342006 a 0.39542667,0.39542667 0 0 1 -0.394973,-0.39496 l -7.74e-4,-4.635 a 9.32172,9.32172 0 0 1 3.02592,-7.501547 l 2.769334,-2.337 a 0.40614667,0.40614667 0 0 1 0.26156,-0.09576 m 0,-0.2666667 A 0.67017333,0.67017333 0 0 0 17.301408,4.66108 l -2.769333,2.337 a 9.66876,9.66876 0 0 0 -3.1198,7.72592 v 4.614427 A 0.66162667,0.66162667 0 0 0 12.073888,20 h 1.34196 a 0.66154667,0.66154667 0 0 0 0.661533,-0.662413 l -0.0063,-4.810227 a 6.9576,6.9576 0 0 1 2.22,-5.5254 l 2.743226,-2.3144933 a 0.67277333,0.67277333 0 0 0 0.07447,-0.95484 l -0.865333,-0.99812 a 0.67126667,0.67126667 0 0 0 -0.508627,-0.23208 v 0 z M 10.921621,6.9980267 7.6449282,4.2329067 A 0.4768,0.4768 0 0 1 7.7385152,3.3567733 L 11.670408,1.55656 A 0.51544,0.51544 0 0 0 11.399821,0.5995333 L 0.72680818,0 2.8340615,10.48 a 0.51550667,0.51550667 0 0 0 0.98584,0.13216 l 1.22424,-4.14748 a 0.47677333,0.47677333 0 0 1 0.854,-0.21688 l 3.2642937,2.754147 a 6.9575867,6.9575867 0 0 1 2.2199998,5.525333 l -0.0063,4.810227 A 0.66152,0.66152 0 0 0 12.037755,20 h 1.34204 a 0.66161333,0.66161333 0 0 0 0.661533,-0.661627 V 14.724 A 9.6687733,9.6687733 0 0 0 10.921541,6.9980533 Z"
+     fill="#000000" />
+</svg>
diff --git a/src/displayapp/icons/navigation/fork_slight_right.svg b/src/displayapp/icons/navigation/fork_slight_right.svg
new file mode 100644
index 00000000..6bb260e6
--- /dev/null
+++ b/src/displayapp/icons/navigation/fork_slight_right.svg
@@ -0,0 +1,58 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   inkscape:version="1.0 (4035a4fb49, 2020-05-01)"
+   sodipodi:docname="fork_slight_right.svg"
+   version="1.1"
+   viewBox="0 0 20 20"
+   height="20"
+   width="20"
+   data-name="WORKING ICONS"
+   id="WORKING_ICONS">
+  <metadata
+     id="metadata11">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs9" />
+  <sodipodi:namedview
+     inkscape:current-layer="WORKING_ICONS"
+     inkscape:window-maximized="1"
+     inkscape:window-y="22"
+     inkscape:window-x="-8"
+     inkscape:cy="13.501857"
+     inkscape:cx="12.330285"
+     inkscape:zoom="21.5"
+     showgrid="false"
+     id="namedview7"
+     inkscape:window-height="1027"
+     inkscape:window-width="1920"
+     inkscape:pageshadow="2"
+     inkscape:pageopacity="0"
+     guidetolerance="10"
+     gridtolerance="10"
+     objecttolerance="10"
+     borderopacity="1"
+     bordercolor="#666666"
+     pagecolor="#ffffff" />
+  <title
+     id="title2">direction</title>
+  <path
+     style="stroke-width:1.33333"
+     id="path4"
+     d="m 2.2816345,4.7690933 a 0.40609333,0.40609333 0 0 1 0.26156,0.09576 L 5.3085279,7.198427 A 9.33624,9.33624 0 0 1 8.3376209,14.724 v 4.614507 a 0.39534667,0.39534667 0 0 1 -0.394893,0.394826 H 6.6006745 a 0.39482667,0.39482667 0 0 1 -0.3948533,-0.3954 l 0.00505,-4.785133 a 7.2266667,7.2266667 0 0 0 -2.31356,-5.754667 l -2.74321,-2.3144797 a 0.40605333,0.40605333 0 0 1 -0.04496,-0.5763466 l 0.8653333,-0.99812 A 0.40621333,0.40621333 0 0 1 2.2816079,4.7690933 m 0,-0.2666666 a 0.67126667,0.67126667 0 0 0 -0.5086267,0.23208 l -0.86533331,0.99812 a 0.67273333,0.67273333 0 0 0 0.074507,0.95484 L 3.7253549,9.001947 a 6.9576,6.9576 0 0 1 2.22,5.5254 l -0.00627,4.810226 A 0.66152,0.66152 0 0 0 6.6006745,20 h 1.3420534 a 0.66154667,0.66154667 0 0 0 0.661533,-0.661533 V 14.724 A 9.66876,9.66876 0 0 0 5.4844745,6.9980533 l -2.7693333,-2.337 A 0.67018667,0.67018667 0 0 0 2.2815945,4.5023867 v 0 z M 5.9422345,14.724 v 4.614427 A 0.66161333,0.66161333 0 0 0 6.6037679,20 h 1.34204 a 0.66152,0.66152 0 0 0 0.661533,-0.66244 l -0.0063,-4.810227 A 6.9575867,6.9575867 0 0 1 10.821041,9.002 l 3.26424,-2.7541467 a 0.47677333,0.47677333 0 0 1 0.854,0.21688 L 16.163595,10.6122 A 0.51550667,0.51550667 0 0 0 17.149515,10.48 L 19.256768,0 8.5837549,0.5995333 A 0.51544,0.51544 0 0 0 8.3131679,1.55656 l 3.9318801,1.8002133 a 0.4768,0.4768 0 0 1 0.09359,0.8761334 L 9.0620209,6.9980533 A 9.66876,9.66876 0 0 0 5.9422345,14.724 Z"
+     fill="#000000" />
+</svg>
diff --git a/src/displayapp/icons/navigation/fork_straight.svg b/src/displayapp/icons/navigation/fork_straight.svg
new file mode 100644
index 00000000..be15f0c9
--- /dev/null
+++ b/src/displayapp/icons/navigation/fork_straight.svg
@@ -0,0 +1,58 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   inkscape:version="1.0 (4035a4fb49, 2020-05-01)"
+   sodipodi:docname="fork_straight.svg"
+   version="1.1"
+   viewBox="0 0 20 20"
+   height="20"
+   width="20"
+   data-name="WORKING ICONS"
+   id="WORKING_ICONS">
+  <metadata
+     id="metadata11">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs9" />
+  <sodipodi:namedview
+     inkscape:current-layer="WORKING_ICONS"
+     inkscape:window-maximized="1"
+     inkscape:window-y="22"
+     inkscape:window-x="-8"
+     inkscape:cy="20.732098"
+     inkscape:cx="13.834961"
+     inkscape:zoom="15.202796"
+     showgrid="false"
+     id="namedview7"
+     inkscape:window-height="1027"
+     inkscape:window-width="1920"
+     inkscape:pageshadow="2"
+     inkscape:pageopacity="0"
+     guidetolerance="10"
+     gridtolerance="10"
+     objecttolerance="10"
+     borderopacity="1"
+     bordercolor="#666666"
+     pagecolor="#ffffff" />
+  <title
+     id="title2">direction</title>
+  <path
+     style="stroke-width:1.12236"
+     id="path4"
+     d="m 18.705082,6.1696627 a 0.34193747,0.34193747 0 0 1 0.258535,0.1179261 l 0.72841,0.8401857 a 0.34183646,0.34183646 0 0 1 -0.03781,0.4851503 L 17.341664,9.564054 a 6.0707201,6.0707201 0 0 0 -1.945113,4.820065 l 0.0053,4.049119 a 0.33236376,0.33236376 0 0 1 -0.332375,0.332824 h -1.12963 a 0.3328576,0.3328576 0 0 1 -0.332501,-0.332465 l -6.51e-4,-3.901562 a 7.8467275,7.8467275 0 0 1 2.547123,-6.3145635 l 2.331137,-1.9672123 a 0.34188135,0.34188135 0 0 1 0.220173,-0.080608 m 0,-0.2244715 a 0.56414183,0.56414183 0 0 0 -0.364946,0.1335608 l -2.331137,1.9672123 a 8.1388548,8.1388548 0 0 0 -2.626148,6.5033892 v 3.884277 a 0.55693629,0.55693629 0 0 0 0.556936,0.556937 h 1.129619 a 0.55686895,0.55686895 0 0 0 0.556858,-0.557599 l -0.0053,-4.049096 a 5.8566865,5.8566865 0 0 1 1.868725,-4.651106 l 2.30913,-1.9482554 a 0.56628553,0.56628553 0 0 0 0.06273,-0.8037764 L 19.133183,6.1405375 A 0.56505094,0.56505094 0 0 0 18.705037,5.94518 v 0 z M 1.2949136,6.1462728 a 0.34183646,0.34183646 0 0 1 0.2201729,0.080608 l 2.3277697,1.9643275 a 7.85895,7.85895 0 0 1 2.5497945,6.3347887 v 3.884345 A 0.33279026,0.33279026 0 0 1 6.060242,18.742694 H 4.9305554 a 0.33236376,0.33236376 0 0 1 -0.332375,-0.332835 l 0.00424,-4.027973 A 6.0831783,6.0831783 0 0 0 2.6549417,9.537791 L 0.34583683,7.5895349 A 0.34183646,0.34183646 0 0 1 0.30802463,7.1043846 L 1.0364347,6.2641989 A 0.34193747,0.34193747 0 0 1 1.2949698,6.1462728 m 0,-0.2244716 A 0.56505094,0.56505094 0 0 0 0.86682403,6.1171588 l -0.7284101,0.8401857 a 0.56628553,0.56628553 0 0 0 0.062684,0.8037539 L 2.5101912,9.709354 a 5.8566865,5.8566865 0 0 1 1.8687255,4.651106 l -0.00528,4.049096 a 0.55686895,0.55686895 0 0 0 0.5569138,0.55761 H 6.060242 A 0.55686895,0.55686895 0 0 0 6.6170998,18.410308 V 14.525997 A 8.1388548,8.1388548 0 0 0 3.9909625,8.0225404 L 1.6598258,6.0553281 A 0.56414183,0.56414183 0 0 0 1.29488,5.9217676 v 0 z M 15.514017,8.1283563 10.010278,1.009444 4.5065848,8.1283675 A 0.43389223,0.43389223 0 0 0 4.9661005,8.8282024 L 8.2791318,7.3200344 A 0.40131019,0.40131019 0 0 1 8.887921,7.7435897 V 18.402081 a 0.56506216,0.56506216 0 0 0 0.5650732,0.565085 H 10.567495 A 0.56506216,0.56506216 0 0 0 11.13258,18.402081 V 7.7435897 a 0.40129896,0.40129896 0 0 1 0.608789,-0.4235553 l 3.31302,1.508168 a 0.43390345,0.43390345 0 0 0 0.459572,-0.6998349 z"
+     fill="#000000" />
+</svg>
diff --git a/src/displayapp/icons/navigation/img_conv_core.php b/src/displayapp/icons/navigation/img_conv_core.php
deleted file mode 100644
index f12b76e0..00000000
--- a/src/displayapp/icons/navigation/img_conv_core.php
+++ /dev/null
@@ -1,822 +0,0 @@
-<?php
-
-class Converter {
-    var $dith;      /*Dithering enable/disable*/
-    var $w;         /*Image width*/
-    var $h;         /*Image height*/
-    var $cf;        /*Color format*/
-    var $alpha;     /*Add alpha byte or not*/
-    var $chroma;    /*Chroma keyed?*/
-    var $d_out;     /*Output data (result)*/
-    var $img;       /*Image resource*/
-    var $out_name;  /*Name of the output file*/
-    var $path;      /*Path to the image file*/
-
-    /*Helper variables*/
-    var $r_act;
-    var $b_act;
-    var $g_act;
-
-    /*For dithering*/
-    var $r_earr;  /*Classification error for next row of pixels*/
-    var $g_earr;
-    var $b_earr;
-
-    var $r_nerr;  /*Classification error for next pixel*/
-    var $g_err;
-    var $b_nerr;
-
-    const CF_TRUE_COLOR_332 = 0;      /*Helper formats. Used internally*/
-    const CF_TRUE_COLOR_565 = 1;
-    const CF_TRUE_COLOR_565_SWAP = 2;
-    const CF_TRUE_COLOR_888 = 3;
-    const CF_ALPHA_1_BIT = 4;
-    const CF_ALPHA_2_BIT = 5;
-    const CF_ALPHA_4_BIT = 6;
-    const CF_ALPHA_8_BIT = 7;
-    const CF_INDEXED_1_BIT = 8;
-    const CF_INDEXED_2_BIT = 9;
-    const CF_INDEXED_4_BIT = 10;
-    const CF_INDEXED_8_BIT = 11;
-    const CF_RAW = 12;
-    const CF_RAW_ALPHA = 13;
-    const CF_RAW_CHROMA = 12;
-
-    const CF_TRUE_COLOR = 100;          /*Helper formats is C arrays contains all treu color formats (usin in "download")*/
-    const CF_TRUE_COLOR_ALPHA = 101;
-    const CF_TRUE_COLOR_CHROMA = 102;
-
-    /**
-     * @param path the image file
-     * @param real_name the real image file name (different in online mode)
-     * @param out_name name of the output file
-     * @param dith 1: dither enabled; 0: disabled
-     * @param cf color format
-     */
-    function __construct ($path, $real_name, $out_name ,$dith, $cf) {
-     		
-        $this->dith = $dith;
-        $this->out_name = $out_name;
-        $this->path = $path;
-
-     		if($cf == "raw" || $cf == "raw_alpha" || $cf == "raw_chroma") return;
-
-        $size = getimagesize($path);
-        $this->w = $size[0];
-        $this->h = $size[1];
-
-        $ext = pathinfo($real_name, PATHINFO_EXTENSION);
-        if(!strcmp(strtolower($ext), "png")) $this->img = imagecreatefrompng($path);
-        else if(!strcmp(strtolower($ext), "bmp")) $this->img = imagecreatefrombmp($path);
-        else if(!strcmp(strtolower($ext), "jpg")) $this->img = imagecreatefromjpeg($path);
-        else if(!strcmp(strtolower($ext), "jpeg")) $this->img = imagecreatefromjpeg($path);
-        else {
-            echo("$ext is a not supported image type. use png, jpg, jpeg or bmp");
-            exit(1);
-        }
-
-        $this->r_earr = array();  /*Classification error for next row of pixels*/
-        $this->g_earr = array();
-        $this->b_earr = array();
-
-        if($this->dith) {
-            for($i = 0; $i < $this->w + 2; ++$i){
-                $this->r_earr[$i] = 0;
-                $this->g_earr[$i] = 0;
-                $this->b_earr[$i] = 0;
-            }
-        }
-
-        $this->r_nerr = 0;  /*Classification error for next pixel*/
-        $this->g_nerr = 0;
-        $this->b_nerr = 0;
-    }
-
-    function convert($cf, $alpha = 0) {
-        $this->cf = $cf;
-        $this->d_out = array();
-        $this->alpha = $alpha;
-
-        if($this->cf == self::CF_RAW || $this->cf == self::CF_RAW_ALPHA || $this->cf == self::CF_RAW_CHROMA) {
-            $myfile = fopen($this->path, "r") or die("Unable to open file!");
-            $this->d_out = unpack('C*', fread($myfile, filesize($this->path)));
-            fclose($myfile);
-            return;
-        }
-
-        $palette_size = 0;
-        if($this->cf == self::CF_INDEXED_1_BIT) $palette_size = 2;
-        if($this->cf == self::CF_INDEXED_2_BIT) $palette_size = 4;
-        if($this->cf == self::CF_INDEXED_4_BIT) $palette_size = 16;
-        if($this->cf == self::CF_INDEXED_8_BIT) $palette_size = 256;
-
-        if($palette_size) {
-            $img_tmp = imagecreatetruecolor($this->w, $this->h);
-            imagecopy ($img_tmp, $this->img, 0 , 0 , 0 , 0, $this->w , $this->h);
-            imagetruecolortopalette($this->img, false, $palette_size);
-            $real_palette_size = imagecolorstotal($this->img);                          /*The real number of colos in the image's palette*/
-	        for($i = 0; $i < $palette_size; $i++) {
-	            if($i < $real_palette_size) {
-	                $c = imagecolorsforindex ($this->img , $i);
-                    array_push($this->d_out, $c['blue'], $c['green'], $c['red'], 0xFF);
-                } else {
-                    array_push($this->d_out, 0xFF, 0xFF, 0xFF, 0xFF);
-                }
-	        }
-        }
-
-        /*Convert all the pixels*/
-        for($y = 0; $y < $this->h; $y++) {
-            $this->dith_reset();
-
-            for($x = 0; $x < $this->w; ++$x){
-                $this->conv_px($x, $y);
-            }
-        }
-
-        /*Revert the original image if it was converted to indexed*/
-        if($palette_size) {
-            imagecopy ($this->img, $img_tmp,  0 , 0 , 0 , 0 , $this->w , $this->h);
-        }
-    }
-
-    function format_to_c_array() {
-
-        $c_array = "";
-        $i = 0;
-        $y_end = $this->h;
-        $x_end = $this->w;
-
-        if($this->cf == self::CF_TRUE_COLOR_332) {
-            $c_array .= "\n#if LV_COLOR_DEPTH == 1 || LV_COLOR_DEPTH == 8";
-            if(!$this->alpha) $c_array .= "\n  /*Pixel format: Blue: 2 bit, Green: 3 bit, Red: 3 bit*/";
-            else  $c_array .= "\n  /*Pixel format: Blue: 2 bit, Green: 3 bit, Red: 3 bit, Alpha 8 bit */";
-        } else if($this->cf == self::CF_TRUE_COLOR_565) {
-            $c_array .= "\n#if LV_COLOR_DEPTH == 16 && LV_COLOR_16_SWAP == 0";
-            if(!$this->alpha) $c_array .= "\n  /*Pixel format: Blue: 5 bit, Green: 6 bit, Red: 5 bit*/";
-            else $c_array .= "\n  /*Pixel format: Blue: 5 bit, Green: 6 bit, Red: 5 bit, Alpha 8 bit*/";
-        }  else if($this->cf == self::CF_TRUE_COLOR_565_SWAP) {
-            $c_array .= "\n#if LV_COLOR_DEPTH == 16 && LV_COLOR_16_SWAP != 0";
-            if(!$this->alpha) $c_array .=  "\n  /*Pixel format: Blue: 5 bit, Green: 6 bit, Red: 5 bit BUT the 2 bytes are swapped*/";
-            else $c_array .= "\n  /*Pixel format:  Blue: 5 bit Green: 6 bit, Red: 5 bit, Alpha 8 bit  BUT the 2  color bytes are swapped*/";
-        }  else if($this->cf == self::CF_TRUE_COLOR_888) {
-            $c_array .= "\n#if LV_COLOR_DEPTH == 32";
-            if(!$this->alpha) $c_array .= "\n  /*Pixel format: Blue: 8 bit, Green: 8 bit, Red: 8 bit, Fix 0xFF: 8 bit, */";
-            else $c_array .= "\n  /*Pixel format:  Blue: 8 bit, Green: 8 bit, Red: 8 bit, Alpha: 8 bit*/";
-        } else if($this->cf == self::CF_INDEXED_1_BIT) {
-            $c_array .= "\n";
-            for($p = 0; $p < 2; $p ++) {
-                $c_array .= "  0x" . str_pad(dechex($this->d_out[$p * 4 + 0]), 2, '0', STR_PAD_LEFT) . ", ";
-                $c_array .= "0x" . str_pad(dechex($this->d_out[$p * 4 + 1]), 2, '0', STR_PAD_LEFT) . ", ";
-                $c_array .= "0x" . str_pad(dechex($this->d_out[$p * 4 + 2]), 2, '0', STR_PAD_LEFT) . ", ";
-                $c_array .= "0x" . str_pad(dechex($this->d_out[$p * 4 + 3]), 2, '0', STR_PAD_LEFT) . ", ";
-                $c_array .= "\t/*Color of index $p*/\n";
-            }
-
-            $i = $p * 4;
-        }
-        else if($this->cf == self::CF_INDEXED_2_BIT) {
-            $c_array .= "\n";
-            for($p = 0; $p < 4; $p ++) {
-                $c_array .= "  0x" . str_pad(dechex($this->d_out[$p * 4 + 0]), 2, '0', STR_PAD_LEFT) . ", ";
-                $c_array .= "0x" . str_pad(dechex($this->d_out[$p * 4 + 1]), 2, '0', STR_PAD_LEFT) . ", ";
-                $c_array .= "0x" . str_pad(dechex($this->d_out[$p * 4 + 2]), 2, '0', STR_PAD_LEFT) . ", ";
-                $c_array .= "0x" . str_pad(dechex($this->d_out[$p * 4 + 3]), 2, '0', STR_PAD_LEFT) . ", ";
-                $c_array .= "\t/*Color of index $p*/\n";
-            }
-
-            $i = $p * 4;
-        }
-        else if($this->cf == self::CF_INDEXED_4_BIT) {
-            $c_array .= "\n";
-            for($p = 0; $p < 16; $p ++) {
-                $c_array .= "  0x" . str_pad(dechex($this->d_out[$p * 4 + 0]), 2, '0', STR_PAD_LEFT) . ", ";
-                $c_array .= "0x" . str_pad(dechex($this->d_out[$p * 4 + 1]), 2, '0', STR_PAD_LEFT) . ", ";
-                $c_array .= "0x" . str_pad(dechex($this->d_out[$p * 4 + 2]), 2, '0', STR_PAD_LEFT) . ", ";
-                $c_array .= "0x" . str_pad(dechex($this->d_out[$p * 4 + 3]), 2, '0', STR_PAD_LEFT) . ", ";
-                $c_array .= "\t/*Color of index $p*/\n";
-            }
-
-            $i = $p * 4;
-        }
-        else if($this->cf == self::CF_INDEXED_8_BIT) {
-            $c_array .= "\n";
-            for($p = 0; $p < 256; $p ++) {
-                $c_array .= "  0x" . str_pad(dechex($this->d_out[$p * 4 + 0]), 2, '0', STR_PAD_LEFT) . ", ";
-                $c_array .= "0x" . str_pad(dechex($this->d_out[$p * 4 + 1]), 2, '0', STR_PAD_LEFT) . ", ";
-                $c_array .= "0x" . str_pad(dechex($this->d_out[$p * 4 + 2]), 2, '0', STR_PAD_LEFT) . ", ";
-                $c_array .= "0x" . str_pad(dechex($this->d_out[$p * 4 + 3]), 2, '0', STR_PAD_LEFT) . ", ";
-                $c_array .= "\t/*Color of index $p*/\n";
-            }
-
-            $i = $p * 4;
-        }
-         else if($this->cf == self::CF_RAW || $this->cf == self::CF_RAW_ALPHA || $this->cf == self::CF_RAW_CHROMA) {
-            $y_end = 1;
-            $x_end = count($this->d_out);
-            $i = 1;
-         }
-
-
-        for($y = 0; $y < $y_end; $y++) {
-            $c_array .= "\n  ";
-            for($x = 0; $x < $x_end; $x++) {
-                if($this->cf == self::CF_TRUE_COLOR_332) {
-                    $c_array .= "0x" . str_pad(dechex($this->d_out[$i]), 2, '0', STR_PAD_LEFT) . ", ";  $i++;
-                    if($this->alpha) {
-                        $c_array .= "0x" . str_pad(dechex($this->d_out[$i]), 2, '0', STR_PAD_LEFT) . ", ";
-                        $i++;
-                    }
-                }
-                else if($this->cf == self::CF_TRUE_COLOR_565 || $this->cf == self::CF_TRUE_COLOR_565_SWAP) {
-                    $c_array .= "0x" . str_pad(dechex($this->d_out[$i]), 2, '0', STR_PAD_LEFT) . ", ";  $i++;
-                    $c_array .= "0x" . str_pad(dechex($this->d_out[$i]), 2, '0', STR_PAD_LEFT) . ", ";  $i++;
-                    if($this->alpha) {
-                        $c_array .= "0x" . str_pad(dechex($this->d_out[$i]), 2, '0', STR_PAD_LEFT) . ", ";
-                        $i++;
-                    }
-                }
-                else if($this->cf == self::CF_TRUE_COLOR_888) {
-
-                    $c_array .= "0x" . str_pad(dechex($this->d_out[$i]), 2, '0', STR_PAD_LEFT) . ", ";  $i++;
-                    $c_array .= "0x" . str_pad(dechex($this->d_out[$i]), 2, '0', STR_PAD_LEFT) . ", ";  $i++;
-                    $c_array .= "0x" . str_pad(dechex($this->d_out[$i]), 2, '0', STR_PAD_LEFT) . ", ";  $i++;
-                    $c_array .= "0x" . str_pad(dechex($this->d_out[$i]), 2, '0', STR_PAD_LEFT) . ", ";  $i++;
-                }
-                else if($this->cf == self::CF_ALPHA_1_BIT || $this->cf == self::CF_INDEXED_1_BIT) {
-                    if(($x & 0x7) == 0) {
-                        $c_array .= "0x" . str_pad(dechex($this->d_out[$i]), 2, '0', STR_PAD_LEFT) . ", ";
-                        $i++;
-                    }
-                }
-                else if($this->cf == self::CF_ALPHA_2_BIT || $this->cf == self::CF_INDEXED_2_BIT) {
-                    if(($x & 0x3) == 0) {
-                        $c_array .= "0x" . str_pad(dechex($this->d_out[$i]), 2, '0', STR_PAD_LEFT) . ", ";
-                        $i++;
-                    }
-                }
-                else if($this->cf == self::CF_ALPHA_4_BIT || $this->cf == self::CF_INDEXED_4_BIT) {
-                    if(($x & 0x1) == 0) {
-                        $c_array .= "0x" . str_pad(dechex($this->d_out[$i]), 2, '0', STR_PAD_LEFT) . ", ";
-                        $i++;
-                    }
-                }
-                else if($this->cf == self::CF_ALPHA_8_BIT || $this->cf == self::CF_INDEXED_8_BIT) {
-                    $c_array .= "0x" . str_pad(dechex($this->d_out[$i]), 2, '0', STR_PAD_LEFT) . ", ";
-                    $i++;
-                }
-                else if($this->cf == self::CF_RAW || $this->cf == self::CF_RAW_ALPHA || $this->cf == self::CF_RAW_CHROMA) {
-                    $c_array .= "0x" . str_pad(dechex($this->d_out[$i]), 2, '0', STR_PAD_LEFT) . ", ";
-                    if($i != 0 && (($i % 16) == 0)) $c_array .= "\n  ";
-                    $i++;
-                }
-            }
-        }
-
-        if($this->cf == self::CF_TRUE_COLOR_332 || $this->cf == self::CF_TRUE_COLOR_565 || $this->cf == self::CF_TRUE_COLOR_565_SWAP || $this->cf == self::CF_TRUE_COLOR_888) {
-            $c_array .= "\n#endif";
-        }
-
-        return $c_array;
-
-    }
-
-    function get_c_header() {
-        $c_header ="#if defined(LV_LVGL_H_INCLUDE_SIMPLE)
-#include \"lvgl.h\"
-#else
-#include \"../lvgl/lvgl.h\"
-#endif
-
-
-#ifndef LV_ATTRIBUTE_MEM_ALIGN
-#define LV_ATTRIBUTE_MEM_ALIGN
-#endif
-
-";
-        $attr_name = "LV_ATTRIBUTE_IMG_" . strtoupper($this->out_name); 
-        $c_header .= 
-"#ifndef $attr_name
-#define $attr_name
-#endif
-
-const LV_ATTRIBUTE_MEM_ALIGN LV_ATTRIBUTE_LARGE_CONST $attr_name uint8_t " . $this->out_name . "_map[] = {";
-
-        return $c_header;
-    }
-
-    function get_c_footer($cf) {
-        $c_footer =
-        "\n};\n
-const lv_img_dsc_t " . $this->out_name . " = {
-  .header.always_zero = 0,
-  .header.w = " . $this->w . ",
-  .header.h = " . $this->h . ",\n";
-
-      if($cf == self::CF_TRUE_COLOR) $c_footer .= "  .data_size = " . $this->w * $this->h . " * LV_COLOR_SIZE / 8,\n  .header.cf = LV_IMG_CF_TRUE_COLOR,";
-      else if($cf == self::CF_TRUE_COLOR_ALPHA) $c_footer .= "  .data_size = " . $this->w * $this->h . " * LV_IMG_PX_SIZE_ALPHA_BYTE,\n  .header.cf = LV_IMG_CF_TRUE_COLOR_ALPHA,";
-      else if($cf == self::CF_TRUE_COLOR_CHROMA) $c_footer .= "  .data_size = " . $this->w * $this->h . " * LV_COLOR_SIZE / 8,\n  .header.cf = LV_IMG_CF_TRUE_COLOR_CHROMA_KEYED,";
-      else if($cf == self::CF_ALPHA_1_BIT) $c_footer .= "  .data_size = " . count($this->d_out) . ",\n  .header.cf = LV_IMG_CF_ALPHA_1BIT,";
-      else if($cf == self::CF_ALPHA_2_BIT) $c_footer .= "  .data_size = " . count($this->d_out) . ",\n  .header.cf = LV_IMG_CF_ALPHA_2BIT,";
-      else if($cf == self::CF_ALPHA_4_BIT) $c_footer .= "  .data_size = " . count($this->d_out) . ",\n  .header.cf = LV_IMG_CF_ALPHA_4BIT,";
-      else if($cf == self::CF_ALPHA_8_BIT) $c_footer .= "  .data_size = " . count($this->d_out) . ",\n  .header.cf = LV_IMG_CF_ALPHA_8BIT,";
-      else if($cf == self::CF_INDEXED_1_BIT) $c_footer .= "  .data_size = " . count($this->d_out) . ",\n  .header.cf = LV_IMG_CF_INDEXED_1BIT,";
-      else if($cf == self::CF_INDEXED_2_BIT) $c_footer .= "  .data_size = " . count($this->d_out) . ",\n  .header.cf = LV_IMG_CF_INDEXED_2BIT,";
-      else if($cf == self::CF_INDEXED_4_BIT) $c_footer .= "  .data_size = " . count($this->d_out) . ",\n  .header.cf = LV_IMG_CF_INDEXED_4BIT,";
-      else if($cf == self::CF_INDEXED_8_BIT) $c_footer .= "  .data_size = " . count($this->d_out) . ",\n  .header.cf = LV_IMG_CF_INDEXED_8BIT,";
-      else if($cf == self::CF_RAW) $c_footer .= "  .data_size = " . count($this->d_out) . ",\n  .header.cf = LV_IMG_CF_RAW,";
-      else if($cf == self::CF_RAW_ALPHA) $c_footer .= "  .data_size = " . count($this->d_out) . ",\n  .header.cf = LV_IMG_CF_RAW_ALPHA,";
-      else if($cf == self::CF_RAW_CHROMA) $c_footer .= "  .data_size = " . count($this->d_out) . ",\n  .header.cf = LV_IMG_CF_RAW_CHROMA_KEYED,";
-
-    $c_footer .= "\n  .data = " . $this->out_name . "_map,
-};\n";
-
-        return $c_footer;
-    }
-
-    function download_c($name, $cf = -1, $content = ""){
-      global $offline;
-
-      if(strlen($content) < 1) {
-        $content = $this->format_to_c_array();
-      }
-
-      if($cf < 0) $cf = $this->cf;
-
-        $out = $this->get_c_header() . $content . "" . $this->get_c_footer($cf);
-        $name = $name . ".c";
-
-      if($offline){
-        $file = fopen($name, "w");
-        fwrite($file, $out);
-        fclose($file);
-      }
-      else{
-        header('Content-Type: application/text');
-        header('Content-disposition: attachment; filename='.$name);
-        header('Content-Length: ' . strlen($out));
-
-        echo($out);
-
-      }
-    }
-
-
-    function download_bin($name, $cf = -1, $content = 0){
-      global $offline;
-
-      if($content == 0) {
-        $content = $this->d_out;
-      }
-
-      if($cf < 0) $cf = $this->cf;
-      $name .= ".bin";
-
-      $lv_cf = 4;               /*Color format in LittlevGL*/
-      switch($cf) {
-        case self::CF_TRUE_COLOR:
-            $lv_cf = 4; break;
-        case self::CF_TRUE_COLOR_ALPHA:
-            $lv_cf = 5; break;
-        case self::CF_TRUE_COLOR_CHROMA:
-            $lv_cf = 6; break;
-        case self::CF_INDEXED_1_BIT:
-            $lv_cf = 7; break;
-        case self::CF_INDEXED_2_BIT:
-            $lv_cf = 8; break;
-        case self::CF_INDEXED_4_BIT:
-            $lv_cf = 9; break;
-        case self::CF_INDEXED_8_BIT:
-            $lv_cf = 10; break;
-        case self::CF_ALPHA_1_BIT:
-            $lv_cf = 11; break;
-        case self::CF_ALPHA_2_BIT:
-            $lv_cf = 12; break;
-        case self::CF_ALPHA_4_BIT:
-            $lv_cf = 13; break;
-        case self::CF_ALPHA_8_BIT:
-            $lv_cf = 14; break;
-      }
-
-
-      $header = $lv_cf + ($this->w << 10) + ($this->h << 21);
-      $header_bin = pack("V", $header);
-
-      $content = pack("C*", ...$content);
-
-      if($offline){
-        $file = fopen($name, "w");
-        fwrite($file, $header_bin);
-        fwrite($file, $content);
-        fclose($file);
-      }
-      else{
-        $len = strlen($content) + 4;
-        header('Content-Type: application/text');
-        header('Content-disposition: attachment; filename='.$name);
-        header('Content-Length:' . $len);
-        echo($header_bin[0]);
-        echo($header_bin[1]);
-        echo($header_bin[2]);
-        echo($header_bin[3]);
-        echo($content);
-
-
-      }
-    }
-
-    private function conv_px($x, $y) {
-        $c = imagecolorat($this->img, $x, $y);
-        if($this->alpha){
-            $a = ($c & 0xff000000) >> 23;       /*Alpha is 7 bit*/
-            if($a & 0x02) $a |= 0x01;           /*Repeate the last bit: 0000000 -> 00000000; 1111110 -> 11111111*/
-            $a = 255 - $a;
-        } else {
-            $a = 0xff;
-        }
-        $r = ($c & 0x00ff0000) >> 16;
-        $g = ($c & 0x0000ff00) >> 8;
-        $b = ($c & 0x000000ff) >> 0;
-
-        $this->dith_next($r, $g, $b, $x);
-
-        if($this->cf == self::CF_TRUE_COLOR_332) {
-           $c8 = ($this->r_act) | ($this->g_act >> 3) | ($this->b_act >> 6);	//RGB332
-            array_push($this->d_out, $c8);
-            if($this->alpha) array_push($this->d_out, $a);
-        } else if($this->cf == self::CF_TRUE_COLOR_565) {
-          $c16 = (($this->r_act) << 8) | (($this->g_act) << 3) | (($this->b_act) >> 3);	//RGR565
-            array_push($this->d_out, $c16 & 0xFF);
-            array_push($this->d_out, ($c16 >> 8) & 0xFF);
-            if($this->alpha) array_push($this->d_out, $a);
-        } else if($this->cf == self::CF_TRUE_COLOR_565_SWAP) {
-            $c16 = (($this->r_act) << 8) | (($this->g_act) << 3) | (($this->b_act) >> 3);	//RGR565
-            array_push($this->d_out, ($c16 >> 8) & 0xFF);
-            array_push($this->d_out, $c16 & 0xFF);
-            if($this->alpha) array_push($this->d_out, $a);
-        } else if($this->cf == self::CF_TRUE_COLOR_888) {
-            array_push($this->d_out, $this->b_act);
-            array_push($this->d_out, $this->g_act);
-            array_push($this->d_out, $this->r_act);
-            array_push($this->d_out, $a);
-        } else if($this->cf == self::CF_ALPHA_1_BIT) {
-            $w = $this->w >> 3;
-            if($this->w & 0x07) $w++;
-            $p = $w * $y + ($x >> 3);
-            if(!isset($this->d_out[$p])) $this->d_out[$p] = 0;          /*Clear the bits first*/
-            if($a > 0x80) {
-                $this->d_out[$p] |= 1 << (7 - ($x & 0x7));
-            }
-        }
-        else if($this->cf == self::CF_ALPHA_2_BIT) {
-            $w = $this->w >> 2;
-            if($this->w & 0x03) $w++;
-
-            $p = $w * $y + ($x >> 2);
-            if(!isset($this->d_out[$p])) $this->d_out[$p] = 0;          /*Clear the bits first*/
-            $this->d_out[$p] |= ($a >> 6) << (6 - (($x & 0x3) * 2));
-        }
-        else if($this->cf == self::CF_ALPHA_4_BIT) {
-            $w = $this->w >> 1;
-            if($this->w & 0x01) $w++;
-
-            $p = $w * $y + ($x >> 1);
-            if(!isset($this->d_out[$p])) $this->d_out[$p] = 0;          /*Clear the bits first*/
-            $this->d_out[$p] |= ($a >> 4) << (4 - (($x & 0x1) * 4));
-        }
-        else if($this->cf == self::CF_ALPHA_8_BIT) {
-            $p = $this->w * $y + $x;
-            $this->d_out[$p] = $a;
-        }
-        else if($this->cf == self::CF_INDEXED_1_BIT) {
-            $w = $this->w >> 3;
-            if($this->w & 0x07) $w++;
-
-            $p = $w * $y + ($x >> 3) + 8;                       /* +8 for the palette*/
-            if(!isset($this->d_out[$p])) $this->d_out[$p] = 0;          /*Clear the bits first*/
-            $this->d_out[$p] |= ($c & 0x1) << (7 - ($x & 0x7));
-        }
-        else if($this->cf == self::CF_INDEXED_2_BIT) {
-            $w = $this->w >> 2;
-            if($this->w & 0x03) $w++;
-
-            $p = $w * $y + ($x >> 2) + 16;                              /* +16 for the palette*/
-            if(!isset($this->d_out[$p])) $this->d_out[$p] = 0;          /*Clear the bits first*/
-            $this->d_out[$p] |= ($c & 0x3) << (6 - (($x & 0x3) * 2));
-        }
-        else if($this->cf == self::CF_INDEXED_4_BIT) {
-            $w = $this->w >> 1;
-            if($this->w & 0x01) $w++;
-
-            $p = $w * $y + ($x >> 1) + 64;                              /* +64 for the palette*/
-            if(!isset($this->d_out[$p])) $this->d_out[$p] = 0;          /*Clear the bits first*/
-            $this->d_out[$p] |= ($c & 0xF) << (4 - (($x & 0x1) * 4));
-        }
-        else if($this->cf == self::CF_INDEXED_8_BIT) {
-            $p = $this->w * $y + $x + 1024;                              /* +1024 for the palette*/
-            $this->d_out[$p] = $c & 0xFF;
-        }
-	}
-
-    private function dith_reset() {
-        if($this->dith){
-          $this->r_nerr = 0;
-          $this->g_nerr = 0;
-          $this->b_nerr = 0;
-        }
-    }
-
-    private function dith_next($r, $g, $b, $x) {
-
-     if($this->dith){
-        $this->r_act = $r + $this->r_nerr + $this->r_earr[$x+1];
-        $this->r_earr[$x+1] = 0;
-
-        $this->g_act = $g + $this->g_nerr + $this->g_earr[$x+1];
-        $this->g_earr[$x+1] = 0;
-
-        $this->b_act = $b + $this->b_nerr + $this->b_earr[$x+1];
-        $this->b_earr[$x+1] = 0;
-
-        if($this->cf == self::CF_TRUE_COLOR_332) {
-            $this->r_act = $this->classify_pixel($this->r_act, 3);
-            $this->g_act = $this->classify_pixel($this->g_act, 3);
-            $this->b_act = $this->classify_pixel($this->b_act, 2);
-
-            if($this->r_act > 0xE0) $this->r_act = 0xE0;
-            if($this->g_act > 0xE0) $this->g_act = 0xE0;
-            if($this->b_act > 0xC0) $this->b_act = 0xC0;
-
-        } else if($this->cf == self::CF_TRUE_COLOR_565 || $this->cf == self::CF_TRUE_COLOR_565_SWAP) {
-            $this->r_act = $this->classify_pixel($this->r_act, 5);
-            $this->g_act = $this->classify_pixel($this->g_act, 6);
-            $this->b_act = $this->classify_pixel($this->b_act, 5);
-
-            if($this->r_act > 0xF8) $this->r_act = 0xF8;
-            if($this->g_act > 0xFC) $this->g_act = 0xFC;
-            if($this->b_act > 0xF8) $this->b_act = 0xF8;
-
-        } else if($this->cf == self::CF_TRUE_COLOR_888) {
-            $this->r_act = $this->classify_pixel($this->r_act, 8);
-            $this->g_act = $this->classify_pixel($this->g_act, 8);
-            $this->b_act = $this->classify_pixel($this->b_act, 8);
-
-            if($this->r_act > 0xFF) $this->r_act = 0xFF;
-            if($this->g_act > 0xFF) $this->g_act = 0xFF;
-            if($this->b_act > 0xFF) $this->b_act = 0xFF;
-        }
-
-        $this->r_err = $r - $this->r_act;
-        $this->g_err = $g - $this->g_act;
-        $this->b_err = $b - $this->b_act;
-
-        $this->r_nerr = round((7 * $this->r_err) / 16);
-        $this->g_nerr = round((7 * $this->g_err) / 16);
-        $this->b_nerr = round((7 * $this->b_err) / 16);
-
-        $this->r_earr[$x] += round((3 * $this->r_err) / 16);
-        $this->g_earr[$x] += round((3 * $this->g_err) / 16);
-        $this->b_earr[$x] += round((3 * $this->b_err) / 16);
-
-        $this->r_earr[$x+1] += round((5 * $this->r_err) / 16);
-        $this->g_earr[$x+1] += round((5 * $this->g_err) / 16);
-        $this->b_earr[$x+1] += round((5 * $this->b_err) / 16);
-
-        $this->r_earr[$x+2] += round($this->r_err / 16);
-        $this->g_earr[$x+2] += round($this->g_err / 16);
-        $this->b_earr[$x+2] += round($this->b_err / 16);
-      }
-      else{
-        if($this->cf == self::CF_TRUE_COLOR_332) {
-            $this->r_act = $this->classify_pixel($r, 3);
-            $this->g_act = $this->classify_pixel($g, 3);
-            $this->b_act = $this->classify_pixel($b, 2);
-
-            if($this->r_act > 0xE0) $this->r_act = 0xE0;
-            if($this->g_act > 0xE0) $this->g_act = 0xE0;
-            if($this->b_act > 0xC0) $this->b_act = 0xC0;
-
-        } else if($this->cf == self::CF_TRUE_COLOR_565 || $this->cf == self::CF_TRUE_COLOR_565_SWAP) {
-            $this->r_act = $this->classify_pixel($r, 5);
-            $this->g_act = $this->classify_pixel($g, 6);
-            $this->b_act = $this->classify_pixel($b, 5);
-
-            if($this->r_act > 0xF8) $this->r_act = 0xF8;
-            if($this->g_act > 0xFC) $this->g_act = 0xFC;
-            if($this->b_act > 0xF8) $this->b_act = 0xF8;
-
-        } else if($this->cf == self::CF_TRUE_COLOR_888) {
-            $this->r_act = $this->classify_pixel($r, 8);
-            $this->g_act = $this->classify_pixel($g, 8);
-            $this->b_act = $this->classify_pixel($b, 8);
-
-            if($this->r_act > 0xFF) $this->r_act = 0xFF;
-            if($this->g_act > 0xFF) $this->g_act = 0xFF;
-            if($this->b_act > 0xFF) $this->b_act = 0xFF;
-        }
-      }
-    }
-
-    private function classify_pixel($value, $bits){
-      $tmp = 1 << (8 - $bits);
-      $val = round($value / $tmp, 0, PHP_ROUND_HALF_DOWN) * $tmp;
-      if($val < 0) $val = 0;
-      return $val;
-    }
-}
-
-$offline = 0;
-if (!isset($_SERVER["HTTP_HOST"])) {
-  parse_str($argv[1], $_POST);
-  $offline = 1;
-}
-
-
-if($offline == 0){
-  /*The scripts runs ONLINE (likely on littelvgl.com)*/
-  header("Cache-Control: no-store, no-cache, must-revalidate, max-age=0");
-  header("Cache-Control: post-check=0, pre-check=0", false);
-  header("Pragma: no-cache");
-
-  $img_file = $_FILES["img_file"]["tmp_name"];
-  $img_file_name = $_FILES["img_file"]["name"];
-  $output_name = $_POST["name"];
-  $cf = $_POST["cf"];
-  $format = $_POST["format"];
-  $dith = $_POST["dith"];
-}
-else{
-  /*The scripts runs OFFLINE (likely in command)*/
-  if(isset($_POST["name"])){
-    $output_name = $_POST["name"];
-  }
-  else{
-    echo("Mising Name\n");
-    exit(0);
-  }
-
-  if(isset($_POST["img"])){
-    $img_file = $_POST["img"];
-    $img_file_name = $_POST["img"];
-  }
-  else{
-    echo("Mising image file\n");
-    exit(0);
-  }
-
-  if(isset($_POST["format"])){
-    $format = $_POST["format"];
-  }
-  else{
-    $format = "c_array";
-  }
-
-  if(isset($_POST["dith"])){
-    $dith = $_POST["dith"];
-  }
-  else {
-    $dith = 0;
-  }
-
-  if(isset($_POST["cf"])){
-    $cf = $_POST["cf"];
-  }
-  else {
-    $cf = "true_color";
-  }
-}
-
-$conv = new Converter($img_file, $img_file_name, $output_name, $dith, $cf);
-
-if(!strcmp($format, "c_array")) {
-    if(!strcmp($cf, "true_color") || !strcmp($cf, "true_color_alpha") || !strcmp($cf, "true_color_chroma")) {
-        $alpha = 0;
-        if(!strcmp($cf, "true_color_alpha"))  $alpha = 1;
-
-        $conv->convert($conv::CF_TRUE_COLOR_332, $alpha);
-        $c_332 = $conv->format_to_c_array();
-
-        $conv->convert($conv::CF_TRUE_COLOR_565, $alpha);
-        $c_565 = $conv->format_to_c_array();
-
-        $conv->convert($conv::CF_TRUE_COLOR_565_SWAP, $alpha);
-        $c_565_swap = $conv->format_to_c_array();
-
-        $conv->convert($conv::CF_TRUE_COLOR_888, $alpha);
-        $c_888 = $conv->format_to_c_array();
-
-        $c_res = $c_332 . $c_565 . $c_565_swap . $c_888;
-
-        if(!strcmp($cf, "true_color")) $conv->download_c($conv->out_name, $conv::CF_TRUE_COLOR, $c_res);
-        if(!strcmp($cf, "true_color_alpha")) $conv->download_c($conv->out_name, $conv::CF_TRUE_COLOR_ALPHA, $c_res);
-        if(!strcmp($cf, "true_color_chroma")) $conv->download_c($conv->out_name, $conv::CF_TRUE_COLOR_CHROMA, $c_res);
-    }
-    else if(!strcmp($cf, "alpha_1")) {
-         $conv->convert($conv::CF_ALPHA_1_BIT, 1);
-         $conv->download_c($conv->out_name);
-    }
-    else if(!strcmp($cf, "alpha_2")) {
-         $conv->convert($conv::CF_ALPHA_2_BIT, 1);
-         $conv->download_c($conv->out_name);
-    }
-    else if(!strcmp($cf, "alpha_4")) {
-         $conv->convert($conv::CF_ALPHA_4_BIT, 1);
-         $conv->download_c($conv->out_name);
-    }
-    else if(!strcmp($cf, "alpha_8")) {
-         $conv->convert($conv::CF_ALPHA_8_BIT, 1);
-         $conv->download_c($conv->out_name);
-    }
-    else if(!strcmp($cf, "indexed_1")) {
-         $conv->convert($conv::CF_INDEXED_1_BIT);
-         $conv->download_c($conv->out_name);
-    }
-    else if(!strcmp($cf, "indexed_2")) {
-         $conv->convert($conv::CF_INDEXED_2_BIT);
-         $conv->download_c($conv->out_name);
-    }
-    else if(!strcmp($cf, "indexed_4")) {
-         $conv->convert($conv::CF_INDEXED_4_BIT);
-         $conv->download_c($conv->out_name);
-    }
-    else if(!strcmp($cf, "indexed_8")) {
-         $conv->convert($conv::CF_INDEXED_8_BIT);
-         $conv->download_c($conv->out_name);
-    }
-    else if(!strcmp($cf, "raw")) {
-         $conv->convert($conv::CF_RAW);
-         $conv->download_c($conv->out_name);
-    }
-    else if(!strcmp($cf, "raw_alpha")) {
-         $conv->convert($conv::CF_RAW_ALPHA, 1);
-         $conv->download_c($conv->out_name);
-    }
-    else if(!strcmp($cf, "raw_chroma")) {
-         $conv->convert($conv::CF_RAW_CHROMA);
-         $conv->download_c($conv->out_name);
-    }
-}
-/*Binary download*/
-else  {
-    if(!strcmp($cf, "true_color") || !strcmp($cf, "true_color_alpha") || !strcmp($cf, "true_color_chroma")) {
-        $alpha = 0;
-        if(!strcmp($cf, "true_color_alpha")) $alpha = 1;
-
-        if (!strcmp($format, "bin_332"))            $conv->convert($conv::CF_TRUE_COLOR_332, $alpha);
-        else if (!strcmp($format, "bin_565"))       $conv->convert($conv::CF_TRUE_COLOR_565, $alpha);
-        else if (!strcmp($format, "bin_565_swap"))  $conv->convert($conv::CF_TRUE_COLOR_565_SWAP, $alpha);
-        else if (!strcmp($format, "bin_888"))       $conv->convert($conv::CF_TRUE_COLOR_888, $alpha);
-        else {
-         echo("Unknown output file format: $format");
-         exit(1);
-        }
-        if(!strcmp($cf, "true_color"))          $conv->download_bin($conv->out_name, $conv::CF_TRUE_COLOR);
-        if(!strcmp($cf, "true_color_alpha"))    $conv->download_bin($conv->out_name, $conv::CF_TRUE_COLOR_ALPHA);
-        if(!strcmp($cf, "true_color_chroma"))   $conv->download_bin($conv->out_name, $conv::CF_TRUE_COLOR_CHROMA);
-    }
-    else if(!strcmp($cf, "alpha_1")) {
-         $conv->convert($conv::CF_ALPHA_1_BIT, 1);
-         $conv->download_bin($conv->out_name);
-    }
-    else if(!strcmp($cf, "alpha_2")) {
-         $conv->convert($conv::CF_ALPHA_2_BIT, 1);
-         $conv->download_bin($conv->out_name);
-    }
-    else if(!strcmp($cf, "alpha_4")) {
-         $conv->convert($conv::CF_ALPHA_4_BIT, 1);
-         $conv->download_bin($conv->out_name);
-    }
-    else if(!strcmp($cf, "alpha_8")) {
-         $conv->convert($conv::CF_ALPHA_8_BIT, 1);
-         $conv->download_bin($conv->out_name);
-    }
-    else if(!strcmp($cf, "indexed_1")) {
-         $conv->convert($conv::CF_INDEXED_1_BIT);
-         $conv->download_bin($conv->out_name);
-    }
-    else if(!strcmp($cf, "indexed_2")) {
-         $conv->convert($conv::CF_INDEXED_2_BIT);
-         $conv->download_bin($conv->out_name);
-    }
-    else if(!strcmp($cf, "indexed_4")) {
-         $conv->convert($conv::CF_INDEXED_4_BIT);
-         $conv->download_bin($conv->out_name);
-    }
-    else if(!strcmp($cf, "indexed_8")) {
-         $conv->convert($conv::CF_INDEXED_8_BIT);
-         $conv->download_bin($conv->out_name);
-    }
-}
-
-
-
-
-/*
-$c_array .= "#include <stdint.h>
-            #include \"lv_conf.h\"
-            #include \"lvgl/lv_draw/lv_draw.h\""; */
-
-
-//download("test", $c_565);
-
-?>
diff --git a/src/displayapp/icons/navigation/invalid-left-white.svg b/src/displayapp/icons/navigation/invalid-left-white.svg
deleted file mode 100644
index 3cb455d9..00000000
--- a/src/displayapp/icons/navigation/invalid-left-white.svg
+++ /dev/null
@@ -1,4 +0,0 @@
-<svg id="WORKING_ICONS" data-name="WORKING ICONS" xmlns="http://www.w3.org/2000/svg" width="20" height="20" viewBox="0 0 20 20">
-  <title>direction</title>
-  <path fill="#ffffff" d="M10,5.97986l0.011,0.00183A6.06019,6.06019,0,0,1,16,12.05493V16H15.99689l0.002,1.50317A0.49614,0.49614,0,0,1,15.50269,18H14.49622A0.49622,0.49622,0,0,1,14,17.50378V12.05493a4.05782,4.05782,0,0,0-3.98877-4.07324H8.01245a0.3576,0.3576,0,0,0-.37738.54248L8.97882,11.476a0.38659,0.38659,0,0,1-.62354.40942L2.0083,7l6.347-4.922a0.38659,0.38659,0,0,1,.62354.40942L7.63507,5.43927a0.35757,0.35757,0,0,0,.37738.54242H10"/>
-</svg>
diff --git a/src/displayapp/icons/navigation/invalid-left.c b/src/displayapp/icons/navigation/invalid-left.c
deleted file mode 100644
index 6783e5c7..00000000
--- a/src/displayapp/icons/navigation/invalid-left.c
+++ /dev/null
@@ -1,96 +0,0 @@
-#if defined(LV_LVGL_H_INCLUDE_SIMPLE)
-#include "lvgl.h"
-#else
-#include "lvgl/lvgl.h"
-#endif
-
-
-#ifndef LV_ATTRIBUTE_MEM_ALIGN
-#define LV_ATTRIBUTE_MEM_ALIGN
-#endif
-
-#ifndef LV_ATTRIBUTE_IMG_INVALID_LEFT
-#define LV_ATTRIBUTE_IMG_INVALID_LEFT
-#endif
-
-const LV_ATTRIBUTE_MEM_ALIGN LV_ATTRIBUTE_LARGE_CONST LV_ATTRIBUTE_IMG_INVALID_LEFT uint8_t invalid_left_map[] = {
-  0x04, 0x02, 0x04, 0xff, 	/*Color of index 0*/
-  0xfc, 0xfe, 0xfc, 0xff, 	/*Color of index 1*/
-
-  0x00, 0x00, 0x00, 0x7f, 0xc0, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0xff, 0xc0, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x01, 0xff, 0xc0, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x07, 0xff, 0xc0, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x0f, 0xff, 0xc0, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x3f, 0xff, 0x80, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x7f, 0xff, 0x80, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 
-  0x00, 0x01, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 
-  0x00, 0x07, 0xff, 0xfe, 0x00, 0x00, 0x00, 0x00, 
-  0x00, 0x0f, 0xff, 0xfe, 0x00, 0x00, 0x00, 0x00, 
-  0x00, 0x1f, 0xff, 0xfc, 0x00, 0x00, 0x00, 0x00, 
-  0x00, 0x7f, 0xff, 0xfc, 0x00, 0x00, 0x00, 0x00, 
-  0x00, 0xff, 0xff, 0xfc, 0x00, 0x00, 0x00, 0x00, 
-  0x01, 0xff, 0xff, 0xff, 0xff, 0xc0, 0x00, 0x00, 
-  0x03, 0xff, 0xff, 0xff, 0xff, 0xfc, 0x00, 0x00, 
-  0x0f, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 
-  0x0f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xc0, 0x00, 
-  0x0f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xe0, 0x00, 
-  0x0f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xf8, 0x00, 
-  0x0f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfc, 0x00, 
-  0x0f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfe, 0x00, 
-  0x0f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 
-  0x0f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x80, 
-  0x07, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xc0, 
-  0x03, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xc0, 
-  0x00, 0xff, 0xff, 0xfc, 0x07, 0xff, 0xff, 0xe0, 
-  0x00, 0x7f, 0xff, 0xfc, 0x00, 0xff, 0xff, 0xf0, 
-  0x00, 0x3f, 0xff, 0xfc, 0x00, 0x3f, 0xff, 0xf0, 
-  0x00, 0x1f, 0xff, 0xfe, 0x00, 0x1f, 0xff, 0xf0, 
-  0x00, 0x07, 0xff, 0xfe, 0x00, 0x07, 0xff, 0xf0, 
-  0x00, 0x03, 0xff, 0xff, 0x00, 0x03, 0xff, 0xf0, 
-  0x00, 0x00, 0xff, 0xff, 0x00, 0x01, 0xff, 0xf0, 
-  0x00, 0x00, 0x7f, 0xff, 0x80, 0x01, 0xff, 0xf0, 
-  0x00, 0x00, 0x3f, 0xff, 0x80, 0x00, 0xff, 0xf0, 
-  0x00, 0x00, 0x1f, 0xff, 0xc0, 0x00, 0x7f, 0xf0, 
-  0x00, 0x00, 0x07, 0xff, 0xc0, 0x00, 0x7f, 0xf0, 
-  0x00, 0x00, 0x03, 0xff, 0xc0, 0x00, 0x7f, 0xf0, 
-  0x00, 0x00, 0x00, 0xff, 0xc0, 0x00, 0x3f, 0xf0, 
-  0x00, 0x00, 0x00, 0x7f, 0xc0, 0x00, 0x3f, 0xf0, 
-  0x00, 0x00, 0x00, 0x3f, 0xc0, 0x00, 0x3f, 0xf0, 
-  0x00, 0x00, 0x00, 0x1f, 0xc0, 0x00, 0x3f, 0xf0, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3f, 0xf0, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3f, 0xf0, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3f, 0xf0, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3f, 0xf0, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3f, 0xf0, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3f, 0xf0, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3f, 0xf0, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3f, 0xf0, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3f, 0xf0, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3f, 0xf0, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3f, 0xf0, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3f, 0xf0, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3f, 0xf0, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3f, 0xf0, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3f, 0xf0, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3f, 0xf0, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3f, 0xf0, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3f, 0xf0, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3f, 0xf0, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3f, 0xf0, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3f, 0xf0, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3f, 0xf0, 
-};
-
-const lv_img_dsc_t invalid_left = {
-      {
-        LV_IMG_CF_INDEXED_1BIT,
-        0,
-        0,
-        64,
-        64
-    },
-    520,
-invalid_left_map,
-};
diff --git a/src/displayapp/icons/navigation/invalid-left.png b/src/displayapp/icons/navigation/invalid-left.png
deleted file mode 100644
index cf9e7d1a..00000000
--- a/src/displayapp/icons/navigation/invalid-left.png
+++ /dev/null
diff --git a/src/displayapp/icons/navigation/invalid-right-white.svg b/src/displayapp/icons/navigation/invalid-right-white.svg
deleted file mode 100644
index 98967557..00000000
--- a/src/displayapp/icons/navigation/invalid-right-white.svg
+++ /dev/null
@@ -1,4 +0,0 @@
-<svg id="WORKING_ICONS" data-name="WORKING ICONS" xmlns="http://www.w3.org/2000/svg" width="20" height="20" viewBox="0 0 20 20">
-  <title>direction</title>
-  <path fill="#ffffff" d="M9.98877,7.98169A4.05782,4.05782,0,0,0,6,12.05493v5.44885A0.49622,0.49622,0,0,1,5.50378,18H4.49731a0.49614,0.49614,0,0,1-.49615-0.49683L4.00311,16H4V12.05493A6.06019,6.06019,0,0,1,9.989,5.98169L10,5.97986V5.98169h1.98755a0.35757,0.35757,0,0,0,.37738-0.54242L11.02118,2.48743A0.38659,0.38659,0,0,1,11.64471,2.078L17.9917,7l-6.347,4.88544a0.38659,0.38659,0,0,1-.62354-0.40942l1.34375-2.95184a0.3576,0.3576,0,0,0-.37738-0.54248H9.98877Z"/>
-</svg>
diff --git a/src/displayapp/icons/navigation/invalid-right.c b/src/displayapp/icons/navigation/invalid-right.c
deleted file mode 100644
index f77af8d4..00000000
--- a/src/displayapp/icons/navigation/invalid-right.c
+++ /dev/null
@@ -1,96 +0,0 @@
-#if defined(LV_LVGL_H_INCLUDE_SIMPLE)
-#include "lvgl.h"
-#else
-#include "lvgl/lvgl.h"
-#endif
-
-
-#ifndef LV_ATTRIBUTE_MEM_ALIGN
-#define LV_ATTRIBUTE_MEM_ALIGN
-#endif
-
-#ifndef LV_ATTRIBUTE_IMG_INVALID_RIGHT
-#define LV_ATTRIBUTE_IMG_INVALID_RIGHT
-#endif
-
-const LV_ATTRIBUTE_MEM_ALIGN LV_ATTRIBUTE_LARGE_CONST LV_ATTRIBUTE_IMG_INVALID_RIGHT uint8_t invalid_right_map[] = {
-  0x04, 0x02, 0x04, 0xff, 	/*Color of index 0*/
-  0xfc, 0xfe, 0xfc, 0xff, 	/*Color of index 1*/
-
-  0x00, 0x00, 0x00, 0x03, 0xfe, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x03, 0xff, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x03, 0xff, 0xc0, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x03, 0xff, 0xe0, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x03, 0xff, 0xf0, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x01, 0xff, 0xfc, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x01, 0xff, 0xfe, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0x80, 0x00, 
-  0x00, 0x00, 0x00, 0x00, 0x7f, 0xff, 0xe0, 0x00, 
-  0x00, 0x00, 0x00, 0x00, 0x7f, 0xff, 0xf0, 0x00, 
-  0x00, 0x00, 0x00, 0x00, 0x3f, 0xff, 0xf8, 0x00, 
-  0x00, 0x00, 0x00, 0x00, 0x3f, 0xff, 0xfe, 0x00, 
-  0x00, 0x00, 0x00, 0x00, 0x3f, 0xff, 0xff, 0x00, 
-  0x00, 0x00, 0x03, 0xff, 0xff, 0xff, 0xff, 0x80, 
-  0x00, 0x00, 0x3f, 0xff, 0xff, 0xff, 0xff, 0xc0, 
-  0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xf0, 
-  0x00, 0x03, 0xff, 0xff, 0xff, 0xff, 0xff, 0xf0, 
-  0x00, 0x07, 0xff, 0xff, 0xff, 0xff, 0xff, 0xf0, 
-  0x00, 0x1f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xf0, 
-  0x00, 0x3f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xf0, 
-  0x00, 0x7f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xf0, 
-  0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xf0, 
-  0x01, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xf0, 
-  0x03, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xe0, 
-  0x03, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xc0, 
-  0x07, 0xff, 0xff, 0xe0, 0x3f, 0xff, 0xff, 0x00, 
-  0x0f, 0xff, 0xff, 0x00, 0x3f, 0xff, 0xfe, 0x00, 
-  0x0f, 0xff, 0xfc, 0x00, 0x3f, 0xff, 0xfc, 0x00, 
-  0x0f, 0xff, 0xf8, 0x00, 0x7f, 0xff, 0xf8, 0x00, 
-  0x0f, 0xff, 0xe0, 0x00, 0x7f, 0xff, 0xe0, 0x00, 
-  0x0f, 0xff, 0xc0, 0x00, 0xff, 0xff, 0xc0, 0x00, 
-  0x0f, 0xff, 0x80, 0x00, 0xff, 0xff, 0x00, 0x00, 
-  0x0f, 0xff, 0x80, 0x01, 0xff, 0xfe, 0x00, 0x00, 
-  0x0f, 0xff, 0x00, 0x01, 0xff, 0xfc, 0x00, 0x00, 
-  0x0f, 0xfe, 0x00, 0x03, 0xff, 0xf8, 0x00, 0x00, 
-  0x0f, 0xfe, 0x00, 0x03, 0xff, 0xf0, 0x00, 0x00, 
-  0x0f, 0xfe, 0x00, 0x03, 0xff, 0xc0, 0x00, 0x00, 
-  0x0f, 0xfc, 0x00, 0x03, 0xff, 0x00, 0x00, 0x00, 
-  0x0f, 0xfc, 0x00, 0x03, 0xfe, 0x00, 0x00, 0x00, 
-  0x0f, 0xfc, 0x00, 0x03, 0xfc, 0x00, 0x00, 0x00, 
-  0x0f, 0xfc, 0x00, 0x03, 0xf8, 0x00, 0x00, 0x00, 
-  0x0f, 0xfc, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x0f, 0xfc, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x0f, 0xfc, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x0f, 0xfc, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x0f, 0xfc, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x0f, 0xfc, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x0f, 0xfc, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x0f, 0xfc, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x0f, 0xfc, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x0f, 0xfc, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x0f, 0xfc, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x0f, 0xfc, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x0f, 0xfc, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x0f, 0xfc, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x0f, 0xfc, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x0f, 0xfc, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x0f, 0xfc, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x0f, 0xfc, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x0f, 0xfc, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x0f, 0xfc, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x0f, 0xfc, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x0f, 0xfc, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-};
-
-const lv_img_dsc_t invalid_right = {
-      {
-        LV_IMG_CF_INDEXED_1BIT,
-        0,
-        0,
-        64,
-        64
-    },
-    520,
-invalid_right_map,
-};
diff --git a/src/displayapp/icons/navigation/invalid-right.png b/src/displayapp/icons/navigation/invalid-right.png
deleted file mode 100644
index 8d0e5c94..00000000
--- a/src/displayapp/icons/navigation/invalid-right.png
+++ /dev/null
diff --git a/src/displayapp/icons/navigation/invalid-slight-left-white.svg b/src/displayapp/icons/navigation/invalid-slight-left-white.svg
deleted file mode 100644
index 7ae2013c..00000000
--- a/src/displayapp/icons/navigation/invalid-slight-left-white.svg
+++ /dev/null
@@ -1,4 +0,0 @@
-<svg id="WORKING_ICONS" data-name="WORKING ICONS" xmlns="http://www.w3.org/2000/svg" width="20" height="20" viewBox="0 0 20 20">
-  <title>direction</title>
-  <path fill="#ffffff" d="M14.9859,14.043v3.46082A0.49621,0.49621,0,0,1,14.48974,18H13.48321a0.49614,0.49614,0,0,1-.49615-0.49683l0.0047-3.60767a5.21819,5.21819,0,0,0-1.665-4.144L8.87854,7.68585a0.35758,0.35758,0,0,0-.6405.16266l-0.91821,3.1106A0.38663,0.38663,0,0,1,6.58044,10.86L5,3l8.00476,0.44965a0.38658,0.38658,0,0,1,.20294.71777L10.25878,5.51758a0.3576,0.3576,0,0,0-.07019.6571l2.45746,2.07385A7.25158,7.25158,0,0,1,14.9859,14.043Z"/>
-</svg>
diff --git a/src/displayapp/icons/navigation/invalid-slight-left.c b/src/displayapp/icons/navigation/invalid-slight-left.c
deleted file mode 100644
index 70329db3..00000000
--- a/src/displayapp/icons/navigation/invalid-slight-left.c
+++ /dev/null
@@ -1,96 +0,0 @@
-#if defined(LV_LVGL_H_INCLUDE_SIMPLE)
-#include "lvgl.h"
-#else
-#include "lvgl/lvgl.h"
-#endif
-
-
-#ifndef LV_ATTRIBUTE_MEM_ALIGN
-#define LV_ATTRIBUTE_MEM_ALIGN
-#endif
-
-#ifndef LV_ATTRIBUTE_IMG_INVALID_SLIGHT_LEFT
-#define LV_ATTRIBUTE_IMG_INVALID_SLIGHT_LEFT
-#endif
-
-const LV_ATTRIBUTE_MEM_ALIGN LV_ATTRIBUTE_LARGE_CONST LV_ATTRIBUTE_IMG_INVALID_SLIGHT_LEFT uint8_t invalid_slight_left_map[] = {
-  0x04, 0x02, 0x04, 0xff, 	/*Color of index 0*/
-  0xfc, 0xfe, 0xfc, 0xff, 	/*Color of index 1*/
-
-  0x00, 0x1f, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 
-  0x00, 0x1f, 0xff, 0xff, 0xff, 0xff, 0x80, 0x00, 
-  0x00, 0x1f, 0xff, 0xff, 0xff, 0xff, 0x80, 0x00, 
-  0x00, 0x1f, 0xff, 0xff, 0xff, 0xff, 0x80, 0x00, 
-  0x00, 0x1f, 0xff, 0xff, 0xff, 0xff, 0x80, 0x00, 
-  0x00, 0x1f, 0xff, 0xff, 0xff, 0xff, 0x80, 0x00, 
-  0x00, 0x1f, 0xff, 0xff, 0xff, 0xff, 0x80, 0x00, 
-  0x00, 0x1f, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 
-  0x00, 0x1f, 0xff, 0xff, 0xff, 0xf8, 0x00, 0x00, 
-  0x00, 0x1f, 0xff, 0xff, 0xff, 0xe0, 0x00, 0x00, 
-  0x00, 0x1f, 0xff, 0xff, 0xff, 0x80, 0x00, 0x00, 
-  0x00, 0x1f, 0xff, 0xff, 0xfc, 0x00, 0x00, 0x00, 
-  0x00, 0x1f, 0xff, 0xff, 0xf0, 0x00, 0x00, 0x00, 
-  0x00, 0x0f, 0xff, 0xff, 0xfc, 0x00, 0x00, 0x00, 
-  0x00, 0x0f, 0xff, 0xff, 0xfc, 0x00, 0x00, 0x00, 
-  0x00, 0x0f, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 
-  0x00, 0x0f, 0xff, 0xff, 0xff, 0x80, 0x00, 0x00, 
-  0x00, 0x0f, 0xff, 0xff, 0xff, 0xc0, 0x00, 0x00, 
-  0x00, 0x07, 0xff, 0xff, 0xff, 0xe0, 0x00, 0x00, 
-  0x00, 0x07, 0xff, 0xff, 0xff, 0xf8, 0x00, 0x00, 
-  0x00, 0x07, 0xff, 0xff, 0xff, 0xfc, 0x00, 0x00, 
-  0x00, 0x07, 0xff, 0xff, 0xff, 0xfe, 0x00, 0x00, 
-  0x00, 0x07, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 
-  0x00, 0x03, 0xff, 0xff, 0xff, 0xff, 0x80, 0x00, 
-  0x00, 0x03, 0xff, 0xc7, 0xff, 0xff, 0x80, 0x00, 
-  0x00, 0x03, 0xff, 0xc3, 0xff, 0xff, 0xc0, 0x00, 
-  0x00, 0x03, 0xff, 0xc1, 0xff, 0xff, 0xe0, 0x00, 
-  0x00, 0x03, 0xff, 0x80, 0xff, 0xff, 0xe0, 0x00, 
-  0x00, 0x01, 0xff, 0x80, 0x7f, 0xff, 0xf0, 0x00, 
-  0x00, 0x01, 0xff, 0x80, 0x1f, 0xff, 0xf8, 0x00, 
-  0x00, 0x01, 0xff, 0x80, 0x0f, 0xff, 0xf8, 0x00, 
-  0x00, 0x01, 0xff, 0x00, 0x07, 0xff, 0xf8, 0x00, 
-  0x00, 0x01, 0xff, 0x00, 0x03, 0xff, 0xfc, 0x00, 
-  0x00, 0x00, 0xff, 0x00, 0x01, 0xff, 0xfc, 0x00, 
-  0x00, 0x00, 0xfe, 0x00, 0x01, 0xff, 0xfc, 0x00, 
-  0x00, 0x00, 0xfe, 0x00, 0x00, 0xff, 0xfc, 0x00, 
-  0x00, 0x00, 0xfe, 0x00, 0x00, 0x7f, 0xfc, 0x00, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x7f, 0xfc, 0x00, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x3f, 0xfc, 0x00, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x3f, 0xfc, 0x00, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x3f, 0xfc, 0x00, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x1f, 0xfc, 0x00, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x1f, 0xfc, 0x00, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x1f, 0xfc, 0x00, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x1f, 0xfc, 0x00, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x1f, 0xfc, 0x00, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x1f, 0xfc, 0x00, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x1f, 0xfc, 0x00, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x1f, 0xfc, 0x00, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x1f, 0xfc, 0x00, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x1f, 0xfc, 0x00, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x1f, 0xfc, 0x00, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x1f, 0xfc, 0x00, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x1f, 0xfc, 0x00, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x1f, 0xfc, 0x00, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x1f, 0xfc, 0x00, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x1f, 0xfc, 0x00, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x1f, 0xfc, 0x00, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x1f, 0xfc, 0x00, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x1f, 0xfc, 0x00, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x1f, 0xfc, 0x00, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x1f, 0xfc, 0x00, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x1f, 0xfc, 0x00, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x1f, 0xfc, 0x00, 
-};
-
-const lv_img_dsc_t invalid_slight_left = {
-      {
-        LV_IMG_CF_INDEXED_1BIT,
-        0,
-        0,
-        64,
-        64
-    },
-    520,
-invalid_slight_left_map,
-};
diff --git a/src/displayapp/icons/navigation/invalid-slight-left.png b/src/displayapp/icons/navigation/invalid-slight-left.png
deleted file mode 100644
index a19f840a..00000000
--- a/src/displayapp/icons/navigation/invalid-slight-left.png
+++ /dev/null
diff --git a/src/displayapp/icons/navigation/invalid-slight-right-white.svg b/src/displayapp/icons/navigation/invalid-slight-right-white.svg
deleted file mode 100644
index 46090067..00000000
--- a/src/displayapp/icons/navigation/invalid-slight-right-white.svg
+++ /dev/null
@@ -1,4 +0,0 @@
-<svg id="WORKING_ICONS" data-name="WORKING ICONS" xmlns="http://www.w3.org/2000/svg" width="20" height="20" viewBox="0 0 20 20">
-  <title>direction</title>
-  <path fill="#ffffff" d="M7.35395,8.24854L9.81141,6.17468a0.3576,0.3576,0,0,0-.07019-0.6571L6.7923,4.16742a0.38658,0.38658,0,0,1,.20294-0.71777L15,3l-1.58044,7.86a0.38663,0.38663,0,0,1-.73938.09912L11.762,7.84851a0.35758,0.35758,0,0,0-.6405-0.16266L8.67328,9.75146a5.21819,5.21819,0,0,0-1.665,4.144l0.0047,3.60767A0.49614,0.49614,0,0,1,6.51679,18H5.51026a0.49621,0.49621,0,0,1-.49615-0.49622V14.043A7.25157,7.25157,0,0,1,7.35395,8.24854Z"/>
-</svg>
diff --git a/src/displayapp/icons/navigation/invalid-slight-right.c b/src/displayapp/icons/navigation/invalid-slight-right.c
deleted file mode 100644
index fa51ed7e..00000000
--- a/src/displayapp/icons/navigation/invalid-slight-right.c
+++ /dev/null
@@ -1,96 +0,0 @@
-#if defined(LV_LVGL_H_INCLUDE_SIMPLE)
-#include "lvgl.h"
-#else
-#include "lvgl/lvgl.h"
-#endif
-
-
-#ifndef LV_ATTRIBUTE_MEM_ALIGN
-#define LV_ATTRIBUTE_MEM_ALIGN
-#endif
-
-#ifndef LV_ATTRIBUTE_IMG_INVALID_SLIGHT_RIGHT
-#define LV_ATTRIBUTE_IMG_INVALID_SLIGHT_RIGHT
-#endif
-
-const LV_ATTRIBUTE_MEM_ALIGN LV_ATTRIBUTE_LARGE_CONST LV_ATTRIBUTE_IMG_INVALID_SLIGHT_RIGHT uint8_t invalid_slight_right_map[] = {
-  0x04, 0x02, 0x04, 0xff, 	/*Color of index 0*/
-  0xfc, 0xfe, 0xfc, 0xff, 	/*Color of index 1*/
-
-  0x00, 0x00, 0x7f, 0xff, 0xff, 0xff, 0xfc, 0x00, 
-  0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xfc, 0x00, 
-  0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xfc, 0x00, 
-  0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xfc, 0x00, 
-  0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xfc, 0x00, 
-  0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xfc, 0x00, 
-  0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xfc, 0x00, 
-  0x00, 0x00, 0x3f, 0xff, 0xff, 0xff, 0xfc, 0x00, 
-  0x00, 0x00, 0x0f, 0xff, 0xff, 0xff, 0xfc, 0x00, 
-  0x00, 0x00, 0x03, 0xff, 0xff, 0xff, 0xfc, 0x00, 
-  0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xfc, 0x00, 
-  0x00, 0x00, 0x00, 0x1f, 0xff, 0xff, 0xfc, 0x00, 
-  0x00, 0x00, 0x00, 0x07, 0xff, 0xff, 0xfc, 0x00, 
-  0x00, 0x00, 0x00, 0x1f, 0xff, 0xff, 0xf8, 0x00, 
-  0x00, 0x00, 0x00, 0x1f, 0xff, 0xff, 0xf8, 0x00, 
-  0x00, 0x00, 0x00, 0x7f, 0xff, 0xff, 0xf8, 0x00, 
-  0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xf8, 0x00, 
-  0x00, 0x00, 0x01, 0xff, 0xff, 0xff, 0xf8, 0x00, 
-  0x00, 0x00, 0x03, 0xff, 0xff, 0xff, 0xf0, 0x00, 
-  0x00, 0x00, 0x0f, 0xff, 0xff, 0xff, 0xf0, 0x00, 
-  0x00, 0x00, 0x1f, 0xff, 0xff, 0xff, 0xf0, 0x00, 
-  0x00, 0x00, 0x3f, 0xff, 0xff, 0xff, 0xf0, 0x00, 
-  0x00, 0x00, 0x7f, 0xff, 0xff, 0xff, 0xf0, 0x00, 
-  0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xe0, 0x00, 
-  0x00, 0x00, 0xff, 0xff, 0xf1, 0xff, 0xe0, 0x00, 
-  0x00, 0x01, 0xff, 0xff, 0xe1, 0xff, 0xe0, 0x00, 
-  0x00, 0x03, 0xff, 0xff, 0xc1, 0xff, 0xe0, 0x00, 
-  0x00, 0x03, 0xff, 0xff, 0x80, 0xff, 0xe0, 0x00, 
-  0x00, 0x07, 0xff, 0xff, 0x00, 0xff, 0xc0, 0x00, 
-  0x00, 0x0f, 0xff, 0xfc, 0x00, 0xff, 0xc0, 0x00, 
-  0x00, 0x0f, 0xff, 0xf8, 0x00, 0xff, 0xc0, 0x00, 
-  0x00, 0x0f, 0xff, 0xf0, 0x00, 0x7f, 0xc0, 0x00, 
-  0x00, 0x1f, 0xff, 0xe0, 0x00, 0x7f, 0xc0, 0x00, 
-  0x00, 0x1f, 0xff, 0xc0, 0x00, 0x7f, 0x80, 0x00, 
-  0x00, 0x1f, 0xff, 0xc0, 0x00, 0x3f, 0x80, 0x00, 
-  0x00, 0x1f, 0xff, 0x80, 0x00, 0x3f, 0x80, 0x00, 
-  0x00, 0x1f, 0xff, 0x00, 0x00, 0x3f, 0x80, 0x00, 
-  0x00, 0x1f, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x00, 0x1f, 0xfe, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x00, 0x1f, 0xfe, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x00, 0x1f, 0xfe, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x00, 0x1f, 0xfc, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x00, 0x1f, 0xfc, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x00, 0x1f, 0xfc, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x00, 0x1f, 0xfc, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x00, 0x1f, 0xfc, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x00, 0x1f, 0xfc, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x00, 0x1f, 0xfc, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x00, 0x1f, 0xfc, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x00, 0x1f, 0xfc, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x00, 0x1f, 0xfc, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x00, 0x1f, 0xfc, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x00, 0x1f, 0xfc, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x00, 0x1f, 0xfc, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x00, 0x1f, 0xfc, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x00, 0x1f, 0xfc, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x00, 0x1f, 0xfc, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x00, 0x1f, 0xfc, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x00, 0x1f, 0xfc, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x00, 0x1f, 0xfc, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x00, 0x1f, 0xfc, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x00, 0x1f, 0xfc, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x00, 0x1f, 0xfc, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x00, 0x1f, 0xfc, 0x00, 0x00, 0x00, 0x00, 0x00, 
-};
-
-const lv_img_dsc_t invalid_slight_right = {
-      {
-        LV_IMG_CF_INDEXED_1BIT,
-        0,
-        0,
-        64,
-        64
-    },
-    520,
-invalid_slight_right_map,
-};
diff --git a/src/displayapp/icons/navigation/invalid-slight-right.png b/src/displayapp/icons/navigation/invalid-slight-right.png
deleted file mode 100644
index b6ba9564..00000000
--- a/src/displayapp/icons/navigation/invalid-slight-right.png
+++ /dev/null
diff --git a/src/displayapp/icons/navigation/invalid-straight-white.svg b/src/displayapp/icons/navigation/invalid-straight-white.svg
deleted file mode 100644
index 08531119..00000000
--- a/src/displayapp/icons/navigation/invalid-straight-white.svg
+++ /dev/null
@@ -1,4 +0,0 @@
-<svg id="WORKING_ICONS" data-name="WORKING ICONS" xmlns="http://www.w3.org/2000/svg" width="20" height="20" viewBox="0 0 20 20">
-  <title>direction</title>
-  <path fill="#ffffff" d="M14.50342,8.96637L11.55157,7.62262A0.35755,0.35755,0,0,0,11.00916,8v9.49652A0.50346,0.50346,0,0,1,10.50568,18h-0.993a0.50346,0.50346,0,0,1-.50348-0.50348V8a0.35756,0.35756,0,0,0-.54242-0.37738L5.51489,8.96637a0.38659,0.38659,0,0,1-.40942-0.62354L10.00916,2l4.90369,6.34283A0.3866,0.3866,0,0,1,14.50342,8.96637Z"/>
-</svg>
diff --git a/src/displayapp/icons/navigation/invalid-straight.c b/src/displayapp/icons/navigation/invalid-straight.c
deleted file mode 100644
index f9f9b331..00000000
--- a/src/displayapp/icons/navigation/invalid-straight.c
+++ /dev/null
@@ -1,96 +0,0 @@
-#if defined(LV_LVGL_H_INCLUDE_SIMPLE)
-#include "lvgl.h"
-#else
-#include "lvgl/lvgl.h"
-#endif
-
-
-#ifndef LV_ATTRIBUTE_MEM_ALIGN
-#define LV_ATTRIBUTE_MEM_ALIGN
-#endif
-
-#ifndef LV_ATTRIBUTE_IMG_INVALID_STRAIGHT
-#define LV_ATTRIBUTE_IMG_INVALID_STRAIGHT
-#endif
-
-const LV_ATTRIBUTE_MEM_ALIGN LV_ATTRIBUTE_LARGE_CONST LV_ATTRIBUTE_IMG_INVALID_STRAIGHT uint8_t invalid_straight_map[] = {
-  0x04, 0x02, 0x04, 0xff, 	/*Color of index 0*/
-  0xfc, 0xfe, 0xfc, 0xff, 	/*Color of index 1*/
-
-  0x00, 0x00, 0x00, 0x0f, 0xf0, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x1f, 0xf8, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x1f, 0xf8, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x3f, 0xfc, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x7f, 0xfe, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0xff, 0xff, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x01, 0xff, 0xff, 0x80, 0x00, 0x00, 
-  0x00, 0x00, 0x01, 0xff, 0xff, 0x80, 0x00, 0x00, 
-  0x00, 0x00, 0x03, 0xff, 0xff, 0xc0, 0x00, 0x00, 
-  0x00, 0x00, 0x07, 0xff, 0xff, 0xe0, 0x00, 0x00, 
-  0x00, 0x00, 0x07, 0xff, 0xff, 0xf0, 0x00, 0x00, 
-  0x00, 0x00, 0x0f, 0xff, 0xff, 0xf0, 0x00, 0x00, 
-  0x00, 0x00, 0x1f, 0xff, 0xff, 0xf8, 0x00, 0x00, 
-  0x00, 0x00, 0x3f, 0xff, 0xff, 0xfc, 0x00, 0x00, 
-  0x00, 0x00, 0x7f, 0xff, 0xff, 0xfe, 0x00, 0x00, 
-  0x00, 0x00, 0x7f, 0xff, 0xff, 0xfe, 0x00, 0x00, 
-  0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 
-  0x00, 0x01, 0xff, 0xff, 0xff, 0xff, 0x80, 0x00, 
-  0x00, 0x03, 0xff, 0xff, 0xff, 0xff, 0xc0, 0x00, 
-  0x00, 0x03, 0xff, 0xff, 0xff, 0xff, 0xc0, 0x00, 
-  0x00, 0x07, 0xff, 0xff, 0xff, 0xff, 0xe0, 0x00, 
-  0x00, 0x0f, 0xff, 0xff, 0xff, 0xff, 0xf0, 0x00, 
-  0x00, 0x0f, 0xff, 0xff, 0xff, 0xff, 0xf0, 0x00, 
-  0x00, 0x0f, 0xff, 0xff, 0xff, 0xff, 0xf0, 0x00, 
-  0x00, 0x0f, 0xff, 0xff, 0xff, 0xff, 0xf0, 0x00, 
-  0x00, 0x0f, 0xff, 0xff, 0xff, 0xff, 0xf0, 0x00, 
-  0x00, 0x0f, 0xfe, 0x3f, 0xfc, 0x7f, 0xf0, 0x00, 
-  0x00, 0x0f, 0xf8, 0x3f, 0xfc, 0x1f, 0xf0, 0x00, 
-  0x00, 0x0f, 0xe0, 0x3f, 0xfc, 0x07, 0xf0, 0x00, 
-  0x00, 0x0f, 0x80, 0x3f, 0xfc, 0x01, 0xf0, 0x00, 
-  0x00, 0x00, 0x00, 0x3f, 0xfc, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x3f, 0xfc, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x3f, 0xfc, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x3f, 0xfc, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x3f, 0xfc, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x3f, 0xfc, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x3f, 0xfc, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x3f, 0xfc, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x3f, 0xfc, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x3f, 0xfc, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x3f, 0xfc, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x3f, 0xfc, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x3f, 0xfc, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x3f, 0xfc, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x3f, 0xfc, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x3f, 0xfc, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x3f, 0xfc, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x3f, 0xfc, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x3f, 0xfc, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x3f, 0xfc, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x3f, 0xfc, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x3f, 0xfc, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x3f, 0xfc, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x3f, 0xfc, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x3f, 0xfc, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x3f, 0xfc, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x3f, 0xfc, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x3f, 0xfc, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x3f, 0xfc, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x3f, 0xfc, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x3f, 0xfc, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x3f, 0xfc, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x3f, 0xfc, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x3f, 0xfc, 0x00, 0x00, 0x00, 
-};
-
-const lv_img_dsc_t invalid_straight = {
-      {
-        LV_IMG_CF_INDEXED_1BIT,
-        0,
-        0,
-        64,
-        64
-    },
-    520,
-invalid_straight_map,
-};
diff --git a/src/displayapp/icons/navigation/invalid-straight.png b/src/displayapp/icons/navigation/invalid-straight.png
deleted file mode 100644
index 0f42d678..00000000
--- a/src/displayapp/icons/navigation/invalid-straight.png
+++ /dev/null
diff --git a/src/displayapp/icons/navigation/invalid-uturn-white.svg b/src/displayapp/icons/navigation/invalid-uturn-white.svg
deleted file mode 100644
index b2c8a120..00000000
--- a/src/displayapp/icons/navigation/invalid-uturn-white.svg
+++ /dev/null
@@ -1,4 +0,0 @@
-<svg id="WORKING_ICONS" data-name="WORKING ICONS" xmlns="http://www.w3.org/2000/svg" width="20" height="20" viewBox="0 0 20 20">
-  <title>direction</title>
-  <path fill="#ffffff" d="M17.00909,8v9.49652A0.50346,0.50346,0,0,1,16.50562,18h-0.993a0.50346,0.50346,0,0,1-.50348-0.50348V8a3.5,3.5,0,1,0-7,0v4H8a0.35757,0.35757,0,0,0,.54242.37738l2.95184-1.34375a0.3866,0.3866,0,0,1,.40942.62354L7,18,2.09625,11.65717a0.3866,0.3866,0,0,1,.40942-0.62354l2.95184,1.34375A0.3576,0.3576,0,0,0,6,12H6.00909V8A5.5,5.5,0,1,1,17.00909,8Z"/>
-</svg>
diff --git a/src/displayapp/icons/navigation/invalid-uturn.c b/src/displayapp/icons/navigation/invalid-uturn.c
deleted file mode 100644
index c3bf775d..00000000
--- a/src/displayapp/icons/navigation/invalid-uturn.c
+++ /dev/null
@@ -1,96 +0,0 @@
-#if defined(LV_LVGL_H_INCLUDE_SIMPLE)
-#include "lvgl.h"
-#else
-#include "lvgl/lvgl.h"
-#endif
-
-
-#ifndef LV_ATTRIBUTE_MEM_ALIGN
-#define LV_ATTRIBUTE_MEM_ALIGN
-#endif
-
-#ifndef LV_ATTRIBUTE_IMG_INVALID_UTURN
-#define LV_ATTRIBUTE_IMG_INVALID_UTURN
-#endif
-
-const LV_ATTRIBUTE_MEM_ALIGN LV_ATTRIBUTE_LARGE_CONST LV_ATTRIBUTE_IMG_INVALID_UTURN uint8_t invalid_uturn_map[] = {
-  0x04, 0x02, 0x04, 0xff, 	/*Color of index 0*/
-  0xfc, 0xfe, 0xfc, 0xff, 	/*Color of index 1*/
-
-  0x00, 0x00, 0x00, 0x0f, 0xff, 0xff, 0xf8, 0x00, 
-  0x00, 0x00, 0x00, 0x3f, 0xff, 0xff, 0xfc, 0x00, 
-  0x00, 0x00, 0x00, 0x7f, 0xff, 0xff, 0xff, 0x00, 
-  0x00, 0x00, 0x01, 0xff, 0xff, 0xff, 0xff, 0x80, 
-  0x00, 0x00, 0x03, 0xff, 0xff, 0xff, 0xff, 0xc0, 
-  0x00, 0x00, 0x07, 0xff, 0xff, 0xff, 0xff, 0xe0, 
-  0x00, 0x00, 0x07, 0xff, 0xff, 0xff, 0xff, 0xf0, 
-  0x00, 0x00, 0x0f, 0xff, 0xff, 0xff, 0xff, 0xf8, 
-  0x00, 0x00, 0x1f, 0xff, 0xff, 0xff, 0xff, 0xf8, 
-  0x00, 0x00, 0x1f, 0xff, 0xff, 0xff, 0xff, 0xfc, 
-  0x00, 0x00, 0x3f, 0xff, 0xff, 0x7f, 0xff, 0xfe, 
-  0x00, 0x00, 0x3f, 0xff, 0xf8, 0x0f, 0xff, 0xfe, 
-  0x00, 0x00, 0x7f, 0xff, 0xe0, 0x03, 0xff, 0xfe, 
-  0x00, 0x00, 0x7f, 0xff, 0x80, 0x01, 0xff, 0xfe, 
-  0x00, 0x00, 0x7f, 0xff, 0x00, 0x00, 0xff, 0xfe, 
-  0x00, 0x00, 0x7f, 0xfe, 0x00, 0x00, 0x7f, 0xfe, 
-  0x00, 0x00, 0xff, 0xfc, 0x00, 0x00, 0x3f, 0xfe, 
-  0x00, 0x00, 0xff, 0xfc, 0x00, 0x00, 0x1f, 0xfe, 
-  0x00, 0x00, 0xff, 0xf8, 0x00, 0x00, 0x1f, 0xfe, 
-  0x00, 0x00, 0xff, 0xf8, 0x00, 0x00, 0x0f, 0xfe, 
-  0x00, 0x00, 0xff, 0xf8, 0x00, 0x00, 0x0f, 0xfe, 
-  0x00, 0x00, 0xff, 0xf0, 0x00, 0x00, 0x0f, 0xfe, 
-  0x00, 0x00, 0xff, 0xf0, 0x00, 0x00, 0x07, 0xfe, 
-  0x00, 0x00, 0xff, 0xf0, 0x00, 0x00, 0x07, 0xfe, 
-  0x00, 0x00, 0xff, 0xf0, 0x00, 0x00, 0x07, 0xfe, 
-  0x00, 0x00, 0xff, 0xf0, 0x00, 0x00, 0x07, 0xfe, 
-  0x00, 0x00, 0xff, 0xf0, 0x00, 0x00, 0x07, 0xfe, 
-  0x00, 0x00, 0xff, 0xf0, 0x00, 0x00, 0x07, 0xfe, 
-  0x00, 0x00, 0xff, 0xf0, 0x00, 0x00, 0x07, 0xfe, 
-  0x00, 0x00, 0xff, 0xf0, 0x00, 0x00, 0x07, 0xfe, 
-  0x00, 0x00, 0xff, 0xf0, 0x00, 0x00, 0x07, 0xfe, 
-  0x00, 0x00, 0xff, 0xf0, 0x00, 0x00, 0x07, 0xfe, 
-  0x00, 0x00, 0xff, 0xf0, 0x00, 0x00, 0x07, 0xfe, 
-  0x7c, 0x00, 0xff, 0xf0, 0x03, 0xf0, 0x07, 0xfe, 
-  0x7f, 0x00, 0xff, 0xf0, 0x1f, 0xf0, 0x07, 0xfe, 
-  0x7f, 0xc0, 0xff, 0xf0, 0x7f, 0xf0, 0x07, 0xfe, 
-  0x7f, 0xf8, 0xff, 0xf1, 0xff, 0xf0, 0x07, 0xfe, 
-  0x7f, 0xfe, 0xff, 0xf7, 0xff, 0xf0, 0x07, 0xfe, 
-  0x7f, 0xff, 0xff, 0xff, 0xff, 0xf0, 0x07, 0xfe, 
-  0x7f, 0xff, 0xff, 0xff, 0xff, 0xf0, 0x07, 0xfe, 
-  0x7f, 0xff, 0xff, 0xff, 0xff, 0xe0, 0x07, 0xfe, 
-  0x7f, 0xff, 0xff, 0xff, 0xff, 0xe0, 0x07, 0xfe, 
-  0x3f, 0xff, 0xff, 0xff, 0xff, 0xc0, 0x07, 0xfe, 
-  0x3f, 0xff, 0xff, 0xff, 0xff, 0x80, 0x07, 0xfe, 
-  0x1f, 0xff, 0xff, 0xff, 0xff, 0x00, 0x07, 0xfe, 
-  0x0f, 0xff, 0xff, 0xff, 0xff, 0x00, 0x07, 0xfe, 
-  0x07, 0xff, 0xff, 0xff, 0xfe, 0x00, 0x07, 0xfe, 
-  0x03, 0xff, 0xff, 0xff, 0xfc, 0x00, 0x07, 0xfe, 
-  0x03, 0xff, 0xff, 0xff, 0xf8, 0x00, 0x07, 0xfe, 
-  0x01, 0xff, 0xff, 0xff, 0xf8, 0x00, 0x07, 0xfe, 
-  0x00, 0xff, 0xff, 0xff, 0xf0, 0x00, 0x07, 0xfe, 
-  0x00, 0x7f, 0xff, 0xff, 0xe0, 0x00, 0x07, 0xfe, 
-  0x00, 0x7f, 0xff, 0xff, 0xc0, 0x00, 0x07, 0xfe, 
-  0x00, 0x3f, 0xff, 0xff, 0x80, 0x00, 0x07, 0xfe, 
-  0x00, 0x1f, 0xff, 0xff, 0x80, 0x00, 0x07, 0xfe, 
-  0x00, 0x0f, 0xff, 0xff, 0x00, 0x00, 0x07, 0xfe, 
-  0x00, 0x07, 0xff, 0xfe, 0x00, 0x00, 0x07, 0xfe, 
-  0x00, 0x07, 0xff, 0xfc, 0x00, 0x00, 0x07, 0xfe, 
-  0x00, 0x03, 0xff, 0xfc, 0x00, 0x00, 0x07, 0xfe, 
-  0x00, 0x01, 0xff, 0xf8, 0x00, 0x00, 0x07, 0xfe, 
-  0x00, 0x00, 0xff, 0xf0, 0x00, 0x00, 0x07, 0xfe, 
-  0x00, 0x00, 0xff, 0xe0, 0x00, 0x00, 0x07, 0xfe, 
-  0x00, 0x00, 0x7f, 0xc0, 0x00, 0x00, 0x07, 0xfe, 
-  0x00, 0x00, 0x3f, 0xc0, 0x00, 0x00, 0x07, 0xfe, 
-};
-
-const lv_img_dsc_t invalid_uturn = {
-      {
-        LV_IMG_CF_INDEXED_1BIT,
-        0,
-        0,
-        64,
-        64
-    },
-    520,
-invalid_uturn_map,
-};
diff --git a/src/displayapp/icons/navigation/invalid-uturn.png b/src/displayapp/icons/navigation/invalid-uturn.png
deleted file mode 100644
index 6e31e8f6..00000000
--- a/src/displayapp/icons/navigation/invalid-uturn.png
+++ /dev/null
diff --git a/src/displayapp/icons/navigation/invalid-white.svg b/src/displayapp/icons/navigation/invalid-white.svg
deleted file mode 100644
index 08531119..00000000
--- a/src/displayapp/icons/navigation/invalid-white.svg
+++ /dev/null
@@ -1,4 +0,0 @@
-<svg id="WORKING_ICONS" data-name="WORKING ICONS" xmlns="http://www.w3.org/2000/svg" width="20" height="20" viewBox="0 0 20 20">
-  <title>direction</title>
-  <path fill="#ffffff" d="M14.50342,8.96637L11.55157,7.62262A0.35755,0.35755,0,0,0,11.00916,8v9.49652A0.50346,0.50346,0,0,1,10.50568,18h-0.993a0.50346,0.50346,0,0,1-.50348-0.50348V8a0.35756,0.35756,0,0,0-.54242-0.37738L5.51489,8.96637a0.38659,0.38659,0,0,1-.40942-0.62354L10.00916,2l4.90369,6.34283A0.3866,0.3866,0,0,1,14.50342,8.96637Z"/>
-</svg>
diff --git a/src/displayapp/icons/navigation/invalid.c b/src/displayapp/icons/navigation/invalid.c
deleted file mode 100644
index 53fe4e30..00000000
--- a/src/displayapp/icons/navigation/invalid.c
+++ /dev/null
@@ -1,96 +0,0 @@
-#if defined(LV_LVGL_H_INCLUDE_SIMPLE)
-#include "lvgl.h"
-#else
-#include "lvgl/lvgl.h"
-#endif
-
-
-#ifndef LV_ATTRIBUTE_MEM_ALIGN
-#define LV_ATTRIBUTE_MEM_ALIGN
-#endif
-
-#ifndef LV_ATTRIBUTE_IMG_INVALID
-#define LV_ATTRIBUTE_IMG_INVALID
-#endif
-
-const LV_ATTRIBUTE_MEM_ALIGN LV_ATTRIBUTE_LARGE_CONST LV_ATTRIBUTE_IMG_INVALID uint8_t invalid_map[] = {
-  0x04, 0x02, 0x04, 0xff, 	/*Color of index 0*/
-  0xfc, 0xfe, 0xfc, 0xff, 	/*Color of index 1*/
-
-  0x00, 0x00, 0x00, 0x0f, 0xf0, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x1f, 0xf8, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x1f, 0xf8, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x3f, 0xfc, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x7f, 0xfe, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0xff, 0xff, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x01, 0xff, 0xff, 0x80, 0x00, 0x00, 
-  0x00, 0x00, 0x01, 0xff, 0xff, 0x80, 0x00, 0x00, 
-  0x00, 0x00, 0x03, 0xff, 0xff, 0xc0, 0x00, 0x00, 
-  0x00, 0x00, 0x07, 0xff, 0xff, 0xe0, 0x00, 0x00, 
-  0x00, 0x00, 0x07, 0xff, 0xff, 0xf0, 0x00, 0x00, 
-  0x00, 0x00, 0x0f, 0xff, 0xff, 0xf0, 0x00, 0x00, 
-  0x00, 0x00, 0x1f, 0xff, 0xff, 0xf8, 0x00, 0x00, 
-  0x00, 0x00, 0x3f, 0xff, 0xff, 0xfc, 0x00, 0x00, 
-  0x00, 0x00, 0x7f, 0xff, 0xff, 0xfe, 0x00, 0x00, 
-  0x00, 0x00, 0x7f, 0xff, 0xff, 0xfe, 0x00, 0x00, 
-  0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 
-  0x00, 0x01, 0xff, 0xff, 0xff, 0xff, 0x80, 0x00, 
-  0x00, 0x03, 0xff, 0xff, 0xff, 0xff, 0xc0, 0x00, 
-  0x00, 0x03, 0xff, 0xff, 0xff, 0xff, 0xc0, 0x00, 
-  0x00, 0x07, 0xff, 0xff, 0xff, 0xff, 0xe0, 0x00, 
-  0x00, 0x0f, 0xff, 0xff, 0xff, 0xff, 0xf0, 0x00, 
-  0x00, 0x0f, 0xff, 0xff, 0xff, 0xff, 0xf0, 0x00, 
-  0x00, 0x0f, 0xff, 0xff, 0xff, 0xff, 0xf0, 0x00, 
-  0x00, 0x0f, 0xff, 0xff, 0xff, 0xff, 0xf0, 0x00, 
-  0x00, 0x0f, 0xff, 0xff, 0xff, 0xff, 0xf0, 0x00, 
-  0x00, 0x0f, 0xfe, 0x3f, 0xfc, 0x7f, 0xf0, 0x00, 
-  0x00, 0x0f, 0xf8, 0x3f, 0xfc, 0x1f, 0xf0, 0x00, 
-  0x00, 0x0f, 0xe0, 0x3f, 0xfc, 0x07, 0xf0, 0x00, 
-  0x00, 0x0f, 0x80, 0x3f, 0xfc, 0x01, 0xf0, 0x00, 
-  0x00, 0x00, 0x00, 0x3f, 0xfc, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x3f, 0xfc, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x3f, 0xfc, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x3f, 0xfc, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x3f, 0xfc, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x3f, 0xfc, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x3f, 0xfc, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x3f, 0xfc, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x3f, 0xfc, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x3f, 0xfc, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x3f, 0xfc, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x3f, 0xfc, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x3f, 0xfc, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x3f, 0xfc, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x3f, 0xfc, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x3f, 0xfc, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x3f, 0xfc, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x3f, 0xfc, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x3f, 0xfc, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x3f, 0xfc, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x3f, 0xfc, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x3f, 0xfc, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x3f, 0xfc, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x3f, 0xfc, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x3f, 0xfc, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x3f, 0xfc, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x3f, 0xfc, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x3f, 0xfc, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x3f, 0xfc, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x3f, 0xfc, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x3f, 0xfc, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x3f, 0xfc, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x3f, 0xfc, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x3f, 0xfc, 0x00, 0x00, 0x00, 
-};
-
-const lv_img_dsc_t invalid = {
-      {
-        LV_IMG_CF_INDEXED_1BIT,
-        0,
-        0,
-        64,
-        64
-    },
-    520,
-invalid_map,
-};
diff --git a/src/displayapp/icons/navigation/invalid.png b/src/displayapp/icons/navigation/invalid.png
deleted file mode 100644
index f2234c20..00000000
--- a/src/displayapp/icons/navigation/invalid.png
+++ /dev/null
diff --git a/src/displayapp/icons/navigation/invalid.svg b/src/displayapp/icons/navigation/invalid.svg
new file mode 100644
index 00000000..82909860
--- /dev/null
+++ b/src/displayapp/icons/navigation/invalid.svg
@@ -0,0 +1,58 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   inkscape:version="1.0 (4035a4fb49, 2020-05-01)"
+   sodipodi:docname="invalid.svg"
+   version="1.1"
+   viewBox="0 0 20 20"
+   height="20"
+   width="20"
+   data-name="WORKING ICONS"
+   id="WORKING_ICONS">
+  <metadata
+     id="metadata11">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs9" />
+  <sodipodi:namedview
+     inkscape:current-layer="WORKING_ICONS"
+     inkscape:window-maximized="1"
+     inkscape:window-y="22"
+     inkscape:window-x="-8"
+     inkscape:cy="16.171954"
+     inkscape:cx="11.444793"
+     inkscape:zoom="21.5"
+     showgrid="false"
+     id="namedview7"
+     inkscape:window-height="1027"
+     inkscape:window-width="1920"
+     inkscape:pageshadow="2"
+     inkscape:pageopacity="0"
+     guidetolerance="10"
+     gridtolerance="10"
+     objecttolerance="10"
+     borderopacity="1"
+     bordercolor="#666666"
+     pagecolor="#ffffff" />
+  <title
+     id="title2">direction</title>
+  <path
+     style="stroke-width:1.25"
+     id="path4"
+     d="M 15.617836,8.707962 11.928024,7.028275 A 0.4469375,0.4469375 0 0 0 11.250011,7.5 V 19.37065 A 0.629325,0.629325 0 0 1 10.620661,20 H 9.3794106 a 0.629325,0.629325 0 0 1 -0.62935,-0.62935 V 7.5 A 0.44695,0.44695 0 0 0 8.0720358,7.028275 L 4.3821733,8.707962 A 0.4832375,0.4832375 0 0 1 3.8703983,7.9285375 L 10.000011,0 16.129624,7.9285375 A 0.48325,0.48325 0 0 1 15.617836,8.707962 Z"
+     fill="#000000" />
+</svg>
diff --git a/src/displayapp/icons/navigation/invalid_left.svg b/src/displayapp/icons/navigation/invalid_left.svg
new file mode 100644
index 00000000..dbf54d68
--- /dev/null
+++ b/src/displayapp/icons/navigation/invalid_left.svg
@@ -0,0 +1,58 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   inkscape:version="1.0 (4035a4fb49, 2020-05-01)"
+   sodipodi:docname="invalid_left.svg"
+   version="1.1"
+   viewBox="0 0 20 20"
+   height="20"
+   width="20"
+   data-name="WORKING ICONS"
+   id="WORKING_ICONS">
+  <metadata
+     id="metadata11">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs9" />
+  <sodipodi:namedview
+     inkscape:current-layer="WORKING_ICONS"
+     inkscape:window-maximized="1"
+     inkscape:window-y="22"
+     inkscape:window-x="-8"
+     inkscape:cy="13.16066"
+     inkscape:cx="14.33587"
+     inkscape:zoom="15.202796"
+     showgrid="false"
+     id="namedview7"
+     inkscape:window-height="1027"
+     inkscape:window-width="1920"
+     inkscape:pageshadow="2"
+     inkscape:pageopacity="0"
+     guidetolerance="10"
+     gridtolerance="10"
+     objecttolerance="10"
+     borderopacity="1"
+     bordercolor="#666666"
+     pagecolor="#ffffff" />
+  <title
+     id="title2">direction</title>
+  <path
+     style="stroke-width:1.24853"
+     id="path4"
+     d="m 11.243339,4.9925164 0.01373,0.00228 a 7.5663193,7.5663193 0 0 1 7.477437,7.5826126 v 4.925532 h -0.0039 l 0.0025,1.87675 a 0.61944488,0.61944488 0 0 1 -0.61952,0.620306 H 16.856998 A 0.61954476,0.61954476 0 0 1 16.237453,19.380458 V 12.577414 A 5.0663035,5.0663035 0 0 0 11.25736,7.491858 H 8.761827 A 0.44647376,0.44647376 0 0 0 8.2906573,8.1691592 L 9.9683672,11.854603 A 0.48266859,0.48266859 0 0 1 9.18986,12.365776 L 1.2654752,6.2661901 9.189885,0.12093333 a 0.48266859,0.48266859 0 0 1 0.7785072,0.5111725 L 8.2906573,4.3175744 A 0.4464363,0.4464363 0 0 0 8.761827,4.9948012 h 2.481512"
+     fill="#000000" />
+</svg>
diff --git a/src/displayapp/icons/navigation/invalid_right.svg b/src/displayapp/icons/navigation/invalid_right.svg
new file mode 100644
index 00000000..c6601c16
--- /dev/null
+++ b/src/displayapp/icons/navigation/invalid_right.svg
@@ -0,0 +1,58 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   inkscape:version="1.0 (4035a4fb49, 2020-05-01)"
+   sodipodi:docname="invalid_right.svg"
+   version="1.1"
+   viewBox="0 0 20 20"
+   height="20"
+   width="20"
+   data-name="WORKING ICONS"
+   id="WORKING_ICONS">
+  <metadata
+     id="metadata11">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs9" />
+  <sodipodi:namedview
+     inkscape:current-layer="WORKING_ICONS"
+     inkscape:window-maximized="1"
+     inkscape:window-y="22"
+     inkscape:window-x="-8"
+     inkscape:cy="13.842431"
+     inkscape:cx="9.2378771"
+     inkscape:zoom="21.5"
+     showgrid="false"
+     id="namedview7"
+     inkscape:window-height="1027"
+     inkscape:window-width="1920"
+     inkscape:pageshadow="2"
+     inkscape:pageopacity="0"
+     guidetolerance="10"
+     gridtolerance="10"
+     objecttolerance="10"
+     borderopacity="1"
+     bordercolor="#666666"
+     pagecolor="#ffffff" />
+  <title
+     id="title2">direction</title>
+  <path
+     style="stroke-width:1.24853"
+     id="path4"
+     d="M 8.7426433,7.4918486 A 5.0663062,5.0663062 0 0 0 3.7625481,12.577407 v 6.803048 A 0.61954509,0.61954509 0 0 1 3.143003,20 H 1.886396 A 0.6194452,0.6194452 0 0 1 1.2669383,19.379693 l 0.00243,-1.876751 h -0.00388 v -4.925535 a 7.5663233,7.5663233 0 0 1 7.477442,-7.5826165 l 0.01373,-0.00228 v 0.00228 h 2.4815137 a 0.44643653,0.44643653 0 0 0 0.47117,-0.6772271 L 10.031633,0.63210537 a 0.48266885,0.48266885 0 0 1 0.778495,-0.5111853 L 18.73453,6.2661801 10.810116,12.365794 A 0.48266885,0.48266885 0 0 1 10.031608,11.854621 L 11.709319,8.169163 A 0.44647399,0.44647399 0 0 0 11.238149,7.4918611 H 8.7426393 Z"
+     fill="#000000" />
+</svg>
diff --git a/src/displayapp/icons/navigation/invalid_slight_left.svg b/src/displayapp/icons/navigation/invalid_slight_left.svg
new file mode 100644
index 00000000..6f78c58c
--- /dev/null
+++ b/src/displayapp/icons/navigation/invalid_slight_left.svg
@@ -0,0 +1,58 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   inkscape:version="1.0 (4035a4fb49, 2020-05-01)"
+   sodipodi:docname="invalid_slight_left.svg"
+   version="1.1"
+   viewBox="0 0 20 20"
+   height="20"
+   width="20"
+   data-name="WORKING ICONS"
+   id="WORKING_ICONS">
+  <metadata
+     id="metadata11">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs9" />
+  <sodipodi:namedview
+     inkscape:current-layer="WORKING_ICONS"
+     inkscape:window-maximized="1"
+     inkscape:window-y="22"
+     inkscape:window-x="-8"
+     inkscape:cy="13.869677"
+     inkscape:cx="8.1752877"
+     inkscape:zoom="21.5"
+     showgrid="false"
+     id="namedview7"
+     inkscape:window-height="1027"
+     inkscape:window-width="1920"
+     inkscape:pageshadow="2"
+     inkscape:pageopacity="0"
+     guidetolerance="10"
+     gridtolerance="10"
+     objecttolerance="10"
+     borderopacity="1"
+     bordercolor="#666666"
+     pagecolor="#ffffff" />
+  <title
+     id="title2">direction</title>
+  <path
+     style="stroke-width:1.33333"
+     id="path4"
+     d="m 16.648074,14.724 v 4.614427 A 0.66161333,0.66161333 0 0 1 15.986528,20 h -1.34204 a 0.66152,0.66152 0 0 1 -0.661534,-0.66244 l 0.0063,-4.810227 A 6.9575867,6.9575867 0 0 0 11.769221,9.002 L 8.5049277,6.2478 A 0.47677333,0.47677333 0 0 0 7.6509274,6.46468 l -1.22428,4.147467 A 0.51550667,0.51550667 0 0 1 5.440794,10.48 L 3.3335407,0 14.006554,0.5995333 A 0.51544,0.51544 0 0 1 14.277141,1.55656 l -3.931893,1.8002133 a 0.4768,0.4768 0 0 0 -0.09359,0.8761334 L 13.528274,6.99804 a 9.6687733,9.6687733 0 0 1 3.1198,7.72596 z"
+     fill="#000000" />
+</svg>
diff --git a/src/displayapp/icons/navigation/invalid_slight_right.svg b/src/displayapp/icons/navigation/invalid_slight_right.svg
new file mode 100644
index 00000000..62c27ed0
--- /dev/null
+++ b/src/displayapp/icons/navigation/invalid_slight_right.svg
@@ -0,0 +1,58 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   inkscape:version="1.0 (4035a4fb49, 2020-05-01)"
+   sodipodi:docname="invalid_slight_right.svg"
+   version="1.1"
+   viewBox="0 0 20 20"
+   height="20"
+   width="20"
+   data-name="WORKING ICONS"
+   id="WORKING_ICONS">
+  <metadata
+     id="metadata11">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs9" />
+  <sodipodi:namedview
+     inkscape:current-layer="WORKING_ICONS"
+     inkscape:window-maximized="1"
+     inkscape:window-y="22"
+     inkscape:window-x="-8"
+     inkscape:cy="10.150614"
+     inkscape:cx="11.158712"
+     inkscape:zoom="21.5"
+     showgrid="false"
+     id="namedview7"
+     inkscape:window-height="1027"
+     inkscape:window-width="1920"
+     inkscape:pageshadow="2"
+     inkscape:pageopacity="0"
+     guidetolerance="10"
+     gridtolerance="10"
+     objecttolerance="10"
+     borderopacity="1"
+     bordercolor="#666666"
+     pagecolor="#ffffff" />
+  <title
+     id="title2">direction</title>
+  <path
+     style="stroke-width:1.33333"
+     id="path4"
+     d="M 6.4717198,6.9980533 9.7483327,4.2329067 A 0.4768,0.4768 0 0 0 9.6547467,3.3567733 L 5.7228532,1.55656 A 0.51544,0.51544 0 0 1 5.9934398,0.5995333 L 16.666453,0 14.5592,10.48 a 0.51550667,0.51550667 0 0 1 -0.98584,0.13216 L 12.34912,6.46468 A 0.47677333,0.47677333 0 0 0 11.49512,6.2478 L 8.2308265,9.001947 a 6.9575867,6.9575867 0 0 0 -2.22,5.525333 l 0.00627,4.810227 A 0.66152,0.66152 0 0 1 5.3555065,20 h -1.34204 A 0.66161333,0.66161333 0 0 1 3.3519332,19.338373 V 14.724 A 9.66876,9.66876 0 0 1 6.4717198,6.9980533 Z"
+     fill="#000000" />
+</svg>
diff --git a/src/displayapp/icons/navigation/invalid_straight.svg b/src/displayapp/icons/navigation/invalid_straight.svg
new file mode 100644
index 00000000..2d75bb8b
--- /dev/null
+++ b/src/displayapp/icons/navigation/invalid_straight.svg
@@ -0,0 +1,58 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   inkscape:version="1.0 (4035a4fb49, 2020-05-01)"
+   sodipodi:docname="invalid_straight.svg"
+   version="1.1"
+   viewBox="0 0 20 20"
+   height="20"
+   width="20"
+   data-name="WORKING ICONS"
+   id="WORKING_ICONS">
+  <metadata
+     id="metadata11">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs9" />
+  <sodipodi:namedview
+     inkscape:current-layer="WORKING_ICONS"
+     inkscape:window-maximized="1"
+     inkscape:window-y="22"
+     inkscape:window-x="-8"
+     inkscape:cy="14.181744"
+     inkscape:cx="6.4369141"
+     inkscape:zoom="15.202796"
+     showgrid="false"
+     id="namedview7"
+     inkscape:window-height="1027"
+     inkscape:window-width="1920"
+     inkscape:pageshadow="2"
+     inkscape:pageopacity="0"
+     guidetolerance="10"
+     gridtolerance="10"
+     objecttolerance="10"
+     borderopacity="1"
+     bordercolor="#666666"
+     pagecolor="#ffffff" />
+  <title
+     id="title2">direction</title>
+  <path
+     style="stroke-width:1.25"
+     id="path4"
+     d="M 15.617836,8.707962 11.928024,7.028275 A 0.4469375,0.4469375 0 0 0 11.250011,7.5 V 19.37065 A 0.629325,0.629325 0 0 1 10.620661,20 H 9.3794106 a 0.629325,0.629325 0 0 1 -0.62935,-0.62935 V 7.5 A 0.44695,0.44695 0 0 0 8.0720358,7.028275 L 4.3821733,8.707962 A 0.4832375,0.4832375 0 0 1 3.8703983,7.9285375 L 10.000011,0 16.129624,7.9285375 A 0.48325,0.48325 0 0 1 15.617836,8.707962 Z"
+     fill="#000000" />
+</svg>
diff --git a/src/displayapp/icons/navigation/invalid_uturn.svg b/src/displayapp/icons/navigation/invalid_uturn.svg
new file mode 100644
index 00000000..8a1e44e5
--- /dev/null
+++ b/src/displayapp/icons/navigation/invalid_uturn.svg
@@ -0,0 +1,58 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   inkscape:version="1.0 (4035a4fb49, 2020-05-01)"
+   sodipodi:docname="invalid_uturn.svg"
+   version="1.1"
+   viewBox="0 0 20 20"
+   height="20"
+   width="20"
+   data-name="WORKING ICONS"
+   id="WORKING_ICONS">
+  <metadata
+     id="metadata11">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs9" />
+  <sodipodi:namedview
+     inkscape:current-layer="WORKING_ICONS"
+     inkscape:window-maximized="1"
+     inkscape:window-y="22"
+     inkscape:window-x="-8"
+     inkscape:cy="15.381823"
+     inkscape:cx="9.9735159"
+     inkscape:zoom="21.5"
+     showgrid="false"
+     id="namedview7"
+     inkscape:window-height="1027"
+     inkscape:window-width="1920"
+     inkscape:pageshadow="2"
+     inkscape:pageopacity="0"
+     guidetolerance="10"
+     gridtolerance="10"
+     objecttolerance="10"
+     borderopacity="1"
+     bordercolor="#666666"
+     pagecolor="#ffffff" />
+  <title
+     id="title2">direction</title>
+  <path
+     style="stroke-width:1.29032"
+     id="path4"
+     d="M 19.683663,7.0967743 V 19.350348 A 0.64962581,0.64962581 0 0 1 19.034024,20 h -1.28129 A 0.64962581,0.64962581 0 0 1 17.103082,19.350348 V 7.0967743 a 4.516129,4.516129 0 1 0 -9.032258,0 V 12.258065 H 8.059031 a 0.46138065,0.46138065 0 0 0 0.6998966,0.486941 l 3.8088254,-1.733871 a 0.49883871,0.49883871 0 0 1 0.528284,0.804568 L 6.7687079,20 0.44128852,11.815703 a 0.49883871,0.49883871 0 0 1 0.5282839,-0.804568 l 3.80882578,1.733871 a 0.46141935,0.46141935 0 0 0 0.6999871,-0.486941 h 0.011729 V 7.0967743 a 7.0967744,7.0967744 0 1 1 14.1935487,0 z"
+     fill="#000000" />
+</svg>
diff --git a/src/displayapp/icons/navigation/merge-left-white.svg b/src/displayapp/icons/navigation/merge-left-white.svg
deleted file mode 100644
index 8c4cd9f5..00000000
--- a/src/displayapp/icons/navigation/merge-left-white.svg
+++ /dev/null
@@ -1,4 +0,0 @@
-<svg id="WORKING_ICONS" data-name="WORKING ICONS" xmlns="http://www.w3.org/2000/svg" width="20" height="20" viewBox="0 0 20 20">
-  <title>direction</title>
-  <path fill="#ffffff" d="M7.8,7.2V17.50252A0.2978,0.2978,0,0,1,7.50253,17.8H6.49747A0.2978,0.2978,0,0,1,6.2,17.50252V7.2H7.8M8,7H6V17.50252A0.49747,0.49747,0,0,0,6.49747,18H7.50253A0.49747,0.49747,0,0,0,8,17.50252V7H8ZM7.98169,10V8.01245a0.3576,0.3576,0,0,1,.54248-0.37738L11.476,8.97882a0.38659,0.38659,0,0,0,.40942-0.62354L7,2.0083l-4.922,6.347a0.38659,0.38659,0,0,0,.40942.62354L5.43927,7.63507a0.35757,0.35757,0,0,1,.54242.37738V10H5.97986l0.00183,0.011A6.06019,6.06019,0,0,0,12.05493,16H16V15.99689l1.50317,0.002A0.49614,0.49614,0,0,0,18,15.50269V14.49622A0.49622,0.49622,0,0,0,17.50378,14H12.05493a4.05782,4.05782,0,0,1-4.07324-3.98877V10Z"/>
-</svg>
diff --git a/src/displayapp/icons/navigation/merge-left.c b/src/displayapp/icons/navigation/merge-left.c
deleted file mode 100644
index 301a20fa..00000000
--- a/src/displayapp/icons/navigation/merge-left.c
+++ /dev/null
@@ -1,96 +0,0 @@
-#if defined(LV_LVGL_H_INCLUDE_SIMPLE)
-#include "lvgl.h"
-#else
-#include "lvgl/lvgl.h"
-#endif
-
-
-#ifndef LV_ATTRIBUTE_MEM_ALIGN
-#define LV_ATTRIBUTE_MEM_ALIGN
-#endif
-
-#ifndef LV_ATTRIBUTE_IMG_MERGE_LEFT
-#define LV_ATTRIBUTE_IMG_MERGE_LEFT
-#endif
-
-const LV_ATTRIBUTE_MEM_ALIGN LV_ATTRIBUTE_LARGE_CONST LV_ATTRIBUTE_IMG_MERGE_LEFT uint8_t merge_left_map[] = {
-  0x04, 0x02, 0x04, 0xff, 	/*Color of index 0*/
-  0xfc, 0xfe, 0xfc, 0xff, 	/*Color of index 1*/
-
-  0x00, 0x00, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0xff, 0x80, 0x00, 0x00, 0x00, 0x00, 
-  0x00, 0x01, 0xff, 0xc0, 0x00, 0x00, 0x00, 0x00, 
-  0x00, 0x03, 0xff, 0xc0, 0x00, 0x00, 0x00, 0x00, 
-  0x00, 0x07, 0xff, 0xe0, 0x00, 0x00, 0x00, 0x00, 
-  0x00, 0x0f, 0xff, 0xf0, 0x00, 0x00, 0x00, 0x00, 
-  0x00, 0x0f, 0xff, 0xf8, 0x00, 0x00, 0x00, 0x00, 
-  0x00, 0x1f, 0xff, 0xfc, 0x00, 0x00, 0x00, 0x00, 
-  0x00, 0x3f, 0xff, 0xfc, 0x00, 0x00, 0x00, 0x00, 
-  0x00, 0x7f, 0xff, 0xfe, 0x00, 0x00, 0x00, 0x00, 
-  0x00, 0x7f, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 
-  0x00, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 
-  0x01, 0xff, 0xff, 0xff, 0x80, 0x00, 0x00, 0x00, 
-  0x03, 0xff, 0xff, 0xff, 0xc0, 0x00, 0x00, 0x00, 
-  0x07, 0xff, 0xff, 0xff, 0xe0, 0x00, 0x00, 0x00, 
-  0x07, 0xff, 0xff, 0xff, 0xf0, 0x00, 0x00, 0x00, 
-  0x0f, 0xff, 0xff, 0xff, 0xf8, 0x00, 0x00, 0x00, 
-  0x1f, 0xff, 0xff, 0xff, 0xf8, 0x00, 0x00, 0x00, 
-  0x1f, 0xff, 0xff, 0xff, 0xfc, 0x00, 0x00, 0x00, 
-  0x3f, 0xff, 0xff, 0xff, 0xfc, 0x00, 0x00, 0x00, 
-  0x7f, 0xff, 0xff, 0xff, 0xfe, 0x00, 0x00, 0x00, 
-  0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 
-  0xff, 0xff, 0xff, 0xff, 0xff, 0x80, 0x00, 0x00, 
-  0xff, 0xff, 0xff, 0xff, 0xff, 0xc0, 0x00, 0x00, 
-  0xff, 0xff, 0xff, 0xff, 0xff, 0xc0, 0x00, 0x00, 
-  0xff, 0xff, 0xff, 0xff, 0xff, 0xc0, 0x00, 0x00, 
-  0xff, 0xe3, 0xff, 0xc7, 0xff, 0xc0, 0x00, 0x00, 
-  0xff, 0x83, 0xff, 0xc1, 0xff, 0xc0, 0x00, 0x00, 
-  0xfe, 0x03, 0xff, 0xc0, 0x7f, 0xc0, 0x00, 0x00, 
-  0xf8, 0x03, 0xff, 0xc0, 0x1f, 0xc0, 0x00, 0x00, 
-  0x00, 0x03, 0xff, 0xc0, 0x00, 0x00, 0x00, 0x00, 
-  0x00, 0x03, 0xff, 0xc0, 0x00, 0x00, 0x00, 0x00, 
-  0x00, 0x03, 0xff, 0xc0, 0x00, 0x00, 0x00, 0x00, 
-  0x00, 0x03, 0xff, 0xe0, 0x00, 0x00, 0x00, 0x00, 
-  0x00, 0x03, 0xff, 0xe0, 0x00, 0x00, 0x00, 0x00, 
-  0x00, 0x03, 0xff, 0xe0, 0x00, 0x00, 0x00, 0x00, 
-  0x00, 0x03, 0xff, 0xf0, 0x00, 0x00, 0x00, 0x00, 
-  0x00, 0x03, 0xff, 0xf0, 0x00, 0x00, 0x00, 0x00, 
-  0x00, 0x03, 0xff, 0xf8, 0x00, 0x00, 0x00, 0x00, 
-  0x00, 0x03, 0xff, 0xfc, 0x00, 0x00, 0x00, 0x00, 
-  0x00, 0x03, 0xff, 0xfc, 0x00, 0x00, 0x00, 0x00, 
-  0x00, 0x03, 0xff, 0xfe, 0x00, 0x00, 0x00, 0x00, 
-  0x00, 0x03, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 
-  0x00, 0x03, 0xff, 0xff, 0xc0, 0x00, 0x00, 0x00, 
-  0x00, 0x03, 0xff, 0xff, 0xe0, 0x00, 0x00, 0x00, 
-  0x00, 0x03, 0xff, 0xff, 0xfc, 0x00, 0x00, 0x00, 
-  0x00, 0x03, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
-  0x00, 0x03, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
-  0x00, 0x03, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
-  0x00, 0x03, 0xef, 0xff, 0xff, 0xff, 0xff, 0xff, 
-  0x00, 0x03, 0xe7, 0xff, 0xff, 0xff, 0xff, 0xff, 
-  0x00, 0x03, 0xe7, 0xff, 0xff, 0xff, 0xff, 0xff, 
-  0x00, 0x03, 0xe7, 0xff, 0xff, 0xff, 0xff, 0xff, 
-  0x00, 0x03, 0xe7, 0xff, 0xff, 0xff, 0xff, 0xff, 
-  0x00, 0x03, 0xe7, 0xff, 0xff, 0xff, 0xff, 0xff, 
-  0x00, 0x03, 0xe7, 0xdf, 0xff, 0xff, 0xff, 0xff, 
-  0x00, 0x03, 0xe7, 0xc3, 0xff, 0xff, 0xff, 0xff, 
-  0x00, 0x03, 0xe7, 0xc0, 0x7f, 0xff, 0xff, 0xff, 
-  0x00, 0x03, 0xe7, 0xc0, 0x00, 0x00, 0x00, 0x00, 
-  0x00, 0x03, 0xe7, 0xc0, 0x00, 0x00, 0x00, 0x00, 
-  0x00, 0x03, 0xe7, 0xc0, 0x00, 0x00, 0x00, 0x00, 
-  0x00, 0x03, 0xff, 0xc0, 0x00, 0x00, 0x00, 0x00, 
-  0x00, 0x03, 0xff, 0xc0, 0x00, 0x00, 0x00, 0x00, 
-  0x00, 0x03, 0xff, 0xc0, 0x00, 0x00, 0x00, 0x00, 
-};
-
-const lv_img_dsc_t merge_left = {
-      {
-        LV_IMG_CF_INDEXED_1BIT,
-        0,
-        0,
-        64,
-        64
-    },
-    520,
-merge_left_map,
-};
diff --git a/src/displayapp/icons/navigation/merge-left.png b/src/displayapp/icons/navigation/merge-left.png
deleted file mode 100644
index a5b6ea57..00000000
--- a/src/displayapp/icons/navigation/merge-left.png
+++ /dev/null
diff --git a/src/displayapp/icons/navigation/merge-right-white.svg b/src/displayapp/icons/navigation/merge-right-white.svg
deleted file mode 100644
index f614ad7a..00000000
--- a/src/displayapp/icons/navigation/merge-right-white.svg
+++ /dev/null
@@ -1,4 +0,0 @@
-<svg id="WORKING_ICONS" data-name="WORKING ICONS" xmlns="http://www.w3.org/2000/svg" width="20" height="20" viewBox="0 0 20 20">
-  <title>direction</title>
-  <path fill="#ffffff" d="M13.8,7.2V17.49921a0.30112,0.30112,0,0,1-.30078.3008H12.50079A0.30112,0.30112,0,0,1,12.2,17.49921V7.2h1.6M14,7H12V17.49921A0.50079,0.50079,0,0,0,12.50079,18h0.99841A0.50079,0.50079,0,0,0,14,17.49921V7h0Zm0.01831,3V8.01245a0.35757,0.35757,0,0,1,.54242-0.37738l2.95184,1.34375A0.38659,0.38659,0,0,0,17.922,8.35529L13,2.0083l-4.88544,6.347a0.38659,0.38659,0,0,0,.40942.62354l2.95184-1.34375a0.3576,0.3576,0,0,1,.54248.37738v1.99878A4.05782,4.05782,0,0,1,7.94507,14H2.49622A0.49622,0.49622,0,0,0,2,14.49622v1.00647a0.49614,0.49614,0,0,0,.49683.49615L4,15.99689V16H7.94507a6.06019,6.06019,0,0,0,6.07324-5.989L14.02014,10"/>
-</svg>
diff --git a/src/displayapp/icons/navigation/merge-right.c b/src/displayapp/icons/navigation/merge-right.c
deleted file mode 100644
index 60639daa..00000000
--- a/src/displayapp/icons/navigation/merge-right.c
+++ /dev/null
@@ -1,96 +0,0 @@
-#if defined(LV_LVGL_H_INCLUDE_SIMPLE)
-#include "lvgl.h"
-#else
-#include "lvgl/lvgl.h"
-#endif
-
-
-#ifndef LV_ATTRIBUTE_MEM_ALIGN
-#define LV_ATTRIBUTE_MEM_ALIGN
-#endif
-
-#ifndef LV_ATTRIBUTE_IMG_MERGE_RIGHT
-#define LV_ATTRIBUTE_IMG_MERGE_RIGHT
-#endif
-
-const LV_ATTRIBUTE_MEM_ALIGN LV_ATTRIBUTE_LARGE_CONST LV_ATTRIBUTE_IMG_MERGE_RIGHT uint8_t merge_right_map[] = {
-  0x04, 0x02, 0x04, 0xff, 	/*Color of index 0*/
-  0xfc, 0xfe, 0xfc, 0xff, 	/*Color of index 1*/
-
-  0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x00, 0x01, 0xff, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x00, 0x03, 0xff, 0x80, 0x00, 
-  0x00, 0x00, 0x00, 0x00, 0x03, 0xff, 0xc0, 0x00, 
-  0x00, 0x00, 0x00, 0x00, 0x07, 0xff, 0xe0, 0x00, 
-  0x00, 0x00, 0x00, 0x00, 0x0f, 0xff, 0xf0, 0x00, 
-  0x00, 0x00, 0x00, 0x00, 0x1f, 0xff, 0xf0, 0x00, 
-  0x00, 0x00, 0x00, 0x00, 0x3f, 0xff, 0xf8, 0x00, 
-  0x00, 0x00, 0x00, 0x00, 0x3f, 0xff, 0xfc, 0x00, 
-  0x00, 0x00, 0x00, 0x00, 0x7f, 0xff, 0xfe, 0x00, 
-  0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xfe, 0x00, 
-  0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0x00, 
-  0x00, 0x00, 0x00, 0x01, 0xff, 0xff, 0xff, 0x80, 
-  0x00, 0x00, 0x00, 0x03, 0xff, 0xff, 0xff, 0xc0, 
-  0x00, 0x00, 0x00, 0x07, 0xff, 0xff, 0xff, 0xe0, 
-  0x00, 0x00, 0x00, 0x0f, 0xff, 0xff, 0xff, 0xe0, 
-  0x00, 0x00, 0x00, 0x1f, 0xff, 0xff, 0xff, 0xf0, 
-  0x00, 0x00, 0x00, 0x1f, 0xff, 0xff, 0xff, 0xf8, 
-  0x00, 0x00, 0x00, 0x3f, 0xff, 0xff, 0xff, 0xf8, 
-  0x00, 0x00, 0x00, 0x3f, 0xff, 0xff, 0xff, 0xfc, 
-  0x00, 0x00, 0x00, 0x7f, 0xff, 0xff, 0xff, 0xfe, 
-  0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 
-  0x00, 0x00, 0x01, 0xff, 0xff, 0xff, 0xff, 0xff, 
-  0x00, 0x00, 0x03, 0xff, 0xff, 0xff, 0xff, 0xff, 
-  0x00, 0x00, 0x03, 0xff, 0xff, 0xff, 0xff, 0xff, 
-  0x00, 0x00, 0x03, 0xff, 0xff, 0xff, 0xff, 0xff, 
-  0x00, 0x00, 0x03, 0xff, 0xe3, 0xff, 0xc7, 0xff, 
-  0x00, 0x00, 0x03, 0xff, 0x83, 0xff, 0xc1, 0xff, 
-  0x00, 0x00, 0x03, 0xfe, 0x03, 0xff, 0xc0, 0x7f, 
-  0x00, 0x00, 0x03, 0xf8, 0x03, 0xff, 0xc0, 0x1f, 
-  0x00, 0x00, 0x00, 0x00, 0x03, 0xff, 0xc0, 0x00, 
-  0x00, 0x00, 0x00, 0x00, 0x03, 0xff, 0xc0, 0x00, 
-  0x00, 0x00, 0x00, 0x00, 0x03, 0xff, 0xc0, 0x00, 
-  0x00, 0x00, 0x00, 0x00, 0x07, 0xff, 0xc0, 0x00, 
-  0x00, 0x00, 0x00, 0x00, 0x07, 0xff, 0xc0, 0x00, 
-  0x00, 0x00, 0x00, 0x00, 0x07, 0xff, 0xc0, 0x00, 
-  0x00, 0x00, 0x00, 0x00, 0x0f, 0xff, 0xc0, 0x00, 
-  0x00, 0x00, 0x00, 0x00, 0x0f, 0xff, 0xc0, 0x00, 
-  0x00, 0x00, 0x00, 0x00, 0x1f, 0xff, 0xc0, 0x00, 
-  0x00, 0x00, 0x00, 0x00, 0x3f, 0xff, 0xc0, 0x00, 
-  0x00, 0x00, 0x00, 0x00, 0x3f, 0xff, 0xc0, 0x00, 
-  0x00, 0x00, 0x00, 0x00, 0x7f, 0xff, 0xc0, 0x00, 
-  0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xc0, 0x00, 
-  0x00, 0x00, 0x00, 0x03, 0xff, 0xff, 0xc0, 0x00, 
-  0x00, 0x00, 0x00, 0x07, 0xff, 0xff, 0xc0, 0x00, 
-  0x00, 0x00, 0x00, 0x3f, 0xff, 0xff, 0xc0, 0x00, 
-  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xc0, 0x00, 
-  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xc0, 0x00, 
-  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xc0, 0x00, 
-  0xff, 0xff, 0xff, 0xff, 0xff, 0xf7, 0xc0, 0x00, 
-  0xff, 0xff, 0xff, 0xff, 0xff, 0xe7, 0xc0, 0x00, 
-  0xff, 0xff, 0xff, 0xff, 0xff, 0xe7, 0xc0, 0x00, 
-  0xff, 0xff, 0xff, 0xff, 0xff, 0xe7, 0xc0, 0x00, 
-  0xff, 0xff, 0xff, 0xff, 0xff, 0xe7, 0xc0, 0x00, 
-  0xff, 0xff, 0xff, 0xff, 0xff, 0xe7, 0xc0, 0x00, 
-  0xff, 0xff, 0xff, 0xff, 0xfb, 0xe7, 0xc0, 0x00, 
-  0xff, 0xff, 0xff, 0xff, 0xc3, 0xe7, 0xc0, 0x00, 
-  0xff, 0xff, 0xff, 0xfe, 0x03, 0xe7, 0xc0, 0x00, 
-  0x00, 0x00, 0x00, 0x00, 0x03, 0xe7, 0xc0, 0x00, 
-  0x00, 0x00, 0x00, 0x00, 0x03, 0xe7, 0xc0, 0x00, 
-  0x00, 0x00, 0x00, 0x00, 0x03, 0xe7, 0xc0, 0x00, 
-  0x00, 0x00, 0x00, 0x00, 0x03, 0xff, 0xc0, 0x00, 
-  0x00, 0x00, 0x00, 0x00, 0x03, 0xff, 0xc0, 0x00, 
-  0x00, 0x00, 0x00, 0x00, 0x03, 0xff, 0xc0, 0x00, 
-};
-
-const lv_img_dsc_t merge_right = {
-      {
-        LV_IMG_CF_INDEXED_1BIT,
-        0,
-        0,
-        64,
-        64
-    },
-    520,
-merge_right_map,
-};
diff --git a/src/displayapp/icons/navigation/merge-right.png b/src/displayapp/icons/navigation/merge-right.png
deleted file mode 100644
index 74cb4343..00000000
--- a/src/displayapp/icons/navigation/merge-right.png
+++ /dev/null
diff --git a/src/displayapp/icons/navigation/merge-slight-left-white.svg b/src/displayapp/icons/navigation/merge-slight-left-white.svg
deleted file mode 100644
index 0152f261..00000000
--- a/src/displayapp/icons/navigation/merge-slight-left-white.svg
+++ /dev/null
@@ -1,4 +0,0 @@
-<svg id="WORKING_ICONS" data-name="WORKING ICONS" xmlns="http://www.w3.org/2000/svg" width="20" height="20" viewBox="0 0 20 20">
-  <title>direction</title>
-  <path fill="#ffffff" d="M9.82565,9.2v8.29515A0.3052,0.3052,0,0,1,9.52081,17.8H8.53052a0.3052,0.3052,0,0,1-.30484-0.30486V9.2h1.6m0.2-.2h-2v8.49515A0.50484,0.50484,0,0,0,8.53052,18h0.9903a0.50486,0.50486,0,0,0,.50485-0.50485V9h0ZM4.517,7.95947L7.46885,6.61572a0.35757,0.35757,0,0,1,.54242.37738h0.001V8.9585a6.60115,6.60115,0,0,0,3.38232,5.72021L15.70547,17.364a0.50277,0.50277,0,0,0,.69263-0.16089l0.52576-.84369a0.50285,0.50285,0,0,0-.16089-0.69275l-4.30485-2.6818a4.65641,4.65641,0,0,1-2.44824-3.957l0.00165-2.03607a0.35723,0.35723,0,0,1,.54224-0.376l2.95184,1.34375A0.38659,0.38659,0,0,0,13.915,7.33594L9.01127,0.9931,4.10758,7.33594A0.38659,0.38659,0,0,0,4.517,7.95947Z"/>
-</svg>
diff --git a/src/displayapp/icons/navigation/merge-slight-left.c b/src/displayapp/icons/navigation/merge-slight-left.c
deleted file mode 100644
index 0c5f0dcb..00000000
--- a/src/displayapp/icons/navigation/merge-slight-left.c
+++ /dev/null
@@ -1,96 +0,0 @@
-#if defined(LV_LVGL_H_INCLUDE_SIMPLE)
-#include "lvgl.h"
-#else
-#include "lvgl/lvgl.h"
-#endif
-
-
-#ifndef LV_ATTRIBUTE_MEM_ALIGN
-#define LV_ATTRIBUTE_MEM_ALIGN
-#endif
-
-#ifndef LV_ATTRIBUTE_IMG_MERGE_SLIGHT_LEFT
-#define LV_ATTRIBUTE_IMG_MERGE_SLIGHT_LEFT
-#endif
-
-const LV_ATTRIBUTE_MEM_ALIGN LV_ATTRIBUTE_LARGE_CONST LV_ATTRIBUTE_IMG_MERGE_SLIGHT_LEFT uint8_t merge_slight_left_map[] = {
-  0x04, 0x02, 0x04, 0xff, 	/*Color of index 0*/
-  0xfc, 0xfe, 0xfc, 0xff, 	/*Color of index 1*/
-
-  0x00, 0x00, 0x01, 0xfe, 0x00, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x03, 0xfe, 0x00, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x07, 0xff, 0x00, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x07, 0xff, 0x80, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x0f, 0xff, 0xc0, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x1f, 0xff, 0xc0, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x3f, 0xff, 0xe0, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x3f, 0xff, 0xf0, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x7f, 0xff, 0xf8, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0xff, 0xff, 0xfc, 0x00, 0x00, 0x00, 
-  0x00, 0x01, 0xff, 0xff, 0xfc, 0x00, 0x00, 0x00, 
-  0x00, 0x01, 0xff, 0xff, 0xfe, 0x00, 0x00, 0x00, 
-  0x00, 0x03, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 
-  0x00, 0x07, 0xff, 0xff, 0xff, 0x80, 0x00, 0x00, 
-  0x00, 0x0f, 0xff, 0xff, 0xff, 0x80, 0x00, 0x00, 
-  0x00, 0x0f, 0xff, 0xff, 0xff, 0xc0, 0x00, 0x00, 
-  0x00, 0x1f, 0xff, 0xff, 0xff, 0xe0, 0x00, 0x00, 
-  0x00, 0x3f, 0xff, 0xff, 0xff, 0xf0, 0x00, 0x00, 
-  0x00, 0x7f, 0xff, 0xff, 0xff, 0xf0, 0x00, 0x00, 
-  0x00, 0xff, 0xff, 0xff, 0xff, 0xf8, 0x00, 0x00, 
-  0x00, 0xff, 0xff, 0xff, 0xff, 0xfc, 0x00, 0x00, 
-  0x00, 0xff, 0xff, 0xff, 0xff, 0xfe, 0x00, 0x00, 
-  0x00, 0xff, 0xff, 0xff, 0xff, 0xfe, 0x00, 0x00, 
-  0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 
-  0x00, 0xff, 0xf7, 0xff, 0xbf, 0xff, 0x00, 0x00, 
-  0x00, 0xff, 0xc7, 0xff, 0x8f, 0xff, 0x00, 0x00, 
-  0x00, 0xff, 0x07, 0xff, 0x83, 0xff, 0x00, 0x00, 
-  0x00, 0xf8, 0x07, 0xff, 0x80, 0xfe, 0x00, 0x00, 
-  0x00, 0x00, 0x07, 0xff, 0x80, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x07, 0xff, 0x80, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x07, 0xff, 0x80, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x07, 0xff, 0x80, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x07, 0xff, 0x80, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x07, 0xff, 0xc0, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x07, 0xff, 0xc0, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x07, 0xff, 0xc0, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x07, 0xff, 0xe0, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x07, 0xff, 0xe0, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x07, 0xff, 0xf0, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x07, 0xff, 0xf8, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x07, 0xff, 0xfc, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x07, 0xff, 0xfe, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x07, 0xff, 0xff, 0x80, 0x00, 0x00, 
-  0x00, 0x00, 0x07, 0xff, 0xff, 0xc0, 0x00, 0x00, 
-  0x00, 0x00, 0x07, 0xff, 0xff, 0xf0, 0x00, 0x00, 
-  0x00, 0x00, 0x07, 0xff, 0xff, 0xfc, 0x00, 0x00, 
-  0x00, 0x00, 0x07, 0xff, 0xff, 0xfe, 0x00, 0x00, 
-  0x00, 0x00, 0x07, 0xdf, 0xff, 0xff, 0x80, 0x00, 
-  0x00, 0x00, 0x07, 0xdf, 0xff, 0xff, 0xc0, 0x00, 
-  0x00, 0x00, 0x07, 0xcf, 0xff, 0xff, 0xf0, 0x00, 
-  0x00, 0x00, 0x07, 0xcf, 0xff, 0xff, 0xfc, 0x00, 
-  0x00, 0x00, 0x07, 0xcf, 0xff, 0xff, 0xfe, 0x00, 
-  0x00, 0x00, 0x07, 0xcf, 0xff, 0xff, 0xff, 0x00, 
-  0x00, 0x00, 0x07, 0xcf, 0xbf, 0xff, 0xff, 0x80, 
-  0x00, 0x00, 0x07, 0xcf, 0x8f, 0xff, 0xff, 0x80, 
-  0x00, 0x00, 0x07, 0xcf, 0x87, 0xff, 0xff, 0x80, 
-  0x00, 0x00, 0x07, 0xcf, 0x83, 0xff, 0xff, 0x80, 
-  0x00, 0x00, 0x07, 0xcf, 0x80, 0xff, 0xff, 0x80, 
-  0x00, 0x00, 0x07, 0xcf, 0x80, 0x3f, 0xff, 0x80, 
-  0x00, 0x00, 0x07, 0xcf, 0x80, 0x1f, 0xff, 0x80, 
-  0x00, 0x00, 0x07, 0xcf, 0x80, 0x07, 0xff, 0x80, 
-  0x00, 0x00, 0x07, 0xff, 0x80, 0x01, 0xff, 0x80, 
-  0x00, 0x00, 0x07, 0xff, 0x80, 0x00, 0xff, 0x80, 
-  0x00, 0x00, 0x07, 0xff, 0x80, 0x00, 0x3f, 0x00, 
-};
-
-const lv_img_dsc_t merge_slight_left = {
-      {
-        LV_IMG_CF_INDEXED_1BIT,
-        0,
-        0,
-        64,
-        64
-    },
-    520,
-merge_slight_left_map,
-};
diff --git a/src/displayapp/icons/navigation/merge-slight-left.png b/src/displayapp/icons/navigation/merge-slight-left.png
deleted file mode 100644
index 2b6eebc6..00000000
--- a/src/displayapp/icons/navigation/merge-slight-left.png
+++ /dev/null
diff --git a/src/displayapp/icons/navigation/merge-slight-right-white.svg b/src/displayapp/icons/navigation/merge-slight-right-white.svg
deleted file mode 100644
index 16f15fcb..00000000
--- a/src/displayapp/icons/navigation/merge-slight-right-white.svg
+++ /dev/null
@@ -1,4 +0,0 @@
-<svg id="WORKING_ICONS" data-name="WORKING ICONS" xmlns="http://www.w3.org/2000/svg" width="20" height="20" viewBox="0 0 20 20">
-  <title>direction</title>
-  <path fill="#ffffff" d="M11.79221,9.2v8.29515a0.3052,0.3052,0,0,1-.30484.30486h-0.9903a0.3052,0.3052,0,0,1-.30484-0.30486V9.2h1.6m0.2-.2h-2v8.49515A0.50484,0.50484,0,0,0,10.49707,18h0.9903a0.50486,0.50486,0,0,0,.50485-0.50485V9h0Zm3.91806-1.66406L11.00659,0.9931,6.10284,7.33594a0.38659,0.38659,0,0,0,.40942.62354L9.46411,6.61572a0.35723,0.35723,0,0,1,.54224.376L10.008,9.02783a4.65641,4.65641,0,0,1-2.44824,3.957L3.2549,15.66667a0.50285,0.50285,0,0,0-.16089.69275L3.61977,17.2031a0.50277,0.50277,0,0,0,.69263.16089l4.31083-2.68528A6.60115,6.60115,0,0,0,12.00555,8.9585V6.9931h0.001A0.35757,0.35757,0,0,1,12.549,6.61572l2.95184,1.34375A0.38659,0.38659,0,0,0,15.91028,7.33594Z"/>
-</svg>
diff --git a/src/displayapp/icons/navigation/merge-slight-right.c b/src/displayapp/icons/navigation/merge-slight-right.c
deleted file mode 100644
index 9e5a25e8..00000000
--- a/src/displayapp/icons/navigation/merge-slight-right.c
+++ /dev/null
@@ -1,96 +0,0 @@
-#if defined(LV_LVGL_H_INCLUDE_SIMPLE)
-#include "lvgl.h"
-#else
-#include "lvgl/lvgl.h"
-#endif
-
-
-#ifndef LV_ATTRIBUTE_MEM_ALIGN
-#define LV_ATTRIBUTE_MEM_ALIGN
-#endif
-
-#ifndef LV_ATTRIBUTE_IMG_MERGE_SLIGHT_RIGHT
-#define LV_ATTRIBUTE_IMG_MERGE_SLIGHT_RIGHT
-#endif
-
-const LV_ATTRIBUTE_MEM_ALIGN LV_ATTRIBUTE_LARGE_CONST LV_ATTRIBUTE_IMG_MERGE_SLIGHT_RIGHT uint8_t merge_slight_right_map[] = {
-  0x04, 0x02, 0x04, 0xff, 	/*Color of index 0*/
-  0xfc, 0xfe, 0xfc, 0xff, 	/*Color of index 1*/
-
-  0x00, 0x00, 0x00, 0x00, 0x3f, 0xc0, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x00, 0x7f, 0xe0, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x00, 0x7f, 0xe0, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x00, 0xff, 0xf0, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x01, 0xff, 0xf8, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x03, 0xff, 0xfc, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x03, 0xff, 0xfc, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x07, 0xff, 0xfe, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x0f, 0xff, 0xff, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x1f, 0xff, 0xff, 0x80, 0x00, 
-  0x00, 0x00, 0x00, 0x3f, 0xff, 0xff, 0xc0, 0x00, 
-  0x00, 0x00, 0x00, 0x3f, 0xff, 0xff, 0xc0, 0x00, 
-  0x00, 0x00, 0x00, 0x7f, 0xff, 0xff, 0xe0, 0x00, 
-  0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xf0, 0x00, 
-  0x00, 0x00, 0x01, 0xff, 0xff, 0xff, 0xf8, 0x00, 
-  0x00, 0x00, 0x01, 0xff, 0xff, 0xff, 0xf8, 0x00, 
-  0x00, 0x00, 0x03, 0xff, 0xff, 0xff, 0xfc, 0x00, 
-  0x00, 0x00, 0x07, 0xff, 0xff, 0xff, 0xfe, 0x00, 
-  0x00, 0x00, 0x0f, 0xff, 0xff, 0xff, 0xff, 0x00, 
-  0x00, 0x00, 0x0f, 0xff, 0xff, 0xff, 0xff, 0x00, 
-  0x00, 0x00, 0x1f, 0xff, 0xff, 0xff, 0xff, 0x80, 
-  0x00, 0x00, 0x3f, 0xff, 0xff, 0xff, 0xff, 0x80, 
-  0x00, 0x00, 0x3f, 0xff, 0xff, 0xff, 0xff, 0x80, 
-  0x00, 0x00, 0x3f, 0xff, 0xff, 0xff, 0xff, 0x80, 
-  0x00, 0x00, 0x3f, 0xfe, 0xff, 0xf7, 0xff, 0x80, 
-  0x00, 0x00, 0x3f, 0xfc, 0xff, 0xf1, 0xff, 0x80, 
-  0x00, 0x00, 0x3f, 0xe0, 0xff, 0xf0, 0x7f, 0x80, 
-  0x00, 0x00, 0x3f, 0x80, 0xff, 0xf0, 0x1f, 0x80, 
-  0x00, 0x00, 0x00, 0x00, 0xff, 0xf0, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x00, 0xff, 0xf0, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x00, 0xff, 0xf0, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x00, 0xff, 0xf0, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x00, 0xff, 0xf0, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x01, 0xff, 0xf0, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x01, 0xff, 0xf0, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x01, 0xff, 0xf0, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x03, 0xff, 0xf0, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x07, 0xff, 0xf0, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x07, 0xff, 0xf0, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x0f, 0xff, 0xf0, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x1f, 0xff, 0xf0, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x3f, 0xff, 0xf0, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0xff, 0xff, 0xf0, 0x00, 0x00, 
-  0x00, 0x00, 0x01, 0xff, 0xff, 0xf0, 0x00, 0x00, 
-  0x00, 0x00, 0x07, 0xff, 0xff, 0xf0, 0x00, 0x00, 
-  0x00, 0x00, 0x0f, 0xff, 0xff, 0xf0, 0x00, 0x00, 
-  0x00, 0x00, 0x3f, 0xff, 0xff, 0xf0, 0x00, 0x00, 
-  0x00, 0x00, 0xff, 0xff, 0xfd, 0xf0, 0x00, 0x00, 
-  0x00, 0x01, 0xff, 0xff, 0xf9, 0xf0, 0x00, 0x00, 
-  0x00, 0x07, 0xff, 0xff, 0xf9, 0xf0, 0x00, 0x00, 
-  0x00, 0x1f, 0xff, 0xff, 0xf9, 0xf0, 0x00, 0x00, 
-  0x00, 0x3f, 0xff, 0xff, 0xf9, 0xf0, 0x00, 0x00, 
-  0x00, 0x7f, 0xff, 0xff, 0xf9, 0xf0, 0x00, 0x00, 
-  0x00, 0xff, 0xff, 0xfe, 0xf9, 0xf0, 0x00, 0x00, 
-  0x00, 0xff, 0xff, 0xfc, 0xf9, 0xf0, 0x00, 0x00, 
-  0x00, 0xff, 0xff, 0xf0, 0xf9, 0xf0, 0x00, 0x00, 
-  0x00, 0xff, 0xff, 0xe0, 0xf9, 0xf0, 0x00, 0x00, 
-  0x00, 0xff, 0xff, 0x80, 0xf9, 0xf0, 0x00, 0x00, 
-  0x00, 0xff, 0xfe, 0x00, 0xf9, 0xf0, 0x00, 0x00, 
-  0x00, 0xff, 0xfc, 0x00, 0xf9, 0xf0, 0x00, 0x00, 
-  0x00, 0xff, 0xf0, 0x00, 0xf9, 0xf0, 0x00, 0x00, 
-  0x00, 0xff, 0xe0, 0x00, 0xff, 0xf0, 0x00, 0x00, 
-  0x00, 0xff, 0x80, 0x00, 0xff, 0xf0, 0x00, 0x00, 
-  0x00, 0x7e, 0x00, 0x00, 0xff, 0xf0, 0x00, 0x00, 
-};
-
-const lv_img_dsc_t merge_slight_right = {
-      {
-        LV_IMG_CF_INDEXED_1BIT,
-        0,
-        0,
-        64,
-        64
-    },
-    520,
-merge_slight_right_map,
-};
diff --git a/src/displayapp/icons/navigation/merge-slight-right.png b/src/displayapp/icons/navigation/merge-slight-right.png
deleted file mode 100644
index 388b5cea..00000000
--- a/src/displayapp/icons/navigation/merge-slight-right.png
+++ /dev/null
diff --git a/src/displayapp/icons/navigation/merge-straight-white.svg b/src/displayapp/icons/navigation/merge-straight-white.svg
deleted file mode 100644
index 08531119..00000000
--- a/src/displayapp/icons/navigation/merge-straight-white.svg
+++ /dev/null
@@ -1,4 +0,0 @@
-<svg id="WORKING_ICONS" data-name="WORKING ICONS" xmlns="http://www.w3.org/2000/svg" width="20" height="20" viewBox="0 0 20 20">
-  <title>direction</title>
-  <path fill="#ffffff" d="M14.50342,8.96637L11.55157,7.62262A0.35755,0.35755,0,0,0,11.00916,8v9.49652A0.50346,0.50346,0,0,1,10.50568,18h-0.993a0.50346,0.50346,0,0,1-.50348-0.50348V8a0.35756,0.35756,0,0,0-.54242-0.37738L5.51489,8.96637a0.38659,0.38659,0,0,1-.40942-0.62354L10.00916,2l4.90369,6.34283A0.3866,0.3866,0,0,1,14.50342,8.96637Z"/>
-</svg>
diff --git a/src/displayapp/icons/navigation/merge-straight.c b/src/displayapp/icons/navigation/merge-straight.c
deleted file mode 100644
index 82a13814..00000000
--- a/src/displayapp/icons/navigation/merge-straight.c
+++ /dev/null
@@ -1,96 +0,0 @@
-#if defined(LV_LVGL_H_INCLUDE_SIMPLE)
-#include "lvgl.h"
-#else
-#include "lvgl/lvgl.h"
-#endif
-
-
-#ifndef LV_ATTRIBUTE_MEM_ALIGN
-#define LV_ATTRIBUTE_MEM_ALIGN
-#endif
-
-#ifndef LV_ATTRIBUTE_IMG_MERGE_STRAIGHT
-#define LV_ATTRIBUTE_IMG_MERGE_STRAIGHT
-#endif
-
-const LV_ATTRIBUTE_MEM_ALIGN LV_ATTRIBUTE_LARGE_CONST LV_ATTRIBUTE_IMG_MERGE_STRAIGHT uint8_t merge_straight_map[] = {
-  0x04, 0x02, 0x04, 0xff, 	/*Color of index 0*/
-  0xfc, 0xfe, 0xfc, 0xff, 	/*Color of index 1*/
-
-  0x00, 0x00, 0x00, 0x0f, 0xf0, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x1f, 0xf8, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x1f, 0xf8, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x3f, 0xfc, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x7f, 0xfe, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0xff, 0xff, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x01, 0xff, 0xff, 0x80, 0x00, 0x00, 
-  0x00, 0x00, 0x01, 0xff, 0xff, 0x80, 0x00, 0x00, 
-  0x00, 0x00, 0x03, 0xff, 0xff, 0xc0, 0x00, 0x00, 
-  0x00, 0x00, 0x07, 0xff, 0xff, 0xe0, 0x00, 0x00, 
-  0x00, 0x00, 0x07, 0xff, 0xff, 0xf0, 0x00, 0x00, 
-  0x00, 0x00, 0x0f, 0xff, 0xff, 0xf0, 0x00, 0x00, 
-  0x00, 0x00, 0x1f, 0xff, 0xff, 0xf8, 0x00, 0x00, 
-  0x00, 0x00, 0x3f, 0xff, 0xff, 0xfc, 0x00, 0x00, 
-  0x00, 0x00, 0x7f, 0xff, 0xff, 0xfe, 0x00, 0x00, 
-  0x00, 0x00, 0x7f, 0xff, 0xff, 0xfe, 0x00, 0x00, 
-  0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 
-  0x00, 0x01, 0xff, 0xff, 0xff, 0xff, 0x80, 0x00, 
-  0x00, 0x03, 0xff, 0xff, 0xff, 0xff, 0xc0, 0x00, 
-  0x00, 0x03, 0xff, 0xff, 0xff, 0xff, 0xc0, 0x00, 
-  0x00, 0x07, 0xff, 0xff, 0xff, 0xff, 0xe0, 0x00, 
-  0x00, 0x0f, 0xff, 0xff, 0xff, 0xff, 0xf0, 0x00, 
-  0x00, 0x0f, 0xff, 0xff, 0xff, 0xff, 0xf0, 0x00, 
-  0x00, 0x0f, 0xff, 0xff, 0xff, 0xff, 0xf0, 0x00, 
-  0x00, 0x0f, 0xff, 0xff, 0xff, 0xff, 0xf0, 0x00, 
-  0x00, 0x0f, 0xff, 0xff, 0xff, 0xff, 0xf0, 0x00, 
-  0x00, 0x0f, 0xfe, 0x3f, 0xfc, 0x7f, 0xf0, 0x00, 
-  0x00, 0x0f, 0xf8, 0x3f, 0xfc, 0x1f, 0xf0, 0x00, 
-  0x00, 0x0f, 0xe0, 0x3f, 0xfc, 0x07, 0xf0, 0x00, 
-  0x00, 0x0f, 0x80, 0x3f, 0xfc, 0x01, 0xf0, 0x00, 
-  0x00, 0x00, 0x00, 0x3f, 0xfc, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x3f, 0xfc, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x3f, 0xfc, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x3f, 0xfc, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x3f, 0xfc, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x3f, 0xfc, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x3f, 0xfc, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x3f, 0xfc, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x3f, 0xfc, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x3f, 0xfc, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x3f, 0xfc, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x3f, 0xfc, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x3f, 0xfc, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x3f, 0xfc, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x3f, 0xfc, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x3f, 0xfc, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x3f, 0xfc, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x3f, 0xfc, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x3f, 0xfc, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x3f, 0xfc, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x3f, 0xfc, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x3f, 0xfc, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x3f, 0xfc, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x3f, 0xfc, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x3f, 0xfc, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x3f, 0xfc, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x3f, 0xfc, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x3f, 0xfc, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x3f, 0xfc, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x3f, 0xfc, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x3f, 0xfc, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x3f, 0xfc, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x3f, 0xfc, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x3f, 0xfc, 0x00, 0x00, 0x00, 
-};
-
-const lv_img_dsc_t merge_straight = {
-      {
-        LV_IMG_CF_INDEXED_1BIT,
-        0,
-        0,
-        64,
-        64
-    },
-    520,
-merge_straight_map,
-};
diff --git a/src/displayapp/icons/navigation/merge-straight.png b/src/displayapp/icons/navigation/merge-straight.png
deleted file mode 100644
index e86ce174..00000000
--- a/src/displayapp/icons/navigation/merge-straight.png
+++ /dev/null
diff --git a/src/displayapp/icons/navigation/merge-straight.svg b/src/displayapp/icons/navigation/merge-straight.svg
new file mode 100644
index 00000000..a26b9e57
--- /dev/null
+++ b/src/displayapp/icons/navigation/merge-straight.svg
@@ -0,0 +1,59 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   id="WORKING_ICONS"
+   data-name="WORKING ICONS"
+   width="20"
+   height="20"
+   viewBox="0 0 20 20"
+   version="1.1"
+   sodipodi:docname="merge-straight.svg"
+   inkscape:version="1.0 (4035a4fb49, 2020-05-01)">
+  <metadata
+     id="metadata11">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs9" />
+  <sodipodi:namedview
+     inkscape:document-rotation="0"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1920"
+     inkscape:window-height="1027"
+     id="namedview7"
+     showgrid="false"
+     inkscape:zoom="21.5"
+     inkscape:cx="8.9790412"
+     inkscape:cy="11.403925"
+     inkscape:window-x="-8"
+     inkscape:window-y="22"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="WORKING_ICONS" />
+  <title
+     id="title2">direction</title>
+  <path
+     fill="#ffffff"
+     d="M 15.617836,8.707962 11.928024,7.028275 A 0.4469375,0.4469375 0 0 0 11.250011,7.5 V 19.37065 A 0.629325,0.629325 0 0 1 10.620661,20 H 9.3794106 a 0.629325,0.629325 0 0 1 -0.62935,-0.62935 V 7.5 A 0.44695,0.44695 0 0 0 8.0720358,7.028275 L 4.3821733,8.707962 A 0.4832375,0.4832375 0 0 1 3.8703983,7.9285375 L 10.000011,0 16.129624,7.9285375 A 0.48325,0.48325 0 0 1 15.617836,8.707962 Z"
+     id="path4"
+     style="fill:#000000;stroke-width:1.25" />
+</svg>
diff --git a/src/displayapp/icons/navigation/merge_left.svg b/src/displayapp/icons/navigation/merge_left.svg
new file mode 100644
index 00000000..d0b3ea44
--- /dev/null
+++ b/src/displayapp/icons/navigation/merge_left.svg
@@ -0,0 +1,58 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   inkscape:version="1.0 (4035a4fb49, 2020-05-01)"
+   sodipodi:docname="merge_left.svg"
+   version="1.1"
+   viewBox="0 0 20 20"
+   height="20"
+   width="20"
+   data-name="WORKING ICONS"
+   id="WORKING_ICONS">
+  <metadata
+     id="metadata11">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs9" />
+  <sodipodi:namedview
+     inkscape:current-layer="WORKING_ICONS"
+     inkscape:window-maximized="1"
+     inkscape:window-y="22"
+     inkscape:window-x="-8"
+     inkscape:cy="15.095741"
+     inkscape:cx="8.9790412"
+     inkscape:zoom="21.5"
+     showgrid="false"
+     id="namedview7"
+     inkscape:window-height="1027"
+     inkscape:window-width="1920"
+     inkscape:pageshadow="2"
+     inkscape:pageopacity="0"
+     guidetolerance="10"
+     gridtolerance="10"
+     objecttolerance="10"
+     borderopacity="1"
+     bordercolor="#666666"
+     pagecolor="#ffffff" />
+  <title
+     id="title2">direction</title>
+  <path
+     style="stroke-width:1.24853"
+     id="path4"
+     d="M 7.2650103,6.4989389 V 19.361928 A 0.37181176,0.37181176 0 0 1 6.8936106,19.73334 H 5.6387646 A 0.37181176,0.37181176 0 0 1 5.2673649,19.361928 V 6.4989389 H 7.2650103 M 7.514716,6.2492332 H 5.0176592 V 19.361928 a 0.62110542,0.62110542 0 0 0 0.6211054,0.621118 h 1.254846 A 0.62110542,0.62110542 0 0 0 7.514716,19.361928 Z M 7.4918555,9.994818 V 7.5133058 A 0.44647376,0.44647376 0 0 1 8.1691567,7.0421361 L 11.854601,8.719846 A 0.48266859,0.48266859 0 0 0 12.365774,7.9413388 L 6.2661876,0.016954 0.12093083,7.9413638 A 0.48266859,0.48266859 0 0 0 0.63210333,8.719871 L 4.3175719,7.0421361 A 0.4464363,0.4464363 0 0 1 4.9947987,7.5133058 V 9.994818 h -0.00228 l 0.00228,0.01373 a 7.5663193,7.5663193 0 0 0 7.5826133,7.477437 h 4.925532 v -0.0039 l 1.87675,0.0025 A 0.61944488,0.61944488 0 0 0 20,16.865065 V 15.608477 A 0.61954476,0.61954476 0 0 0 19.380456,14.988932 H 12.577412 A 5.0663035,5.0663035 0 0 1 7.4918555,10.008839 Z"
+     fill="#000000" />
+</svg>
diff --git a/src/displayapp/icons/navigation/merge_right.svg b/src/displayapp/icons/navigation/merge_right.svg
new file mode 100644
index 00000000..51a8fdf2
--- /dev/null
+++ b/src/displayapp/icons/navigation/merge_right.svg
@@ -0,0 +1,58 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   inkscape:version="1.0 (4035a4fb49, 2020-05-01)"
+   sodipodi:docname="merge_right.svg"
+   version="1.1"
+   viewBox="0 0 20 20"
+   height="20"
+   width="20"
+   data-name="WORKING ICONS"
+   id="WORKING_ICONS">
+  <metadata
+     id="metadata11">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs9" />
+  <sodipodi:namedview
+     inkscape:current-layer="WORKING_ICONS"
+     inkscape:window-maximized="1"
+     inkscape:window-y="22"
+     inkscape:window-x="-8"
+     inkscape:cy="11.79899"
+     inkscape:cx="6.5541578"
+     inkscape:zoom="21.5"
+     showgrid="false"
+     id="namedview7"
+     inkscape:window-height="1027"
+     inkscape:window-width="1920"
+     inkscape:pageshadow="2"
+     inkscape:pageopacity="0"
+     guidetolerance="10"
+     gridtolerance="10"
+     objecttolerance="10"
+     borderopacity="1"
+     bordercolor="#666666"
+     pagecolor="#ffffff" />
+  <title
+     id="title2">direction</title>
+  <path
+     style="stroke-width:1.24853"
+     id="path4"
+     d="M 14.732642,6.4989373 V 19.3578 a 0.37595707,0.37595707 0 0 1 -0.375533,0.375558 H 13.11054 A 0.37595707,0.37595707 0 0 1 12.734995,19.3578 V 6.4989373 h 1.997647 M 14.982348,6.2492315 H 12.48529 V 19.3578 a 0.62525086,0.62525086 0 0 0 0.62525,0.625251 h 1.246544 A 0.62525086,0.62525086 0 0 0 14.982348,19.3578 Z m 0.02286,3.7455875 V 7.5133047 A 0.44643653,0.44643653 0 0 1 15.682435,7.0421348 L 19.367893,8.719846 A 0.48266885,0.48266885 0 0 0 19.879079,7.9413504 L 13.733819,0.016949 7.6342053,7.9413629 A 0.48266885,0.48266885 0 0 0 8.1453785,8.719871 L 11.830836,7.0421598 a 0.44647399,0.44647399 0 0 1 0.677302,0.4711699 v 2.4955353 a 5.0663062,5.0663062 0 0 1 -5.0855459,4.98007 H 0.61954456 A 0.61954509,0.61954509 0 0 0 -5.373984e-7,15.60848 v 1.256607 A 0.6194452,0.6194452 0 0 0 0.62030616,17.484545 l 1.87675144,-0.0024 v 0.0039 h 4.9255345 a 7.5663233,7.5663233 0 0 0 7.5826159,-7.477441 l 0.0023,-0.01373"
+     fill="#000000" />
+</svg>
diff --git a/src/displayapp/icons/navigation/merge_slight_left.svg b/src/displayapp/icons/navigation/merge_slight_left.svg
new file mode 100644
index 00000000..9f066087
--- /dev/null
+++ b/src/displayapp/icons/navigation/merge_slight_left.svg
@@ -0,0 +1,58 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   inkscape:version="1.0 (4035a4fb49, 2020-05-01)"
+   sodipodi:docname="merge_slight_left.svg"
+   version="1.1"
+   viewBox="0 0 20 20"
+   height="20"
+   width="20"
+   data-name="WORKING ICONS"
+   id="WORKING_ICONS">
+  <metadata
+     id="metadata11">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs9" />
+  <sodipodi:namedview
+     inkscape:current-layer="WORKING_ICONS"
+     inkscape:window-maximized="1"
+     inkscape:window-y="22"
+     inkscape:window-x="-8"
+     inkscape:cy="12.003334"
+     inkscape:cx="10.136991"
+     inkscape:zoom="21.5"
+     showgrid="false"
+     id="namedview7"
+     inkscape:window-height="1027"
+     inkscape:window-width="1920"
+     inkscape:pageshadow="2"
+     inkscape:pageopacity="0"
+     guidetolerance="10"
+     gridtolerance="10"
+     objecttolerance="10"
+     borderopacity="1"
+     bordercolor="#666666"
+     pagecolor="#ffffff" />
+  <title
+     id="title2">direction</title>
+  <path
+     style="stroke-width:1.17599"
+     id="path4"
+     d="M 9.2006919,9.651259 V 19.4063 a 0.35891315,0.35891315 0 0 1 -0.35849,0.358501 H 7.6776279 A 0.35891315,0.35891315 0 0 1 7.3191381,19.406288 V 9.651259 H 9.2007269 M 9.4359259,9.416061 H 7.0839394 V 19.4063 A 0.59368844,0.59368844 0 0 0 7.6776279,20 h 1.164586 a 0.59371196,0.59371196 0 0 0 0.5937,-0.5937 v -9.990239 0 z M 2.9577554,8.1924043 6.4291111,6.6121633 a 0.42049991,0.42049991 0 0 1 0.6378823,0.4437963 h 0.00118 V 9.367257 a 7.762908,7.762908 0 0 0 3.9775856,6.726928 l 5.069566,3.157883 a 0.59125414,0.59125414 0 0 0 0.814528,-0.189205 l 0.61829,-0.992174 A 0.59134822,0.59134822 0 0 0 17.358934,17.25602 L 12.296459,14.102241 A 5.4759068,5.4759068 0 0 1 9.4173449,9.448835 l 0.0019,-2.3944042 A 0.42010008,0.42010008 0 0 1 10.056956,6.6122574 L 13.5283,8.1924983 A 0.45462724,0.45462724 0 0 0 14.00974,7.4591372 L 8.2429866,0 2.4762802,7.4591372 a 0.45462724,0.45462724 0 0 0 0.4814752,0.7332671 z"
+     fill="#000000" />
+</svg>
diff --git a/src/displayapp/icons/navigation/merge_slight_right.svg b/src/displayapp/icons/navigation/merge_slight_right.svg
new file mode 100644
index 00000000..8c371c45
--- /dev/null
+++ b/src/displayapp/icons/navigation/merge_slight_right.svg
@@ -0,0 +1,58 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   inkscape:version="1.0 (4035a4fb49, 2020-05-01)"
+   sodipodi:docname="merge_slight_right.svg"
+   version="1.1"
+   viewBox="0 0 20 20"
+   height="20"
+   width="20"
+   data-name="WORKING ICONS"
+   id="WORKING_ICONS">
+  <metadata
+     id="metadata11">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs9" />
+  <sodipodi:namedview
+     inkscape:current-layer="WORKING_ICONS"
+     inkscape:window-maximized="1"
+     inkscape:window-y="22"
+     inkscape:window-x="-8"
+     inkscape:cy="14.591693"
+     inkscape:cx="8.8155659"
+     inkscape:zoom="21.5"
+     showgrid="false"
+     id="namedview7"
+     inkscape:window-height="1027"
+     inkscape:window-width="1920"
+     inkscape:pageshadow="2"
+     inkscape:pageopacity="0"
+     guidetolerance="10"
+     gridtolerance="10"
+     objecttolerance="10"
+     borderopacity="1"
+     bordercolor="#666666"
+     pagecolor="#ffffff" />
+  <title
+     id="title2">direction</title>
+  <path
+     style="stroke-width:1.17599"
+     id="path4"
+     d="M 12.680873,9.651259 V 19.4063 a 0.35891315,0.35891315 0 0 1 -0.35849,0.358513 H 11.157797 A 0.35891315,0.35891315 0 0 1 10.799307,19.4063 V 9.651259 h 1.88159 M 12.916095,9.416061 H 10.564109 V 19.4063 A 0.59368844,0.59368844 0 0 0 11.157797,20 h 1.164586 a 0.59371196,0.59371196 0 0 0 0.593701,-0.5937 v -9.990239 0 z M 17.523708,7.4591372 11.756989,0 5.9902123,7.4591372 A 0.45462724,0.45462724 0 0 0 6.4716874,8.192416 L 9.943043,6.6121633 a 0.42010008,0.42010008 0 0 1 0.637671,0.4421735 l 0.0019,2.3944512 A 5.4759068,5.4759068 0 0 1 7.7035404,14.102194 L 2.641054,17.25602 a 0.59134822,0.59134822 0 0 0 -0.1892056,0.814669 l 0.6182903,0.992162 a 0.59125414,0.59125414 0 0 0 0.8145282,0.189206 L 8.954174,16.094185 A 7.762908,7.762908 0 0 0 12.93176,9.367257 V 7.0559596 h 0.0012 a 0.42049991,0.42049991 0 0 1 0.637917,-0.4437963 l 3.471344,1.580241 A 0.45462724,0.45462724 0 0 0 17.52372,7.4591372 Z"
+     fill="#000000" />
+</svg>
diff --git a/src/displayapp/icons/navigation/new b/src/displayapp/icons/navigation/new
deleted file mode 100644
index 7e1cd6c7..00000000
--- a/src/displayapp/icons/navigation/new
+++ /dev/null
@@ -1,8 +0,0 @@
-    {
-        LV_IMG_CF_INDEXED_1BIT,
-        0,
-        0,
-        64,
-        64
-    },
-    520,
diff --git a/src/displayapp/icons/navigation/new-name-left-white.svg b/src/displayapp/icons/navigation/new-name-left-white.svg
deleted file mode 100644
index 3cb455d9..00000000
--- a/src/displayapp/icons/navigation/new-name-left-white.svg
+++ /dev/null
@@ -1,4 +0,0 @@
-<svg id="WORKING_ICONS" data-name="WORKING ICONS" xmlns="http://www.w3.org/2000/svg" width="20" height="20" viewBox="0 0 20 20">
-  <title>direction</title>
-  <path fill="#ffffff" d="M10,5.97986l0.011,0.00183A6.06019,6.06019,0,0,1,16,12.05493V16H15.99689l0.002,1.50317A0.49614,0.49614,0,0,1,15.50269,18H14.49622A0.49622,0.49622,0,0,1,14,17.50378V12.05493a4.05782,4.05782,0,0,0-3.98877-4.07324H8.01245a0.3576,0.3576,0,0,0-.37738.54248L8.97882,11.476a0.38659,0.38659,0,0,1-.62354.40942L2.0083,7l6.347-4.922a0.38659,0.38659,0,0,1,.62354.40942L7.63507,5.43927a0.35757,0.35757,0,0,0,.37738.54242H10"/>
-</svg>
diff --git a/src/displayapp/icons/navigation/new-name-left.c b/src/displayapp/icons/navigation/new-name-left.c
deleted file mode 100644
index 99d65aac..00000000
--- a/src/displayapp/icons/navigation/new-name-left.c
+++ /dev/null
@@ -1,96 +0,0 @@
-#if defined(LV_LVGL_H_INCLUDE_SIMPLE)
-#include "lvgl.h"
-#else
-#include "lvgl/lvgl.h"
-#endif
-
-
-#ifndef LV_ATTRIBUTE_MEM_ALIGN
-#define LV_ATTRIBUTE_MEM_ALIGN
-#endif
-
-#ifndef LV_ATTRIBUTE_IMG_NEW_NAME_LEFT
-#define LV_ATTRIBUTE_IMG_NEW_NAME_LEFT
-#endif
-
-const LV_ATTRIBUTE_MEM_ALIGN LV_ATTRIBUTE_LARGE_CONST LV_ATTRIBUTE_IMG_NEW_NAME_LEFT uint8_t new_name_left_map[] = {
-  0x04, 0x02, 0x04, 0xff, 	/*Color of index 0*/
-  0xfc, 0xfe, 0xfc, 0xff, 	/*Color of index 1*/
-
-  0x00, 0x00, 0x00, 0x7f, 0xc0, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0xff, 0xc0, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x01, 0xff, 0xc0, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x07, 0xff, 0xc0, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x0f, 0xff, 0xc0, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x3f, 0xff, 0x80, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x7f, 0xff, 0x80, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 
-  0x00, 0x01, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 
-  0x00, 0x07, 0xff, 0xfe, 0x00, 0x00, 0x00, 0x00, 
-  0x00, 0x0f, 0xff, 0xfe, 0x00, 0x00, 0x00, 0x00, 
-  0x00, 0x1f, 0xff, 0xfc, 0x00, 0x00, 0x00, 0x00, 
-  0x00, 0x7f, 0xff, 0xfc, 0x00, 0x00, 0x00, 0x00, 
-  0x00, 0xff, 0xff, 0xfc, 0x00, 0x00, 0x00, 0x00, 
-  0x01, 0xff, 0xff, 0xff, 0xff, 0xc0, 0x00, 0x00, 
-  0x03, 0xff, 0xff, 0xff, 0xff, 0xfc, 0x00, 0x00, 
-  0x0f, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 
-  0x0f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xc0, 0x00, 
-  0x0f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xe0, 0x00, 
-  0x0f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xf8, 0x00, 
-  0x0f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfc, 0x00, 
-  0x0f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfe, 0x00, 
-  0x0f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 
-  0x0f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x80, 
-  0x07, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xc0, 
-  0x03, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xc0, 
-  0x00, 0xff, 0xff, 0xfc, 0x07, 0xff, 0xff, 0xe0, 
-  0x00, 0x7f, 0xff, 0xfc, 0x00, 0xff, 0xff, 0xf0, 
-  0x00, 0x3f, 0xff, 0xfc, 0x00, 0x3f, 0xff, 0xf0, 
-  0x00, 0x1f, 0xff, 0xfe, 0x00, 0x1f, 0xff, 0xf0, 
-  0x00, 0x07, 0xff, 0xfe, 0x00, 0x07, 0xff, 0xf0, 
-  0x00, 0x03, 0xff, 0xff, 0x00, 0x03, 0xff, 0xf0, 
-  0x00, 0x00, 0xff, 0xff, 0x00, 0x01, 0xff, 0xf0, 
-  0x00, 0x00, 0x7f, 0xff, 0x80, 0x01, 0xff, 0xf0, 
-  0x00, 0x00, 0x3f, 0xff, 0x80, 0x00, 0xff, 0xf0, 
-  0x00, 0x00, 0x1f, 0xff, 0xc0, 0x00, 0x7f, 0xf0, 
-  0x00, 0x00, 0x07, 0xff, 0xc0, 0x00, 0x7f, 0xf0, 
-  0x00, 0x00, 0x03, 0xff, 0xc0, 0x00, 0x7f, 0xf0, 
-  0x00, 0x00, 0x00, 0xff, 0xc0, 0x00, 0x3f, 0xf0, 
-  0x00, 0x00, 0x00, 0x7f, 0xc0, 0x00, 0x3f, 0xf0, 
-  0x00, 0x00, 0x00, 0x3f, 0xc0, 0x00, 0x3f, 0xf0, 
-  0x00, 0x00, 0x00, 0x1f, 0xc0, 0x00, 0x3f, 0xf0, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3f, 0xf0, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3f, 0xf0, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3f, 0xf0, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3f, 0xf0, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3f, 0xf0, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3f, 0xf0, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3f, 0xf0, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3f, 0xf0, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3f, 0xf0, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3f, 0xf0, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3f, 0xf0, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3f, 0xf0, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3f, 0xf0, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3f, 0xf0, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3f, 0xf0, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3f, 0xf0, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3f, 0xf0, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3f, 0xf0, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3f, 0xf0, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3f, 0xf0, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3f, 0xf0, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3f, 0xf0, 
-};
-
-const lv_img_dsc_t new_name_left = {
-      {
-        LV_IMG_CF_INDEXED_1BIT,
-        0,
-        0,
-        64,
-        64
-    },
-    520,
-new_name_left_map,
-};
diff --git a/src/displayapp/icons/navigation/new-name-left.png b/src/displayapp/icons/navigation/new-name-left.png
deleted file mode 100644
index 8fcc7385..00000000
--- a/src/displayapp/icons/navigation/new-name-left.png
+++ /dev/null
diff --git a/src/displayapp/icons/navigation/new-name-right-white.svg b/src/displayapp/icons/navigation/new-name-right-white.svg
deleted file mode 100644
index 98967557..00000000
--- a/src/displayapp/icons/navigation/new-name-right-white.svg
+++ /dev/null
@@ -1,4 +0,0 @@
-<svg id="WORKING_ICONS" data-name="WORKING ICONS" xmlns="http://www.w3.org/2000/svg" width="20" height="20" viewBox="0 0 20 20">
-  <title>direction</title>
-  <path fill="#ffffff" d="M9.98877,7.98169A4.05782,4.05782,0,0,0,6,12.05493v5.44885A0.49622,0.49622,0,0,1,5.50378,18H4.49731a0.49614,0.49614,0,0,1-.49615-0.49683L4.00311,16H4V12.05493A6.06019,6.06019,0,0,1,9.989,5.98169L10,5.97986V5.98169h1.98755a0.35757,0.35757,0,0,0,.37738-0.54242L11.02118,2.48743A0.38659,0.38659,0,0,1,11.64471,2.078L17.9917,7l-6.347,4.88544a0.38659,0.38659,0,0,1-.62354-0.40942l1.34375-2.95184a0.3576,0.3576,0,0,0-.37738-0.54248H9.98877Z"/>
-</svg>
diff --git a/src/displayapp/icons/navigation/new-name-right.c b/src/displayapp/icons/navigation/new-name-right.c
deleted file mode 100644
index 066c0aa0..00000000
--- a/src/displayapp/icons/navigation/new-name-right.c
+++ /dev/null
@@ -1,96 +0,0 @@
-#if defined(LV_LVGL_H_INCLUDE_SIMPLE)
-#include "lvgl.h"
-#else
-#include "lvgl/lvgl.h"
-#endif
-
-
-#ifndef LV_ATTRIBUTE_MEM_ALIGN
-#define LV_ATTRIBUTE_MEM_ALIGN
-#endif
-
-#ifndef LV_ATTRIBUTE_IMG_NEW_NAME_RIGHT
-#define LV_ATTRIBUTE_IMG_NEW_NAME_RIGHT
-#endif
-
-const LV_ATTRIBUTE_MEM_ALIGN LV_ATTRIBUTE_LARGE_CONST LV_ATTRIBUTE_IMG_NEW_NAME_RIGHT uint8_t new_name_right_map[] = {
-  0x04, 0x02, 0x04, 0xff, 	/*Color of index 0*/
-  0xfc, 0xfe, 0xfc, 0xff, 	/*Color of index 1*/
-
-  0x00, 0x00, 0x00, 0x03, 0xfe, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x03, 0xff, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x03, 0xff, 0xc0, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x03, 0xff, 0xe0, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x03, 0xff, 0xf0, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x01, 0xff, 0xfc, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x01, 0xff, 0xfe, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0x80, 0x00, 
-  0x00, 0x00, 0x00, 0x00, 0x7f, 0xff, 0xe0, 0x00, 
-  0x00, 0x00, 0x00, 0x00, 0x7f, 0xff, 0xf0, 0x00, 
-  0x00, 0x00, 0x00, 0x00, 0x3f, 0xff, 0xf8, 0x00, 
-  0x00, 0x00, 0x00, 0x00, 0x3f, 0xff, 0xfe, 0x00, 
-  0x00, 0x00, 0x00, 0x00, 0x3f, 0xff, 0xff, 0x00, 
-  0x00, 0x00, 0x03, 0xff, 0xff, 0xff, 0xff, 0x80, 
-  0x00, 0x00, 0x3f, 0xff, 0xff, 0xff, 0xff, 0xc0, 
-  0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xf0, 
-  0x00, 0x03, 0xff, 0xff, 0xff, 0xff, 0xff, 0xf0, 
-  0x00, 0x07, 0xff, 0xff, 0xff, 0xff, 0xff, 0xf0, 
-  0x00, 0x1f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xf0, 
-  0x00, 0x3f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xf0, 
-  0x00, 0x7f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xf0, 
-  0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xf0, 
-  0x01, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xf0, 
-  0x03, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xe0, 
-  0x03, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xc0, 
-  0x07, 0xff, 0xff, 0xe0, 0x3f, 0xff, 0xff, 0x00, 
-  0x0f, 0xff, 0xff, 0x00, 0x3f, 0xff, 0xfe, 0x00, 
-  0x0f, 0xff, 0xfc, 0x00, 0x3f, 0xff, 0xfc, 0x00, 
-  0x0f, 0xff, 0xf8, 0x00, 0x7f, 0xff, 0xf8, 0x00, 
-  0x0f, 0xff, 0xe0, 0x00, 0x7f, 0xff, 0xe0, 0x00, 
-  0x0f, 0xff, 0xc0, 0x00, 0xff, 0xff, 0xc0, 0x00, 
-  0x0f, 0xff, 0x80, 0x00, 0xff, 0xff, 0x00, 0x00, 
-  0x0f, 0xff, 0x80, 0x01, 0xff, 0xfe, 0x00, 0x00, 
-  0x0f, 0xff, 0x00, 0x01, 0xff, 0xfc, 0x00, 0x00, 
-  0x0f, 0xfe, 0x00, 0x03, 0xff, 0xf8, 0x00, 0x00, 
-  0x0f, 0xfe, 0x00, 0x03, 0xff, 0xf0, 0x00, 0x00, 
-  0x0f, 0xfe, 0x00, 0x03, 0xff, 0xc0, 0x00, 0x00, 
-  0x0f, 0xfc, 0x00, 0x03, 0xff, 0x00, 0x00, 0x00, 
-  0x0f, 0xfc, 0x00, 0x03, 0xfe, 0x00, 0x00, 0x00, 
-  0x0f, 0xfc, 0x00, 0x03, 0xfc, 0x00, 0x00, 0x00, 
-  0x0f, 0xfc, 0x00, 0x03, 0xf8, 0x00, 0x00, 0x00, 
-  0x0f, 0xfc, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x0f, 0xfc, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x0f, 0xfc, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x0f, 0xfc, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x0f, 0xfc, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x0f, 0xfc, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x0f, 0xfc, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x0f, 0xfc, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x0f, 0xfc, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x0f, 0xfc, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x0f, 0xfc, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x0f, 0xfc, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x0f, 0xfc, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x0f, 0xfc, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x0f, 0xfc, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x0f, 0xfc, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x0f, 0xfc, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x0f, 0xfc, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x0f, 0xfc, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x0f, 0xfc, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x0f, 0xfc, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x0f, 0xfc, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-};
-
-const lv_img_dsc_t new_name_right = {
-      {
-        LV_IMG_CF_INDEXED_1BIT,
-        0,
-        0,
-        64,
-        64
-    },
-    520,
-new_name_right_map,
-};
diff --git a/src/displayapp/icons/navigation/new-name-right.png b/src/displayapp/icons/navigation/new-name-right.png
deleted file mode 100644
index 115171ce..00000000
--- a/src/displayapp/icons/navigation/new-name-right.png
+++ /dev/null
diff --git a/src/displayapp/icons/navigation/new-name-sharp-left-white.svg b/src/displayapp/icons/navigation/new-name-sharp-left-white.svg
deleted file mode 100644
index 043963b7..00000000
--- a/src/displayapp/icons/navigation/new-name-sharp-left-white.svg
+++ /dev/null
@@ -1,4 +0,0 @@
-<svg id="WORKING_ICONS" data-name="WORKING ICONS" xmlns="http://www.w3.org/2000/svg" width="20" height="20" viewBox="0 0 20 20">
-  <title>direction</title>
-  <path fill="#ffffff" d="M15.49771,18a0.49779,0.49779,0,0,1-.49779-0.49779V5.00391l-0.27979-.00635a2.56758,2.56758,0,0,0-2.0957.79L7.22917,10.40041a0.34918,0.34918,0,0,0,.08252.63177l2.92877,1.39331a0.38658,0.38658,0,0,1-.21344.71472l-8.0105.33209,1.69568-7.836a0.38661,0.38661,0,0,1,.74072-0.0882l0.8725,3.12372a0.35757,0.35757,0,0,0,.638.17206L5.9672,8.84835,11.3593,4.23926A4.46634,4.46634,0,0,1,14.74406,2.998L15.00822,3a1.92935,1.92935,0,0,1,1.43408.56885,2.10247,2.10247,0,0,1,.55713,1.46045L16.9999,17.50219A0.49779,0.49779,0,0,1,16.50211,18h-1.0044Z"/>
-</svg>
diff --git a/src/displayapp/icons/navigation/new-name-sharp-left.c b/src/displayapp/icons/navigation/new-name-sharp-left.c
deleted file mode 100644
index d372c940..00000000
--- a/src/displayapp/icons/navigation/new-name-sharp-left.c
+++ /dev/null
@@ -1,96 +0,0 @@
-#if defined(LV_LVGL_H_INCLUDE_SIMPLE)
-#include "lvgl.h"
-#else
-#include "lvgl/lvgl.h"
-#endif
-
-
-#ifndef LV_ATTRIBUTE_MEM_ALIGN
-#define LV_ATTRIBUTE_MEM_ALIGN
-#endif
-
-#ifndef LV_ATTRIBUTE_IMG_NEW_NAME_SHARP_LEFT
-#define LV_ATTRIBUTE_IMG_NEW_NAME_SHARP_LEFT
-#endif
-
-const LV_ATTRIBUTE_MEM_ALIGN LV_ATTRIBUTE_LARGE_CONST LV_ATTRIBUTE_IMG_NEW_NAME_SHARP_LEFT uint8_t new_name_sharp_left_map[] = {
-  0x04, 0x02, 0x04, 0xff, 	/*Color of index 0*/
-  0xfc, 0xfe, 0xfc, 0xff, 	/*Color of index 1*/
-
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x3f, 0xff, 0xfe, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 
-  0x00, 0x00, 0x00, 0x00, 0x01, 0xff, 0xff, 0xff, 
-  0x00, 0x00, 0x00, 0x00, 0x03, 0xff, 0xff, 0xff, 
-  0x00, 0x00, 0x00, 0x00, 0x07, 0xff, 0xff, 0xff, 
-  0x00, 0x00, 0x00, 0x00, 0x0f, 0xff, 0xff, 0xff, 
-  0x00, 0x00, 0x00, 0x00, 0x3f, 0xff, 0xff, 0xff, 
-  0x00, 0x00, 0x00, 0x00, 0x7f, 0xff, 0xff, 0xff, 
-  0x03, 0xf0, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 
-  0x07, 0xf8, 0x00, 0x01, 0xff, 0xff, 0xff, 0xff, 
-  0x07, 0xf8, 0x00, 0x07, 0xff, 0xff, 0xff, 0xff, 
-  0x07, 0xf8, 0x00, 0x0f, 0xff, 0xff, 0xe7, 0xff, 
-  0x07, 0xf8, 0x00, 0x1f, 0xff, 0xff, 0x87, 0xff, 
-  0x0f, 0xfc, 0x00, 0x3f, 0xff, 0xff, 0x07, 0xff, 
-  0x0f, 0xfc, 0x00, 0x7f, 0xff, 0xfc, 0x07, 0xff, 
-  0x0f, 0xfc, 0x00, 0xff, 0xff, 0xf8, 0x07, 0xff, 
-  0x0f, 0xfc, 0x01, 0xff, 0xff, 0xf0, 0x07, 0xff, 
-  0x0f, 0xfe, 0x03, 0xff, 0xff, 0xe0, 0x07, 0xff, 
-  0x1f, 0xfe, 0x0f, 0xff, 0xff, 0xc0, 0x07, 0xff, 
-  0x1f, 0xfe, 0x1f, 0xff, 0xff, 0x80, 0x07, 0xff, 
-  0x1f, 0xff, 0x3f, 0xff, 0xff, 0x00, 0x07, 0xff, 
-  0x1f, 0xff, 0x7f, 0xff, 0xfe, 0x00, 0x07, 0xff, 
-  0x1f, 0xff, 0xff, 0xff, 0xf8, 0x00, 0x07, 0xff, 
-  0x3f, 0xff, 0xff, 0xff, 0xf0, 0x00, 0x07, 0xff, 
-  0x3f, 0xff, 0xff, 0xff, 0xe0, 0x00, 0x07, 0xff, 
-  0x3f, 0xff, 0xff, 0xff, 0xc0, 0x00, 0x07, 0xff, 
-  0x3f, 0xff, 0xff, 0xff, 0x00, 0x00, 0x07, 0xff, 
-  0x7f, 0xff, 0xff, 0xfe, 0x00, 0x00, 0x07, 0xff, 
-  0x7f, 0xff, 0xff, 0xfc, 0x00, 0x00, 0x07, 0xff, 
-  0x7f, 0xff, 0xff, 0xf8, 0x00, 0x00, 0x07, 0xff, 
-  0x7f, 0xff, 0xff, 0xf0, 0x00, 0x00, 0x07, 0xff, 
-  0x7f, 0xff, 0xff, 0xe0, 0x00, 0x00, 0x07, 0xff, 
-  0xff, 0xff, 0xff, 0x80, 0x00, 0x00, 0x07, 0xff, 
-  0xff, 0xff, 0xff, 0xe0, 0x00, 0x00, 0x07, 0xff, 
-  0xff, 0xff, 0xff, 0xf8, 0x00, 0x00, 0x07, 0xff, 
-  0xff, 0xff, 0xff, 0xfe, 0x00, 0x00, 0x07, 0xff, 
-  0xff, 0xff, 0xff, 0xff, 0x80, 0x00, 0x07, 0xff, 
-  0xff, 0xff, 0xff, 0xff, 0xf0, 0x00, 0x07, 0xff, 
-  0xff, 0xff, 0xff, 0xff, 0xf8, 0x00, 0x07, 0xff, 
-  0xff, 0xff, 0xff, 0xff, 0xfc, 0x00, 0x07, 0xff, 
-  0xff, 0xff, 0xff, 0xff, 0xfc, 0x00, 0x07, 0xff, 
-  0xff, 0xff, 0xff, 0xff, 0xfc, 0x00, 0x07, 0xff, 
-  0xff, 0xff, 0xff, 0xff, 0xfc, 0x00, 0x07, 0xff, 
-  0xff, 0xff, 0xff, 0xff, 0xfc, 0x00, 0x07, 0xff, 
-  0xff, 0xff, 0xff, 0xff, 0xfc, 0x00, 0x07, 0xff, 
-  0xff, 0xff, 0xff, 0xfc, 0x00, 0x00, 0x07, 0xff, 
-  0xf8, 0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0xff, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0xff, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0xff, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0xff, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0xff, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0xff, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0xff, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0xff, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0xff, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0xff, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0xff, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0xff, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0xff, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0xff, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0xff, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0xff, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0xff, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0xff, 
-};
-
-const lv_img_dsc_t new_name_sharp_left = {
-      {
-        LV_IMG_CF_INDEXED_1BIT,
-        0,
-        0,
-        64,
-        64
-    },
-    520,
-new_name_sharp_left_map,
-};
diff --git a/src/displayapp/icons/navigation/new-name-sharp-left.png b/src/displayapp/icons/navigation/new-name-sharp-left.png
deleted file mode 100644
index 42ab6434..00000000
--- a/src/displayapp/icons/navigation/new-name-sharp-left.png
+++ /dev/null
diff --git a/src/displayapp/icons/navigation/new-name-sharp-right-white.svg b/src/displayapp/icons/navigation/new-name-sharp-right-white.svg
deleted file mode 100644
index 4ffe0f95..00000000
--- a/src/displayapp/icons/navigation/new-name-sharp-right-white.svg
+++ /dev/null
@@ -1,4 +0,0 @@
-<svg id="WORKING_ICONS" data-name="WORKING ICONS" xmlns="http://www.w3.org/2000/svg" width="20" height="20" viewBox="0 0 20 20">
-  <title>direction</title>
-  <path fill="#ffffff" d="M3.49789,18a0.49779,0.49779,0,0,1-.49779-0.49781L3.00057,5.0293A2.10247,2.10247,0,0,1,3.5577,3.56885,1.92935,1.92935,0,0,1,4.99178,3l0.26416-.002A4.46634,4.46634,0,0,1,8.6407,4.23926L14.0328,8.84835l0.00378-.00446a0.35757,0.35757,0,0,0,.638-0.17206l0.8725-3.12372a0.38661,0.38661,0,0,1,.74072.0882l1.69568,7.836L9.973,13.14022a0.38658,0.38658,0,0,1-.21344-0.71472l2.92877-1.39331a0.34918,0.34918,0,0,0,.08252-0.63177L7.37557,5.7876a2.56758,2.56758,0,0,0-2.0957-.79l-0.27979.00635v12.4983A0.49779,0.49779,0,0,1,4.50229,18H3.49789Z"/>
-</svg>
diff --git a/src/displayapp/icons/navigation/new-name-sharp-right.c b/src/displayapp/icons/navigation/new-name-sharp-right.c
deleted file mode 100644
index 640ada62..00000000
--- a/src/displayapp/icons/navigation/new-name-sharp-right.c
+++ /dev/null
@@ -1,96 +0,0 @@
-#if defined(LV_LVGL_H_INCLUDE_SIMPLE)
-#include "lvgl.h"
-#else
-#include "lvgl/lvgl.h"
-#endif
-
-
-#ifndef LV_ATTRIBUTE_MEM_ALIGN
-#define LV_ATTRIBUTE_MEM_ALIGN
-#endif
-
-#ifndef LV_ATTRIBUTE_IMG_NEW_NAME_SHARP_RIGHT
-#define LV_ATTRIBUTE_IMG_NEW_NAME_SHARP_RIGHT
-#endif
-
-const LV_ATTRIBUTE_MEM_ALIGN LV_ATTRIBUTE_LARGE_CONST LV_ATTRIBUTE_IMG_NEW_NAME_SHARP_RIGHT uint8_t new_name_sharp_right_map[] = {
-  0x04, 0x02, 0x04, 0xff, 	/*Color of index 0*/
-  0xfc, 0xfe, 0xfc, 0xff, 	/*Color of index 1*/
-
-  0x7f, 0xff, 0xfc, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0xff, 0xff, 0xff, 0x80, 0x00, 0x00, 0x00, 0x00, 
-  0xff, 0xff, 0xff, 0xc0, 0x00, 0x00, 0x00, 0x00, 
-  0xff, 0xff, 0xff, 0xe0, 0x00, 0x00, 0x00, 0x00, 
-  0xff, 0xff, 0xff, 0xf0, 0x00, 0x00, 0x00, 0x00, 
-  0xff, 0xff, 0xff, 0xfc, 0x00, 0x00, 0x00, 0x00, 
-  0xff, 0xff, 0xff, 0xfe, 0x00, 0x00, 0x00, 0x00, 
-  0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x0f, 0xc0, 
-  0xff, 0xff, 0xff, 0xff, 0x80, 0x00, 0x1f, 0xe0, 
-  0xff, 0xff, 0xff, 0xff, 0xe0, 0x00, 0x1f, 0xe0, 
-  0xff, 0xe7, 0xff, 0xff, 0xf0, 0x00, 0x1f, 0xe0, 
-  0xff, 0xe1, 0xff, 0xff, 0xf8, 0x00, 0x1f, 0xe0, 
-  0xff, 0xe0, 0xff, 0xff, 0xfc, 0x00, 0x3f, 0xf0, 
-  0xff, 0xe0, 0x3f, 0xff, 0xfe, 0x00, 0x3f, 0xf0, 
-  0xff, 0xe0, 0x1f, 0xff, 0xff, 0x00, 0x3f, 0xf0, 
-  0xff, 0xe0, 0x0f, 0xff, 0xff, 0x80, 0x3f, 0xf0, 
-  0xff, 0xe0, 0x07, 0xff, 0xff, 0xc0, 0x7f, 0xf0, 
-  0xff, 0xe0, 0x03, 0xff, 0xff, 0xf0, 0x7f, 0xf8, 
-  0xff, 0xe0, 0x01, 0xff, 0xff, 0xf8, 0x7f, 0xf8, 
-  0xff, 0xe0, 0x00, 0xff, 0xff, 0xfc, 0xff, 0xf8, 
-  0xff, 0xe0, 0x00, 0x7f, 0xff, 0xfe, 0xff, 0xf8, 
-  0xff, 0xe0, 0x00, 0x1f, 0xff, 0xff, 0xff, 0xf8, 
-  0xff, 0xe0, 0x00, 0x0f, 0xff, 0xff, 0xff, 0xfc, 
-  0xff, 0xe0, 0x00, 0x07, 0xff, 0xff, 0xff, 0xfc, 
-  0xff, 0xe0, 0x00, 0x03, 0xff, 0xff, 0xff, 0xfc, 
-  0xff, 0xe0, 0x00, 0x00, 0xff, 0xff, 0xff, 0xfc, 
-  0xff, 0xe0, 0x00, 0x00, 0x7f, 0xff, 0xff, 0xfe, 
-  0xff, 0xe0, 0x00, 0x00, 0x3f, 0xff, 0xff, 0xfe, 
-  0xff, 0xe0, 0x00, 0x00, 0x1f, 0xff, 0xff, 0xfe, 
-  0xff, 0xe0, 0x00, 0x00, 0x0f, 0xff, 0xff, 0xfe, 
-  0xff, 0xe0, 0x00, 0x00, 0x07, 0xff, 0xff, 0xfe, 
-  0xff, 0xe0, 0x00, 0x00, 0x01, 0xff, 0xff, 0xff, 
-  0xff, 0xe0, 0x00, 0x00, 0x07, 0xff, 0xff, 0xff, 
-  0xff, 0xe0, 0x00, 0x00, 0x1f, 0xff, 0xff, 0xff, 
-  0xff, 0xe0, 0x00, 0x00, 0x7f, 0xff, 0xff, 0xff, 
-  0xff, 0xe0, 0x00, 0x01, 0xff, 0xff, 0xff, 0xff, 
-  0xff, 0xe0, 0x00, 0x07, 0xff, 0xff, 0xff, 0xff, 
-  0xff, 0xe0, 0x00, 0x1f, 0xff, 0xff, 0xff, 0xff, 
-  0xff, 0xe0, 0x00, 0x3f, 0xff, 0xff, 0xff, 0xff, 
-  0xff, 0xe0, 0x00, 0x3f, 0xff, 0xff, 0xff, 0xff, 
-  0xff, 0xe0, 0x00, 0x3f, 0xff, 0xff, 0xff, 0xff, 
-  0xff, 0xe0, 0x00, 0x3f, 0xff, 0xff, 0xff, 0xff, 
-  0xff, 0xe0, 0x00, 0x3f, 0xff, 0xff, 0xff, 0xff, 
-  0xff, 0xe0, 0x00, 0x3f, 0xff, 0xff, 0xff, 0xff, 
-  0xff, 0xe0, 0x00, 0x00, 0x1f, 0xff, 0xff, 0xff, 
-  0xff, 0xe0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1f, 
-  0xff, 0xe0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0xff, 0xe0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0xff, 0xe0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0xff, 0xe0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0xff, 0xe0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0xff, 0xe0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0xff, 0xe0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0xff, 0xe0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0xff, 0xe0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0xff, 0xe0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0xff, 0xe0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0xff, 0xe0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0xff, 0xe0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0xff, 0xe0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0xff, 0xe0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0xff, 0xe0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0xff, 0xe0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-};
-
-const lv_img_dsc_t new_name_sharp_right = {
-      {
-        LV_IMG_CF_INDEXED_1BIT,
-        0,
-        0,
-        64,
-        64
-    },
-    520,
-new_name_sharp_right_map,
-};
diff --git a/src/displayapp/icons/navigation/new-name-sharp-right.png b/src/displayapp/icons/navigation/new-name-sharp-right.png
deleted file mode 100644
index 0905ba6e..00000000
--- a/src/displayapp/icons/navigation/new-name-sharp-right.png
+++ /dev/null
diff --git a/src/displayapp/icons/navigation/new-name-slight-left-white.svg b/src/displayapp/icons/navigation/new-name-slight-left-white.svg
deleted file mode 100644
index 7ae2013c..00000000
--- a/src/displayapp/icons/navigation/new-name-slight-left-white.svg
+++ /dev/null
@@ -1,4 +0,0 @@
-<svg id="WORKING_ICONS" data-name="WORKING ICONS" xmlns="http://www.w3.org/2000/svg" width="20" height="20" viewBox="0 0 20 20">
-  <title>direction</title>
-  <path fill="#ffffff" d="M14.9859,14.043v3.46082A0.49621,0.49621,0,0,1,14.48974,18H13.48321a0.49614,0.49614,0,0,1-.49615-0.49683l0.0047-3.60767a5.21819,5.21819,0,0,0-1.665-4.144L8.87854,7.68585a0.35758,0.35758,0,0,0-.6405.16266l-0.91821,3.1106A0.38663,0.38663,0,0,1,6.58044,10.86L5,3l8.00476,0.44965a0.38658,0.38658,0,0,1,.20294.71777L10.25878,5.51758a0.3576,0.3576,0,0,0-.07019.6571l2.45746,2.07385A7.25158,7.25158,0,0,1,14.9859,14.043Z"/>
-</svg>
diff --git a/src/displayapp/icons/navigation/new-name-slight-left.c b/src/displayapp/icons/navigation/new-name-slight-left.c
deleted file mode 100644
index b49f19c9..00000000
--- a/src/displayapp/icons/navigation/new-name-slight-left.c
+++ /dev/null
@@ -1,96 +0,0 @@
-#if defined(LV_LVGL_H_INCLUDE_SIMPLE)
-#include "lvgl.h"
-#else
-#include "lvgl/lvgl.h"
-#endif
-
-
-#ifndef LV_ATTRIBUTE_MEM_ALIGN
-#define LV_ATTRIBUTE_MEM_ALIGN
-#endif
-
-#ifndef LV_ATTRIBUTE_IMG_NEW_NAME_SLIGHT_LEFT
-#define LV_ATTRIBUTE_IMG_NEW_NAME_SLIGHT_LEFT
-#endif
-
-const LV_ATTRIBUTE_MEM_ALIGN LV_ATTRIBUTE_LARGE_CONST LV_ATTRIBUTE_IMG_NEW_NAME_SLIGHT_LEFT uint8_t new_name_slight_left_map[] = {
-  0x04, 0x02, 0x04, 0xff, 	/*Color of index 0*/
-  0xfc, 0xfe, 0xfc, 0xff, 	/*Color of index 1*/
-
-  0x00, 0x1f, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 
-  0x00, 0x1f, 0xff, 0xff, 0xff, 0xff, 0x80, 0x00, 
-  0x00, 0x1f, 0xff, 0xff, 0xff, 0xff, 0x80, 0x00, 
-  0x00, 0x1f, 0xff, 0xff, 0xff, 0xff, 0x80, 0x00, 
-  0x00, 0x1f, 0xff, 0xff, 0xff, 0xff, 0x80, 0x00, 
-  0x00, 0x1f, 0xff, 0xff, 0xff, 0xff, 0x80, 0x00, 
-  0x00, 0x1f, 0xff, 0xff, 0xff, 0xff, 0x80, 0x00, 
-  0x00, 0x1f, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 
-  0x00, 0x1f, 0xff, 0xff, 0xff, 0xf8, 0x00, 0x00, 
-  0x00, 0x1f, 0xff, 0xff, 0xff, 0xe0, 0x00, 0x00, 
-  0x00, 0x1f, 0xff, 0xff, 0xff, 0x80, 0x00, 0x00, 
-  0x00, 0x1f, 0xff, 0xff, 0xfc, 0x00, 0x00, 0x00, 
-  0x00, 0x1f, 0xff, 0xff, 0xf0, 0x00, 0x00, 0x00, 
-  0x00, 0x0f, 0xff, 0xff, 0xfc, 0x00, 0x00, 0x00, 
-  0x00, 0x0f, 0xff, 0xff, 0xfc, 0x00, 0x00, 0x00, 
-  0x00, 0x0f, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 
-  0x00, 0x0f, 0xff, 0xff, 0xff, 0x80, 0x00, 0x00, 
-  0x00, 0x0f, 0xff, 0xff, 0xff, 0xc0, 0x00, 0x00, 
-  0x00, 0x07, 0xff, 0xff, 0xff, 0xe0, 0x00, 0x00, 
-  0x00, 0x07, 0xff, 0xff, 0xff, 0xf8, 0x00, 0x00, 
-  0x00, 0x07, 0xff, 0xff, 0xff, 0xfc, 0x00, 0x00, 
-  0x00, 0x07, 0xff, 0xff, 0xff, 0xfe, 0x00, 0x00, 
-  0x00, 0x07, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 
-  0x00, 0x03, 0xff, 0xff, 0xff, 0xff, 0x80, 0x00, 
-  0x00, 0x03, 0xff, 0xc7, 0xff, 0xff, 0x80, 0x00, 
-  0x00, 0x03, 0xff, 0xc3, 0xff, 0xff, 0xc0, 0x00, 
-  0x00, 0x03, 0xff, 0xc1, 0xff, 0xff, 0xe0, 0x00, 
-  0x00, 0x03, 0xff, 0x80, 0xff, 0xff, 0xe0, 0x00, 
-  0x00, 0x01, 0xff, 0x80, 0x7f, 0xff, 0xf0, 0x00, 
-  0x00, 0x01, 0xff, 0x80, 0x1f, 0xff, 0xf8, 0x00, 
-  0x00, 0x01, 0xff, 0x80, 0x0f, 0xff, 0xf8, 0x00, 
-  0x00, 0x01, 0xff, 0x00, 0x07, 0xff, 0xf8, 0x00, 
-  0x00, 0x01, 0xff, 0x00, 0x03, 0xff, 0xfc, 0x00, 
-  0x00, 0x00, 0xff, 0x00, 0x01, 0xff, 0xfc, 0x00, 
-  0x00, 0x00, 0xfe, 0x00, 0x01, 0xff, 0xfc, 0x00, 
-  0x00, 0x00, 0xfe, 0x00, 0x00, 0xff, 0xfc, 0x00, 
-  0x00, 0x00, 0xfe, 0x00, 0x00, 0x7f, 0xfc, 0x00, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x7f, 0xfc, 0x00, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x3f, 0xfc, 0x00, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x3f, 0xfc, 0x00, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x3f, 0xfc, 0x00, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x1f, 0xfc, 0x00, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x1f, 0xfc, 0x00, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x1f, 0xfc, 0x00, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x1f, 0xfc, 0x00, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x1f, 0xfc, 0x00, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x1f, 0xfc, 0x00, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x1f, 0xfc, 0x00, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x1f, 0xfc, 0x00, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x1f, 0xfc, 0x00, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x1f, 0xfc, 0x00, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x1f, 0xfc, 0x00, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x1f, 0xfc, 0x00, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x1f, 0xfc, 0x00, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x1f, 0xfc, 0x00, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x1f, 0xfc, 0x00, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x1f, 0xfc, 0x00, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x1f, 0xfc, 0x00, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x1f, 0xfc, 0x00, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x1f, 0xfc, 0x00, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x1f, 0xfc, 0x00, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x1f, 0xfc, 0x00, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x1f, 0xfc, 0x00, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x1f, 0xfc, 0x00, 
-};
-
-const lv_img_dsc_t new_name_slight_left = {
-      {
-        LV_IMG_CF_INDEXED_1BIT,
-        0,
-        0,
-        64,
-        64
-    },
-    520,
-new_name_slight_left_map,
-};
diff --git a/src/displayapp/icons/navigation/new-name-slight-left.png b/src/displayapp/icons/navigation/new-name-slight-left.png
deleted file mode 100644
index 5b66903d..00000000
--- a/src/displayapp/icons/navigation/new-name-slight-left.png
+++ /dev/null
diff --git a/src/displayapp/icons/navigation/new-name-slight-right-white.svg b/src/displayapp/icons/navigation/new-name-slight-right-white.svg
deleted file mode 100644
index 46090067..00000000
--- a/src/displayapp/icons/navigation/new-name-slight-right-white.svg
+++ /dev/null
@@ -1,4 +0,0 @@
-<svg id="WORKING_ICONS" data-name="WORKING ICONS" xmlns="http://www.w3.org/2000/svg" width="20" height="20" viewBox="0 0 20 20">
-  <title>direction</title>
-  <path fill="#ffffff" d="M7.35395,8.24854L9.81141,6.17468a0.3576,0.3576,0,0,0-.07019-0.6571L6.7923,4.16742a0.38658,0.38658,0,0,1,.20294-0.71777L15,3l-1.58044,7.86a0.38663,0.38663,0,0,1-.73938.09912L11.762,7.84851a0.35758,0.35758,0,0,0-.6405-0.16266L8.67328,9.75146a5.21819,5.21819,0,0,0-1.665,4.144l0.0047,3.60767A0.49614,0.49614,0,0,1,6.51679,18H5.51026a0.49621,0.49621,0,0,1-.49615-0.49622V14.043A7.25157,7.25157,0,0,1,7.35395,8.24854Z"/>
-</svg>
diff --git a/src/displayapp/icons/navigation/new-name-slight-right.c b/src/displayapp/icons/navigation/new-name-slight-right.c
deleted file mode 100644
index 992f8451..00000000
--- a/src/displayapp/icons/navigation/new-name-slight-right.c
+++ /dev/null
@@ -1,96 +0,0 @@
-#if defined(LV_LVGL_H_INCLUDE_SIMPLE)
-#include "lvgl.h"
-#else
-#include "lvgl/lvgl.h"
-#endif
-
-
-#ifndef LV_ATTRIBUTE_MEM_ALIGN
-#define LV_ATTRIBUTE_MEM_ALIGN
-#endif
-
-#ifndef LV_ATTRIBUTE_IMG_NEW_NAME_SLIGHT_RIGHT
-#define LV_ATTRIBUTE_IMG_NEW_NAME_SLIGHT_RIGHT
-#endif
-
-const LV_ATTRIBUTE_MEM_ALIGN LV_ATTRIBUTE_LARGE_CONST LV_ATTRIBUTE_IMG_NEW_NAME_SLIGHT_RIGHT uint8_t new_name_slight_right_map[] = {
-  0x04, 0x02, 0x04, 0xff, 	/*Color of index 0*/
-  0xfc, 0xfe, 0xfc, 0xff, 	/*Color of index 1*/
-
-  0x00, 0x00, 0x7f, 0xff, 0xff, 0xff, 0xfc, 0x00, 
-  0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xfc, 0x00, 
-  0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xfc, 0x00, 
-  0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xfc, 0x00, 
-  0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xfc, 0x00, 
-  0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xfc, 0x00, 
-  0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xfc, 0x00, 
-  0x00, 0x00, 0x3f, 0xff, 0xff, 0xff, 0xfc, 0x00, 
-  0x00, 0x00, 0x0f, 0xff, 0xff, 0xff, 0xfc, 0x00, 
-  0x00, 0x00, 0x03, 0xff, 0xff, 0xff, 0xfc, 0x00, 
-  0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xfc, 0x00, 
-  0x00, 0x00, 0x00, 0x1f, 0xff, 0xff, 0xfc, 0x00, 
-  0x00, 0x00, 0x00, 0x07, 0xff, 0xff, 0xfc, 0x00, 
-  0x00, 0x00, 0x00, 0x1f, 0xff, 0xff, 0xf8, 0x00, 
-  0x00, 0x00, 0x00, 0x1f, 0xff, 0xff, 0xf8, 0x00, 
-  0x00, 0x00, 0x00, 0x7f, 0xff, 0xff, 0xf8, 0x00, 
-  0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xf8, 0x00, 
-  0x00, 0x00, 0x01, 0xff, 0xff, 0xff, 0xf8, 0x00, 
-  0x00, 0x00, 0x03, 0xff, 0xff, 0xff, 0xf0, 0x00, 
-  0x00, 0x00, 0x0f, 0xff, 0xff, 0xff, 0xf0, 0x00, 
-  0x00, 0x00, 0x1f, 0xff, 0xff, 0xff, 0xf0, 0x00, 
-  0x00, 0x00, 0x3f, 0xff, 0xff, 0xff, 0xf0, 0x00, 
-  0x00, 0x00, 0x7f, 0xff, 0xff, 0xff, 0xf0, 0x00, 
-  0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xe0, 0x00, 
-  0x00, 0x00, 0xff, 0xff, 0xf1, 0xff, 0xe0, 0x00, 
-  0x00, 0x01, 0xff, 0xff, 0xe1, 0xff, 0xe0, 0x00, 
-  0x00, 0x03, 0xff, 0xff, 0xc1, 0xff, 0xe0, 0x00, 
-  0x00, 0x03, 0xff, 0xff, 0x80, 0xff, 0xe0, 0x00, 
-  0x00, 0x07, 0xff, 0xff, 0x00, 0xff, 0xc0, 0x00, 
-  0x00, 0x0f, 0xff, 0xfc, 0x00, 0xff, 0xc0, 0x00, 
-  0x00, 0x0f, 0xff, 0xf8, 0x00, 0xff, 0xc0, 0x00, 
-  0x00, 0x0f, 0xff, 0xf0, 0x00, 0x7f, 0xc0, 0x00, 
-  0x00, 0x1f, 0xff, 0xe0, 0x00, 0x7f, 0xc0, 0x00, 
-  0x00, 0x1f, 0xff, 0xc0, 0x00, 0x7f, 0x80, 0x00, 
-  0x00, 0x1f, 0xff, 0xc0, 0x00, 0x3f, 0x80, 0x00, 
-  0x00, 0x1f, 0xff, 0x80, 0x00, 0x3f, 0x80, 0x00, 
-  0x00, 0x1f, 0xff, 0x00, 0x00, 0x3f, 0x80, 0x00, 
-  0x00, 0x1f, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x00, 0x1f, 0xfe, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x00, 0x1f, 0xfe, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x00, 0x1f, 0xfe, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x00, 0x1f, 0xfc, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x00, 0x1f, 0xfc, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x00, 0x1f, 0xfc, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x00, 0x1f, 0xfc, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x00, 0x1f, 0xfc, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x00, 0x1f, 0xfc, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x00, 0x1f, 0xfc, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x00, 0x1f, 0xfc, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x00, 0x1f, 0xfc, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x00, 0x1f, 0xfc, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x00, 0x1f, 0xfc, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x00, 0x1f, 0xfc, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x00, 0x1f, 0xfc, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x00, 0x1f, 0xfc, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x00, 0x1f, 0xfc, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x00, 0x1f, 0xfc, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x00, 0x1f, 0xfc, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x00, 0x1f, 0xfc, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x00, 0x1f, 0xfc, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x00, 0x1f, 0xfc, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x00, 0x1f, 0xfc, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x00, 0x1f, 0xfc, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x00, 0x1f, 0xfc, 0x00, 0x00, 0x00, 0x00, 0x00, 
-};
-
-const lv_img_dsc_t new_name_slight_right = {
-      {
-        LV_IMG_CF_INDEXED_1BIT,
-        0,
-        0,
-        64,
-        64
-    },
-    520,
-new_name_slight_right_map,
-};
diff --git a/src/displayapp/icons/navigation/new-name-slight-right.png b/src/displayapp/icons/navigation/new-name-slight-right.png
deleted file mode 100644
index f62b3739..00000000
--- a/src/displayapp/icons/navigation/new-name-slight-right.png
+++ /dev/null
diff --git a/src/displayapp/icons/navigation/new-name-straight-white.svg b/src/displayapp/icons/navigation/new-name-straight-white.svg
deleted file mode 100644
index 08531119..00000000
--- a/src/displayapp/icons/navigation/new-name-straight-white.svg
+++ /dev/null
@@ -1,4 +0,0 @@
-<svg id="WORKING_ICONS" data-name="WORKING ICONS" xmlns="http://www.w3.org/2000/svg" width="20" height="20" viewBox="0 0 20 20">
-  <title>direction</title>
-  <path fill="#ffffff" d="M14.50342,8.96637L11.55157,7.62262A0.35755,0.35755,0,0,0,11.00916,8v9.49652A0.50346,0.50346,0,0,1,10.50568,18h-0.993a0.50346,0.50346,0,0,1-.50348-0.50348V8a0.35756,0.35756,0,0,0-.54242-0.37738L5.51489,8.96637a0.38659,0.38659,0,0,1-.40942-0.62354L10.00916,2l4.90369,6.34283A0.3866,0.3866,0,0,1,14.50342,8.96637Z"/>
-</svg>
diff --git a/src/displayapp/icons/navigation/new-name-straight.c b/src/displayapp/icons/navigation/new-name-straight.c
deleted file mode 100644
index 3d58ce2f..00000000
--- a/src/displayapp/icons/navigation/new-name-straight.c
+++ /dev/null
@@ -1,96 +0,0 @@
-#if defined(LV_LVGL_H_INCLUDE_SIMPLE)
-#include "lvgl.h"
-#else
-#include "lvgl/lvgl.h"
-#endif
-
-
-#ifndef LV_ATTRIBUTE_MEM_ALIGN
-#define LV_ATTRIBUTE_MEM_ALIGN
-#endif
-
-#ifndef LV_ATTRIBUTE_IMG_NEW_NAME_STRAIGHT
-#define LV_ATTRIBUTE_IMG_NEW_NAME_STRAIGHT
-#endif
-
-const LV_ATTRIBUTE_MEM_ALIGN LV_ATTRIBUTE_LARGE_CONST LV_ATTRIBUTE_IMG_NEW_NAME_STRAIGHT uint8_t new_name_straight_map[] = {
-  0x04, 0x02, 0x04, 0xff, 	/*Color of index 0*/
-  0xfc, 0xfe, 0xfc, 0xff, 	/*Color of index 1*/
-
-  0x00, 0x00, 0x00, 0x0f, 0xf0, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x1f, 0xf8, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x1f, 0xf8, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x3f, 0xfc, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x7f, 0xfe, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0xff, 0xff, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x01, 0xff, 0xff, 0x80, 0x00, 0x00, 
-  0x00, 0x00, 0x01, 0xff, 0xff, 0x80, 0x00, 0x00, 
-  0x00, 0x00, 0x03, 0xff, 0xff, 0xc0, 0x00, 0x00, 
-  0x00, 0x00, 0x07, 0xff, 0xff, 0xe0, 0x00, 0x00, 
-  0x00, 0x00, 0x07, 0xff, 0xff, 0xf0, 0x00, 0x00, 
-  0x00, 0x00, 0x0f, 0xff, 0xff, 0xf0, 0x00, 0x00, 
-  0x00, 0x00, 0x1f, 0xff, 0xff, 0xf8, 0x00, 0x00, 
-  0x00, 0x00, 0x3f, 0xff, 0xff, 0xfc, 0x00, 0x00, 
-  0x00, 0x00, 0x7f, 0xff, 0xff, 0xfe, 0x00, 0x00, 
-  0x00, 0x00, 0x7f, 0xff, 0xff, 0xfe, 0x00, 0x00, 
-  0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 
-  0x00, 0x01, 0xff, 0xff, 0xff, 0xff, 0x80, 0x00, 
-  0x00, 0x03, 0xff, 0xff, 0xff, 0xff, 0xc0, 0x00, 
-  0x00, 0x03, 0xff, 0xff, 0xff, 0xff, 0xc0, 0x00, 
-  0x00, 0x07, 0xff, 0xff, 0xff, 0xff, 0xe0, 0x00, 
-  0x00, 0x0f, 0xff, 0xff, 0xff, 0xff, 0xf0, 0x00, 
-  0x00, 0x0f, 0xff, 0xff, 0xff, 0xff, 0xf0, 0x00, 
-  0x00, 0x0f, 0xff, 0xff, 0xff, 0xff, 0xf0, 0x00, 
-  0x00, 0x0f, 0xff, 0xff, 0xff, 0xff, 0xf0, 0x00, 
-  0x00, 0x0f, 0xff, 0xff, 0xff, 0xff, 0xf0, 0x00, 
-  0x00, 0x0f, 0xfe, 0x3f, 0xfc, 0x7f, 0xf0, 0x00, 
-  0x00, 0x0f, 0xf8, 0x3f, 0xfc, 0x1f, 0xf0, 0x00, 
-  0x00, 0x0f, 0xe0, 0x3f, 0xfc, 0x07, 0xf0, 0x00, 
-  0x00, 0x0f, 0x80, 0x3f, 0xfc, 0x01, 0xf0, 0x00, 
-  0x00, 0x00, 0x00, 0x3f, 0xfc, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x3f, 0xfc, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x3f, 0xfc, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x3f, 0xfc, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x3f, 0xfc, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x3f, 0xfc, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x3f, 0xfc, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x3f, 0xfc, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x3f, 0xfc, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x3f, 0xfc, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x3f, 0xfc, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x3f, 0xfc, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x3f, 0xfc, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x3f, 0xfc, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x3f, 0xfc, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x3f, 0xfc, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x3f, 0xfc, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x3f, 0xfc, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x3f, 0xfc, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x3f, 0xfc, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x3f, 0xfc, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x3f, 0xfc, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x3f, 0xfc, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x3f, 0xfc, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x3f, 0xfc, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x3f, 0xfc, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x3f, 0xfc, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x3f, 0xfc, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x3f, 0xfc, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x3f, 0xfc, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x3f, 0xfc, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x3f, 0xfc, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x3f, 0xfc, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x3f, 0xfc, 0x00, 0x00, 0x00, 
-};
-
-const lv_img_dsc_t new_name_straight = {
-      {
-        LV_IMG_CF_INDEXED_1BIT,
-        0,
-        0,
-        64,
-        64
-    },
-    520,
-new_name_straight_map,
-};
diff --git a/src/displayapp/icons/navigation/new-name-straight.png b/src/displayapp/icons/navigation/new-name-straight.png
deleted file mode 100644
index 5082f3fc..00000000
--- a/src/displayapp/icons/navigation/new-name-straight.png
+++ /dev/null
diff --git a/src/displayapp/icons/navigation/new_name_left.svg b/src/displayapp/icons/navigation/new_name_left.svg
new file mode 100644
index 00000000..9efa4e05
--- /dev/null
+++ b/src/displayapp/icons/navigation/new_name_left.svg
@@ -0,0 +1,58 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   inkscape:version="1.0 (4035a4fb49, 2020-05-01)"
+   sodipodi:docname="new_name_left.svg"
+   version="1.1"
+   viewBox="0 0 20 20"
+   height="20"
+   width="20"
+   data-name="WORKING ICONS"
+   id="WORKING_ICONS">
+  <metadata
+     id="metadata11">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs9" />
+  <sodipodi:namedview
+     inkscape:current-layer="WORKING_ICONS"
+     inkscape:window-maximized="1"
+     inkscape:window-y="22"
+     inkscape:window-x="-8"
+     inkscape:cy="17.399124"
+     inkscape:cx="9.3653076"
+     inkscape:zoom="15.202796"
+     showgrid="false"
+     id="namedview7"
+     inkscape:window-height="1027"
+     inkscape:window-width="1920"
+     inkscape:pageshadow="2"
+     inkscape:pageopacity="0"
+     guidetolerance="10"
+     gridtolerance="10"
+     objecttolerance="10"
+     borderopacity="1"
+     bordercolor="#666666"
+     pagecolor="#ffffff" />
+  <title
+     id="title2">direction</title>
+  <path
+     style="stroke-width:1.24853"
+     id="path4"
+     d="m 11.243339,4.9925164 0.01373,0.00228 a 7.5663193,7.5663193 0 0 1 7.477437,7.5826126 v 4.925532 h -0.0039 l 0.0025,1.87675 a 0.61944488,0.61944488 0 0 1 -0.61952,0.620306 H 16.856998 A 0.61954476,0.61954476 0 0 1 16.237453,19.380458 V 12.577414 A 5.0663035,5.0663035 0 0 0 11.25736,7.491858 H 8.761827 A 0.44647376,0.44647376 0 0 0 8.2906573,8.1691592 L 9.9683672,11.854603 A 0.48266859,0.48266859 0 0 1 9.18986,12.365776 L 1.2654752,6.2661901 9.189885,0.12093333 a 0.48266859,0.48266859 0 0 1 0.7785072,0.5111725 L 8.2906573,4.3175744 A 0.4464363,0.4464363 0 0 0 8.761827,4.9948012 h 2.481512"
+     fill="#000000" />
+</svg>
diff --git a/src/displayapp/icons/navigation/new_name_right.svg b/src/displayapp/icons/navigation/new_name_right.svg
new file mode 100644
index 00000000..25ab2b81
--- /dev/null
+++ b/src/displayapp/icons/navigation/new_name_right.svg
@@ -0,0 +1,58 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   inkscape:version="1.0 (4035a4fb49, 2020-05-01)"
+   sodipodi:docname="new_name_right.svg"
+   version="1.1"
+   viewBox="0 0 20 20"
+   height="20"
+   width="20"
+   data-name="WORKING ICONS"
+   id="WORKING_ICONS">
+  <metadata
+     id="metadata11">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs9" />
+  <sodipodi:namedview
+     inkscape:current-layer="WORKING_ICONS"
+     inkscape:window-maximized="1"
+     inkscape:window-y="22"
+     inkscape:window-x="-8"
+     inkscape:cy="16.589963"
+     inkscape:cx="3.2195343"
+     inkscape:zoom="15.202796"
+     showgrid="false"
+     id="namedview7"
+     inkscape:window-height="1027"
+     inkscape:window-width="1920"
+     inkscape:pageshadow="2"
+     inkscape:pageopacity="0"
+     guidetolerance="10"
+     gridtolerance="10"
+     objecttolerance="10"
+     borderopacity="1"
+     bordercolor="#666666"
+     pagecolor="#ffffff" />
+  <title
+     id="title2">direction</title>
+  <path
+     style="stroke-width:1.24853"
+     id="path4"
+     d="M 8.7426433,7.4918486 A 5.0663062,5.0663062 0 0 0 3.7625481,12.577407 v 6.803048 A 0.61954509,0.61954509 0 0 1 3.143003,20 H 1.886396 A 0.6194452,0.6194452 0 0 1 1.2669383,19.379693 l 0.00243,-1.876751 h -0.00388 v -4.925535 a 7.5663233,7.5663233 0 0 1 7.477442,-7.5826165 l 0.01373,-0.00228 v 0.00228 h 2.4815137 a 0.44643653,0.44643653 0 0 0 0.47117,-0.6772271 L 10.031633,0.63210537 a 0.48266885,0.48266885 0 0 1 0.778495,-0.5111853 L 18.73453,6.2661801 10.810116,12.365794 A 0.48266885,0.48266885 0 0 1 10.031608,11.854621 L 11.709319,8.169163 A 0.44647399,0.44647399 0 0 0 11.238149,7.4918611 H 8.7426393 Z"
+     fill="#000000" />
+</svg>
diff --git a/src/displayapp/icons/navigation/new_name_sharp_left.svg b/src/displayapp/icons/navigation/new_name_sharp_left.svg
new file mode 100644
index 00000000..fcd09494
--- /dev/null
+++ b/src/displayapp/icons/navigation/new_name_sharp_left.svg
@@ -0,0 +1,58 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   inkscape:version="1.0 (4035a4fb49, 2020-05-01)"
+   sodipodi:docname="new_name_sharp_left.svg"
+   version="1.1"
+   viewBox="0 0 20 20"
+   height="20"
+   width="20"
+   data-name="WORKING ICONS"
+   id="WORKING_ICONS">
+  <metadata
+     id="metadata11">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs9" />
+  <sodipodi:namedview
+     inkscape:current-layer="WORKING_ICONS"
+     inkscape:window-maximized="1"
+     inkscape:window-y="22"
+     inkscape:window-x="-8"
+     inkscape:cy="13.910546"
+     inkscape:cx="10.232352"
+     inkscape:zoom="21.5"
+     showgrid="false"
+     id="namedview7"
+     inkscape:window-height="1027"
+     inkscape:window-width="1920"
+     inkscape:pageshadow="2"
+     inkscape:pageopacity="0"
+     guidetolerance="10"
+     gridtolerance="10"
+     objecttolerance="10"
+     borderopacity="1"
+     bordercolor="#666666"
+     pagecolor="#ffffff" />
+  <title
+     id="title2">direction</title>
+  <path
+     style="stroke-width:1.33234"
+     id="path4"
+     d="M 17.980077,19.999977 A 0.6632279,0.6632279 0 0 1 17.316849,19.336749 V 2.6847052 l -0.372777,-0.00846 a 3.4209018,3.4209018 0 0 0 -2.792195,1.052552 L 6.9635309,9.8747033 A 0.46522814,0.46522814 0 0 0 7.073476,10.716439 l 3.902131,1.856369 a 0.51505784,0.51505784 0 0 1 -0.284375,0.952254 L 0.018484,13.96752 2.2777144,3.5272667 A 0.51509781,0.51509781 0 0 1 3.2646088,3.4097539 l 1.1624708,4.1618724 a 0.47640652,0.47640652 0 0 0 0.8500359,0.229243 l 0.00504,0.006 7.1841365,-6.1408965 a 5.9507047,5.9507047 0 0 1 4.509667,-1.65378625 l 0.351952,0.00266 a 2.5705594,2.5705594 0 0 1 1.910689,0.7579043 2.8012149,2.8012149 0 0 1 0.74229,1.94582285 l 6.26e-4,16.6181893 a 0.6632279,0.6632279 0 0 1 -0.663232,0.663214 z"
+     fill="#000000" />
+</svg>
diff --git a/src/displayapp/icons/navigation/new_name_sharp_right.svg b/src/displayapp/icons/navigation/new_name_sharp_right.svg
new file mode 100644
index 00000000..46b8afa5
--- /dev/null
+++ b/src/displayapp/icons/navigation/new_name_sharp_right.svg
@@ -0,0 +1,58 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   inkscape:version="1.0 (4035a4fb49, 2020-05-01)"
+   sodipodi:docname="new_name_sharp_right.svg"
+   version="1.1"
+   viewBox="0 0 20 20"
+   height="20"
+   width="20"
+   data-name="WORKING ICONS"
+   id="WORKING_ICONS">
+  <metadata
+     id="metadata11">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs9" />
+  <sodipodi:namedview
+     inkscape:current-layer="WORKING_ICONS"
+     inkscape:window-maximized="1"
+     inkscape:window-y="22"
+     inkscape:window-x="-8"
+     inkscape:cy="13.406497"
+     inkscape:cx="13.365628"
+     inkscape:zoom="21.5"
+     showgrid="false"
+     id="namedview7"
+     inkscape:window-height="1027"
+     inkscape:window-width="1920"
+     inkscape:pageshadow="2"
+     inkscape:pageopacity="0"
+     guidetolerance="10"
+     gridtolerance="10"
+     objecttolerance="10"
+     borderopacity="1"
+     bordercolor="#666666"
+     pagecolor="#ffffff" />
+  <title
+     id="title2">direction</title>
+  <path
+     style="stroke-width:1.33234"
+     id="path4"
+     d="M 0.6817139,19.999998 A 0.6632279,0.6632279 0 0 1 0.018486,19.336744 L 0.0191122,2.7185536 a 2.8012149,2.8012149 0 0 1 0.7422892,-1.94582289 2.5705594,2.5705594 0 0 1 1.910689,-0.7579043 l 0.3519522,-0.00266 A 5.9507047,5.9507047 0 0 1 7.53371,1.6659527 l 7.184136,6.1408968 0.005,-0.0059 a 0.47640652,0.47640652 0 0 0 0.850036,-0.229243 l 1.162471,-4.1618724 a 0.51509781,0.51509781 0 0 1 0.986894,0.1175128 L 19.981514,13.967554 9.308793,13.525096 A 0.51505784,0.51505784 0 0 1 9.024417,12.572842 l 3.902131,-1.856369 A 0.46522814,0.46522814 0 0 0 13.036494,9.8747375 L 5.8481205,3.7288707 A 3.4209018,3.4209018 0 0 0 3.0559256,2.6763183 l -0.3727767,0.00846 V 19.336824 A 0.6632279,0.6632279 0 0 1 2.019921,19.999998 Z"
+     fill="#000000" />
+</svg>
diff --git a/src/displayapp/icons/navigation/new_name_slight_left.svg b/src/displayapp/icons/navigation/new_name_slight_left.svg
new file mode 100644
index 00000000..0616fc00
--- /dev/null
+++ b/src/displayapp/icons/navigation/new_name_slight_left.svg
@@ -0,0 +1,58 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   inkscape:version="1.0 (4035a4fb49, 2020-05-01)"
+   sodipodi:docname="new_name_slight_left.svg"
+   version="1.1"
+   viewBox="0 0 20 20"
+   height="20"
+   width="20"
+   data-name="WORKING ICONS"
+   id="WORKING_ICONS">
+  <metadata
+     id="metadata11">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs9" />
+  <sodipodi:namedview
+     inkscape:current-layer="WORKING_ICONS"
+     inkscape:window-maximized="1"
+     inkscape:window-y="22"
+     inkscape:window-x="-8"
+     inkscape:cy="14.196627"
+     inkscape:cx="9.5375818"
+     inkscape:zoom="21.5"
+     showgrid="false"
+     id="namedview7"
+     inkscape:window-height="1027"
+     inkscape:window-width="1920"
+     inkscape:pageshadow="2"
+     inkscape:pageopacity="0"
+     guidetolerance="10"
+     gridtolerance="10"
+     objecttolerance="10"
+     borderopacity="1"
+     bordercolor="#666666"
+     pagecolor="#ffffff" />
+  <title
+     id="title2">direction</title>
+  <path
+     style="stroke-width:1.33333"
+     id="path4"
+     d="m 16.648074,14.724 v 4.614427 A 0.66161333,0.66161333 0 0 1 15.986528,20 h -1.34204 a 0.66152,0.66152 0 0 1 -0.661534,-0.66244 l 0.0063,-4.810227 A 6.9575867,6.9575867 0 0 0 11.769221,9.002 L 8.5049277,6.2478 A 0.47677333,0.47677333 0 0 0 7.6509274,6.46468 l -1.22428,4.147467 A 0.51550667,0.51550667 0 0 1 5.440794,10.48 L 3.3335407,0 14.006554,0.5995333 A 0.51544,0.51544 0 0 1 14.277141,1.55656 l -3.931893,1.8002133 a 0.4768,0.4768 0 0 0 -0.09359,0.8761334 L 13.528274,6.99804 a 9.6687733,9.6687733 0 0 1 3.1198,7.72596 z"
+     fill="#000000" />
+</svg>
diff --git a/src/displayapp/icons/navigation/new_name_slight_right.svg b/src/displayapp/icons/navigation/new_name_slight_right.svg
new file mode 100644
index 00000000..c1625b88
--- /dev/null
+++ b/src/displayapp/icons/navigation/new_name_slight_right.svg
@@ -0,0 +1,58 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   inkscape:version="1.0 (4035a4fb49, 2020-05-01)"
+   sodipodi:docname="new_name_slight_right.svg"
+   version="1.1"
+   viewBox="0 0 20 20"
+   height="20"
+   width="20"
+   data-name="WORKING ICONS"
+   id="WORKING_ICONS">
+  <metadata
+     id="metadata11">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs9" />
+  <sodipodi:namedview
+     inkscape:current-layer="WORKING_ICONS"
+     inkscape:window-maximized="1"
+     inkscape:window-y="22"
+     inkscape:window-x="-8"
+     inkscape:cy="14.986758"
+     inkscape:cx="12.112318"
+     inkscape:zoom="21.5"
+     showgrid="false"
+     id="namedview7"
+     inkscape:window-height="1027"
+     inkscape:window-width="1920"
+     inkscape:pageshadow="2"
+     inkscape:pageopacity="0"
+     guidetolerance="10"
+     gridtolerance="10"
+     objecttolerance="10"
+     borderopacity="1"
+     bordercolor="#666666"
+     pagecolor="#ffffff" />
+  <title
+     id="title2">direction</title>
+  <path
+     style="stroke-width:1.33333"
+     id="path4"
+     d="M 6.4717198,6.9980533 9.7483327,4.2329067 A 0.4768,0.4768 0 0 0 9.6547467,3.3567733 L 5.7228532,1.55656 A 0.51544,0.51544 0 0 1 5.9934398,0.5995333 L 16.666453,0 14.5592,10.48 a 0.51550667,0.51550667 0 0 1 -0.98584,0.13216 L 12.34912,6.46468 A 0.47677333,0.47677333 0 0 0 11.49512,6.2478 L 8.2308265,9.001947 a 6.9575867,6.9575867 0 0 0 -2.22,5.525333 l 0.00627,4.810227 A 0.66152,0.66152 0 0 1 5.3555065,20 h -1.34204 A 0.66161333,0.66161333 0 0 1 3.3519332,19.338373 V 14.724 A 9.66876,9.66876 0 0 1 6.4717198,6.9980533 Z"
+     fill="#000000" />
+</svg>
diff --git a/src/displayapp/icons/navigation/new_name_straight.svg b/src/displayapp/icons/navigation/new_name_straight.svg
new file mode 100644
index 00000000..284f45ad
--- /dev/null
+++ b/src/displayapp/icons/navigation/new_name_straight.svg
@@ -0,0 +1,58 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   inkscape:version="1.0 (4035a4fb49, 2020-05-01)"
+   sodipodi:docname="new_name_straight.svg"
+   version="1.1"
+   viewBox="0 0 20 20"
+   height="20"
+   width="20"
+   data-name="WORKING ICONS"
+   id="WORKING_ICONS">
+  <metadata
+     id="metadata11">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs9" />
+  <sodipodi:namedview
+     inkscape:current-layer="WORKING_ICONS"
+     inkscape:window-maximized="1"
+     inkscape:window-y="22"
+     inkscape:window-x="-8"
+     inkscape:cy="12.561875"
+     inkscape:cx="4.7150609"
+     inkscape:zoom="21.5"
+     showgrid="false"
+     id="namedview7"
+     inkscape:window-height="1027"
+     inkscape:window-width="1920"
+     inkscape:pageshadow="2"
+     inkscape:pageopacity="0"
+     guidetolerance="10"
+     gridtolerance="10"
+     objecttolerance="10"
+     borderopacity="1"
+     bordercolor="#666666"
+     pagecolor="#ffffff" />
+  <title
+     id="title2">direction</title>
+  <path
+     style="stroke-width:1.25"
+     id="path4"
+     d="M 15.617836,8.707962 11.928024,7.028275 A 0.4469375,0.4469375 0 0 0 11.250011,7.5 V 19.37065 A 0.629325,0.629325 0 0 1 10.620661,20 H 9.3794106 a 0.629325,0.629325 0 0 1 -0.62935,-0.62935 V 7.5 A 0.44695,0.44695 0 0 0 8.0720358,7.028275 L 4.3821733,8.707962 A 0.4832375,0.4832375 0 0 1 3.8703983,7.9285375 L 10.000011,0 16.129624,7.9285375 A 0.48325,0.48325 0 0 1 15.617836,8.707962 Z"
+     fill="#000000" />
+</svg>
diff --git a/src/displayapp/icons/navigation/notificaiton_sharp_right.svg b/src/displayapp/icons/navigation/notificaiton_sharp_right.svg
new file mode 100644
index 00000000..d0b54ef0
--- /dev/null
+++ b/src/displayapp/icons/navigation/notificaiton_sharp_right.svg
@@ -0,0 +1,58 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   inkscape:version="1.0 (4035a4fb49, 2020-05-01)"
+   sodipodi:docname="notificaiton_sharp_right.svg"
+   version="1.1"
+   viewBox="0 0 20 20"
+   height="20"
+   width="20"
+   data-name="WORKING ICONS"
+   id="WORKING_ICONS">
+  <metadata
+     id="metadata11">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs9" />
+  <sodipodi:namedview
+     inkscape:current-layer="WORKING_ICONS"
+     inkscape:window-maximized="1"
+     inkscape:window-y="22"
+     inkscape:window-x="-8"
+     inkscape:cy="14.523578"
+     inkscape:cx="12.49376"
+     inkscape:zoom="21.5"
+     showgrid="false"
+     id="namedview7"
+     inkscape:window-height="1027"
+     inkscape:window-width="1920"
+     inkscape:pageshadow="2"
+     inkscape:pageopacity="0"
+     guidetolerance="10"
+     gridtolerance="10"
+     objecttolerance="10"
+     borderopacity="1"
+     bordercolor="#666666"
+     pagecolor="#ffffff" />
+  <title
+     id="title2">direction</title>
+  <path
+     style="stroke-width:1.33234"
+     id="path4"
+     d="M 0.681745,19.999972 A 0.66322701,0.66322701 0 0 1 0.018518,19.336718 L 0.0191442,2.71855 A 2.8012112,2.8012112 0 0 1 0.7614324,0.7727297 2.5705559,2.5705559 0 0 1 2.6721189,0.0148264 l 0.3519517,-0.00266 a 5.9506968,5.9506968 0 0 1 4.5096614,1.653784 l 7.184126,6.1408891 0.005,-0.0059 a 0.47640588,0.47640588 0 0 0 0.850035,-0.229243 l 1.162469,-4.1618669 a 0.51509712,0.51509712 0 0 1 0.986893,0.1175126 L 19.981482,13.967583 9.308775,13.525125 A 0.51505715,0.51505715 0 0 1 9.0244,12.572873 l 3.902126,-1.856367 A 0.46522752,0.46522752 0 0 0 13.036508,9.8747245 L 5.8481448,3.728839 A 3.4208972,3.4208972 0 0 0 3.0559536,2.6762881 l -0.3727763,0.00846 V 19.336771 a 0.66322701,0.66322701 0 0 1 -0.663227,0.663227 H 0.681745 Z"
+     fill="#000000" />
+</svg>
diff --git a/src/displayapp/icons/navigation/notification-left-white.svg b/src/displayapp/icons/navigation/notification-left-white.svg
deleted file mode 100644
index 3cb455d9..00000000
--- a/src/displayapp/icons/navigation/notification-left-white.svg
+++ /dev/null
@@ -1,4 +0,0 @@
-<svg id="WORKING_ICONS" data-name="WORKING ICONS" xmlns="http://www.w3.org/2000/svg" width="20" height="20" viewBox="0 0 20 20">
-  <title>direction</title>
-  <path fill="#ffffff" d="M10,5.97986l0.011,0.00183A6.06019,6.06019,0,0,1,16,12.05493V16H15.99689l0.002,1.50317A0.49614,0.49614,0,0,1,15.50269,18H14.49622A0.49622,0.49622,0,0,1,14,17.50378V12.05493a4.05782,4.05782,0,0,0-3.98877-4.07324H8.01245a0.3576,0.3576,0,0,0-.37738.54248L8.97882,11.476a0.38659,0.38659,0,0,1-.62354.40942L2.0083,7l6.347-4.922a0.38659,0.38659,0,0,1,.62354.40942L7.63507,5.43927a0.35757,0.35757,0,0,0,.37738.54242H10"/>
-</svg>
diff --git a/src/displayapp/icons/navigation/notification-left.c b/src/displayapp/icons/navigation/notification-left.c
deleted file mode 100644
index 4e394626..00000000
--- a/src/displayapp/icons/navigation/notification-left.c
+++ /dev/null
@@ -1,96 +0,0 @@
-#if defined(LV_LVGL_H_INCLUDE_SIMPLE)
-#include "lvgl.h"
-#else
-#include "lvgl/lvgl.h"
-#endif
-
-
-#ifndef LV_ATTRIBUTE_MEM_ALIGN
-#define LV_ATTRIBUTE_MEM_ALIGN
-#endif
-
-#ifndef LV_ATTRIBUTE_IMG_NOTIFICATION_LEFT
-#define LV_ATTRIBUTE_IMG_NOTIFICATION_LEFT
-#endif
-
-const LV_ATTRIBUTE_MEM_ALIGN LV_ATTRIBUTE_LARGE_CONST LV_ATTRIBUTE_IMG_NOTIFICATION_LEFT uint8_t notification_left_map[] = {
-  0x04, 0x02, 0x04, 0xff, 	/*Color of index 0*/
-  0xfc, 0xfe, 0xfc, 0xff, 	/*Color of index 1*/
-
-  0x00, 0x00, 0x00, 0x7f, 0xc0, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0xff, 0xc0, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x01, 0xff, 0xc0, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x07, 0xff, 0xc0, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x0f, 0xff, 0xc0, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x3f, 0xff, 0x80, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x7f, 0xff, 0x80, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 
-  0x00, 0x01, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 
-  0x00, 0x07, 0xff, 0xfe, 0x00, 0x00, 0x00, 0x00, 
-  0x00, 0x0f, 0xff, 0xfe, 0x00, 0x00, 0x00, 0x00, 
-  0x00, 0x1f, 0xff, 0xfc, 0x00, 0x00, 0x00, 0x00, 
-  0x00, 0x7f, 0xff, 0xfc, 0x00, 0x00, 0x00, 0x00, 
-  0x00, 0xff, 0xff, 0xfc, 0x00, 0x00, 0x00, 0x00, 
-  0x01, 0xff, 0xff, 0xff, 0xff, 0xc0, 0x00, 0x00, 
-  0x03, 0xff, 0xff, 0xff, 0xff, 0xfc, 0x00, 0x00, 
-  0x0f, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 
-  0x0f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xc0, 0x00, 
-  0x0f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xe0, 0x00, 
-  0x0f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xf8, 0x00, 
-  0x0f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfc, 0x00, 
-  0x0f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfe, 0x00, 
-  0x0f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 
-  0x0f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x80, 
-  0x07, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xc0, 
-  0x03, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xc0, 
-  0x00, 0xff, 0xff, 0xfc, 0x07, 0xff, 0xff, 0xe0, 
-  0x00, 0x7f, 0xff, 0xfc, 0x00, 0xff, 0xff, 0xf0, 
-  0x00, 0x3f, 0xff, 0xfc, 0x00, 0x3f, 0xff, 0xf0, 
-  0x00, 0x1f, 0xff, 0xfe, 0x00, 0x1f, 0xff, 0xf0, 
-  0x00, 0x07, 0xff, 0xfe, 0x00, 0x07, 0xff, 0xf0, 
-  0x00, 0x03, 0xff, 0xff, 0x00, 0x03, 0xff, 0xf0, 
-  0x00, 0x00, 0xff, 0xff, 0x00, 0x01, 0xff, 0xf0, 
-  0x00, 0x00, 0x7f, 0xff, 0x80, 0x01, 0xff, 0xf0, 
-  0x00, 0x00, 0x3f, 0xff, 0x80, 0x00, 0xff, 0xf0, 
-  0x00, 0x00, 0x1f, 0xff, 0xc0, 0x00, 0x7f, 0xf0, 
-  0x00, 0x00, 0x07, 0xff, 0xc0, 0x00, 0x7f, 0xf0, 
-  0x00, 0x00, 0x03, 0xff, 0xc0, 0x00, 0x7f, 0xf0, 
-  0x00, 0x00, 0x00, 0xff, 0xc0, 0x00, 0x3f, 0xf0, 
-  0x00, 0x00, 0x00, 0x7f, 0xc0, 0x00, 0x3f, 0xf0, 
-  0x00, 0x00, 0x00, 0x3f, 0xc0, 0x00, 0x3f, 0xf0, 
-  0x00, 0x00, 0x00, 0x1f, 0xc0, 0x00, 0x3f, 0xf0, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3f, 0xf0, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3f, 0xf0, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3f, 0xf0, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3f, 0xf0, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3f, 0xf0, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3f, 0xf0, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3f, 0xf0, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3f, 0xf0, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3f, 0xf0, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3f, 0xf0, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3f, 0xf0, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3f, 0xf0, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3f, 0xf0, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3f, 0xf0, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3f, 0xf0, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3f, 0xf0, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3f, 0xf0, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3f, 0xf0, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3f, 0xf0, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3f, 0xf0, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3f, 0xf0, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3f, 0xf0, 
-};
-
-const lv_img_dsc_t notification_left = {
-      {
-        LV_IMG_CF_INDEXED_1BIT,
-        0,
-        0,
-        64,
-        64
-    },
-    520,
-notification_left_map,
-};
diff --git a/src/displayapp/icons/navigation/notification-left.png b/src/displayapp/icons/navigation/notification-left.png
deleted file mode 100644
index e90ef9d7..00000000
--- a/src/displayapp/icons/navigation/notification-left.png
+++ /dev/null
diff --git a/src/displayapp/icons/navigation/notification-right-white.svg b/src/displayapp/icons/navigation/notification-right-white.svg
deleted file mode 100644
index 98967557..00000000
--- a/src/displayapp/icons/navigation/notification-right-white.svg
+++ /dev/null
@@ -1,4 +0,0 @@
-<svg id="WORKING_ICONS" data-name="WORKING ICONS" xmlns="http://www.w3.org/2000/svg" width="20" height="20" viewBox="0 0 20 20">
-  <title>direction</title>
-  <path fill="#ffffff" d="M9.98877,7.98169A4.05782,4.05782,0,0,0,6,12.05493v5.44885A0.49622,0.49622,0,0,1,5.50378,18H4.49731a0.49614,0.49614,0,0,1-.49615-0.49683L4.00311,16H4V12.05493A6.06019,6.06019,0,0,1,9.989,5.98169L10,5.97986V5.98169h1.98755a0.35757,0.35757,0,0,0,.37738-0.54242L11.02118,2.48743A0.38659,0.38659,0,0,1,11.64471,2.078L17.9917,7l-6.347,4.88544a0.38659,0.38659,0,0,1-.62354-0.40942l1.34375-2.95184a0.3576,0.3576,0,0,0-.37738-0.54248H9.98877Z"/>
-</svg>
diff --git a/src/displayapp/icons/navigation/notification-right.c b/src/displayapp/icons/navigation/notification-right.c
deleted file mode 100644
index 76891fd9..00000000
--- a/src/displayapp/icons/navigation/notification-right.c
+++ /dev/null
@@ -1,96 +0,0 @@
-#if defined(LV_LVGL_H_INCLUDE_SIMPLE)
-#include "lvgl.h"
-#else
-#include "lvgl/lvgl.h"
-#endif
-
-
-#ifndef LV_ATTRIBUTE_MEM_ALIGN
-#define LV_ATTRIBUTE_MEM_ALIGN
-#endif
-
-#ifndef LV_ATTRIBUTE_IMG_NOTIFICATION_RIGHT
-#define LV_ATTRIBUTE_IMG_NOTIFICATION_RIGHT
-#endif
-
-const LV_ATTRIBUTE_MEM_ALIGN LV_ATTRIBUTE_LARGE_CONST LV_ATTRIBUTE_IMG_NOTIFICATION_RIGHT uint8_t notification_right_map[] = {
-  0x04, 0x02, 0x04, 0xff, 	/*Color of index 0*/
-  0xfc, 0xfe, 0xfc, 0xff, 	/*Color of index 1*/
-
-  0x00, 0x00, 0x00, 0x03, 0xfe, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x03, 0xff, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x03, 0xff, 0xc0, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x03, 0xff, 0xe0, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x03, 0xff, 0xf0, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x01, 0xff, 0xfc, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x01, 0xff, 0xfe, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0x80, 0x00, 
-  0x00, 0x00, 0x00, 0x00, 0x7f, 0xff, 0xe0, 0x00, 
-  0x00, 0x00, 0x00, 0x00, 0x7f, 0xff, 0xf0, 0x00, 
-  0x00, 0x00, 0x00, 0x00, 0x3f, 0xff, 0xf8, 0x00, 
-  0x00, 0x00, 0x00, 0x00, 0x3f, 0xff, 0xfe, 0x00, 
-  0x00, 0x00, 0x00, 0x00, 0x3f, 0xff, 0xff, 0x00, 
-  0x00, 0x00, 0x03, 0xff, 0xff, 0xff, 0xff, 0x80, 
-  0x00, 0x00, 0x3f, 0xff, 0xff, 0xff, 0xff, 0xc0, 
-  0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xf0, 
-  0x00, 0x03, 0xff, 0xff, 0xff, 0xff, 0xff, 0xf0, 
-  0x00, 0x07, 0xff, 0xff, 0xff, 0xff, 0xff, 0xf0, 
-  0x00, 0x1f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xf0, 
-  0x00, 0x3f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xf0, 
-  0x00, 0x7f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xf0, 
-  0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xf0, 
-  0x01, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xf0, 
-  0x03, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xe0, 
-  0x03, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xc0, 
-  0x07, 0xff, 0xff, 0xe0, 0x3f, 0xff, 0xff, 0x00, 
-  0x0f, 0xff, 0xff, 0x00, 0x3f, 0xff, 0xfe, 0x00, 
-  0x0f, 0xff, 0xfc, 0x00, 0x3f, 0xff, 0xfc, 0x00, 
-  0x0f, 0xff, 0xf8, 0x00, 0x7f, 0xff, 0xf8, 0x00, 
-  0x0f, 0xff, 0xe0, 0x00, 0x7f, 0xff, 0xe0, 0x00, 
-  0x0f, 0xff, 0xc0, 0x00, 0xff, 0xff, 0xc0, 0x00, 
-  0x0f, 0xff, 0x80, 0x00, 0xff, 0xff, 0x00, 0x00, 
-  0x0f, 0xff, 0x80, 0x01, 0xff, 0xfe, 0x00, 0x00, 
-  0x0f, 0xff, 0x00, 0x01, 0xff, 0xfc, 0x00, 0x00, 
-  0x0f, 0xfe, 0x00, 0x03, 0xff, 0xf8, 0x00, 0x00, 
-  0x0f, 0xfe, 0x00, 0x03, 0xff, 0xf0, 0x00, 0x00, 
-  0x0f, 0xfe, 0x00, 0x03, 0xff, 0xc0, 0x00, 0x00, 
-  0x0f, 0xfc, 0x00, 0x03, 0xff, 0x00, 0x00, 0x00, 
-  0x0f, 0xfc, 0x00, 0x03, 0xfe, 0x00, 0x00, 0x00, 
-  0x0f, 0xfc, 0x00, 0x03, 0xfc, 0x00, 0x00, 0x00, 
-  0x0f, 0xfc, 0x00, 0x03, 0xf8, 0x00, 0x00, 0x00, 
-  0x0f, 0xfc, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x0f, 0xfc, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x0f, 0xfc, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x0f, 0xfc, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x0f, 0xfc, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x0f, 0xfc, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x0f, 0xfc, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x0f, 0xfc, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x0f, 0xfc, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x0f, 0xfc, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x0f, 0xfc, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x0f, 0xfc, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x0f, 0xfc, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x0f, 0xfc, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x0f, 0xfc, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x0f, 0xfc, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x0f, 0xfc, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x0f, 0xfc, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x0f, 0xfc, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x0f, 0xfc, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x0f, 0xfc, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x0f, 0xfc, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-};
-
-const lv_img_dsc_t notification_right = {
-      {
-        LV_IMG_CF_INDEXED_1BIT,
-        0,
-        0,
-        64,
-        64
-    },
-    520,
-notification_right_map,
-};
diff --git a/src/displayapp/icons/navigation/notification-right.png b/src/displayapp/icons/navigation/notification-right.png
deleted file mode 100644
index bc71624c..00000000
--- a/src/displayapp/icons/navigation/notification-right.png
+++ /dev/null
diff --git a/src/displayapp/icons/navigation/notification-sharp-left-white.svg b/src/displayapp/icons/navigation/notification-sharp-left-white.svg
deleted file mode 100644
index 838e9d02..00000000
--- a/src/displayapp/icons/navigation/notification-sharp-left-white.svg
+++ /dev/null
@@ -1,4 +0,0 @@
-<svg id="WORKING_ICONS" data-name="WORKING ICONS" xmlns="http://www.w3.org/2000/svg" width="20" height="20" viewBox="0 0 20 20">
-  <title>direction</title>
-  <path fill="#ffffff" d="M15.49771,17.99542a0.49779,0.49779,0,0,1-.49779-0.49779V4.99933L14.72014,4.993a2.56758,2.56758,0,0,0-2.0957.79L7.22917,10.39583a0.34918,0.34918,0,0,0,.08252.63177l2.92877,1.39331a0.38658,0.38658,0,0,1-.21344.71472l-8.0105.33209,1.69568-7.836a0.38661,0.38661,0,0,1,.74072-0.0882l0.8725,3.12372a0.35757,0.35757,0,0,0,.638.17206L5.9672,8.84377,11.3593,4.23468a4.46634,4.46634,0,0,1,3.38477-1.24121l0.26416,0.002a1.92935,1.92935,0,0,1,1.43408.56885,2.10247,2.10247,0,0,1,.55713,1.46045L16.9999,17.49761a0.49779,0.49779,0,0,1-.49779.49781h-1.0044Z"/>
-</svg>
diff --git a/src/displayapp/icons/navigation/notification-sharp-left.c b/src/displayapp/icons/navigation/notification-sharp-left.c
deleted file mode 100644
index 2d2bedc0..00000000
--- a/src/displayapp/icons/navigation/notification-sharp-left.c
+++ /dev/null
@@ -1,96 +0,0 @@
-#if defined(LV_LVGL_H_INCLUDE_SIMPLE)
-#include "lvgl.h"
-#else
-#include "lvgl/lvgl.h"
-#endif
-
-
-#ifndef LV_ATTRIBUTE_MEM_ALIGN
-#define LV_ATTRIBUTE_MEM_ALIGN
-#endif
-
-#ifndef LV_ATTRIBUTE_IMG_NOTIFICATION_SHARP_LEFT
-#define LV_ATTRIBUTE_IMG_NOTIFICATION_SHARP_LEFT
-#endif
-
-const LV_ATTRIBUTE_MEM_ALIGN LV_ATTRIBUTE_LARGE_CONST LV_ATTRIBUTE_IMG_NOTIFICATION_SHARP_LEFT uint8_t notification_sharp_left_map[] = {
-  0x04, 0x02, 0x04, 0xff, 	/*Color of index 0*/
-  0xfc, 0xfe, 0xfc, 0xff, 	/*Color of index 1*/
-
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x3f, 0xff, 0xfe, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 
-  0x00, 0x00, 0x00, 0x00, 0x01, 0xff, 0xff, 0xff, 
-  0x00, 0x00, 0x00, 0x00, 0x03, 0xff, 0xff, 0xff, 
-  0x00, 0x00, 0x00, 0x00, 0x07, 0xff, 0xff, 0xff, 
-  0x00, 0x00, 0x00, 0x00, 0x1f, 0xff, 0xff, 0xff, 
-  0x00, 0x00, 0x00, 0x00, 0x3f, 0xff, 0xff, 0xff, 
-  0x00, 0x00, 0x00, 0x00, 0x7f, 0xff, 0xff, 0xff, 
-  0x03, 0xf0, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 
-  0x07, 0xf8, 0x00, 0x01, 0xff, 0xff, 0xff, 0xff, 
-  0x07, 0xf8, 0x00, 0x07, 0xff, 0xff, 0xff, 0xff, 
-  0x07, 0xf8, 0x00, 0x0f, 0xff, 0xff, 0xe7, 0xff, 
-  0x07, 0xf8, 0x00, 0x1f, 0xff, 0xff, 0x87, 0xff, 
-  0x0f, 0xfc, 0x00, 0x3f, 0xff, 0xff, 0x07, 0xff, 
-  0x0f, 0xfc, 0x00, 0x7f, 0xff, 0xfc, 0x07, 0xff, 
-  0x0f, 0xfc, 0x00, 0xff, 0xff, 0xf8, 0x07, 0xff, 
-  0x0f, 0xfc, 0x01, 0xff, 0xff, 0xf0, 0x07, 0xff, 
-  0x0f, 0xfe, 0x03, 0xff, 0xff, 0xe0, 0x07, 0xff, 
-  0x1f, 0xfe, 0x0f, 0xff, 0xff, 0xc0, 0x07, 0xff, 
-  0x1f, 0xfe, 0x1f, 0xff, 0xff, 0x80, 0x07, 0xff, 
-  0x1f, 0xff, 0x3f, 0xff, 0xff, 0x00, 0x07, 0xff, 
-  0x1f, 0xff, 0x7f, 0xff, 0xfe, 0x00, 0x07, 0xff, 
-  0x1f, 0xff, 0xff, 0xff, 0xf8, 0x00, 0x07, 0xff, 
-  0x3f, 0xff, 0xff, 0xff, 0xf0, 0x00, 0x07, 0xff, 
-  0x3f, 0xff, 0xff, 0xff, 0xe0, 0x00, 0x07, 0xff, 
-  0x3f, 0xff, 0xff, 0xff, 0xc0, 0x00, 0x07, 0xff, 
-  0x3f, 0xff, 0xff, 0xff, 0x00, 0x00, 0x07, 0xff, 
-  0x7f, 0xff, 0xff, 0xfe, 0x00, 0x00, 0x07, 0xff, 
-  0x7f, 0xff, 0xff, 0xfc, 0x00, 0x00, 0x07, 0xff, 
-  0x7f, 0xff, 0xff, 0xf8, 0x00, 0x00, 0x07, 0xff, 
-  0x7f, 0xff, 0xff, 0xf0, 0x00, 0x00, 0x07, 0xff, 
-  0x7f, 0xff, 0xff, 0xe0, 0x00, 0x00, 0x07, 0xff, 
-  0xff, 0xff, 0xff, 0x80, 0x00, 0x00, 0x07, 0xff, 
-  0xff, 0xff, 0xff, 0xe0, 0x00, 0x00, 0x07, 0xff, 
-  0xff, 0xff, 0xff, 0xf8, 0x00, 0x00, 0x07, 0xff, 
-  0xff, 0xff, 0xff, 0xfe, 0x00, 0x00, 0x07, 0xff, 
-  0xff, 0xff, 0xff, 0xff, 0x80, 0x00, 0x07, 0xff, 
-  0xff, 0xff, 0xff, 0xff, 0xf0, 0x00, 0x07, 0xff, 
-  0xff, 0xff, 0xff, 0xff, 0xf8, 0x00, 0x07, 0xff, 
-  0xff, 0xff, 0xff, 0xff, 0xfc, 0x00, 0x07, 0xff, 
-  0xff, 0xff, 0xff, 0xff, 0xfc, 0x00, 0x07, 0xff, 
-  0xff, 0xff, 0xff, 0xff, 0xfc, 0x00, 0x07, 0xff, 
-  0xff, 0xff, 0xff, 0xff, 0xfc, 0x00, 0x07, 0xff, 
-  0xff, 0xff, 0xff, 0xff, 0xfc, 0x00, 0x07, 0xff, 
-  0xff, 0xff, 0xff, 0xff, 0xfc, 0x00, 0x07, 0xff, 
-  0xff, 0xff, 0xff, 0xf8, 0x00, 0x00, 0x07, 0xff, 
-  0xf8, 0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0xff, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0xff, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0xff, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0xff, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0xff, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0xff, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0xff, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0xff, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0xff, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0xff, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0xff, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0xff, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0xff, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0xff, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0xff, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0xff, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0xff, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0xff, 
-};
-
-const lv_img_dsc_t notification_sharp_left = {
-      {
-        LV_IMG_CF_INDEXED_1BIT,
-        0,
-        0,
-        64,
-        64
-    },
-    520,
-notification_sharp_left_map,
-};
diff --git a/src/displayapp/icons/navigation/notification-sharp-left.png b/src/displayapp/icons/navigation/notification-sharp-left.png
deleted file mode 100644
index 8f9f55ba..00000000
--- a/src/displayapp/icons/navigation/notification-sharp-left.png
+++ /dev/null
diff --git a/src/displayapp/icons/navigation/notification-sharp-right-white.svg b/src/displayapp/icons/navigation/notification-sharp-right-white.svg
deleted file mode 100644
index 44542f52..00000000
--- a/src/displayapp/icons/navigation/notification-sharp-right-white.svg
+++ /dev/null
@@ -1,4 +0,0 @@
-<svg id="WORKING_ICONS" data-name="WORKING ICONS" xmlns="http://www.w3.org/2000/svg" width="20" height="20" viewBox="0 0 20 20">
-  <title>direction</title>
-  <path fill="#ffffff" d="M3.49789,17.99542a0.49779,0.49779,0,0,1-.49779-0.49781L3.00057,5.02472A2.10247,2.10247,0,0,1,3.5577,3.56427a1.92935,1.92935,0,0,1,1.43408-.56885l0.26416-.002A4.46634,4.46634,0,0,1,8.6407,4.23468L14.0328,8.84377l0.00378-.00446a0.35757,0.35757,0,0,0,.638-0.17206l0.8725-3.12372a0.38661,0.38661,0,0,1,.74072.0882l1.69568,7.836L9.973,13.13564a0.38658,0.38658,0,0,1-.21344-0.71472l2.92877-1.39331a0.34918,0.34918,0,0,0,.08252-0.63177L7.37557,5.783a2.56758,2.56758,0,0,0-2.0957-.79l-0.27979.00635v12.4983a0.49779,0.49779,0,0,1-.49779.49779H3.49789Z"/>
-</svg>
diff --git a/src/displayapp/icons/navigation/notification-sharp-right.c b/src/displayapp/icons/navigation/notification-sharp-right.c
deleted file mode 100644
index 3d56f0ec..00000000
--- a/src/displayapp/icons/navigation/notification-sharp-right.c
+++ /dev/null
@@ -1,96 +0,0 @@
-#if defined(LV_LVGL_H_INCLUDE_SIMPLE)
-#include "lvgl.h"
-#else
-#include "lvgl/lvgl.h"
-#endif
-
-
-#ifndef LV_ATTRIBUTE_MEM_ALIGN
-#define LV_ATTRIBUTE_MEM_ALIGN
-#endif
-
-#ifndef LV_ATTRIBUTE_IMG_NOTIFICATION_SHARP_RIGHT
-#define LV_ATTRIBUTE_IMG_NOTIFICATION_SHARP_RIGHT
-#endif
-
-const LV_ATTRIBUTE_MEM_ALIGN LV_ATTRIBUTE_LARGE_CONST LV_ATTRIBUTE_IMG_NOTIFICATION_SHARP_RIGHT uint8_t notification_sharp_right_map[] = {
-  0x04, 0x02, 0x04, 0xff, 	/*Color of index 0*/
-  0xfc, 0xfe, 0xfc, 0xff, 	/*Color of index 1*/
-
-  0x7f, 0xff, 0xfc, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0xff, 0xff, 0xff, 0x80, 0x00, 0x00, 0x00, 0x00, 
-  0xff, 0xff, 0xff, 0xc0, 0x00, 0x00, 0x00, 0x00, 
-  0xff, 0xff, 0xff, 0xe0, 0x00, 0x00, 0x00, 0x00, 
-  0xff, 0xff, 0xff, 0xf8, 0x00, 0x00, 0x00, 0x00, 
-  0xff, 0xff, 0xff, 0xfc, 0x00, 0x00, 0x00, 0x00, 
-  0xff, 0xff, 0xff, 0xfe, 0x00, 0x00, 0x00, 0x00, 
-  0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x0f, 0xc0, 
-  0xff, 0xff, 0xff, 0xff, 0x80, 0x00, 0x1f, 0xe0, 
-  0xff, 0xff, 0xff, 0xff, 0xe0, 0x00, 0x1f, 0xe0, 
-  0xff, 0xe7, 0xff, 0xff, 0xf0, 0x00, 0x1f, 0xe0, 
-  0xff, 0xe1, 0xff, 0xff, 0xf8, 0x00, 0x1f, 0xe0, 
-  0xff, 0xe0, 0xff, 0xff, 0xfc, 0x00, 0x3f, 0xf0, 
-  0xff, 0xe0, 0x3f, 0xff, 0xfe, 0x00, 0x3f, 0xf0, 
-  0xff, 0xe0, 0x1f, 0xff, 0xff, 0x00, 0x3f, 0xf0, 
-  0xff, 0xe0, 0x0f, 0xff, 0xff, 0x80, 0x3f, 0xf0, 
-  0xff, 0xe0, 0x07, 0xff, 0xff, 0xc0, 0x7f, 0xf0, 
-  0xff, 0xe0, 0x03, 0xff, 0xff, 0xf0, 0x7f, 0xf8, 
-  0xff, 0xe0, 0x01, 0xff, 0xff, 0xf8, 0x7f, 0xf8, 
-  0xff, 0xe0, 0x00, 0xff, 0xff, 0xfc, 0xff, 0xf8, 
-  0xff, 0xe0, 0x00, 0x7f, 0xff, 0xfe, 0xff, 0xf8, 
-  0xff, 0xe0, 0x00, 0x1f, 0xff, 0xff, 0xff, 0xf8, 
-  0xff, 0xe0, 0x00, 0x0f, 0xff, 0xff, 0xff, 0xfc, 
-  0xff, 0xe0, 0x00, 0x07, 0xff, 0xff, 0xff, 0xfc, 
-  0xff, 0xe0, 0x00, 0x03, 0xff, 0xff, 0xff, 0xfc, 
-  0xff, 0xe0, 0x00, 0x00, 0xff, 0xff, 0xff, 0xfc, 
-  0xff, 0xe0, 0x00, 0x00, 0x7f, 0xff, 0xff, 0xfe, 
-  0xff, 0xe0, 0x00, 0x00, 0x3f, 0xff, 0xff, 0xfe, 
-  0xff, 0xe0, 0x00, 0x00, 0x1f, 0xff, 0xff, 0xfe, 
-  0xff, 0xe0, 0x00, 0x00, 0x0f, 0xff, 0xff, 0xfe, 
-  0xff, 0xe0, 0x00, 0x00, 0x07, 0xff, 0xff, 0xfe, 
-  0xff, 0xe0, 0x00, 0x00, 0x01, 0xff, 0xff, 0xff, 
-  0xff, 0xe0, 0x00, 0x00, 0x07, 0xff, 0xff, 0xff, 
-  0xff, 0xe0, 0x00, 0x00, 0x1f, 0xff, 0xff, 0xff, 
-  0xff, 0xe0, 0x00, 0x00, 0x7f, 0xff, 0xff, 0xff, 
-  0xff, 0xe0, 0x00, 0x01, 0xff, 0xff, 0xff, 0xff, 
-  0xff, 0xe0, 0x00, 0x0f, 0xff, 0xff, 0xff, 0xff, 
-  0xff, 0xe0, 0x00, 0x1f, 0xff, 0xff, 0xff, 0xff, 
-  0xff, 0xe0, 0x00, 0x3f, 0xff, 0xff, 0xff, 0xff, 
-  0xff, 0xe0, 0x00, 0x3f, 0xff, 0xff, 0xff, 0xff, 
-  0xff, 0xe0, 0x00, 0x3f, 0xff, 0xff, 0xff, 0xff, 
-  0xff, 0xe0, 0x00, 0x3f, 0xff, 0xff, 0xff, 0xff, 
-  0xff, 0xe0, 0x00, 0x3f, 0xff, 0xff, 0xff, 0xff, 
-  0xff, 0xe0, 0x00, 0x3f, 0xff, 0xff, 0xff, 0xff, 
-  0xff, 0xe0, 0x00, 0x00, 0x1f, 0xff, 0xff, 0xff, 
-  0xff, 0xe0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1f, 
-  0xff, 0xe0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0xff, 0xe0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0xff, 0xe0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0xff, 0xe0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0xff, 0xe0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0xff, 0xe0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0xff, 0xe0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0xff, 0xe0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0xff, 0xe0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0xff, 0xe0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0xff, 0xe0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0xff, 0xe0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0xff, 0xe0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0xff, 0xe0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0xff, 0xe0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0xff, 0xe0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0xff, 0xe0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-};
-
-const lv_img_dsc_t notification_sharp_right = {
-      {
-        LV_IMG_CF_INDEXED_1BIT,
-        0,
-        0,
-        64,
-        64
-    },
-    520,
-notification_sharp_right_map,
-};
diff --git a/src/displayapp/icons/navigation/notification-sharp-right.png b/src/displayapp/icons/navigation/notification-sharp-right.png
deleted file mode 100644
index f0fcc0c1..00000000
--- a/src/displayapp/icons/navigation/notification-sharp-right.png
+++ /dev/null
diff --git a/src/displayapp/icons/navigation/notification-slight-left-white.svg b/src/displayapp/icons/navigation/notification-slight-left-white.svg
deleted file mode 100644
index 7ae2013c..00000000
--- a/src/displayapp/icons/navigation/notification-slight-left-white.svg
+++ /dev/null
@@ -1,4 +0,0 @@
-<svg id="WORKING_ICONS" data-name="WORKING ICONS" xmlns="http://www.w3.org/2000/svg" width="20" height="20" viewBox="0 0 20 20">
-  <title>direction</title>
-  <path fill="#ffffff" d="M14.9859,14.043v3.46082A0.49621,0.49621,0,0,1,14.48974,18H13.48321a0.49614,0.49614,0,0,1-.49615-0.49683l0.0047-3.60767a5.21819,5.21819,0,0,0-1.665-4.144L8.87854,7.68585a0.35758,0.35758,0,0,0-.6405.16266l-0.91821,3.1106A0.38663,0.38663,0,0,1,6.58044,10.86L5,3l8.00476,0.44965a0.38658,0.38658,0,0,1,.20294.71777L10.25878,5.51758a0.3576,0.3576,0,0,0-.07019.6571l2.45746,2.07385A7.25158,7.25158,0,0,1,14.9859,14.043Z"/>
-</svg>
diff --git a/src/displayapp/icons/navigation/notification-slight-left.c b/src/displayapp/icons/navigation/notification-slight-left.c
deleted file mode 100644
index 8aae05fc..00000000
--- a/src/displayapp/icons/navigation/notification-slight-left.c
+++ /dev/null
@@ -1,96 +0,0 @@
-#if defined(LV_LVGL_H_INCLUDE_SIMPLE)
-#include "lvgl.h"
-#else
-#include "lvgl/lvgl.h"
-#endif
-
-
-#ifndef LV_ATTRIBUTE_MEM_ALIGN
-#define LV_ATTRIBUTE_MEM_ALIGN
-#endif
-
-#ifndef LV_ATTRIBUTE_IMG_NOTIFICATION_SLIGHT_LEFT
-#define LV_ATTRIBUTE_IMG_NOTIFICATION_SLIGHT_LEFT
-#endif
-
-const LV_ATTRIBUTE_MEM_ALIGN LV_ATTRIBUTE_LARGE_CONST LV_ATTRIBUTE_IMG_NOTIFICATION_SLIGHT_LEFT uint8_t notification_slight_left_map[] = {
-  0x04, 0x02, 0x04, 0xff, 	/*Color of index 0*/
-  0xfc, 0xfe, 0xfc, 0xff, 	/*Color of index 1*/
-
-  0x00, 0x1f, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 
-  0x00, 0x1f, 0xff, 0xff, 0xff, 0xff, 0x80, 0x00, 
-  0x00, 0x1f, 0xff, 0xff, 0xff, 0xff, 0x80, 0x00, 
-  0x00, 0x1f, 0xff, 0xff, 0xff, 0xff, 0x80, 0x00, 
-  0x00, 0x1f, 0xff, 0xff, 0xff, 0xff, 0x80, 0x00, 
-  0x00, 0x1f, 0xff, 0xff, 0xff, 0xff, 0x80, 0x00, 
-  0x00, 0x1f, 0xff, 0xff, 0xff, 0xff, 0x80, 0x00, 
-  0x00, 0x1f, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 
-  0x00, 0x1f, 0xff, 0xff, 0xff, 0xf8, 0x00, 0x00, 
-  0x00, 0x1f, 0xff, 0xff, 0xff, 0xe0, 0x00, 0x00, 
-  0x00, 0x1f, 0xff, 0xff, 0xff, 0x80, 0x00, 0x00, 
-  0x00, 0x1f, 0xff, 0xff, 0xfc, 0x00, 0x00, 0x00, 
-  0x00, 0x1f, 0xff, 0xff, 0xf0, 0x00, 0x00, 0x00, 
-  0x00, 0x0f, 0xff, 0xff, 0xfc, 0x00, 0x00, 0x00, 
-  0x00, 0x0f, 0xff, 0xff, 0xfc, 0x00, 0x00, 0x00, 
-  0x00, 0x0f, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 
-  0x00, 0x0f, 0xff, 0xff, 0xff, 0x80, 0x00, 0x00, 
-  0x00, 0x0f, 0xff, 0xff, 0xff, 0xc0, 0x00, 0x00, 
-  0x00, 0x07, 0xff, 0xff, 0xff, 0xe0, 0x00, 0x00, 
-  0x00, 0x07, 0xff, 0xff, 0xff, 0xf8, 0x00, 0x00, 
-  0x00, 0x07, 0xff, 0xff, 0xff, 0xfc, 0x00, 0x00, 
-  0x00, 0x07, 0xff, 0xff, 0xff, 0xfe, 0x00, 0x00, 
-  0x00, 0x07, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 
-  0x00, 0x03, 0xff, 0xff, 0xff, 0xff, 0x80, 0x00, 
-  0x00, 0x03, 0xff, 0xc7, 0xff, 0xff, 0x80, 0x00, 
-  0x00, 0x03, 0xff, 0xc3, 0xff, 0xff, 0xc0, 0x00, 
-  0x00, 0x03, 0xff, 0xc1, 0xff, 0xff, 0xe0, 0x00, 
-  0x00, 0x03, 0xff, 0x80, 0xff, 0xff, 0xe0, 0x00, 
-  0x00, 0x01, 0xff, 0x80, 0x7f, 0xff, 0xf0, 0x00, 
-  0x00, 0x01, 0xff, 0x80, 0x1f, 0xff, 0xf8, 0x00, 
-  0x00, 0x01, 0xff, 0x80, 0x0f, 0xff, 0xf8, 0x00, 
-  0x00, 0x01, 0xff, 0x00, 0x07, 0xff, 0xf8, 0x00, 
-  0x00, 0x01, 0xff, 0x00, 0x03, 0xff, 0xfc, 0x00, 
-  0x00, 0x00, 0xff, 0x00, 0x01, 0xff, 0xfc, 0x00, 
-  0x00, 0x00, 0xfe, 0x00, 0x01, 0xff, 0xfc, 0x00, 
-  0x00, 0x00, 0xfe, 0x00, 0x00, 0xff, 0xfc, 0x00, 
-  0x00, 0x00, 0xfe, 0x00, 0x00, 0x7f, 0xfc, 0x00, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x7f, 0xfc, 0x00, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x3f, 0xfc, 0x00, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x3f, 0xfc, 0x00, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x3f, 0xfc, 0x00, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x1f, 0xfc, 0x00, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x1f, 0xfc, 0x00, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x1f, 0xfc, 0x00, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x1f, 0xfc, 0x00, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x1f, 0xfc, 0x00, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x1f, 0xfc, 0x00, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x1f, 0xfc, 0x00, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x1f, 0xfc, 0x00, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x1f, 0xfc, 0x00, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x1f, 0xfc, 0x00, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x1f, 0xfc, 0x00, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x1f, 0xfc, 0x00, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x1f, 0xfc, 0x00, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x1f, 0xfc, 0x00, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x1f, 0xfc, 0x00, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x1f, 0xfc, 0x00, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x1f, 0xfc, 0x00, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x1f, 0xfc, 0x00, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x1f, 0xfc, 0x00, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x1f, 0xfc, 0x00, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x1f, 0xfc, 0x00, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x1f, 0xfc, 0x00, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x1f, 0xfc, 0x00, 
-};
-
-const lv_img_dsc_t notification_slight_left = {
-      {
-        LV_IMG_CF_INDEXED_1BIT,
-        0,
-        0,
-        64,
-        64
-    },
-    520,
-notification_slight_left_map,
-};
diff --git a/src/displayapp/icons/navigation/notification-slight-left.png b/src/displayapp/icons/navigation/notification-slight-left.png
deleted file mode 100644
index 6db73071..00000000
--- a/src/displayapp/icons/navigation/notification-slight-left.png
+++ /dev/null
diff --git a/src/displayapp/icons/navigation/notification-slight-right-white.svg b/src/displayapp/icons/navigation/notification-slight-right-white.svg
deleted file mode 100644
index 46090067..00000000
--- a/src/displayapp/icons/navigation/notification-slight-right-white.svg
+++ /dev/null
@@ -1,4 +0,0 @@
-<svg id="WORKING_ICONS" data-name="WORKING ICONS" xmlns="http://www.w3.org/2000/svg" width="20" height="20" viewBox="0 0 20 20">
-  <title>direction</title>
-  <path fill="#ffffff" d="M7.35395,8.24854L9.81141,6.17468a0.3576,0.3576,0,0,0-.07019-0.6571L6.7923,4.16742a0.38658,0.38658,0,0,1,.20294-0.71777L15,3l-1.58044,7.86a0.38663,0.38663,0,0,1-.73938.09912L11.762,7.84851a0.35758,0.35758,0,0,0-.6405-0.16266L8.67328,9.75146a5.21819,5.21819,0,0,0-1.665,4.144l0.0047,3.60767A0.49614,0.49614,0,0,1,6.51679,18H5.51026a0.49621,0.49621,0,0,1-.49615-0.49622V14.043A7.25157,7.25157,0,0,1,7.35395,8.24854Z"/>
-</svg>
diff --git a/src/displayapp/icons/navigation/notification-slight-right.c b/src/displayapp/icons/navigation/notification-slight-right.c
deleted file mode 100644
index ed3221cc..00000000
--- a/src/displayapp/icons/navigation/notification-slight-right.c
+++ /dev/null
@@ -1,96 +0,0 @@
-#if defined(LV_LVGL_H_INCLUDE_SIMPLE)
-#include "lvgl.h"
-#else
-#include "lvgl/lvgl.h"
-#endif
-
-
-#ifndef LV_ATTRIBUTE_MEM_ALIGN
-#define LV_ATTRIBUTE_MEM_ALIGN
-#endif
-
-#ifndef LV_ATTRIBUTE_IMG_NOTIFICATION_SLIGHT_RIGHT
-#define LV_ATTRIBUTE_IMG_NOTIFICATION_SLIGHT_RIGHT
-#endif
-
-const LV_ATTRIBUTE_MEM_ALIGN LV_ATTRIBUTE_LARGE_CONST LV_ATTRIBUTE_IMG_NOTIFICATION_SLIGHT_RIGHT uint8_t notification_slight_right_map[] = {
-  0x04, 0x02, 0x04, 0xff, 	/*Color of index 0*/
-  0xfc, 0xfe, 0xfc, 0xff, 	/*Color of index 1*/
-
-  0x00, 0x00, 0x7f, 0xff, 0xff, 0xff, 0xfc, 0x00, 
-  0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xfc, 0x00, 
-  0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xfc, 0x00, 
-  0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xfc, 0x00, 
-  0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xfc, 0x00, 
-  0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xfc, 0x00, 
-  0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xfc, 0x00, 
-  0x00, 0x00, 0x3f, 0xff, 0xff, 0xff, 0xfc, 0x00, 
-  0x00, 0x00, 0x0f, 0xff, 0xff, 0xff, 0xfc, 0x00, 
-  0x00, 0x00, 0x03, 0xff, 0xff, 0xff, 0xfc, 0x00, 
-  0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xfc, 0x00, 
-  0x00, 0x00, 0x00, 0x1f, 0xff, 0xff, 0xfc, 0x00, 
-  0x00, 0x00, 0x00, 0x07, 0xff, 0xff, 0xfc, 0x00, 
-  0x00, 0x00, 0x00, 0x1f, 0xff, 0xff, 0xf8, 0x00, 
-  0x00, 0x00, 0x00, 0x1f, 0xff, 0xff, 0xf8, 0x00, 
-  0x00, 0x00, 0x00, 0x7f, 0xff, 0xff, 0xf8, 0x00, 
-  0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xf8, 0x00, 
-  0x00, 0x00, 0x01, 0xff, 0xff, 0xff, 0xf8, 0x00, 
-  0x00, 0x00, 0x03, 0xff, 0xff, 0xff, 0xf0, 0x00, 
-  0x00, 0x00, 0x0f, 0xff, 0xff, 0xff, 0xf0, 0x00, 
-  0x00, 0x00, 0x1f, 0xff, 0xff, 0xff, 0xf0, 0x00, 
-  0x00, 0x00, 0x3f, 0xff, 0xff, 0xff, 0xf0, 0x00, 
-  0x00, 0x00, 0x7f, 0xff, 0xff, 0xff, 0xf0, 0x00, 
-  0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xe0, 0x00, 
-  0x00, 0x00, 0xff, 0xff, 0xf1, 0xff, 0xe0, 0x00, 
-  0x00, 0x01, 0xff, 0xff, 0xe1, 0xff, 0xe0, 0x00, 
-  0x00, 0x03, 0xff, 0xff, 0xc1, 0xff, 0xe0, 0x00, 
-  0x00, 0x03, 0xff, 0xff, 0x80, 0xff, 0xe0, 0x00, 
-  0x00, 0x07, 0xff, 0xff, 0x00, 0xff, 0xc0, 0x00, 
-  0x00, 0x0f, 0xff, 0xfc, 0x00, 0xff, 0xc0, 0x00, 
-  0x00, 0x0f, 0xff, 0xf8, 0x00, 0xff, 0xc0, 0x00, 
-  0x00, 0x0f, 0xff, 0xf0, 0x00, 0x7f, 0xc0, 0x00, 
-  0x00, 0x1f, 0xff, 0xe0, 0x00, 0x7f, 0xc0, 0x00, 
-  0x00, 0x1f, 0xff, 0xc0, 0x00, 0x7f, 0x80, 0x00, 
-  0x00, 0x1f, 0xff, 0xc0, 0x00, 0x3f, 0x80, 0x00, 
-  0x00, 0x1f, 0xff, 0x80, 0x00, 0x3f, 0x80, 0x00, 
-  0x00, 0x1f, 0xff, 0x00, 0x00, 0x3f, 0x80, 0x00, 
-  0x00, 0x1f, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x00, 0x1f, 0xfe, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x00, 0x1f, 0xfe, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x00, 0x1f, 0xfe, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x00, 0x1f, 0xfc, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x00, 0x1f, 0xfc, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x00, 0x1f, 0xfc, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x00, 0x1f, 0xfc, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x00, 0x1f, 0xfc, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x00, 0x1f, 0xfc, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x00, 0x1f, 0xfc, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x00, 0x1f, 0xfc, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x00, 0x1f, 0xfc, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x00, 0x1f, 0xfc, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x00, 0x1f, 0xfc, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x00, 0x1f, 0xfc, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x00, 0x1f, 0xfc, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x00, 0x1f, 0xfc, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x00, 0x1f, 0xfc, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x00, 0x1f, 0xfc, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x00, 0x1f, 0xfc, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x00, 0x1f, 0xfc, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x00, 0x1f, 0xfc, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x00, 0x1f, 0xfc, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x00, 0x1f, 0xfc, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x00, 0x1f, 0xfc, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x00, 0x1f, 0xfc, 0x00, 0x00, 0x00, 0x00, 0x00, 
-};
-
-const lv_img_dsc_t notification_slight_right = {
-      {
-        LV_IMG_CF_INDEXED_1BIT,
-        0,
-        0,
-        64,
-        64
-    },
-    520,
-notification_slight_right_map,
-};
diff --git a/src/displayapp/icons/navigation/notification-slight-right.png b/src/displayapp/icons/navigation/notification-slight-right.png
deleted file mode 100644
index 68706ad4..00000000
--- a/src/displayapp/icons/navigation/notification-slight-right.png
+++ /dev/null
diff --git a/src/displayapp/icons/navigation/notification-straight-white.svg b/src/displayapp/icons/navigation/notification-straight-white.svg
deleted file mode 100644
index 08531119..00000000
--- a/src/displayapp/icons/navigation/notification-straight-white.svg
+++ /dev/null
@@ -1,4 +0,0 @@
-<svg id="WORKING_ICONS" data-name="WORKING ICONS" xmlns="http://www.w3.org/2000/svg" width="20" height="20" viewBox="0 0 20 20">
-  <title>direction</title>
-  <path fill="#ffffff" d="M14.50342,8.96637L11.55157,7.62262A0.35755,0.35755,0,0,0,11.00916,8v9.49652A0.50346,0.50346,0,0,1,10.50568,18h-0.993a0.50346,0.50346,0,0,1-.50348-0.50348V8a0.35756,0.35756,0,0,0-.54242-0.37738L5.51489,8.96637a0.38659,0.38659,0,0,1-.40942-0.62354L10.00916,2l4.90369,6.34283A0.3866,0.3866,0,0,1,14.50342,8.96637Z"/>
-</svg>
diff --git a/src/displayapp/icons/navigation/notification-straight.c b/src/displayapp/icons/navigation/notification-straight.c
deleted file mode 100644
index 6e33fc38..00000000
--- a/src/displayapp/icons/navigation/notification-straight.c
+++ /dev/null
@@ -1,96 +0,0 @@
-#if defined(LV_LVGL_H_INCLUDE_SIMPLE)
-#include "lvgl.h"
-#else
-#include "lvgl/lvgl.h"
-#endif
-
-
-#ifndef LV_ATTRIBUTE_MEM_ALIGN
-#define LV_ATTRIBUTE_MEM_ALIGN
-#endif
-
-#ifndef LV_ATTRIBUTE_IMG_NOTIFICATION_STRAIGHT
-#define LV_ATTRIBUTE_IMG_NOTIFICATION_STRAIGHT
-#endif
-
-const LV_ATTRIBUTE_MEM_ALIGN LV_ATTRIBUTE_LARGE_CONST LV_ATTRIBUTE_IMG_NOTIFICATION_STRAIGHT uint8_t notification_straight_map[] = {
-  0x04, 0x02, 0x04, 0xff, 	/*Color of index 0*/
-  0xfc, 0xfe, 0xfc, 0xff, 	/*Color of index 1*/
-
-  0x00, 0x00, 0x00, 0x0f, 0xf0, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x1f, 0xf8, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x1f, 0xf8, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x3f, 0xfc, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x7f, 0xfe, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0xff, 0xff, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x01, 0xff, 0xff, 0x80, 0x00, 0x00, 
-  0x00, 0x00, 0x01, 0xff, 0xff, 0x80, 0x00, 0x00, 
-  0x00, 0x00, 0x03, 0xff, 0xff, 0xc0, 0x00, 0x00, 
-  0x00, 0x00, 0x07, 0xff, 0xff, 0xe0, 0x00, 0x00, 
-  0x00, 0x00, 0x07, 0xff, 0xff, 0xf0, 0x00, 0x00, 
-  0x00, 0x00, 0x0f, 0xff, 0xff, 0xf0, 0x00, 0x00, 
-  0x00, 0x00, 0x1f, 0xff, 0xff, 0xf8, 0x00, 0x00, 
-  0x00, 0x00, 0x3f, 0xff, 0xff, 0xfc, 0x00, 0x00, 
-  0x00, 0x00, 0x7f, 0xff, 0xff, 0xfe, 0x00, 0x00, 
-  0x00, 0x00, 0x7f, 0xff, 0xff, 0xfe, 0x00, 0x00, 
-  0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 
-  0x00, 0x01, 0xff, 0xff, 0xff, 0xff, 0x80, 0x00, 
-  0x00, 0x03, 0xff, 0xff, 0xff, 0xff, 0xc0, 0x00, 
-  0x00, 0x03, 0xff, 0xff, 0xff, 0xff, 0xc0, 0x00, 
-  0x00, 0x07, 0xff, 0xff, 0xff, 0xff, 0xe0, 0x00, 
-  0x00, 0x0f, 0xff, 0xff, 0xff, 0xff, 0xf0, 0x00, 
-  0x00, 0x0f, 0xff, 0xff, 0xff, 0xff, 0xf0, 0x00, 
-  0x00, 0x0f, 0xff, 0xff, 0xff, 0xff, 0xf0, 0x00, 
-  0x00, 0x0f, 0xff, 0xff, 0xff, 0xff, 0xf0, 0x00, 
-  0x00, 0x0f, 0xff, 0xff, 0xff, 0xff, 0xf0, 0x00, 
-  0x00, 0x0f, 0xfe, 0x3f, 0xfc, 0x7f, 0xf0, 0x00, 
-  0x00, 0x0f, 0xf8, 0x3f, 0xfc, 0x1f, 0xf0, 0x00, 
-  0x00, 0x0f, 0xe0, 0x3f, 0xfc, 0x07, 0xf0, 0x00, 
-  0x00, 0x0f, 0x80, 0x3f, 0xfc, 0x01, 0xf0, 0x00, 
-  0x00, 0x00, 0x00, 0x3f, 0xfc, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x3f, 0xfc, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x3f, 0xfc, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x3f, 0xfc, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x3f, 0xfc, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x3f, 0xfc, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x3f, 0xfc, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x3f, 0xfc, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x3f, 0xfc, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x3f, 0xfc, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x3f, 0xfc, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x3f, 0xfc, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x3f, 0xfc, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x3f, 0xfc, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x3f, 0xfc, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x3f, 0xfc, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x3f, 0xfc, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x3f, 0xfc, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x3f, 0xfc, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x3f, 0xfc, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x3f, 0xfc, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x3f, 0xfc, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x3f, 0xfc, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x3f, 0xfc, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x3f, 0xfc, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x3f, 0xfc, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x3f, 0xfc, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x3f, 0xfc, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x3f, 0xfc, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x3f, 0xfc, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x3f, 0xfc, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x3f, 0xfc, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x3f, 0xfc, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x3f, 0xfc, 0x00, 0x00, 0x00, 
-};
-
-const lv_img_dsc_t notification_straight = {
-      {
-        LV_IMG_CF_INDEXED_1BIT,
-        0,
-        0,
-        64,
-        64
-    },
-    520,
-notification_straight_map,
-};
diff --git a/src/displayapp/icons/navigation/notification-straight.png b/src/displayapp/icons/navigation/notification-straight.png
deleted file mode 100644
index b6c9f7df..00000000
--- a/src/displayapp/icons/navigation/notification-straight.png
+++ /dev/null
diff --git a/src/displayapp/icons/navigation/notification_left.svg b/src/displayapp/icons/navigation/notification_left.svg
new file mode 100644
index 00000000..4927b806
--- /dev/null
+++ b/src/displayapp/icons/navigation/notification_left.svg
@@ -0,0 +1,58 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   inkscape:version="1.0 (4035a4fb49, 2020-05-01)"
+   sodipodi:docname="notification_left.svg"
+   version="1.1"
+   viewBox="0 0 20 20"
+   height="20"
+   width="20"
+   data-name="WORKING ICONS"
+   id="WORKING_ICONS">
+  <metadata
+     id="metadata11">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs9" />
+  <sodipodi:namedview
+     inkscape:current-layer="WORKING_ICONS"
+     inkscape:window-maximized="1"
+     inkscape:window-y="22"
+     inkscape:window-x="-8"
+     inkscape:cy="17.707376"
+     inkscape:cx="9.0185242"
+     inkscape:zoom="15.202796"
+     showgrid="false"
+     id="namedview7"
+     inkscape:window-height="1027"
+     inkscape:window-width="1920"
+     inkscape:pageshadow="2"
+     inkscape:pageopacity="0"
+     guidetolerance="10"
+     gridtolerance="10"
+     objecttolerance="10"
+     borderopacity="1"
+     bordercolor="#666666"
+     pagecolor="#ffffff" />
+  <title
+     id="title2">direction</title>
+  <path
+     style="stroke-width:1.24853"
+     id="path4"
+     d="m 11.243339,4.9925164 0.01373,0.00228 a 7.5663193,7.5663193 0 0 1 7.477437,7.5826126 v 4.925532 h -0.0039 l 0.0025,1.87675 a 0.61944488,0.61944488 0 0 1 -0.61952,0.620306 H 16.856998 A 0.61954476,0.61954476 0 0 1 16.237453,19.380458 V 12.577414 A 5.0663035,5.0663035 0 0 0 11.25736,7.491858 H 8.761827 A 0.44647376,0.44647376 0 0 0 8.2906573,8.1691592 L 9.9683672,11.854603 A 0.48266859,0.48266859 0 0 1 9.18986,12.365776 L 1.2654752,6.2661901 9.189885,0.12093333 a 0.48266859,0.48266859 0 0 1 0.7785072,0.5111725 L 8.2906573,4.3175744 A 0.4464363,0.4464363 0 0 0 8.761827,4.9948012 h 2.481512"
+     fill="#000000" />
+</svg>
diff --git a/src/displayapp/icons/navigation/notification_right.svg b/src/displayapp/icons/navigation/notification_right.svg
new file mode 100644
index 00000000..0283d307
--- /dev/null
+++ b/src/displayapp/icons/navigation/notification_right.svg
@@ -0,0 +1,58 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   inkscape:version="1.0 (4035a4fb49, 2020-05-01)"
+   sodipodi:docname="notification_right.svg"
+   version="1.1"
+   viewBox="0 0 20 20"
+   height="20"
+   width="20"
+   data-name="WORKING ICONS"
+   id="WORKING_ICONS">
+  <metadata
+     id="metadata11">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs9" />
+  <sodipodi:namedview
+     inkscape:current-layer="WORKING_ICONS"
+     inkscape:window-maximized="1"
+     inkscape:window-y="22"
+     inkscape:window-x="-8"
+     inkscape:cy="15.722397"
+     inkscape:cx="11.540154"
+     inkscape:zoom="21.5"
+     showgrid="false"
+     id="namedview7"
+     inkscape:window-height="1027"
+     inkscape:window-width="1920"
+     inkscape:pageshadow="2"
+     inkscape:pageopacity="0"
+     guidetolerance="10"
+     gridtolerance="10"
+     objecttolerance="10"
+     borderopacity="1"
+     bordercolor="#666666"
+     pagecolor="#ffffff" />
+  <title
+     id="title2">direction</title>
+  <path
+     style="stroke-width:1.24853"
+     id="path4"
+     d="M 8.7426433,7.4918486 A 5.0663062,5.0663062 0 0 0 3.7625481,12.577407 v 6.803048 A 0.61954509,0.61954509 0 0 1 3.143003,20 H 1.886396 A 0.6194452,0.6194452 0 0 1 1.2669383,19.379693 l 0.00243,-1.876751 h -0.00388 v -4.925535 a 7.5663233,7.5663233 0 0 1 7.477442,-7.5826165 l 0.01373,-0.00228 v 0.00228 h 2.4815137 a 0.44643653,0.44643653 0 0 0 0.47117,-0.6772271 L 10.031633,0.63210537 a 0.48266885,0.48266885 0 0 1 0.778495,-0.5111853 L 18.73453,6.2661801 10.810116,12.365794 A 0.48266885,0.48266885 0 0 1 10.031608,11.854621 L 11.709319,8.169163 A 0.44647399,0.44647399 0 0 0 11.238149,7.4918611 H 8.7426393 Z"
+     fill="#000000" />
+</svg>
diff --git a/src/displayapp/icons/navigation/notification_sharp_left.svg b/src/displayapp/icons/navigation/notification_sharp_left.svg
new file mode 100644
index 00000000..1604cd86
--- /dev/null
+++ b/src/displayapp/icons/navigation/notification_sharp_left.svg
@@ -0,0 +1,58 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   inkscape:version="1.0 (4035a4fb49, 2020-05-01)"
+   sodipodi:docname="notification_sharp_left.svg"
+   version="1.1"
+   viewBox="0 0 20 20"
+   height="20"
+   width="20"
+   data-name="WORKING ICONS"
+   id="WORKING_ICONS">
+  <metadata
+     id="metadata11">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs9" />
+  <sodipodi:namedview
+     inkscape:current-layer="WORKING_ICONS"
+     inkscape:window-maximized="1"
+     inkscape:window-y="22"
+     inkscape:window-x="-8"
+     inkscape:cy="10.518433"
+     inkscape:cx="11.553777"
+     inkscape:zoom="21.5"
+     showgrid="false"
+     id="namedview7"
+     inkscape:window-height="1027"
+     inkscape:window-width="1920"
+     inkscape:pageshadow="2"
+     inkscape:pageopacity="0"
+     guidetolerance="10"
+     gridtolerance="10"
+     objecttolerance="10"
+     borderopacity="1"
+     bordercolor="#666666"
+     pagecolor="#ffffff" />
+  <title
+     id="title2">direction</title>
+  <path
+     style="stroke-width:1.33235"
+     id="path4"
+     d="m 17.980101,19.999959 a 0.66322994,0.66322994 0 0 1 -0.66323,-0.66323 V 2.6846325 l -0.372764,-0.00843 A 3.4209123,3.4209123 0 0 0 14.151903,3.7287543 L 6.9635218,9.8746527 a 0.46522958,0.46522958 0 0 0 0.1099455,0.8417383 l 3.9021427,1.856375 a 0.51505943,0.51505943 0 0 1 -0.284376,0.952257 L 0.0184535,13.967483 2.2776908,3.5271966 A 0.5150994,0.5150994 0 0 1 3.2645883,3.4096834 l 1.1624744,4.1618853 a 0.47640798,0.47640798 0 0 0 0.8500385,0.229243 l 0.00504,0.006 7.1841578,-6.1409158 a 5.950723,5.950723 0 0 1 4.509695,-1.65372468 l 0.351953,0.00266 a 2.5705673,2.5705673 0 0 1 1.910695,0.7579066 2.8012235,2.8012235 0 0 1 0.742292,1.94582888 l 6.12e-4,16.6181743 a 0.66322994,0.66322994 0 0 1 -0.66323,0.663257 z"
+     fill="#000000" />
+</svg>
diff --git a/src/displayapp/icons/navigation/notification_slight_left.svg b/src/displayapp/icons/navigation/notification_slight_left.svg
new file mode 100644
index 00000000..2f4aa721
--- /dev/null
+++ b/src/displayapp/icons/navigation/notification_slight_left.svg
@@ -0,0 +1,58 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   inkscape:version="1.0 (4035a4fb49, 2020-05-01)"
+   sodipodi:docname="notification_slight_left.svg"
+   version="1.1"
+   viewBox="0 0 20 20"
+   height="20"
+   width="20"
+   data-name="WORKING ICONS"
+   id="WORKING_ICONS">
+  <metadata
+     id="metadata11">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs9" />
+  <sodipodi:namedview
+     inkscape:current-layer="WORKING_ICONS"
+     inkscape:window-maximized="1"
+     inkscape:window-y="22"
+     inkscape:window-x="-8"
+     inkscape:cy="17.495453"
+     inkscape:cx="15.74227"
+     inkscape:zoom="15.202796"
+     showgrid="false"
+     id="namedview7"
+     inkscape:window-height="1027"
+     inkscape:window-width="1920"
+     inkscape:pageshadow="2"
+     inkscape:pageopacity="0"
+     guidetolerance="10"
+     gridtolerance="10"
+     objecttolerance="10"
+     borderopacity="1"
+     bordercolor="#666666"
+     pagecolor="#ffffff" />
+  <title
+     id="title2">direction</title>
+  <path
+     style="stroke-width:1.33333"
+     id="path4"
+     d="m 16.648074,14.724 v 4.614427 A 0.66161333,0.66161333 0 0 1 15.986528,20 h -1.34204 a 0.66152,0.66152 0 0 1 -0.661534,-0.66244 l 0.0063,-4.810227 A 6.9575867,6.9575867 0 0 0 11.769221,9.002 L 8.5049277,6.2478 A 0.47677333,0.47677333 0 0 0 7.6509274,6.46468 l -1.22428,4.147467 A 0.51550667,0.51550667 0 0 1 5.440794,10.48 L 3.3335407,0 14.006554,0.5995333 A 0.51544,0.51544 0 0 1 14.277141,1.55656 l -3.931893,1.8002133 a 0.4768,0.4768 0 0 0 -0.09359,0.8761334 L 13.528274,6.99804 a 9.6687733,9.6687733 0 0 1 3.1198,7.72596 z"
+     fill="#000000" />
+</svg>
diff --git a/src/displayapp/icons/navigation/notification_slight_right.svg b/src/displayapp/icons/navigation/notification_slight_right.svg
new file mode 100644
index 00000000..a5d52e50
--- /dev/null
+++ b/src/displayapp/icons/navigation/notification_slight_right.svg
@@ -0,0 +1,58 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   inkscape:version="1.0 (4035a4fb49, 2020-05-01)"
+   sodipodi:docname="notification_slight_right.svg"
+   version="1.1"
+   viewBox="0 0 20 20"
+   height="20"
+   width="20"
+   data-name="WORKING ICONS"
+   id="WORKING_ICONS">
+  <metadata
+     id="metadata11">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs9" />
+  <sodipodi:namedview
+     inkscape:current-layer="WORKING_ICONS"
+     inkscape:window-maximized="1"
+     inkscape:window-y="22"
+     inkscape:window-x="-8"
+     inkscape:cy="6.9507466"
+     inkscape:cx="-1.1685259"
+     inkscape:zoom="10.75"
+     showgrid="false"
+     id="namedview7"
+     inkscape:window-height="1027"
+     inkscape:window-width="1920"
+     inkscape:pageshadow="2"
+     inkscape:pageopacity="0"
+     guidetolerance="10"
+     gridtolerance="10"
+     objecttolerance="10"
+     borderopacity="1"
+     bordercolor="#666666"
+     pagecolor="#ffffff" />
+  <title
+     id="title2">direction</title>
+  <path
+     style="stroke-width:1.33333"
+     id="path4"
+     d="M 6.4717198,6.9980533 9.7483327,4.2329067 A 0.4768,0.4768 0 0 0 9.6547467,3.3567733 L 5.7228532,1.55656 A 0.51544,0.51544 0 0 1 5.9934398,0.5995333 L 16.666453,0 14.5592,10.48 a 0.51550667,0.51550667 0 0 1 -0.98584,0.13216 L 12.34912,6.46468 A 0.47677333,0.47677333 0 0 0 11.49512,6.2478 L 8.2308265,9.001947 a 6.9575867,6.9575867 0 0 0 -2.22,5.525333 l 0.00627,4.810227 A 0.66152,0.66152 0 0 1 5.3555065,20 h -1.34204 A 0.66161333,0.66161333 0 0 1 3.3519332,19.338373 V 14.724 A 9.66876,9.66876 0 0 1 6.4717198,6.9980533 Z"
+     fill="#000000" />
+</svg>
diff --git a/src/displayapp/icons/navigation/notification_straight.svg b/src/displayapp/icons/navigation/notification_straight.svg
new file mode 100644
index 00000000..1580df4d
--- /dev/null
+++ b/src/displayapp/icons/navigation/notification_straight.svg
@@ -0,0 +1,58 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   inkscape:version="1.0 (4035a4fb49, 2020-05-01)"
+   sodipodi:docname="notification_straight.svg"
+   version="1.1"
+   viewBox="0 0 20 20"
+   height="20"
+   width="20"
+   data-name="WORKING ICONS"
+   id="WORKING_ICONS">
+  <metadata
+     id="metadata11">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs9" />
+  <sodipodi:namedview
+     inkscape:current-layer="WORKING_ICONS"
+     inkscape:window-maximized="1"
+     inkscape:window-y="22"
+     inkscape:window-x="-8"
+     inkscape:cy="14.074021"
+     inkscape:cx="11.444793"
+     inkscape:zoom="21.5"
+     showgrid="false"
+     id="namedview7"
+     inkscape:window-height="1027"
+     inkscape:window-width="1920"
+     inkscape:pageshadow="2"
+     inkscape:pageopacity="0"
+     guidetolerance="10"
+     gridtolerance="10"
+     objecttolerance="10"
+     borderopacity="1"
+     bordercolor="#666666"
+     pagecolor="#ffffff" />
+  <title
+     id="title2">direction</title>
+  <path
+     style="stroke-width:1.25"
+     id="path4"
+     d="M 15.617836,8.707962 11.928024,7.028275 A 0.4469375,0.4469375 0 0 0 11.250011,7.5 V 19.37065 A 0.629325,0.629325 0 0 1 10.620661,20 H 9.3794106 a 0.629325,0.629325 0 0 1 -0.62935,-0.62935 V 7.5 A 0.44695,0.44695 0 0 0 8.0720358,7.028275 L 4.3821733,8.707962 A 0.4832375,0.4832375 0 0 1 3.8703983,7.9285375 L 10.000011,0 16.129624,7.9285375 A 0.48325,0.48325 0 0 1 15.617836,8.707962 Z"
+     fill="#000000" />
+</svg>
diff --git a/src/displayapp/icons/navigation/off-ramp-left-white.svg b/src/displayapp/icons/navigation/off-ramp-left-white.svg
deleted file mode 100644
index 486a1808..00000000
--- a/src/displayapp/icons/navigation/off-ramp-left-white.svg
+++ /dev/null
@@ -1,4 +0,0 @@
-<svg id="WORKING_ICONS" data-name="WORKING ICONS" xmlns="http://www.w3.org/2000/svg" width="20" height="20" viewBox="0 0 20 20">
-  <title>direction</title>
-  <path fill="#ffffff" d="M14.5029,2.2A0.29744,0.29744,0,0,1,14.8,2.49712V17.50288A0.29744,0.29744,0,0,1,14.5029,17.8H13.4971A0.29744,0.29744,0,0,1,13.2,17.50288V2.49712A0.29744,0.29744,0,0,1,13.4971,2.2h1.0058m0-.2H13.4971A0.49711,0.49711,0,0,0,13,2.49712V17.50288A0.49711,0.49711,0,0,0,13.4971,18h1.0058A0.49711,0.49711,0,0,0,15,17.50288V2.49712A0.49711,0.49711,0,0,0,14.5029,2h0ZM9.00078,5.98169H7.01323a0.35757,0.35757,0,0,1-.37738-0.54242L7.9796,2.48743A0.38659,0.38659,0,0,0,7.35606,2.078L1.00908,7l6.347,4.88544A0.38659,0.38659,0,0,0,7.9796,11.476L6.63585,8.52417a0.3576,0.3576,0,0,1,.37738-0.54248H9.012a4.05782,4.05782,0,0,1,3.98877,4.07324v5.44885A0.49622,0.49622,0,0,0,13.497,18h1.00647a0.49614,0.49614,0,0,0,.49615-0.49683L14.99766,16h0.00311V12.05493a6.06019,6.06019,0,0,0-5.989-6.07324l-0.011-.00183"/>
-</svg>
diff --git a/src/displayapp/icons/navigation/off-ramp-left.c b/src/displayapp/icons/navigation/off-ramp-left.c
deleted file mode 100644
index d1db227d..00000000
--- a/src/displayapp/icons/navigation/off-ramp-left.c
+++ /dev/null
@@ -1,96 +0,0 @@
-#if defined(LV_LVGL_H_INCLUDE_SIMPLE)
-#include "lvgl.h"
-#else
-#include "lvgl/lvgl.h"
-#endif
-
-
-#ifndef LV_ATTRIBUTE_MEM_ALIGN
-#define LV_ATTRIBUTE_MEM_ALIGN
-#endif
-
-#ifndef LV_ATTRIBUTE_IMG_OFF_RAMP_LEFT
-#define LV_ATTRIBUTE_IMG_OFF_RAMP_LEFT
-#endif
-
-const LV_ATTRIBUTE_MEM_ALIGN LV_ATTRIBUTE_LARGE_CONST LV_ATTRIBUTE_IMG_OFF_RAMP_LEFT uint8_t off_ramp_left_map[] = {
-  0x04, 0x02, 0x04, 0xff, 	/*Color of index 0*/
-  0xfc, 0xfe, 0xfc, 0xff, 	/*Color of index 1*/
-
-  0x00, 0x00, 0x00, 0x7f, 0xc0, 0x00, 0x3f, 0xf0, 
-  0x00, 0x00, 0x00, 0xff, 0xc0, 0x00, 0x3f, 0xf0, 
-  0x00, 0x00, 0x01, 0xff, 0xc0, 0x00, 0x3f, 0xf0, 
-  0x00, 0x00, 0x07, 0xff, 0xc0, 0x00, 0x3e, 0x70, 
-  0x00, 0x00, 0x0f, 0xff, 0xc0, 0x00, 0x3e, 0x70, 
-  0x00, 0x00, 0x3f, 0xff, 0x80, 0x00, 0x3e, 0x70, 
-  0x00, 0x00, 0x7f, 0xff, 0x80, 0x00, 0x3e, 0x70, 
-  0x00, 0x00, 0xff, 0xff, 0x80, 0x00, 0x3e, 0x70, 
-  0x00, 0x01, 0xff, 0xff, 0x00, 0x00, 0x3e, 0x70, 
-  0x00, 0x03, 0xff, 0xff, 0x00, 0x00, 0x3e, 0x70, 
-  0x00, 0x0f, 0xff, 0xfe, 0x00, 0x00, 0x3e, 0x70, 
-  0x00, 0x1f, 0xff, 0xfe, 0x00, 0x00, 0x3e, 0x70, 
-  0x00, 0x7f, 0xff, 0xfc, 0x00, 0x00, 0x3e, 0x70, 
-  0x00, 0xff, 0xff, 0xfc, 0x00, 0x00, 0x3e, 0x70, 
-  0x01, 0xff, 0xff, 0xff, 0xff, 0xc0, 0x3e, 0x70, 
-  0x03, 0xff, 0xff, 0xff, 0xff, 0xfc, 0x3e, 0x70, 
-  0x0f, 0xff, 0xff, 0xff, 0xff, 0xff, 0x3e, 0x70, 
-  0x0f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfe, 0x70, 
-  0x0f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfe, 0x70, 
-  0x0f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfe, 0x70, 
-  0x0f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfe, 0x70, 
-  0x0f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfe, 0x70, 
-  0x0f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x70, 
-  0x0f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xf0, 
-  0x07, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xf0, 
-  0x01, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xf0, 
-  0x00, 0xff, 0xff, 0xfc, 0x07, 0xff, 0xff, 0xf0, 
-  0x00, 0x7f, 0xff, 0xfc, 0x00, 0xff, 0xff, 0xf0, 
-  0x00, 0x3f, 0xff, 0xfe, 0x00, 0x3f, 0xff, 0xf0, 
-  0x00, 0x1f, 0xff, 0xfe, 0x00, 0x0f, 0xff, 0xf0, 
-  0x00, 0x07, 0xff, 0xfe, 0x00, 0x07, 0xff, 0xf0, 
-  0x00, 0x01, 0xff, 0xff, 0x00, 0x03, 0xff, 0xf0, 
-  0x00, 0x00, 0xff, 0xff, 0x00, 0x01, 0xff, 0xf0, 
-  0x00, 0x00, 0x7f, 0xff, 0x80, 0x01, 0xff, 0xf0, 
-  0x00, 0x00, 0x3f, 0xff, 0x80, 0x00, 0xff, 0xf0, 
-  0x00, 0x00, 0x1f, 0xff, 0xc0, 0x00, 0xff, 0xf0, 
-  0x00, 0x00, 0x07, 0xff, 0xc0, 0x00, 0x7f, 0xf0, 
-  0x00, 0x00, 0x03, 0xff, 0xc0, 0x00, 0x7f, 0xf0, 
-  0x00, 0x00, 0x01, 0xff, 0xc0, 0x00, 0x3f, 0xf0, 
-  0x00, 0x00, 0x00, 0x7f, 0xc0, 0x00, 0x3f, 0xf0, 
-  0x00, 0x00, 0x00, 0x3f, 0xc0, 0x00, 0x3f, 0xf0, 
-  0x00, 0x00, 0x00, 0x1f, 0xc0, 0x00, 0x3f, 0xf0, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3f, 0xf0, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3f, 0xf0, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3f, 0xf0, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3f, 0xf0, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3f, 0xf0, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3f, 0xf0, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3f, 0xf0, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3f, 0xf0, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3f, 0xf0, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3f, 0xf0, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3f, 0xf0, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3f, 0xf0, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3f, 0xf0, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3f, 0xf0, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3f, 0xf0, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3f, 0xf0, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3f, 0xf0, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3f, 0xf0, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3f, 0xf0, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3f, 0xf0, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3f, 0xf0, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3f, 0xf0, 
-};
-
-const lv_img_dsc_t off_ramp_left = {
-      {
-        LV_IMG_CF_INDEXED_1BIT,
-        0,
-        0,
-        64,
-        64
-    },
-    520,
-off_ramp_left_map,
-};
diff --git a/src/displayapp/icons/navigation/off-ramp-left.png b/src/displayapp/icons/navigation/off-ramp-left.png
deleted file mode 100644
index 33060b7e..00000000
--- a/src/displayapp/icons/navigation/off-ramp-left.png
+++ /dev/null
diff --git a/src/displayapp/icons/navigation/off-ramp-right-white.svg b/src/displayapp/icons/navigation/off-ramp-right-white.svg
deleted file mode 100644
index 177dda42..00000000
--- a/src/displayapp/icons/navigation/off-ramp-right-white.svg
+++ /dev/null
@@ -1,4 +0,0 @@
-<svg id="WORKING_ICONS" data-name="WORKING ICONS" xmlns="http://www.w3.org/2000/svg" width="20" height="20" viewBox="0 0 20 20">
-  <title>direction</title>
-  <path fill="#ffffff" d="M6.5029,2.2A0.29744,0.29744,0,0,1,6.8,2.49712V17.50288A0.29744,0.29744,0,0,1,6.5029,17.8H5.4971A0.29744,0.29744,0,0,1,5.2,17.50288V2.49712A0.29744,0.29744,0,0,1,5.4971,2.2H6.5029m0-.2H5.4971A0.49711,0.49711,0,0,0,5,2.49712V17.50288A0.49711,0.49711,0,0,0,5.4971,18H6.5029A0.49711,0.49711,0,0,0,7,17.50288V2.49712A0.49711,0.49711,0,0,0,6.5029,2h0Zm4.5054,5.98169h1.98755a0.3576,0.3576,0,0,1,.37738.54248L12.02948,11.476a0.38659,0.38659,0,0,0,.62354.40942L19,7,12.653,2.078a0.38659,0.38659,0,0,0-.62354.40942l1.34375,2.95184a0.35757,0.35757,0,0,1-.37738.54242H11.0083V5.97986l-0.011.00183a6.06019,6.06019,0,0,0-5.989,6.07324V16H5.01141l-0.002,1.50317A0.49614,0.49614,0,0,0,5.50562,18H6.51208a0.49622,0.49622,0,0,0,.49622-0.49622V12.05493a4.05782,4.05782,0,0,1,3.98877-4.07324H11.0083Z"/>
-</svg>
diff --git a/src/displayapp/icons/navigation/off-ramp-right.c b/src/displayapp/icons/navigation/off-ramp-right.c
deleted file mode 100644
index 5b8bbd46..00000000
--- a/src/displayapp/icons/navigation/off-ramp-right.c
+++ /dev/null
@@ -1,96 +0,0 @@
-#if defined(LV_LVGL_H_INCLUDE_SIMPLE)
-#include "lvgl.h"
-#else
-#include "lvgl/lvgl.h"
-#endif
-
-
-#ifndef LV_ATTRIBUTE_MEM_ALIGN
-#define LV_ATTRIBUTE_MEM_ALIGN
-#endif
-
-#ifndef LV_ATTRIBUTE_IMG_OFF_RAMP_RIGHT
-#define LV_ATTRIBUTE_IMG_OFF_RAMP_RIGHT
-#endif
-
-const LV_ATTRIBUTE_MEM_ALIGN LV_ATTRIBUTE_LARGE_CONST LV_ATTRIBUTE_IMG_OFF_RAMP_RIGHT uint8_t off_ramp_right_map[] = {
-  0x04, 0x02, 0x04, 0xff, 	/*Color of index 0*/
-  0xfc, 0xfe, 0xfc, 0xff, 	/*Color of index 1*/
-
-  0x0f, 0xfc, 0x00, 0x03, 0xfe, 0x00, 0x00, 0x00, 
-  0x0f, 0xfc, 0x00, 0x03, 0xff, 0x00, 0x00, 0x00, 
-  0x0f, 0xfc, 0x00, 0x03, 0xff, 0x80, 0x00, 0x00, 
-  0x0e, 0x7c, 0x00, 0x03, 0xff, 0xe0, 0x00, 0x00, 
-  0x0e, 0x7c, 0x00, 0x03, 0xff, 0xf0, 0x00, 0x00, 
-  0x0e, 0x7c, 0x00, 0x01, 0xff, 0xfc, 0x00, 0x00, 
-  0x0e, 0x7c, 0x00, 0x01, 0xff, 0xfe, 0x00, 0x00, 
-  0x0e, 0x7c, 0x00, 0x01, 0xff, 0xff, 0x00, 0x00, 
-  0x0e, 0x7c, 0x00, 0x00, 0xff, 0xff, 0x80, 0x00, 
-  0x0e, 0x7c, 0x00, 0x00, 0x7f, 0xff, 0xc0, 0x00, 
-  0x0e, 0x7c, 0x00, 0x00, 0x7f, 0xff, 0xf0, 0x00, 
-  0x0e, 0x7c, 0x00, 0x00, 0x7f, 0xff, 0xf8, 0x00, 
-  0x0e, 0x7c, 0x00, 0x00, 0x3f, 0xff, 0xfe, 0x00, 
-  0x0e, 0x7c, 0x00, 0x00, 0x3f, 0xff, 0xff, 0x00, 
-  0x0e, 0x7c, 0x03, 0xff, 0xff, 0xff, 0xff, 0x80, 
-  0x0e, 0x7c, 0x3f, 0xff, 0xff, 0xff, 0xff, 0xc0, 
-  0x0e, 0x7c, 0xff, 0xff, 0xff, 0xff, 0xff, 0xf0, 
-  0x0e, 0x7f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xf0, 
-  0x0e, 0x7f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xf0, 
-  0x0e, 0x7f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xf0, 
-  0x0e, 0x7f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xf0, 
-  0x0e, 0x7f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xf0, 
-  0x0e, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xf0, 
-  0x0f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xf0, 
-  0x0f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xe0, 
-  0x0f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x80, 
-  0x0f, 0xff, 0xff, 0xe0, 0x3f, 0xff, 0xff, 0x00, 
-  0x0f, 0xff, 0xff, 0x00, 0x3f, 0xff, 0xfe, 0x00, 
-  0x0f, 0xff, 0xfc, 0x00, 0x3f, 0xff, 0xfc, 0x00, 
-  0x0f, 0xff, 0xf0, 0x00, 0x7f, 0xff, 0xf8, 0x00, 
-  0x0f, 0xff, 0xe0, 0x00, 0x7f, 0xff, 0xe0, 0x00, 
-  0x0f, 0xff, 0xc0, 0x00, 0xff, 0xff, 0xc0, 0x00, 
-  0x0f, 0xff, 0x80, 0x00, 0xff, 0xff, 0x00, 0x00, 
-  0x0f, 0xff, 0x80, 0x01, 0xff, 0xfe, 0x00, 0x00, 
-  0x0f, 0xff, 0x00, 0x01, 0xff, 0xfc, 0x00, 0x00, 
-  0x0f, 0xff, 0x00, 0x03, 0xff, 0xf8, 0x00, 0x00, 
-  0x0f, 0xfe, 0x00, 0x03, 0xff, 0xe0, 0x00, 0x00, 
-  0x0f, 0xfe, 0x00, 0x03, 0xff, 0xc0, 0x00, 0x00, 
-  0x0f, 0xfc, 0x00, 0x03, 0xff, 0x80, 0x00, 0x00, 
-  0x0f, 0xfc, 0x00, 0x03, 0xfe, 0x00, 0x00, 0x00, 
-  0x0f, 0xfc, 0x00, 0x03, 0xfc, 0x00, 0x00, 0x00, 
-  0x0f, 0xfc, 0x00, 0x03, 0xf8, 0x00, 0x00, 0x00, 
-  0x0f, 0xfc, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x0f, 0xfc, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x0f, 0xfc, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x0f, 0xfc, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x0f, 0xfc, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x0f, 0xfc, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x0f, 0xfc, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x0f, 0xfc, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x0f, 0xfc, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x0f, 0xfc, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x0f, 0xfc, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x0f, 0xfc, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x0f, 0xfc, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x0f, 0xfc, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x0f, 0xfc, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x0f, 0xfc, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x0f, 0xfc, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x0f, 0xfc, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x0f, 0xfc, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x0f, 0xfc, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x0f, 0xfc, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x0f, 0xfc, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-};
-
-const lv_img_dsc_t off_ramp_right = {
-      {
-        LV_IMG_CF_INDEXED_1BIT,
-        0,
-        0,
-        64,
-        64
-    },
-    520,
-off_ramp_right_map,
-};
diff --git a/src/displayapp/icons/navigation/off-ramp-right.png b/src/displayapp/icons/navigation/off-ramp-right.png
deleted file mode 100644
index fd55170e..00000000
--- a/src/displayapp/icons/navigation/off-ramp-right.png
+++ /dev/null
diff --git a/src/displayapp/icons/navigation/off-ramp-slight-left-white.svg b/src/displayapp/icons/navigation/off-ramp-slight-left-white.svg
deleted file mode 100644
index 4bdb72d5..00000000
--- a/src/displayapp/icons/navigation/off-ramp-slight-left-white.svg
+++ /dev/null
@@ -1,4 +0,0 @@
-<svg id="WORKING_ICONS" data-name="WORKING ICONS" xmlns="http://www.w3.org/2000/svg" width="20" height="20" viewBox="0 0 20 20">
-  <title>direction</title>
-  <path fill="#ffffff" d="M14.5029,2.2A0.29744,0.29744,0,0,1,14.8,2.49712V17.50288A0.29744,0.29744,0,0,1,14.5029,17.8H13.4971A0.29744,0.29744,0,0,1,13.2,17.50288V2.49712A0.29744,0.29744,0,0,1,13.4971,2.2h1.0058m0-.2H13.4971A0.49711,0.49711,0,0,0,13,2.49712V17.50288A0.49711,0.49711,0,0,0,13.4971,18h1.0058A0.49711,0.49711,0,0,0,15,17.50288V2.49712A0.49711,0.49711,0,0,0,14.5029,2h0ZM12.64606,8.24854L10.1886,6.17468a0.3576,0.3576,0,0,1,.07019-0.6571L13.2077,4.16742a0.38658,0.38658,0,0,0-.20294-0.71777L5,3l1.58044,7.86a0.38663,0.38663,0,0,0,.73938.09912L8.238,7.84851a0.35758,0.35758,0,0,1,.6405-0.16266l2.44818,2.06561a5.21819,5.21819,0,0,1,1.665,4.144l-0.0047,3.60767A0.49614,0.49614,0,0,0,13.48322,18h1.00653a0.49621,0.49621,0,0,0,.49615-0.49622V14.043A7.25157,7.25157,0,0,0,12.64606,8.24854Z"/>
-</svg>
diff --git a/src/displayapp/icons/navigation/off-ramp-slight-left.c b/src/displayapp/icons/navigation/off-ramp-slight-left.c
deleted file mode 100644
index 9eed9891..00000000
--- a/src/displayapp/icons/navigation/off-ramp-slight-left.c
+++ /dev/null
@@ -1,96 +0,0 @@
-#if defined(LV_LVGL_H_INCLUDE_SIMPLE)
-#include "lvgl.h"
-#else
-#include "lvgl/lvgl.h"
-#endif
-
-
-#ifndef LV_ATTRIBUTE_MEM_ALIGN
-#define LV_ATTRIBUTE_MEM_ALIGN
-#endif
-
-#ifndef LV_ATTRIBUTE_IMG_OFF_RAMP_SLIGHT_LEFT
-#define LV_ATTRIBUTE_IMG_OFF_RAMP_SLIGHT_LEFT
-#endif
-
-const LV_ATTRIBUTE_MEM_ALIGN LV_ATTRIBUTE_LARGE_CONST LV_ATTRIBUTE_IMG_OFF_RAMP_SLIGHT_LEFT uint8_t off_ramp_slight_left_map[] = {
-  0x04, 0x02, 0x04, 0xff, 	/*Color of index 0*/
-  0xfc, 0xfe, 0xfc, 0xff, 	/*Color of index 1*/
-
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x3f, 0xf0, 0x00, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x3f, 0xf0, 0x00, 
-  0x00, 0x0f, 0xfe, 0x00, 0x00, 0x3f, 0xf0, 0x00, 
-  0x00, 0x0f, 0xff, 0xff, 0xff, 0x3e, 0x70, 0x00, 
-  0x00, 0x0f, 0xff, 0xff, 0xff, 0xfe, 0x70, 0x00, 
-  0x00, 0x0f, 0xff, 0xff, 0xff, 0xfe, 0x70, 0x00, 
-  0x00, 0x0f, 0xff, 0xff, 0xff, 0xfe, 0x70, 0x00, 
-  0x00, 0x0f, 0xff, 0xff, 0xff, 0xfe, 0x70, 0x00, 
-  0x00, 0x0f, 0xff, 0xff, 0xff, 0xfe, 0x70, 0x00, 
-  0x00, 0x0f, 0xff, 0xff, 0xff, 0xfe, 0x70, 0x00, 
-  0x00, 0x0f, 0xff, 0xff, 0xff, 0xfe, 0x70, 0x00, 
-  0x00, 0x0f, 0xff, 0xff, 0xff, 0xfe, 0x70, 0x00, 
-  0x00, 0x0f, 0xff, 0xff, 0xff, 0xfe, 0x70, 0x00, 
-  0x00, 0x0f, 0xff, 0xff, 0xff, 0xbe, 0x70, 0x00, 
-  0x00, 0x0f, 0xff, 0xff, 0xfe, 0x3e, 0x70, 0x00, 
-  0x00, 0x0f, 0xff, 0xff, 0xf0, 0x3e, 0x70, 0x00, 
-  0x00, 0x0f, 0xff, 0xff, 0xf8, 0x3e, 0x70, 0x00, 
-  0x00, 0x0f, 0xff, 0xff, 0xfc, 0x3e, 0x70, 0x00, 
-  0x00, 0x07, 0xff, 0xff, 0xfe, 0x3e, 0x70, 0x00, 
-  0x00, 0x07, 0xff, 0xff, 0xff, 0x3e, 0x70, 0x00, 
-  0x00, 0x07, 0xff, 0xff, 0xff, 0xbe, 0x70, 0x00, 
-  0x00, 0x07, 0xff, 0xff, 0xff, 0xfe, 0x70, 0x00, 
-  0x00, 0x07, 0xff, 0xff, 0xff, 0xfe, 0x70, 0x00, 
-  0x00, 0x03, 0xff, 0xff, 0xff, 0xfe, 0x70, 0x00, 
-  0x00, 0x03, 0xff, 0xff, 0xff, 0xfe, 0x70, 0x00, 
-  0x00, 0x03, 0xff, 0xff, 0xff, 0xfe, 0x70, 0x00, 
-  0x00, 0x03, 0xff, 0xef, 0xff, 0xff, 0x70, 0x00, 
-  0x00, 0x01, 0xff, 0xc7, 0xff, 0xff, 0x70, 0x00, 
-  0x00, 0x01, 0xff, 0xc3, 0xff, 0xff, 0xf0, 0x00, 
-  0x00, 0x01, 0xff, 0xc1, 0xff, 0xff, 0xf0, 0x00, 
-  0x00, 0x01, 0xff, 0xc0, 0xff, 0xff, 0xf0, 0x00, 
-  0x00, 0x01, 0xff, 0x80, 0x7f, 0xff, 0xf0, 0x00, 
-  0x00, 0x00, 0xff, 0x80, 0x1f, 0xff, 0xf0, 0x00, 
-  0x00, 0x00, 0xff, 0x80, 0x0f, 0xff, 0xf0, 0x00, 
-  0x00, 0x00, 0xff, 0x00, 0x07, 0xff, 0xf0, 0x00, 
-  0x00, 0x00, 0xff, 0x00, 0x03, 0xff, 0xf0, 0x00, 
-  0x00, 0x00, 0xff, 0x00, 0x03, 0xff, 0xf0, 0x00, 
-  0x00, 0x00, 0x7e, 0x00, 0x01, 0xff, 0xf0, 0x00, 
-  0x00, 0x00, 0x7e, 0x00, 0x01, 0xff, 0xf0, 0x00, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xf0, 0x00, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xf0, 0x00, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x7f, 0xf0, 0x00, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x7f, 0xf0, 0x00, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x7f, 0xf0, 0x00, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x3f, 0xf0, 0x00, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x3f, 0xf0, 0x00, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x3f, 0xf0, 0x00, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x3f, 0xf0, 0x00, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x3f, 0xf0, 0x00, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x3f, 0xf0, 0x00, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x3f, 0xf0, 0x00, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x3f, 0xf0, 0x00, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x3f, 0xf0, 0x00, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x3f, 0xf0, 0x00, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x3f, 0xf0, 0x00, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x3f, 0xf0, 0x00, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x3f, 0xf0, 0x00, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x3f, 0xf0, 0x00, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x3f, 0xf0, 0x00, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x3f, 0xf0, 0x00, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x3f, 0xf0, 0x00, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x3f, 0xf0, 0x00, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x3f, 0xf0, 0x00, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x3f, 0xf0, 0x00, 
-};
-
-const lv_img_dsc_t off_ramp_slight_left = {
-      {
-        LV_IMG_CF_INDEXED_1BIT,
-        0,
-        0,
-        64,
-        64
-    },
-    520,
-off_ramp_slight_left_map,
-};
diff --git a/src/displayapp/icons/navigation/off-ramp-slight-left.png b/src/displayapp/icons/navigation/off-ramp-slight-left.png
deleted file mode 100644
index dfc42be0..00000000
--- a/src/displayapp/icons/navigation/off-ramp-slight-left.png
+++ /dev/null
diff --git a/src/displayapp/icons/navigation/off-ramp-slight-right-white.svg b/src/displayapp/icons/navigation/off-ramp-slight-right-white.svg
deleted file mode 100644
index d13f60ec..00000000
--- a/src/displayapp/icons/navigation/off-ramp-slight-right-white.svg
+++ /dev/null
@@ -1,4 +0,0 @@
-<svg id="WORKING_ICONS" data-name="WORKING ICONS" xmlns="http://www.w3.org/2000/svg" width="20" height="20" viewBox="0 0 20 20">
-  <title>direction</title>
-  <path fill="#ffffff" d="M8.5029,2.2A0.29744,0.29744,0,0,1,8.8,2.49712V17.50288A0.29744,0.29744,0,0,1,8.5029,17.8H7.4971A0.29744,0.29744,0,0,1,7.2,17.50288V2.49712A0.29744,0.29744,0,0,1,7.4971,2.2H8.5029m0-.2H7.4971A0.49711,0.49711,0,0,0,7,2.49712V17.50288A0.49711,0.49711,0,0,0,7.4971,18H8.5029A0.49711,0.49711,0,0,0,9,17.50288V2.49712A0.49711,0.49711,0,0,0,8.5029,2h0ZM7.0141,14.043v3.46082A0.49621,0.49621,0,0,0,7.51025,18H8.51678a0.49614,0.49614,0,0,0,.49615-0.49683l-0.0047-3.60767a5.21819,5.21819,0,0,1,1.665-4.144l2.44818-2.06561a0.35758,0.35758,0,0,1,.6405.16266l0.91821,3.1106A0.38663,0.38663,0,0,0,15.41956,10.86L17,3l-8.00476.44965a0.38658,0.38658,0,0,0-.20294.71777l2.94891,1.35016a0.3576,0.3576,0,0,1,.07019.6571L9.35394,8.24854A7.25157,7.25157,0,0,0,7.0141,14.043Z"/>
-</svg>
diff --git a/src/displayapp/icons/navigation/off-ramp-slight-right.c b/src/displayapp/icons/navigation/off-ramp-slight-right.c
deleted file mode 100644
index 5b9fd182..00000000
--- a/src/displayapp/icons/navigation/off-ramp-slight-right.c
+++ /dev/null
@@ -1,96 +0,0 @@
-#if defined(LV_LVGL_H_INCLUDE_SIMPLE)
-#include "lvgl.h"
-#else
-#include "lvgl/lvgl.h"
-#endif
-
-
-#ifndef LV_ATTRIBUTE_MEM_ALIGN
-#define LV_ATTRIBUTE_MEM_ALIGN
-#endif
-
-#ifndef LV_ATTRIBUTE_IMG_OFF_RAMP_SLIGHT_RIGHT
-#define LV_ATTRIBUTE_IMG_OFF_RAMP_SLIGHT_RIGHT
-#endif
-
-const LV_ATTRIBUTE_MEM_ALIGN LV_ATTRIBUTE_LARGE_CONST LV_ATTRIBUTE_IMG_OFF_RAMP_SLIGHT_RIGHT uint8_t off_ramp_slight_right_map[] = {
-  0x04, 0x02, 0x04, 0xff, 	/*Color of index 0*/
-  0xfc, 0xfe, 0xfc, 0xff, 	/*Color of index 1*/
-
-  0x00, 0x0f, 0xfc, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x00, 0x0f, 0xfc, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x00, 0x0f, 0xfc, 0x00, 0x00, 0x3f, 0xf0, 0x00, 
-  0x00, 0x0e, 0x7c, 0x7f, 0xff, 0xff, 0xf0, 0x00, 
-  0x00, 0x0e, 0x7f, 0xff, 0xff, 0xff, 0xf0, 0x00, 
-  0x00, 0x0e, 0x7f, 0xff, 0xff, 0xff, 0xf0, 0x00, 
-  0x00, 0x0e, 0x7f, 0xff, 0xff, 0xff, 0xf0, 0x00, 
-  0x00, 0x0e, 0x7f, 0xff, 0xff, 0xff, 0xf0, 0x00, 
-  0x00, 0x0e, 0x7f, 0xff, 0xff, 0xff, 0xf0, 0x00, 
-  0x00, 0x0e, 0x7f, 0xff, 0xff, 0xff, 0xf0, 0x00, 
-  0x00, 0x0e, 0x7f, 0xff, 0xff, 0xff, 0xf0, 0x00, 
-  0x00, 0x0e, 0x7f, 0xff, 0xff, 0xff, 0xf0, 0x00, 
-  0x00, 0x0e, 0x7f, 0xff, 0xff, 0xff, 0xf0, 0x00, 
-  0x00, 0x0e, 0x7d, 0xff, 0xff, 0xff, 0xf0, 0x00, 
-  0x00, 0x0e, 0x7c, 0x3f, 0xff, 0xff, 0xf0, 0x00, 
-  0x00, 0x0e, 0x7c, 0x0f, 0xff, 0xff, 0xf0, 0x00, 
-  0x00, 0x0e, 0x7c, 0x1f, 0xff, 0xff, 0xf0, 0x00, 
-  0x00, 0x0e, 0x7c, 0x3f, 0xff, 0xff, 0xf0, 0x00, 
-  0x00, 0x0e, 0x7c, 0x7f, 0xff, 0xff, 0xe0, 0x00, 
-  0x00, 0x0e, 0x7c, 0xff, 0xff, 0xff, 0xe0, 0x00, 
-  0x00, 0x0e, 0x7d, 0xff, 0xff, 0xff, 0xe0, 0x00, 
-  0x00, 0x0e, 0x7f, 0xff, 0xff, 0xff, 0xe0, 0x00, 
-  0x00, 0x0e, 0x7f, 0xff, 0xff, 0xff, 0xe0, 0x00, 
-  0x00, 0x0e, 0x7f, 0xff, 0xff, 0xff, 0xc0, 0x00, 
-  0x00, 0x0e, 0x7f, 0xff, 0xff, 0xff, 0xc0, 0x00, 
-  0x00, 0x0e, 0x7f, 0xff, 0xff, 0xff, 0xc0, 0x00, 
-  0x00, 0x0e, 0xff, 0xff, 0xf7, 0xff, 0xc0, 0x00, 
-  0x00, 0x0e, 0xff, 0xff, 0xe3, 0xff, 0x80, 0x00, 
-  0x00, 0x0f, 0xff, 0xff, 0xc3, 0xff, 0x80, 0x00, 
-  0x00, 0x0f, 0xff, 0xff, 0x83, 0xff, 0x80, 0x00, 
-  0x00, 0x0f, 0xff, 0xff, 0x03, 0xff, 0x80, 0x00, 
-  0x00, 0x0f, 0xff, 0xfe, 0x01, 0xff, 0x80, 0x00, 
-  0x00, 0x0f, 0xff, 0xf8, 0x01, 0xff, 0x00, 0x00, 
-  0x00, 0x0f, 0xff, 0xf0, 0x01, 0xff, 0x00, 0x00, 
-  0x00, 0x0f, 0xff, 0xe0, 0x00, 0xff, 0x00, 0x00, 
-  0x00, 0x0f, 0xff, 0xc0, 0x00, 0xff, 0x00, 0x00, 
-  0x00, 0x0f, 0xff, 0xc0, 0x00, 0xff, 0x00, 0x00, 
-  0x00, 0x0f, 0xff, 0x80, 0x00, 0x7e, 0x00, 0x00, 
-  0x00, 0x0f, 0xff, 0x80, 0x00, 0x7e, 0x00, 0x00, 
-  0x00, 0x0f, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x00, 0x0f, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x00, 0x0f, 0xfe, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x00, 0x0f, 0xfe, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x00, 0x0f, 0xfe, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x00, 0x0f, 0xfc, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x00, 0x0f, 0xfc, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x00, 0x0f, 0xfc, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x00, 0x0f, 0xfc, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x00, 0x0f, 0xfc, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x00, 0x0f, 0xfc, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x00, 0x0f, 0xfc, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x00, 0x0f, 0xfc, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x00, 0x0f, 0xfc, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x00, 0x0f, 0xfc, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x00, 0x0f, 0xfc, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x00, 0x0f, 0xfc, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x00, 0x0f, 0xfc, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x00, 0x0f, 0xfc, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x00, 0x0f, 0xfc, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x00, 0x0f, 0xfc, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x00, 0x0f, 0xfc, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x00, 0x0f, 0xfc, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x00, 0x0f, 0xfc, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x00, 0x0f, 0xfc, 0x00, 0x00, 0x00, 0x00, 0x00, 
-};
-
-const lv_img_dsc_t off_ramp_slight_right = {
-      {
-        LV_IMG_CF_INDEXED_1BIT,
-        0,
-        0,
-        64,
-        64
-    },
-    520,
-off_ramp_slight_right_map,
-};
diff --git a/src/displayapp/icons/navigation/off-ramp-slight-right.png b/src/displayapp/icons/navigation/off-ramp-slight-right.png
deleted file mode 100644
index ffb8a763..00000000
--- a/src/displayapp/icons/navigation/off-ramp-slight-right.png
+++ /dev/null
diff --git a/src/displayapp/icons/navigation/off_ramp_left.svg b/src/displayapp/icons/navigation/off_ramp_left.svg
new file mode 100644
index 00000000..1eb68597
--- /dev/null
+++ b/src/displayapp/icons/navigation/off_ramp_left.svg
@@ -0,0 +1,58 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   inkscape:version="1.0 (4035a4fb49, 2020-05-01)"
+   sodipodi:docname="off_ramp_left.svg"
+   version="1.1"
+   viewBox="0 0 20 20"
+   height="20"
+   width="20"
+   data-name="WORKING ICONS"
+   id="WORKING_ICONS">
+  <metadata
+     id="metadata11">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs9" />
+  <sodipodi:namedview
+     inkscape:current-layer="WORKING_ICONS"
+     inkscape:window-maximized="1"
+     inkscape:window-y="22"
+     inkscape:window-x="-8"
+     inkscape:cy="19.152307"
+     inkscape:cx="15.60741"
+     inkscape:zoom="15.202796"
+     showgrid="false"
+     id="namedview7"
+     inkscape:window-height="1027"
+     inkscape:window-width="1920"
+     inkscape:pageshadow="2"
+     inkscape:pageopacity="0"
+     guidetolerance="10"
+     gridtolerance="10"
+     objecttolerance="10"
+     borderopacity="1"
+     bordercolor="#666666"
+     pagecolor="#ffffff" />
+  <title
+     id="title2">direction</title>
+  <path
+     style="stroke-width:1.24853"
+     id="path4"
+     d="m 18.112863,0.27325637 a 0.37136219,0.37136219 0 0 1 0.370938,0.3709627 V 19.379332 a 0.37136219,0.37136219 0 0 1 -0.370938,0.370963 H 16.857094 A 0.37136219,0.37136219 0 0 1 16.486156,19.379332 V 0.64421907 a 0.37136219,0.37136219 0 0 1 0.370938,-0.3709627 h 1.255769 m 0,-0.2497056 H 16.857094 A 0.6206558,0.6206558 0 0 0 16.23645,0.64421907 V 19.379332 A 0.6206558,0.6206558 0 0 0 16.857094,20 h 1.255769 a 0.6206558,0.6206558 0 0 0 0.620644,-0.620668 V 0.64421907 A 0.6206558,0.6206558 0 0 0 18.112863,0.02355077 Z M 11.243312,4.9948026 H 8.7617996 A 0.44643619,0.44643619 0 0 1 8.2906301,4.317576 L 9.9683397,0.63212087 A 0.48266847,0.48266847 0 0 0 9.1898325,0.12093597 L 1.2654497,6.2661912 9.1898575,12.3658 A 0.48266847,0.48266847 0 0 0 9.9683397,11.854603 L 8.2906301,8.1691599 A 0.44647364,0.44647364 0 0 1 8.7617996,7.4918588 H 11.25732 a 5.0663022,5.0663022 0 0 1 4.980092,5.0855542 v 6.803043 A 0.61954461,0.61954461 0 0 0 16.856969,20 h 1.256606 a 0.61944472,0.61944472 0 0 0 0.619457,-0.620306 l -0.0024,-1.87675 h 0.0039 V 12.577413 A 7.5663174,7.5663174 0 0 0 11.257033,4.9948026 l -0.01373,-0.00228"
+     fill="#000000" />
+</svg>
diff --git a/src/displayapp/icons/navigation/off_ramp_right.svg b/src/displayapp/icons/navigation/off_ramp_right.svg
new file mode 100644
index 00000000..8368d414
--- /dev/null
+++ b/src/displayapp/icons/navigation/off_ramp_right.svg
@@ -0,0 +1,58 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   inkscape:version="1.0 (4035a4fb49, 2020-05-01)"
+   sodipodi:docname="off_ramp_right.svg"
+   version="1.1"
+   viewBox="0 0 20 20"
+   height="20"
+   width="20"
+   data-name="WORKING ICONS"
+   id="WORKING_ICONS">
+  <metadata
+     id="metadata11">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs9" />
+  <sodipodi:namedview
+     inkscape:current-layer="WORKING_ICONS"
+     inkscape:window-maximized="1"
+     inkscape:window-y="22"
+     inkscape:window-x="-8"
+     inkscape:cy="12.447827"
+     inkscape:cx="10.887302"
+     inkscape:zoom="15.202796"
+     showgrid="false"
+     id="namedview7"
+     inkscape:window-height="1027"
+     inkscape:window-width="1920"
+     inkscape:pageshadow="2"
+     inkscape:pageopacity="0"
+     guidetolerance="10"
+     gridtolerance="10"
+     objecttolerance="10"
+     borderopacity="1"
+     bordercolor="#666666"
+     pagecolor="#ffffff" />
+  <title
+     id="title2">direction</title>
+  <path
+     style="stroke-width:1.24853"
+     id="path4"
+     d="m 3.1367143,0.27325183 a 0.37136229,0.37136229 0 0 1 0.3709378,0.3709628 V 19.379332 A 0.37136229,0.37136229 0 0 1 3.1367143,19.750295 H 1.8809445 A 0.37136229,0.37136229 0 0 1 1.5100067,19.379332 V 0.64421463 a 0.37136229,0.37136229 0 0 1 0.3709378,-0.3709628 h 1.2557698 m 0,-0.2497057 H 1.8809445 A 0.62065595,0.62065595 0 0 0 1.260301,0.64421463 V 19.379332 A 0.62065595,0.62065595 0 0 0 1.8809445,20 H 3.1367143 A 0.62065595,0.62065595 0 0 0 3.7573578,19.379332 V 0.64421463 A 0.62065595,0.62065595 0 0 0 3.1367143,0.02354613 Z M 8.761834,7.491856 h 2.481513 a 0.44647376,0.44647376 0 0 1 0.471169,0.6773012 l -1.67771,3.6854438 a 0.48266859,0.48266859 0 0 0 0.778508,0.511173 l 7.924385,-6.0995859 -7.92441,-6.14525677 a 0.48266859,0.48266859 0 0 0 -0.778508,0.5111725 l 1.67771,3.68545607 A 0.4464363,0.4464363 0 0 1 11.243322,4.9947867 H 8.761834 v -0.00227 l -0.01373,0.00228 A 7.5663193,7.5663193 0 0 0 1.2706678,12.577409 v 4.925532 h 0.00388 l -0.0025,1.87675 A 0.61944488,0.61944488 0 0 0 1.89158,19.999997 H 3.1481758 A 0.61954476,0.61954476 0 0 0 3.7677206,19.380456 V 12.577412 A 5.0663035,5.0663035 0 0 1 8.747813,7.491856 Z"
+     fill="#000000" />
+</svg>
diff --git a/src/displayapp/icons/navigation/off_ramp_slight_left.svg b/src/displayapp/icons/navigation/off_ramp_slight_left.svg
new file mode 100644
index 00000000..40a31b95
--- /dev/null
+++ b/src/displayapp/icons/navigation/off_ramp_slight_left.svg
@@ -0,0 +1,58 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   inkscape:version="1.0 (4035a4fb49, 2020-05-01)"
+   sodipodi:docname="off_ramp_slight_left.svg"
+   version="1.1"
+   viewBox="0 0 20 20"
+   height="20"
+   width="20"
+   data-name="WORKING ICONS"
+   id="WORKING_ICONS">
+  <metadata
+     id="metadata11">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs9" />
+  <sodipodi:namedview
+     inkscape:current-layer="WORKING_ICONS"
+     inkscape:window-maximized="1"
+     inkscape:window-y="22"
+     inkscape:window-x="-8"
+     inkscape:cy="13.801562"
+     inkscape:cx="13.215776"
+     inkscape:zoom="21.5"
+     showgrid="false"
+     id="namedview7"
+     inkscape:window-height="1027"
+     inkscape:window-width="1920"
+     inkscape:pageshadow="2"
+     inkscape:pageopacity="0"
+     guidetolerance="10"
+     gridtolerance="10"
+     objecttolerance="10"
+     borderopacity="1"
+     bordercolor="#666666"
+     pagecolor="#ffffff" />
+  <title
+     id="title2">direction</title>
+  <path
+     style="stroke-width:1.25"
+     id="path4"
+     d="M 15.628625,0.24999999 A 0.3718,0.3718 0 0 1 16,0.62139999 V 19.3786 A 0.3718,0.3718 0 0 1 15.628625,19.75 h -1.25725 A 0.3718,0.3718 0 0 1 14,19.3786 V 0.62139999 a 0.3718,0.3718 0 0 1 0.371375,-0.3714 h 1.25725 M 15.628625,0 h -1.25725 A 0.6213875,0.6213875 0 0 0 13.75,0.62139999 V 19.3786 A 0.6213875,0.6213875 0 0 0 14.371375,20 h 1.25725 A 0.6213875,0.6213875 0 0 0 16.25,19.3786 V 0.62139999 A 0.6213875,0.6213875 0 0 0 15.628625,0 Z M 13.307575,7.810675 10.23575,5.21835 a 0.447,0.447 0 0 1 0.08774,-0.821375 l 3.686138,-1.6877 A 0.483225,0.483225 0 0 0 13.75595,1.8120625 L 3.75,1.25 5.72555,11.075 a 0.4832875,0.4832875 0 0 0 0.924225,0.1239 L 7.7975,7.3106375 A 0.446975,0.446975 0 0 1 8.598125,7.1073125 L 11.65835,9.689325 a 6.5227375,6.5227375 0 0 1 2.08125,5.18 l -0.0059,4.509587 A 0.620175,0.620175 0 0 0 14.354025,20 h 1.258162 a 0.6202625,0.6202625 0 0 0 0.620188,-0.620275 V 15.05375 a 9.0644625,9.0644625 0 0 0 -2.9248,-7.243075 z"
+     fill="#000000" />
+</svg>
diff --git a/src/displayapp/icons/navigation/off_ramp_slight_right.svg b/src/displayapp/icons/navigation/off_ramp_slight_right.svg
new file mode 100644
index 00000000..e3b6185c
--- /dev/null
+++ b/src/displayapp/icons/navigation/off_ramp_slight_right.svg
@@ -0,0 +1,58 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   inkscape:version="1.0 (4035a4fb49, 2020-05-01)"
+   sodipodi:docname="off_ramp_slight_right.svg"
+   version="1.1"
+   viewBox="0 0 20 20"
+   height="20"
+   width="20"
+   data-name="WORKING ICONS"
+   id="WORKING_ICONS">
+  <metadata
+     id="metadata11">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs9" />
+  <sodipodi:namedview
+     inkscape:current-layer="WORKING_ICONS"
+     inkscape:window-maximized="1"
+     inkscape:window-y="22"
+     inkscape:window-x="-8"
+     inkscape:cy="12.26217"
+     inkscape:cx="8.0254354"
+     inkscape:zoom="21.5"
+     showgrid="false"
+     id="namedview7"
+     inkscape:window-height="1027"
+     inkscape:window-width="1920"
+     inkscape:pageshadow="2"
+     inkscape:pageopacity="0"
+     guidetolerance="10"
+     gridtolerance="10"
+     objecttolerance="10"
+     borderopacity="1"
+     bordercolor="#666666"
+     pagecolor="#ffffff" />
+  <title
+     id="title2">direction</title>
+  <path
+     style="stroke-width:1.25"
+     id="path4"
+     d="M 5.628625,0.25 A 0.3718,0.3718 0 0 1 6,0.6214 V 19.3786 A 0.3718,0.3718 0 0 1 5.628625,19.75 H 4.371375 A 0.3718,0.3718 0 0 1 4,19.3786 V 0.6214 A 0.3718,0.3718 0 0 1 4.371375,0.25 h 1.25725 m 0,-0.25 H 4.371375 A 0.6213875,0.6213875 0 0 0 3.75,0.6214 V 19.3786 A 0.6213875,0.6213875 0 0 0 4.371375,20 h 1.25725 A 0.6213875,0.6213875 0 0 0 6.25,19.3786 V 0.6214 A 0.6213875,0.6213875 0 0 0 5.628625,0 Z m -1.861,15.05375 v 4.326025 A 0.6202625,0.6202625 0 0 0 4.3878125,20 H 5.645975 a 0.620175,0.620175 0 0 0 0.6201875,-0.621038 l -0.00587,-4.509587 a 6.5227375,6.5227375 0 0 1 2.0812495,-5.18 l 3.060225,-2.5820125 a 0.446975,0.446975 0 0 1 0.800625,0.203325 L 13.35015,11.198937 A 0.4832875,0.4832875 0 0 0 14.27445,11.075 L 16.25,1.25 6.24405,1.8120625 A 0.483225,0.483225 0 0 0 5.990375,2.709275 l 3.686137,1.6877 A 0.447,0.447 0 0 1 9.76425,5.21835 L 6.692425,7.810675 a 9.0644625,9.0644625 0 0 0 -2.9248,7.243075 z"
+     fill="#000000" />
+</svg>
diff --git a/src/displayapp/icons/navigation/on-ramp-left-white.svg b/src/displayapp/icons/navigation/on-ramp-left-white.svg
deleted file mode 100644
index cdb2bba0..00000000
--- a/src/displayapp/icons/navigation/on-ramp-left-white.svg
+++ /dev/null
@@ -1,4 +0,0 @@
-<svg id="WORKING_ICONS" data-name="WORKING ICONS" xmlns="http://www.w3.org/2000/svg" width="20" height="20" viewBox="0 0 20 20">
-  <title>direction</title>
-  <path fill="#ffffff" d="M9.00078,5.97986l0.011,0.00183a6.06019,6.06019,0,0,1,5.989,6.07324V16H14.99766l0.002,1.50317A0.49614,0.49614,0,0,1,14.50346,18H13.497a0.49622,0.49622,0,0,1-.49622-0.49622V12.05493A4.05782,4.05782,0,0,0,9.012,7.98169H7.01323a0.3576,0.3576,0,0,0-.37738.54248L7.9796,11.476a0.38659,0.38659,0,0,1-.62354.40942L1.00908,7l6.347-4.922a0.38659,0.38659,0,0,1,.62354.40942L6.63585,5.43927a0.35757,0.35757,0,0,0,.37738.54242H9.00078"/>
-</svg>
diff --git a/src/displayapp/icons/navigation/on-ramp-left.c b/src/displayapp/icons/navigation/on-ramp-left.c
deleted file mode 100644
index 3bdabf2d..00000000
--- a/src/displayapp/icons/navigation/on-ramp-left.c
+++ /dev/null
@@ -1,96 +0,0 @@
-#if defined(LV_LVGL_H_INCLUDE_SIMPLE)
-#include "lvgl.h"
-#else
-#include "lvgl/lvgl.h"
-#endif
-
-
-#ifndef LV_ATTRIBUTE_MEM_ALIGN
-#define LV_ATTRIBUTE_MEM_ALIGN
-#endif
-
-#ifndef LV_ATTRIBUTE_IMG_ON_RAMP_LEFT
-#define LV_ATTRIBUTE_IMG_ON_RAMP_LEFT
-#endif
-
-const LV_ATTRIBUTE_MEM_ALIGN LV_ATTRIBUTE_LARGE_CONST LV_ATTRIBUTE_IMG_ON_RAMP_LEFT uint8_t on_ramp_left_map[] = {
-  0x04, 0x02, 0x04, 0xff, 	/*Color of index 0*/
-  0xfc, 0xfe, 0xfc, 0xff, 	/*Color of index 1*/
-
-  0x00, 0x00, 0x00, 0x7f, 0xc0, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0xff, 0xc0, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x01, 0xff, 0xc0, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x07, 0xff, 0xc0, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x0f, 0xff, 0xc0, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x3f, 0xff, 0x80, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x7f, 0xff, 0x80, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0xff, 0xff, 0x80, 0x00, 0x00, 0x00, 
-  0x00, 0x01, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 
-  0x00, 0x03, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 
-  0x00, 0x0f, 0xff, 0xfe, 0x00, 0x00, 0x00, 0x00, 
-  0x00, 0x1f, 0xff, 0xfe, 0x00, 0x00, 0x00, 0x00, 
-  0x00, 0x7f, 0xff, 0xfc, 0x00, 0x00, 0x00, 0x00, 
-  0x00, 0xff, 0xff, 0xfc, 0x00, 0x00, 0x00, 0x00, 
-  0x01, 0xff, 0xff, 0xff, 0xff, 0xc0, 0x00, 0x00, 
-  0x03, 0xff, 0xff, 0xff, 0xff, 0xfc, 0x00, 0x00, 
-  0x0f, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 
-  0x0f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xc0, 0x00, 
-  0x0f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xe0, 0x00, 
-  0x0f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xf8, 0x00, 
-  0x0f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfc, 0x00, 
-  0x0f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfe, 0x00, 
-  0x0f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 
-  0x0f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x80, 
-  0x07, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x80, 
-  0x01, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xc0, 
-  0x00, 0xff, 0xff, 0xfc, 0x07, 0xff, 0xff, 0xe0, 
-  0x00, 0x7f, 0xff, 0xfc, 0x00, 0xff, 0xff, 0xe0, 
-  0x00, 0x3f, 0xff, 0xfe, 0x00, 0x3f, 0xff, 0xf0, 
-  0x00, 0x1f, 0xff, 0xfe, 0x00, 0x0f, 0xff, 0xf0, 
-  0x00, 0x07, 0xff, 0xfe, 0x00, 0x07, 0xff, 0xf0, 
-  0x00, 0x01, 0xff, 0xff, 0x00, 0x03, 0xff, 0xf0, 
-  0x00, 0x00, 0xff, 0xff, 0x00, 0x01, 0xff, 0xf0, 
-  0x00, 0x00, 0x7f, 0xff, 0x80, 0x01, 0xff, 0xf0, 
-  0x00, 0x00, 0x3f, 0xff, 0x80, 0x00, 0xff, 0xf0, 
-  0x00, 0x00, 0x1f, 0xff, 0xc0, 0x00, 0xff, 0xf0, 
-  0x00, 0x00, 0x07, 0xff, 0xc0, 0x00, 0x7f, 0xf0, 
-  0x00, 0x00, 0x03, 0xff, 0xc0, 0x00, 0x7f, 0xf0, 
-  0x00, 0x00, 0x01, 0xff, 0xc0, 0x00, 0x3f, 0xf0, 
-  0x00, 0x00, 0x00, 0x7f, 0xc0, 0x00, 0x3f, 0xf0, 
-  0x00, 0x00, 0x00, 0x3f, 0xc0, 0x00, 0x3f, 0xf0, 
-  0x00, 0x00, 0x00, 0x1f, 0xc0, 0x00, 0x3f, 0xf0, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3f, 0xf0, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3f, 0xf0, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3f, 0xf0, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3f, 0xf0, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3f, 0xf0, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3f, 0xf0, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3f, 0xf0, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3f, 0xf0, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3f, 0xf0, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3f, 0xf0, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3f, 0xf0, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3f, 0xf0, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3f, 0xf0, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3f, 0xf0, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3f, 0xf0, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3f, 0xf0, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3f, 0xf0, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3f, 0xf0, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3f, 0xf0, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3f, 0xf0, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3f, 0xf0, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3f, 0xf0, 
-};
-
-const lv_img_dsc_t on_ramp_left = {
-      {
-        LV_IMG_CF_INDEXED_1BIT,
-        0,
-        0,
-        64,
-        64
-    },
-    520,
-on_ramp_left_map,
-};
diff --git a/src/displayapp/icons/navigation/on-ramp-left.png b/src/displayapp/icons/navigation/on-ramp-left.png
deleted file mode 100644
index 9319037f..00000000
--- a/src/displayapp/icons/navigation/on-ramp-left.png
+++ /dev/null
diff --git a/src/displayapp/icons/navigation/on-ramp-right-white.svg b/src/displayapp/icons/navigation/on-ramp-right-white.svg
deleted file mode 100644
index a2707320..00000000
--- a/src/displayapp/icons/navigation/on-ramp-right-white.svg
+++ /dev/null
@@ -1,4 +0,0 @@
-<svg id="WORKING_ICONS" data-name="WORKING ICONS" xmlns="http://www.w3.org/2000/svg" width="20" height="20" viewBox="0 0 20 20">
-  <title>direction</title>
-  <path fill="#ffffff" d="M10.99707,7.98169A4.05782,4.05782,0,0,0,7.0083,12.05493v5.44885A0.49622,0.49622,0,0,1,6.51208,18H5.50562a0.49614,0.49614,0,0,1-.49615-0.49683L5.01141,16H5.0083V12.05493a6.06019,6.06019,0,0,1,5.989-6.07324l0.011-.00183V5.98169h1.98755a0.35757,0.35757,0,0,0,.37738-0.54242L12.02948,2.48743A0.38659,0.38659,0,0,1,12.653,2.078L19,7l-6.347,4.88544a0.38659,0.38659,0,0,1-.62354-0.40942l1.34375-2.95184a0.3576,0.3576,0,0,0-.37738-0.54248H10.99707Z"/>
-</svg>
diff --git a/src/displayapp/icons/navigation/on-ramp-right.c b/src/displayapp/icons/navigation/on-ramp-right.c
deleted file mode 100644
index 94398d41..00000000
--- a/src/displayapp/icons/navigation/on-ramp-right.c
+++ /dev/null
@@ -1,96 +0,0 @@
-#if defined(LV_LVGL_H_INCLUDE_SIMPLE)
-#include "lvgl.h"
-#else
-#include "lvgl/lvgl.h"
-#endif
-
-
-#ifndef LV_ATTRIBUTE_MEM_ALIGN
-#define LV_ATTRIBUTE_MEM_ALIGN
-#endif
-
-#ifndef LV_ATTRIBUTE_IMG_ON_RAMP_RIGHT
-#define LV_ATTRIBUTE_IMG_ON_RAMP_RIGHT
-#endif
-
-const LV_ATTRIBUTE_MEM_ALIGN LV_ATTRIBUTE_LARGE_CONST LV_ATTRIBUTE_IMG_ON_RAMP_RIGHT uint8_t on_ramp_right_map[] = {
-  0x04, 0x02, 0x04, 0xff, 	/*Color of index 0*/
-  0xfc, 0xfe, 0xfc, 0xff, 	/*Color of index 1*/
-
-  0x00, 0x00, 0x00, 0x03, 0xfe, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x03, 0xff, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x03, 0xff, 0x80, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x03, 0xff, 0xe0, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x03, 0xff, 0xf0, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x01, 0xff, 0xfc, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x01, 0xff, 0xfe, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x01, 0xff, 0xff, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0x80, 0x00, 
-  0x00, 0x00, 0x00, 0x00, 0x7f, 0xff, 0xc0, 0x00, 
-  0x00, 0x00, 0x00, 0x00, 0x7f, 0xff, 0xf0, 0x00, 
-  0x00, 0x00, 0x00, 0x00, 0x7f, 0xff, 0xf8, 0x00, 
-  0x00, 0x00, 0x00, 0x00, 0x3f, 0xff, 0xfe, 0x00, 
-  0x00, 0x00, 0x00, 0x00, 0x3f, 0xff, 0xff, 0x00, 
-  0x00, 0x00, 0x03, 0xff, 0xff, 0xff, 0xff, 0x80, 
-  0x00, 0x00, 0x3f, 0xff, 0xff, 0xff, 0xff, 0xc0, 
-  0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xf0, 
-  0x00, 0x03, 0xff, 0xff, 0xff, 0xff, 0xff, 0xf0, 
-  0x00, 0x07, 0xff, 0xff, 0xff, 0xff, 0xff, 0xf0, 
-  0x00, 0x1f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xf0, 
-  0x00, 0x3f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xf0, 
-  0x00, 0x7f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xf0, 
-  0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xf0, 
-  0x01, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xf0, 
-  0x01, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xe0, 
-  0x03, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x80, 
-  0x07, 0xff, 0xff, 0xe0, 0x3f, 0xff, 0xff, 0x00, 
-  0x07, 0xff, 0xff, 0x00, 0x3f, 0xff, 0xfe, 0x00, 
-  0x0f, 0xff, 0xfc, 0x00, 0x3f, 0xff, 0xfc, 0x00, 
-  0x0f, 0xff, 0xf0, 0x00, 0x7f, 0xff, 0xf8, 0x00, 
-  0x0f, 0xff, 0xe0, 0x00, 0x7f, 0xff, 0xe0, 0x00, 
-  0x0f, 0xff, 0xc0, 0x00, 0xff, 0xff, 0xc0, 0x00, 
-  0x0f, 0xff, 0x80, 0x00, 0xff, 0xff, 0x00, 0x00, 
-  0x0f, 0xff, 0x80, 0x01, 0xff, 0xfe, 0x00, 0x00, 
-  0x0f, 0xff, 0x00, 0x01, 0xff, 0xfc, 0x00, 0x00, 
-  0x0f, 0xff, 0x00, 0x03, 0xff, 0xf8, 0x00, 0x00, 
-  0x0f, 0xfe, 0x00, 0x03, 0xff, 0xe0, 0x00, 0x00, 
-  0x0f, 0xfe, 0x00, 0x03, 0xff, 0xc0, 0x00, 0x00, 
-  0x0f, 0xfc, 0x00, 0x03, 0xff, 0x80, 0x00, 0x00, 
-  0x0f, 0xfc, 0x00, 0x03, 0xfe, 0x00, 0x00, 0x00, 
-  0x0f, 0xfc, 0x00, 0x03, 0xfc, 0x00, 0x00, 0x00, 
-  0x0f, 0xfc, 0x00, 0x03, 0xf8, 0x00, 0x00, 0x00, 
-  0x0f, 0xfc, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x0f, 0xfc, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x0f, 0xfc, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x0f, 0xfc, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x0f, 0xfc, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x0f, 0xfc, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x0f, 0xfc, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x0f, 0xfc, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x0f, 0xfc, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x0f, 0xfc, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x0f, 0xfc, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x0f, 0xfc, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x0f, 0xfc, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x0f, 0xfc, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x0f, 0xfc, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x0f, 0xfc, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x0f, 0xfc, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x0f, 0xfc, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x0f, 0xfc, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x0f, 0xfc, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x0f, 0xfc, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x0f, 0xfc, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-};
-
-const lv_img_dsc_t on_ramp_right = {
-      {
-        LV_IMG_CF_INDEXED_1BIT,
-        0,
-        0,
-        64,
-        64
-    },
-    520,
-on_ramp_right_map,
-};
diff --git a/src/displayapp/icons/navigation/on-ramp-right.png b/src/displayapp/icons/navigation/on-ramp-right.png
deleted file mode 100644
index db711996..00000000
--- a/src/displayapp/icons/navigation/on-ramp-right.png
+++ /dev/null
diff --git a/src/displayapp/icons/navigation/on-ramp-sharp-left-white.svg b/src/displayapp/icons/navigation/on-ramp-sharp-left-white.svg
deleted file mode 100644
index 043963b7..00000000
--- a/src/displayapp/icons/navigation/on-ramp-sharp-left-white.svg
+++ /dev/null
@@ -1,4 +0,0 @@
-<svg id="WORKING_ICONS" data-name="WORKING ICONS" xmlns="http://www.w3.org/2000/svg" width="20" height="20" viewBox="0 0 20 20">
-  <title>direction</title>
-  <path fill="#ffffff" d="M15.49771,18a0.49779,0.49779,0,0,1-.49779-0.49779V5.00391l-0.27979-.00635a2.56758,2.56758,0,0,0-2.0957.79L7.22917,10.40041a0.34918,0.34918,0,0,0,.08252.63177l2.92877,1.39331a0.38658,0.38658,0,0,1-.21344.71472l-8.0105.33209,1.69568-7.836a0.38661,0.38661,0,0,1,.74072-0.0882l0.8725,3.12372a0.35757,0.35757,0,0,0,.638.17206L5.9672,8.84835,11.3593,4.23926A4.46634,4.46634,0,0,1,14.74406,2.998L15.00822,3a1.92935,1.92935,0,0,1,1.43408.56885,2.10247,2.10247,0,0,1,.55713,1.46045L16.9999,17.50219A0.49779,0.49779,0,0,1,16.50211,18h-1.0044Z"/>
-</svg>
diff --git a/src/displayapp/icons/navigation/on-ramp-sharp-left.c b/src/displayapp/icons/navigation/on-ramp-sharp-left.c
deleted file mode 100644
index a3672655..00000000
--- a/src/displayapp/icons/navigation/on-ramp-sharp-left.c
+++ /dev/null
@@ -1,96 +0,0 @@
-#if defined(LV_LVGL_H_INCLUDE_SIMPLE)
-#include "lvgl.h"
-#else
-#include "lvgl/lvgl.h"
-#endif
-
-
-#ifndef LV_ATTRIBUTE_MEM_ALIGN
-#define LV_ATTRIBUTE_MEM_ALIGN
-#endif
-
-#ifndef LV_ATTRIBUTE_IMG_ON_RAMP_SHARP_LEFT
-#define LV_ATTRIBUTE_IMG_ON_RAMP_SHARP_LEFT
-#endif
-
-const LV_ATTRIBUTE_MEM_ALIGN LV_ATTRIBUTE_LARGE_CONST LV_ATTRIBUTE_IMG_ON_RAMP_SHARP_LEFT uint8_t on_ramp_sharp_left_map[] = {
-  0x04, 0x02, 0x04, 0xff, 	/*Color of index 0*/
-  0xfc, 0xfe, 0xfc, 0xff, 	/*Color of index 1*/
-
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x3f, 0xff, 0xfe, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 
-  0x00, 0x00, 0x00, 0x00, 0x01, 0xff, 0xff, 0xff, 
-  0x00, 0x00, 0x00, 0x00, 0x03, 0xff, 0xff, 0xff, 
-  0x00, 0x00, 0x00, 0x00, 0x07, 0xff, 0xff, 0xff, 
-  0x00, 0x00, 0x00, 0x00, 0x0f, 0xff, 0xff, 0xff, 
-  0x00, 0x00, 0x00, 0x00, 0x3f, 0xff, 0xff, 0xff, 
-  0x00, 0x00, 0x00, 0x00, 0x7f, 0xff, 0xff, 0xff, 
-  0x03, 0xf0, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 
-  0x07, 0xf8, 0x00, 0x01, 0xff, 0xff, 0xff, 0xff, 
-  0x07, 0xf8, 0x00, 0x07, 0xff, 0xff, 0xff, 0xff, 
-  0x07, 0xf8, 0x00, 0x0f, 0xff, 0xff, 0xe7, 0xff, 
-  0x07, 0xf8, 0x00, 0x1f, 0xff, 0xff, 0x87, 0xff, 
-  0x0f, 0xfc, 0x00, 0x3f, 0xff, 0xff, 0x07, 0xff, 
-  0x0f, 0xfc, 0x00, 0x7f, 0xff, 0xfc, 0x07, 0xff, 
-  0x0f, 0xfc, 0x00, 0xff, 0xff, 0xf8, 0x07, 0xff, 
-  0x0f, 0xfc, 0x01, 0xff, 0xff, 0xf0, 0x07, 0xff, 
-  0x0f, 0xfe, 0x03, 0xff, 0xff, 0xe0, 0x07, 0xff, 
-  0x1f, 0xfe, 0x0f, 0xff, 0xff, 0xc0, 0x07, 0xff, 
-  0x1f, 0xfe, 0x1f, 0xff, 0xff, 0x80, 0x07, 0xff, 
-  0x1f, 0xff, 0x3f, 0xff, 0xff, 0x00, 0x07, 0xff, 
-  0x1f, 0xff, 0x7f, 0xff, 0xfe, 0x00, 0x07, 0xff, 
-  0x1f, 0xff, 0xff, 0xff, 0xf8, 0x00, 0x07, 0xff, 
-  0x3f, 0xff, 0xff, 0xff, 0xf0, 0x00, 0x07, 0xff, 
-  0x3f, 0xff, 0xff, 0xff, 0xe0, 0x00, 0x07, 0xff, 
-  0x3f, 0xff, 0xff, 0xff, 0xc0, 0x00, 0x07, 0xff, 
-  0x3f, 0xff, 0xff, 0xff, 0x00, 0x00, 0x07, 0xff, 
-  0x7f, 0xff, 0xff, 0xfe, 0x00, 0x00, 0x07, 0xff, 
-  0x7f, 0xff, 0xff, 0xfc, 0x00, 0x00, 0x07, 0xff, 
-  0x7f, 0xff, 0xff, 0xf8, 0x00, 0x00, 0x07, 0xff, 
-  0x7f, 0xff, 0xff, 0xf0, 0x00, 0x00, 0x07, 0xff, 
-  0x7f, 0xff, 0xff, 0xe0, 0x00, 0x00, 0x07, 0xff, 
-  0xff, 0xff, 0xff, 0x80, 0x00, 0x00, 0x07, 0xff, 
-  0xff, 0xff, 0xff, 0xe0, 0x00, 0x00, 0x07, 0xff, 
-  0xff, 0xff, 0xff, 0xf8, 0x00, 0x00, 0x07, 0xff, 
-  0xff, 0xff, 0xff, 0xfe, 0x00, 0x00, 0x07, 0xff, 
-  0xff, 0xff, 0xff, 0xff, 0x80, 0x00, 0x07, 0xff, 
-  0xff, 0xff, 0xff, 0xff, 0xf0, 0x00, 0x07, 0xff, 
-  0xff, 0xff, 0xff, 0xff, 0xf8, 0x00, 0x07, 0xff, 
-  0xff, 0xff, 0xff, 0xff, 0xfc, 0x00, 0x07, 0xff, 
-  0xff, 0xff, 0xff, 0xff, 0xfc, 0x00, 0x07, 0xff, 
-  0xff, 0xff, 0xff, 0xff, 0xfc, 0x00, 0x07, 0xff, 
-  0xff, 0xff, 0xff, 0xff, 0xfc, 0x00, 0x07, 0xff, 
-  0xff, 0xff, 0xff, 0xff, 0xfc, 0x00, 0x07, 0xff, 
-  0xff, 0xff, 0xff, 0xff, 0xfc, 0x00, 0x07, 0xff, 
-  0xff, 0xff, 0xff, 0xfc, 0x00, 0x00, 0x07, 0xff, 
-  0xf8, 0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0xff, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0xff, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0xff, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0xff, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0xff, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0xff, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0xff, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0xff, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0xff, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0xff, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0xff, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0xff, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0xff, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0xff, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0xff, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0xff, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0xff, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0xff, 
-};
-
-const lv_img_dsc_t on_ramp_sharp_left = {
-      {
-        LV_IMG_CF_INDEXED_1BIT,
-        0,
-        0,
-        64,
-        64
-    },
-    520,
-on_ramp_sharp_left_map,
-};
diff --git a/src/displayapp/icons/navigation/on-ramp-sharp-left.png b/src/displayapp/icons/navigation/on-ramp-sharp-left.png
deleted file mode 100644
index 188a17a1..00000000
--- a/src/displayapp/icons/navigation/on-ramp-sharp-left.png
+++ /dev/null
diff --git a/src/displayapp/icons/navigation/on-ramp-sharp-right-white.svg b/src/displayapp/icons/navigation/on-ramp-sharp-right-white.svg
deleted file mode 100644
index 44542f52..00000000
--- a/src/displayapp/icons/navigation/on-ramp-sharp-right-white.svg
+++ /dev/null
@@ -1,4 +0,0 @@
-<svg id="WORKING_ICONS" data-name="WORKING ICONS" xmlns="http://www.w3.org/2000/svg" width="20" height="20" viewBox="0 0 20 20">
-  <title>direction</title>
-  <path fill="#ffffff" d="M3.49789,17.99542a0.49779,0.49779,0,0,1-.49779-0.49781L3.00057,5.02472A2.10247,2.10247,0,0,1,3.5577,3.56427a1.92935,1.92935,0,0,1,1.43408-.56885l0.26416-.002A4.46634,4.46634,0,0,1,8.6407,4.23468L14.0328,8.84377l0.00378-.00446a0.35757,0.35757,0,0,0,.638-0.17206l0.8725-3.12372a0.38661,0.38661,0,0,1,.74072.0882l1.69568,7.836L9.973,13.13564a0.38658,0.38658,0,0,1-.21344-0.71472l2.92877-1.39331a0.34918,0.34918,0,0,0,.08252-0.63177L7.37557,5.783a2.56758,2.56758,0,0,0-2.0957-.79l-0.27979.00635v12.4983a0.49779,0.49779,0,0,1-.49779.49779H3.49789Z"/>
-</svg>
diff --git a/src/displayapp/icons/navigation/on-ramp-sharp-right.c b/src/displayapp/icons/navigation/on-ramp-sharp-right.c
deleted file mode 100644
index 33fa9d79..00000000
--- a/src/displayapp/icons/navigation/on-ramp-sharp-right.c
+++ /dev/null
@@ -1,96 +0,0 @@
-#if defined(LV_LVGL_H_INCLUDE_SIMPLE)
-#include "lvgl.h"
-#else
-#include "lvgl/lvgl.h"
-#endif
-
-
-#ifndef LV_ATTRIBUTE_MEM_ALIGN
-#define LV_ATTRIBUTE_MEM_ALIGN
-#endif
-
-#ifndef LV_ATTRIBUTE_IMG_ON_RAMP_SHARP_RIGHT
-#define LV_ATTRIBUTE_IMG_ON_RAMP_SHARP_RIGHT
-#endif
-
-const LV_ATTRIBUTE_MEM_ALIGN LV_ATTRIBUTE_LARGE_CONST LV_ATTRIBUTE_IMG_ON_RAMP_SHARP_RIGHT uint8_t on_ramp_sharp_right_map[] = {
-  0x04, 0x02, 0x04, 0xff, 	/*Color of index 0*/
-  0xfc, 0xfe, 0xfc, 0xff, 	/*Color of index 1*/
-
-  0x7f, 0xff, 0xfc, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0xff, 0xff, 0xff, 0x80, 0x00, 0x00, 0x00, 0x00, 
-  0xff, 0xff, 0xff, 0xc0, 0x00, 0x00, 0x00, 0x00, 
-  0xff, 0xff, 0xff, 0xe0, 0x00, 0x00, 0x00, 0x00, 
-  0xff, 0xff, 0xff, 0xf8, 0x00, 0x00, 0x00, 0x00, 
-  0xff, 0xff, 0xff, 0xfc, 0x00, 0x00, 0x00, 0x00, 
-  0xff, 0xff, 0xff, 0xfe, 0x00, 0x00, 0x00, 0x00, 
-  0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x0f, 0xc0, 
-  0xff, 0xff, 0xff, 0xff, 0x80, 0x00, 0x1f, 0xe0, 
-  0xff, 0xff, 0xff, 0xff, 0xe0, 0x00, 0x1f, 0xe0, 
-  0xff, 0xe7, 0xff, 0xff, 0xf0, 0x00, 0x1f, 0xe0, 
-  0xff, 0xe1, 0xff, 0xff, 0xf8, 0x00, 0x1f, 0xe0, 
-  0xff, 0xe0, 0xff, 0xff, 0xfc, 0x00, 0x3f, 0xf0, 
-  0xff, 0xe0, 0x3f, 0xff, 0xfe, 0x00, 0x3f, 0xf0, 
-  0xff, 0xe0, 0x1f, 0xff, 0xff, 0x00, 0x3f, 0xf0, 
-  0xff, 0xe0, 0x0f, 0xff, 0xff, 0x80, 0x3f, 0xf0, 
-  0xff, 0xe0, 0x07, 0xff, 0xff, 0xc0, 0x7f, 0xf0, 
-  0xff, 0xe0, 0x03, 0xff, 0xff, 0xf0, 0x7f, 0xf8, 
-  0xff, 0xe0, 0x01, 0xff, 0xff, 0xf8, 0x7f, 0xf8, 
-  0xff, 0xe0, 0x00, 0xff, 0xff, 0xfc, 0xff, 0xf8, 
-  0xff, 0xe0, 0x00, 0x7f, 0xff, 0xfe, 0xff, 0xf8, 
-  0xff, 0xe0, 0x00, 0x1f, 0xff, 0xff, 0xff, 0xf8, 
-  0xff, 0xe0, 0x00, 0x0f, 0xff, 0xff, 0xff, 0xfc, 
-  0xff, 0xe0, 0x00, 0x07, 0xff, 0xff, 0xff, 0xfc, 
-  0xff, 0xe0, 0x00, 0x03, 0xff, 0xff, 0xff, 0xfc, 
-  0xff, 0xe0, 0x00, 0x00, 0xff, 0xff, 0xff, 0xfc, 
-  0xff, 0xe0, 0x00, 0x00, 0x7f, 0xff, 0xff, 0xfe, 
-  0xff, 0xe0, 0x00, 0x00, 0x3f, 0xff, 0xff, 0xfe, 
-  0xff, 0xe0, 0x00, 0x00, 0x1f, 0xff, 0xff, 0xfe, 
-  0xff, 0xe0, 0x00, 0x00, 0x0f, 0xff, 0xff, 0xfe, 
-  0xff, 0xe0, 0x00, 0x00, 0x07, 0xff, 0xff, 0xfe, 
-  0xff, 0xe0, 0x00, 0x00, 0x01, 0xff, 0xff, 0xff, 
-  0xff, 0xe0, 0x00, 0x00, 0x07, 0xff, 0xff, 0xff, 
-  0xff, 0xe0, 0x00, 0x00, 0x1f, 0xff, 0xff, 0xff, 
-  0xff, 0xe0, 0x00, 0x00, 0x7f, 0xff, 0xff, 0xff, 
-  0xff, 0xe0, 0x00, 0x01, 0xff, 0xff, 0xff, 0xff, 
-  0xff, 0xe0, 0x00, 0x0f, 0xff, 0xff, 0xff, 0xff, 
-  0xff, 0xe0, 0x00, 0x1f, 0xff, 0xff, 0xff, 0xff, 
-  0xff, 0xe0, 0x00, 0x3f, 0xff, 0xff, 0xff, 0xff, 
-  0xff, 0xe0, 0x00, 0x3f, 0xff, 0xff, 0xff, 0xff, 
-  0xff, 0xe0, 0x00, 0x3f, 0xff, 0xff, 0xff, 0xff, 
-  0xff, 0xe0, 0x00, 0x3f, 0xff, 0xff, 0xff, 0xff, 
-  0xff, 0xe0, 0x00, 0x3f, 0xff, 0xff, 0xff, 0xff, 
-  0xff, 0xe0, 0x00, 0x3f, 0xff, 0xff, 0xff, 0xff, 
-  0xff, 0xe0, 0x00, 0x00, 0x1f, 0xff, 0xff, 0xff, 
-  0xff, 0xe0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1f, 
-  0xff, 0xe0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0xff, 0xe0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0xff, 0xe0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0xff, 0xe0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0xff, 0xe0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0xff, 0xe0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0xff, 0xe0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0xff, 0xe0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0xff, 0xe0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0xff, 0xe0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0xff, 0xe0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0xff, 0xe0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0xff, 0xe0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0xff, 0xe0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0xff, 0xe0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0xff, 0xe0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0xff, 0xe0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-};
-
-const lv_img_dsc_t on_ramp_sharp_right = {
-      {
-        LV_IMG_CF_INDEXED_1BIT,
-        0,
-        0,
-        64,
-        64
-    },
-    520,
-on_ramp_sharp_right_map,
-};
diff --git a/src/displayapp/icons/navigation/on-ramp-sharp-right.png b/src/displayapp/icons/navigation/on-ramp-sharp-right.png
deleted file mode 100644
index 4c32f963..00000000
--- a/src/displayapp/icons/navigation/on-ramp-sharp-right.png
+++ /dev/null
diff --git a/src/displayapp/icons/navigation/on-ramp-slight-left-white.svg b/src/displayapp/icons/navigation/on-ramp-slight-left-white.svg
deleted file mode 100644
index f15e5aa0..00000000
--- a/src/displayapp/icons/navigation/on-ramp-slight-left-white.svg
+++ /dev/null
@@ -1,4 +0,0 @@
-<svg id="WORKING_ICONS" data-name="WORKING ICONS" xmlns="http://www.w3.org/2000/svg" width="20" height="20" viewBox="0 0 20 20">
-  <title>direction</title>
-  <path fill="#ffffff" d="M12.9859,14.043v3.46082A0.49621,0.49621,0,0,1,12.48975,18H11.48322a0.49614,0.49614,0,0,1-.49615-0.49683l0.0047-3.60767a5.21819,5.21819,0,0,0-1.665-4.144L6.87854,7.68585a0.35758,0.35758,0,0,0-.6405.16266l-0.91821,3.1106A0.38663,0.38663,0,0,1,4.58044,10.86L3,3l8.00476,0.44965a0.38658,0.38658,0,0,1,.20294.71777L8.25879,5.51758a0.3576,0.3576,0,0,0-.07019.6571l2.45746,2.07385A7.25157,7.25157,0,0,1,12.9859,14.043Z"/>
-</svg>
diff --git a/src/displayapp/icons/navigation/on-ramp-slight-left.c b/src/displayapp/icons/navigation/on-ramp-slight-left.c
deleted file mode 100644
index c3300310..00000000
--- a/src/displayapp/icons/navigation/on-ramp-slight-left.c
+++ /dev/null
@@ -1,96 +0,0 @@
-#if defined(LV_LVGL_H_INCLUDE_SIMPLE)
-#include "lvgl.h"
-#else
-#include "lvgl/lvgl.h"
-#endif
-
-
-#ifndef LV_ATTRIBUTE_MEM_ALIGN
-#define LV_ATTRIBUTE_MEM_ALIGN
-#endif
-
-#ifndef LV_ATTRIBUTE_IMG_ON_RAMP_SLIGHT_LEFT
-#define LV_ATTRIBUTE_IMG_ON_RAMP_SLIGHT_LEFT
-#endif
-
-const LV_ATTRIBUTE_MEM_ALIGN LV_ATTRIBUTE_LARGE_CONST LV_ATTRIBUTE_IMG_ON_RAMP_SLIGHT_LEFT uint8_t on_ramp_slight_left_map[] = {
-  0x04, 0x02, 0x04, 0xff, 	/*Color of index 0*/
-  0xfc, 0xfe, 0xfc, 0xff, 	/*Color of index 1*/
-
-  0x00, 0x1f, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 
-  0x00, 0x1f, 0xff, 0xff, 0xff, 0xff, 0x80, 0x00, 
-  0x00, 0x1f, 0xff, 0xff, 0xff, 0xff, 0x80, 0x00, 
-  0x00, 0x1f, 0xff, 0xff, 0xff, 0xff, 0x80, 0x00, 
-  0x00, 0x1f, 0xff, 0xff, 0xff, 0xff, 0x80, 0x00, 
-  0x00, 0x1f, 0xff, 0xff, 0xff, 0xff, 0x80, 0x00, 
-  0x00, 0x1f, 0xff, 0xff, 0xff, 0xff, 0x80, 0x00, 
-  0x00, 0x1f, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 
-  0x00, 0x1f, 0xff, 0xff, 0xff, 0xf8, 0x00, 0x00, 
-  0x00, 0x1f, 0xff, 0xff, 0xff, 0xe0, 0x00, 0x00, 
-  0x00, 0x1f, 0xff, 0xff, 0xff, 0x80, 0x00, 0x00, 
-  0x00, 0x1f, 0xff, 0xff, 0xfc, 0x00, 0x00, 0x00, 
-  0x00, 0x1f, 0xff, 0xff, 0xf0, 0x00, 0x00, 0x00, 
-  0x00, 0x0f, 0xff, 0xff, 0xfc, 0x00, 0x00, 0x00, 
-  0x00, 0x0f, 0xff, 0xff, 0xfc, 0x00, 0x00, 0x00, 
-  0x00, 0x0f, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 
-  0x00, 0x0f, 0xff, 0xff, 0xff, 0x80, 0x00, 0x00, 
-  0x00, 0x0f, 0xff, 0xff, 0xff, 0xc0, 0x00, 0x00, 
-  0x00, 0x07, 0xff, 0xff, 0xff, 0xe0, 0x00, 0x00, 
-  0x00, 0x07, 0xff, 0xff, 0xff, 0xf8, 0x00, 0x00, 
-  0x00, 0x07, 0xff, 0xff, 0xff, 0xfc, 0x00, 0x00, 
-  0x00, 0x07, 0xff, 0xff, 0xff, 0xfe, 0x00, 0x00, 
-  0x00, 0x07, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 
-  0x00, 0x03, 0xff, 0xff, 0xff, 0xff, 0x80, 0x00, 
-  0x00, 0x03, 0xff, 0xc7, 0xff, 0xff, 0x80, 0x00, 
-  0x00, 0x03, 0xff, 0xc3, 0xff, 0xff, 0xc0, 0x00, 
-  0x00, 0x03, 0xff, 0xc1, 0xff, 0xff, 0xe0, 0x00, 
-  0x00, 0x03, 0xff, 0x80, 0xff, 0xff, 0xe0, 0x00, 
-  0x00, 0x01, 0xff, 0x80, 0x7f, 0xff, 0xf0, 0x00, 
-  0x00, 0x01, 0xff, 0x80, 0x1f, 0xff, 0xf8, 0x00, 
-  0x00, 0x01, 0xff, 0x80, 0x0f, 0xff, 0xf8, 0x00, 
-  0x00, 0x01, 0xff, 0x00, 0x07, 0xff, 0xf8, 0x00, 
-  0x00, 0x01, 0xff, 0x00, 0x03, 0xff, 0xfc, 0x00, 
-  0x00, 0x00, 0xff, 0x00, 0x01, 0xff, 0xfc, 0x00, 
-  0x00, 0x00, 0xfe, 0x00, 0x01, 0xff, 0xfc, 0x00, 
-  0x00, 0x00, 0xfe, 0x00, 0x00, 0xff, 0xfc, 0x00, 
-  0x00, 0x00, 0xfe, 0x00, 0x00, 0x7f, 0xfc, 0x00, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x7f, 0xfc, 0x00, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x3f, 0xfc, 0x00, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x3f, 0xfc, 0x00, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x3f, 0xfc, 0x00, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x1f, 0xfc, 0x00, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x1f, 0xfc, 0x00, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x1f, 0xfc, 0x00, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x1f, 0xfc, 0x00, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x1f, 0xfc, 0x00, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x1f, 0xfc, 0x00, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x1f, 0xfc, 0x00, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x1f, 0xfc, 0x00, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x1f, 0xfc, 0x00, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x1f, 0xfc, 0x00, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x1f, 0xfc, 0x00, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x1f, 0xfc, 0x00, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x1f, 0xfc, 0x00, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x1f, 0xfc, 0x00, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x1f, 0xfc, 0x00, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x1f, 0xfc, 0x00, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x1f, 0xfc, 0x00, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x1f, 0xfc, 0x00, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x1f, 0xfc, 0x00, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x1f, 0xfc, 0x00, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x1f, 0xfc, 0x00, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x1f, 0xfc, 0x00, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x1f, 0xfc, 0x00, 
-};
-
-const lv_img_dsc_t on_ramp_slight_left = {
-      {
-        LV_IMG_CF_INDEXED_1BIT,
-        0,
-        0,
-        64,
-        64
-    },
-    520,
-on_ramp_slight_left_map,
-};
diff --git a/src/displayapp/icons/navigation/on-ramp-slight-left.png b/src/displayapp/icons/navigation/on-ramp-slight-left.png
deleted file mode 100644
index 344df2f7..00000000
--- a/src/displayapp/icons/navigation/on-ramp-slight-left.png
+++ /dev/null
diff --git a/src/displayapp/icons/navigation/on-ramp-slight-right-white.svg b/src/displayapp/icons/navigation/on-ramp-slight-right-white.svg
deleted file mode 100644
index 6d48848e..00000000
--- a/src/displayapp/icons/navigation/on-ramp-slight-right-white.svg
+++ /dev/null
@@ -1,4 +0,0 @@
-<svg id="WORKING_ICONS" data-name="WORKING ICONS" xmlns="http://www.w3.org/2000/svg" width="20" height="20" viewBox="0 0 20 20">
-  <title>direction</title>
-  <path fill="#ffffff" d="M9.35394,8.24854L11.8114,6.17468a0.3576,0.3576,0,0,0-.07019-0.6571L8.7923,4.16742a0.38658,0.38658,0,0,1,.20294-0.71777L17,3l-1.58044,7.86a0.38663,0.38663,0,0,1-.73938.09912L13.762,7.84851a0.35758,0.35758,0,0,0-.6405-0.16266L10.67328,9.75146a5.21819,5.21819,0,0,0-1.665,4.144l0.0047,3.60767A0.49614,0.49614,0,0,1,8.51678,18H7.51025a0.49621,0.49621,0,0,1-.49615-0.49622V14.043A7.25157,7.25157,0,0,1,9.35394,8.24854Z"/>
-</svg>
diff --git a/src/displayapp/icons/navigation/on-ramp-slight-right.c b/src/displayapp/icons/navigation/on-ramp-slight-right.c
deleted file mode 100644
index b0746de7..00000000
--- a/src/displayapp/icons/navigation/on-ramp-slight-right.c
+++ /dev/null
@@ -1,96 +0,0 @@
-#if defined(LV_LVGL_H_INCLUDE_SIMPLE)
-#include "lvgl.h"
-#else
-#include "lvgl/lvgl.h"
-#endif
-
-
-#ifndef LV_ATTRIBUTE_MEM_ALIGN
-#define LV_ATTRIBUTE_MEM_ALIGN
-#endif
-
-#ifndef LV_ATTRIBUTE_IMG_ON_RAMP_SLIGHT_RIGHT
-#define LV_ATTRIBUTE_IMG_ON_RAMP_SLIGHT_RIGHT
-#endif
-
-const LV_ATTRIBUTE_MEM_ALIGN LV_ATTRIBUTE_LARGE_CONST LV_ATTRIBUTE_IMG_ON_RAMP_SLIGHT_RIGHT uint8_t on_ramp_slight_right_map[] = {
-  0x04, 0x02, 0x04, 0xff, 	/*Color of index 0*/
-  0xfc, 0xfe, 0xfc, 0xff, 	/*Color of index 1*/
-
-  0x00, 0x00, 0x7f, 0xff, 0xff, 0xff, 0xfc, 0x00, 
-  0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xfc, 0x00, 
-  0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xfc, 0x00, 
-  0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xfc, 0x00, 
-  0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xfc, 0x00, 
-  0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xfc, 0x00, 
-  0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xfc, 0x00, 
-  0x00, 0x00, 0x3f, 0xff, 0xff, 0xff, 0xfc, 0x00, 
-  0x00, 0x00, 0x0f, 0xff, 0xff, 0xff, 0xfc, 0x00, 
-  0x00, 0x00, 0x03, 0xff, 0xff, 0xff, 0xfc, 0x00, 
-  0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xfc, 0x00, 
-  0x00, 0x00, 0x00, 0x1f, 0xff, 0xff, 0xfc, 0x00, 
-  0x00, 0x00, 0x00, 0x07, 0xff, 0xff, 0xfc, 0x00, 
-  0x00, 0x00, 0x00, 0x1f, 0xff, 0xff, 0xf8, 0x00, 
-  0x00, 0x00, 0x00, 0x1f, 0xff, 0xff, 0xf8, 0x00, 
-  0x00, 0x00, 0x00, 0x7f, 0xff, 0xff, 0xf8, 0x00, 
-  0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xf8, 0x00, 
-  0x00, 0x00, 0x01, 0xff, 0xff, 0xff, 0xf8, 0x00, 
-  0x00, 0x00, 0x03, 0xff, 0xff, 0xff, 0xf0, 0x00, 
-  0x00, 0x00, 0x0f, 0xff, 0xff, 0xff, 0xf0, 0x00, 
-  0x00, 0x00, 0x1f, 0xff, 0xff, 0xff, 0xf0, 0x00, 
-  0x00, 0x00, 0x3f, 0xff, 0xff, 0xff, 0xf0, 0x00, 
-  0x00, 0x00, 0x7f, 0xff, 0xff, 0xff, 0xf0, 0x00, 
-  0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xe0, 0x00, 
-  0x00, 0x00, 0xff, 0xff, 0xf1, 0xff, 0xe0, 0x00, 
-  0x00, 0x01, 0xff, 0xff, 0xe1, 0xff, 0xe0, 0x00, 
-  0x00, 0x03, 0xff, 0xff, 0xc1, 0xff, 0xe0, 0x00, 
-  0x00, 0x03, 0xff, 0xff, 0x80, 0xff, 0xe0, 0x00, 
-  0x00, 0x07, 0xff, 0xff, 0x00, 0xff, 0xc0, 0x00, 
-  0x00, 0x0f, 0xff, 0xfc, 0x00, 0xff, 0xc0, 0x00, 
-  0x00, 0x0f, 0xff, 0xf8, 0x00, 0xff, 0xc0, 0x00, 
-  0x00, 0x0f, 0xff, 0xf0, 0x00, 0x7f, 0xc0, 0x00, 
-  0x00, 0x1f, 0xff, 0xe0, 0x00, 0x7f, 0xc0, 0x00, 
-  0x00, 0x1f, 0xff, 0xc0, 0x00, 0x7f, 0x80, 0x00, 
-  0x00, 0x1f, 0xff, 0xc0, 0x00, 0x3f, 0x80, 0x00, 
-  0x00, 0x1f, 0xff, 0x80, 0x00, 0x3f, 0x80, 0x00, 
-  0x00, 0x1f, 0xff, 0x00, 0x00, 0x3f, 0x80, 0x00, 
-  0x00, 0x1f, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x00, 0x1f, 0xfe, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x00, 0x1f, 0xfe, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x00, 0x1f, 0xfe, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x00, 0x1f, 0xfc, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x00, 0x1f, 0xfc, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x00, 0x1f, 0xfc, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x00, 0x1f, 0xfc, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x00, 0x1f, 0xfc, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x00, 0x1f, 0xfc, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x00, 0x1f, 0xfc, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x00, 0x1f, 0xfc, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x00, 0x1f, 0xfc, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x00, 0x1f, 0xfc, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x00, 0x1f, 0xfc, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x00, 0x1f, 0xfc, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x00, 0x1f, 0xfc, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x00, 0x1f, 0xfc, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x00, 0x1f, 0xfc, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x00, 0x1f, 0xfc, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x00, 0x1f, 0xfc, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x00, 0x1f, 0xfc, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x00, 0x1f, 0xfc, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x00, 0x1f, 0xfc, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x00, 0x1f, 0xfc, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x00, 0x1f, 0xfc, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x00, 0x1f, 0xfc, 0x00, 0x00, 0x00, 0x00, 0x00, 
-};
-
-const lv_img_dsc_t on_ramp_slight_right = {
-      {
-        LV_IMG_CF_INDEXED_1BIT,
-        0,
-        0,
-        64,
-        64
-    },
-    520,
-on_ramp_slight_right_map,
-};
diff --git a/src/displayapp/icons/navigation/on-ramp-slight-right.png b/src/displayapp/icons/navigation/on-ramp-slight-right.png
deleted file mode 100644
index bd7d2f8d..00000000
--- a/src/displayapp/icons/navigation/on-ramp-slight-right.png
+++ /dev/null
diff --git a/src/displayapp/icons/navigation/on-ramp-straight-white.svg b/src/displayapp/icons/navigation/on-ramp-straight-white.svg
deleted file mode 100644
index 08531119..00000000
--- a/src/displayapp/icons/navigation/on-ramp-straight-white.svg
+++ /dev/null
@@ -1,4 +0,0 @@
-<svg id="WORKING_ICONS" data-name="WORKING ICONS" xmlns="http://www.w3.org/2000/svg" width="20" height="20" viewBox="0 0 20 20">
-  <title>direction</title>
-  <path fill="#ffffff" d="M14.50342,8.96637L11.55157,7.62262A0.35755,0.35755,0,0,0,11.00916,8v9.49652A0.50346,0.50346,0,0,1,10.50568,18h-0.993a0.50346,0.50346,0,0,1-.50348-0.50348V8a0.35756,0.35756,0,0,0-.54242-0.37738L5.51489,8.96637a0.38659,0.38659,0,0,1-.40942-0.62354L10.00916,2l4.90369,6.34283A0.3866,0.3866,0,0,1,14.50342,8.96637Z"/>
-</svg>
diff --git a/src/displayapp/icons/navigation/on-ramp-straight.c b/src/displayapp/icons/navigation/on-ramp-straight.c
deleted file mode 100644
index d8359f25..00000000
--- a/src/displayapp/icons/navigation/on-ramp-straight.c
+++ /dev/null
@@ -1,96 +0,0 @@
-#if defined(LV_LVGL_H_INCLUDE_SIMPLE)
-#include "lvgl.h"
-#else
-#include "lvgl/lvgl.h"
-#endif
-
-
-#ifndef LV_ATTRIBUTE_MEM_ALIGN
-#define LV_ATTRIBUTE_MEM_ALIGN
-#endif
-
-#ifndef LV_ATTRIBUTE_IMG_ON_RAMP_STRAIGHT
-#define LV_ATTRIBUTE_IMG_ON_RAMP_STRAIGHT
-#endif
-
-const LV_ATTRIBUTE_MEM_ALIGN LV_ATTRIBUTE_LARGE_CONST LV_ATTRIBUTE_IMG_ON_RAMP_STRAIGHT uint8_t on_ramp_straight_map[] = {
-  0x04, 0x02, 0x04, 0xff, 	/*Color of index 0*/
-  0xfc, 0xfe, 0xfc, 0xff, 	/*Color of index 1*/
-
-  0x00, 0x00, 0x00, 0x0f, 0xf0, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x1f, 0xf8, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x1f, 0xf8, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x3f, 0xfc, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x7f, 0xfe, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0xff, 0xff, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x01, 0xff, 0xff, 0x80, 0x00, 0x00, 
-  0x00, 0x00, 0x01, 0xff, 0xff, 0x80, 0x00, 0x00, 
-  0x00, 0x00, 0x03, 0xff, 0xff, 0xc0, 0x00, 0x00, 
-  0x00, 0x00, 0x07, 0xff, 0xff, 0xe0, 0x00, 0x00, 
-  0x00, 0x00, 0x07, 0xff, 0xff, 0xf0, 0x00, 0x00, 
-  0x00, 0x00, 0x0f, 0xff, 0xff, 0xf0, 0x00, 0x00, 
-  0x00, 0x00, 0x1f, 0xff, 0xff, 0xf8, 0x00, 0x00, 
-  0x00, 0x00, 0x3f, 0xff, 0xff, 0xfc, 0x00, 0x00, 
-  0x00, 0x00, 0x7f, 0xff, 0xff, 0xfe, 0x00, 0x00, 
-  0x00, 0x00, 0x7f, 0xff, 0xff, 0xfe, 0x00, 0x00, 
-  0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 
-  0x00, 0x01, 0xff, 0xff, 0xff, 0xff, 0x80, 0x00, 
-  0x00, 0x03, 0xff, 0xff, 0xff, 0xff, 0xc0, 0x00, 
-  0x00, 0x03, 0xff, 0xff, 0xff, 0xff, 0xc0, 0x00, 
-  0x00, 0x07, 0xff, 0xff, 0xff, 0xff, 0xe0, 0x00, 
-  0x00, 0x0f, 0xff, 0xff, 0xff, 0xff, 0xf0, 0x00, 
-  0x00, 0x0f, 0xff, 0xff, 0xff, 0xff, 0xf0, 0x00, 
-  0x00, 0x0f, 0xff, 0xff, 0xff, 0xff, 0xf0, 0x00, 
-  0x00, 0x0f, 0xff, 0xff, 0xff, 0xff, 0xf0, 0x00, 
-  0x00, 0x0f, 0xff, 0xff, 0xff, 0xff, 0xf0, 0x00, 
-  0x00, 0x0f, 0xfe, 0x3f, 0xfc, 0x7f, 0xf0, 0x00, 
-  0x00, 0x0f, 0xf8, 0x3f, 0xfc, 0x1f, 0xf0, 0x00, 
-  0x00, 0x0f, 0xe0, 0x3f, 0xfc, 0x07, 0xf0, 0x00, 
-  0x00, 0x0f, 0x80, 0x3f, 0xfc, 0x01, 0xf0, 0x00, 
-  0x00, 0x00, 0x00, 0x3f, 0xfc, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x3f, 0xfc, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x3f, 0xfc, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x3f, 0xfc, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x3f, 0xfc, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x3f, 0xfc, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x3f, 0xfc, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x3f, 0xfc, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x3f, 0xfc, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x3f, 0xfc, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x3f, 0xfc, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x3f, 0xfc, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x3f, 0xfc, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x3f, 0xfc, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x3f, 0xfc, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x3f, 0xfc, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x3f, 0xfc, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x3f, 0xfc, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x3f, 0xfc, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x3f, 0xfc, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x3f, 0xfc, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x3f, 0xfc, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x3f, 0xfc, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x3f, 0xfc, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x3f, 0xfc, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x3f, 0xfc, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x3f, 0xfc, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x3f, 0xfc, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x3f, 0xfc, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x3f, 0xfc, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x3f, 0xfc, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x3f, 0xfc, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x3f, 0xfc, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x3f, 0xfc, 0x00, 0x00, 0x00, 
-};
-
-const lv_img_dsc_t on_ramp_straight = {
-      {
-        LV_IMG_CF_INDEXED_1BIT,
-        0,
-        0,
-        64,
-        64
-    },
-    520,
-on_ramp_straight_map,
-};
diff --git a/src/displayapp/icons/navigation/on-ramp-straight.png b/src/displayapp/icons/navigation/on-ramp-straight.png
deleted file mode 100644
index 9d33a96c..00000000
--- a/src/displayapp/icons/navigation/on-ramp-straight.png
+++ /dev/null
diff --git a/src/displayapp/icons/navigation/on_ramp_left.svg b/src/displayapp/icons/navigation/on_ramp_left.svg
new file mode 100644
index 00000000..768784ca
--- /dev/null
+++ b/src/displayapp/icons/navigation/on_ramp_left.svg
@@ -0,0 +1,58 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   inkscape:version="1.0 (4035a4fb49, 2020-05-01)"
+   sodipodi:docname="on_ramp_left.svg"
+   version="1.1"
+   viewBox="0 0 20 20"
+   height="20"
+   width="20"
+   data-name="WORKING ICONS"
+   id="WORKING_ICONS">
+  <metadata
+     id="metadata11">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs9" />
+  <sodipodi:namedview
+     inkscape:current-layer="WORKING_ICONS"
+     inkscape:window-maximized="1"
+     inkscape:window-y="22"
+     inkscape:window-x="-8"
+     inkscape:cy="12.847956"
+     inkscape:cx="6.9900919"
+     inkscape:zoom="21.5"
+     showgrid="false"
+     id="namedview7"
+     inkscape:window-height="1027"
+     inkscape:window-width="1920"
+     inkscape:pageshadow="2"
+     inkscape:pageopacity="0"
+     guidetolerance="10"
+     gridtolerance="10"
+     objecttolerance="10"
+     borderopacity="1"
+     bordercolor="#666666"
+     pagecolor="#ffffff" />
+  <title
+     id="title2">direction</title>
+  <path
+     style="stroke-width:1.24853"
+     id="path4"
+     d="m 11.243339,4.9925166 0.01373,0.00228 a 7.5663193,7.5663193 0 0 1 7.477437,7.5826124 v 4.925532 h -0.0039 l 0.0025,1.87675 a 0.61944488,0.61944488 0 0 1 -0.619519,0.620306 H 16.856998 A 0.61954476,0.61954476 0 0 1 16.237453,19.380458 V 12.577414 A 5.0663035,5.0663035 0 0 0 11.257348,7.4918582 H 8.761827 A 0.44647376,0.44647376 0 0 0 8.2906573,8.1691594 L 9.9683674,11.854603 A 0.48266859,0.48266859 0 0 1 9.18986,12.365776 L 1.2654752,6.2661903 9.189885,0.12093346 a 0.48266859,0.48266859 0 0 1 0.7785074,0.5111725 L 8.2906573,4.3175746 A 0.4464363,0.4464363 0 0 0 8.761827,4.9948014 h 2.481512"
+     fill="#000000" />
+</svg>
diff --git a/src/displayapp/icons/navigation/on_ramp_right.svg b/src/displayapp/icons/navigation/on_ramp_right.svg
new file mode 100644
index 00000000..33389dc1
--- /dev/null
+++ b/src/displayapp/icons/navigation/on_ramp_right.svg
@@ -0,0 +1,58 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   inkscape:version="1.0 (4035a4fb49, 2020-05-01)"
+   sodipodi:docname="on_ramp_right.svg"
+   version="1.1"
+   viewBox="0 0 20 20"
+   height="20"
+   width="20"
+   data-name="WORKING ICONS"
+   id="WORKING_ICONS">
+  <metadata
+     id="metadata11">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs9" />
+  <sodipodi:namedview
+     inkscape:current-layer="WORKING_ICONS"
+     inkscape:window-maximized="1"
+     inkscape:window-y="22"
+     inkscape:window-x="-8"
+     inkscape:cy="13.079546"
+     inkscape:cx="10.886253"
+     inkscape:zoom="21.5"
+     showgrid="false"
+     id="namedview7"
+     inkscape:window-height="1027"
+     inkscape:window-width="1920"
+     inkscape:pageshadow="2"
+     inkscape:pageopacity="0"
+     guidetolerance="10"
+     gridtolerance="10"
+     objecttolerance="10"
+     borderopacity="1"
+     bordercolor="#666666"
+     pagecolor="#ffffff" />
+  <title
+     id="title2">direction</title>
+  <path
+     style="stroke-width:1.24853"
+     id="path4"
+     d="m 8.7426396,7.491839 a 5.0663101,5.0663101 0 0 0 -4.9800992,5.085563 v 6.803053 A 0.61954557,0.61954557 0 0 1 3.1429948,20 H 1.8863993 A 0.61944568,0.61944568 0 0 1 1.2669411,19.379693 l 0.00242,-1.876753 h -0.00388 V 12.577402 A 7.5663291,7.5663291 0 0 1 8.7429266,4.994779 l 0.01373,-0.00228 v 0.00228 h 2.4815204 a 0.44643688,0.44643688 0 0 0 0.47117,-0.6772277 L 10.031635,0.63209051 a 0.48266922,0.48266922 0 0 1 0.778483,-0.5111857 l 7.92442,6.14526479 -7.92442,6.0996184 A 0.48266922,0.48266922 0 0 1 10.03161,11.854615 L 11.709322,8.1691537 A 0.44647433,0.44647433 0 0 0 11.238152,7.4918515 H 8.7426396 Z"
+     fill="#000000" />
+</svg>
diff --git a/src/displayapp/icons/navigation/on_ramp_sharp_left.svg b/src/displayapp/icons/navigation/on_ramp_sharp_left.svg
new file mode 100644
index 00000000..0b7f07bd
--- /dev/null
+++ b/src/displayapp/icons/navigation/on_ramp_sharp_left.svg
@@ -0,0 +1,58 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   inkscape:version="1.0 (4035a4fb49, 2020-05-01)"
+   sodipodi:docname="on_ramp_sharp_left.svg"
+   version="1.1"
+   viewBox="0 0 20 20"
+   height="20"
+   width="20"
+   data-name="WORKING ICONS"
+   id="WORKING_ICONS">
+  <metadata
+     id="metadata11">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs9" />
+  <sodipodi:namedview
+     inkscape:current-layer="WORKING_ICONS"
+     inkscape:window-maximized="1"
+     inkscape:window-y="22"
+     inkscape:window-x="-8"
+     inkscape:cy="9.1425165"
+     inkscape:cx="4.905782"
+     inkscape:zoom="21.5"
+     showgrid="false"
+     id="namedview7"
+     inkscape:window-height="1027"
+     inkscape:window-width="1920"
+     inkscape:pageshadow="2"
+     inkscape:pageopacity="0"
+     guidetolerance="10"
+     gridtolerance="10"
+     objecttolerance="10"
+     borderopacity="1"
+     bordercolor="#666666"
+     pagecolor="#ffffff" />
+  <title
+     id="title2">direction</title>
+  <path
+     style="stroke-width:1.33234"
+     id="path4"
+     d="M 17.980077,19.999977 A 0.6632279,0.6632279 0 0 1 17.316849,19.336749 V 2.6847052 l -0.372777,-0.00846 a 3.4209018,3.4209018 0 0 0 -2.792195,1.052552 L 6.9635309,9.8747033 A 0.46522814,0.46522814 0 0 0 7.073476,10.716439 l 3.902131,1.856369 a 0.51505784,0.51505784 0 0 1 -0.284375,0.952254 L 0.018484,13.96752 2.2777144,3.5272667 A 0.51509781,0.51509781 0 0 1 3.2646088,3.4097539 l 1.1624708,4.1618724 a 0.47640652,0.47640652 0 0 0 0.8500359,0.229243 l 0.00504,0.006 7.1841365,-6.1408965 a 5.9507047,5.9507047 0 0 1 4.509667,-1.65378625 l 0.351952,0.00266 a 2.5705594,2.5705594 0 0 1 1.910689,0.7579043 2.8012149,2.8012149 0 0 1 0.74229,1.94582285 l 6.26e-4,16.6181893 a 0.6632279,0.6632279 0 0 1 -0.663232,0.663214 z"
+     fill="#000000" />
+</svg>
diff --git a/src/displayapp/icons/navigation/on_ramp_sharp_right.svg b/src/displayapp/icons/navigation/on_ramp_sharp_right.svg
new file mode 100644
index 00000000..93f2d70e
--- /dev/null
+++ b/src/displayapp/icons/navigation/on_ramp_sharp_right.svg
@@ -0,0 +1,58 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   inkscape:version="1.0 (4035a4fb49, 2020-05-01)"
+   sodipodi:docname="on_ramp_sharp_right.svg"
+   version="1.1"
+   viewBox="0 0 20 20"
+   height="20"
+   width="20"
+   data-name="WORKING ICONS"
+   id="WORKING_ICONS">
+  <metadata
+     id="metadata11">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs9" />
+  <sodipodi:namedview
+     inkscape:current-layer="WORKING_ICONS"
+     inkscape:window-maximized="1"
+     inkscape:window-y="22"
+     inkscape:window-x="-8"
+     inkscape:cy="15.681528"
+     inkscape:cx="12.629989"
+     inkscape:zoom="21.5"
+     showgrid="false"
+     id="namedview7"
+     inkscape:window-height="1027"
+     inkscape:window-width="1920"
+     inkscape:pageshadow="2"
+     inkscape:pageopacity="0"
+     guidetolerance="10"
+     gridtolerance="10"
+     objecttolerance="10"
+     borderopacity="1"
+     bordercolor="#666666"
+     pagecolor="#ffffff" />
+  <title
+     id="title2">direction</title>
+  <path
+     style="stroke-width:1.33234"
+     id="path4"
+     d="M 0.681745,19.999972 A 0.66322701,0.66322701 0 0 1 0.018518,19.336718 L 0.0191442,2.71855 A 2.8012112,2.8012112 0 0 1 0.7614324,0.7727297 2.5705559,2.5705559 0 0 1 2.6721189,0.0148264 l 0.3519517,-0.00266 a 5.9506968,5.9506968 0 0 1 4.5096614,1.653784 l 7.184126,6.1408891 0.005,-0.0059 a 0.47640588,0.47640588 0 0 0 0.850035,-0.229243 l 1.162469,-4.1618669 a 0.51509712,0.51509712 0 0 1 0.986893,0.1175126 L 19.981482,13.967583 9.308775,13.525125 A 0.51505715,0.51505715 0 0 1 9.0244,12.572873 l 3.902126,-1.856367 A 0.46522752,0.46522752 0 0 0 13.036508,9.8747245 L 5.8481448,3.728839 A 3.4208972,3.4208972 0 0 0 3.0559536,2.6762881 l -0.3727763,0.00846 V 19.336771 a 0.66322701,0.66322701 0 0 1 -0.663227,0.663227 H 0.681745 Z"
+     fill="#000000" />
+</svg>
diff --git a/src/displayapp/icons/navigation/on_ramp_slight_left.svg b/src/displayapp/icons/navigation/on_ramp_slight_left.svg
new file mode 100644
index 00000000..f1a78e8d
--- /dev/null
+++ b/src/displayapp/icons/navigation/on_ramp_slight_left.svg
@@ -0,0 +1,58 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   inkscape:version="1.0 (4035a4fb49, 2020-05-01)"
+   sodipodi:docname="on_ramp_slight_left.svg"
+   version="1.1"
+   viewBox="0 0 20 20"
+   height="20"
+   width="20"
+   data-name="WORKING ICONS"
+   id="WORKING_ICONS">
+  <metadata
+     id="metadata11">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs9" />
+  <sodipodi:namedview
+     inkscape:current-layer="WORKING_ICONS"
+     inkscape:window-maximized="1"
+     inkscape:window-y="22"
+     inkscape:window-x="-8"
+     inkscape:cy="14.796037"
+     inkscape:cx="13.025055"
+     inkscape:zoom="21.5"
+     showgrid="false"
+     id="namedview7"
+     inkscape:window-height="1027"
+     inkscape:window-width="1920"
+     inkscape:pageshadow="2"
+     inkscape:pageopacity="0"
+     guidetolerance="10"
+     gridtolerance="10"
+     objecttolerance="10"
+     borderopacity="1"
+     bordercolor="#666666"
+     pagecolor="#ffffff" />
+  <title
+     id="title2">direction</title>
+  <path
+     style="stroke-width:1.33333"
+     id="path4"
+     d="m 16.648073,14.724 v 4.614427 A 0.66161333,0.66161333 0 0 1 15.98654,20 H 14.6445 a 0.66152,0.66152 0 0 1 -0.661533,-0.66244 l 0.0063,-4.810227 A 6.9575867,6.9575867 0 0 0 11.769267,9.002 L 8.5049269,6.2478 a 0.47677333,0.47677333 0 0 0 -0.854,0.21688 l -1.22428,4.147467 A 0.51550667,0.51550667 0 0 1 5.4407935,10.48 L 3.3335402,0 14.006553,0.5995333 A 0.51544,0.51544 0 0 1 14.27714,1.55656 L 10.34526,3.3567733 A 0.4768,0.4768 0 0 0 10.25167,4.2329067 L 13.528287,6.99804 a 9.66876,9.66876 0 0 1 3.119786,7.72596 z"
+     fill="#000000" />
+</svg>
diff --git a/src/displayapp/icons/navigation/on_ramp_slight_right.svg b/src/displayapp/icons/navigation/on_ramp_slight_right.svg
new file mode 100644
index 00000000..3ce94e68
--- /dev/null
+++ b/src/displayapp/icons/navigation/on_ramp_slight_right.svg
@@ -0,0 +1,58 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   inkscape:version="1.0 (4035a4fb49, 2020-05-01)"
+   sodipodi:docname="on_ramp_slight_right.svg"
+   version="1.1"
+   viewBox="0 0 20 20"
+   height="20"
+   width="20"
+   data-name="WORKING ICONS"
+   id="WORKING_ICONS">
+  <metadata
+     id="metadata11">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs9" />
+  <sodipodi:namedview
+     inkscape:current-layer="WORKING_ICONS"
+     inkscape:window-maximized="1"
+     inkscape:window-y="22"
+     inkscape:window-x="-8"
+     inkscape:cy="10.586548"
+     inkscape:cx="8.6793365"
+     inkscape:zoom="21.5"
+     showgrid="false"
+     id="namedview7"
+     inkscape:window-height="1027"
+     inkscape:window-width="1920"
+     inkscape:pageshadow="2"
+     inkscape:pageopacity="0"
+     guidetolerance="10"
+     gridtolerance="10"
+     objecttolerance="10"
+     borderopacity="1"
+     bordercolor="#666666"
+     pagecolor="#ffffff" />
+  <title
+     id="title2">direction</title>
+  <path
+     style="stroke-width:1.33333"
+     id="path4"
+     d="M 6.4717127,6.9980533 9.7483257,4.2329067 A 0.4768,0.4768 0 0 0 9.6547397,3.3567733 L 5.7228595,1.55656 A 0.51544,0.51544 0 0 1 5.9934462,0.5995333 L 16.66646,0 14.559206,10.48 a 0.51550667,0.51550667 0 0 1 -0.98584,0.13216 l -1.22424,-4.14748 a 0.47677333,0.47677333 0 0 0 -0.854,-0.21688 L 8.2308327,9.001947 A 6.9575867,6.9575867 0 0 0 6.0108328,14.52728 l 0.00627,4.810227 A 0.66152,0.66152 0 0 1 5.3554995,20 h -1.34204 A 0.66161333,0.66161333 0 0 1 3.3519262,19.338373 V 14.724 A 9.66876,9.66876 0 0 1 6.4717127,6.9980533 Z"
+     fill="#000000" />
+</svg>
diff --git a/src/displayapp/icons/navigation/on_ramp_straight.svg b/src/displayapp/icons/navigation/on_ramp_straight.svg
new file mode 100644
index 00000000..b1f0e45a
--- /dev/null
+++ b/src/displayapp/icons/navigation/on_ramp_straight.svg
@@ -0,0 +1,58 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   inkscape:version="1.0 (4035a4fb49, 2020-05-01)"
+   sodipodi:docname="on_ramp_straight.svg"
+   version="1.1"
+   viewBox="0 0 20 20"
+   height="20"
+   width="20"
+   data-name="WORKING ICONS"
+   id="WORKING_ICONS">
+  <metadata
+     id="metadata11">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs9" />
+  <sodipodi:namedview
+     inkscape:current-layer="WORKING_ICONS"
+     inkscape:window-maximized="1"
+     inkscape:window-y="22"
+     inkscape:window-x="-8"
+     inkscape:cy="11.826236"
+     inkscape:cx="9.7010571"
+     inkscape:zoom="21.5"
+     showgrid="false"
+     id="namedview7"
+     inkscape:window-height="1027"
+     inkscape:window-width="1920"
+     inkscape:pageshadow="2"
+     inkscape:pageopacity="0"
+     guidetolerance="10"
+     gridtolerance="10"
+     objecttolerance="10"
+     borderopacity="1"
+     bordercolor="#666666"
+     pagecolor="#ffffff" />
+  <title
+     id="title2">direction</title>
+  <path
+     style="stroke-width:1.25"
+     id="path4"
+     d="M 15.617836,8.707962 11.928024,7.028275 A 0.4469375,0.4469375 0 0 0 11.250011,7.5 V 19.37065 A 0.629325,0.629325 0 0 1 10.620661,20 H 9.3794106 a 0.629325,0.629325 0 0 1 -0.62935,-0.62935 V 7.5 A 0.44695,0.44695 0 0 0 8.0720358,7.028275 L 4.3821733,8.707962 A 0.4832375,0.4832375 0 0 1 3.8703983,7.9285375 L 10.000011,0 16.129624,7.9285375 A 0.48325,0.48325 0 0 1 15.617836,8.707962 Z"
+     fill="#000000" />
+</svg>
diff --git a/src/displayapp/icons/navigation/rotary-left-white.svg b/src/displayapp/icons/navigation/rotary-left-white.svg
deleted file mode 100644
index d6e044f0..00000000
--- a/src/displayapp/icons/navigation/rotary-left-white.svg
+++ /dev/null
@@ -1,4 +0,0 @@
-<svg id="WORKING_ICONS" data-name="WORKING ICONS" xmlns="http://www.w3.org/2000/svg" width="20" height="20" viewBox="0 0 20 20">
-  <title>direction</title>
-  <path fill="#ffffff" d="M13,6.2A3.8,3.8,0,1,1,9.2,10,3.80428,3.80428,0,0,1,13,6.2m0,7A3.2,3.2,0,1,0,9.8,10,3.20362,3.20362,0,0,0,13,13.2M13,6a4,4,0,1,0,4,4,4.00458,4.00458,0,0,0-4-4h0Zm0,7a3,3,0,1,1,3-3,3.00328,3.00328,0,0,1-3,3h0Zm2.82861-5.82812a4.0315,4.0315,0,0,0-.542-0.45459,4.078,4.078,0,0,0-5.11475.4541A3.96842,3.96842,0,0,0,9.03076,9.5H5a0.17879,0.17879,0,0,1-.18866-0.27124L5.48322,7.75287a0.1933,0.1933,0,0,0-.31177-0.20471L2,10l3.17145,2.45184a0.1933,0.1933,0,0,0,.31177-0.20471L4.81134,10.77124A0.17879,0.17879,0,0,1,5,10.5h5V10a2.98063,2.98063,0,0,1,.87891-2.12158,3.06088,3.06088,0,0,1,3.83545-.34082,3.02248,3.02248,0,0,1,.40723.34131A2.99976,2.99976,0,0,1,13,13H12.5v4h1V13.96924A4.00038,4.00038,0,0,0,15.82861,7.17188Z"/>
-</svg>
diff --git a/src/displayapp/icons/navigation/rotary-left.c b/src/displayapp/icons/navigation/rotary-left.c
deleted file mode 100644
index c54c5d3d..00000000
--- a/src/displayapp/icons/navigation/rotary-left.c
+++ /dev/null
@@ -1,96 +0,0 @@
-#if defined(LV_LVGL_H_INCLUDE_SIMPLE)
-#include "lvgl.h"
-#else
-#include "lvgl/lvgl.h"
-#endif
-
-
-#ifndef LV_ATTRIBUTE_MEM_ALIGN
-#define LV_ATTRIBUTE_MEM_ALIGN
-#endif
-
-#ifndef LV_ATTRIBUTE_IMG_ROTARY_LEFT
-#define LV_ATTRIBUTE_IMG_ROTARY_LEFT
-#endif
-
-const LV_ATTRIBUTE_MEM_ALIGN LV_ATTRIBUTE_LARGE_CONST LV_ATTRIBUTE_IMG_ROTARY_LEFT uint8_t rotary_left_map[] = {
-  0x04, 0x02, 0x04, 0xff, 	/*Color of index 0*/
-  0xfc, 0xfe, 0xfc, 0xff, 	/*Color of index 1*/
-
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x00, 0x0f, 0xff, 0xff, 0x80, 
-  0x00, 0x00, 0x00, 0x00, 0x1f, 0xff, 0xff, 0xe0, 
-  0x00, 0x00, 0x00, 0x00, 0x7f, 0xff, 0xff, 0xf0, 
-  0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xf8, 
-  0x00, 0x0f, 0x00, 0x00, 0xff, 0xff, 0xff, 0xfc, 
-  0x00, 0x3f, 0x80, 0x01, 0xff, 0xff, 0xff, 0xfe, 
-  0x00, 0x7f, 0x80, 0x03, 0xff, 0xff, 0xff, 0xfe, 
-  0x00, 0xff, 0x80, 0x07, 0xff, 0xe0, 0x3f, 0xff, 
-  0x03, 0xff, 0x80, 0x07, 0xff, 0xc0, 0x0f, 0xff, 
-  0x07, 0xff, 0x80, 0x07, 0xff, 0x00, 0x07, 0xff, 
-  0x0f, 0xff, 0x00, 0x0f, 0xfe, 0x00, 0x03, 0xff, 
-  0x1f, 0xff, 0x00, 0x0f, 0xfe, 0x00, 0x01, 0xff, 
-  0x7f, 0xfe, 0x00, 0x0f, 0xfc, 0x00, 0x00, 0xff, 
-  0xff, 0xff, 0xff, 0xff, 0xf8, 0x00, 0x00, 0xff, 
-  0xff, 0xff, 0xff, 0xff, 0xf8, 0x00, 0x00, 0x7f, 
-  0xff, 0xff, 0xff, 0xff, 0xf8, 0x00, 0x00, 0x7f, 
-  0xff, 0xff, 0xff, 0xff, 0xf0, 0x00, 0x00, 0x7f, 
-  0xff, 0xff, 0xff, 0xff, 0xf0, 0x00, 0x00, 0x7f, 
-  0xff, 0xff, 0xff, 0xff, 0xf8, 0x00, 0x00, 0x7f, 
-  0xff, 0xff, 0xff, 0xff, 0xf8, 0x00, 0x00, 0x7f, 
-  0xff, 0xff, 0xff, 0xff, 0xf8, 0x00, 0x00, 0xff, 
-  0x7f, 0xfe, 0x00, 0x0f, 0xfc, 0x00, 0x00, 0xff, 
-  0x1f, 0xff, 0x00, 0x0f, 0xfe, 0x00, 0x01, 0xff, 
-  0x0f, 0xff, 0x00, 0x0f, 0xfe, 0x00, 0x03, 0xff, 
-  0x07, 0xff, 0x80, 0x07, 0xff, 0x00, 0x07, 0xff, 
-  0x03, 0xff, 0x80, 0x07, 0xff, 0xc0, 0x0f, 0xff, 
-  0x00, 0xff, 0x80, 0x07, 0xff, 0xe0, 0x3f, 0xff, 
-  0x00, 0x7f, 0x80, 0x03, 0xff, 0xff, 0xff, 0xfe, 
-  0x00, 0x3f, 0x80, 0x01, 0xff, 0xff, 0xff, 0xfe, 
-  0x00, 0x0f, 0x00, 0x00, 0xff, 0xff, 0xff, 0xfc, 
-  0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xf8, 
-  0x00, 0x00, 0x00, 0x00, 0x7f, 0xff, 0xff, 0xf0, 
-  0x00, 0x00, 0x00, 0x00, 0x1f, 0xff, 0xff, 0xe0, 
-  0x00, 0x00, 0x00, 0x00, 0x0f, 0xff, 0xff, 0xc0, 
-  0x00, 0x00, 0x00, 0x00, 0x07, 0xff, 0xff, 0x00, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xfc, 0x00, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x1f, 0xe0, 0x00, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x1f, 0xe0, 0x00, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x1f, 0xe0, 0x00, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x1f, 0xe0, 0x00, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x1f, 0xe0, 0x00, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x1f, 0xe0, 0x00, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x1f, 0xe0, 0x00, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x1f, 0xe0, 0x00, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x1f, 0xe0, 0x00, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x1f, 0xe0, 0x00, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x1f, 0xe0, 0x00, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-};
-
-const lv_img_dsc_t rotary_left = {
-      {
-        LV_IMG_CF_INDEXED_1BIT,
-        0,
-        0,
-        64,
-        64
-    },
-    520,
-rotary_left_map,
-};
diff --git a/src/displayapp/icons/navigation/rotary-left.png b/src/displayapp/icons/navigation/rotary-left.png
deleted file mode 100644
index 2531b5cf..00000000
--- a/src/displayapp/icons/navigation/rotary-left.png
+++ /dev/null
diff --git a/src/displayapp/icons/navigation/rotary-right-white.svg b/src/displayapp/icons/navigation/rotary-right-white.svg
deleted file mode 100644
index 1389b1ce..00000000
--- a/src/displayapp/icons/navigation/rotary-right-white.svg
+++ /dev/null
@@ -1,4 +0,0 @@
-<svg id="WORKING_ICONS" data-name="WORKING ICONS" xmlns="http://www.w3.org/2000/svg" width="20" height="20" viewBox="0 0 20 20">
-  <title>direction</title>
-  <path fill="#ffffff" d="M7,6.2A3.8,3.8,0,1,1,3.2,10,3.80428,3.80428,0,0,1,7,6.2m0,7A3.2,3.2,0,1,0,3.8,10,3.20362,3.20362,0,0,0,7,13.2M7,6a4,4,0,1,0,4,4A4.00458,4.00458,0,0,0,7,6H7Zm0,7a3,3,0,1,1,3-3,3.00328,3.00328,0,0,1-3,3H7Zm7.83777-5.45184a0.1933,0.1933,0,0,0-.31177.20471l0.67188,1.47589A0.17881,0.17881,0,0,1,15.00916,9.5H10V10a2.99994,2.99994,0,0,1-3,3H6.5v4h1V13.96924A4.0032,4.0032,0,0,0,10.96924,10.5h4.03992a0.17881,0.17881,0,0,1,.18872.27124L14.526,12.24713a0.1933,0.1933,0,0,0,.31177.20471L18.00916,10Z"/>
-</svg>
diff --git a/src/displayapp/icons/navigation/rotary-right.c b/src/displayapp/icons/navigation/rotary-right.c
deleted file mode 100644
index 15f95425..00000000
--- a/src/displayapp/icons/navigation/rotary-right.c
+++ /dev/null
@@ -1,96 +0,0 @@
-#if defined(LV_LVGL_H_INCLUDE_SIMPLE)
-#include "lvgl.h"
-#else
-#include "lvgl/lvgl.h"
-#endif
-
-
-#ifndef LV_ATTRIBUTE_MEM_ALIGN
-#define LV_ATTRIBUTE_MEM_ALIGN
-#endif
-
-#ifndef LV_ATTRIBUTE_IMG_ROTARY_RIGHT
-#define LV_ATTRIBUTE_IMG_ROTARY_RIGHT
-#endif
-
-const LV_ATTRIBUTE_MEM_ALIGN LV_ATTRIBUTE_LARGE_CONST LV_ATTRIBUTE_IMG_ROTARY_RIGHT uint8_t rotary_right_map[] = {
-  0x04, 0x02, 0x04, 0xff, 	/*Color of index 0*/
-  0xfc, 0xfe, 0xfc, 0xff, 	/*Color of index 1*/
-
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x01, 0xff, 0xff, 0xf0, 0x00, 0x00, 0x00, 0x00, 
-  0x07, 0xff, 0xff, 0xf8, 0x00, 0x00, 0x00, 0x00, 
-  0x0f, 0xff, 0xff, 0xfc, 0x00, 0x00, 0x00, 0x00, 
-  0x1f, 0xff, 0xff, 0xfe, 0x00, 0x00, 0x00, 0x00, 
-  0x3f, 0xff, 0xff, 0xff, 0x00, 0x01, 0xf0, 0x00, 
-  0x7f, 0xff, 0xff, 0xff, 0x80, 0x01, 0xf8, 0x00, 
-  0x7f, 0xff, 0xff, 0xff, 0xc0, 0x01, 0xfe, 0x00, 
-  0xff, 0xfc, 0x07, 0xff, 0xc0, 0x01, 0xff, 0x00, 
-  0xff, 0xf0, 0x03, 0xff, 0xe0, 0x01, 0xff, 0x80, 
-  0xff, 0xe0, 0x00, 0xff, 0xe0, 0x01, 0xff, 0xe0, 
-  0xff, 0xc0, 0x00, 0x7f, 0xe0, 0x00, 0xff, 0xf0, 
-  0xff, 0x80, 0x00, 0x7f, 0xf0, 0x00, 0xff, 0xf8, 
-  0xff, 0x00, 0x00, 0x3f, 0xf0, 0x00, 0xff, 0xfc, 
-  0xff, 0x00, 0x00, 0x1f, 0xff, 0xff, 0xff, 0xff, 
-  0xfe, 0x00, 0x00, 0x1f, 0xff, 0xff, 0xff, 0xff, 
-  0xfe, 0x00, 0x00, 0x1f, 0xff, 0xff, 0xff, 0xff, 
-  0xfe, 0x00, 0x00, 0x0f, 0xff, 0xff, 0xff, 0xff, 
-  0xfe, 0x00, 0x00, 0x0f, 0xff, 0xff, 0xff, 0xff, 
-  0xfe, 0x00, 0x00, 0x1f, 0xff, 0xff, 0xff, 0xff, 
-  0xfe, 0x00, 0x00, 0x1f, 0xff, 0xff, 0xff, 0xff, 
-  0xff, 0x00, 0x00, 0x1f, 0xff, 0xff, 0xff, 0xff, 
-  0xff, 0x00, 0x00, 0x3f, 0xf0, 0x00, 0xff, 0xfc, 
-  0xff, 0x80, 0x00, 0x7f, 0xf0, 0x00, 0xff, 0xf8, 
-  0xff, 0xc0, 0x00, 0x7f, 0xe0, 0x00, 0xff, 0xf0, 
-  0xff, 0xe0, 0x00, 0xff, 0xe0, 0x01, 0xff, 0xe0, 
-  0xff, 0xf0, 0x03, 0xff, 0xe0, 0x01, 0xff, 0x80, 
-  0xff, 0xfc, 0x07, 0xff, 0xc0, 0x01, 0xff, 0x00, 
-  0x7f, 0xff, 0xff, 0xff, 0xc0, 0x01, 0xfe, 0x00, 
-  0x7f, 0xff, 0xff, 0xff, 0x80, 0x01, 0xf8, 0x00, 
-  0x3f, 0xff, 0xff, 0xff, 0x00, 0x01, 0xf0, 0x00, 
-  0x1f, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 
-  0x0f, 0xff, 0xff, 0xfe, 0x00, 0x00, 0x00, 0x00, 
-  0x07, 0xff, 0xff, 0xf8, 0x00, 0x00, 0x00, 0x00, 
-  0x03, 0xff, 0xff, 0xf0, 0x00, 0x00, 0x00, 0x00, 
-  0x00, 0xff, 0xff, 0xe0, 0x00, 0x00, 0x00, 0x00, 
-  0x00, 0x3f, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x00, 0x07, 0xf8, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x00, 0x07, 0xf8, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x00, 0x07, 0xf8, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x00, 0x07, 0xf8, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x00, 0x07, 0xf8, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x00, 0x07, 0xf8, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x00, 0x07, 0xf8, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x00, 0x07, 0xf8, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x00, 0x07, 0xf8, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x00, 0x07, 0xf8, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x00, 0x07, 0xf8, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-};
-
-const lv_img_dsc_t rotary_right = {
-      {
-        LV_IMG_CF_INDEXED_1BIT,
-        0,
-        0,
-        64,
-        64
-    },
-    520,
-rotary_right_map,
-};
diff --git a/src/displayapp/icons/navigation/rotary-right.png b/src/displayapp/icons/navigation/rotary-right.png
deleted file mode 100644
index eb19d987..00000000
--- a/src/displayapp/icons/navigation/rotary-right.png
+++ /dev/null
diff --git a/src/displayapp/icons/navigation/rotary-sharp-left-white.svg b/src/displayapp/icons/navigation/rotary-sharp-left-white.svg
deleted file mode 100644
index bf04ccfd..00000000
--- a/src/displayapp/icons/navigation/rotary-sharp-left-white.svg
+++ /dev/null
@@ -1,4 +0,0 @@
-<svg id="WORKING_ICONS" data-name="WORKING ICONS" xmlns="http://www.w3.org/2000/svg" width="20" height="20" viewBox="0 0 20 20">
-  <title>direction</title>
-  <path fill="#ffffff" d="M10.994,5.2A3.8,3.8,0,1,1,7.194,9a3.80428,3.80428,0,0,1,3.8-3.8m0,7A3.2,3.2,0,1,0,7.794,9a3.20362,3.20362,0,0,0,3.2,3.2m0-7.2a4,4,0,1,0,4,4,4.00458,4.00458,0,0,0-4-4h0Zm0,7a3,3,0,1,1,3-3,3.00328,3.00328,0,0,1-3,3h0Zm2.8291-5.82812a4.03583,4.03583,0,0,0-.54248-0.45459,4.07906,4.07906,0,0,0-5.11475.4541,4.00058,4.00058,0,0,0-.33252,5.28076L4.76758,14.51792a0.17873,0.17873,0,0,1-.325-0.05847L3.874,12.94071a0.19332,0.19332,0,0,0-.36523.07568L3,16.99265l3.97626-.50879a0.19332,0.19332,0,0,0,.07568-0.36523L5.5332,15.55008a0.17879,0.17879,0,0,1-.05835-0.3252l-0.00037-.00037,3.40378-3.40567,0.33838-.353-0.34521-.34619A2.9995,2.9995,0,0,1,8.8729,6.87842a3.06063,3.06063,0,0,1,3.83545-.34082,3.02673,3.02673,0,0,1,.40771.34131A3,3,0,0,1,10.994,12h-0.5v4h1V12.96924A4.00076,4.00076,0,0,0,13.82309,6.17188Z"/>
-</svg>
diff --git a/src/displayapp/icons/navigation/rotary-sharp-left.c b/src/displayapp/icons/navigation/rotary-sharp-left.c
deleted file mode 100644
index c1d49213..00000000
--- a/src/displayapp/icons/navigation/rotary-sharp-left.c
+++ /dev/null
@@ -1,96 +0,0 @@
-#if defined(LV_LVGL_H_INCLUDE_SIMPLE)
-#include "lvgl.h"
-#else
-#include "lvgl/lvgl.h"
-#endif
-
-
-#ifndef LV_ATTRIBUTE_MEM_ALIGN
-#define LV_ATTRIBUTE_MEM_ALIGN
-#endif
-
-#ifndef LV_ATTRIBUTE_IMG_ROTARY_SHARP_LEFT
-#define LV_ATTRIBUTE_IMG_ROTARY_SHARP_LEFT
-#endif
-
-const LV_ATTRIBUTE_MEM_ALIGN LV_ATTRIBUTE_LARGE_CONST LV_ATTRIBUTE_IMG_ROTARY_SHARP_LEFT uint8_t rotary_sharp_left_map[] = {
-  0x04, 0x02, 0x04, 0xff, 	/*Color of index 0*/
-  0xfc, 0xfe, 0xfc, 0xff, 	/*Color of index 1*/
-
-  0x00, 0x00, 0x00, 0x01, 0xff, 0xff, 0xfc, 0x00, 
-  0x00, 0x00, 0x00, 0x03, 0xff, 0xff, 0xff, 0x00, 
-  0x00, 0x00, 0x00, 0x1f, 0xff, 0xff, 0xff, 0x80, 
-  0x00, 0x00, 0x00, 0x1f, 0xff, 0xff, 0xff, 0xe0, 
-  0x00, 0x00, 0x00, 0x3f, 0xff, 0xff, 0xff, 0xe0, 
-  0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xf8, 
-  0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xf8, 
-  0x00, 0x00, 0x01, 0xff, 0xff, 0xff, 0xff, 0xfc, 
-  0x00, 0x00, 0x03, 0xff, 0xff, 0x03, 0xff, 0xfe, 
-  0x00, 0x00, 0x03, 0xff, 0xf8, 0x00, 0x7f, 0xfe, 
-  0x00, 0x00, 0x03, 0xff, 0xe0, 0x00, 0x3f, 0xff, 
-  0x00, 0x00, 0x07, 0xff, 0xc0, 0x00, 0x1f, 0xff, 
-  0x00, 0x00, 0x07, 0xff, 0x80, 0x00, 0x0f, 0xff, 
-  0x00, 0x00, 0x0f, 0xff, 0x00, 0x00, 0x07, 0xff, 
-  0x00, 0x00, 0x0f, 0xfe, 0x00, 0x00, 0x03, 0xff, 
-  0x00, 0x00, 0x0f, 0xfe, 0x00, 0x00, 0x01, 0xff, 
-  0x00, 0x00, 0x1f, 0xfc, 0x00, 0x00, 0x01, 0xff, 
-  0x00, 0x00, 0x1f, 0xfc, 0x00, 0x00, 0x01, 0xff, 
-  0x00, 0x00, 0x1f, 0xf8, 0x00, 0x00, 0x00, 0xff, 
-  0x00, 0x00, 0x1f, 0xf8, 0x00, 0x00, 0x00, 0xff, 
-  0x00, 0x00, 0x1f, 0xf8, 0x00, 0x00, 0x00, 0xff, 
-  0x00, 0x00, 0x1f, 0xf8, 0x00, 0x00, 0x00, 0xff, 
-  0x00, 0x00, 0x1f, 0xf8, 0x00, 0x00, 0x00, 0xff, 
-  0x00, 0x00, 0x1f, 0xf8, 0x00, 0x00, 0x00, 0xff, 
-  0x00, 0x00, 0x1f, 0xfc, 0x00, 0x00, 0x01, 0xff, 
-  0x00, 0x00, 0x1f, 0xfc, 0x00, 0x00, 0x01, 0xff, 
-  0x00, 0x00, 0x0f, 0xfc, 0x00, 0x00, 0x01, 0xff, 
-  0x00, 0x00, 0x0f, 0xfe, 0x00, 0x00, 0x03, 0xff, 
-  0x00, 0x00, 0x0f, 0xfe, 0x00, 0x00, 0x03, 0xff, 
-  0x00, 0x00, 0x0f, 0xff, 0x00, 0x00, 0x07, 0xff, 
-  0x00, 0x00, 0x07, 0xff, 0x80, 0x00, 0x0f, 0xff, 
-  0x00, 0x00, 0x07, 0xff, 0xc0, 0x00, 0x1f, 0xff, 
-  0x00, 0x00, 0x03, 0xff, 0xe0, 0x00, 0x3f, 0xff, 
-  0x00, 0x00, 0x03, 0xff, 0xf8, 0x00, 0xff, 0xfe, 
-  0x00, 0x00, 0x03, 0xff, 0xff, 0x03, 0xff, 0xfc, 
-  0x00, 0x00, 0x07, 0xff, 0xff, 0xff, 0xff, 0xfc, 
-  0x00, 0x00, 0x0f, 0xff, 0xff, 0xff, 0xff, 0xf8, 
-  0x00, 0x00, 0x1f, 0xff, 0xff, 0xff, 0xff, 0xf0, 
-  0x00, 0x00, 0x3f, 0xff, 0xff, 0xff, 0xff, 0xe0, 
-  0x00, 0x00, 0x7f, 0xff, 0xff, 0xff, 0xff, 0xe0, 
-  0x7e, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0x80, 
-  0x7e, 0x01, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 
-  0x7f, 0x03, 0xff, 0xf8, 0xff, 0xff, 0xf8, 0x00, 
-  0x7f, 0x07, 0xff, 0xf0, 0x3f, 0xff, 0xe0, 0x00, 
-  0xff, 0x8f, 0xff, 0xe0, 0x03, 0xff, 0x00, 0x00, 
-  0xff, 0x9f, 0xff, 0xc0, 0x03, 0xfe, 0x00, 0x00, 
-  0xff, 0xbf, 0xff, 0x80, 0x03, 0xfe, 0x00, 0x00, 
-  0xff, 0xff, 0xff, 0x00, 0x03, 0xfe, 0x00, 0x00, 
-  0xff, 0xff, 0xfe, 0x00, 0x03, 0xfe, 0x00, 0x00, 
-  0xff, 0xff, 0xfc, 0x00, 0x03, 0xfe, 0x00, 0x00, 
-  0xff, 0xff, 0xf8, 0x00, 0x03, 0xfe, 0x00, 0x00, 
-  0xff, 0xff, 0xf0, 0x00, 0x03, 0xfe, 0x00, 0x00, 
-  0xff, 0xff, 0xe0, 0x00, 0x03, 0xfe, 0x00, 0x00, 
-  0xff, 0xff, 0xc0, 0x00, 0x03, 0xfe, 0x00, 0x00, 
-  0xff, 0xff, 0x80, 0x00, 0x03, 0xfe, 0x00, 0x00, 
-  0xff, 0xff, 0xf0, 0x00, 0x03, 0xfe, 0x00, 0x00, 
-  0xff, 0xff, 0xfc, 0x00, 0x03, 0xfe, 0x00, 0x00, 
-  0xff, 0xff, 0xff, 0x00, 0x03, 0xfe, 0x00, 0x00, 
-  0xff, 0xff, 0xff, 0x00, 0x03, 0xfe, 0x00, 0x00, 
-  0xff, 0xff, 0xff, 0x00, 0x03, 0xfe, 0x00, 0x00, 
-  0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0xff, 0xff, 0xf0, 0x00, 0x00, 0x00, 0x00, 0x00, 
-};
-
-const lv_img_dsc_t rotary_sharp_left = {
-      {
-        LV_IMG_CF_INDEXED_1BIT,
-        0,
-        0,
-        64,
-        64
-    },
-    520,
-rotary_sharp_left_map,
-};
diff --git a/src/displayapp/icons/navigation/rotary-sharp-left.png b/src/displayapp/icons/navigation/rotary-sharp-left.png
deleted file mode 100644
index 974fb1f0..00000000
--- a/src/displayapp/icons/navigation/rotary-sharp-left.png
+++ /dev/null
diff --git a/src/displayapp/icons/navigation/rotary-sharp-right-white.svg b/src/displayapp/icons/navigation/rotary-sharp-right-white.svg
deleted file mode 100644
index e48b71be..00000000
--- a/src/displayapp/icons/navigation/rotary-sharp-right-white.svg
+++ /dev/null
@@ -1,4 +0,0 @@
-<svg id="WORKING_ICONS" data-name="WORKING ICONS" xmlns="http://www.w3.org/2000/svg" width="20" height="20" viewBox="0 0 20 20">
-  <title>direction</title>
-  <path fill="#ffffff" d="M8.97217,5.2a3.8,3.8,0,1,1-3.8,3.8,3.8043,3.8043,0,0,1,3.8-3.8m0,7a3.2,3.2,0,1,0-3.2-3.2,3.20361,3.20361,0,0,0,3.2,3.2m0-7.2a4,4,0,1,0,4,4,4.00458,4.00458,0,0,0-4-4h0Zm0,7a3,3,0,1,1,3-3,3.00328,3.00328,0,0,1-3,3h0Zm7.491,1.02374a0.19328,0.19328,0,0,0-.36517-0.07568L15.52948,14.4668a0.17883,0.17883,0,0,1-.32526.05835l-0.00018.00018-3.75726-3.75726-0.35352.35352A2.98022,2.98022,0,0,1,8.97217,12h-0.5v4h1V12.96924a3.95621,3.95621,0,0,0,1.95264-.80859l3.07312,3.07275a0.17841,0.17841,0,0,1-.05914.324L12.9201,16.126a0.1933,0.1933,0,0,0,.07568.36523L16.972,17Z"/>
-</svg>
diff --git a/src/displayapp/icons/navigation/rotary-sharp-right.c b/src/displayapp/icons/navigation/rotary-sharp-right.c
deleted file mode 100644
index d0d05ca6..00000000
--- a/src/displayapp/icons/navigation/rotary-sharp-right.c
+++ /dev/null
@@ -1,96 +0,0 @@
-#if defined(LV_LVGL_H_INCLUDE_SIMPLE)
-#include "lvgl.h"
-#else
-#include "lvgl/lvgl.h"
-#endif
-
-
-#ifndef LV_ATTRIBUTE_MEM_ALIGN
-#define LV_ATTRIBUTE_MEM_ALIGN
-#endif
-
-#ifndef LV_ATTRIBUTE_IMG_ROTARY_SHARP_RIGHT
-#define LV_ATTRIBUTE_IMG_ROTARY_SHARP_RIGHT
-#endif
-
-const LV_ATTRIBUTE_MEM_ALIGN LV_ATTRIBUTE_LARGE_CONST LV_ATTRIBUTE_IMG_ROTARY_SHARP_RIGHT uint8_t rotary_sharp_right_map[] = {
-  0x04, 0x02, 0x04, 0xff, 	/*Color of index 0*/
-  0xfc, 0xfe, 0xfc, 0xff, 	/*Color of index 1*/
-
-  0x00, 0x3f, 0xff, 0xff, 0x80, 0x00, 0x00, 0x00, 
-  0x00, 0xff, 0xff, 0xff, 0xc0, 0x00, 0x00, 0x00, 
-  0x03, 0xff, 0xff, 0xff, 0xf0, 0x00, 0x00, 0x00, 
-  0x07, 0xff, 0xff, 0xff, 0xf8, 0x00, 0x00, 0x00, 
-  0x07, 0xff, 0xff, 0xff, 0xfc, 0x00, 0x00, 0x00, 
-  0x1f, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 
-  0x3f, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 
-  0x3f, 0xff, 0xff, 0xff, 0xff, 0x80, 0x00, 0x00, 
-  0x7f, 0xff, 0xc0, 0xff, 0xff, 0xc0, 0x00, 0x00, 
-  0x7f, 0xfe, 0x00, 0x1f, 0xff, 0xc0, 0x00, 0x00, 
-  0xff, 0xfc, 0x00, 0x07, 0xff, 0xc0, 0x00, 0x00, 
-  0xff, 0xf8, 0x00, 0x03, 0xff, 0xe0, 0x00, 0x00, 
-  0xff, 0xf0, 0x00, 0x01, 0xff, 0xe0, 0x00, 0x00, 
-  0xff, 0xe0, 0x00, 0x00, 0xff, 0xf0, 0x00, 0x00, 
-  0xff, 0xc0, 0x00, 0x00, 0xff, 0xf0, 0x00, 0x00, 
-  0xff, 0x80, 0x00, 0x00, 0x7f, 0xf0, 0x00, 0x00, 
-  0xff, 0x80, 0x00, 0x00, 0x7f, 0xf0, 0x00, 0x00, 
-  0xff, 0x80, 0x00, 0x00, 0x3f, 0xf0, 0x00, 0x00, 
-  0xff, 0x00, 0x00, 0x00, 0x3f, 0xf8, 0x00, 0x00, 
-  0xff, 0x00, 0x00, 0x00, 0x1f, 0xf8, 0x00, 0x00, 
-  0xff, 0x00, 0x00, 0x00, 0x1f, 0xf8, 0x00, 0x00, 
-  0xfe, 0x00, 0x00, 0x00, 0x1f, 0xf8, 0x00, 0x00, 
-  0xff, 0x00, 0x00, 0x00, 0x1f, 0xf8, 0x00, 0x00, 
-  0xff, 0x00, 0x00, 0x00, 0x1f, 0xf8, 0x00, 0x00, 
-  0xff, 0x00, 0x00, 0x00, 0x3f, 0xf8, 0x00, 0x00, 
-  0xff, 0x80, 0x00, 0x00, 0x3f, 0xf0, 0x00, 0x00, 
-  0xff, 0x80, 0x00, 0x00, 0x7f, 0xf0, 0x00, 0x00, 
-  0xff, 0xc0, 0x00, 0x00, 0x7f, 0xf0, 0x00, 0x00, 
-  0xff, 0xc0, 0x00, 0x00, 0xff, 0xf0, 0x00, 0x00, 
-  0xff, 0xe0, 0x00, 0x00, 0xff, 0xe0, 0x00, 0x00, 
-  0xff, 0xf0, 0x00, 0x03, 0xff, 0xe0, 0x00, 0x00, 
-  0xff, 0xf8, 0x00, 0x03, 0xff, 0xe0, 0x00, 0x00, 
-  0xff, 0xfc, 0x00, 0x0f, 0xff, 0xc0, 0x00, 0x00, 
-  0x7f, 0xff, 0x00, 0x3f, 0xff, 0xc0, 0x00, 0x00, 
-  0x7f, 0xff, 0xc0, 0xff, 0xff, 0xc0, 0x00, 0x00, 
-  0x3f, 0xff, 0xff, 0xff, 0xff, 0xe0, 0x00, 0x00, 
-  0x3f, 0xff, 0xff, 0xff, 0xff, 0xf0, 0x00, 0x00, 
-  0x0f, 0xff, 0xff, 0xff, 0xff, 0xf8, 0x00, 0x00, 
-  0x07, 0xff, 0xff, 0xff, 0xff, 0xfc, 0x00, 0x00, 
-  0x07, 0xff, 0xff, 0xff, 0xff, 0xfe, 0x00, 0x00, 
-  0x01, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x7e, 
-  0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0x80, 0x7e, 
-  0x00, 0x1f, 0xff, 0xff, 0x1f, 0xff, 0xc0, 0xfe, 
-  0x00, 0x07, 0xff, 0xfc, 0x0f, 0xff, 0xe0, 0xfe, 
-  0x00, 0x00, 0xff, 0xc0, 0x0f, 0xff, 0xf1, 0xfe, 
-  0x00, 0x00, 0xff, 0xc0, 0x03, 0xff, 0xf9, 0xff, 
-  0x00, 0x00, 0xff, 0xc0, 0x03, 0xff, 0xfd, 0xff, 
-  0x00, 0x00, 0xff, 0xc0, 0x01, 0xff, 0xff, 0xff, 
-  0x00, 0x00, 0xff, 0xc0, 0x00, 0x7f, 0xff, 0xff, 
-  0x00, 0x00, 0xff, 0xc0, 0x00, 0x7f, 0xff, 0xff, 
-  0x00, 0x00, 0xff, 0xc0, 0x00, 0x3f, 0xff, 0xff, 
-  0x00, 0x00, 0xff, 0xc0, 0x00, 0x0f, 0xff, 0xff, 
-  0x00, 0x00, 0xff, 0xc0, 0x00, 0x0f, 0xff, 0xff, 
-  0x00, 0x00, 0xff, 0xc0, 0x00, 0x03, 0xff, 0xff, 
-  0x00, 0x00, 0xff, 0xc0, 0x00, 0x01, 0xff, 0xff, 
-  0x00, 0x00, 0xff, 0xc0, 0x00, 0x0f, 0xff, 0xff, 
-  0x00, 0x00, 0xff, 0xc0, 0x00, 0x3f, 0xff, 0xff, 
-  0x00, 0x00, 0xff, 0xc0, 0x00, 0xff, 0xff, 0xff, 
-  0x00, 0x00, 0xff, 0xc0, 0x00, 0xff, 0xff, 0xff, 
-  0x00, 0x00, 0xff, 0xc0, 0x00, 0xff, 0xff, 0xff, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x0f, 0xff, 0xff, 
-};
-
-const lv_img_dsc_t rotary_sharp_right = {
-      {
-        LV_IMG_CF_INDEXED_1BIT,
-        0,
-        0,
-        64,
-        64
-    },
-    520,
-rotary_sharp_right_map,
-};
diff --git a/src/displayapp/icons/navigation/rotary-sharp-right.png b/src/displayapp/icons/navigation/rotary-sharp-right.png
deleted file mode 100644
index 20839129..00000000
--- a/src/displayapp/icons/navigation/rotary-sharp-right.png
+++ /dev/null
diff --git a/src/displayapp/icons/navigation/rotary-slight-left-white.svg b/src/displayapp/icons/navigation/rotary-slight-left-white.svg
deleted file mode 100644
index f482aecb..00000000
--- a/src/displayapp/icons/navigation/rotary-slight-left-white.svg
+++ /dev/null
@@ -1,4 +0,0 @@
-<svg id="WORKING_ICONS" data-name="WORKING ICONS" xmlns="http://www.w3.org/2000/svg" width="20" height="20" viewBox="0 0 20 20">
-  <title>direction</title>
-  <path fill="#ffffff" d="M10.97473,7.2a3.8,3.8,0,1,1-3.8,3.8,3.80428,3.80428,0,0,1,3.8-3.8m0,7a3.2,3.2,0,1,0-3.2-3.2,3.20362,3.20362,0,0,0,3.2,3.2m0-7.2a4,4,0,1,0,4,4,4.00458,4.00458,0,0,0-4-4h0Zm0,7a3,3,0,1,1,3-3,3.00328,3.00328,0,0,1-3,3h0Zm2.82861-5.82812a4.0315,4.0315,0,0,0-.542-0.45459,4.07671,4.07671,0,0,0-4.73975.12256l-3.04816-3.045A0.17774,0.17774,0,0,1,5.53412,4.473L7.0528,3.90442a0.1933,0.1933,0,0,0-.07568-0.36523L3.00085,3.0304,3.5097,7.00665a0.19328,0.19328,0,0,0,.36517.07568L4.44342,5.5636a0.17879,0.17879,0,0,1,.3252-0.05835L4.7688,5.50507,8.50061,9.23193l0.353-.35352a3.05971,3.05971,0,0,1,3.83545-.34082,3.02248,3.02248,0,0,1,.40723.34131A2.99976,2.99976,0,0,1,10.97473,14h-0.5v4h1V14.96924A4.00038,4.00038,0,0,0,13.80334,8.17188Z"/>
-</svg>
diff --git a/src/displayapp/icons/navigation/rotary-slight-left.c b/src/displayapp/icons/navigation/rotary-slight-left.c
deleted file mode 100644
index b285b43c..00000000
--- a/src/displayapp/icons/navigation/rotary-slight-left.c
+++ /dev/null
@@ -1,96 +0,0 @@
-#if defined(LV_LVGL_H_INCLUDE_SIMPLE)
-#include "lvgl.h"
-#else
-#include "lvgl/lvgl.h"
-#endif
-
-
-#ifndef LV_ATTRIBUTE_MEM_ALIGN
-#define LV_ATTRIBUTE_MEM_ALIGN
-#endif
-
-#ifndef LV_ATTRIBUTE_IMG_ROTARY_SLIGHT_LEFT
-#define LV_ATTRIBUTE_IMG_ROTARY_SLIGHT_LEFT
-#endif
-
-const LV_ATTRIBUTE_MEM_ALIGN LV_ATTRIBUTE_LARGE_CONST LV_ATTRIBUTE_IMG_ROTARY_SLIGHT_LEFT uint8_t rotary_slight_left_map[] = {
-  0x04, 0x02, 0x04, 0xff, 	/*Color of index 0*/
-  0xfc, 0xfe, 0xfc, 0xff, 	/*Color of index 1*/
-
-  0x01, 0xff, 0xff, 0x80, 0x00, 0x00, 0x00, 0x00, 
-  0x01, 0xff, 0xff, 0xe0, 0x00, 0x00, 0x00, 0x00, 
-  0x01, 0xff, 0xff, 0xe0, 0x00, 0x00, 0x00, 0x00, 
-  0x01, 0xff, 0xff, 0xe0, 0x00, 0x00, 0x00, 0x00, 
-  0x01, 0xff, 0xff, 0xe0, 0x00, 0x00, 0x00, 0x00, 
-  0x01, 0xff, 0xff, 0xe0, 0x00, 0x00, 0x00, 0x00, 
-  0x01, 0xff, 0xff, 0x80, 0x00, 0x00, 0x00, 0x00, 
-  0x01, 0xff, 0xfc, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x01, 0xff, 0xfc, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x01, 0xff, 0xfe, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x01, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x01, 0xff, 0xff, 0x80, 0x00, 0x00, 0x00, 0x00, 
-  0x01, 0xff, 0xff, 0xc0, 0x00, 0x00, 0x00, 0x00, 
-  0x01, 0xff, 0xff, 0xe0, 0x00, 0x00, 0x00, 0x00, 
-  0x01, 0xff, 0xff, 0xf0, 0x00, 0x00, 0x00, 0x00, 
-  0x01, 0xfd, 0xff, 0xf8, 0x07, 0xf8, 0x00, 0x00, 
-  0x01, 0xfc, 0xff, 0xfc, 0x7f, 0xff, 0x80, 0x00, 
-  0x01, 0xfc, 0x7f, 0xff, 0xff, 0xff, 0xe0, 0x00, 
-  0x01, 0xf8, 0x3f, 0xff, 0xff, 0xff, 0xf8, 0x00, 
-  0x01, 0xf8, 0x1f, 0xff, 0xff, 0xff, 0xfc, 0x00, 
-  0x00, 0x00, 0x0f, 0xff, 0xff, 0xff, 0xfe, 0x00, 
-  0x00, 0x00, 0x07, 0xff, 0xff, 0xff, 0xff, 0x00, 
-  0x00, 0x00, 0x03, 0xff, 0xff, 0xff, 0xff, 0x80, 
-  0x00, 0x00, 0x01, 0xff, 0xff, 0xff, 0xff, 0x80, 
-  0x00, 0x00, 0x00, 0xff, 0xfc, 0x0f, 0xff, 0xc0, 
-  0x00, 0x00, 0x01, 0xff, 0xf0, 0x03, 0xff, 0xc0, 
-  0x00, 0x00, 0x01, 0xff, 0xc0, 0x01, 0xff, 0xc0, 
-  0x00, 0x00, 0x01, 0xff, 0x80, 0x00, 0xff, 0xc0, 
-  0x00, 0x00, 0x03, 0xff, 0x80, 0x00, 0x7f, 0xc0, 
-  0x00, 0x00, 0x03, 0xff, 0x00, 0x00, 0x3f, 0xc0, 
-  0x00, 0x00, 0x03, 0xfe, 0x00, 0x00, 0x3f, 0xc0, 
-  0x00, 0x00, 0x03, 0xfe, 0x00, 0x00, 0x1f, 0xc0, 
-  0x00, 0x00, 0x03, 0xfe, 0x00, 0x00, 0x1f, 0xc0, 
-  0x00, 0x00, 0x03, 0xfc, 0x00, 0x00, 0x1f, 0xc0, 
-  0x00, 0x00, 0x03, 0xfc, 0x00, 0x00, 0x1f, 0xc0, 
-  0x00, 0x00, 0x03, 0xfc, 0x00, 0x00, 0x1f, 0xc0, 
-  0x00, 0x00, 0x03, 0xfe, 0x00, 0x00, 0x1f, 0xc0, 
-  0x00, 0x00, 0x03, 0xfe, 0x00, 0x00, 0x3f, 0xc0, 
-  0x00, 0x00, 0x03, 0xff, 0x00, 0x00, 0x3f, 0xc0, 
-  0x00, 0x00, 0x03, 0xff, 0x00, 0x00, 0x7f, 0xc0, 
-  0x00, 0x00, 0x03, 0xff, 0x80, 0x00, 0xff, 0xc0, 
-  0x00, 0x00, 0x01, 0xff, 0xc0, 0x01, 0xff, 0xc0, 
-  0x00, 0x00, 0x01, 0xff, 0xf0, 0x03, 0xff, 0xc0, 
-  0x00, 0x00, 0x00, 0xff, 0xf8, 0x07, 0xff, 0xc0, 
-  0x00, 0x00, 0x00, 0xff, 0xff, 0x3f, 0xff, 0x80, 
-  0x00, 0x00, 0x00, 0x7f, 0xff, 0xff, 0xff, 0x80, 
-  0x00, 0x00, 0x00, 0x7f, 0xff, 0xff, 0xff, 0x00, 
-  0x00, 0x00, 0x00, 0x3f, 0xff, 0xff, 0xfe, 0x00, 
-  0x00, 0x00, 0x00, 0x1f, 0xff, 0xff, 0xfc, 0x00, 
-  0x00, 0x00, 0x00, 0x0f, 0xff, 0xff, 0xf8, 0x00, 
-  0x00, 0x00, 0x00, 0x07, 0xff, 0xff, 0xf0, 0x00, 
-  0x00, 0x00, 0x00, 0x01, 0xff, 0xff, 0xc0, 0x00, 
-  0x00, 0x00, 0x00, 0x00, 0x3f, 0xff, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x00, 0x07, 0xf8, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x00, 0x07, 0xf8, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x00, 0x07, 0xf8, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x00, 0x07, 0xf8, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x00, 0x07, 0xf8, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x00, 0x07, 0xf8, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x00, 0x07, 0xf8, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x00, 0x07, 0xf8, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x00, 0x07, 0xf8, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x00, 0x07, 0xf8, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x00, 0x07, 0xf8, 0x00, 0x00, 
-};
-
-const lv_img_dsc_t rotary_slight_left = {
-      {
-        LV_IMG_CF_INDEXED_1BIT,
-        0,
-        0,
-        64,
-        64
-    },
-    520,
-rotary_slight_left_map,
-};
diff --git a/src/displayapp/icons/navigation/rotary-slight-left.png b/src/displayapp/icons/navigation/rotary-slight-left.png
deleted file mode 100644
index 0493f21a..00000000
--- a/src/displayapp/icons/navigation/rotary-slight-left.png
+++ /dev/null
diff --git a/src/displayapp/icons/navigation/rotary-slight-right-white.svg b/src/displayapp/icons/navigation/rotary-slight-right-white.svg
deleted file mode 100644
index a11f8cbd..00000000
--- a/src/displayapp/icons/navigation/rotary-slight-right-white.svg
+++ /dev/null
@@ -1,4 +0,0 @@
-<svg id="WORKING_ICONS" data-name="WORKING ICONS" xmlns="http://www.w3.org/2000/svg" width="20" height="20" viewBox="0 0 20 20">
-  <title>direction</title>
-  <path fill="#ffffff" d="M8.97128,7.2a3.8,3.8,0,1,1-3.8,3.8,3.80428,3.80428,0,0,1,3.8-3.8m0,7a3.2,3.2,0,1,0-3.2-3.2,3.20362,3.20362,0,0,0,3.2,3.2m0-7.2a4,4,0,1,0,4,4,4.00458,4.00458,0,0,0-4-4h0Zm0,7a3,3,0,1,1,3-3,3.00328,3.00328,0,0,1-3,3h0ZM13.05247,3.45127a0.19328,0.19328,0,0,0-.07568.36517l1.51874,0.5686a0.17878,0.17878,0,0,1,.05835.3252l0.00006,0.00006L10.73885,8.52539l0.35352,0.35352A2.99976,2.99976,0,0,1,8.97127,14h-0.5v3.97917h1V14.96924a4.00123,4.00123,0,0,0,2.66016-6.42236L15.261,5.41734a0.17878,0.17878,0,0,1,.3252.05835L16.1547,6.99443a0.19332,0.19332,0,0,0,.36523-0.07574l0.50879-3.9762Z"/>
-</svg>
diff --git a/src/displayapp/icons/navigation/rotary-slight-right.c b/src/displayapp/icons/navigation/rotary-slight-right.c
deleted file mode 100644
index 46e19cfe..00000000
--- a/src/displayapp/icons/navigation/rotary-slight-right.c
+++ /dev/null
@@ -1,96 +0,0 @@
-#if defined(LV_LVGL_H_INCLUDE_SIMPLE)
-#include "lvgl.h"
-#else
-#include "lvgl/lvgl.h"
-#endif
-
-
-#ifndef LV_ATTRIBUTE_MEM_ALIGN
-#define LV_ATTRIBUTE_MEM_ALIGN
-#endif
-
-#ifndef LV_ATTRIBUTE_IMG_ROTARY_SLIGHT_RIGHT
-#define LV_ATTRIBUTE_IMG_ROTARY_SLIGHT_RIGHT
-#endif
-
-const LV_ATTRIBUTE_MEM_ALIGN LV_ATTRIBUTE_LARGE_CONST LV_ATTRIBUTE_IMG_ROTARY_SLIGHT_RIGHT uint8_t rotary_slight_right_map[] = {
-  0x04, 0x02, 0x04, 0xff, 	/*Color of index 0*/
-  0xfc, 0xfe, 0xfc, 0xff, 	/*Color of index 1*/
-
-  0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xc0, 
-  0x00, 0x00, 0x00, 0x00, 0x03, 0xff, 0xff, 0xc0, 
-  0x00, 0x00, 0x00, 0x00, 0x03, 0xff, 0xff, 0xc0, 
-  0x00, 0x00, 0x00, 0x00, 0x03, 0xff, 0xff, 0xc0, 
-  0x00, 0x00, 0x00, 0x00, 0x03, 0xff, 0xff, 0xc0, 
-  0x00, 0x00, 0x00, 0x00, 0x03, 0xff, 0xff, 0xc0, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xc0, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x1f, 0xff, 0xc0, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x1f, 0xff, 0xc0, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x3f, 0xff, 0xc0, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x7f, 0xff, 0xc0, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xc0, 
-  0x00, 0x00, 0x00, 0x00, 0x01, 0xff, 0xff, 0xc0, 
-  0x00, 0x00, 0x00, 0x00, 0x03, 0xff, 0xff, 0xc0, 
-  0x00, 0x00, 0x00, 0x00, 0x07, 0xff, 0xff, 0xc0, 
-  0x00, 0x00, 0x0f, 0xf0, 0x0f, 0xff, 0xdf, 0xc0, 
-  0x00, 0x00, 0xff, 0xff, 0x1f, 0xff, 0x9f, 0xc0, 
-  0x00, 0x03, 0xff, 0xff, 0xff, 0xff, 0x1f, 0xc0, 
-  0x00, 0x0f, 0xff, 0xff, 0xff, 0xfe, 0x0f, 0xc0, 
-  0x00, 0x1f, 0xff, 0xff, 0xff, 0xfc, 0x0f, 0x80, 
-  0x00, 0x3f, 0xff, 0xff, 0xff, 0xf8, 0x00, 0x00, 
-  0x00, 0x7f, 0xff, 0xff, 0xff, 0xf0, 0x00, 0x00, 
-  0x00, 0xff, 0xff, 0xff, 0xff, 0xe0, 0x00, 0x00, 
-  0x00, 0xff, 0xff, 0xff, 0xff, 0xc0, 0x00, 0x00, 
-  0x01, 0xff, 0xfc, 0x3f, 0xff, 0x80, 0x00, 0x00, 
-  0x01, 0xff, 0xf0, 0x0f, 0xff, 0x80, 0x00, 0x00, 
-  0x01, 0xff, 0xc0, 0x03, 0xff, 0xc0, 0x00, 0x00, 
-  0x01, 0xff, 0x80, 0x01, 0xff, 0xc0, 0x00, 0x00, 
-  0x01, 0xff, 0x00, 0x00, 0xff, 0xc0, 0x00, 0x00, 
-  0x01, 0xfe, 0x00, 0x00, 0x7f, 0xe0, 0x00, 0x00, 
-  0x01, 0xfe, 0x00, 0x00, 0x7f, 0xe0, 0x00, 0x00, 
-  0x01, 0xfc, 0x00, 0x00, 0x3f, 0xe0, 0x00, 0x00, 
-  0x01, 0xfc, 0x00, 0x00, 0x3f, 0xe0, 0x00, 0x00, 
-  0x01, 0xfc, 0x00, 0x00, 0x3f, 0xe0, 0x00, 0x00, 
-  0x01, 0xfc, 0x00, 0x00, 0x1f, 0xe0, 0x00, 0x00, 
-  0x01, 0xfc, 0x00, 0x00, 0x3f, 0xe0, 0x00, 0x00, 
-  0x01, 0xfc, 0x00, 0x00, 0x3f, 0xe0, 0x00, 0x00, 
-  0x01, 0xfc, 0x00, 0x00, 0x3f, 0xe0, 0x00, 0x00, 
-  0x01, 0xfe, 0x00, 0x00, 0x7f, 0xe0, 0x00, 0x00, 
-  0x01, 0xff, 0x00, 0x00, 0xff, 0xe0, 0x00, 0x00, 
-  0x01, 0xff, 0x00, 0x00, 0xff, 0xc0, 0x00, 0x00, 
-  0x01, 0xff, 0x80, 0x01, 0xff, 0xc0, 0x00, 0x00, 
-  0x01, 0xff, 0xc0, 0x03, 0xff, 0xc0, 0x00, 0x00, 
-  0x01, 0xff, 0xf0, 0x0f, 0xff, 0x80, 0x00, 0x00, 
-  0x01, 0xff, 0xfc, 0x3f, 0xff, 0x80, 0x00, 0x00, 
-  0x00, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 
-  0x00, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 
-  0x00, 0x7f, 0xff, 0xff, 0xfe, 0x00, 0x00, 0x00, 
-  0x00, 0x3f, 0xff, 0xff, 0xfc, 0x00, 0x00, 0x00, 
-  0x00, 0x1f, 0xff, 0xff, 0xf8, 0x00, 0x00, 0x00, 
-  0x00, 0x07, 0xff, 0xff, 0xe0, 0x00, 0x00, 0x00, 
-  0x00, 0x03, 0xff, 0xff, 0x80, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x7f, 0xfe, 0x00, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x0f, 0xf0, 0x00, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x0f, 0xf0, 0x00, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x0f, 0xf0, 0x00, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x0f, 0xf0, 0x00, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x0f, 0xf0, 0x00, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x0f, 0xf0, 0x00, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x0f, 0xf0, 0x00, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x0f, 0xf0, 0x00, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x0f, 0xf0, 0x00, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x0f, 0xf0, 0x00, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x0f, 0xf0, 0x00, 0x00, 0x00, 0x00, 
-};
-
-const lv_img_dsc_t rotary_slight_right = {
-      {
-        LV_IMG_CF_INDEXED_1BIT,
-        0,
-        0,
-        64,
-        64
-    },
-    520,
-rotary_slight_right_map,
-};
diff --git a/src/displayapp/icons/navigation/rotary-slight-right.png b/src/displayapp/icons/navigation/rotary-slight-right.png
deleted file mode 100644
index ae5dc247..00000000
--- a/src/displayapp/icons/navigation/rotary-slight-right.png
+++ /dev/null
diff --git a/src/displayapp/icons/navigation/rotary-straight-white.svg b/src/displayapp/icons/navigation/rotary-straight-white.svg
deleted file mode 100644
index 0bd80b54..00000000
--- a/src/displayapp/icons/navigation/rotary-straight-white.svg
+++ /dev/null
@@ -1,4 +0,0 @@
-<svg id="WORKING_ICONS" data-name="WORKING ICONS" xmlns="http://www.w3.org/2000/svg" width="20" height="20" viewBox="0 0 20 20">
-  <title>direction</title>
-  <path fill="#ffffff" d="M10,8.2A3.8,3.8,0,1,1,6.2,12,3.80428,3.80428,0,0,1,10,8.2m0,7A3.2,3.2,0,1,0,6.8,12,3.20362,3.20362,0,0,0,10,15.2M10,8a4,4,0,1,0,4,4,4.00458,4.00458,0,0,0-4-4h0Zm0,7a3,3,0,1,1,3-3,3.00328,3.00328,0,0,1-3,3h0Zm2.83057-5.82666A3.97135,3.97135,0,0,0,10.5,8.03076V5.00415a0.17881,0.17881,0,0,1,.27124-0.18872L12.24713,5.4873a0.19329,0.19329,0,0,0,.20471-0.31177L10,2.00415,7.54816,5.17554a0.1933,0.1933,0,0,0,.20471.31177l1.476-.67187A0.17879,0.17879,0,0,1,9.5,5.00415V9H10a3,3,0,1,1,0,6H9.5v3h1V15.96924A4.00076,4.00076,0,0,0,12.83057,9.17334Z"/>
-</svg>
diff --git a/src/displayapp/icons/navigation/rotary-straight.c b/src/displayapp/icons/navigation/rotary-straight.c
deleted file mode 100644
index 52e98489..00000000
--- a/src/displayapp/icons/navigation/rotary-straight.c
+++ /dev/null
@@ -1,96 +0,0 @@
-#if defined(LV_LVGL_H_INCLUDE_SIMPLE)
-#include "lvgl.h"
-#else
-#include "lvgl/lvgl.h"
-#endif
-
-
-#ifndef LV_ATTRIBUTE_MEM_ALIGN
-#define LV_ATTRIBUTE_MEM_ALIGN
-#endif
-
-#ifndef LV_ATTRIBUTE_IMG_ROTARY_STRAIGHT
-#define LV_ATTRIBUTE_IMG_ROTARY_STRAIGHT
-#endif
-
-const LV_ATTRIBUTE_MEM_ALIGN LV_ATTRIBUTE_LARGE_CONST LV_ATTRIBUTE_IMG_ROTARY_STRAIGHT uint8_t rotary_straight_map[] = {
-  0x04, 0x02, 0x04, 0xff, 	/*Color of index 0*/
-  0xfc, 0xfe, 0xfc, 0xff, 	/*Color of index 1*/
-
-  0x00, 0x00, 0x00, 0x0f, 0xf0, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x1f, 0xf8, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x1f, 0xf8, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x3f, 0xfc, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x7f, 0xfe, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0xff, 0xff, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x01, 0xff, 0xff, 0x80, 0x00, 0x00, 
-  0x00, 0x00, 0x03, 0xff, 0xff, 0xc0, 0x00, 0x00, 
-  0x00, 0x00, 0x03, 0xff, 0xff, 0xc0, 0x00, 0x00, 
-  0x00, 0x00, 0x07, 0xff, 0xff, 0xe0, 0x00, 0x00, 
-  0x00, 0x00, 0x0f, 0xff, 0xff, 0xf0, 0x00, 0x00, 
-  0x00, 0x00, 0x0f, 0xff, 0xff, 0xf0, 0x00, 0x00, 
-  0x00, 0x00, 0x0f, 0xff, 0xff, 0xf0, 0x00, 0x00, 
-  0x00, 0x00, 0x0f, 0xff, 0xff, 0xf0, 0x00, 0x00, 
-  0x00, 0x00, 0x0f, 0xff, 0xff, 0xf0, 0x00, 0x00, 
-  0x00, 0x00, 0x0f, 0xcf, 0xf3, 0xf0, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x0f, 0xf0, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x0f, 0xf0, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x0f, 0xf0, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x0f, 0xf0, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x0f, 0xf0, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x0f, 0xf0, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x3f, 0xfc, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x01, 0xff, 0xff, 0x80, 0x00, 0x00, 
-  0x00, 0x00, 0x07, 0xff, 0xff, 0xe0, 0x00, 0x00, 
-  0x00, 0x00, 0x0f, 0xff, 0xff, 0xf0, 0x00, 0x00, 
-  0x00, 0x00, 0x1f, 0xff, 0xff, 0xf8, 0x00, 0x00, 
-  0x00, 0x00, 0x3f, 0xff, 0xff, 0xfc, 0x00, 0x00, 
-  0x00, 0x00, 0x7f, 0xff, 0xff, 0xfe, 0x00, 0x00, 
-  0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 
-  0x00, 0x00, 0xff, 0xfe, 0x7f, 0xff, 0x00, 0x00, 
-  0x00, 0x00, 0xff, 0xf0, 0x0f, 0xff, 0x00, 0x00, 
-  0x00, 0x00, 0xff, 0xe0, 0x07, 0xff, 0x00, 0x00, 
-  0x00, 0x00, 0xff, 0xc0, 0x03, 0xff, 0x00, 0x00, 
-  0x00, 0x00, 0xff, 0x80, 0x01, 0xff, 0x00, 0x00, 
-  0x00, 0x00, 0xff, 0x00, 0x00, 0xff, 0x00, 0x00, 
-  0x00, 0x00, 0xfe, 0x00, 0x00, 0x7f, 0x00, 0x00, 
-  0x00, 0x00, 0xfe, 0x00, 0x00, 0x7f, 0x00, 0x00, 
-  0x00, 0x00, 0xfe, 0x00, 0x00, 0x7f, 0x00, 0x00, 
-  0x00, 0x00, 0xfc, 0x00, 0x00, 0x3f, 0x00, 0x00, 
-  0x00, 0x00, 0xfc, 0x00, 0x00, 0x3f, 0x00, 0x00, 
-  0x00, 0x00, 0xfe, 0x00, 0x00, 0x7f, 0x00, 0x00, 
-  0x00, 0x00, 0xfe, 0x00, 0x00, 0x7f, 0x00, 0x00, 
-  0x00, 0x00, 0xfe, 0x00, 0x00, 0x7f, 0x00, 0x00, 
-  0x00, 0x00, 0xff, 0x00, 0x00, 0xff, 0x00, 0x00, 
-  0x00, 0x00, 0xff, 0x80, 0x01, 0xff, 0x00, 0x00, 
-  0x00, 0x00, 0xff, 0xc0, 0x03, 0xff, 0x00, 0x00, 
-  0x00, 0x00, 0xff, 0xe0, 0x07, 0xff, 0x00, 0x00, 
-  0x00, 0x00, 0xff, 0xf0, 0x0f, 0xff, 0x00, 0x00, 
-  0x00, 0x00, 0xff, 0xfe, 0x7f, 0xff, 0x00, 0x00, 
-  0x00, 0x00, 0xff, 0xff, 0xff, 0xfe, 0x00, 0x00, 
-  0x00, 0x00, 0x7f, 0xff, 0xff, 0xfe, 0x00, 0x00, 
-  0x00, 0x00, 0x3f, 0xff, 0xff, 0xfc, 0x00, 0x00, 
-  0x00, 0x00, 0x1f, 0xff, 0xff, 0xf8, 0x00, 0x00, 
-  0x00, 0x00, 0x0f, 0xff, 0xff, 0xf0, 0x00, 0x00, 
-  0x00, 0x00, 0x07, 0xff, 0xff, 0xc0, 0x00, 0x00, 
-  0x00, 0x00, 0x01, 0xff, 0xff, 0x80, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x3f, 0xfc, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x0f, 0xf0, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x0f, 0xf0, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x0f, 0xf0, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x0f, 0xf0, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x0f, 0xf0, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x0f, 0xf0, 0x00, 0x00, 0x00, 
-};
-
-const lv_img_dsc_t rotary_straight = {
-      {
-        LV_IMG_CF_INDEXED_1BIT,
-        0,
-        0,
-        64,
-        64
-    },
-    520,
-rotary_straight_map,
-};
diff --git a/src/displayapp/icons/navigation/rotary-straight.png b/src/displayapp/icons/navigation/rotary-straight.png
deleted file mode 100644
index 35728c8a..00000000
--- a/src/displayapp/icons/navigation/rotary-straight.png
+++ /dev/null
diff --git a/src/displayapp/icons/navigation/rotary-white.svg b/src/displayapp/icons/navigation/rotary-white.svg
deleted file mode 100644
index 759109ae..00000000
--- a/src/displayapp/icons/navigation/rotary-white.svg
+++ /dev/null
@@ -1,4 +0,0 @@
-<svg id="WORKING_ICONS" data-name="WORKING ICONS" xmlns="http://www.w3.org/2000/svg" width="20" height="20" viewBox="0 0 20 20">
-  <title>direction</title>
-  <path fill="#ffffff" d="M5.5,10.002a0.17879,0.17879,0,0,0,.27124.18866l1.47589-.67187a0.1933,0.1933,0,0,1,.20471.31177L5,13.002,2.54816,9.83051a0.1933,0.1933,0,0,1,.20471-0.31177l1.476,0.67187A0.17876,0.17876,0,0,0,4.5,10.002V10A5.51888,5.51888,0,0,1,7.25293,5.23438l0.5,0.86523A4.51856,4.51856,0,0,0,5.5,10v0.002Zm6.75146-3.89941A4.51948,4.51948,0,0,1,14.5,10h1a5.5223,5.5223,0,0,0-2.74756-4.7627L12.751,5.23724A0.17878,0.17878,0,0,1,12.72321,4.908L14.043,3.96576a0.19332,0.19332,0,0,0-.16766-0.33319l-3.97247.53766,1.52063,3.70911a0.19331,0.19331,0,0,0,.37238-0.02142L11.952,6.24377A0.17945,0.17945,0,0,1,12.25146,6.10254ZM12.74688,14.766a0.17879,0.17879,0,0,1,.299.14053l0.1561,1.61412a0.1933,0.1933,0,0,0,.37235.02141L15.095,12.833l-3.97245-.53766a0.1933,0.1933,0,0,0-.16764.33317l1.31982,0.94225a0.17879,0.17879,0,0,1-.02781.32923l0.00361-.00254a4.57684,4.57684,0,0,1-4.502,0l-0.501.86523a5.50442,5.50442,0,0,0,5.50391,0Z" />
-</svg>
diff --git a/src/displayapp/icons/navigation/rotary.c b/src/displayapp/icons/navigation/rotary.c
deleted file mode 100644
index c8189698..00000000
--- a/src/displayapp/icons/navigation/rotary.c
+++ /dev/null
@@ -1,96 +0,0 @@
-#if defined(LV_LVGL_H_INCLUDE_SIMPLE)
-#include "lvgl.h"
-#else
-#include "lvgl/lvgl.h"
-#endif
-
-
-#ifndef LV_ATTRIBUTE_MEM_ALIGN
-#define LV_ATTRIBUTE_MEM_ALIGN
-#endif
-
-#ifndef LV_ATTRIBUTE_IMG_ROTARY
-#define LV_ATTRIBUTE_IMG_ROTARY
-#endif
-
-const LV_ATTRIBUTE_MEM_ALIGN LV_ATTRIBUTE_LARGE_CONST LV_ATTRIBUTE_IMG_ROTARY uint8_t rotary_map[] = {
-  0x04, 0x02, 0x04, 0xff, 	/*Color of index 0*/
-  0xfc, 0xfe, 0xfc, 0xff, 	/*Color of index 1*/
-
-  0x00, 0x00, 0x00, 0x00, 0x03, 0xff, 0xff, 0xe0, 
-  0x00, 0x00, 0x00, 0x00, 0x3f, 0xff, 0xff, 0xe0, 
-  0x00, 0x00, 0x00, 0x00, 0x3f, 0xff, 0xff, 0xe0, 
-  0x00, 0x00, 0x00, 0x00, 0x3f, 0xff, 0xff, 0xe0, 
-  0x00, 0x00, 0x00, 0x00, 0x3f, 0xff, 0xff, 0xc0, 
-  0x00, 0x00, 0x00, 0x00, 0x1f, 0xff, 0xff, 0x00, 
-  0x00, 0x00, 0x07, 0xc0, 0x1f, 0xff, 0xfe, 0x00, 
-  0x00, 0x00, 0x1f, 0xc0, 0x1f, 0xff, 0xfc, 0x00, 
-  0x00, 0x00, 0x3f, 0xe0, 0x0f, 0xff, 0xff, 0x00, 
-  0x00, 0x00, 0x7f, 0xe0, 0x0f, 0xff, 0xff, 0x80, 
-  0x00, 0x01, 0xff, 0xf0, 0x07, 0xff, 0xff, 0xc0, 
-  0x00, 0x01, 0xff, 0xf0, 0x07, 0xff, 0xff, 0xe0, 
-  0x00, 0x03, 0xff, 0xf0, 0x07, 0xff, 0xff, 0xf0, 
-  0x00, 0x07, 0xff, 0xf0, 0x03, 0xff, 0xff, 0xf8, 
-  0x00, 0x0f, 0xff, 0xe0, 0x01, 0xff, 0xff, 0xf8, 
-  0x00, 0x0f, 0xff, 0xc0, 0x01, 0xff, 0xff, 0xfc, 
-  0x00, 0x1f, 0xff, 0x80, 0x01, 0xff, 0x7f, 0xfe, 
-  0x00, 0x1f, 0xfe, 0x00, 0x00, 0xff, 0x3f, 0xfe, 
-  0x00, 0x3f, 0xfe, 0x00, 0x00, 0xff, 0x1f, 0xff, 
-  0x00, 0x3f, 0xf8, 0x00, 0x00, 0x7f, 0x0f, 0xff, 
-  0x00, 0x7f, 0xf8, 0x00, 0x00, 0x7f, 0x07, 0xff, 
-  0x00, 0x7f, 0xf0, 0x00, 0x00, 0x7f, 0x03, 0xff, 
-  0x00, 0x7f, 0xe0, 0x00, 0x00, 0x3f, 0x03, 0xff, 
-  0x00, 0xff, 0xe0, 0x00, 0x00, 0x1e, 0x01, 0xff, 
-  0x00, 0xff, 0xe0, 0x00, 0x00, 0x00, 0x01, 0xff, 
-  0x00, 0xff, 0xc0, 0x00, 0x00, 0x00, 0x00, 0xff, 
-  0x00, 0xff, 0xc0, 0x00, 0x00, 0x00, 0x00, 0xff, 
-  0xf8, 0xff, 0xcf, 0xe0, 0x00, 0x00, 0x00, 0xff, 
-  0xfe, 0xff, 0xff, 0xe0, 0x00, 0x00, 0x00, 0xff, 
-  0xff, 0xff, 0xff, 0xe0, 0x00, 0x00, 0x00, 0x7f, 
-  0xff, 0xff, 0xff, 0xe0, 0x00, 0x00, 0x00, 0x7f, 
-  0xff, 0xff, 0xff, 0xe0, 0x00, 0x00, 0x00, 0x7f, 
-  0xff, 0xff, 0xff, 0xe0, 0x00, 0x00, 0x00, 0x7f, 
-  0xff, 0xff, 0xff, 0x80, 0x00, 0x00, 0x00, 0x00, 
-  0xff, 0xff, 0xff, 0x80, 0x00, 0x00, 0x00, 0x00, 
-  0x7f, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x7f, 0xff, 0xfe, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x1f, 0xff, 0xfc, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x1f, 0xff, 0xf8, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x0f, 0xff, 0xf8, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x07, 0xff, 0xf0, 0x00, 0x00, 0xf8, 0x00, 0x00, 
-  0x07, 0xff, 0xe0, 0x00, 0x01, 0xff, 0xe0, 0x00, 
-  0x03, 0xff, 0xc0, 0x00, 0x01, 0xff, 0xff, 0xf0, 
-  0x01, 0xff, 0xc0, 0x00, 0x01, 0xff, 0xff, 0xff, 
-  0x00, 0xff, 0x80, 0x00, 0x01, 0xff, 0xff, 0xff, 
-  0x00, 0xff, 0x00, 0x00, 0x01, 0xff, 0xff, 0xff, 
-  0x00, 0x7f, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 
-  0x00, 0x3c, 0x00, 0x00, 0x00, 0x3f, 0xff, 0xfe, 
-  0x00, 0x00, 0x00, 0xf0, 0x00, 0x1f, 0xff, 0xfe, 
-  0x00, 0x00, 0x01, 0xfc, 0x00, 0x1f, 0xff, 0xfe, 
-  0x00, 0x00, 0x01, 0xff, 0xc1, 0xff, 0xff, 0xfe, 
-  0x00, 0x00, 0x03, 0xff, 0xff, 0xff, 0xff, 0xfc, 
-  0x00, 0x00, 0x07, 0xff, 0xff, 0xff, 0xff, 0xfc, 
-  0x00, 0x00, 0x07, 0xff, 0xff, 0xff, 0xff, 0xf8, 
-  0x00, 0x00, 0x07, 0xff, 0xff, 0xff, 0xff, 0xf8, 
-  0x00, 0x00, 0x07, 0xff, 0xff, 0xff, 0xff, 0xf0, 
-  0x00, 0x00, 0x03, 0xff, 0xff, 0xff, 0xff, 0xf0, 
-  0x00, 0x00, 0x01, 0xff, 0xff, 0xff, 0xff, 0xf0, 
-  0x00, 0x00, 0x00, 0x3f, 0xff, 0xff, 0x3f, 0xe0, 
-  0x00, 0x00, 0x00, 0x07, 0xff, 0xf8, 0x3f, 0xe0, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3f, 0xc0, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3f, 0xc0, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3f, 0xc0, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3f, 0x80, 
-};
-
-const lv_img_dsc_t rotary = {
-      {
-        LV_IMG_CF_INDEXED_1BIT,
-        0,
-        0,
-        64,
-        64
-    },
-    520,
-rotary_map,
-};
diff --git a/src/displayapp/icons/navigation/rotary.png b/src/displayapp/icons/navigation/rotary.png
deleted file mode 100644
index aab9644e..00000000
--- a/src/displayapp/icons/navigation/rotary.png
+++ /dev/null
diff --git a/src/displayapp/icons/navigation/rotary.svg b/src/displayapp/icons/navigation/rotary.svg
new file mode 100644
index 00000000..475670e4
--- /dev/null
+++ b/src/displayapp/icons/navigation/rotary.svg
@@ -0,0 +1,58 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   inkscape:version="1.0 (4035a4fb49, 2020-05-01)"
+   sodipodi:docname="rotary.svg"
+   version="1.1"
+   viewBox="0 0 20 20"
+   height="20"
+   width="20"
+   data-name="WORKING ICONS"
+   id="WORKING_ICONS">
+  <metadata
+     id="metadata11">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs9" />
+  <sodipodi:namedview
+     inkscape:current-layer="WORKING_ICONS"
+     inkscape:window-maximized="1"
+     inkscape:window-y="22"
+     inkscape:window-x="-8"
+     inkscape:cy="14.687053"
+     inkscape:cx="10.491188"
+     inkscape:zoom="21.5"
+     showgrid="false"
+     id="namedview7"
+     inkscape:window-height="1027"
+     inkscape:window-width="1920"
+     inkscape:pageshadow="2"
+     inkscape:pageopacity="0"
+     guidetolerance="10"
+     gridtolerance="10"
+     objecttolerance="10"
+     borderopacity="1"
+     bordercolor="#666666"
+     pagecolor="#ffffff" />
+  <title
+     id="title2">direction</title>
+  <path
+     style="stroke-width:1.53314"
+     id="path4"
+     d="m 4.6342106,9.7711173 a 0.27410998,0.27410998 0 0 0 0.4158487,0.2892417 l 2.262745,-1.0300697 a 0.29635583,0.29635583 0 0 1 0.3138485,0.477986 L 3.8676409,14.370535 0.10862861,9.5081993 a 0.29635583,0.29635583 0 0 1 0.3138489,-0.477987 L 2.6853912,10.060282 A 0.27406399,0.27406399 0 0 0 3.1010713,9.7711173 v -0.0031 A 8.461212,8.461212 0 0 1 7.3216965,2.4616914 L 8.0882658,3.7882096 A 6.9275821,6.9275821 0 0 0 4.6342106,9.7680513 Z M 14.98514,3.7927783 a 6.9289926,6.9289926 0 0 1 3.447325,5.975273 h 1.533139 A 8.4664553,8.4664553 0 0 0 15.753212,2.4661682 l -0.0022,-9.2e-5 A 0.27409465,0.27409465 0 0 1 15.708398,1.9613054 L 17.73182,0.51672019 a 0.2963865,0.2963865 0 0 0 -0.257046,-0.5108267 l -6.09035,0.8243077 2.331338,5.68658211 a 0.29637116,0.29637116 0 0 0 0.57091,-0.03284 L 14.526026,4.0092269 A 0.27512185,0.27512185 0 0 1 14.98514,3.7927017 Z m 0.759548,13.2822147 a 0.27410998,0.27410998 0 0 1 0.458408,0.215452 l 0.239323,2.474671 a 0.29635583,0.29635583 0 0 0 0.570865,0.03282 l 2.331399,-5.686506 -6.09032,-0.824307 a 0.29635583,0.29635583 0 0 0 -0.257015,0.510796 l 2.023468,1.4446 a 0.27410998,0.27410998 0 0 1 -0.04264,0.504756 l 0.0055,-0.0039 a 7.0169334,7.0169334 0 0 1 -6.9021932,0 l -0.7681032,1.326519 a 8.4390428,8.4390428 0 0 0 8.4382614,0 z"
+     fill="#000000" />
+</svg>
diff --git a/src/displayapp/icons/navigation/rotary_left.svg b/src/displayapp/icons/navigation/rotary_left.svg
new file mode 100644
index 00000000..57271528
--- /dev/null
+++ b/src/displayapp/icons/navigation/rotary_left.svg
@@ -0,0 +1,58 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   inkscape:version="1.0 (4035a4fb49, 2020-05-01)"
+   sodipodi:docname="rotary_left.svg"
+   version="1.1"
+   viewBox="0 0 20 20"
+   height="20"
+   width="20"
+   data-name="WORKING ICONS"
+   id="WORKING_ICONS">
+  <metadata
+     id="metadata11">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs9" />
+  <sodipodi:namedview
+     inkscape:current-layer="WORKING_ICONS"
+     inkscape:window-maximized="1"
+     inkscape:window-y="22"
+     inkscape:window-x="-8"
+     inkscape:cy="14.496332"
+     inkscape:cx="8.0663042"
+     inkscape:zoom="21.5"
+     showgrid="false"
+     id="namedview7"
+     inkscape:window-height="1027"
+     inkscape:window-width="1920"
+     inkscape:pageshadow="2"
+     inkscape:pageopacity="0"
+     guidetolerance="10"
+     gridtolerance="10"
+     objecttolerance="10"
+     borderopacity="1"
+     bordercolor="#666666"
+     pagecolor="#ffffff" />
+  <title
+     id="title2">direction</title>
+  <path
+     style="stroke-width:1.33333"
+     id="path4"
+     d="M 14.666667,2.9333332 A 5.0666667,5.0666667 0 1 1 9.6,7.9999995 5.0723733,5.0723733 0 0 1 14.666667,2.9333332 m 0,9.3333338 A 4.2666667,4.2666667 0 1 0 10.4,7.9999995 4.2714933,4.2714933 0 0 0 14.666667,12.266667 m 0,-9.6000005 A 5.3333333,5.3333333 0 1 0 20,7.9999995 5.33944,5.33944 0 0 0 14.666667,2.6666665 Z m 0,9.3333335 a 4,4 0 1 1 4,-4.0000005 4.0043733,4.0043733 0 0 1 -4,4.0000005 z m 3.77148,-7.7708268 A 5.3753333,5.3753333 0 0 0 17.71548,3.6230532 5.4373333,5.4373333 0 0 0 10.895813,4.2285198 5.2912267,5.2912267 0 0 0 9.374347,7.3333335 H 4 A 0.23838667,0.23838667 0 0 1 3.7484533,6.9716795 l 0.89584,-1.967853 A 0.25773333,0.25773333 0 0 0 4.2286,4.7308798 L 0,7.9999995 4.2286,11.26912 A 0.25773333,0.25773333 0 0 0 4.6442933,10.996174 L 3.7484533,9.0283195 A 0.23838667,0.23838667 0 0 1 4,8.6666665 h 6.666667 v -0.666667 a 3.9741733,3.9741733 0 0 1 1.17188,-2.828773 4.0811733,4.0811733 0 0 1 5.113933,-0.4544267 4.0299733,4.0299733 0 0 1 0.542973,0.45508 A 3.99968,3.99968 0 0 1 14.666667,12 H 14 v 5.333334 h 1.333333 V 13.29232 a 5.33384,5.33384 0 0 0 3.104814,-9.0631468 z"
+     fill="#000000" />
+</svg>
diff --git a/src/displayapp/icons/navigation/rotary_right.svg b/src/displayapp/icons/navigation/rotary_right.svg
new file mode 100644
index 00000000..1d4d1078
--- /dev/null
+++ b/src/displayapp/icons/navigation/rotary_right.svg
@@ -0,0 +1,58 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   inkscape:version="1.0 (4035a4fb49, 2020-05-01)"
+   sodipodi:docname="rotary_right.svg"
+   version="1.1"
+   viewBox="0 0 20 20"
+   height="20"
+   width="20"
+   data-name="WORKING ICONS"
+   id="WORKING_ICONS">
+  <metadata
+     id="metadata11">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs9" />
+  <sodipodi:namedview
+     inkscape:current-layer="WORKING_ICONS"
+     inkscape:window-maximized="1"
+     inkscape:window-y="22"
+     inkscape:window-x="-8"
+     inkscape:cy="13.338382"
+     inkscape:cx="14.80966"
+     inkscape:zoom="21.5"
+     showgrid="false"
+     id="namedview7"
+     inkscape:window-height="1027"
+     inkscape:window-width="1920"
+     inkscape:pageshadow="2"
+     inkscape:pageopacity="0"
+     guidetolerance="10"
+     gridtolerance="10"
+     objecttolerance="10"
+     borderopacity="1"
+     bordercolor="#666666"
+     pagecolor="#ffffff" />
+  <title
+     id="title2">direction</title>
+  <path
+     style="stroke-width:1.33252"
+     id="path4"
+     d="M 5.3300783,2.9376459 A 5.0635745,5.0635745 0 1 1 0.2665038,8.00122 5.0692777,5.0692777 0 0 1 5.3300783,2.9376459 m 0,9.3276371 A 4.2640627,4.2640627 0 1 0 1.0660156,8.00122 4.2688865,4.2688865 0 0 0 5.3300783,12.265283 m 0,-9.594141 A 5.3300784,5.3300784 0 1 0 10.660157,8.00122 5.3361814,5.3361814 0 0 0 5.3300783,2.671142 Z m 0,9.327637 A 3.9975588,3.9975588 0 1 1 9.3276369,8.00122 4.0019295,4.0019295 0 0 1 5.3300783,11.998779 Z M 15.774061,4.7340956 a 0.25757604,0.25757604 0 0 0 -0.41544,0.27278 L 16.253914,6.973528 A 0.23826783,0.23826783 0 0 1 16.002441,7.334961 H 9.3276369 V 8.00122 A 3.9974789,3.9974789 0 0 1 5.3300783,11.998779 H 4.6638185 v 5.330079 H 5.9963381 V 13.290311 A 5.3343425,5.3343425 0 0 0 10.619169,8.66748 h 5.383272 a 0.23826783,0.23826783 0 0 1 0.251473,0.361433 l -0.895293,1.966652 a 0.25757604,0.25757604 0 0 0 0.41544,0.27278 L 20,8.00122 Z"
+     fill="#000000" />
+</svg>
diff --git a/src/displayapp/icons/navigation/rotary_sharp_left.svg b/src/displayapp/icons/navigation/rotary_sharp_left.svg
new file mode 100644
index 00000000..bd8714db
--- /dev/null
+++ b/src/displayapp/icons/navigation/rotary_sharp_left.svg
@@ -0,0 +1,58 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   inkscape:version="1.0 (4035a4fb49, 2020-05-01)"
+   sodipodi:docname="rotary_sharp_left.svg"
+   version="1.1"
+   viewBox="0 0 20 20"
+   height="20"
+   width="20"
+   data-name="WORKING ICONS"
+   id="WORKING_ICONS">
+  <metadata
+     id="metadata11">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs9" />
+  <sodipodi:namedview
+     inkscape:current-layer="WORKING_ICONS"
+     inkscape:window-maximized="1"
+     inkscape:window-y="22"
+     inkscape:window-x="-8"
+     inkscape:cy="18.574335"
+     inkscape:cx="15.318423"
+     inkscape:zoom="15.202796"
+     showgrid="false"
+     id="namedview7"
+     inkscape:window-height="1027"
+     inkscape:window-width="1920"
+     inkscape:pageshadow="2"
+     inkscape:pageopacity="0"
+     guidetolerance="10"
+     gridtolerance="10"
+     objecttolerance="10"
+     borderopacity="1"
+     bordercolor="#666666"
+     pagecolor="#ffffff" />
+  <title
+     id="title2">direction</title>
+  <path
+     style="stroke-width:1.6675"
+     id="path4"
+     d="M 13.329998,0.3346256 A 6.3365016,6.3365016 0 1 1 6.9934967,6.6711275 6.3436385,6.3436385 0 0 1 13.329998,0.3346256 m 0,11.6725034 A 5.3360013,5.3360013 0 1 0 7.993997,6.6711275 5.3420377,5.3420377 0 0 0 13.329998,12.007129 m 0,-12.0060035 A 6.6700017,6.6700017 0 1 0 20,6.6711275 6.6776388,6.6776388 0 0 0 13.329998,0.0011255 Z m 0,11.6725035 A 5.0025013,5.0025013 0 1 1 18.3325,6.6711275 5.0079707,5.0079707 0 0 1 13.329998,11.673629 Z M 18.047524,1.9552359 A 6.7297482,6.7297482 0 0 0 17.142938,1.1972069 6.8018343,6.8018343 0 0 0 8.61409,1.9544188 6.6709688,6.6709688 0 0 0 8.059613,10.760089 l -5.1121726,5.112173 a 0.29803235,0.29803235 0 0 1 -0.5419376,-0.0975 l -0.9481074,-2.5325 A 0.32236118,0.32236118 0 0 0 0.8483742,13.36846 L 0,19.998874 6.6304152,19.150466 a 0.32236118,0.32236118 0 0 0 0.1261964,-0.60902 L 4.2241121,17.593388 a 0.2981324,0.2981324 0 0 1 -0.097299,-0.542271 l -6.17e-4,-6.16e-4 5.6758049,-5.678956 0.564249,-0.588628 -0.575638,-0.577272 a 5.0016675,5.0016675 0 0 1 0.0025,-7.0722534 5.1036018,5.1036018 0 0 1 6.395615,-0.5683175 5.0470735,5.0470735 0 0 1 0.679856,0.5691346 5.0025013,5.0025013 0 0 1 -3.538536,8.5394203 h -0.83375 v 6.670002 h 1.667501 V 13.289837 A 6.671269,6.671269 0 0 0 18.047507,1.9552359 Z"
+     fill="#000000" />
+</svg>
diff --git a/src/displayapp/icons/navigation/rotary_sharp_right.svg b/src/displayapp/icons/navigation/rotary_sharp_right.svg
new file mode 100644
index 00000000..51489475
--- /dev/null
+++ b/src/displayapp/icons/navigation/rotary_sharp_right.svg
@@ -0,0 +1,58 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   inkscape:version="1.0 (4035a4fb49, 2020-05-01)"
+   sodipodi:docname="rotary_sharp_right.svg"
+   version="1.1"
+   viewBox="0 0 20 20"
+   height="20"
+   width="20"
+   data-name="WORKING ICONS"
+   id="WORKING_ICONS">
+  <metadata
+     id="metadata11">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs9" />
+  <sodipodi:namedview
+     inkscape:current-layer="WORKING_ICONS"
+     inkscape:window-maximized="1"
+     inkscape:window-y="22"
+     inkscape:window-x="-8"
+     inkscape:cy="13.661569"
+     inkscape:cx="3.8360382"
+     inkscape:zoom="15.202796"
+     showgrid="false"
+     id="namedview7"
+     inkscape:window-height="1027"
+     inkscape:window-width="1920"
+     inkscape:pageshadow="2"
+     inkscape:pageopacity="0"
+     guidetolerance="10"
+     gridtolerance="10"
+     objecttolerance="10"
+     borderopacity="1"
+     bordercolor="#666666"
+     pagecolor="#ffffff" />
+  <title
+     id="title2">direction</title>
+  <path
+     style="stroke-width:1.66667"
+     id="path4"
+     d="M 6.6668087,0.3333333 A 6.3333333,6.3333333 0 1 1 0.333475,6.666667 6.3405,6.3405 0 0 1 6.6668087,0.3333333 M 6.6668087,12 A 5.3333333,5.3333333 0 1 0 1.333475,6.666667 5.33935,5.33935 0 0 0 6.6668087,12 m 0,-12 A 6.6666667,6.6666667 0 1 0 13.333475,6.666667 6.6743,6.6743 0 0 0 6.6668087,0 Z m 0,11.666667 a 5,5 0 1 1 5.0000003,-5 5.0054667,5.0054667 0 0 1 -5.0000003,5 z M 19.151809,13.3729 A 0.32213333,0.32213333 0 0 0 18.543192,13.246767 L 17.595659,15.778 a 0.29805,0.29805 0 0 1 -0.5421,0.09725 l -3e-4,3e-4 -6.2621,-6.2621 -0.5892,0.5892 a 4.9670333,4.9670333 0 0 1 -3.5351503,1.464017 h -0.833334 v 6.666666 h 1.666667 v -5.051266 a 6.5936833,6.5936833 0 0 0 3.2544003,-1.34765 l 5.121867,5.12125 a 0.29735,0.29735 0 0 1 -0.09857,0.54 l -2.53115,0.947666 a 0.32216667,0.32216667 0 0 0 0.126133,0.608717 L 19.999859,20 Z"
+     fill="#000000" />
+</svg>
diff --git a/src/displayapp/icons/navigation/rotary_slight_left.svg b/src/displayapp/icons/navigation/rotary_slight_left.svg
new file mode 100644
index 00000000..8aa2cf7a
--- /dev/null
+++ b/src/displayapp/icons/navigation/rotary_slight_left.svg
@@ -0,0 +1,58 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   inkscape:version="1.0 (4035a4fb49, 2020-05-01)"
+   sodipodi:docname="rotary_slight_left.svg"
+   version="1.1"
+   viewBox="0 0 20 20"
+   height="20"
+   width="20"
+   data-name="WORKING ICONS"
+   id="WORKING_ICONS">
+  <metadata
+     id="metadata11">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs9" />
+  <sodipodi:namedview
+     inkscape:current-layer="WORKING_ICONS"
+     inkscape:window-maximized="1"
+     inkscape:window-y="22"
+     inkscape:window-x="-8"
+     inkscape:cy="15.490807"
+     inkscape:cx="13.215776"
+     inkscape:zoom="21.5"
+     showgrid="false"
+     id="namedview7"
+     inkscape:window-height="1027"
+     inkscape:window-width="1920"
+     inkscape:pageshadow="2"
+     inkscape:pageopacity="0"
+     guidetolerance="10"
+     gridtolerance="10"
+     objecttolerance="10"
+     borderopacity="1"
+     bordercolor="#666666"
+     pagecolor="#ffffff" />
+  <title
+     id="title2">direction</title>
+  <path
+     style="stroke-width:1.33604"
+     id="path4"
+     d="M 12.654634,5.5707567 A 5.076956,5.076956 0 1 1 7.5776775,10.647713 5.0826742,5.0826742 0 0 1 12.654634,5.5707567 m 0,9.3522873 a 4.2753313,4.2753313 0 1 0 -4.2753319,-4.275331 4.2801678,4.2801678 0 0 0 4.2753309,4.275331 m 0,-9.6194955 a 5.3441642,5.3441642 0 1 0 5.344164,5.3441645 5.3502832,5.3502832 0 0 0 -5.344164,-5.3441645 z m 0,9.3522875 a 4.0081231,4.0081231 0 1 1 4.008123,-4.008123 4.0125053,4.0125053 0 0 1 -4.008123,4.008123 z m 3.77914,-7.7866077 A 5.3862495,5.3862495 0 0 0 15.709639,6.2618774 5.4466519,5.4466519 0 0 0 9.3771375,6.4256226 L 5.3046709,2.3573776 A 0.23746794,0.23746794 0 0 1 5.3857552,1.9273728 L 7.414774,1.1677266 A 0.25825673,0.25825673 0 0 0 7.3136624,0.6797643 L 2.0012025,0 2.681047,5.3124332 A 0.25823001,0.25823001 0 0 0 3.1689291,5.4135448 L 3.9285352,3.3844592 a 0.23887078,0.23887078 0 0 1 0.4344806,-0.077958 l 2.405e-4,-2.405e-4 4.9858512,4.9792383 0.471623,-0.472318 a 4.0878981,4.0878981 0 0 1 5.1243185,-0.455349 4.0381573,4.0381573 0 0 1 0.544076,0.456004 4.0078025,4.0078025 0 0 1 -2.834491,6.842 H 11.986613 V 20 h 1.336041 v -4.04922 a 5.3446719,5.3446719 0 0 0 3.111119,-9.0815517 z"
+     fill="#000000" />
+</svg>
diff --git a/src/displayapp/icons/navigation/rotary_slight_right.svg b/src/displayapp/icons/navigation/rotary_slight_right.svg
new file mode 100644
index 00000000..c8cef813
--- /dev/null
+++ b/src/displayapp/icons/navigation/rotary_slight_right.svg
@@ -0,0 +1,58 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   inkscape:version="1.0 (4035a4fb49, 2020-05-01)"
+   sodipodi:docname="rotary_slight_right.svg"
+   version="1.1"
+   viewBox="0 0 20 20"
+   height="20"
+   width="20"
+   data-name="WORKING ICONS"
+   id="WORKING_ICONS">
+  <metadata
+     id="metadata11">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs9" />
+  <sodipodi:namedview
+     inkscape:current-layer="WORKING_ICONS"
+     inkscape:window-maximized="1"
+     inkscape:window-y="22"
+     inkscape:window-x="-8"
+     inkscape:cy="11.676383"
+     inkscape:cx="7.8483372"
+     inkscape:zoom="21.5"
+     showgrid="false"
+     id="namedview7"
+     inkscape:window-height="1027"
+     inkscape:window-width="1920"
+     inkscape:pageshadow="2"
+     inkscape:pageopacity="0"
+     guidetolerance="10"
+     gridtolerance="10"
+     objecttolerance="10"
+     borderopacity="1"
+     bordercolor="#666666"
+     pagecolor="#ffffff" />
+  <title
+     id="title2">direction</title>
+  <path
+     style="stroke-width:1.33008"
+     id="path4"
+     d="M 7.3016379,5.6628325 A 5.0543072,5.0543072 0 1 1 2.2473311,10.71714 5.0599999,5.0599999 0 0 1 7.3016379,5.6628325 m 0,9.3105655 A 4.2562587,4.2562587 0 1 0 3.0453796,10.71714 4.2610736,4.2610736 0 0 0 7.3016379,14.973398 m 0,-9.5765817 A 5.3203234,5.3203234 0 1 0 12.621962,10.71714 5.3264151,5.3264151 0 0 0 7.3016379,5.3968163 Z m 0,9.3105657 A 3.9902425,3.9902425 0 1 1 11.291881,10.71714 3.9946052,3.9946052 0 0 1 7.3016379,14.707382 Z M 12.729951,0.6767185 A 0.25707803,0.25707803 0 0 0 12.62929,1.1624242 l 2.020047,0.7562839 a 0.23779185,0.23779185 0 0 1 0.07761,0.4325423 l 7.9e-5,7.98e-5 L 9.6526479,7.425708 10.122859,7.895919 A 3.9899233,3.9899233 0 0 1 7.3016249,14.707382 H 6.6365845 V 20 H 7.9666649 V 15.99655 A 5.3219594,5.3219594 0 0 0 11.504893,7.454292 l 4.162581,-4.1625414 a 0.23779185,0.23779185 0 0 1 0.432543,0.07761 l 0.756151,2.020047 A 0.25713123,0.25713123 0 0 0 17.341953,5.2886674 L 18.018685,0 Z"
+     fill="#000000" />
+</svg>
diff --git a/src/displayapp/icons/navigation/rotary_straight.svg b/src/displayapp/icons/navigation/rotary_straight.svg
new file mode 100644
index 00000000..a8d8759a
--- /dev/null
+++ b/src/displayapp/icons/navigation/rotary_straight.svg
@@ -0,0 +1,58 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   inkscape:version="1.0 (4035a4fb49, 2020-05-01)"
+   sodipodi:docname="rotary_straight.svg"
+   version="1.1"
+   viewBox="0 0 20 20"
+   height="20"
+   width="20"
+   data-name="WORKING ICONS"
+   id="WORKING_ICONS">
+  <metadata
+     id="metadata11">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs9" />
+  <sodipodi:namedview
+     inkscape:current-layer="WORKING_ICONS"
+     inkscape:window-maximized="1"
+     inkscape:window-y="22"
+     inkscape:window-x="-8"
+     inkscape:cy="14.564447"
+     inkscape:cx="14.11489"
+     inkscape:zoom="21.5"
+     showgrid="false"
+     id="namedview7"
+     inkscape:window-height="1027"
+     inkscape:window-width="1920"
+     inkscape:pageshadow="2"
+     inkscape:pageopacity="0"
+     guidetolerance="10"
+     gridtolerance="10"
+     objecttolerance="10"
+     borderopacity="1"
+     bordercolor="#666666"
+     pagecolor="#ffffff" />
+  <title
+     id="title2">direction</title>
+  <path
+     style="stroke-width:1.25032"
+     id="path4"
+     d="M 9.9999967,7.7468218 A 4.7512324,4.7512324 0 1 1 5.2487646,12.498054 4.7565837,4.7565837 0 0 1 9.9999967,7.7468218 m 0,8.7522702 a 4.0010378,4.0010378 0 1 0 -4.0010376,-4.001038 4.0055639,4.0055639 0 0 0 4.0010376,4.001038 m 0,-9.002335 A 5.0012972,5.0012972 0 1 0 15.001294,12.498054 5.0070237,5.0070237 0 0 0 9.9999967,7.496757 Z m 0,8.75227 A 3.7509729,3.7509729 0 1 1 13.75097,12.498054 3.755074,3.755074 0 0 1 9.9999967,16.249027 Z M 13.539128,8.963812 A 4.9654754,4.9654754 0 0 0 10.625159,7.5352169 v -3.784244 a 0.22357049,0.22357049 0 0 1 0.339138,-0.2359612 l 1.845341,0.8400554 A 0.24167518,0.24167518 0 0 0 13.065592,3.9652535 L 9.9999967,0 6.9344018,3.965266 a 0.24168769,0.24168769 0 0 0 0.2559539,0.3898136 l 1.845479,-0.8400554 a 0.22354548,0.22354548 0 0 1 0.339,0.2359487 V 8.747081 h 0.625162 a 3.750973,3.750973 0 1 1 0,7.501946 H 9.3748347 V 20 h 1.2503243 v -2.539109 a 5.0022475,5.0022475 0 0 0 2.913969,-8.497079 z"
+     fill="#000000" />
+</svg>
diff --git a/src/displayapp/icons/navigation/roundabout-left-white.svg b/src/displayapp/icons/navigation/roundabout-left-white.svg
deleted file mode 100644
index f1762a07..00000000
--- a/src/displayapp/icons/navigation/roundabout-left-white.svg
+++ /dev/null
@@ -1,4 +0,0 @@
-<svg id="WORKING_ICONS" data-name="WORKING ICONS" xmlns="http://www.w3.org/2000/svg" width="20" height="20" viewBox="0 0 20 20">
-  <title>direction</title>
-  <path fill="#ffffff" d="M13,6.2A3.8,3.8,0,1,1,9.2,10,3.80428,3.80428,0,0,1,13,6.2m0,7A3.2,3.2,0,1,0,9.8,10,3.20363,3.20363,0,0,0,13,13.2M13,6a4,4,0,1,0,4,4,4.00458,4.00458,0,0,0-4-4h0Zm0,7a3,3,0,1,1,3-3,3.00328,3.00328,0,0,1-3,3h0Zm2.82861-5.82813a4.0315,4.0315,0,0,0-.542-0.45459,4.078,4.078,0,0,0-5.11475.4541A3.96842,3.96842,0,0,0,9.03076,9.5H5a0.17879,0.17879,0,0,1-.18866-0.27124L5.48322,7.75287a0.1933,0.1933,0,0,0-.31177-0.20471L2,10l3.17145,2.45184a0.1933,0.1933,0,0,0,.31177-0.20471L4.81134,10.77124A0.17879,0.17879,0,0,1,5,10.5h5V10a2.98063,2.98063,0,0,1,.87891-2.12158,3.06088,3.06088,0,0,1,3.83545-.34082,3.02248,3.02248,0,0,1,.40723.34131A2.99976,2.99976,0,0,1,13,13H12.5v4h1V13.96924A4.00038,4.00038,0,0,0,15.82861,7.17187Z"/>
-</svg>
diff --git a/src/displayapp/icons/navigation/roundabout-left.c b/src/displayapp/icons/navigation/roundabout-left.c
deleted file mode 100644
index 9b8ebe36..00000000
--- a/src/displayapp/icons/navigation/roundabout-left.c
+++ /dev/null
@@ -1,96 +0,0 @@
-#if defined(LV_LVGL_H_INCLUDE_SIMPLE)
-#include "lvgl.h"
-#else
-#include "lvgl/lvgl.h"
-#endif
-
-
-#ifndef LV_ATTRIBUTE_MEM_ALIGN
-#define LV_ATTRIBUTE_MEM_ALIGN
-#endif
-
-#ifndef LV_ATTRIBUTE_IMG_ROUNDABOUT_LEFT
-#define LV_ATTRIBUTE_IMG_ROUNDABOUT_LEFT
-#endif
-
-const LV_ATTRIBUTE_MEM_ALIGN LV_ATTRIBUTE_LARGE_CONST LV_ATTRIBUTE_IMG_ROUNDABOUT_LEFT uint8_t roundabout_left_map[] = {
-  0x04, 0x02, 0x04, 0xff, 	/*Color of index 0*/
-  0xfc, 0xfe, 0xfc, 0xff, 	/*Color of index 1*/
-
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x00, 0x0f, 0xff, 0xff, 0x80, 
-  0x00, 0x00, 0x00, 0x00, 0x1f, 0xff, 0xff, 0xe0, 
-  0x00, 0x00, 0x00, 0x00, 0x7f, 0xff, 0xff, 0xf0, 
-  0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xf8, 
-  0x00, 0x0f, 0x00, 0x00, 0xff, 0xff, 0xff, 0xfc, 
-  0x00, 0x3f, 0x80, 0x01, 0xff, 0xff, 0xff, 0xfe, 
-  0x00, 0x7f, 0x80, 0x03, 0xff, 0xff, 0xff, 0xfe, 
-  0x00, 0xff, 0x80, 0x07, 0xff, 0xe0, 0x3f, 0xff, 
-  0x03, 0xff, 0x80, 0x07, 0xff, 0xc0, 0x0f, 0xff, 
-  0x07, 0xff, 0x80, 0x07, 0xff, 0x00, 0x07, 0xff, 
-  0x0f, 0xff, 0x00, 0x0f, 0xfe, 0x00, 0x03, 0xff, 
-  0x1f, 0xff, 0x00, 0x0f, 0xfe, 0x00, 0x01, 0xff, 
-  0x7f, 0xfe, 0x00, 0x0f, 0xfc, 0x00, 0x00, 0xff, 
-  0xff, 0xff, 0xff, 0xff, 0xf8, 0x00, 0x00, 0xff, 
-  0xff, 0xff, 0xff, 0xff, 0xf8, 0x00, 0x00, 0x7f, 
-  0xff, 0xff, 0xff, 0xff, 0xf8, 0x00, 0x00, 0x7f, 
-  0xff, 0xff, 0xff, 0xff, 0xf0, 0x00, 0x00, 0x7f, 
-  0xff, 0xff, 0xff, 0xff, 0xf0, 0x00, 0x00, 0x7f, 
-  0xff, 0xff, 0xff, 0xff, 0xf8, 0x00, 0x00, 0x7f, 
-  0xff, 0xff, 0xff, 0xff, 0xf8, 0x00, 0x00, 0x7f, 
-  0xff, 0xff, 0xff, 0xff, 0xf8, 0x00, 0x00, 0xff, 
-  0x7f, 0xfe, 0x00, 0x0f, 0xfc, 0x00, 0x00, 0xff, 
-  0x1f, 0xff, 0x00, 0x0f, 0xfe, 0x00, 0x01, 0xff, 
-  0x0f, 0xff, 0x00, 0x0f, 0xfe, 0x00, 0x03, 0xff, 
-  0x07, 0xff, 0x80, 0x07, 0xff, 0x00, 0x07, 0xff, 
-  0x03, 0xff, 0x80, 0x07, 0xff, 0xc0, 0x0f, 0xff, 
-  0x00, 0xff, 0x80, 0x07, 0xff, 0xe0, 0x3f, 0xff, 
-  0x00, 0x7f, 0x80, 0x03, 0xff, 0xff, 0xff, 0xfe, 
-  0x00, 0x3f, 0x80, 0x01, 0xff, 0xff, 0xff, 0xfe, 
-  0x00, 0x0f, 0x00, 0x00, 0xff, 0xff, 0xff, 0xfc, 
-  0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xf8, 
-  0x00, 0x00, 0x00, 0x00, 0x7f, 0xff, 0xff, 0xf0, 
-  0x00, 0x00, 0x00, 0x00, 0x1f, 0xff, 0xff, 0xe0, 
-  0x00, 0x00, 0x00, 0x00, 0x0f, 0xff, 0xff, 0xc0, 
-  0x00, 0x00, 0x00, 0x00, 0x07, 0xff, 0xff, 0x00, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xfc, 0x00, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x1f, 0xe0, 0x00, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x1f, 0xe0, 0x00, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x1f, 0xe0, 0x00, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x1f, 0xe0, 0x00, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x1f, 0xe0, 0x00, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x1f, 0xe0, 0x00, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x1f, 0xe0, 0x00, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x1f, 0xe0, 0x00, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x1f, 0xe0, 0x00, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x1f, 0xe0, 0x00, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x1f, 0xe0, 0x00, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-};
-
-const lv_img_dsc_t roundabout_left = {
-      {
-        LV_IMG_CF_INDEXED_1BIT,
-        0,
-        0,
-        64,
-        64
-    },
-    520,
-roundabout_left_map,
-};
diff --git a/src/displayapp/icons/navigation/roundabout-left.png b/src/displayapp/icons/navigation/roundabout-left.png
deleted file mode 100644
index b25f0359..00000000
--- a/src/displayapp/icons/navigation/roundabout-left.png
+++ /dev/null
diff --git a/src/displayapp/icons/navigation/roundabout-right-white.svg b/src/displayapp/icons/navigation/roundabout-right-white.svg
deleted file mode 100644
index ab89ff96..00000000
--- a/src/displayapp/icons/navigation/roundabout-right-white.svg
+++ /dev/null
@@ -1,4 +0,0 @@
-<svg id="WORKING_ICONS" data-name="WORKING ICONS" xmlns="http://www.w3.org/2000/svg" width="20" height="20" viewBox="0 0 20 20">
-  <title>direction</title>
-  <path fill="#ffffff" d="M7,6.2A3.8,3.8,0,1,1,3.2,10,3.80428,3.80428,0,0,1,7,6.2m0,7A3.2,3.2,0,1,0,3.8,10,3.20363,3.20363,0,0,0,7,13.2M7,6a4,4,0,1,0,4,4A4.00458,4.00458,0,0,0,7,6H7Zm0,7a3,3,0,1,1,3-3,3.00328,3.00328,0,0,1-3,3H7Zm7.83777-5.45184a0.1933,0.1933,0,0,0-.31177.20471l0.67188,1.47589A0.17881,0.17881,0,0,1,15.00916,9.5H10V10a2.99994,2.99994,0,0,1-3,3H6.5v4h1V13.96924A4.0032,4.0032,0,0,0,10.96924,10.5h4.03992a0.17881,0.17881,0,0,1,.18872.27124L14.526,12.24713a0.1933,0.1933,0,0,0,.31177.20471L18.00916,10Z"/>
-</svg>
diff --git a/src/displayapp/icons/navigation/roundabout-right.c b/src/displayapp/icons/navigation/roundabout-right.c
deleted file mode 100644
index 17eea49d..00000000
--- a/src/displayapp/icons/navigation/roundabout-right.c
+++ /dev/null
@@ -1,96 +0,0 @@
-#if defined(LV_LVGL_H_INCLUDE_SIMPLE)
-#include "lvgl.h"
-#else
-#include "lvgl/lvgl.h"
-#endif
-
-
-#ifndef LV_ATTRIBUTE_MEM_ALIGN
-#define LV_ATTRIBUTE_MEM_ALIGN
-#endif
-
-#ifndef LV_ATTRIBUTE_IMG_ROUNDABOUT_RIGHT
-#define LV_ATTRIBUTE_IMG_ROUNDABOUT_RIGHT
-#endif
-
-const LV_ATTRIBUTE_MEM_ALIGN LV_ATTRIBUTE_LARGE_CONST LV_ATTRIBUTE_IMG_ROUNDABOUT_RIGHT uint8_t roundabout_right_map[] = {
-  0x04, 0x02, 0x04, 0xff, 	/*Color of index 0*/
-  0xfc, 0xfe, 0xfc, 0xff, 	/*Color of index 1*/
-
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x01, 0xff, 0xff, 0xf0, 0x00, 0x00, 0x00, 0x00, 
-  0x07, 0xff, 0xff, 0xf8, 0x00, 0x00, 0x00, 0x00, 
-  0x0f, 0xff, 0xff, 0xfc, 0x00, 0x00, 0x00, 0x00, 
-  0x1f, 0xff, 0xff, 0xfe, 0x00, 0x00, 0x00, 0x00, 
-  0x3f, 0xff, 0xff, 0xff, 0x00, 0x01, 0xf0, 0x00, 
-  0x7f, 0xff, 0xff, 0xff, 0x80, 0x01, 0xf8, 0x00, 
-  0x7f, 0xff, 0xff, 0xff, 0xc0, 0x01, 0xfe, 0x00, 
-  0xff, 0xfc, 0x07, 0xff, 0xc0, 0x01, 0xff, 0x00, 
-  0xff, 0xf0, 0x03, 0xff, 0xe0, 0x01, 0xff, 0x80, 
-  0xff, 0xe0, 0x00, 0xff, 0xe0, 0x01, 0xff, 0xe0, 
-  0xff, 0xc0, 0x00, 0x7f, 0xe0, 0x00, 0xff, 0xf0, 
-  0xff, 0x80, 0x00, 0x7f, 0xf0, 0x00, 0xff, 0xf8, 
-  0xff, 0x00, 0x00, 0x3f, 0xf0, 0x00, 0xff, 0xfc, 
-  0xff, 0x00, 0x00, 0x1f, 0xff, 0xff, 0xff, 0xff, 
-  0xfe, 0x00, 0x00, 0x1f, 0xff, 0xff, 0xff, 0xff, 
-  0xfe, 0x00, 0x00, 0x1f, 0xff, 0xff, 0xff, 0xff, 
-  0xfe, 0x00, 0x00, 0x0f, 0xff, 0xff, 0xff, 0xff, 
-  0xfe, 0x00, 0x00, 0x0f, 0xff, 0xff, 0xff, 0xff, 
-  0xfe, 0x00, 0x00, 0x1f, 0xff, 0xff, 0xff, 0xff, 
-  0xfe, 0x00, 0x00, 0x1f, 0xff, 0xff, 0xff, 0xff, 
-  0xff, 0x00, 0x00, 0x1f, 0xff, 0xff, 0xff, 0xff, 
-  0xff, 0x00, 0x00, 0x3f, 0xf0, 0x00, 0xff, 0xfc, 
-  0xff, 0x80, 0x00, 0x7f, 0xf0, 0x00, 0xff, 0xf8, 
-  0xff, 0xc0, 0x00, 0x7f, 0xe0, 0x00, 0xff, 0xf0, 
-  0xff, 0xe0, 0x00, 0xff, 0xe0, 0x01, 0xff, 0xe0, 
-  0xff, 0xf0, 0x03, 0xff, 0xe0, 0x01, 0xff, 0x80, 
-  0xff, 0xfc, 0x07, 0xff, 0xc0, 0x01, 0xff, 0x00, 
-  0x7f, 0xff, 0xff, 0xff, 0xc0, 0x01, 0xfe, 0x00, 
-  0x7f, 0xff, 0xff, 0xff, 0x80, 0x01, 0xf8, 0x00, 
-  0x3f, 0xff, 0xff, 0xff, 0x00, 0x01, 0xf0, 0x00, 
-  0x1f, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 
-  0x0f, 0xff, 0xff, 0xfe, 0x00, 0x00, 0x00, 0x00, 
-  0x07, 0xff, 0xff, 0xf8, 0x00, 0x00, 0x00, 0x00, 
-  0x03, 0xff, 0xff, 0xf0, 0x00, 0x00, 0x00, 0x00, 
-  0x00, 0xff, 0xff, 0xe0, 0x00, 0x00, 0x00, 0x00, 
-  0x00, 0x3f, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x00, 0x07, 0xf8, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x00, 0x07, 0xf8, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x00, 0x07, 0xf8, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x00, 0x07, 0xf8, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x00, 0x07, 0xf8, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x00, 0x07, 0xf8, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x00, 0x07, 0xf8, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x00, 0x07, 0xf8, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x00, 0x07, 0xf8, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x00, 0x07, 0xf8, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x00, 0x07, 0xf8, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-};
-
-const lv_img_dsc_t roundabout_right = {
-      {
-        LV_IMG_CF_INDEXED_1BIT,
-        0,
-        0,
-        64,
-        64
-    },
-    520,
-roundabout_right_map,
-};
diff --git a/src/displayapp/icons/navigation/roundabout-right.png b/src/displayapp/icons/navigation/roundabout-right.png
deleted file mode 100644
index def83ade..00000000
--- a/src/displayapp/icons/navigation/roundabout-right.png
+++ /dev/null
diff --git a/src/displayapp/icons/navigation/roundabout-sharp-left-white.svg b/src/displayapp/icons/navigation/roundabout-sharp-left-white.svg
deleted file mode 100644
index 592e7183..00000000
--- a/src/displayapp/icons/navigation/roundabout-sharp-left-white.svg
+++ /dev/null
@@ -1,4 +0,0 @@
-<svg id="WORKING_ICONS" data-name="WORKING ICONS" xmlns="http://www.w3.org/2000/svg" width="20" height="20" viewBox="0 0 20 20">
-  <title>direction</title>
-  <path fill="#ffffff" d="M10.994,5.2A3.8,3.8,0,1,1,7.194,9a3.80428,3.80428,0,0,1,3.8-3.8m0,7A3.2,3.2,0,1,0,7.794,9a3.20363,3.20363,0,0,0,3.2,3.2m0-7.2a4,4,0,1,0,4,4,4.00458,4.00458,0,0,0-4-4h0Zm0,7a3,3,0,1,1,3-3,3.00328,3.00328,0,0,1-3,3h0Zm2.8291-5.82813a4.03583,4.03583,0,0,0-.54248-0.45459,4.07906,4.07906,0,0,0-5.11475.4541,4.00058,4.00058,0,0,0-.33252,5.28076L4.76758,14.51792a0.17873,0.17873,0,0,1-.325-0.05847L3.874,12.94071a0.19332,0.19332,0,0,0-.36523.07568L3,16.99265l3.97626-.50879a0.19332,0.19332,0,0,0,.07568-0.36523L5.5332,15.55008a0.17879,0.17879,0,0,1-.05835-0.3252l-0.00037-.00037,3.40378-3.40567,0.33838-.353-0.34521-.34619A2.9995,2.9995,0,0,1,8.8729,6.87842a3.06063,3.06063,0,0,1,3.83545-.34082,3.02673,3.02673,0,0,1,.40771.34131A3,3,0,0,1,10.994,12h-0.5v4h1V12.96924A4.00076,4.00076,0,0,0,13.82309,6.17187Z"/>
-</svg>
diff --git a/src/displayapp/icons/navigation/roundabout-sharp-left.c b/src/displayapp/icons/navigation/roundabout-sharp-left.c
deleted file mode 100644
index 4bf45060..00000000
--- a/src/displayapp/icons/navigation/roundabout-sharp-left.c
+++ /dev/null
@@ -1,96 +0,0 @@
-#if defined(LV_LVGL_H_INCLUDE_SIMPLE)
-#include "lvgl.h"
-#else
-#include "lvgl/lvgl.h"
-#endif
-
-
-#ifndef LV_ATTRIBUTE_MEM_ALIGN
-#define LV_ATTRIBUTE_MEM_ALIGN
-#endif
-
-#ifndef LV_ATTRIBUTE_IMG_ROUNDABOUT_SHARP_LEFT
-#define LV_ATTRIBUTE_IMG_ROUNDABOUT_SHARP_LEFT
-#endif
-
-const LV_ATTRIBUTE_MEM_ALIGN LV_ATTRIBUTE_LARGE_CONST LV_ATTRIBUTE_IMG_ROUNDABOUT_SHARP_LEFT uint8_t roundabout_sharp_left_map[] = {
-  0x04, 0x02, 0x04, 0xff, 	/*Color of index 0*/
-  0xfc, 0xfe, 0xfc, 0xff, 	/*Color of index 1*/
-
-  0x00, 0x00, 0x00, 0x01, 0xff, 0xff, 0xfc, 0x00, 
-  0x00, 0x00, 0x00, 0x03, 0xff, 0xff, 0xff, 0x00, 
-  0x00, 0x00, 0x00, 0x1f, 0xff, 0xff, 0xff, 0x80, 
-  0x00, 0x00, 0x00, 0x1f, 0xff, 0xff, 0xff, 0xe0, 
-  0x00, 0x00, 0x00, 0x3f, 0xff, 0xff, 0xff, 0xe0, 
-  0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xf8, 
-  0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xf8, 
-  0x00, 0x00, 0x01, 0xff, 0xff, 0xff, 0xff, 0xfc, 
-  0x00, 0x00, 0x03, 0xff, 0xff, 0x03, 0xff, 0xfe, 
-  0x00, 0x00, 0x03, 0xff, 0xf8, 0x00, 0x7f, 0xfe, 
-  0x00, 0x00, 0x03, 0xff, 0xe0, 0x00, 0x3f, 0xff, 
-  0x00, 0x00, 0x07, 0xff, 0xc0, 0x00, 0x1f, 0xff, 
-  0x00, 0x00, 0x07, 0xff, 0x80, 0x00, 0x0f, 0xff, 
-  0x00, 0x00, 0x0f, 0xff, 0x00, 0x00, 0x07, 0xff, 
-  0x00, 0x00, 0x0f, 0xfe, 0x00, 0x00, 0x03, 0xff, 
-  0x00, 0x00, 0x0f, 0xfe, 0x00, 0x00, 0x01, 0xff, 
-  0x00, 0x00, 0x1f, 0xfc, 0x00, 0x00, 0x01, 0xff, 
-  0x00, 0x00, 0x1f, 0xfc, 0x00, 0x00, 0x01, 0xff, 
-  0x00, 0x00, 0x1f, 0xf8, 0x00, 0x00, 0x00, 0xff, 
-  0x00, 0x00, 0x1f, 0xf8, 0x00, 0x00, 0x00, 0xff, 
-  0x00, 0x00, 0x1f, 0xf8, 0x00, 0x00, 0x00, 0xff, 
-  0x00, 0x00, 0x1f, 0xf8, 0x00, 0x00, 0x00, 0xff, 
-  0x00, 0x00, 0x1f, 0xf8, 0x00, 0x00, 0x00, 0xff, 
-  0x00, 0x00, 0x1f, 0xf8, 0x00, 0x00, 0x00, 0xff, 
-  0x00, 0x00, 0x1f, 0xfc, 0x00, 0x00, 0x01, 0xff, 
-  0x00, 0x00, 0x1f, 0xfc, 0x00, 0x00, 0x01, 0xff, 
-  0x00, 0x00, 0x0f, 0xfc, 0x00, 0x00, 0x01, 0xff, 
-  0x00, 0x00, 0x0f, 0xfe, 0x00, 0x00, 0x03, 0xff, 
-  0x00, 0x00, 0x0f, 0xfe, 0x00, 0x00, 0x03, 0xff, 
-  0x00, 0x00, 0x0f, 0xff, 0x00, 0x00, 0x07, 0xff, 
-  0x00, 0x00, 0x07, 0xff, 0x80, 0x00, 0x0f, 0xff, 
-  0x00, 0x00, 0x07, 0xff, 0xc0, 0x00, 0x1f, 0xff, 
-  0x00, 0x00, 0x03, 0xff, 0xe0, 0x00, 0x3f, 0xff, 
-  0x00, 0x00, 0x03, 0xff, 0xf8, 0x00, 0xff, 0xfe, 
-  0x00, 0x00, 0x03, 0xff, 0xff, 0x03, 0xff, 0xfc, 
-  0x00, 0x00, 0x07, 0xff, 0xff, 0xff, 0xff, 0xfc, 
-  0x00, 0x00, 0x0f, 0xff, 0xff, 0xff, 0xff, 0xf8, 
-  0x00, 0x00, 0x1f, 0xff, 0xff, 0xff, 0xff, 0xf0, 
-  0x00, 0x00, 0x3f, 0xff, 0xff, 0xff, 0xff, 0xe0, 
-  0x00, 0x00, 0x7f, 0xff, 0xff, 0xff, 0xff, 0xe0, 
-  0x7e, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0x80, 
-  0x7e, 0x01, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 
-  0x7f, 0x03, 0xff, 0xf8, 0xff, 0xff, 0xf8, 0x00, 
-  0x7f, 0x07, 0xff, 0xf0, 0x3f, 0xff, 0xe0, 0x00, 
-  0xff, 0x8f, 0xff, 0xe0, 0x03, 0xff, 0x00, 0x00, 
-  0xff, 0x9f, 0xff, 0xc0, 0x03, 0xfe, 0x00, 0x00, 
-  0xff, 0xbf, 0xff, 0x80, 0x03, 0xfe, 0x00, 0x00, 
-  0xff, 0xff, 0xff, 0x00, 0x03, 0xfe, 0x00, 0x00, 
-  0xff, 0xff, 0xfe, 0x00, 0x03, 0xfe, 0x00, 0x00, 
-  0xff, 0xff, 0xfc, 0x00, 0x03, 0xfe, 0x00, 0x00, 
-  0xff, 0xff, 0xf8, 0x00, 0x03, 0xfe, 0x00, 0x00, 
-  0xff, 0xff, 0xf0, 0x00, 0x03, 0xfe, 0x00, 0x00, 
-  0xff, 0xff, 0xe0, 0x00, 0x03, 0xfe, 0x00, 0x00, 
-  0xff, 0xff, 0xc0, 0x00, 0x03, 0xfe, 0x00, 0x00, 
-  0xff, 0xff, 0x80, 0x00, 0x03, 0xfe, 0x00, 0x00, 
-  0xff, 0xff, 0xf0, 0x00, 0x03, 0xfe, 0x00, 0x00, 
-  0xff, 0xff, 0xfc, 0x00, 0x03, 0xfe, 0x00, 0x00, 
-  0xff, 0xff, 0xff, 0x00, 0x03, 0xfe, 0x00, 0x00, 
-  0xff, 0xff, 0xff, 0x00, 0x03, 0xfe, 0x00, 0x00, 
-  0xff, 0xff, 0xff, 0x00, 0x03, 0xfe, 0x00, 0x00, 
-  0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0xff, 0xff, 0xf0, 0x00, 0x00, 0x00, 0x00, 0x00, 
-};
-
-const lv_img_dsc_t roundabout_sharp_left = {
-      {
-        LV_IMG_CF_INDEXED_1BIT,
-        0,
-        0,
-        64,
-        64
-    },
-    520,
-roundabout_sharp_left_map,
-};
diff --git a/src/displayapp/icons/navigation/roundabout-sharp-left.png b/src/displayapp/icons/navigation/roundabout-sharp-left.png
deleted file mode 100644
index 3f6c2d21..00000000
--- a/src/displayapp/icons/navigation/roundabout-sharp-left.png
+++ /dev/null
diff --git a/src/displayapp/icons/navigation/roundabout-sharp-right-white.svg b/src/displayapp/icons/navigation/roundabout-sharp-right-white.svg
deleted file mode 100644
index 0811994d..00000000
--- a/src/displayapp/icons/navigation/roundabout-sharp-right-white.svg
+++ /dev/null
@@ -1,4 +0,0 @@
-<svg id="WORKING_ICONS" data-name="WORKING ICONS" xmlns="http://www.w3.org/2000/svg" width="20" height="20" viewBox="0 0 20 20">
-  <title>direction</title>
-  <path fill="#ffffff" d="M8.97217,5.2a3.8,3.8,0,1,1-3.8,3.8,3.8043,3.8043,0,0,1,3.8-3.8m0,7a3.2,3.2,0,1,0-3.2-3.2,3.20362,3.20362,0,0,0,3.2,3.2m0-7.2a4,4,0,1,0,4,4,4.00458,4.00458,0,0,0-4-4h0Zm0,7a3,3,0,1,1,3-3,3.00328,3.00328,0,0,1-3,3h0Zm7.491,1.02374a0.19328,0.19328,0,0,0-.36517-0.07568L15.52948,14.4668a0.17883,0.17883,0,0,1-.32526.05835l-0.00018.00018-3.75726-3.75726-0.35352.35352A2.98022,2.98022,0,0,1,8.97217,12h-0.5v4h1V12.96924a3.95621,3.95621,0,0,0,1.95264-.80859l3.07312,3.07275a0.17841,0.17841,0,0,1-.05914.324L12.9201,16.126a0.1933,0.1933,0,0,0,.07568.36523L16.972,17Z"/>
-</svg>
diff --git a/src/displayapp/icons/navigation/roundabout-sharp-right.c b/src/displayapp/icons/navigation/roundabout-sharp-right.c
deleted file mode 100644
index bf3f68aa..00000000
--- a/src/displayapp/icons/navigation/roundabout-sharp-right.c
+++ /dev/null
@@ -1,96 +0,0 @@
-#if defined(LV_LVGL_H_INCLUDE_SIMPLE)
-#include "lvgl.h"
-#else
-#include "lvgl/lvgl.h"
-#endif
-
-
-#ifndef LV_ATTRIBUTE_MEM_ALIGN
-#define LV_ATTRIBUTE_MEM_ALIGN
-#endif
-
-#ifndef LV_ATTRIBUTE_IMG_ROUNDABOUT_SHARP_RIGHT
-#define LV_ATTRIBUTE_IMG_ROUNDABOUT_SHARP_RIGHT
-#endif
-
-const LV_ATTRIBUTE_MEM_ALIGN LV_ATTRIBUTE_LARGE_CONST LV_ATTRIBUTE_IMG_ROUNDABOUT_SHARP_RIGHT uint8_t roundabout_sharp_right_map[] = {
-  0x04, 0x02, 0x04, 0xff, 	/*Color of index 0*/
-  0xfc, 0xfe, 0xfc, 0xff, 	/*Color of index 1*/
-
-  0x00, 0x3f, 0xff, 0xff, 0x80, 0x00, 0x00, 0x00, 
-  0x00, 0xff, 0xff, 0xff, 0xc0, 0x00, 0x00, 0x00, 
-  0x03, 0xff, 0xff, 0xff, 0xf0, 0x00, 0x00, 0x00, 
-  0x07, 0xff, 0xff, 0xff, 0xf8, 0x00, 0x00, 0x00, 
-  0x07, 0xff, 0xff, 0xff, 0xfc, 0x00, 0x00, 0x00, 
-  0x1f, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 
-  0x3f, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 
-  0x3f, 0xff, 0xff, 0xff, 0xff, 0x80, 0x00, 0x00, 
-  0x7f, 0xff, 0xc0, 0xff, 0xff, 0xc0, 0x00, 0x00, 
-  0x7f, 0xfe, 0x00, 0x1f, 0xff, 0xc0, 0x00, 0x00, 
-  0xff, 0xfc, 0x00, 0x07, 0xff, 0xc0, 0x00, 0x00, 
-  0xff, 0xf8, 0x00, 0x03, 0xff, 0xe0, 0x00, 0x00, 
-  0xff, 0xf0, 0x00, 0x01, 0xff, 0xe0, 0x00, 0x00, 
-  0xff, 0xe0, 0x00, 0x00, 0xff, 0xf0, 0x00, 0x00, 
-  0xff, 0xc0, 0x00, 0x00, 0xff, 0xf0, 0x00, 0x00, 
-  0xff, 0x80, 0x00, 0x00, 0x7f, 0xf0, 0x00, 0x00, 
-  0xff, 0x80, 0x00, 0x00, 0x7f, 0xf0, 0x00, 0x00, 
-  0xff, 0x80, 0x00, 0x00, 0x3f, 0xf0, 0x00, 0x00, 
-  0xff, 0x00, 0x00, 0x00, 0x3f, 0xf8, 0x00, 0x00, 
-  0xff, 0x00, 0x00, 0x00, 0x1f, 0xf8, 0x00, 0x00, 
-  0xff, 0x00, 0x00, 0x00, 0x1f, 0xf8, 0x00, 0x00, 
-  0xfe, 0x00, 0x00, 0x00, 0x1f, 0xf8, 0x00, 0x00, 
-  0xff, 0x00, 0x00, 0x00, 0x1f, 0xf8, 0x00, 0x00, 
-  0xff, 0x00, 0x00, 0x00, 0x1f, 0xf8, 0x00, 0x00, 
-  0xff, 0x00, 0x00, 0x00, 0x3f, 0xf8, 0x00, 0x00, 
-  0xff, 0x80, 0x00, 0x00, 0x3f, 0xf0, 0x00, 0x00, 
-  0xff, 0x80, 0x00, 0x00, 0x7f, 0xf0, 0x00, 0x00, 
-  0xff, 0xc0, 0x00, 0x00, 0x7f, 0xf0, 0x00, 0x00, 
-  0xff, 0xc0, 0x00, 0x00, 0xff, 0xf0, 0x00, 0x00, 
-  0xff, 0xe0, 0x00, 0x00, 0xff, 0xe0, 0x00, 0x00, 
-  0xff, 0xf0, 0x00, 0x03, 0xff, 0xe0, 0x00, 0x00, 
-  0xff, 0xf8, 0x00, 0x03, 0xff, 0xe0, 0x00, 0x00, 
-  0xff, 0xfc, 0x00, 0x0f, 0xff, 0xc0, 0x00, 0x00, 
-  0x7f, 0xff, 0x00, 0x3f, 0xff, 0xc0, 0x00, 0x00, 
-  0x7f, 0xff, 0xc0, 0xff, 0xff, 0xc0, 0x00, 0x00, 
-  0x3f, 0xff, 0xff, 0xff, 0xff, 0xe0, 0x00, 0x00, 
-  0x3f, 0xff, 0xff, 0xff, 0xff, 0xf0, 0x00, 0x00, 
-  0x0f, 0xff, 0xff, 0xff, 0xff, 0xf8, 0x00, 0x00, 
-  0x07, 0xff, 0xff, 0xff, 0xff, 0xfc, 0x00, 0x00, 
-  0x07, 0xff, 0xff, 0xff, 0xff, 0xfe, 0x00, 0x00, 
-  0x01, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x7e, 
-  0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0x80, 0x7e, 
-  0x00, 0x1f, 0xff, 0xff, 0x1f, 0xff, 0xc0, 0xfe, 
-  0x00, 0x07, 0xff, 0xfc, 0x0f, 0xff, 0xe0, 0xfe, 
-  0x00, 0x00, 0xff, 0xc0, 0x0f, 0xff, 0xf1, 0xfe, 
-  0x00, 0x00, 0xff, 0xc0, 0x03, 0xff, 0xf9, 0xff, 
-  0x00, 0x00, 0xff, 0xc0, 0x03, 0xff, 0xfd, 0xff, 
-  0x00, 0x00, 0xff, 0xc0, 0x01, 0xff, 0xff, 0xff, 
-  0x00, 0x00, 0xff, 0xc0, 0x00, 0x7f, 0xff, 0xff, 
-  0x00, 0x00, 0xff, 0xc0, 0x00, 0x7f, 0xff, 0xff, 
-  0x00, 0x00, 0xff, 0xc0, 0x00, 0x3f, 0xff, 0xff, 
-  0x00, 0x00, 0xff, 0xc0, 0x00, 0x0f, 0xff, 0xff, 
-  0x00, 0x00, 0xff, 0xc0, 0x00, 0x0f, 0xff, 0xff, 
-  0x00, 0x00, 0xff, 0xc0, 0x00, 0x03, 0xff, 0xff, 
-  0x00, 0x00, 0xff, 0xc0, 0x00, 0x01, 0xff, 0xff, 
-  0x00, 0x00, 0xff, 0xc0, 0x00, 0x0f, 0xff, 0xff, 
-  0x00, 0x00, 0xff, 0xc0, 0x00, 0x3f, 0xff, 0xff, 
-  0x00, 0x00, 0xff, 0xc0, 0x00, 0xff, 0xff, 0xff, 
-  0x00, 0x00, 0xff, 0xc0, 0x00, 0xff, 0xff, 0xff, 
-  0x00, 0x00, 0xff, 0xc0, 0x00, 0xff, 0xff, 0xff, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x0f, 0xff, 0xff, 
-};
-
-const lv_img_dsc_t roundabout_sharp_right = {
-      {
-        LV_IMG_CF_INDEXED_1BIT,
-        0,
-        0,
-        64,
-        64
-    },
-    520,
-roundabout_sharp_right_map,
-};
diff --git a/src/displayapp/icons/navigation/roundabout-sharp-right.png b/src/displayapp/icons/navigation/roundabout-sharp-right.png
deleted file mode 100644
index bb2a8454..00000000
--- a/src/displayapp/icons/navigation/roundabout-sharp-right.png
+++ /dev/null
diff --git a/src/displayapp/icons/navigation/roundabout-slight-left-white.svg b/src/displayapp/icons/navigation/roundabout-slight-left-white.svg
deleted file mode 100644
index d597020e..00000000
--- a/src/displayapp/icons/navigation/roundabout-slight-left-white.svg
+++ /dev/null
@@ -1,4 +0,0 @@
-<svg id="WORKING_ICONS" data-name="WORKING ICONS" xmlns="http://www.w3.org/2000/svg" width="20" height="20" viewBox="0 0 20 20">
-  <title>direction</title>
-  <path fill="#ffffff" d="M10.97473,7.2a3.8,3.8,0,1,1-3.8,3.8,3.80428,3.80428,0,0,1,3.8-3.8m0,7a3.2,3.2,0,1,0-3.2-3.2,3.20363,3.20363,0,0,0,3.2,3.2m0-7.2a4,4,0,1,0,4,4,4.00458,4.00458,0,0,0-4-4h0Zm0,7a3,3,0,1,1,3-3,3.00328,3.00328,0,0,1-3,3h0Zm-5.499-9.20184A0.17879,0.17879,0,0,1,5.53408,4.473L7.0528,3.90441a0.1933,0.1933,0,0,0-.0757-0.36521L3.00086,3.03039,3.50967,7.00664a0.1933,0.1933,0,0,0,.36521.0757L4.44342,5.56362a0.17879,0.17879,0,0,1,.32521-0.05835m6.7061,9.464a4.00038,4.00038,0,0,0,2.32861-6.79736,4.0315,4.0315,0,0,0-.542-0.45459,4.07671,4.07671,0,0,0-4.73975.12256l-3.75294-3.749-0.707.708,4.439,4.43311,0.353-.35352a3.05971,3.05971,0,0,1,3.83545-.34082,3.02248,3.02248,0,0,1,.40723.34131A2.99976,2.99976,0,0,1,10.97472,14h-0.5v4h1V14.96924Z"/>
-</svg>
diff --git a/src/displayapp/icons/navigation/roundabout-slight-left.c b/src/displayapp/icons/navigation/roundabout-slight-left.c
deleted file mode 100644
index 4ddec650..00000000
--- a/src/displayapp/icons/navigation/roundabout-slight-left.c
+++ /dev/null
@@ -1,96 +0,0 @@
-#if defined(LV_LVGL_H_INCLUDE_SIMPLE)
-#include "lvgl.h"
-#else
-#include "lvgl/lvgl.h"
-#endif
-
-
-#ifndef LV_ATTRIBUTE_MEM_ALIGN
-#define LV_ATTRIBUTE_MEM_ALIGN
-#endif
-
-#ifndef LV_ATTRIBUTE_IMG_ROUNDABOUT_SLIGHT_LEFT
-#define LV_ATTRIBUTE_IMG_ROUNDABOUT_SLIGHT_LEFT
-#endif
-
-const LV_ATTRIBUTE_MEM_ALIGN LV_ATTRIBUTE_LARGE_CONST LV_ATTRIBUTE_IMG_ROUNDABOUT_SLIGHT_LEFT uint8_t roundabout_slight_left_map[] = {
-  0x04, 0x02, 0x04, 0xff, 	/*Color of index 0*/
-  0xfc, 0xfe, 0xfc, 0xff, 	/*Color of index 1*/
-
-  0x01, 0xff, 0xff, 0x80, 0x00, 0x00, 0x00, 0x00, 
-  0x01, 0xff, 0xff, 0xe0, 0x00, 0x00, 0x00, 0x00, 
-  0x01, 0xff, 0xff, 0xe0, 0x00, 0x00, 0x00, 0x00, 
-  0x01, 0xff, 0xff, 0xe0, 0x00, 0x00, 0x00, 0x00, 
-  0x01, 0xff, 0xff, 0xe0, 0x00, 0x00, 0x00, 0x00, 
-  0x01, 0xff, 0xff, 0xe0, 0x00, 0x00, 0x00, 0x00, 
-  0x01, 0xff, 0xff, 0x80, 0x00, 0x00, 0x00, 0x00, 
-  0x01, 0xff, 0xfc, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x01, 0xff, 0xfc, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x01, 0xff, 0xfe, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x01, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x01, 0xff, 0xff, 0x80, 0x00, 0x00, 0x00, 0x00, 
-  0x01, 0xff, 0xff, 0xc0, 0x00, 0x00, 0x00, 0x00, 
-  0x01, 0xff, 0xff, 0xe0, 0x00, 0x00, 0x00, 0x00, 
-  0x01, 0xff, 0xff, 0xf0, 0x00, 0x00, 0x00, 0x00, 
-  0x01, 0xfd, 0xff, 0xf8, 0x07, 0xf8, 0x00, 0x00, 
-  0x01, 0xfc, 0xff, 0xfc, 0x7f, 0xff, 0x80, 0x00, 
-  0x01, 0xfc, 0x7f, 0xff, 0xff, 0xff, 0xe0, 0x00, 
-  0x01, 0xf8, 0x3f, 0xff, 0xff, 0xff, 0xf8, 0x00, 
-  0x01, 0xf8, 0x1f, 0xff, 0xff, 0xff, 0xfc, 0x00, 
-  0x00, 0x00, 0x0f, 0xff, 0xff, 0xff, 0xfe, 0x00, 
-  0x00, 0x00, 0x07, 0xff, 0xff, 0xff, 0xff, 0x00, 
-  0x00, 0x00, 0x03, 0xff, 0xff, 0xff, 0xff, 0x80, 
-  0x00, 0x00, 0x01, 0xff, 0xff, 0xff, 0xff, 0x80, 
-  0x00, 0x00, 0x00, 0xff, 0xfc, 0x0f, 0xff, 0xc0, 
-  0x00, 0x00, 0x01, 0xff, 0xf0, 0x03, 0xff, 0xc0, 
-  0x00, 0x00, 0x01, 0xff, 0xc0, 0x01, 0xff, 0xc0, 
-  0x00, 0x00, 0x01, 0xff, 0x80, 0x00, 0xff, 0xc0, 
-  0x00, 0x00, 0x03, 0xff, 0x80, 0x00, 0x7f, 0xc0, 
-  0x00, 0x00, 0x03, 0xff, 0x00, 0x00, 0x3f, 0xc0, 
-  0x00, 0x00, 0x03, 0xfe, 0x00, 0x00, 0x3f, 0xc0, 
-  0x00, 0x00, 0x03, 0xfe, 0x00, 0x00, 0x1f, 0xc0, 
-  0x00, 0x00, 0x03, 0xfe, 0x00, 0x00, 0x1f, 0xc0, 
-  0x00, 0x00, 0x03, 0xfc, 0x00, 0x00, 0x1f, 0xc0, 
-  0x00, 0x00, 0x03, 0xfc, 0x00, 0x00, 0x1f, 0xc0, 
-  0x00, 0x00, 0x03, 0xfc, 0x00, 0x00, 0x1f, 0xc0, 
-  0x00, 0x00, 0x03, 0xfe, 0x00, 0x00, 0x1f, 0xc0, 
-  0x00, 0x00, 0x03, 0xfe, 0x00, 0x00, 0x3f, 0xc0, 
-  0x00, 0x00, 0x03, 0xff, 0x00, 0x00, 0x3f, 0xc0, 
-  0x00, 0x00, 0x03, 0xff, 0x00, 0x00, 0x7f, 0xc0, 
-  0x00, 0x00, 0x03, 0xff, 0x80, 0x00, 0xff, 0xc0, 
-  0x00, 0x00, 0x01, 0xff, 0xc0, 0x01, 0xff, 0xc0, 
-  0x00, 0x00, 0x01, 0xff, 0xf0, 0x03, 0xff, 0xc0, 
-  0x00, 0x00, 0x00, 0xff, 0xf8, 0x07, 0xff, 0xc0, 
-  0x00, 0x00, 0x00, 0xff, 0xff, 0x3f, 0xff, 0x80, 
-  0x00, 0x00, 0x00, 0x7f, 0xff, 0xff, 0xff, 0x80, 
-  0x00, 0x00, 0x00, 0x7f, 0xff, 0xff, 0xff, 0x00, 
-  0x00, 0x00, 0x00, 0x3f, 0xff, 0xff, 0xfe, 0x00, 
-  0x00, 0x00, 0x00, 0x1f, 0xff, 0xff, 0xfc, 0x00, 
-  0x00, 0x00, 0x00, 0x0f, 0xff, 0xff, 0xf8, 0x00, 
-  0x00, 0x00, 0x00, 0x07, 0xff, 0xff, 0xf0, 0x00, 
-  0x00, 0x00, 0x00, 0x01, 0xff, 0xff, 0xc0, 0x00, 
-  0x00, 0x00, 0x00, 0x00, 0x3f, 0xff, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x00, 0x07, 0xf8, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x00, 0x07, 0xf8, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x00, 0x07, 0xf8, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x00, 0x07, 0xf8, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x00, 0x07, 0xf8, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x00, 0x07, 0xf8, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x00, 0x07, 0xf8, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x00, 0x07, 0xf8, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x00, 0x07, 0xf8, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x00, 0x07, 0xf8, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x00, 0x07, 0xf8, 0x00, 0x00, 
-};
-
-const lv_img_dsc_t roundabout_slight_left = {
-      {
-        LV_IMG_CF_INDEXED_1BIT,
-        0,
-        0,
-        64,
-        64
-    },
-    520,
-roundabout_slight_left_map,
-};
diff --git a/src/displayapp/icons/navigation/roundabout-slight-left.png b/src/displayapp/icons/navigation/roundabout-slight-left.png
deleted file mode 100644
index ed8b7b17..00000000
--- a/src/displayapp/icons/navigation/roundabout-slight-left.png
+++ /dev/null
diff --git a/src/displayapp/icons/navigation/roundabout-slight-right-white.svg b/src/displayapp/icons/navigation/roundabout-slight-right-white.svg
deleted file mode 100644
index 26804143..00000000
--- a/src/displayapp/icons/navigation/roundabout-slight-right-white.svg
+++ /dev/null
@@ -1,4 +0,0 @@
-<svg id="WORKING_ICONS" data-name="WORKING ICONS" xmlns="http://www.w3.org/2000/svg" width="20" height="20" viewBox="0 0 20 20">
-  <title>direction</title>
-  <path fill="#ffffff" d="M8.97128,7.2a3.8,3.8,0,1,1-3.8,3.8,3.80428,3.80428,0,0,1,3.8-3.8m0,7a3.2,3.2,0,1,0-3.2-3.2,3.20363,3.20363,0,0,0,3.2,3.2m0-7.2a4,4,0,1,0,4,4,4.00458,4.00458,0,0,0-4-4h0Zm0,7a3,3,0,1,1,3-3,3.00328,3.00328,0,0,1-3,3h0ZM13.05247,3.45127a0.19328,0.19328,0,0,0-.07568.36517l1.51874,0.5686a0.17878,0.17878,0,0,1,.05835.3252l0.00006,0.00006L10.73885,8.52539l0.35352,0.35352A2.99976,2.99976,0,0,1,8.97127,14h-0.5v3.97917h1V14.96924a4.00123,4.00123,0,0,0,2.66016-6.42236L15.261,5.41734a0.17878,0.17878,0,0,1,.3252.05835L16.1547,6.99443a0.19332,0.19332,0,0,0,.36523-0.07574l0.50879-3.9762Z"/>
-</svg>
diff --git a/src/displayapp/icons/navigation/roundabout-slight-right.c b/src/displayapp/icons/navigation/roundabout-slight-right.c
deleted file mode 100644
index e4ee2188..00000000
--- a/src/displayapp/icons/navigation/roundabout-slight-right.c
+++ /dev/null
@@ -1,96 +0,0 @@
-#if defined(LV_LVGL_H_INCLUDE_SIMPLE)
-#include "lvgl.h"
-#else
-#include "lvgl/lvgl.h"
-#endif
-
-
-#ifndef LV_ATTRIBUTE_MEM_ALIGN
-#define LV_ATTRIBUTE_MEM_ALIGN
-#endif
-
-#ifndef LV_ATTRIBUTE_IMG_ROUNDABOUT_SLIGHT_RIGHT
-#define LV_ATTRIBUTE_IMG_ROUNDABOUT_SLIGHT_RIGHT
-#endif
-
-const LV_ATTRIBUTE_MEM_ALIGN LV_ATTRIBUTE_LARGE_CONST LV_ATTRIBUTE_IMG_ROUNDABOUT_SLIGHT_RIGHT uint8_t roundabout_slight_right_map[] = {
-  0x04, 0x02, 0x04, 0xff, 	/*Color of index 0*/
-  0xfc, 0xfe, 0xfc, 0xff, 	/*Color of index 1*/
-
-  0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xc0, 
-  0x00, 0x00, 0x00, 0x00, 0x03, 0xff, 0xff, 0xc0, 
-  0x00, 0x00, 0x00, 0x00, 0x03, 0xff, 0xff, 0xc0, 
-  0x00, 0x00, 0x00, 0x00, 0x03, 0xff, 0xff, 0xc0, 
-  0x00, 0x00, 0x00, 0x00, 0x03, 0xff, 0xff, 0xc0, 
-  0x00, 0x00, 0x00, 0x00, 0x03, 0xff, 0xff, 0xc0, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xc0, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x1f, 0xff, 0xc0, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x1f, 0xff, 0xc0, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x3f, 0xff, 0xc0, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x7f, 0xff, 0xc0, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xc0, 
-  0x00, 0x00, 0x00, 0x00, 0x01, 0xff, 0xff, 0xc0, 
-  0x00, 0x00, 0x00, 0x00, 0x03, 0xff, 0xff, 0xc0, 
-  0x00, 0x00, 0x00, 0x00, 0x07, 0xff, 0xff, 0xc0, 
-  0x00, 0x00, 0x0f, 0xf0, 0x0f, 0xff, 0xdf, 0xc0, 
-  0x00, 0x00, 0xff, 0xff, 0x1f, 0xff, 0x9f, 0xc0, 
-  0x00, 0x03, 0xff, 0xff, 0xff, 0xff, 0x1f, 0xc0, 
-  0x00, 0x0f, 0xff, 0xff, 0xff, 0xfe, 0x0f, 0xc0, 
-  0x00, 0x1f, 0xff, 0xff, 0xff, 0xfc, 0x0f, 0x80, 
-  0x00, 0x3f, 0xff, 0xff, 0xff, 0xf8, 0x00, 0x00, 
-  0x00, 0x7f, 0xff, 0xff, 0xff, 0xf0, 0x00, 0x00, 
-  0x00, 0xff, 0xff, 0xff, 0xff, 0xe0, 0x00, 0x00, 
-  0x00, 0xff, 0xff, 0xff, 0xff, 0xc0, 0x00, 0x00, 
-  0x01, 0xff, 0xfc, 0x3f, 0xff, 0x80, 0x00, 0x00, 
-  0x01, 0xff, 0xf0, 0x0f, 0xff, 0x80, 0x00, 0x00, 
-  0x01, 0xff, 0xc0, 0x03, 0xff, 0xc0, 0x00, 0x00, 
-  0x01, 0xff, 0x80, 0x01, 0xff, 0xc0, 0x00, 0x00, 
-  0x01, 0xff, 0x00, 0x00, 0xff, 0xc0, 0x00, 0x00, 
-  0x01, 0xfe, 0x00, 0x00, 0x7f, 0xe0, 0x00, 0x00, 
-  0x01, 0xfe, 0x00, 0x00, 0x7f, 0xe0, 0x00, 0x00, 
-  0x01, 0xfc, 0x00, 0x00, 0x3f, 0xe0, 0x00, 0x00, 
-  0x01, 0xfc, 0x00, 0x00, 0x3f, 0xe0, 0x00, 0x00, 
-  0x01, 0xfc, 0x00, 0x00, 0x3f, 0xe0, 0x00, 0x00, 
-  0x01, 0xfc, 0x00, 0x00, 0x1f, 0xe0, 0x00, 0x00, 
-  0x01, 0xfc, 0x00, 0x00, 0x3f, 0xe0, 0x00, 0x00, 
-  0x01, 0xfc, 0x00, 0x00, 0x3f, 0xe0, 0x00, 0x00, 
-  0x01, 0xfc, 0x00, 0x00, 0x3f, 0xe0, 0x00, 0x00, 
-  0x01, 0xfe, 0x00, 0x00, 0x7f, 0xe0, 0x00, 0x00, 
-  0x01, 0xff, 0x00, 0x00, 0xff, 0xe0, 0x00, 0x00, 
-  0x01, 0xff, 0x00, 0x00, 0xff, 0xc0, 0x00, 0x00, 
-  0x01, 0xff, 0x80, 0x01, 0xff, 0xc0, 0x00, 0x00, 
-  0x01, 0xff, 0xc0, 0x03, 0xff, 0xc0, 0x00, 0x00, 
-  0x01, 0xff, 0xf0, 0x0f, 0xff, 0x80, 0x00, 0x00, 
-  0x01, 0xff, 0xfc, 0x3f, 0xff, 0x80, 0x00, 0x00, 
-  0x00, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 
-  0x00, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 
-  0x00, 0x7f, 0xff, 0xff, 0xfe, 0x00, 0x00, 0x00, 
-  0x00, 0x3f, 0xff, 0xff, 0xfc, 0x00, 0x00, 0x00, 
-  0x00, 0x1f, 0xff, 0xff, 0xf8, 0x00, 0x00, 0x00, 
-  0x00, 0x07, 0xff, 0xff, 0xe0, 0x00, 0x00, 0x00, 
-  0x00, 0x03, 0xff, 0xff, 0x80, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x7f, 0xfe, 0x00, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x0f, 0xf0, 0x00, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x0f, 0xf0, 0x00, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x0f, 0xf0, 0x00, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x0f, 0xf0, 0x00, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x0f, 0xf0, 0x00, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x0f, 0xf0, 0x00, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x0f, 0xf0, 0x00, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x0f, 0xf0, 0x00, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x0f, 0xf0, 0x00, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x0f, 0xf0, 0x00, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x0f, 0xf0, 0x00, 0x00, 0x00, 0x00, 
-};
-
-const lv_img_dsc_t roundabout_slight_right = {
-      {
-        LV_IMG_CF_INDEXED_1BIT,
-        0,
-        0,
-        64,
-        64
-    },
-    520,
-roundabout_slight_right_map,
-};
diff --git a/src/displayapp/icons/navigation/roundabout-slight-right.png b/src/displayapp/icons/navigation/roundabout-slight-right.png
deleted file mode 100644
index 20c7f33c..00000000
--- a/src/displayapp/icons/navigation/roundabout-slight-right.png
+++ /dev/null
diff --git a/src/displayapp/icons/navigation/roundabout-straight-white.svg b/src/displayapp/icons/navigation/roundabout-straight-white.svg
deleted file mode 100644
index ebca38bd..00000000
--- a/src/displayapp/icons/navigation/roundabout-straight-white.svg
+++ /dev/null
@@ -1,4 +0,0 @@
-<svg id="WORKING_ICONS" data-name="WORKING ICONS" xmlns="http://www.w3.org/2000/svg" width="20" height="20" viewBox="0 0 20 20">
-  <title>direction</title>
-  <path fill="#ffffff" d="M10,8.2A3.8,3.8,0,1,1,6.2,12,3.80427,3.80427,0,0,1,10,8.2m0,7A3.2,3.2,0,1,0,6.8,12,3.20363,3.20363,0,0,0,10,15.2M10,8a4,4,0,1,0,4,4,4.00458,4.00458,0,0,0-4-4h0Zm0,7a3,3,0,1,1,3-3,3.00328,3.00328,0,0,1-3,3h0Zm2.83057-5.82666A3.97135,3.97135,0,0,0,10.5,8.03076V5.00415a0.17881,0.17881,0,0,1,.27124-0.18872L12.24713,5.4873a0.19329,0.19329,0,0,0,.20471-0.31177L10,2.00415,7.54816,5.17554a0.1933,0.1933,0,0,0,.20471.31177l1.476-.67187A0.17879,0.17879,0,0,1,9.5,5.00415V9H10a3,3,0,1,1,0,6H9.5v3h1V15.96924A4.00076,4.00076,0,0,0,12.83057,9.17334Z"/>
-</svg>
diff --git a/src/displayapp/icons/navigation/roundabout-straight.c b/src/displayapp/icons/navigation/roundabout-straight.c
deleted file mode 100644
index b090e0dc..00000000
--- a/src/displayapp/icons/navigation/roundabout-straight.c
+++ /dev/null
@@ -1,96 +0,0 @@
-#if defined(LV_LVGL_H_INCLUDE_SIMPLE)
-#include "lvgl.h"
-#else
-#include "lvgl/lvgl.h"
-#endif
-
-
-#ifndef LV_ATTRIBUTE_MEM_ALIGN
-#define LV_ATTRIBUTE_MEM_ALIGN
-#endif
-
-#ifndef LV_ATTRIBUTE_IMG_ROUNDABOUT_STRAIGHT
-#define LV_ATTRIBUTE_IMG_ROUNDABOUT_STRAIGHT
-#endif
-
-const LV_ATTRIBUTE_MEM_ALIGN LV_ATTRIBUTE_LARGE_CONST LV_ATTRIBUTE_IMG_ROUNDABOUT_STRAIGHT uint8_t roundabout_straight_map[] = {
-  0x04, 0x02, 0x04, 0xff, 	/*Color of index 0*/
-  0xfc, 0xfe, 0xfc, 0xff, 	/*Color of index 1*/
-
-  0x00, 0x00, 0x00, 0x0f, 0xf0, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x1f, 0xf8, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x1f, 0xf8, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x3f, 0xfc, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x7f, 0xfe, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0xff, 0xff, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x01, 0xff, 0xff, 0x80, 0x00, 0x00, 
-  0x00, 0x00, 0x03, 0xff, 0xff, 0xc0, 0x00, 0x00, 
-  0x00, 0x00, 0x03, 0xff, 0xff, 0xc0, 0x00, 0x00, 
-  0x00, 0x00, 0x07, 0xff, 0xff, 0xe0, 0x00, 0x00, 
-  0x00, 0x00, 0x0f, 0xff, 0xff, 0xf0, 0x00, 0x00, 
-  0x00, 0x00, 0x0f, 0xff, 0xff, 0xf0, 0x00, 0x00, 
-  0x00, 0x00, 0x0f, 0xff, 0xff, 0xf0, 0x00, 0x00, 
-  0x00, 0x00, 0x0f, 0xff, 0xff, 0xf0, 0x00, 0x00, 
-  0x00, 0x00, 0x0f, 0xff, 0xff, 0xf0, 0x00, 0x00, 
-  0x00, 0x00, 0x0f, 0xcf, 0xf3, 0xf0, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x0f, 0xf0, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x0f, 0xf0, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x0f, 0xf0, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x0f, 0xf0, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x0f, 0xf0, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x0f, 0xf0, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x3f, 0xfc, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x01, 0xff, 0xff, 0x80, 0x00, 0x00, 
-  0x00, 0x00, 0x07, 0xff, 0xff, 0xe0, 0x00, 0x00, 
-  0x00, 0x00, 0x0f, 0xff, 0xff, 0xf0, 0x00, 0x00, 
-  0x00, 0x00, 0x1f, 0xff, 0xff, 0xf8, 0x00, 0x00, 
-  0x00, 0x00, 0x3f, 0xff, 0xff, 0xfc, 0x00, 0x00, 
-  0x00, 0x00, 0x7f, 0xff, 0xff, 0xfe, 0x00, 0x00, 
-  0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 
-  0x00, 0x00, 0xff, 0xfe, 0x7f, 0xff, 0x00, 0x00, 
-  0x00, 0x00, 0xff, 0xf0, 0x0f, 0xff, 0x00, 0x00, 
-  0x00, 0x00, 0xff, 0xe0, 0x07, 0xff, 0x00, 0x00, 
-  0x00, 0x00, 0xff, 0xc0, 0x03, 0xff, 0x00, 0x00, 
-  0x00, 0x00, 0xff, 0x80, 0x01, 0xff, 0x00, 0x00, 
-  0x00, 0x00, 0xff, 0x00, 0x00, 0xff, 0x00, 0x00, 
-  0x00, 0x00, 0xfe, 0x00, 0x00, 0x7f, 0x00, 0x00, 
-  0x00, 0x00, 0xfe, 0x00, 0x00, 0x7f, 0x00, 0x00, 
-  0x00, 0x00, 0xfe, 0x00, 0x00, 0x7f, 0x00, 0x00, 
-  0x00, 0x00, 0xfc, 0x00, 0x00, 0x3f, 0x00, 0x00, 
-  0x00, 0x00, 0xfc, 0x00, 0x00, 0x3f, 0x00, 0x00, 
-  0x00, 0x00, 0xfe, 0x00, 0x00, 0x7f, 0x00, 0x00, 
-  0x00, 0x00, 0xfe, 0x00, 0x00, 0x7f, 0x00, 0x00, 
-  0x00, 0x00, 0xfe, 0x00, 0x00, 0x7f, 0x00, 0x00, 
-  0x00, 0x00, 0xff, 0x00, 0x00, 0xff, 0x00, 0x00, 
-  0x00, 0x00, 0xff, 0x80, 0x01, 0xff, 0x00, 0x00, 
-  0x00, 0x00, 0xff, 0xc0, 0x03, 0xff, 0x00, 0x00, 
-  0x00, 0x00, 0xff, 0xe0, 0x07, 0xff, 0x00, 0x00, 
-  0x00, 0x00, 0xff, 0xf0, 0x0f, 0xff, 0x00, 0x00, 
-  0x00, 0x00, 0xff, 0xfe, 0x7f, 0xff, 0x00, 0x00, 
-  0x00, 0x00, 0xff, 0xff, 0xff, 0xfe, 0x00, 0x00, 
-  0x00, 0x00, 0x7f, 0xff, 0xff, 0xfe, 0x00, 0x00, 
-  0x00, 0x00, 0x3f, 0xff, 0xff, 0xfc, 0x00, 0x00, 
-  0x00, 0x00, 0x1f, 0xff, 0xff, 0xf8, 0x00, 0x00, 
-  0x00, 0x00, 0x0f, 0xff, 0xff, 0xf0, 0x00, 0x00, 
-  0x00, 0x00, 0x07, 0xff, 0xff, 0xc0, 0x00, 0x00, 
-  0x00, 0x00, 0x01, 0xff, 0xff, 0x80, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x3f, 0xfc, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x0f, 0xf0, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x0f, 0xf0, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x0f, 0xf0, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x0f, 0xf0, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x0f, 0xf0, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x0f, 0xf0, 0x00, 0x00, 0x00, 
-};
-
-const lv_img_dsc_t roundabout_straight = {
-      {
-        LV_IMG_CF_INDEXED_1BIT,
-        0,
-        0,
-        64,
-        64
-    },
-    520,
-roundabout_straight_map,
-};
diff --git a/src/displayapp/icons/navigation/roundabout-straight.png b/src/displayapp/icons/navigation/roundabout-straight.png
deleted file mode 100644
index e5301327..00000000
--- a/src/displayapp/icons/navigation/roundabout-straight.png
+++ /dev/null
diff --git a/src/displayapp/icons/navigation/roundabout-white.svg b/src/displayapp/icons/navigation/roundabout-white.svg
deleted file mode 100644
index 9c31a9fb..00000000
--- a/src/displayapp/icons/navigation/roundabout-white.svg
+++ /dev/null
@@ -1,4 +0,0 @@
-<svg id="WORKING_ICONS" data-name="WORKING ICONS" xmlns="http://www.w3.org/2000/svg" width="20" height="20" viewBox="0 0 20 20">
-  <title>direction</title>
-  <path fill="#ffffff" d="M5.5,10.002a0.17879,0.17879,0,0,0,.27124.18866l1.47589-.67188a0.1933,0.1933,0,0,1,.20471.31177L5,13.002,2.54816,9.83051a0.1933,0.1933,0,0,1,.20471-0.31177l1.476,0.67188A0.17876,0.17876,0,0,0,4.5,10.002V10A5.51888,5.51888,0,0,1,7.25293,5.23437l0.5,0.86523A4.51856,4.51856,0,0,0,5.5,10v0.002Zm6.75146-3.89941A4.51948,4.51948,0,0,1,14.5,10h1a5.5223,5.5223,0,0,0-2.74756-4.7627L12.751,5.23724A0.17878,0.17878,0,0,1,12.72321,4.908L14.043,3.96576a0.19332,0.19332,0,0,0-.16766-0.33319l-3.97247.53766,1.52063,3.70911a0.19331,0.19331,0,0,0,.37238-0.02142L11.952,6.24377A0.17945,0.17945,0,0,1,12.25146,6.10254ZM12.74688,14.766a0.17879,0.17879,0,0,1,.299.14053l0.1561,1.61412a0.1933,0.1933,0,0,0,.37235.02141L15.095,12.833l-3.97245-.53766a0.1933,0.1933,0,0,0-.16764.33317l1.31982,0.94225a0.17879,0.17879,0,0,1-.02781.32923l0.00361-.00254a4.57684,4.57684,0,0,1-4.502,0l-0.501.86523a5.50442,5.50442,0,0,0,5.50391,0Z" />
-</svg>
diff --git a/src/displayapp/icons/navigation/roundabout.c b/src/displayapp/icons/navigation/roundabout.c
deleted file mode 100644
index e29e0549..00000000
--- a/src/displayapp/icons/navigation/roundabout.c
+++ /dev/null
@@ -1,96 +0,0 @@
-#if defined(LV_LVGL_H_INCLUDE_SIMPLE)
-#include "lvgl.h"
-#else
-#include "lvgl/lvgl.h"
-#endif
-
-
-#ifndef LV_ATTRIBUTE_MEM_ALIGN
-#define LV_ATTRIBUTE_MEM_ALIGN
-#endif
-
-#ifndef LV_ATTRIBUTE_IMG_ROUNDABOUT
-#define LV_ATTRIBUTE_IMG_ROUNDABOUT
-#endif
-
-const LV_ATTRIBUTE_MEM_ALIGN LV_ATTRIBUTE_LARGE_CONST LV_ATTRIBUTE_IMG_ROUNDABOUT uint8_t roundabout_map[] = {
-  0x04, 0x02, 0x04, 0xff, 	/*Color of index 0*/
-  0xfc, 0xfe, 0xfc, 0xff, 	/*Color of index 1*/
-
-  0x00, 0x00, 0x00, 0x00, 0x03, 0xff, 0xff, 0xe0, 
-  0x00, 0x00, 0x00, 0x00, 0x3f, 0xff, 0xff, 0xe0, 
-  0x00, 0x00, 0x00, 0x00, 0x3f, 0xff, 0xff, 0xe0, 
-  0x00, 0x00, 0x00, 0x00, 0x3f, 0xff, 0xff, 0xe0, 
-  0x00, 0x00, 0x00, 0x00, 0x3f, 0xff, 0xff, 0xc0, 
-  0x00, 0x00, 0x00, 0x00, 0x1f, 0xff, 0xff, 0x00, 
-  0x00, 0x00, 0x07, 0xc0, 0x1f, 0xff, 0xfe, 0x00, 
-  0x00, 0x00, 0x1f, 0xc0, 0x1f, 0xff, 0xfc, 0x00, 
-  0x00, 0x00, 0x3f, 0xe0, 0x0f, 0xff, 0xff, 0x00, 
-  0x00, 0x00, 0x7f, 0xe0, 0x0f, 0xff, 0xff, 0x80, 
-  0x00, 0x01, 0xff, 0xf0, 0x07, 0xff, 0xff, 0xc0, 
-  0x00, 0x01, 0xff, 0xf0, 0x07, 0xff, 0xff, 0xe0, 
-  0x00, 0x03, 0xff, 0xf0, 0x07, 0xff, 0xff, 0xf0, 
-  0x00, 0x07, 0xff, 0xf0, 0x03, 0xff, 0xff, 0xf8, 
-  0x00, 0x0f, 0xff, 0xe0, 0x01, 0xff, 0xff, 0xf8, 
-  0x00, 0x0f, 0xff, 0xc0, 0x01, 0xff, 0xff, 0xfc, 
-  0x00, 0x1f, 0xff, 0x80, 0x01, 0xff, 0x7f, 0xfe, 
-  0x00, 0x1f, 0xfe, 0x00, 0x00, 0xff, 0x3f, 0xfe, 
-  0x00, 0x3f, 0xfe, 0x00, 0x00, 0xff, 0x1f, 0xff, 
-  0x00, 0x3f, 0xf8, 0x00, 0x00, 0x7f, 0x0f, 0xff, 
-  0x00, 0x7f, 0xf8, 0x00, 0x00, 0x7f, 0x07, 0xff, 
-  0x00, 0x7f, 0xf0, 0x00, 0x00, 0x7f, 0x03, 0xff, 
-  0x00, 0x7f, 0xe0, 0x00, 0x00, 0x3f, 0x03, 0xff, 
-  0x00, 0xff, 0xe0, 0x00, 0x00, 0x1e, 0x01, 0xff, 
-  0x00, 0xff, 0xe0, 0x00, 0x00, 0x00, 0x01, 0xff, 
-  0x00, 0xff, 0xc0, 0x00, 0x00, 0x00, 0x00, 0xff, 
-  0x00, 0xff, 0xc0, 0x00, 0x00, 0x00, 0x00, 0xff, 
-  0xf8, 0xff, 0xcf, 0xe0, 0x00, 0x00, 0x00, 0xff, 
-  0xfe, 0xff, 0xff, 0xe0, 0x00, 0x00, 0x00, 0xff, 
-  0xff, 0xff, 0xff, 0xe0, 0x00, 0x00, 0x00, 0x7f, 
-  0xff, 0xff, 0xff, 0xe0, 0x00, 0x00, 0x00, 0x7f, 
-  0xff, 0xff, 0xff, 0xe0, 0x00, 0x00, 0x00, 0x7f, 
-  0xff, 0xff, 0xff, 0xe0, 0x00, 0x00, 0x00, 0x7f, 
-  0xff, 0xff, 0xff, 0x80, 0x00, 0x00, 0x00, 0x00, 
-  0xff, 0xff, 0xff, 0x80, 0x00, 0x00, 0x00, 0x00, 
-  0x7f, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x7f, 0xff, 0xfe, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x1f, 0xff, 0xfc, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x1f, 0xff, 0xf8, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x0f, 0xff, 0xf8, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x07, 0xff, 0xf0, 0x00, 0x00, 0xf8, 0x00, 0x00, 
-  0x07, 0xff, 0xe0, 0x00, 0x01, 0xff, 0xe0, 0x00, 
-  0x03, 0xff, 0xc0, 0x00, 0x01, 0xff, 0xff, 0xf0, 
-  0x01, 0xff, 0xc0, 0x00, 0x01, 0xff, 0xff, 0xff, 
-  0x00, 0xff, 0x80, 0x00, 0x01, 0xff, 0xff, 0xff, 
-  0x00, 0xff, 0x00, 0x00, 0x01, 0xff, 0xff, 0xff, 
-  0x00, 0x7f, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 
-  0x00, 0x3c, 0x00, 0x00, 0x00, 0x3f, 0xff, 0xfe, 
-  0x00, 0x00, 0x00, 0xf0, 0x00, 0x1f, 0xff, 0xfe, 
-  0x00, 0x00, 0x01, 0xfc, 0x00, 0x1f, 0xff, 0xfe, 
-  0x00, 0x00, 0x01, 0xff, 0xc1, 0xff, 0xff, 0xfe, 
-  0x00, 0x00, 0x03, 0xff, 0xff, 0xff, 0xff, 0xfc, 
-  0x00, 0x00, 0x07, 0xff, 0xff, 0xff, 0xff, 0xfc, 
-  0x00, 0x00, 0x07, 0xff, 0xff, 0xff, 0xff, 0xf8, 
-  0x00, 0x00, 0x07, 0xff, 0xff, 0xff, 0xff, 0xf8, 
-  0x00, 0x00, 0x07, 0xff, 0xff, 0xff, 0xff, 0xf0, 
-  0x00, 0x00, 0x03, 0xff, 0xff, 0xff, 0xff, 0xf0, 
-  0x00, 0x00, 0x01, 0xff, 0xff, 0xff, 0xff, 0xf0, 
-  0x00, 0x00, 0x00, 0x3f, 0xff, 0xff, 0x3f, 0xe0, 
-  0x00, 0x00, 0x00, 0x07, 0xff, 0xf8, 0x3f, 0xe0, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3f, 0xc0, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3f, 0xc0, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3f, 0xc0, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3f, 0x80, 
-};
-
-const lv_img_dsc_t roundabout = {
-      {
-        LV_IMG_CF_INDEXED_1BIT,
-        0,
-        0,
-        64,
-        64
-    },
-    520,
-roundabout_map,
-};
diff --git a/src/displayapp/icons/navigation/roundabout.png b/src/displayapp/icons/navigation/roundabout.png
deleted file mode 100644
index a469c089..00000000
--- a/src/displayapp/icons/navigation/roundabout.png
+++ /dev/null
diff --git a/src/displayapp/icons/navigation/roundabout.svg b/src/displayapp/icons/navigation/roundabout.svg
new file mode 100644
index 00000000..08010720
--- /dev/null
+++ b/src/displayapp/icons/navigation/roundabout.svg
@@ -0,0 +1,58 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   inkscape:version="1.0 (4035a4fb49, 2020-05-01)"
+   sodipodi:docname="roundabout.svg"
+   version="1.1"
+   viewBox="0 0 20 20"
+   height="20"
+   width="20"
+   data-name="WORKING ICONS"
+   id="WORKING_ICONS">
+  <metadata
+     id="metadata11">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs9" />
+  <sodipodi:namedview
+     inkscape:current-layer="WORKING_ICONS"
+     inkscape:window-maximized="1"
+     inkscape:window-y="22"
+     inkscape:window-x="-8"
+     inkscape:cy="12.987268"
+     inkscape:cx="9.3267761"
+     inkscape:zoom="15.202796"
+     showgrid="false"
+     id="namedview7"
+     inkscape:window-height="1027"
+     inkscape:window-width="1920"
+     inkscape:pageshadow="2"
+     inkscape:pageopacity="0"
+     guidetolerance="10"
+     gridtolerance="10"
+     objecttolerance="10"
+     borderopacity="1"
+     bordercolor="#666666"
+     pagecolor="#ffffff" />
+  <title
+     id="title2">direction</title>
+  <path
+     style="stroke-width:1.53314"
+     id="path4"
+     d="m 4.6342105,9.7711173 a 0.27410998,0.27410998 0 0 0 0.4158487,0.2892417 l 2.262745,-1.0300857 a 0.29635583,0.29635583 0 0 1 0.3138485,0.477987 L 3.8676408,14.370535 0.10862851,9.5081993 a 0.29635583,0.29635583 0 0 1 0.3138489,-0.477987 L 2.6853911,10.060298 A 0.27406399,0.27406399 0 0 0 3.1010712,9.7711173 v -0.0031 A 8.461212,8.461212 0 0 1 7.3216964,2.4616761 L 8.0882657,3.7881942 A 6.9275821,6.9275821 0 0 0 4.6342105,9.7680513 Z M 14.98514,3.7927783 a 6.9289926,6.9289926 0 0 1 3.447325,5.975273 h 1.533139 A 8.4664553,8.4664553 0 0 0 15.753212,2.4661682 l -0.0022,-9.2e-5 A 0.27409465,0.27409465 0 0 1 15.708398,1.9613054 L 17.73182,0.51672019 a 0.2963865,0.2963865 0 0 0 -0.257046,-0.5108267 l -6.09035,0.8243077 2.331338,5.68658211 a 0.29637116,0.29637116 0 0 0 0.57091,-0.03284 L 14.526026,4.0092269 A 0.27512185,0.27512185 0 0 1 14.98514,3.7927017 Z m 0.759548,13.2822147 a 0.27410998,0.27410998 0 0 1 0.458408,0.215452 l 0.239323,2.474671 a 0.29635583,0.29635583 0 0 0 0.570865,0.03282 l 2.331399,-5.686506 -6.09032,-0.824307 a 0.29635583,0.29635583 0 0 0 -0.257015,0.510796 l 2.023468,1.4446 a 0.27410998,0.27410998 0 0 1 -0.04264,0.504756 l 0.0055,-0.0039 a 7.0169334,7.0169334 0 0 1 -6.9021933,0 l -0.7681032,1.326519 a 8.4390428,8.4390428 0 0 0 8.4382615,0 z"
+     fill="#000000" />
+</svg>
diff --git a/src/displayapp/icons/navigation/roundabout_left.svg b/src/displayapp/icons/navigation/roundabout_left.svg
new file mode 100644
index 00000000..eea807b1
--- /dev/null
+++ b/src/displayapp/icons/navigation/roundabout_left.svg
@@ -0,0 +1,58 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   inkscape:version="1.0 (4035a4fb49, 2020-05-01)"
+   sodipodi:docname="roundabout_left.svg"
+   version="1.1"
+   viewBox="0 0 20 20"
+   height="20"
+   width="20"
+   data-name="WORKING ICONS"
+   id="WORKING_ICONS">
+  <metadata
+     id="metadata11">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs9" />
+  <sodipodi:namedview
+     inkscape:current-layer="WORKING_ICONS"
+     inkscape:window-maximized="1"
+     inkscape:window-y="22"
+     inkscape:window-x="-8"
+     inkscape:cy="11.94584"
+     inkscape:cx="9.1908386"
+     inkscape:zoom="30.405592"
+     showgrid="false"
+     id="namedview7"
+     inkscape:window-height="1027"
+     inkscape:window-width="1920"
+     inkscape:pageshadow="2"
+     inkscape:pageopacity="0"
+     guidetolerance="10"
+     gridtolerance="10"
+     objecttolerance="10"
+     borderopacity="1"
+     bordercolor="#666666"
+     pagecolor="#ffffff" />
+  <title
+     id="title2">direction</title>
+  <path
+     style="stroke-width:1.33333"
+     id="path4"
+     d="M 14.666661,2.9333361 A 5.0666648,5.0666648 0 1 1 9.5999961,8.0000005 5.0723714,5.0723714 0 0 1 14.666661,2.9333361 m 0,9.3333299 a 4.2666651,4.2666651 0 1 0 -4.266665,-4.2666655 4.2715051,4.2715051 0 0 0 4.266665,4.2666655 m 0,-9.5999965 a 5.3333313,5.3333313 0 1 0 5.333332,5.333331 5.339438,5.339438 0 0 0 -5.333332,-5.333331 z m 0,9.3333305 A 3.9999985,3.9999985 0 1 1 18.66666,8.0000005 4.0043718,4.0043718 0 0 1 14.666661,12 Z M 18.43814,4.2291623 A 5.3753313,5.3753313 0 0 0 17.715473,3.6230425 5.4373313,5.4373313 0 0 0 10.895809,4.2285089 5.2912247,5.2912247 0 0 0 9.3743431,7.3333345 H 3.9999986 A 0.23838658,0.23838658 0 0 1 3.748452,6.9716815 L 4.6442917,5.0038286 A 0.25773324,0.25773324 0 0 0 4.2285985,4.7308821 L 6.6486681e-8,8.0000005 4.2285985,11.269119 A 0.25773324,0.25773324 0 0 0 4.6442917,10.996173 L 3.748452,9.0283205 A 0.23838658,0.23838658 0 0 1 3.9999986,8.6666675 H 10.666663 V 8.0000005 A 3.9741719,3.9741719 0 0 1 11.838542,5.1712286 4.0811718,4.0811718 0 0 1 16.952474,4.7168021 4.0299718,4.0299718 0 0 1 17.495447,5.1718819 3.9996785,3.9996785 0 0 1 14.666661,12 h -0.666666 v 5.333331 h 1.333333 V 13.292318 A 5.333838,5.333838 0 0 0 18.43814,4.2291623 Z"
+     fill="#000000" />
+</svg>
diff --git a/src/displayapp/icons/navigation/roundabout_right.svg b/src/displayapp/icons/navigation/roundabout_right.svg
new file mode 100644
index 00000000..310270bb
--- /dev/null
+++ b/src/displayapp/icons/navigation/roundabout_right.svg
@@ -0,0 +1,58 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   inkscape:version="1.0 (4035a4fb49, 2020-05-01)"
+   sodipodi:docname="roundabout_right.svg"
+   version="1.1"
+   viewBox="0 0 20 20"
+   height="20"
+   width="20"
+   data-name="WORKING ICONS"
+   id="WORKING_ICONS">
+  <metadata
+     id="metadata11">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs9" />
+  <sodipodi:namedview
+     inkscape:current-layer="WORKING_ICONS"
+     inkscape:window-maximized="1"
+     inkscape:window-y="22"
+     inkscape:window-x="-8"
+     inkscape:cy="9.2378771"
+     inkscape:cx="10.164237"
+     inkscape:zoom="21.5"
+     showgrid="false"
+     id="namedview7"
+     inkscape:window-height="1027"
+     inkscape:window-width="1920"
+     inkscape:pageshadow="2"
+     inkscape:pageopacity="0"
+     guidetolerance="10"
+     gridtolerance="10"
+     objecttolerance="10"
+     borderopacity="1"
+     bordercolor="#666666"
+     pagecolor="#ffffff" />
+  <title
+     id="title2">direction</title>
+  <path
+     style="stroke-width:1.33252"
+     id="path4"
+     d="M 5.3300783,2.9376459 A 5.0635745,5.0635745 0 1 1 0.2665038,8.00122 5.0692777,5.0692777 0 0 1 5.3300783,2.9376459 m 0,9.3276371 A 4.2640627,4.2640627 0 1 0 1.0660156,8.00122 4.2688998,4.2688998 0 0 0 5.3300783,12.265283 m 0,-9.594141 A 5.3300784,5.3300784 0 1 0 10.660157,8.00122 5.3361814,5.3361814 0 0 0 5.3300783,2.671142 Z m 0,9.327637 A 3.9975588,3.9975588 0 1 1 9.3276369,8.00122 4.0019295,4.0019295 0 0 1 5.3300783,11.998779 Z M 15.774061,4.7340956 a 0.25757604,0.25757604 0 0 0 -0.41544,0.27278 L 16.253914,6.973528 A 0.23826783,0.23826783 0 0 1 16.002441,7.334961 H 9.3276369 V 8.00122 A 3.9974789,3.9974789 0 0 1 5.3300783,11.998779 H 4.6638185 v 5.330079 H 5.9963381 V 13.290311 A 5.3343425,5.3343425 0 0 0 10.619169,8.66748 h 5.383272 a 0.23826783,0.23826783 0 0 1 0.251473,0.361433 l -0.895293,1.966652 a 0.25757604,0.25757604 0 0 0 0.41544,0.27278 L 20,8.00122 Z"
+     fill="#000000" />
+</svg>
diff --git a/src/displayapp/icons/navigation/roundabout_sharp_left.svg b/src/displayapp/icons/navigation/roundabout_sharp_left.svg
new file mode 100644
index 00000000..33e8a420
--- /dev/null
+++ b/src/displayapp/icons/navigation/roundabout_sharp_left.svg
@@ -0,0 +1,58 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   inkscape:version="1.0 (4035a4fb49, 2020-05-01)"
+   sodipodi:docname="roundabout_sharp_left.svg"
+   version="1.1"
+   viewBox="0 0 20 20"
+   height="20"
+   width="20"
+   data-name="WORKING ICONS"
+   id="WORKING_ICONS">
+  <metadata
+     id="metadata11">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs9" />
+  <sodipodi:namedview
+     inkscape:current-layer="WORKING_ICONS"
+     inkscape:window-maximized="1"
+     inkscape:window-y="22"
+     inkscape:window-x="-8"
+     inkscape:cy="11.069249"
+     inkscape:cx="9.6724823"
+     inkscape:zoom="30.405592"
+     showgrid="false"
+     id="namedview7"
+     inkscape:window-height="1027"
+     inkscape:window-width="1920"
+     inkscape:pageshadow="2"
+     inkscape:pageopacity="0"
+     guidetolerance="10"
+     gridtolerance="10"
+     objecttolerance="10"
+     borderopacity="1"
+     bordercolor="#666666"
+     pagecolor="#ffffff" />
+  <title
+     id="title2">direction</title>
+  <path
+     style="stroke-width:1.6675"
+     id="path4"
+     d="M 13.329998,0.3346256 A 6.3365016,6.3365016 0 1 1 6.9934967,6.6711275 6.3436385,6.3436385 0 0 1 13.329998,0.3346256 m 0,11.6725034 A 5.3360013,5.3360013 0 1 0 7.993997,6.6711275 5.3420544,5.3420544 0 0 0 13.329998,12.007129 m 0,-12.0060035 A 6.6700017,6.6700017 0 1 0 20,6.6711275 6.6776388,6.6776388 0 0 0 13.329998,0.0011255 Z m 0,11.6725035 A 5.0025013,5.0025013 0 1 1 18.3325,6.6711275 5.0079707,5.0079707 0 0 1 13.329998,11.673629 Z M 18.047524,1.9552192 A 6.7297482,6.7297482 0 0 0 17.142938,1.1971902 6.8018343,6.8018343 0 0 0 8.61409,1.9544021 6.6709688,6.6709688 0 0 0 8.059613,10.760072 l -5.1121726,5.11219 a 0.29803235,0.29803235 0 0 1 -0.5419376,-0.0975 l -0.9481074,-2.5325 A 0.32236118,0.32236118 0 0 0 0.8483742,13.36846 L 0,19.998874 6.6304152,19.150466 a 0.32236118,0.32236118 0 0 0 0.1261964,-0.60902 L 4.2241121,17.593388 a 0.2981324,0.2981324 0 0 1 -0.097299,-0.542271 l -6.17e-4,-6.16e-4 5.6758049,-5.678956 0.564249,-0.588628 -0.575638,-0.577272 a 5.0016675,5.0016675 0 0 1 0.0025,-7.0722534 5.1036018,5.1036018 0 0 1 6.395615,-0.5683175 5.0470735,5.0470735 0 0 1 0.679856,0.5691346 5.0025013,5.0025013 0 0 1 -3.538536,8.5394203 h -0.83375 v 6.670002 h 1.667501 V 13.289837 A 6.671269,6.671269 0 0 0 18.047507,1.9552192 Z"
+     fill="#000000" />
+</svg>
diff --git a/src/displayapp/icons/navigation/roundabout_sharp_right.svg b/src/displayapp/icons/navigation/roundabout_sharp_right.svg
new file mode 100644
index 00000000..4b38c290
--- /dev/null
+++ b/src/displayapp/icons/navigation/roundabout_sharp_right.svg
@@ -0,0 +1,58 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   inkscape:version="1.0 (4035a4fb49, 2020-05-01)"
+   sodipodi:docname="roundabout_sharp_right.svg"
+   version="1.1"
+   viewBox="0 0 20 20"
+   height="20"
+   width="20"
+   data-name="WORKING ICONS"
+   id="WORKING_ICONS">
+  <metadata
+     id="metadata11">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs9" />
+  <sodipodi:namedview
+     inkscape:current-layer="WORKING_ICONS"
+     inkscape:window-maximized="1"
+     inkscape:window-y="22"
+     inkscape:window-x="-8"
+     inkscape:cy="12.563422"
+     inkscape:cx="10.07814"
+     inkscape:zoom="15.202796"
+     showgrid="false"
+     id="namedview7"
+     inkscape:window-height="1027"
+     inkscape:window-width="1920"
+     inkscape:pageshadow="2"
+     inkscape:pageopacity="0"
+     guidetolerance="10"
+     gridtolerance="10"
+     objecttolerance="10"
+     borderopacity="1"
+     bordercolor="#666666"
+     pagecolor="#ffffff" />
+  <title
+     id="title2">direction</title>
+  <path
+     style="stroke-width:1.66667"
+     id="path4"
+     d="M 6.6668087,0.3333333 A 6.3333333,6.3333333 0 1 1 0.333475,6.666667 6.3405,6.3405 0 0 1 6.6668087,0.3333333 M 6.6668087,12 A 5.3333333,5.3333333 0 1 0 1.333475,6.666667 5.3393667,5.3393667 0 0 0 6.6668087,12 m 0,-12 A 6.6666667,6.6666667 0 1 0 13.333475,6.666667 6.6743,6.6743 0 0 0 6.6668087,0 Z m 0,11.666667 a 5,5 0 1 1 5.0000003,-5 5.0054667,5.0054667 0 0 1 -5.0000003,5 z M 19.151809,13.3729 A 0.32213333,0.32213333 0 0 0 18.543192,13.246767 L 17.595659,15.778 a 0.29805,0.29805 0 0 1 -0.5421,0.09725 l -3e-4,3e-4 -6.2621,-6.2621 -0.5892,0.5892 a 4.9670333,4.9670333 0 0 1 -3.5351503,1.464017 h -0.833334 v 6.666666 h 1.666667 v -5.051266 a 6.5936833,6.5936833 0 0 0 3.2544003,-1.34765 l 5.121867,5.12125 a 0.29735,0.29735 0 0 1 -0.09857,0.54 l -2.53115,0.947666 a 0.32216667,0.32216667 0 0 0 0.126133,0.608717 L 19.999859,20 Z"
+     fill="#000000" />
+</svg>
diff --git a/src/displayapp/icons/navigation/roundabout_slight_left.svg b/src/displayapp/icons/navigation/roundabout_slight_left.svg
new file mode 100644
index 00000000..e755305b
--- /dev/null
+++ b/src/displayapp/icons/navigation/roundabout_slight_left.svg
@@ -0,0 +1,58 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   inkscape:version="1.0 (4035a4fb49, 2020-05-01)"
+   sodipodi:docname="roundabout_slight_left.svg"
+   version="1.1"
+   viewBox="0 0 20 20"
+   height="20"
+   width="20"
+   data-name="WORKING ICONS"
+   id="WORKING_ICONS">
+  <metadata
+     id="metadata11">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs9" />
+  <sodipodi:namedview
+     inkscape:current-layer="WORKING_ICONS"
+     inkscape:window-maximized="1"
+     inkscape:window-y="22"
+     inkscape:window-x="-8"
+     inkscape:cy="11.676383"
+     inkscape:cx="7.7665995"
+     inkscape:zoom="21.5"
+     showgrid="false"
+     id="namedview7"
+     inkscape:window-height="1027"
+     inkscape:window-width="1920"
+     inkscape:pageshadow="2"
+     inkscape:pageopacity="0"
+     guidetolerance="10"
+     gridtolerance="10"
+     objecttolerance="10"
+     borderopacity="1"
+     bordercolor="#666666"
+     pagecolor="#ffffff" />
+  <title
+     id="title2">direction</title>
+  <path
+     style="stroke-width:1.33604"
+     id="path4"
+     d="M 12.654625,5.5707664 A 5.0769526,5.0769526 0 1 1 7.5776724,10.647719 5.0826708,5.0826708 0 0 1 12.654625,5.5707664 m 0,9.3522806 a 4.2753285,4.2753285 0 1 0 -4.2753285,-4.275328 4.2801783,4.2801783 0 0 0 4.2753285,4.275328 m 0,-9.6194887 a 5.3441606,5.3441606 0 1 0 5.34416,5.3441607 5.3502797,5.3502797 0 0 0 -5.34416,-5.3441607 z m 0,9.3522807 a 4.0081205,4.0081205 0 1 1 4.00812,-4.00812 4.0125027,4.0125027 0 0 1 -4.00812,4.00812 z M 5.3077402,2.3618117 A 0.23887062,0.23887062 0 0 1 5.3856981,1.9273849 L 7.414769,1.1677258 A 0.25825656,0.25825656 0 0 0 7.3136308,0.6797906 L 2.0012145,0 2.6810051,5.3124296 A 0.25825656,0.25825656 0 0 0 3.1689403,5.4135679 L 3.9285326,3.384497 A 0.23887062,0.23887062 0 0 1 4.3630262,3.306539 M 13.322646,15.950823 A 5.3446683,5.3446683 0 0 0 16.433761,6.8692772 5.3862459,5.3862459 0 0 0 15.709628,6.2619267 5.4466482,5.4466482 0 0 0 9.3771315,6.4256717 L 4.3630529,1.4168572 3.4184725,2.3627736 9.3491545,8.285587 9.8207765,7.81327 a 4.0878954,4.0878954 0 0 1 5.1243165,-0.45535 4.0381546,4.0381546 0 0 1 0.544075,0.456004 4.0077998,4.0077998 0 0 1 -2.834556,6.841915 h -0.66802 V 20 h 1.33604 v -4.049217 z"
+     fill="#000000" />
+</svg>
diff --git a/src/displayapp/icons/navigation/roundabout_slight_right.svg b/src/displayapp/icons/navigation/roundabout_slight_right.svg
new file mode 100644
index 00000000..a8e240ac
--- /dev/null
+++ b/src/displayapp/icons/navigation/roundabout_slight_right.svg
@@ -0,0 +1,58 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   inkscape:version="1.0 (4035a4fb49, 2020-05-01)"
+   sodipodi:docname="roundabout_slight_right.svg"
+   version="1.1"
+   viewBox="0 0 20 20"
+   height="20"
+   width="20"
+   data-name="WORKING ICONS"
+   id="WORKING_ICONS">
+  <metadata
+     id="metadata11">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs9" />
+  <sodipodi:namedview
+     inkscape:current-layer="WORKING_ICONS"
+     inkscape:window-maximized="1"
+     inkscape:window-y="22"
+     inkscape:window-x="-8"
+     inkscape:cy="22.399161"
+     inkscape:cx="10.220252"
+     inkscape:zoom="10.75"
+     showgrid="false"
+     id="namedview7"
+     inkscape:window-height="1027"
+     inkscape:window-width="1920"
+     inkscape:pageshadow="2"
+     inkscape:pageopacity="0"
+     guidetolerance="10"
+     gridtolerance="10"
+     objecttolerance="10"
+     borderopacity="1"
+     bordercolor="#666666"
+     pagecolor="#ffffff" />
+  <title
+     id="title2">direction</title>
+  <path
+     style="stroke-width:1.33008"
+     id="path4"
+     d="M 7.3016379,5.6628325 A 5.0543072,5.0543072 0 1 1 2.2473311,10.71714 5.0599999,5.0599999 0 0 1 7.3016379,5.6628325 m 0,9.3105655 A 4.2562587,4.2562587 0 1 0 3.0453796,10.71714 4.2610869,4.2610869 0 0 0 7.3016379,14.973398 m 0,-9.5765817 A 5.3203234,5.3203234 0 1 0 12.621962,10.71714 5.3264151,5.3264151 0 0 0 7.3016379,5.3968163 Z m 0,9.3105657 A 3.9902425,3.9902425 0 1 1 11.291881,10.71714 3.9946052,3.9946052 0 0 1 7.3016379,14.707382 Z M 12.729951,0.6767185 A 0.25707803,0.25707803 0 0 0 12.62929,1.1624242 l 2.020047,0.7562839 a 0.23779185,0.23779185 0 0 1 0.07761,0.4325423 l 7.9e-5,7.98e-5 L 9.6526479,7.425708 10.122859,7.895919 A 3.9899233,3.9899233 0 0 1 7.3016249,14.707382 H 6.6365845 V 20 H 7.9666649 V 15.99655 A 5.3219594,5.3219594 0 0 0 11.504893,7.454292 l 4.162581,-4.1625414 a 0.23779185,0.23779185 0 0 1 0.432543,0.07761 l 0.756151,2.020047 A 0.25713123,0.25713123 0 0 0 17.341953,5.2886674 L 18.018685,0 Z"
+     fill="#000000" />
+</svg>
diff --git a/src/displayapp/icons/navigation/roundabout_straight.svg b/src/displayapp/icons/navigation/roundabout_straight.svg
new file mode 100644
index 00000000..17477288
--- /dev/null
+++ b/src/displayapp/icons/navigation/roundabout_straight.svg
@@ -0,0 +1,58 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   inkscape:version="1.0 (4035a4fb49, 2020-05-01)"
+   sodipodi:docname="roundabout_straight.svg"
+   version="1.1"
+   viewBox="0 0 20 20"
+   height="20"
+   width="20"
+   data-name="WORKING ICONS"
+   id="WORKING_ICONS">
+  <metadata
+     id="metadata11">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs9" />
+  <sodipodi:namedview
+     inkscape:current-layer="WORKING_ICONS"
+     inkscape:window-maximized="1"
+     inkscape:window-y="22"
+     inkscape:window-x="-8"
+     inkscape:cy="22.862341"
+     inkscape:cx="-0.7325918"
+     inkscape:zoom="10.75"
+     showgrid="false"
+     id="namedview7"
+     inkscape:window-height="1027"
+     inkscape:window-width="1920"
+     inkscape:pageshadow="2"
+     inkscape:pageopacity="0"
+     guidetolerance="10"
+     gridtolerance="10"
+     objecttolerance="10"
+     borderopacity="1"
+     bordercolor="#666666"
+     pagecolor="#ffffff" />
+  <title
+     id="title2">direction</title>
+  <path
+     style="stroke-width:1.25032"
+     id="path4"
+     d="M 9.9999967,7.7468218 A 4.7512324,4.7512324 0 1 1 5.2487646,12.498054 4.7565712,4.7565712 0 0 1 9.9999967,7.7468218 m 0,8.7522702 a 4.0010378,4.0010378 0 1 0 -4.0010376,-4.001038 4.0055764,4.0055764 0 0 0 4.0010376,4.001038 m 0,-9.002335 A 5.0012972,5.0012972 0 1 0 15.001294,12.498054 5.0070237,5.0070237 0 0 0 9.9999967,7.496757 Z m 0,8.75227 A 3.7509729,3.7509729 0 1 1 13.75097,12.498054 3.755074,3.755074 0 0 1 9.9999967,16.249027 Z M 13.539128,8.963812 A 4.9654754,4.9654754 0 0 0 10.625159,7.5352169 v -3.784244 a 0.22357049,0.22357049 0 0 1 0.339138,-0.2359612 l 1.845341,0.8400554 A 0.24167518,0.24167518 0 0 0 13.065592,3.9652535 L 9.9999967,0 6.9344018,3.965266 a 0.24168769,0.24168769 0 0 0 0.2559539,0.3898136 l 1.845479,-0.8400554 a 0.22354548,0.22354548 0 0 1 0.339,0.2359487 V 8.747081 h 0.625162 a 3.750973,3.750973 0 1 1 0,7.501946 H 9.3748347 V 20 h 1.2503243 v -2.539109 a 5.0022475,5.0022475 0 0 0 2.913969,-8.497079 z"
+     fill="#000000" />
+</svg>
diff --git a/src/displayapp/icons/navigation/turn-left-white.svg b/src/displayapp/icons/navigation/turn-left-white.svg
deleted file mode 100644
index 3cb455d9..00000000
--- a/src/displayapp/icons/navigation/turn-left-white.svg
+++ /dev/null
@@ -1,4 +0,0 @@
-<svg id="WORKING_ICONS" data-name="WORKING ICONS" xmlns="http://www.w3.org/2000/svg" width="20" height="20" viewBox="0 0 20 20">
-  <title>direction</title>
-  <path fill="#ffffff" d="M10,5.97986l0.011,0.00183A6.06019,6.06019,0,0,1,16,12.05493V16H15.99689l0.002,1.50317A0.49614,0.49614,0,0,1,15.50269,18H14.49622A0.49622,0.49622,0,0,1,14,17.50378V12.05493a4.05782,4.05782,0,0,0-3.98877-4.07324H8.01245a0.3576,0.3576,0,0,0-.37738.54248L8.97882,11.476a0.38659,0.38659,0,0,1-.62354.40942L2.0083,7l6.347-4.922a0.38659,0.38659,0,0,1,.62354.40942L7.63507,5.43927a0.35757,0.35757,0,0,0,.37738.54242H10"/>
-</svg>
diff --git a/src/displayapp/icons/navigation/turn-left.c b/src/displayapp/icons/navigation/turn-left.c
deleted file mode 100644
index 91d73c98..00000000
--- a/src/displayapp/icons/navigation/turn-left.c
+++ /dev/null
@@ -1,96 +0,0 @@
-#if defined(LV_LVGL_H_INCLUDE_SIMPLE)
-#include "lvgl.h"
-#else
-#include "lvgl/lvgl.h"
-#endif
-
-
-#ifndef LV_ATTRIBUTE_MEM_ALIGN
-#define LV_ATTRIBUTE_MEM_ALIGN
-#endif
-
-#ifndef LV_ATTRIBUTE_IMG_TURN_LEFT
-#define LV_ATTRIBUTE_IMG_TURN_LEFT
-#endif
-
-const LV_ATTRIBUTE_MEM_ALIGN LV_ATTRIBUTE_LARGE_CONST LV_ATTRIBUTE_IMG_TURN_LEFT uint8_t turn_left_map[] = {
-  0x04, 0x02, 0x04, 0xff, 	/*Color of index 0*/
-  0xfc, 0xfe, 0xfc, 0xff, 	/*Color of index 1*/
-
-  0x00, 0x00, 0x00, 0x7f, 0xc0, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0xff, 0xc0, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x01, 0xff, 0xc0, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x07, 0xff, 0xc0, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x0f, 0xff, 0xc0, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x3f, 0xff, 0x80, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x7f, 0xff, 0x80, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 
-  0x00, 0x01, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 
-  0x00, 0x07, 0xff, 0xfe, 0x00, 0x00, 0x00, 0x00, 
-  0x00, 0x0f, 0xff, 0xfe, 0x00, 0x00, 0x00, 0x00, 
-  0x00, 0x1f, 0xff, 0xfc, 0x00, 0x00, 0x00, 0x00, 
-  0x00, 0x7f, 0xff, 0xfc, 0x00, 0x00, 0x00, 0x00, 
-  0x00, 0xff, 0xff, 0xfc, 0x00, 0x00, 0x00, 0x00, 
-  0x01, 0xff, 0xff, 0xff, 0xff, 0xc0, 0x00, 0x00, 
-  0x03, 0xff, 0xff, 0xff, 0xff, 0xfc, 0x00, 0x00, 
-  0x0f, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 
-  0x0f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xc0, 0x00, 
-  0x0f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xe0, 0x00, 
-  0x0f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xf8, 0x00, 
-  0x0f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfc, 0x00, 
-  0x0f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfe, 0x00, 
-  0x0f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 
-  0x0f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x80, 
-  0x07, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xc0, 
-  0x03, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xc0, 
-  0x00, 0xff, 0xff, 0xfc, 0x07, 0xff, 0xff, 0xe0, 
-  0x00, 0x7f, 0xff, 0xfc, 0x00, 0xff, 0xff, 0xf0, 
-  0x00, 0x3f, 0xff, 0xfc, 0x00, 0x3f, 0xff, 0xf0, 
-  0x00, 0x1f, 0xff, 0xfe, 0x00, 0x1f, 0xff, 0xf0, 
-  0x00, 0x07, 0xff, 0xfe, 0x00, 0x07, 0xff, 0xf0, 
-  0x00, 0x03, 0xff, 0xff, 0x00, 0x03, 0xff, 0xf0, 
-  0x00, 0x00, 0xff, 0xff, 0x00, 0x01, 0xff, 0xf0, 
-  0x00, 0x00, 0x7f, 0xff, 0x80, 0x01, 0xff, 0xf0, 
-  0x00, 0x00, 0x3f, 0xff, 0x80, 0x00, 0xff, 0xf0, 
-  0x00, 0x00, 0x1f, 0xff, 0xc0, 0x00, 0x7f, 0xf0, 
-  0x00, 0x00, 0x07, 0xff, 0xc0, 0x00, 0x7f, 0xf0, 
-  0x00, 0x00, 0x03, 0xff, 0xc0, 0x00, 0x7f, 0xf0, 
-  0x00, 0x00, 0x00, 0xff, 0xc0, 0x00, 0x3f, 0xf0, 
-  0x00, 0x00, 0x00, 0x7f, 0xc0, 0x00, 0x3f, 0xf0, 
-  0x00, 0x00, 0x00, 0x3f, 0xc0, 0x00, 0x3f, 0xf0, 
-  0x00, 0x00, 0x00, 0x1f, 0xc0, 0x00, 0x3f, 0xf0, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3f, 0xf0, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3f, 0xf0, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3f, 0xf0, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3f, 0xf0, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3f, 0xf0, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3f, 0xf0, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3f, 0xf0, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3f, 0xf0, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3f, 0xf0, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3f, 0xf0, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3f, 0xf0, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3f, 0xf0, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3f, 0xf0, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3f, 0xf0, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3f, 0xf0, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3f, 0xf0, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3f, 0xf0, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3f, 0xf0, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3f, 0xf0, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3f, 0xf0, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3f, 0xf0, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3f, 0xf0, 
-};
-
-const lv_img_dsc_t turn_left = {
-      {
-        LV_IMG_CF_INDEXED_1BIT,
-        0,
-        0,
-        64,
-        64
-    },
-    520,
-turn_left_map,
-};
diff --git a/src/displayapp/icons/navigation/turn-left.png b/src/displayapp/icons/navigation/turn-left.png
deleted file mode 100644
index 2e39f5f7..00000000
--- a/src/displayapp/icons/navigation/turn-left.png
+++ /dev/null
diff --git a/src/displayapp/icons/navigation/turn-right-white.svg b/src/displayapp/icons/navigation/turn-right-white.svg
deleted file mode 100644
index 98967557..00000000
--- a/src/displayapp/icons/navigation/turn-right-white.svg
+++ /dev/null
@@ -1,4 +0,0 @@
-<svg id="WORKING_ICONS" data-name="WORKING ICONS" xmlns="http://www.w3.org/2000/svg" width="20" height="20" viewBox="0 0 20 20">
-  <title>direction</title>
-  <path fill="#ffffff" d="M9.98877,7.98169A4.05782,4.05782,0,0,0,6,12.05493v5.44885A0.49622,0.49622,0,0,1,5.50378,18H4.49731a0.49614,0.49614,0,0,1-.49615-0.49683L4.00311,16H4V12.05493A6.06019,6.06019,0,0,1,9.989,5.98169L10,5.97986V5.98169h1.98755a0.35757,0.35757,0,0,0,.37738-0.54242L11.02118,2.48743A0.38659,0.38659,0,0,1,11.64471,2.078L17.9917,7l-6.347,4.88544a0.38659,0.38659,0,0,1-.62354-0.40942l1.34375-2.95184a0.3576,0.3576,0,0,0-.37738-0.54248H9.98877Z"/>
-</svg>
diff --git a/src/displayapp/icons/navigation/turn-right.c b/src/displayapp/icons/navigation/turn-right.c
deleted file mode 100644
index ea092c9e..00000000
--- a/src/displayapp/icons/navigation/turn-right.c
+++ /dev/null
@@ -1,96 +0,0 @@
-#if defined(LV_LVGL_H_INCLUDE_SIMPLE)
-#include "lvgl.h"
-#else
-#include "lvgl/lvgl.h"
-#endif
-
-
-#ifndef LV_ATTRIBUTE_MEM_ALIGN
-#define LV_ATTRIBUTE_MEM_ALIGN
-#endif
-
-#ifndef LV_ATTRIBUTE_IMG_TURN_RIGHT
-#define LV_ATTRIBUTE_IMG_TURN_RIGHT
-#endif
-
-const LV_ATTRIBUTE_MEM_ALIGN LV_ATTRIBUTE_LARGE_CONST LV_ATTRIBUTE_IMG_TURN_RIGHT uint8_t turn_right_map[] = {
-  0x04, 0x02, 0x04, 0xff, 	/*Color of index 0*/
-  0xfc, 0xfe, 0xfc, 0xff, 	/*Color of index 1*/
-
-  0x00, 0x00, 0x00, 0x03, 0xfe, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x03, 0xff, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x03, 0xff, 0xc0, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x03, 0xff, 0xe0, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x03, 0xff, 0xf0, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x01, 0xff, 0xfc, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x01, 0xff, 0xfe, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0x80, 0x00, 
-  0x00, 0x00, 0x00, 0x00, 0x7f, 0xff, 0xe0, 0x00, 
-  0x00, 0x00, 0x00, 0x00, 0x7f, 0xff, 0xf0, 0x00, 
-  0x00, 0x00, 0x00, 0x00, 0x3f, 0xff, 0xf8, 0x00, 
-  0x00, 0x00, 0x00, 0x00, 0x3f, 0xff, 0xfe, 0x00, 
-  0x00, 0x00, 0x00, 0x00, 0x3f, 0xff, 0xff, 0x00, 
-  0x00, 0x00, 0x03, 0xff, 0xff, 0xff, 0xff, 0x80, 
-  0x00, 0x00, 0x3f, 0xff, 0xff, 0xff, 0xff, 0xc0, 
-  0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xf0, 
-  0x00, 0x03, 0xff, 0xff, 0xff, 0xff, 0xff, 0xf0, 
-  0x00, 0x07, 0xff, 0xff, 0xff, 0xff, 0xff, 0xf0, 
-  0x00, 0x1f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xf0, 
-  0x00, 0x3f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xf0, 
-  0x00, 0x7f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xf0, 
-  0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xf0, 
-  0x01, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xf0, 
-  0x03, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xe0, 
-  0x03, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xc0, 
-  0x07, 0xff, 0xff, 0xe0, 0x3f, 0xff, 0xff, 0x00, 
-  0x0f, 0xff, 0xff, 0x00, 0x3f, 0xff, 0xfe, 0x00, 
-  0x0f, 0xff, 0xfc, 0x00, 0x3f, 0xff, 0xfc, 0x00, 
-  0x0f, 0xff, 0xf8, 0x00, 0x7f, 0xff, 0xf8, 0x00, 
-  0x0f, 0xff, 0xe0, 0x00, 0x7f, 0xff, 0xe0, 0x00, 
-  0x0f, 0xff, 0xc0, 0x00, 0xff, 0xff, 0xc0, 0x00, 
-  0x0f, 0xff, 0x80, 0x00, 0xff, 0xff, 0x00, 0x00, 
-  0x0f, 0xff, 0x80, 0x01, 0xff, 0xfe, 0x00, 0x00, 
-  0x0f, 0xff, 0x00, 0x01, 0xff, 0xfc, 0x00, 0x00, 
-  0x0f, 0xfe, 0x00, 0x03, 0xff, 0xf8, 0x00, 0x00, 
-  0x0f, 0xfe, 0x00, 0x03, 0xff, 0xf0, 0x00, 0x00, 
-  0x0f, 0xfe, 0x00, 0x03, 0xff, 0xc0, 0x00, 0x00, 
-  0x0f, 0xfc, 0x00, 0x03, 0xff, 0x00, 0x00, 0x00, 
-  0x0f, 0xfc, 0x00, 0x03, 0xfe, 0x00, 0x00, 0x00, 
-  0x0f, 0xfc, 0x00, 0x03, 0xfc, 0x00, 0x00, 0x00, 
-  0x0f, 0xfc, 0x00, 0x03, 0xf8, 0x00, 0x00, 0x00, 
-  0x0f, 0xfc, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x0f, 0xfc, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x0f, 0xfc, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x0f, 0xfc, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x0f, 0xfc, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x0f, 0xfc, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x0f, 0xfc, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x0f, 0xfc, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x0f, 0xfc, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x0f, 0xfc, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x0f, 0xfc, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x0f, 0xfc, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x0f, 0xfc, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x0f, 0xfc, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x0f, 0xfc, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x0f, 0xfc, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x0f, 0xfc, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x0f, 0xfc, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x0f, 0xfc, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x0f, 0xfc, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x0f, 0xfc, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x0f, 0xfc, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-};
-
-const lv_img_dsc_t turn_right = {
-      {
-        LV_IMG_CF_INDEXED_1BIT,
-        0,
-        0,
-        64,
-        64
-    },
-    520,
-turn_right_map,
-};
diff --git a/src/displayapp/icons/navigation/turn-right.png b/src/displayapp/icons/navigation/turn-right.png
deleted file mode 100644
index 2f58bc4f..00000000
--- a/src/displayapp/icons/navigation/turn-right.png
+++ /dev/null
diff --git a/src/displayapp/icons/navigation/turn-sharp-left-white.svg b/src/displayapp/icons/navigation/turn-sharp-left-white.svg
deleted file mode 100644
index 838e9d02..00000000
--- a/src/displayapp/icons/navigation/turn-sharp-left-white.svg
+++ /dev/null
@@ -1,4 +0,0 @@
-<svg id="WORKING_ICONS" data-name="WORKING ICONS" xmlns="http://www.w3.org/2000/svg" width="20" height="20" viewBox="0 0 20 20">
-  <title>direction</title>
-  <path fill="#ffffff" d="M15.49771,17.99542a0.49779,0.49779,0,0,1-.49779-0.49779V4.99933L14.72014,4.993a2.56758,2.56758,0,0,0-2.0957.79L7.22917,10.39583a0.34918,0.34918,0,0,0,.08252.63177l2.92877,1.39331a0.38658,0.38658,0,0,1-.21344.71472l-8.0105.33209,1.69568-7.836a0.38661,0.38661,0,0,1,.74072-0.0882l0.8725,3.12372a0.35757,0.35757,0,0,0,.638.17206L5.9672,8.84377,11.3593,4.23468a4.46634,4.46634,0,0,1,3.38477-1.24121l0.26416,0.002a1.92935,1.92935,0,0,1,1.43408.56885,2.10247,2.10247,0,0,1,.55713,1.46045L16.9999,17.49761a0.49779,0.49779,0,0,1-.49779.49781h-1.0044Z"/>
-</svg>
diff --git a/src/displayapp/icons/navigation/turn-sharp-left.c b/src/displayapp/icons/navigation/turn-sharp-left.c
deleted file mode 100644
index da219e5c..00000000
--- a/src/displayapp/icons/navigation/turn-sharp-left.c
+++ /dev/null
@@ -1,96 +0,0 @@
-#if defined(LV_LVGL_H_INCLUDE_SIMPLE)
-#include "lvgl.h"
-#else
-#include "lvgl/lvgl.h"
-#endif
-
-
-#ifndef LV_ATTRIBUTE_MEM_ALIGN
-#define LV_ATTRIBUTE_MEM_ALIGN
-#endif
-
-#ifndef LV_ATTRIBUTE_IMG_TURN_SHARP_LEFT
-#define LV_ATTRIBUTE_IMG_TURN_SHARP_LEFT
-#endif
-
-const LV_ATTRIBUTE_MEM_ALIGN LV_ATTRIBUTE_LARGE_CONST LV_ATTRIBUTE_IMG_TURN_SHARP_LEFT uint8_t turn_sharp_left_map[] = {
-  0x04, 0x02, 0x04, 0xff, 	/*Color of index 0*/
-  0xfc, 0xfe, 0xfc, 0xff, 	/*Color of index 1*/
-
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x3f, 0xff, 0xfe, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 
-  0x00, 0x00, 0x00, 0x00, 0x01, 0xff, 0xff, 0xff, 
-  0x00, 0x00, 0x00, 0x00, 0x03, 0xff, 0xff, 0xff, 
-  0x00, 0x00, 0x00, 0x00, 0x07, 0xff, 0xff, 0xff, 
-  0x00, 0x00, 0x00, 0x00, 0x1f, 0xff, 0xff, 0xff, 
-  0x00, 0x00, 0x00, 0x00, 0x3f, 0xff, 0xff, 0xff, 
-  0x00, 0x00, 0x00, 0x00, 0x7f, 0xff, 0xff, 0xff, 
-  0x03, 0xf0, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 
-  0x07, 0xf8, 0x00, 0x01, 0xff, 0xff, 0xff, 0xff, 
-  0x07, 0xf8, 0x00, 0x07, 0xff, 0xff, 0xff, 0xff, 
-  0x07, 0xf8, 0x00, 0x0f, 0xff, 0xff, 0xe7, 0xff, 
-  0x07, 0xf8, 0x00, 0x1f, 0xff, 0xff, 0x87, 0xff, 
-  0x0f, 0xfc, 0x00, 0x3f, 0xff, 0xff, 0x07, 0xff, 
-  0x0f, 0xfc, 0x00, 0x7f, 0xff, 0xfc, 0x07, 0xff, 
-  0x0f, 0xfc, 0x00, 0xff, 0xff, 0xf8, 0x07, 0xff, 
-  0x0f, 0xfc, 0x01, 0xff, 0xff, 0xf0, 0x07, 0xff, 
-  0x0f, 0xfe, 0x03, 0xff, 0xff, 0xe0, 0x07, 0xff, 
-  0x1f, 0xfe, 0x0f, 0xff, 0xff, 0xc0, 0x07, 0xff, 
-  0x1f, 0xfe, 0x1f, 0xff, 0xff, 0x80, 0x07, 0xff, 
-  0x1f, 0xff, 0x3f, 0xff, 0xff, 0x00, 0x07, 0xff, 
-  0x1f, 0xff, 0x7f, 0xff, 0xfe, 0x00, 0x07, 0xff, 
-  0x1f, 0xff, 0xff, 0xff, 0xf8, 0x00, 0x07, 0xff, 
-  0x3f, 0xff, 0xff, 0xff, 0xf0, 0x00, 0x07, 0xff, 
-  0x3f, 0xff, 0xff, 0xff, 0xe0, 0x00, 0x07, 0xff, 
-  0x3f, 0xff, 0xff, 0xff, 0xc0, 0x00, 0x07, 0xff, 
-  0x3f, 0xff, 0xff, 0xff, 0x00, 0x00, 0x07, 0xff, 
-  0x7f, 0xff, 0xff, 0xfe, 0x00, 0x00, 0x07, 0xff, 
-  0x7f, 0xff, 0xff, 0xfc, 0x00, 0x00, 0x07, 0xff, 
-  0x7f, 0xff, 0xff, 0xf8, 0x00, 0x00, 0x07, 0xff, 
-  0x7f, 0xff, 0xff, 0xf0, 0x00, 0x00, 0x07, 0xff, 
-  0x7f, 0xff, 0xff, 0xe0, 0x00, 0x00, 0x07, 0xff, 
-  0xff, 0xff, 0xff, 0x80, 0x00, 0x00, 0x07, 0xff, 
-  0xff, 0xff, 0xff, 0xe0, 0x00, 0x00, 0x07, 0xff, 
-  0xff, 0xff, 0xff, 0xf8, 0x00, 0x00, 0x07, 0xff, 
-  0xff, 0xff, 0xff, 0xfe, 0x00, 0x00, 0x07, 0xff, 
-  0xff, 0xff, 0xff, 0xff, 0x80, 0x00, 0x07, 0xff, 
-  0xff, 0xff, 0xff, 0xff, 0xf0, 0x00, 0x07, 0xff, 
-  0xff, 0xff, 0xff, 0xff, 0xf8, 0x00, 0x07, 0xff, 
-  0xff, 0xff, 0xff, 0xff, 0xfc, 0x00, 0x07, 0xff, 
-  0xff, 0xff, 0xff, 0xff, 0xfc, 0x00, 0x07, 0xff, 
-  0xff, 0xff, 0xff, 0xff, 0xfc, 0x00, 0x07, 0xff, 
-  0xff, 0xff, 0xff, 0xff, 0xfc, 0x00, 0x07, 0xff, 
-  0xff, 0xff, 0xff, 0xff, 0xfc, 0x00, 0x07, 0xff, 
-  0xff, 0xff, 0xff, 0xff, 0xfc, 0x00, 0x07, 0xff, 
-  0xff, 0xff, 0xff, 0xf8, 0x00, 0x00, 0x07, 0xff, 
-  0xf8, 0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0xff, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0xff, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0xff, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0xff, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0xff, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0xff, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0xff, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0xff, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0xff, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0xff, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0xff, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0xff, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0xff, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0xff, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0xff, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0xff, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0xff, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0xff, 
-};
-
-const lv_img_dsc_t turn_sharp_left = {
-      {
-        LV_IMG_CF_INDEXED_1BIT,
-        0,
-        0,
-        64,
-        64
-    },
-    520,
-turn_sharp_left_map,
-};
diff --git a/src/displayapp/icons/navigation/turn-sharp-left.png b/src/displayapp/icons/navigation/turn-sharp-left.png
deleted file mode 100644
index 23243f5f..00000000
--- a/src/displayapp/icons/navigation/turn-sharp-left.png
+++ /dev/null
diff --git a/src/displayapp/icons/navigation/turn-sharp-right-white.svg b/src/displayapp/icons/navigation/turn-sharp-right-white.svg
deleted file mode 100644
index 44542f52..00000000
--- a/src/displayapp/icons/navigation/turn-sharp-right-white.svg
+++ /dev/null
@@ -1,4 +0,0 @@
-<svg id="WORKING_ICONS" data-name="WORKING ICONS" xmlns="http://www.w3.org/2000/svg" width="20" height="20" viewBox="0 0 20 20">
-  <title>direction</title>
-  <path fill="#ffffff" d="M3.49789,17.99542a0.49779,0.49779,0,0,1-.49779-0.49781L3.00057,5.02472A2.10247,2.10247,0,0,1,3.5577,3.56427a1.92935,1.92935,0,0,1,1.43408-.56885l0.26416-.002A4.46634,4.46634,0,0,1,8.6407,4.23468L14.0328,8.84377l0.00378-.00446a0.35757,0.35757,0,0,0,.638-0.17206l0.8725-3.12372a0.38661,0.38661,0,0,1,.74072.0882l1.69568,7.836L9.973,13.13564a0.38658,0.38658,0,0,1-.21344-0.71472l2.92877-1.39331a0.34918,0.34918,0,0,0,.08252-0.63177L7.37557,5.783a2.56758,2.56758,0,0,0-2.0957-.79l-0.27979.00635v12.4983a0.49779,0.49779,0,0,1-.49779.49779H3.49789Z"/>
-</svg>
diff --git a/src/displayapp/icons/navigation/turn-sharp-right.c b/src/displayapp/icons/navigation/turn-sharp-right.c
deleted file mode 100644
index 83827037..00000000
--- a/src/displayapp/icons/navigation/turn-sharp-right.c
+++ /dev/null
@@ -1,96 +0,0 @@
-#if defined(LV_LVGL_H_INCLUDE_SIMPLE)
-#include "lvgl.h"
-#else
-#include "lvgl/lvgl.h"
-#endif
-
-
-#ifndef LV_ATTRIBUTE_MEM_ALIGN
-#define LV_ATTRIBUTE_MEM_ALIGN
-#endif
-
-#ifndef LV_ATTRIBUTE_IMG_TURN_SHARP_RIGHT
-#define LV_ATTRIBUTE_IMG_TURN_SHARP_RIGHT
-#endif
-
-const LV_ATTRIBUTE_MEM_ALIGN LV_ATTRIBUTE_LARGE_CONST LV_ATTRIBUTE_IMG_TURN_SHARP_RIGHT uint8_t turn_sharp_right_map[] = {
-  0x04, 0x02, 0x04, 0xff, 	/*Color of index 0*/
-  0xfc, 0xfe, 0xfc, 0xff, 	/*Color of index 1*/
-
-  0x7f, 0xff, 0xfc, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0xff, 0xff, 0xff, 0x80, 0x00, 0x00, 0x00, 0x00, 
-  0xff, 0xff, 0xff, 0xc0, 0x00, 0x00, 0x00, 0x00, 
-  0xff, 0xff, 0xff, 0xe0, 0x00, 0x00, 0x00, 0x00, 
-  0xff, 0xff, 0xff, 0xf8, 0x00, 0x00, 0x00, 0x00, 
-  0xff, 0xff, 0xff, 0xfc, 0x00, 0x00, 0x00, 0x00, 
-  0xff, 0xff, 0xff, 0xfe, 0x00, 0x00, 0x00, 0x00, 
-  0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x0f, 0xc0, 
-  0xff, 0xff, 0xff, 0xff, 0x80, 0x00, 0x1f, 0xe0, 
-  0xff, 0xff, 0xff, 0xff, 0xe0, 0x00, 0x1f, 0xe0, 
-  0xff, 0xe7, 0xff, 0xff, 0xf0, 0x00, 0x1f, 0xe0, 
-  0xff, 0xe1, 0xff, 0xff, 0xf8, 0x00, 0x1f, 0xe0, 
-  0xff, 0xe0, 0xff, 0xff, 0xfc, 0x00, 0x3f, 0xf0, 
-  0xff, 0xe0, 0x3f, 0xff, 0xfe, 0x00, 0x3f, 0xf0, 
-  0xff, 0xe0, 0x1f, 0xff, 0xff, 0x00, 0x3f, 0xf0, 
-  0xff, 0xe0, 0x0f, 0xff, 0xff, 0x80, 0x3f, 0xf0, 
-  0xff, 0xe0, 0x07, 0xff, 0xff, 0xc0, 0x7f, 0xf0, 
-  0xff, 0xe0, 0x03, 0xff, 0xff, 0xf0, 0x7f, 0xf8, 
-  0xff, 0xe0, 0x01, 0xff, 0xff, 0xf8, 0x7f, 0xf8, 
-  0xff, 0xe0, 0x00, 0xff, 0xff, 0xfc, 0xff, 0xf8, 
-  0xff, 0xe0, 0x00, 0x7f, 0xff, 0xfe, 0xff, 0xf8, 
-  0xff, 0xe0, 0x00, 0x1f, 0xff, 0xff, 0xff, 0xf8, 
-  0xff, 0xe0, 0x00, 0x0f, 0xff, 0xff, 0xff, 0xfc, 
-  0xff, 0xe0, 0x00, 0x07, 0xff, 0xff, 0xff, 0xfc, 
-  0xff, 0xe0, 0x00, 0x03, 0xff, 0xff, 0xff, 0xfc, 
-  0xff, 0xe0, 0x00, 0x00, 0xff, 0xff, 0xff, 0xfc, 
-  0xff, 0xe0, 0x00, 0x00, 0x7f, 0xff, 0xff, 0xfe, 
-  0xff, 0xe0, 0x00, 0x00, 0x3f, 0xff, 0xff, 0xfe, 
-  0xff, 0xe0, 0x00, 0x00, 0x1f, 0xff, 0xff, 0xfe, 
-  0xff, 0xe0, 0x00, 0x00, 0x0f, 0xff, 0xff, 0xfe, 
-  0xff, 0xe0, 0x00, 0x00, 0x07, 0xff, 0xff, 0xfe, 
-  0xff, 0xe0, 0x00, 0x00, 0x01, 0xff, 0xff, 0xff, 
-  0xff, 0xe0, 0x00, 0x00, 0x07, 0xff, 0xff, 0xff, 
-  0xff, 0xe0, 0x00, 0x00, 0x1f, 0xff, 0xff, 0xff, 
-  0xff, 0xe0, 0x00, 0x00, 0x7f, 0xff, 0xff, 0xff, 
-  0xff, 0xe0, 0x00, 0x01, 0xff, 0xff, 0xff, 0xff, 
-  0xff, 0xe0, 0x00, 0x0f, 0xff, 0xff, 0xff, 0xff, 
-  0xff, 0xe0, 0x00, 0x1f, 0xff, 0xff, 0xff, 0xff, 
-  0xff, 0xe0, 0x00, 0x3f, 0xff, 0xff, 0xff, 0xff, 
-  0xff, 0xe0, 0x00, 0x3f, 0xff, 0xff, 0xff, 0xff, 
-  0xff, 0xe0, 0x00, 0x3f, 0xff, 0xff, 0xff, 0xff, 
-  0xff, 0xe0, 0x00, 0x3f, 0xff, 0xff, 0xff, 0xff, 
-  0xff, 0xe0, 0x00, 0x3f, 0xff, 0xff, 0xff, 0xff, 
-  0xff, 0xe0, 0x00, 0x3f, 0xff, 0xff, 0xff, 0xff, 
-  0xff, 0xe0, 0x00, 0x00, 0x1f, 0xff, 0xff, 0xff, 
-  0xff, 0xe0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1f, 
-  0xff, 0xe0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0xff, 0xe0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0xff, 0xe0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0xff, 0xe0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0xff, 0xe0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0xff, 0xe0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0xff, 0xe0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0xff, 0xe0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0xff, 0xe0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0xff, 0xe0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0xff, 0xe0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0xff, 0xe0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0xff, 0xe0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0xff, 0xe0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0xff, 0xe0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0xff, 0xe0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0xff, 0xe0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-};
-
-const lv_img_dsc_t turn_sharp_right = {
-      {
-        LV_IMG_CF_INDEXED_1BIT,
-        0,
-        0,
-        64,
-        64
-    },
-    520,
-turn_sharp_right_map,
-};
diff --git a/src/displayapp/icons/navigation/turn-sharp-right.png b/src/displayapp/icons/navigation/turn-sharp-right.png
deleted file mode 100644
index 1ce59a47..00000000
--- a/src/displayapp/icons/navigation/turn-sharp-right.png
+++ /dev/null
diff --git a/src/displayapp/icons/navigation/turn-slight-left-white.svg b/src/displayapp/icons/navigation/turn-slight-left-white.svg
deleted file mode 100644
index 7ae2013c..00000000
--- a/src/displayapp/icons/navigation/turn-slight-left-white.svg
+++ /dev/null
@@ -1,4 +0,0 @@
-<svg id="WORKING_ICONS" data-name="WORKING ICONS" xmlns="http://www.w3.org/2000/svg" width="20" height="20" viewBox="0 0 20 20">
-  <title>direction</title>
-  <path fill="#ffffff" d="M14.9859,14.043v3.46082A0.49621,0.49621,0,0,1,14.48974,18H13.48321a0.49614,0.49614,0,0,1-.49615-0.49683l0.0047-3.60767a5.21819,5.21819,0,0,0-1.665-4.144L8.87854,7.68585a0.35758,0.35758,0,0,0-.6405.16266l-0.91821,3.1106A0.38663,0.38663,0,0,1,6.58044,10.86L5,3l8.00476,0.44965a0.38658,0.38658,0,0,1,.20294.71777L10.25878,5.51758a0.3576,0.3576,0,0,0-.07019.6571l2.45746,2.07385A7.25158,7.25158,0,0,1,14.9859,14.043Z"/>
-</svg>
diff --git a/src/displayapp/icons/navigation/turn-slight-left.c b/src/displayapp/icons/navigation/turn-slight-left.c
deleted file mode 100644
index e3d3fbb9..00000000
--- a/src/displayapp/icons/navigation/turn-slight-left.c
+++ /dev/null
@@ -1,96 +0,0 @@
-#if defined(LV_LVGL_H_INCLUDE_SIMPLE)
-#include "lvgl.h"
-#else
-#include "lvgl/lvgl.h"
-#endif
-
-
-#ifndef LV_ATTRIBUTE_MEM_ALIGN
-#define LV_ATTRIBUTE_MEM_ALIGN
-#endif
-
-#ifndef LV_ATTRIBUTE_IMG_TURN_SLIGHT_LEFT
-#define LV_ATTRIBUTE_IMG_TURN_SLIGHT_LEFT
-#endif
-
-const LV_ATTRIBUTE_MEM_ALIGN LV_ATTRIBUTE_LARGE_CONST LV_ATTRIBUTE_IMG_TURN_SLIGHT_LEFT uint8_t turn_slight_left_map[] = {
-  0x04, 0x02, 0x04, 0xff, 	/*Color of index 0*/
-  0xfc, 0xfe, 0xfc, 0xff, 	/*Color of index 1*/
-
-  0x00, 0x1f, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 
-  0x00, 0x1f, 0xff, 0xff, 0xff, 0xff, 0x80, 0x00, 
-  0x00, 0x1f, 0xff, 0xff, 0xff, 0xff, 0x80, 0x00, 
-  0x00, 0x1f, 0xff, 0xff, 0xff, 0xff, 0x80, 0x00, 
-  0x00, 0x1f, 0xff, 0xff, 0xff, 0xff, 0x80, 0x00, 
-  0x00, 0x1f, 0xff, 0xff, 0xff, 0xff, 0x80, 0x00, 
-  0x00, 0x1f, 0xff, 0xff, 0xff, 0xff, 0x80, 0x00, 
-  0x00, 0x1f, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 
-  0x00, 0x1f, 0xff, 0xff, 0xff, 0xf8, 0x00, 0x00, 
-  0x00, 0x1f, 0xff, 0xff, 0xff, 0xe0, 0x00, 0x00, 
-  0x00, 0x1f, 0xff, 0xff, 0xff, 0x80, 0x00, 0x00, 
-  0x00, 0x1f, 0xff, 0xff, 0xfc, 0x00, 0x00, 0x00, 
-  0x00, 0x1f, 0xff, 0xff, 0xf0, 0x00, 0x00, 0x00, 
-  0x00, 0x0f, 0xff, 0xff, 0xfc, 0x00, 0x00, 0x00, 
-  0x00, 0x0f, 0xff, 0xff, 0xfc, 0x00, 0x00, 0x00, 
-  0x00, 0x0f, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 
-  0x00, 0x0f, 0xff, 0xff, 0xff, 0x80, 0x00, 0x00, 
-  0x00, 0x0f, 0xff, 0xff, 0xff, 0xc0, 0x00, 0x00, 
-  0x00, 0x07, 0xff, 0xff, 0xff, 0xe0, 0x00, 0x00, 
-  0x00, 0x07, 0xff, 0xff, 0xff, 0xf8, 0x00, 0x00, 
-  0x00, 0x07, 0xff, 0xff, 0xff, 0xfc, 0x00, 0x00, 
-  0x00, 0x07, 0xff, 0xff, 0xff, 0xfe, 0x00, 0x00, 
-  0x00, 0x07, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 
-  0x00, 0x03, 0xff, 0xff, 0xff, 0xff, 0x80, 0x00, 
-  0x00, 0x03, 0xff, 0xc7, 0xff, 0xff, 0x80, 0x00, 
-  0x00, 0x03, 0xff, 0xc3, 0xff, 0xff, 0xc0, 0x00, 
-  0x00, 0x03, 0xff, 0xc1, 0xff, 0xff, 0xe0, 0x00, 
-  0x00, 0x03, 0xff, 0x80, 0xff, 0xff, 0xe0, 0x00, 
-  0x00, 0x01, 0xff, 0x80, 0x7f, 0xff, 0xf0, 0x00, 
-  0x00, 0x01, 0xff, 0x80, 0x1f, 0xff, 0xf8, 0x00, 
-  0x00, 0x01, 0xff, 0x80, 0x0f, 0xff, 0xf8, 0x00, 
-  0x00, 0x01, 0xff, 0x00, 0x07, 0xff, 0xf8, 0x00, 
-  0x00, 0x01, 0xff, 0x00, 0x03, 0xff, 0xfc, 0x00, 
-  0x00, 0x00, 0xff, 0x00, 0x01, 0xff, 0xfc, 0x00, 
-  0x00, 0x00, 0xfe, 0x00, 0x01, 0xff, 0xfc, 0x00, 
-  0x00, 0x00, 0xfe, 0x00, 0x00, 0xff, 0xfc, 0x00, 
-  0x00, 0x00, 0xfe, 0x00, 0x00, 0x7f, 0xfc, 0x00, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x7f, 0xfc, 0x00, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x3f, 0xfc, 0x00, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x3f, 0xfc, 0x00, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x3f, 0xfc, 0x00, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x1f, 0xfc, 0x00, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x1f, 0xfc, 0x00, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x1f, 0xfc, 0x00, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x1f, 0xfc, 0x00, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x1f, 0xfc, 0x00, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x1f, 0xfc, 0x00, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x1f, 0xfc, 0x00, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x1f, 0xfc, 0x00, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x1f, 0xfc, 0x00, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x1f, 0xfc, 0x00, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x1f, 0xfc, 0x00, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x1f, 0xfc, 0x00, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x1f, 0xfc, 0x00, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x1f, 0xfc, 0x00, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x1f, 0xfc, 0x00, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x1f, 0xfc, 0x00, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x1f, 0xfc, 0x00, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x1f, 0xfc, 0x00, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x1f, 0xfc, 0x00, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x1f, 0xfc, 0x00, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x1f, 0xfc, 0x00, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x1f, 0xfc, 0x00, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x1f, 0xfc, 0x00, 
-};
-
-const lv_img_dsc_t turn_slight_left = {
-      {
-        LV_IMG_CF_INDEXED_1BIT,
-        0,
-        0,
-        64,
-        64
-    },
-    520,
-turn_slight_left_map,
-};
diff --git a/src/displayapp/icons/navigation/turn-slight-left.png b/src/displayapp/icons/navigation/turn-slight-left.png
deleted file mode 100644
index 8fea533f..00000000
--- a/src/displayapp/icons/navigation/turn-slight-left.png
+++ /dev/null
diff --git a/src/displayapp/icons/navigation/turn-slight-right-white.svg b/src/displayapp/icons/navigation/turn-slight-right-white.svg
deleted file mode 100644
index 46090067..00000000
--- a/src/displayapp/icons/navigation/turn-slight-right-white.svg
+++ /dev/null
@@ -1,4 +0,0 @@
-<svg id="WORKING_ICONS" data-name="WORKING ICONS" xmlns="http://www.w3.org/2000/svg" width="20" height="20" viewBox="0 0 20 20">
-  <title>direction</title>
-  <path fill="#ffffff" d="M7.35395,8.24854L9.81141,6.17468a0.3576,0.3576,0,0,0-.07019-0.6571L6.7923,4.16742a0.38658,0.38658,0,0,1,.20294-0.71777L15,3l-1.58044,7.86a0.38663,0.38663,0,0,1-.73938.09912L11.762,7.84851a0.35758,0.35758,0,0,0-.6405-0.16266L8.67328,9.75146a5.21819,5.21819,0,0,0-1.665,4.144l0.0047,3.60767A0.49614,0.49614,0,0,1,6.51679,18H5.51026a0.49621,0.49621,0,0,1-.49615-0.49622V14.043A7.25157,7.25157,0,0,1,7.35395,8.24854Z"/>
-</svg>
diff --git a/src/displayapp/icons/navigation/turn-slight-right.c b/src/displayapp/icons/navigation/turn-slight-right.c
deleted file mode 100644
index a62e3481..00000000
--- a/src/displayapp/icons/navigation/turn-slight-right.c
+++ /dev/null
@@ -1,96 +0,0 @@
-#if defined(LV_LVGL_H_INCLUDE_SIMPLE)
-#include "lvgl.h"
-#else
-#include "lvgl/lvgl.h"
-#endif
-
-
-#ifndef LV_ATTRIBUTE_MEM_ALIGN
-#define LV_ATTRIBUTE_MEM_ALIGN
-#endif
-
-#ifndef LV_ATTRIBUTE_IMG_TURN_SLIGHT_RIGHT
-#define LV_ATTRIBUTE_IMG_TURN_SLIGHT_RIGHT
-#endif
-
-const LV_ATTRIBUTE_MEM_ALIGN LV_ATTRIBUTE_LARGE_CONST LV_ATTRIBUTE_IMG_TURN_SLIGHT_RIGHT uint8_t turn_slight_right_map[] = {
-  0x04, 0x02, 0x04, 0xff, 	/*Color of index 0*/
-  0xfc, 0xfe, 0xfc, 0xff, 	/*Color of index 1*/
-
-  0x00, 0x00, 0x7f, 0xff, 0xff, 0xff, 0xfc, 0x00, 
-  0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xfc, 0x00, 
-  0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xfc, 0x00, 
-  0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xfc, 0x00, 
-  0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xfc, 0x00, 
-  0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xfc, 0x00, 
-  0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xfc, 0x00, 
-  0x00, 0x00, 0x3f, 0xff, 0xff, 0xff, 0xfc, 0x00, 
-  0x00, 0x00, 0x0f, 0xff, 0xff, 0xff, 0xfc, 0x00, 
-  0x00, 0x00, 0x03, 0xff, 0xff, 0xff, 0xfc, 0x00, 
-  0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xfc, 0x00, 
-  0x00, 0x00, 0x00, 0x1f, 0xff, 0xff, 0xfc, 0x00, 
-  0x00, 0x00, 0x00, 0x07, 0xff, 0xff, 0xfc, 0x00, 
-  0x00, 0x00, 0x00, 0x1f, 0xff, 0xff, 0xf8, 0x00, 
-  0x00, 0x00, 0x00, 0x1f, 0xff, 0xff, 0xf8, 0x00, 
-  0x00, 0x00, 0x00, 0x7f, 0xff, 0xff, 0xf8, 0x00, 
-  0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xf8, 0x00, 
-  0x00, 0x00, 0x01, 0xff, 0xff, 0xff, 0xf8, 0x00, 
-  0x00, 0x00, 0x03, 0xff, 0xff, 0xff, 0xf0, 0x00, 
-  0x00, 0x00, 0x0f, 0xff, 0xff, 0xff, 0xf0, 0x00, 
-  0x00, 0x00, 0x1f, 0xff, 0xff, 0xff, 0xf0, 0x00, 
-  0x00, 0x00, 0x3f, 0xff, 0xff, 0xff, 0xf0, 0x00, 
-  0x00, 0x00, 0x7f, 0xff, 0xff, 0xff, 0xf0, 0x00, 
-  0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xe0, 0x00, 
-  0x00, 0x00, 0xff, 0xff, 0xf1, 0xff, 0xe0, 0x00, 
-  0x00, 0x01, 0xff, 0xff, 0xe1, 0xff, 0xe0, 0x00, 
-  0x00, 0x03, 0xff, 0xff, 0xc1, 0xff, 0xe0, 0x00, 
-  0x00, 0x03, 0xff, 0xff, 0x80, 0xff, 0xe0, 0x00, 
-  0x00, 0x07, 0xff, 0xff, 0x00, 0xff, 0xc0, 0x00, 
-  0x00, 0x0f, 0xff, 0xfc, 0x00, 0xff, 0xc0, 0x00, 
-  0x00, 0x0f, 0xff, 0xf8, 0x00, 0xff, 0xc0, 0x00, 
-  0x00, 0x0f, 0xff, 0xf0, 0x00, 0x7f, 0xc0, 0x00, 
-  0x00, 0x1f, 0xff, 0xe0, 0x00, 0x7f, 0xc0, 0x00, 
-  0x00, 0x1f, 0xff, 0xc0, 0x00, 0x7f, 0x80, 0x00, 
-  0x00, 0x1f, 0xff, 0xc0, 0x00, 0x3f, 0x80, 0x00, 
-  0x00, 0x1f, 0xff, 0x80, 0x00, 0x3f, 0x80, 0x00, 
-  0x00, 0x1f, 0xff, 0x00, 0x00, 0x3f, 0x80, 0x00, 
-  0x00, 0x1f, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x00, 0x1f, 0xfe, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x00, 0x1f, 0xfe, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x00, 0x1f, 0xfe, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x00, 0x1f, 0xfc, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x00, 0x1f, 0xfc, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x00, 0x1f, 0xfc, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x00, 0x1f, 0xfc, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x00, 0x1f, 0xfc, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x00, 0x1f, 0xfc, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x00, 0x1f, 0xfc, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x00, 0x1f, 0xfc, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x00, 0x1f, 0xfc, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x00, 0x1f, 0xfc, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x00, 0x1f, 0xfc, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x00, 0x1f, 0xfc, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x00, 0x1f, 0xfc, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x00, 0x1f, 0xfc, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x00, 0x1f, 0xfc, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x00, 0x1f, 0xfc, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x00, 0x1f, 0xfc, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x00, 0x1f, 0xfc, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x00, 0x1f, 0xfc, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x00, 0x1f, 0xfc, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x00, 0x1f, 0xfc, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x00, 0x1f, 0xfc, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x00, 0x1f, 0xfc, 0x00, 0x00, 0x00, 0x00, 0x00, 
-};
-
-const lv_img_dsc_t turn_slight_right = {
-      {
-        LV_IMG_CF_INDEXED_1BIT,
-        0,
-        0,
-        64,
-        64
-    },
-    520,
-turn_slight_right_map,
-};
diff --git a/src/displayapp/icons/navigation/turn-slight-right.png b/src/displayapp/icons/navigation/turn-slight-right.png
deleted file mode 100644
index 172c348e..00000000
--- a/src/displayapp/icons/navigation/turn-slight-right.png
+++ /dev/null
diff --git a/src/displayapp/icons/navigation/turn-straight-white.svg b/src/displayapp/icons/navigation/turn-straight-white.svg
deleted file mode 100644
index 08531119..00000000
--- a/src/displayapp/icons/navigation/turn-straight-white.svg
+++ /dev/null
@@ -1,4 +0,0 @@
-<svg id="WORKING_ICONS" data-name="WORKING ICONS" xmlns="http://www.w3.org/2000/svg" width="20" height="20" viewBox="0 0 20 20">
-  <title>direction</title>
-  <path fill="#ffffff" d="M14.50342,8.96637L11.55157,7.62262A0.35755,0.35755,0,0,0,11.00916,8v9.49652A0.50346,0.50346,0,0,1,10.50568,18h-0.993a0.50346,0.50346,0,0,1-.50348-0.50348V8a0.35756,0.35756,0,0,0-.54242-0.37738L5.51489,8.96637a0.38659,0.38659,0,0,1-.40942-0.62354L10.00916,2l4.90369,6.34283A0.3866,0.3866,0,0,1,14.50342,8.96637Z"/>
-</svg>
diff --git a/src/displayapp/icons/navigation/turn-straight.c b/src/displayapp/icons/navigation/turn-straight.c
deleted file mode 100644
index e00cf3fd..00000000
--- a/src/displayapp/icons/navigation/turn-straight.c
+++ /dev/null
@@ -1,96 +0,0 @@
-#if defined(LV_LVGL_H_INCLUDE_SIMPLE)
-#include "lvgl.h"
-#else
-#include "lvgl/lvgl.h"
-#endif
-
-
-#ifndef LV_ATTRIBUTE_MEM_ALIGN
-#define LV_ATTRIBUTE_MEM_ALIGN
-#endif
-
-#ifndef LV_ATTRIBUTE_IMG_TURN_STRAIGHT
-#define LV_ATTRIBUTE_IMG_TURN_STRAIGHT
-#endif
-
-const LV_ATTRIBUTE_MEM_ALIGN LV_ATTRIBUTE_LARGE_CONST LV_ATTRIBUTE_IMG_TURN_STRAIGHT uint8_t turn_straight_map[] = {
-  0x04, 0x02, 0x04, 0xff, 	/*Color of index 0*/
-  0xfc, 0xfe, 0xfc, 0xff, 	/*Color of index 1*/
-
-  0x00, 0x00, 0x00, 0x0f, 0xf0, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x1f, 0xf8, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x1f, 0xf8, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x3f, 0xfc, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x7f, 0xfe, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0xff, 0xff, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x01, 0xff, 0xff, 0x80, 0x00, 0x00, 
-  0x00, 0x00, 0x01, 0xff, 0xff, 0x80, 0x00, 0x00, 
-  0x00, 0x00, 0x03, 0xff, 0xff, 0xc0, 0x00, 0x00, 
-  0x00, 0x00, 0x07, 0xff, 0xff, 0xe0, 0x00, 0x00, 
-  0x00, 0x00, 0x07, 0xff, 0xff, 0xf0, 0x00, 0x00, 
-  0x00, 0x00, 0x0f, 0xff, 0xff, 0xf0, 0x00, 0x00, 
-  0x00, 0x00, 0x1f, 0xff, 0xff, 0xf8, 0x00, 0x00, 
-  0x00, 0x00, 0x3f, 0xff, 0xff, 0xfc, 0x00, 0x00, 
-  0x00, 0x00, 0x7f, 0xff, 0xff, 0xfe, 0x00, 0x00, 
-  0x00, 0x00, 0x7f, 0xff, 0xff, 0xfe, 0x00, 0x00, 
-  0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 
-  0x00, 0x01, 0xff, 0xff, 0xff, 0xff, 0x80, 0x00, 
-  0x00, 0x03, 0xff, 0xff, 0xff, 0xff, 0xc0, 0x00, 
-  0x00, 0x03, 0xff, 0xff, 0xff, 0xff, 0xc0, 0x00, 
-  0x00, 0x07, 0xff, 0xff, 0xff, 0xff, 0xe0, 0x00, 
-  0x00, 0x0f, 0xff, 0xff, 0xff, 0xff, 0xf0, 0x00, 
-  0x00, 0x0f, 0xff, 0xff, 0xff, 0xff, 0xf0, 0x00, 
-  0x00, 0x0f, 0xff, 0xff, 0xff, 0xff, 0xf0, 0x00, 
-  0x00, 0x0f, 0xff, 0xff, 0xff, 0xff, 0xf0, 0x00, 
-  0x00, 0x0f, 0xff, 0xff, 0xff, 0xff, 0xf0, 0x00, 
-  0x00, 0x0f, 0xfe, 0x3f, 0xfc, 0x7f, 0xf0, 0x00, 
-  0x00, 0x0f, 0xf8, 0x3f, 0xfc, 0x1f, 0xf0, 0x00, 
-  0x00, 0x0f, 0xe0, 0x3f, 0xfc, 0x07, 0xf0, 0x00, 
-  0x00, 0x0f, 0x80, 0x3f, 0xfc, 0x01, 0xf0, 0x00, 
-  0x00, 0x00, 0x00, 0x3f, 0xfc, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x3f, 0xfc, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x3f, 0xfc, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x3f, 0xfc, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x3f, 0xfc, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x3f, 0xfc, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x3f, 0xfc, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x3f, 0xfc, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x3f, 0xfc, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x3f, 0xfc, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x3f, 0xfc, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x3f, 0xfc, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x3f, 0xfc, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x3f, 0xfc, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x3f, 0xfc, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x3f, 0xfc, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x3f, 0xfc, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x3f, 0xfc, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x3f, 0xfc, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x3f, 0xfc, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x3f, 0xfc, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x3f, 0xfc, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x3f, 0xfc, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x3f, 0xfc, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x3f, 0xfc, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x3f, 0xfc, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x3f, 0xfc, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x3f, 0xfc, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x3f, 0xfc, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x3f, 0xfc, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x3f, 0xfc, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x3f, 0xfc, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x3f, 0xfc, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x3f, 0xfc, 0x00, 0x00, 0x00, 
-};
-
-const lv_img_dsc_t turn_straight = {
-      {
-        LV_IMG_CF_INDEXED_1BIT,
-        0,
-        0,
-        64,
-        64
-    },
-    520,
-turn_straight_map,
-};
diff --git a/src/displayapp/icons/navigation/turn-straight.png b/src/displayapp/icons/navigation/turn-straight.png
deleted file mode 100644
index 7dee5deb..00000000
--- a/src/displayapp/icons/navigation/turn-straight.png
+++ /dev/null
diff --git a/src/displayapp/icons/navigation/turn_left.svg b/src/displayapp/icons/navigation/turn_left.svg
new file mode 100644
index 00000000..9d1b96a3
--- /dev/null
+++ b/src/displayapp/icons/navigation/turn_left.svg
@@ -0,0 +1,58 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   inkscape:version="1.0 (4035a4fb49, 2020-05-01)"
+   sodipodi:docname="turn_left.svg"
+   version="1.1"
+   viewBox="0 0 20 20"
+   height="20"
+   width="20"
+   data-name="WORKING ICONS"
+   id="WORKING_ICONS">
+  <metadata
+     id="metadata11">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs9" />
+  <sodipodi:namedview
+     inkscape:current-layer="WORKING_ICONS"
+     inkscape:window-maximized="1"
+     inkscape:window-y="22"
+     inkscape:window-x="-8"
+     inkscape:cy="15.313708"
+     inkscape:cx="15.395446"
+     inkscape:zoom="21.5"
+     showgrid="false"
+     id="namedview7"
+     inkscape:window-height="1027"
+     inkscape:window-width="1920"
+     inkscape:pageshadow="2"
+     inkscape:pageopacity="0"
+     guidetolerance="10"
+     gridtolerance="10"
+     objecttolerance="10"
+     borderopacity="1"
+     bordercolor="#666666"
+     pagecolor="#ffffff" />
+  <title
+     id="title2">direction</title>
+  <path
+     style="stroke-width:1.24853"
+     id="path4"
+     d="m 11.243339,4.9925164 0.01373,0.00228 a 7.5663193,7.5663193 0 0 1 7.477437,7.5826126 v 4.925532 h -0.0039 l 0.0025,1.87675 a 0.61944488,0.61944488 0 0 1 -0.61952,0.620306 H 16.856998 A 0.61954476,0.61954476 0 0 1 16.237453,19.380458 V 12.577414 A 5.0663035,5.0663035 0 0 0 11.25736,7.491858 H 8.761827 A 0.44647376,0.44647376 0 0 0 8.2906573,8.1691592 L 9.9683672,11.854603 A 0.48266859,0.48266859 0 0 1 9.18986,12.365776 L 1.2654752,6.2661901 9.189885,0.12093333 a 0.48266859,0.48266859 0 0 1 0.7785072,0.5111725 L 8.2906573,4.3175744 A 0.4464363,0.4464363 0 0 0 8.761827,4.9948012 h 2.481512"
+     fill="#000000" />
+</svg>
diff --git a/src/displayapp/icons/navigation/turn_right.svg b/src/displayapp/icons/navigation/turn_right.svg
new file mode 100644
index 00000000..efbcfd9d
--- /dev/null
+++ b/src/displayapp/icons/navigation/turn_right.svg
@@ -0,0 +1,58 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   inkscape:version="1.0 (4035a4fb49, 2020-05-01)"
+   sodipodi:docname="turn_right.svg"
+   version="1.1"
+   viewBox="0 0 20 20"
+   height="20"
+   width="20"
+   data-name="WORKING ICONS"
+   id="WORKING_ICONS">
+  <metadata
+     id="metadata11">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs9" />
+  <sodipodi:namedview
+     inkscape:current-layer="WORKING_ICONS"
+     inkscape:window-maximized="1"
+     inkscape:window-y="22"
+     inkscape:window-x="-8"
+     inkscape:cy="11.771744"
+     inkscape:cx="5.4370767"
+     inkscape:zoom="21.5"
+     showgrid="false"
+     id="namedview7"
+     inkscape:window-height="1027"
+     inkscape:window-width="1920"
+     inkscape:pageshadow="2"
+     inkscape:pageopacity="0"
+     guidetolerance="10"
+     gridtolerance="10"
+     objecttolerance="10"
+     borderopacity="1"
+     bordercolor="#666666"
+     pagecolor="#ffffff" />
+  <title
+     id="title2">direction</title>
+  <path
+     style="stroke-width:1.24853"
+     id="path4"
+     d="M 8.7426433,7.4918486 A 5.0663062,5.0663062 0 0 0 3.7625481,12.577407 v 6.803048 A 0.61954509,0.61954509 0 0 1 3.143003,20 H 1.886396 A 0.6194452,0.6194452 0 0 1 1.2669383,19.379693 l 0.00243,-1.876751 h -0.00388 v -4.925535 a 7.5663233,7.5663233 0 0 1 7.477442,-7.5826165 l 0.01373,-0.00228 v 0.00228 h 2.4815137 a 0.44643653,0.44643653 0 0 0 0.47117,-0.6772271 L 10.031633,0.63210537 a 0.48266885,0.48266885 0 0 1 0.778495,-0.5111853 L 18.73453,6.2661801 10.810116,12.365794 A 0.48266885,0.48266885 0 0 1 10.031608,11.854621 L 11.709319,8.169163 A 0.44647399,0.44647399 0 0 0 11.238149,7.4918611 H 8.7426393 Z"
+     fill="#000000" />
+</svg>
diff --git a/src/displayapp/icons/navigation/turn_sharp_left.svg b/src/displayapp/icons/navigation/turn_sharp_left.svg
new file mode 100644
index 00000000..9e3e9bfa
--- /dev/null
+++ b/src/displayapp/icons/navigation/turn_sharp_left.svg
@@ -0,0 +1,58 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   inkscape:version="1.0 (4035a4fb49, 2020-05-01)"
+   sodipodi:docname="turn_sharp_left.svg"
+   version="1.1"
+   viewBox="0 0 20 20"
+   height="20"
+   width="20"
+   data-name="WORKING ICONS"
+   id="WORKING_ICONS">
+  <metadata
+     id="metadata11">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs9" />
+  <sodipodi:namedview
+     inkscape:current-layer="WORKING_ICONS"
+     inkscape:window-maximized="1"
+     inkscape:window-y="22"
+     inkscape:window-x="-8"
+     inkscape:cy="12.330285"
+     inkscape:cx="11.649138"
+     inkscape:zoom="21.5"
+     showgrid="false"
+     id="namedview7"
+     inkscape:window-height="1027"
+     inkscape:window-width="1920"
+     inkscape:pageshadow="2"
+     inkscape:pageopacity="0"
+     guidetolerance="10"
+     gridtolerance="10"
+     objecttolerance="10"
+     borderopacity="1"
+     bordercolor="#666666"
+     pagecolor="#ffffff" />
+  <title
+     id="title2">direction</title>
+  <path
+     style="stroke-width:1.33235"
+     id="path4"
+     d="m 17.980101,19.999959 a 0.66322994,0.66322994 0 0 1 -0.66323,-0.66323 V 2.6846325 l -0.372764,-0.00843 A 3.4209123,3.4209123 0 0 0 14.151903,3.7287543 L 6.9635218,9.8746527 a 0.46522958,0.46522958 0 0 0 0.1099455,0.8417383 l 3.9021427,1.856375 a 0.51505943,0.51505943 0 0 1 -0.284376,0.952257 L 0.0184535,13.967483 2.2776908,3.5271966 A 0.5150994,0.5150994 0 0 1 3.2645883,3.4096834 l 1.1624744,4.1618853 a 0.47640798,0.47640798 0 0 0 0.8500385,0.229243 l 0.00504,0.006 7.1841578,-6.1409158 a 5.950723,5.950723 0 0 1 4.509695,-1.65372468 l 0.351953,0.00266 a 2.5705673,2.5705673 0 0 1 1.910695,0.7579066 2.8012235,2.8012235 0 0 1 0.742292,1.94582888 l 6.12e-4,16.6181743 a 0.66322994,0.66322994 0 0 1 -0.66323,0.663257 z"
+     fill="#000000" />
+</svg>
diff --git a/src/displayapp/icons/navigation/turn_sharp_right.svg b/src/displayapp/icons/navigation/turn_sharp_right.svg
new file mode 100644
index 00000000..99f2f504
--- /dev/null
+++ b/src/displayapp/icons/navigation/turn_sharp_right.svg
@@ -0,0 +1,58 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   inkscape:version="1.0 (4035a4fb49, 2020-05-01)"
+   sodipodi:docname="turn_sharp_right.svg"
+   version="1.1"
+   viewBox="0 0 20 20"
+   height="20"
+   width="20"
+   data-name="WORKING ICONS"
+   id="WORKING_ICONS">
+  <metadata
+     id="metadata11">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs9" />
+  <sodipodi:namedview
+     inkscape:current-layer="WORKING_ICONS"
+     inkscape:window-maximized="1"
+     inkscape:window-y="22"
+     inkscape:window-x="-8"
+     inkscape:cy="14.291988"
+     inkscape:cx="12.929694"
+     inkscape:zoom="21.5"
+     showgrid="false"
+     id="namedview7"
+     inkscape:window-height="1027"
+     inkscape:window-width="1920"
+     inkscape:pageshadow="2"
+     inkscape:pageopacity="0"
+     guidetolerance="10"
+     gridtolerance="10"
+     objecttolerance="10"
+     borderopacity="1"
+     bordercolor="#666666"
+     pagecolor="#ffffff" />
+  <title
+     id="title2">direction</title>
+  <path
+     style="stroke-width:1.33234"
+     id="path4"
+     d="M 0.681745,19.999972 A 0.66322701,0.66322701 0 0 1 0.018518,19.336718 L 0.0191442,2.71855 A 2.8012112,2.8012112 0 0 1 0.7614324,0.7727297 2.5705559,2.5705559 0 0 1 2.6721189,0.0148264 l 0.3519517,-0.00266 a 5.9506968,5.9506968 0 0 1 4.5096614,1.653784 l 7.184126,6.1408891 0.005,-0.0059 a 0.47640588,0.47640588 0 0 0 0.850035,-0.229243 l 1.162469,-4.1618669 a 0.51509712,0.51509712 0 0 1 0.986893,0.1175126 L 19.981482,13.967583 9.308775,13.525125 A 0.51505715,0.51505715 0 0 1 9.0244,12.572873 l 3.902126,-1.856367 A 0.46522752,0.46522752 0 0 0 13.036508,9.8747245 L 5.8481448,3.728839 A 3.4208972,3.4208972 0 0 0 3.0559536,2.6762881 l -0.3727763,0.00846 V 19.336771 a 0.66322701,0.66322701 0 0 1 -0.663227,0.663227 H 0.681745 Z"
+     fill="#000000" />
+</svg>
diff --git a/src/displayapp/icons/navigation/turn_slight_left.svg b/src/displayapp/icons/navigation/turn_slight_left.svg
new file mode 100644
index 00000000..6fbb36ca
--- /dev/null
+++ b/src/displayapp/icons/navigation/turn_slight_left.svg
@@ -0,0 +1,58 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   inkscape:version="1.0 (4035a4fb49, 2020-05-01)"
+   sodipodi:docname="turn_slight_left.svg"
+   version="1.1"
+   viewBox="0 0 20 20"
+   height="20"
+   width="20"
+   data-name="WORKING ICONS"
+   id="WORKING_ICONS">
+  <metadata
+     id="metadata11">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs9" />
+  <sodipodi:namedview
+     inkscape:current-layer="WORKING_ICONS"
+     inkscape:window-maximized="1"
+     inkscape:window-y="22"
+     inkscape:window-x="-8"
+     inkscape:cy="14.046775"
+     inkscape:cx="11.649138"
+     inkscape:zoom="21.5"
+     showgrid="false"
+     id="namedview7"
+     inkscape:window-height="1027"
+     inkscape:window-width="1920"
+     inkscape:pageshadow="2"
+     inkscape:pageopacity="0"
+     guidetolerance="10"
+     gridtolerance="10"
+     objecttolerance="10"
+     borderopacity="1"
+     bordercolor="#666666"
+     pagecolor="#ffffff" />
+  <title
+     id="title2">direction</title>
+  <path
+     style="stroke-width:1.33333"
+     id="path4"
+     d="m 16.648074,14.724 v 4.614427 A 0.66161333,0.66161333 0 0 1 15.986528,20 h -1.34204 a 0.66152,0.66152 0 0 1 -0.661534,-0.66244 l 0.0063,-4.810227 A 6.9575867,6.9575867 0 0 0 11.769221,9.002 L 8.5049277,6.2478 A 0.47677333,0.47677333 0 0 0 7.6509274,6.46468 l -1.22428,4.147467 A 0.51550667,0.51550667 0 0 1 5.440794,10.48 L 3.3335407,0 14.006554,0.5995333 A 0.51544,0.51544 0 0 1 14.277141,1.55656 l -3.931893,1.8002133 a 0.4768,0.4768 0 0 0 -0.09359,0.8761334 L 13.528274,6.99804 a 9.6687733,9.6687733 0 0 1 3.1198,7.72596 z"
+     fill="#000000" />
+</svg>
diff --git a/src/displayapp/icons/navigation/turn_slight_right.svg b/src/displayapp/icons/navigation/turn_slight_right.svg
new file mode 100644
index 00000000..9e289428
--- /dev/null
+++ b/src/displayapp/icons/navigation/turn_slight_right.svg
@@ -0,0 +1,58 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   inkscape:version="1.0 (4035a4fb49, 2020-05-01)"
+   sodipodi:docname="turn_slight_right.svg"
+   version="1.1"
+   viewBox="0 0 20 20"
+   height="20"
+   width="20"
+   data-name="WORKING ICONS"
+   id="WORKING_ICONS">
+  <metadata
+     id="metadata11">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs9" />
+  <sodipodi:namedview
+     inkscape:current-layer="WORKING_ICONS"
+     inkscape:window-maximized="1"
+     inkscape:window-y="22"
+     inkscape:window-x="-8"
+     inkscape:cy="14.605591"
+     inkscape:cx="9.866217"
+     inkscape:zoom="15.202796"
+     showgrid="false"
+     id="namedview7"
+     inkscape:window-height="1027"
+     inkscape:window-width="1920"
+     inkscape:pageshadow="2"
+     inkscape:pageopacity="0"
+     guidetolerance="10"
+     gridtolerance="10"
+     objecttolerance="10"
+     borderopacity="1"
+     bordercolor="#666666"
+     pagecolor="#ffffff" />
+  <title
+     id="title2">direction</title>
+  <path
+     style="stroke-width:1.33333"
+     id="path4"
+     d="M 6.4717198,6.9980533 9.7483327,4.2329067 A 0.4768,0.4768 0 0 0 9.6547467,3.3567733 L 5.7228532,1.55656 A 0.51544,0.51544 0 0 1 5.9934398,0.5995333 L 16.666453,0 14.5592,10.48 a 0.51550667,0.51550667 0 0 1 -0.98584,0.13216 L 12.34912,6.46468 A 0.47677333,0.47677333 0 0 0 11.49512,6.2478 L 8.2308265,9.001947 a 6.9575867,6.9575867 0 0 0 -2.22,5.525333 l 0.00627,4.810227 A 0.66152,0.66152 0 0 1 5.3555065,20 h -1.34204 A 0.66161333,0.66161333 0 0 1 3.3519332,19.338373 V 14.724 A 9.66876,9.66876 0 0 1 6.4717198,6.9980533 Z"
+     fill="#000000" />
+</svg>
diff --git a/src/displayapp/icons/navigation/turn_straight.svg b/src/displayapp/icons/navigation/turn_straight.svg
new file mode 100644
index 00000000..e10ba219
--- /dev/null
+++ b/src/displayapp/icons/navigation/turn_straight.svg
@@ -0,0 +1,58 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   inkscape:version="1.0 (4035a4fb49, 2020-05-01)"
+   sodipodi:docname="turn_straight.svg"
+   version="1.1"
+   viewBox="0 0 20 20"
+   height="20"
+   width="20"
+   data-name="WORKING ICONS"
+   id="WORKING_ICONS">
+  <metadata
+     id="metadata11">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs9" />
+  <sodipodi:namedview
+     inkscape:current-layer="WORKING_ICONS"
+     inkscape:window-maximized="1"
+     inkscape:window-y="22"
+     inkscape:window-x="-8"
+     inkscape:cy="18.516537"
+     inkscape:cx="14.97164"
+     inkscape:zoom="15.202796"
+     showgrid="false"
+     id="namedview7"
+     inkscape:window-height="1027"
+     inkscape:window-width="1920"
+     inkscape:pageshadow="2"
+     inkscape:pageopacity="0"
+     guidetolerance="10"
+     gridtolerance="10"
+     objecttolerance="10"
+     borderopacity="1"
+     bordercolor="#666666"
+     pagecolor="#ffffff" />
+  <title
+     id="title2">direction</title>
+  <path
+     style="stroke-width:1.25"
+     id="path4"
+     d="M 15.617836,8.707962 11.928024,7.028275 A 0.4469375,0.4469375 0 0 0 11.250011,7.5 V 19.37065 A 0.629325,0.629325 0 0 1 10.620661,20 H 9.3794106 a 0.629325,0.629325 0 0 1 -0.62935,-0.62935 V 7.5 A 0.44695,0.44695 0 0 0 8.0720358,7.028275 L 4.3821733,8.707962 A 0.4832375,0.4832375 0 0 1 3.8703983,7.9285375 L 10.000011,0 16.129624,7.9285375 A 0.48325,0.48325 0 0 1 15.617836,8.707962 Z"
+     fill="#000000" />
+</svg>
diff --git a/src/displayapp/icons/navigation/unique/arrive.svg b/src/displayapp/icons/navigation/unique/arrive.svg
new file mode 100644
index 00000000..f37adc2f
--- /dev/null
+++ b/src/displayapp/icons/navigation/unique/arrive.svg
@@ -0,0 +1,64 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   id="WORKING_ICONS"
+   data-name="WORKING ICONS"
+   width="10.001093"
+   height="20"
+   viewBox="0 0 10.001093 20"
+   version="1.1"
+   sodipodi:docname="arrive.svg"
+   inkscape:version="1.0 (4035a4fb49, 2020-05-01)">
+  <metadata
+     id="metadata11">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title>direction</dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs9" />
+  <sodipodi:namedview
+     fit-margin-bottom="0"
+     fit-margin-right="0"
+     fit-margin-left="0"
+     fit-margin-top="0"
+     inkscape:document-rotation="0"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1920"
+     inkscape:window-height="1027"
+     id="namedview7"
+     showgrid="false"
+     inkscape:zoom="21.5"
+     inkscape:cx="4.4929857"
+     inkscape:cy="15.027627"
+     inkscape:window-x="-8"
+     inkscape:window-y="22"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="WORKING_ICONS" />
+  <title
+     id="title2">direction</title>
+  <path
+     fill="#000000"
+     d="m 4.9913884,4.4444444 a 2,2.2222222 0 1 1 2,-2.2222222 2,2.2222222 0 0 1 -2,2.2222222 z m 4.91284,9.2790446 -4.90368,-7.0476001 -4.90368996,7.0476001 a 0.38659,0.42954444 0 0 0 0.40942,0.692822 L 3.4581184,12.923256 a 0.35542,0.39491111 0 0 1 0.54096,0.410077 h -0.00769 v 6.111178 A 0.49992,0.55546667 0 0 0 4.4913284,20 h 1.00012 a 0.49992,0.55546667 0 0 0 0.49994,-0.555489 v -6.101955 h 0.0092 a 0.35757,0.3973 0 0 1 0.54242,-0.419312 l 2.95184,1.493056 a 0.3866,0.42955556 0 0 0 0.40942,-0.692811 z"
+     id="path4"
+     style="stroke-width:1.05409" />
+</svg>
diff --git a/src/displayapp/icons/navigation/unique/arrive_left.svg b/src/displayapp/icons/navigation/unique/arrive_left.svg
new file mode 100644
index 00000000..3189e7d7
--- /dev/null
+++ b/src/displayapp/icons/navigation/unique/arrive_left.svg
@@ -0,0 +1,64 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   id="WORKING_ICONS"
+   data-name="WORKING ICONS"
+   width="20"
+   height="13.283"
+   viewBox="0 0 20 13.283"
+   version="1.1"
+   sodipodi:docname="arrive_left.svg"
+   inkscape:version="1.0 (4035a4fb49, 2020-05-01)">
+  <metadata
+     id="metadata11">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title>direction</dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs9" />
+  <sodipodi:namedview
+     fit-margin-bottom="0"
+     fit-margin-right="0"
+     fit-margin-left="0"
+     fit-margin-top="0"
+     inkscape:document-rotation="0"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1920"
+     inkscape:window-height="1027"
+     id="namedview7"
+     showgrid="false"
+     inkscape:zoom="21.5"
+     inkscape:cx="11.145089"
+     inkscape:cy="9.0262758"
+     inkscape:window-x="-8"
+     inkscape:window-y="22"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="WORKING_ICONS" />
+  <title
+     id="title2">direction</title>
+  <path
+     fill="#000000"
+     d="M 2.2222222,7.7274438 A 2.2222222,2.2222222 0 1 1 4.4444444,5.5052216 2.2222222,2.2222222 0 0 1 2.2222222,7.7274438 Z M 13.336589,6.6570888 a 4.5086889,4.5086889 0 0 1 4.431967,4.5258222 h 0.0092 v 1.530833 A 0.56924444,0.56924444 0 0 0 18.347011,13.283 h 1.083711 A 0.56924444,0.56924444 0 0 0 20,12.713744 V 11.060778 H 19.98461 A 6.7289667,6.7289667 0 0 0 13.336389,4.4348661 l -0.01222,-0.00203 1.33e-4,0.022311 h -1.102078 v -0.0101 A 0.3973,0.3973 0 0 1 11.802911,3.842355 L 13.295967,0.56253282 A 0.42954444,0.42954444 0 0 0 12.603144,0.10762172 L 5.5555556,5.5561546 12.603144,11.0047 a 0.42955556,0.42955556 0 0 0 0.692823,-0.454911 L 11.802911,7.2699668 a 0.3973,0.3973 0 0 1 0.419311,-0.6027 v 0.0101 h 1.111111"
+     id="path4"
+     style="stroke-width:1.11111" />
+</svg>
diff --git a/src/displayapp/icons/navigation/unique/arrive_right.svg b/src/displayapp/icons/navigation/unique/arrive_right.svg
new file mode 100644
index 00000000..f73959b0
--- /dev/null
+++ b/src/displayapp/icons/navigation/unique/arrive_right.svg
@@ -0,0 +1,64 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   id="WORKING_ICONS"
+   data-name="WORKING ICONS"
+   width="20"
+   height="13.28301"
+   viewBox="0 0 20 13.28301"
+   version="1.1"
+   sodipodi:docname="arrive_right.svg"
+   inkscape:version="1.0 (4035a4fb49, 2020-05-01)">
+  <metadata
+     id="metadata11">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title>direction</dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs9" />
+  <sodipodi:namedview
+     fit-margin-bottom="0"
+     fit-margin-right="0"
+     fit-margin-left="0"
+     fit-margin-top="0"
+     inkscape:document-rotation="0"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1920"
+     inkscape:window-height="1027"
+     id="namedview7"
+     showgrid="false"
+     inkscape:zoom="21.5"
+     inkscape:cx="-2.2735074"
+     inkscape:cy="11.791738"
+     inkscape:window-x="-8"
+     inkscape:window-y="22"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="WORKING_ICONS" />
+  <title
+     id="title2">direction</title>
+  <path
+     fill="#000000"
+     d="M 15.555556,5.5052318 A 2.2222222,2.2222222 0 1 1 17.777778,7.7274539 2.2222222,2.2222222 0 0 1 15.555556,5.5052318 Z M 6.6666667,6.6773769 h 1.1111111 v -0.0101 a 0.3973,0.3973 0 0 1 0.4193111,0.602689 L 6.7040333,10.549788 a 0.42955556,0.42955556 0 0 0 0.6928223,0.454911 L 14.444444,5.5561658 7.3968556,0.10762086 A 0.42954444,0.42954444 0 0 0 6.7040333,0.56253196 L 8.1970889,3.8423653 A 0.3973,0.3973 0 0 1 7.7777778,4.4450542 v 0.0101 H 6.6757556 l 1.333e-4,-0.022311 -0.012222,0.00203 A 6.7289667,6.7289667 0 0 0 0.0153889,11.060788 H 0 v 1.652966 a 0.56924444,0.56924444 0 0 0 0.5692556,0.569256 h 1.0837111 a 0.56924444,0.56924444 0 0 0 0.5692555,-0.569256 v -1.530833 h 0.00922 A 4.5086889,4.5086889 0 0 1 6.6634111,6.6570989"
+     id="path4"
+     style="stroke-width:1.11111" />
+</svg>
diff --git a/src/displayapp/icons/navigation/unique/close.svg b/src/displayapp/icons/navigation/unique/close.svg
new file mode 100644
index 00000000..4e288723
--- /dev/null
+++ b/src/displayapp/icons/navigation/unique/close.svg
@@ -0,0 +1,58 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   inkscape:version="1.0 (4035a4fb49, 2020-05-01)"
+   sodipodi:docname="close.svg"
+   version="1.1"
+   viewBox="0 0 20 20"
+   height="20"
+   width="20"
+   data-name="WORKING ICONS"
+   id="WORKING_ICONS">
+  <metadata
+     id="metadata11">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs9" />
+  <sodipodi:namedview
+     inkscape:current-layer="WORKING_ICONS"
+     inkscape:window-maximized="1"
+     inkscape:window-y="22"
+     inkscape:window-x="-8"
+     inkscape:cy="14.778983"
+     inkscape:cx="4.2598846"
+     inkscape:zoom="15.202796"
+     showgrid="false"
+     id="namedview7"
+     inkscape:window-height="1027"
+     inkscape:window-width="1920"
+     inkscape:pageshadow="2"
+     inkscape:pageopacity="0"
+     guidetolerance="10"
+     gridtolerance="10"
+     objecttolerance="10"
+     borderopacity="1"
+     bordercolor="#666666"
+     pagecolor="#ffffff" />
+  <title
+     id="title2">direction</title>
+  <path
+     style="stroke-width:1.33314"
+     id="path4"
+     d="M 19.805919,2.0792199 12.353764,9.531375 a 0.6627435,0.6627435 0 0 0 0,0.937197 l 7.452155,7.452155 a 0.6627435,0.6627435 0 0 1 0,0.937197 l -0.947862,0.947862 a 0.6627435,0.6627435 0 0 1 -0.937197,0 l -7.452155,-7.452155 a 0.6627435,0.6627435 0 0 0 -0.9371971,0 l -7.4522881,7.452288 a 0.6627435,0.6627435 0 0 1 -0.9371968,0 L 0.194161,18.858057 a 0.6627435,0.6627435 0 0 1 0,-0.937197 l 7.4521549,-7.452155 a 0.6627435,0.6627435 0 0 0 0,-0.937197 L 0.194081,2.0792199 a 0.6627435,0.6627435 0 0 1 0,-0.9371968 l 0.947862,-0.947862 a 0.6627435,0.6627435 0 0 1 0.9371968,0 L 9.5313749,7.646236 a 0.6627435,0.6627435 0 0 0 0.9371971,0 l 7.452155,-7.4521549 a 0.6627435,0.6627435 0 0 1 0.937197,0 l 0.947862,0.947862 a 0.6627435,0.6627435 0 0 1 1.33e-4,0.9372768 z"
+     fill="#000000" />
+</svg>
diff --git a/src/displayapp/icons/navigation/unique/continue.svg b/src/displayapp/icons/navigation/unique/continue.svg
new file mode 100644
index 00000000..ce2c8178
--- /dev/null
+++ b/src/displayapp/icons/navigation/unique/continue.svg
@@ -0,0 +1,64 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   id="WORKING_ICONS"
+   data-name="WORKING ICONS"
+   width="12.501349"
+   height="20"
+   viewBox="0 0 12.501349 20"
+   version="1.1"
+   sodipodi:docname="continue.svg"
+   inkscape:version="1.0 (4035a4fb49, 2020-05-01)">
+  <metadata
+     id="metadata11">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title>direction</dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs9" />
+  <sodipodi:namedview
+     fit-margin-bottom="0"
+     fit-margin-right="0"
+     fit-margin-left="0"
+     fit-margin-top="0"
+     inkscape:document-rotation="0"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1920"
+     inkscape:window-height="1027"
+     id="namedview7"
+     showgrid="false"
+     inkscape:zoom="21.5"
+     inkscape:cx="11.114825"
+     inkscape:cy="16.43079"
+     inkscape:window-x="-8"
+     inkscape:window-y="22"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="WORKING_ICONS" />
+  <title
+     id="title2">direction</title>
+  <path
+     fill="#000000"
+     d="M 11.86851,8.707962 8.1786984,7.028275 A 0.4469375,0.4469375 0 0 0 7.5006854,7.5 V 19.37065 A 0.629325,0.629325 0 0 1 6.8713354,20 H 5.630085 A 0.629325,0.629325 0 0 1 5.000735,19.37065 V 7.5 A 0.44695,0.44695 0 0 0 4.3227102,7.028275 L 0.63284773,8.707962 A 0.4832375,0.4832375 0 0 1 0.12107273,7.9285375 L 6.2506854,0 12.380298,7.9285375 A 0.48325,0.48325 0 0 1 11.86851,8.707962 Z"
+     id="path4"
+     style="stroke-width:1.25" />
+</svg>
diff --git a/src/displayapp/icons/navigation/unique/continue_left.svg b/src/displayapp/icons/navigation/unique/continue_left.svg
new file mode 100644
index 00000000..fb4c5617
--- /dev/null
+++ b/src/displayapp/icons/navigation/unique/continue_left.svg
@@ -0,0 +1,64 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   id="WORKING_ICONS"
+   data-name="WORKING ICONS"
+   width="17.469049"
+   height="19.999994"
+   viewBox="0 0 17.469049 19.999994"
+   version="1.1"
+   sodipodi:docname="continue_left.svg"
+   inkscape:version="1.0 (4035a4fb49, 2020-05-01)">
+  <metadata
+     id="metadata11">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title>direction</dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs9" />
+  <sodipodi:namedview
+     fit-margin-bottom="0"
+     fit-margin-right="0"
+     fit-margin-left="0"
+     fit-margin-top="0"
+     inkscape:document-rotation="0"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1920"
+     inkscape:window-height="1027"
+     id="namedview7"
+     showgrid="false"
+     inkscape:zoom="30.405592"
+     inkscape:cx="7.8194018"
+     inkscape:cy="12.051799"
+     inkscape:window-x="-8"
+     inkscape:window-y="22"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="WORKING_ICONS" />
+  <title
+     id="title2">direction</title>
+  <path
+     fill="#000000"
+     d="m 9.9778638,4.9925136 0.01373,0.00228 a 7.5663193,7.5663193 0 0 1 7.4774372,7.5826124 v 4.925532 h -0.0039 l 0.0025,1.87675 a 0.61944488,0.61944488 0 0 1 -0.61952,0.620306 H 15.591523 A 0.61954476,0.61954476 0 0 1 14.971978,19.380455 V 12.577411 A 5.0663035,5.0663035 0 0 0 9.9918848,7.4918552 H 7.4963518 A 0.44647376,0.44647376 0 0 0 7.0251821,8.1691564 L 8.702892,11.8546 A 0.48266859,0.48266859 0 0 1 7.9243848,12.365773 L 0,6.2661873 7.9244098,0.12093057 A 0.48266859,0.48266859 0 0 1 8.702917,0.63210307 L 7.0251821,4.3175716 a 0.4464363,0.4464363 0 0 0 0.4711697,0.6772268 h 2.481512"
+     id="path4"
+     style="stroke-width:1.24853" />
+</svg>
diff --git a/src/displayapp/icons/navigation/unique/continue_right.svg b/src/displayapp/icons/navigation/unique/continue_right.svg
new file mode 100644
index 00000000..838b8f15
--- /dev/null
+++ b/src/displayapp/icons/navigation/unique/continue_right.svg
@@ -0,0 +1,64 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   id="WORKING_ICONS"
+   data-name="WORKING ICONS"
+   width="17.469061"
+   height="20"
+   viewBox="0 0 17.469061 20"
+   version="1.1"
+   sodipodi:docname="continue_right.svg"
+   inkscape:version="1.0 (4035a4fb49, 2020-05-01)">
+  <metadata
+     id="metadata11">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title>direction</dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs9" />
+  <sodipodi:namedview
+     fit-margin-bottom="0"
+     fit-margin-right="0"
+     fit-margin-left="0"
+     fit-margin-top="0"
+     inkscape:document-rotation="0"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1920"
+     inkscape:window-height="1027"
+     id="namedview7"
+     showgrid="false"
+     inkscape:zoom="21.5"
+     inkscape:cx="9.6207834"
+     inkscape:cy="12.793465"
+     inkscape:window-x="-8"
+     inkscape:window-y="22"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="WORKING_ICONS" />
+  <title
+     id="title2">direction</title>
+  <path
+     fill="#000000"
+     d="M 7.4771737,7.4918486 A 5.0663062,5.0663062 0 0 0 2.4970785,12.577407 v 6.803048 A 0.61954509,0.61954509 0 0 1 1.8775334,20 H 0.62092638 a 0.6194452,0.6194452 0 0 1 -0.6194577,-0.620307 l 0.00243,-1.876751 H 1.8684501e-5 V 12.577407 A 7.5663233,7.5663233 0 0 1 7.4774607,4.9947905 l 0.01373,-0.00228 v 0.00228 H 9.9727044 A 0.44643653,0.44643653 0 0 0 10.443874,4.3175634 L 8.7661634,0.63210535 a 0.48266885,0.48266885 0 0 1 0.778495,-0.5111853 L 17.46906,6.2661801 9.5446464,12.365794 A 0.48266885,0.48266885 0 0 1 8.7661384,11.854621 L 10.443849,8.169163 A 0.44647399,0.44647399 0 0 0 9.9726794,7.4918611 H 7.4771697 Z"
+     id="path4"
+     style="stroke-width:1.24853" />
+</svg>
diff --git a/src/displayapp/icons/navigation/unique/continue_slight_left.svg b/src/displayapp/icons/navigation/unique/continue_slight_left.svg
new file mode 100644
index 00000000..e8f6e451
--- /dev/null
+++ b/src/displayapp/icons/navigation/unique/continue_slight_left.svg
@@ -0,0 +1,64 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   id="WORKING_ICONS"
+   data-name="WORKING ICONS"
+   width="13.332919"
+   height="20"
+   viewBox="0 0 13.332919 20"
+   version="1.1"
+   sodipodi:docname="continue_slight_left.svg"
+   inkscape:version="1.0 (4035a4fb49, 2020-05-01)">
+  <metadata
+     id="metadata11">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title>direction</dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs9" />
+  <sodipodi:namedview
+     fit-margin-bottom="0"
+     fit-margin-right="0"
+     fit-margin-left="0"
+     fit-margin-top="0"
+     inkscape:document-rotation="0"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1920"
+     inkscape:window-height="1027"
+     id="namedview7"
+     showgrid="false"
+     inkscape:zoom="15.202796"
+     inkscape:cx="13.603205"
+     inkscape:cy="22.774268"
+     inkscape:window-x="-8"
+     inkscape:window-y="22"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="WORKING_ICONS" />
+  <title
+     id="title2">direction</title>
+  <path
+     fill="#000000"
+     d="m 13.314533,14.724 v 4.614427 A 0.66161333,0.66161333 0 0 1 12.652987,20 h -1.34204 a 0.66152,0.66152 0 0 1 -0.661534,-0.66244 l 0.0063,-4.810227 A 6.9575867,6.9575867 0 0 0 8.4356803,9.002 L 5.171387,6.2478 A 0.47677333,0.47677333 0 0 0 4.3173867,6.46468 l -1.22428,4.147467 A 0.51550667,0.51550667 0 0 1 2.1072533,10.48 L 0,0 10.673013,0.5995333 A 0.51544,0.51544 0 0 1 10.9436,1.55656 L 7.0117073,3.3567733 a 0.4768,0.4768 0 0 0 -0.09359,0.8761334 L 10.194733,6.99804 a 9.6687733,9.6687733 0 0 1 3.1198,7.72596 z"
+     id="path4"
+     style="stroke-width:1.33333" />
+</svg>
diff --git a/src/displayapp/icons/navigation/unique/continue_slight_right.svg b/src/displayapp/icons/navigation/unique/continue_slight_right.svg
new file mode 100644
index 00000000..a466bd2e
--- /dev/null
+++ b/src/displayapp/icons/navigation/unique/continue_slight_right.svg
@@ -0,0 +1,64 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   id="WORKING_ICONS"
+   data-name="WORKING ICONS"
+   width="13.332906"
+   height="20"
+   viewBox="0 0 13.332906 20"
+   version="1.1"
+   sodipodi:docname="continue_slight_right.svg"
+   inkscape:version="1.0 (4035a4fb49, 2020-05-01)">
+  <metadata
+     id="metadata11">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title>direction</dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs9" />
+  <sodipodi:namedview
+     fit-margin-bottom="0"
+     fit-margin-right="0"
+     fit-margin-left="0"
+     fit-margin-top="0"
+     inkscape:document-rotation="0"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1920"
+     inkscape:window-height="1027"
+     id="namedview7"
+     showgrid="false"
+     inkscape:zoom="21.5"
+     inkscape:cx="6.5990997"
+     inkscape:cy="14.169382"
+     inkscape:window-x="-8"
+     inkscape:window-y="22"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="WORKING_ICONS" />
+  <title
+     id="title2">direction</title>
+  <path
+     fill="#000000"
+     d="M 3.1381725,6.9980533 6.4147854,4.2329067 A 0.4768,0.4768 0 0 0 6.3211994,3.3567733 L 2.3893059,1.55656 A 0.51544,0.51544 0 0 1 2.6598925,0.5995333 L 13.332906,0 11.225653,10.48 a 0.51550667,0.51550667 0 0 1 -0.98584,0.13216 L 9.0155727,6.46468 a 0.47677333,0.47677333 0 0 0 -0.854,-0.21688 L 4.8972792,9.001947 a 6.9575867,6.9575867 0 0 0 -2.22,5.525333 l 0.00627,4.810227 A 0.66152,0.66152 0 0 1 2.0219592,20 H 0.67991915 A 0.66161333,0.66161333 0 0 1 0.01838585,19.338373 V 14.724 A 9.66876,9.66876 0 0 1 3.1381725,6.9980533 Z"
+     id="path4"
+     style="stroke-width:1.33333" />
+</svg>
diff --git a/src/displayapp/icons/navigation/unique/continue_uturn.svg b/src/displayapp/icons/navigation/unique/continue_uturn.svg
new file mode 100644
index 00000000..035becc3
--- /dev/null
+++ b/src/displayapp/icons/navigation/unique/continue_uturn.svg
@@ -0,0 +1,64 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   id="WORKING_ICONS"
+   data-name="WORKING ICONS"
+   width="19.367325"
+   height="20.000843"
+   viewBox="0 0 19.367325 20.000843"
+   version="1.1"
+   sodipodi:docname="continue_uturn.svg"
+   inkscape:version="1.0 (4035a4fb49, 2020-05-01)">
+  <metadata
+     id="metadata11">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title>direction</dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs9" />
+  <sodipodi:namedview
+     fit-margin-bottom="0"
+     fit-margin-right="0"
+     fit-margin-left="0"
+     fit-margin-top="0"
+     inkscape:document-rotation="0"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1920"
+     inkscape:window-height="1027"
+     id="namedview7"
+     showgrid="false"
+     inkscape:zoom="15.202796"
+     inkscape:cx="6.0627795"
+     inkscape:cy="11.023005"
+     inkscape:window-x="-8"
+     inkscape:window-y="22"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="WORKING_ICONS" />
+  <title
+     id="title2">direction</title>
+  <path
+     fill="#000000"
+     d="M 19.367326,7.0976168 V 19.351191 a 0.64962581,0.64962581 0 0 1 -0.649639,0.649652 h -1.28129 A 0.64962581,0.64962581 0 0 1 16.786745,19.351191 V 7.0976168 a 4.516129,4.516129 0 1 0 -9.0322583,0 v 5.1612912 h -0.011793 a 0.46138065,0.46138065 0 0 0 0.6998966,0.486941 L 12.251416,11.011978 A 0.49883871,0.49883871 0 0 1 12.7797,11.816546 L 6.4523706,20.000843 0.12495119,11.816546 a 0.49883871,0.49883871 0 0 1 0.5282839,-0.804568 L 4.4620609,12.745849 A 0.46141935,0.46141935 0 0 0 5.162048,12.258908 H 5.173777 V 7.0976168 a 7.0967744,7.0967744 0 1 1 14.193549,0 z"
+     id="path4"
+     style="stroke-width:1.29032" />
+</svg>
diff --git a/src/displayapp/icons/navigation/unique/depart.svg b/src/displayapp/icons/navigation/unique/depart.svg
new file mode 100644
index 00000000..1f8d24a8
--- /dev/null
+++ b/src/displayapp/icons/navigation/unique/depart.svg
@@ -0,0 +1,64 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   id="WORKING_ICONS"
+   data-name="WORKING ICONS"
+   width="11.112293"
+   height="20"
+   viewBox="0 0 11.112293 20"
+   version="1.1"
+   sodipodi:docname="depart.svg"
+   inkscape:version="1.0 (4035a4fb49, 2020-05-01)">
+  <metadata
+     id="metadata11">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title>direction</dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs9" />
+  <sodipodi:namedview
+     fit-margin-bottom="0"
+     fit-margin-right="0"
+     fit-margin-left="0"
+     fit-margin-top="0"
+     inkscape:document-rotation="0"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1920"
+     inkscape:window-height="1027"
+     id="namedview7"
+     showgrid="false"
+     inkscape:zoom="21.5"
+     inkscape:cx="1.4836494"
+     inkscape:cy="9.8236635"
+     inkscape:window-x="-8"
+     inkscape:window-y="22"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="WORKING_ICONS" />
+  <title
+     id="title2">direction</title>
+  <path
+     fill="#000000"
+     d="M 5.5459876,20 A 2.2222222,2.2222222 0 1 1 7.7682098,17.777778 2.2222222,2.2222222 0 0 1 5.5459876,20 Z M 11.004699,7.0475889 5.5561538,0 0.10762067,7.0475889 a 0.42954445,0.42954445 0 0 0 0.454911,0.6928222 L 3.842354,6.2473555 a 0.39491111,0.39491111 0 0 1 0.6011111,0.410089 h -0.00859 v 6.1111775 a 0.55546667,0.55546667 0 0 0 0.5554889,0.555489 h 1.1112448 a 0.55546667,0.55546667 0 0 0 0.555489,-0.555489 V 6.6666667 h 0.01017 a 0.3973,0.3973 0 0 1 0.602701,-0.4193112 l 3.2798232,1.4930556 a 0.42955555,0.42955555 0 0 0 0.454907,-0.6928222 z"
+     id="path4"
+     style="stroke-width:1.11111" />
+</svg>
diff --git a/src/displayapp/icons/navigation/unique/depart_left.svg b/src/displayapp/icons/navigation/unique/depart_left.svg
new file mode 100644
index 00000000..a78a2541
--- /dev/null
+++ b/src/displayapp/icons/navigation/unique/depart_left.svg
@@ -0,0 +1,64 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   id="WORKING_ICONS"
+   data-name="WORKING ICONS"
+   width="16.514585"
+   height="20"
+   viewBox="0 0 16.514585 20"
+   version="1.1"
+   sodipodi:docname="depart_left.svg"
+   inkscape:version="1.0 (4035a4fb49, 2020-05-01)">
+  <metadata
+     id="metadata11">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title>direction</dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs9" />
+  <sodipodi:namedview
+     fit-margin-bottom="0"
+     fit-margin-right="0"
+     fit-margin-left="0"
+     fit-margin-top="0"
+     inkscape:document-rotation="0"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1920"
+     inkscape:window-height="1027"
+     id="namedview7"
+     showgrid="false"
+     inkscape:zoom="15.202796"
+     inkscape:cx="9.741833"
+     inkscape:cy="20.366049"
+     inkscape:window-x="-8"
+     inkscape:window-y="22"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="WORKING_ICONS" />
+  <title
+     id="title2">direction</title>
+  <path
+     fill="#000000"
+     d="M 14.15536,20 A 2.3592266,2.3592266 0 1 1 16.514586,17.640774 2.3592266,2.3592266 0 0 1 14.15536,20 Z M 8.260749,7.0675217 a 4.7866585,4.7866585 0 0 1 4.705207,4.8048483 h 0.0098 v 1.625212 a 0.60433949,0.60433949 0 0 0 0.604352,0.604352 h 1.150524 a 0.60433949,0.60433949 0 0 0 0.604351,-0.604352 v -1.754875 h -0.01634 A 7.1438208,7.1438208 0 0 0 8.260537,4.7082951 l -0.01298,-0.00216 8.3e-5,0.023687 H 7.07768 V 4.7191004 A 0.42179433,0.42179433 0 0 1 6.6325174,4.0792545 L 8.217623,0.59721299 A 0.45602671,0.45602671 0 0 0 7.482087,0.11425569 L 0,5.8987137 7.482087,11.683172 A 0.45603851,0.45603851 0 0 0 8.217623,11.200215 L 6.6325174,7.7181729 A 0.42179433,0.42179433 0 0 1 7.07768,7.078327 V 7.08905 h 1.179613"
+     id="path4"
+     style="stroke-width:1.17961" />
+</svg>
diff --git a/src/displayapp/icons/navigation/unique/depart_right.svg b/src/displayapp/icons/navigation/unique/depart_right.svg
new file mode 100644
index 00000000..22c0bdba
--- /dev/null
+++ b/src/displayapp/icons/navigation/unique/depart_right.svg
@@ -0,0 +1,64 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   id="WORKING_ICONS"
+   data-name="WORKING ICONS"
+   width="16.514585"
+   height="20"
+   viewBox="0 0 16.514585 20"
+   version="1.1"
+   sodipodi:docname="depart_right.svg"
+   inkscape:version="1.0 (4035a4fb49, 2020-05-01)">
+  <metadata
+     id="metadata11">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title>direction</dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs9" />
+  <sodipodi:namedview
+     fit-margin-bottom="0"
+     fit-margin-right="0"
+     fit-margin-left="0"
+     fit-margin-top="0"
+     inkscape:document-rotation="0"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1920"
+     inkscape:window-height="1027"
+     id="namedview7"
+     showgrid="false"
+     inkscape:zoom="21.5"
+     inkscape:cx="10.328742"
+     inkscape:cy="11.499285"
+     inkscape:window-x="-8"
+     inkscape:window-y="22"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="WORKING_ICONS" />
+  <title
+     id="title2">direction</title>
+  <path
+     fill="#000000"
+     d="M 0,17.640774 A 2.3592266,2.3592266 0 1 1 2.3592266,20 2.3592266,2.3592266 0 0 1 0,17.640774 Z M 8.257293,7.0890497 H 9.436906 V 7.0783267 A 0.42179433,0.42179433 0 0 1 9.882069,7.7181726 L 8.296964,11.200203 A 0.45603851,0.45603851 0 0 0 9.0325,11.68316 L 16.514586,5.8987137 9.0325,0.11425569 A 0.45602671,0.45602671 0 0 0 8.296964,0.59721299 L 9.882069,4.0792427 A 0.42179433,0.42179433 0 0 1 9.436906,4.7191004 v 0.010723 H 8.266942 l 1.42e-4,-0.023687 -0.01298,0.00216 A 7.1438208,7.1438208 0 0 0 1.195951,11.742707 H 1.179613 v 1.754875 a 0.60433949,0.60433949 0 0 0 0.6043513,0.604352 h 1.150524 A 0.60433949,0.60433949 0 0 0 3.5388396,13.497582 V 11.87237 h 0.00979 A 4.7866585,4.7866585 0 0 1 8.253837,7.0675217"
+     id="path4"
+     style="stroke-width:1.17961" />
+</svg>
diff --git a/src/displayapp/icons/navigation/unique/end_of_road_left.svg b/src/displayapp/icons/navigation/unique/end_of_road_left.svg
new file mode 100644
index 00000000..9fa1147f
--- /dev/null
+++ b/src/displayapp/icons/navigation/unique/end_of_road_left.svg
@@ -0,0 +1,64 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   id="WORKING_ICONS"
+   data-name="WORKING ICONS"
+   width="18.717573"
+   height="20"
+   viewBox="0 0 18.717573 20"
+   version="1.1"
+   sodipodi:docname="end_of_road_left.svg"
+   inkscape:version="1.0 (4035a4fb49, 2020-05-01)">
+  <metadata
+     id="metadata11">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title>direction</dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs9" />
+  <sodipodi:namedview
+     fit-margin-bottom="0"
+     fit-margin-right="0"
+     fit-margin-left="0"
+     fit-margin-top="0"
+     inkscape:document-rotation="0"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1920"
+     inkscape:window-height="1027"
+     id="namedview7"
+     showgrid="false"
+     inkscape:zoom="30.405592"
+     inkscape:cx="10.986743"
+     inkscape:cy="10.847693"
+     inkscape:window-x="-8"
+     inkscape:window-y="22"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="WORKING_ICONS" />
+  <title
+     id="title2">direction</title>
+  <path
+     fill="#000000"
+     d="m 18.097728,5.2673575 a 0.37053845,0.37053845 0 0 1 0.370138,0.3701389 V 6.894865 A 0.37053845,0.37053845 0 0 1 18.097727,7.265004 H 6.4819883 V 5.2673575 H 18.097715 m 0,-0.2497058 H 6.2322825 V 7.5147098 H 18.097728 A 0.61983225,0.61983225 0 0 0 18.717572,6.894865 V 5.6374964 A 0.61983225,0.61983225 0 0 0 18.097728,5.0176517 v 0 z M 9.9778695,4.9947911 H 7.4963557 A 0.44643653,0.44643653 0 0 1 7.0251858,4.317564 L 8.702897,0.63210609 A 0.48266885,0.48266885 0 0 0 7.9244014,0.12092079 L 0,6.2661807 7.9244139,12.365794 A 0.48266885,0.48266885 0 0 0 8.702897,11.854596 L 7.0251858,8.1691516 A 0.44647399,0.44647399 0 0 1 7.4963557,7.4918492 h 2.4955348 a 5.0663062,5.0663062 0 0 1 4.9800955,5.0855578 v 6.803048 A 0.61954509,0.61954509 0 0 0 15.591531,20 h 1.256606 a 0.6194452,0.6194452 0 0 0 0.619459,-0.620307 l -0.0024,-1.876751 h 0.0039 V 12.577407 A 7.5663233,7.5663233 0 0 0 9.9916025,4.9947911 l -0.01373,-0.00228"
+     id="path4"
+     style="stroke-width:1.24853" />
+</svg>
diff --git a/src/displayapp/icons/navigation/unique/end_of_road_right.svg b/src/displayapp/icons/navigation/unique/end_of_road_right.svg
new file mode 100644
index 00000000..3995f78d
--- /dev/null
+++ b/src/displayapp/icons/navigation/unique/end_of_road_right.svg
@@ -0,0 +1,64 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   id="WORKING_ICONS"
+   data-name="WORKING ICONS"
+   width="19.966091"
+   height="19.999998"
+   viewBox="0 0 19.966091 19.999998"
+   version="1.1"
+   sodipodi:docname="end_of_road_right.svg"
+   inkscape:version="1.0 (4035a4fb49, 2020-05-01)">
+  <metadata
+     id="metadata11">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title>direction</dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs9" />
+  <sodipodi:namedview
+     fit-margin-bottom="0"
+     fit-margin-right="0"
+     fit-margin-left="0"
+     fit-margin-top="0"
+     inkscape:document-rotation="0"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1920"
+     inkscape:window-height="1027"
+     id="namedview7"
+     showgrid="false"
+     inkscape:zoom="30.405592"
+     inkscape:cx="10.426158"
+     inkscape:cy="11.57979"
+     inkscape:window-x="-8"
+     inkscape:window-y="22"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="WORKING_ICONS" />
+  <title
+     id="title2">direction</title>
+  <path
+     fill="#000000"
+     d="M 13.484107,5.2673656 V 7.265011 H 0.6257499 A 0.37645628,0.37645628 0 0 1 0.2497057,6.8889793 V 5.6433974 A 0.37645628,0.37645628 0 0 1 0.6257499,5.2673656 H 13.484107 M 13.733812,5.0176599 H 0.6257499 A 0.62574995,0.62574995 0 0 0 0,5.6433974 V 6.8889793 A 0.62574995,0.62574995 0 0 0 0.6257499,7.5147167 H 13.733812 Z M 9.988227,7.4918562 h 2.481513 a 0.44647376,0.44647376 0 0 1 0.471169,0.6773012 l -1.67771,3.6854446 a 0.48266859,0.48266859 0 0 0 0.778508,0.511173 l 7.924385,-6.0995867 -7.92441,-6.14525673 a 0.48266859,0.48266859 0 0 0 -0.778508,0.5111725 l 1.67771,3.68545603 A 0.4464363,0.4464363 0 0 1 12.469715,4.9947869 H 9.988227 v -0.00227 l -0.01373,0.00228 A 7.5663193,7.5663193 0 0 0 2.4970608,12.577411 v 4.925531 h 0.00388 l -0.0025,1.87675 a 0.61944488,0.61944488 0 0 0 0.6195198,0.620306 H 4.3745688 A 0.61954476,0.61954476 0 0 0 4.9941136,19.380457 V 12.577413 A 5.0663035,5.0663035 0 0 1 9.974206,7.4918562 Z"
+     id="path4"
+     style="stroke-width:1.24853" />
+</svg>
diff --git a/src/displayapp/icons/navigation/unique/ferry.svg b/src/displayapp/icons/navigation/unique/ferry.svg
new file mode 100644
index 00000000..da4f6ff6
--- /dev/null
+++ b/src/displayapp/icons/navigation/unique/ferry.svg
@@ -0,0 +1,64 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   id="WORKING_ICONS"
+   data-name="WORKING ICONS"
+   width="17.309931"
+   height="20"
+   viewBox="0 0 17.309931 20"
+   version="1.1"
+   sodipodi:docname="ferry.svg"
+   inkscape:version="1.0 (4035a4fb49, 2020-05-01)">
+  <metadata
+     id="metadata11">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title>ferry</dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs9" />
+  <sodipodi:namedview
+     fit-margin-bottom="0"
+     fit-margin-right="0"
+     fit-margin-left="0"
+     fit-margin-top="0"
+     inkscape:document-rotation="0"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1920"
+     inkscape:window-height="1027"
+     id="namedview7"
+     showgrid="false"
+     inkscape:zoom="30.405592"
+     inkscape:cx="8.755161"
+     inkscape:cy="10.712074"
+     inkscape:window-x="-8"
+     inkscape:window-y="22"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="WORKING_ICONS" />
+  <title
+     id="title2">ferry</title>
+  <path
+     fill="#ffffff"
+     d="m 5.7655385,14.649646 c 0.8981192,0.01199 1.7658794,0.326226 2.4633365,0.892126 l 0.3461986,0.306254 h 0.066576 L 9.054426,15.475195 c 1.307167,-1.080538 3.167717,-1.177872 4.580474,-0.239674 L 16.644165,9.3235132 14.646866,7.9919803 V 3.2650375 C 14.584816,2.199811 13.716257,1.3602792 12.649565,1.3343143 h -0.665766 c 0.04567,-0.68973409 -0.476555,-1.28586135 -1.16629,-1.331533 -0.05498,-0.003599395 -0.110256,-0.003599395 -0.165243,0 H 6.6576658 C 5.9679316,-0.04288981 5.3718043,0.47933705 5.3261327,1.1690711 c -0.0036,0.054992 -0.0036,0.1102512 0,0.1652432 H 4.660366 C 3.5936749,1.3602788 2.7251157,2.199811 2.6630662,3.2650375 V 7.9919803 L 0.6657666,9.3235132 3.6617162,15.355358 C 4.2799471,14.921412 5.0106925,14.676276 5.7655385,14.649646 Z M 3.9945994,3.2650375 c 0.013981,-0.3453996 0.3053206,-0.61397 0.6505871,-0.5999889 0.00506,2.664e-4 0.010117,5.327e-4 0.015179,7.989e-4 h 7.9891985 c 0.344868,-0.022769 0.642997,0.2382113 0.665767,0.5830784 0.0019,0.027563 0.0019,0.055126 0,0.082688 V 7.3262133 L 8.654965,4.6631473 3.9945994,7.2596371 c 0,0 0,-3.9945996 0,-3.9945996 z M 17.30993,17.312712 v 1.331534 c -0.34966,0.02583 -0.674953,0.188545 -0.905441,0.452721 -0.361777,0.383881 -0.822623,0.660307 -1.331534,0.79892 -0.818494,0.241673 -1.703695,0.0566 -2.356815,-0.492667 l -0.519295,-0.466037 c -0.405185,-0.402923 -1.059501,-0.402923 -1.464687,0 -0.186414,0.159784 -0.359514,0.332883 -0.559244,0.492668 -0.975748,0.779745 -2.3719938,0.740331 -3.3022029,-0.09322 l -0.519298,-0.466028 c -0.3813509,-0.333149 -0.950182,-0.333149 -1.331533,0 -0.2529915,0.19973 -0.479352,0.426091 -0.7323433,0.625821 -0.9377988,0.694394 -2.2279213,0.661505 -3.129103,-0.07988 L 0.7456586,19.057019 C 0.5529857,18.836386 0.289209,18.690316 0,18.644246 v -1.331534 c 0.3442014,-0.04261 0.6930629,0.0225 0.9986498,0.186414 0.3704324,0.22929 0.7222236,0.487476 1.0519113,0.772289 0.2730974,0.297599 0.68534,0.42476 1.0785418,0.332884 0.1497975,-0.04434 0.2898747,-0.116642 0.4127753,-0.213045 0.2130454,-0.159784 0.3861446,-0.346198 0.5991899,-0.519298 0.9461874,-0.784007 2.3160688,-0.784007 3.2622562,0 0.2130453,0.1731 0.4127753,0.372831 0.6258206,0.545929 0.3813512,0.33315 0.9501811,0.33315 1.3315331,0 0.213046,-0.173098 0.412776,-0.372829 0.62582,-0.545929 0.948451,-0.79133 2.327122,-0.79133 3.275574,0 0.199729,0.1731 0.386144,0.359514 0.585874,0.519298 0.381351,0.333149 0.950182,0.333149 1.331532,0 l 0.625821,-0.545928 c 0.425424,-0.345134 0.956839,-0.533279 1.504631,-0.532614 z"
+     id="path4"
+     style="fill:#000000;stroke-width:1.11112" />
+</svg>
diff --git a/src/displayapp/icons/navigation/unique/flag.svg b/src/displayapp/icons/navigation/unique/flag.svg
new file mode 100644
index 00000000..0e02846b
--- /dev/null
+++ b/src/displayapp/icons/navigation/unique/flag.svg
@@ -0,0 +1,64 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   id="WORKING_ICONS"
+   data-name="WORKING ICONS"
+   width="18.666668"
+   height="20"
+   viewBox="0 0 18.666668 20"
+   version="1.1"
+   sodipodi:docname="flag.svg"
+   inkscape:version="1.0 (4035a4fb49, 2020-05-01)">
+  <metadata
+     id="metadata11">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title>direction</dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs9" />
+  <sodipodi:namedview
+     fit-margin-bottom="0"
+     fit-margin-right="0"
+     fit-margin-left="0"
+     fit-margin-top="0"
+     inkscape:document-rotation="0"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1920"
+     inkscape:window-height="1027"
+     id="namedview7"
+     showgrid="false"
+     inkscape:zoom="21.5"
+     inkscape:cx="10.587406"
+     inkscape:cy="12.657235"
+     inkscape:window-x="-8"
+     inkscape:window-y="22"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="WORKING_ICONS" />
+  <title
+     id="title2">direction</title>
+  <path
+     fill="#000000"
+     d="m 0.6666667,20 v 0 A 0.66666667,0.66666667 0 0 1 0,19.333333 V 0.6666667 A 0.66666667,0.66666667 0 0 1 0.6666667,0 V 0 A 0.66666667,0.66666667 0 0 1 1.3333333,0.6666667 V 19.333333 A 0.66666667,0.66666667 0 0 1 0.6666667,20 Z M 13.777774,5.3333333 18.666668,0 H 4 v 10.666667 h 14.666668 z"
+     id="path4"
+     style="stroke-width:1.33333" />
+</svg>
diff --git a/src/displayapp/icons/navigation/unique/fork.svg b/src/displayapp/icons/navigation/unique/fork.svg
new file mode 100644
index 00000000..25a9a869
--- /dev/null
+++ b/src/displayapp/icons/navigation/unique/fork.svg
@@ -0,0 +1,64 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   id="WORKING_ICONS"
+   data-name="WORKING ICONS"
+   width="20"
+   height="16.666666"
+   viewBox="0 0 20 16.666666"
+   version="1.1"
+   sodipodi:docname="fork.svg"
+   inkscape:version="1.0 (4035a4fb49, 2020-05-01)">
+  <metadata
+     id="metadata11">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title>direction</dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs9" />
+  <sodipodi:namedview
+     fit-margin-bottom="0"
+     fit-margin-right="0"
+     fit-margin-left="0"
+     fit-margin-top="0"
+     inkscape:document-rotation="0"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1920"
+     inkscape:window-height="1027"
+     id="namedview7"
+     showgrid="false"
+     inkscape:zoom="21.5"
+     inkscape:cx="11.485662"
+     inkscape:cy="12.47547"
+     inkscape:window-x="-8"
+     inkscape:window-y="22"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="WORKING_ICONS" />
+  <title
+     id="title2">direction</title>
+  <path
+     fill="#000000"
+     d="m 20,0 -1.756044,8.7333325 a 0.42958889,0.42958889 0 0 1 -0.821534,0.110134 l -1.0202,-3.4562332 A 0.39731111,0.39731111 0 0 0 15.690556,5.2065 l -2.720245,2.295122 a 5.7979889,5.7979889 0 0 0 -1.85,4.604444 l 0.0052,4.008522 A 0.55126667,0.55126667 0 0 1 10.5742,16.666666 H 9.4258 A 0.55126667,0.55126667 0 0 1 8.8745222,16.114632 l 0.00522,-4.008521 a 5.7979889,5.7979889 0 0 0 -1.85,-4.604444 L 4.3094889,5.2065 A 0.39731111,0.39731111 0 0 0 3.5978222,5.3872333 L 2.5775889,8.8434555 A 0.42958889,0.42958889 0 0 1 1.7560444,8.7333325 L 0,0 8.8941778,0.4996111 A 0.42953333,0.42953333 0 0 1 9.119667,1.2971333 L 5.8431,2.7973111 A 0.39733333,0.39733333 0 0 0 5.7651111,3.5274222 L 8.4956222,5.8317111 A 7.3784889,7.3784889 0 0 1 10,7.6572 7.3784889,7.3784889 0 0 1 11.504378,5.8317111 L 14.234889,3.5274222 A 0.39733333,0.39733333 0 0 0 14.1569,2.7973111 L 10.880333,1.2971333 a 0.42953333,0.42953333 0 0 1 0.225489,-0.7975222 z"
+     id="path4"
+     style="stroke-width:1.11111" />
+</svg>
diff --git a/src/displayapp/icons/navigation/unique/fork_left.svg b/src/displayapp/icons/navigation/unique/fork_left.svg
new file mode 100644
index 00000000..b9a2eed9
--- /dev/null
+++ b/src/displayapp/icons/navigation/unique/fork_left.svg
@@ -0,0 +1,64 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   id="WORKING_ICONS"
+   data-name="WORKING ICONS"
+   width="19.999958"
+   height="17.917435"
+   viewBox="0 0 19.999958 17.917435"
+   version="1.1"
+   sodipodi:docname="fork_left.svg"
+   inkscape:version="1.0 (4035a4fb49, 2020-05-01)">
+  <metadata
+     id="metadata11">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title>direction</dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs9" />
+  <sodipodi:namedview
+     fit-margin-bottom="0"
+     fit-margin-right="0"
+     fit-margin-left="0"
+     fit-margin-top="0"
+     inkscape:document-rotation="0"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1920"
+     inkscape:window-height="1027"
+     id="namedview7"
+     showgrid="false"
+     inkscape:zoom="21.5"
+     inkscape:cx="11.458394"
+     inkscape:cy="11.152772"
+     inkscape:window-x="-8"
+     inkscape:window-y="22"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="WORKING_ICONS" />
+  <title
+     id="title2">direction</title>
+  <path
+     fill="#000000"
+     d="m 18.709535,5.1403677 a 0.34075743,0.34075743 0 0 1 0.257618,0.117523 l 0.72592,0.8373137 a 0.34066795,0.34066795 0 0 1 -0.03768,0.4834919 l -2.304646,1.9444924 a 6.0499684,6.0499684 0 0 0 -1.938464,4.8035893 l 0.0053,4.035277 a 0.33121645,0.33121645 0 0 1 -0.331239,0.331675 h -1.125757 a 0.33171978,0.33171978 0 0 1 -0.33134,-0.331328 l -6.49e-4,-3.888248 a 7.8199049,7.8199049 0 0 1 2.538415,-6.2929775 l 2.323169,-1.9604878 a 0.34086928,0.34086928 0 0 1 0.219453,-0.080332 m 0,-0.2237042 a 0.56226933,0.56226933 0 0 0 -0.363698,0.133104 l -2.323213,1.9604652 a 8.1110335,8.1110335 0 0 0 -2.617216,6.4812243 v 3.871 a 0.5550325,0.5550325 0 0 0 0.555033,0.554988 h 1.125757 a 0.55494302,0.55494302 0 0 0 0.554955,-0.555692 l -0.0053,-4.035255 A 5.8366664,5.8366664 0 0 1 17.49829,8.6912807 L 19.799546,6.7496734 A 0.56434978,0.56434978 0 0 0 19.862016,5.948667 L 19.136139,5.1113533 A 0.56311941,0.56311941 0 0 0 18.709456,4.9166635 v 0 z M 8.9388845,4.4747023 H 6.715768 A 0.39994956,0.39994956 0 0 1 6.2936606,3.8679941 L 7.7966732,0.56629897 A 0.43240904,0.43240904 0 0 0 7.0992306,0.10834297 L 0,5.6137035 7.099253,11.07817 A 0.43240904,0.43240904 0 0 0 7.7966732,10.620203 L 6.2936606,7.3185197 A 0.39998312,0.39998312 0 0 1 6.715768,6.7117444 h 2.2356663 a 4.538757,4.538757 0 0 1 4.4615227,4.5560036 v 6.094654 a 0.5550325,0.5550325 0 0 0 0.555044,0.555032 h 1.125758 a 0.55494302,0.55494302 0 0 0 0.554954,-0.555715 l -0.0022,-1.681327 h 0.0035 V 11.267748 A 6.7784499,6.7784499 0 0 0 8.951177,4.4747023 l -0.012304,-0.00205"
+     id="path4"
+     style="stroke-width:1.11852" />
+</svg>
diff --git a/src/displayapp/icons/navigation/unique/fork_right.svg b/src/displayapp/icons/navigation/unique/fork_right.svg
new file mode 100644
index 00000000..8ebb31c6
--- /dev/null
+++ b/src/displayapp/icons/navigation/unique/fork_right.svg
@@ -0,0 +1,64 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   id="WORKING_ICONS"
+   data-name="WORKING ICONS"
+   width="20"
+   height="17.918297"
+   viewBox="0 0 20 17.918297"
+   version="1.1"
+   sodipodi:docname="fork_right.svg"
+   inkscape:version="1.0 (4035a4fb49, 2020-05-01)">
+  <metadata
+     id="metadata11">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title>direction</dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs9" />
+  <sodipodi:namedview
+     fit-margin-bottom="0"
+     fit-margin-right="0"
+     fit-margin-left="0"
+     fit-margin-top="0"
+     inkscape:document-rotation="0"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1920"
+     inkscape:window-height="1027"
+     id="namedview7"
+     showgrid="false"
+     inkscape:zoom="21.5"
+     inkscape:cx="10.164237"
+     inkscape:cy="13.714317"
+     inkscape:window-x="-8"
+     inkscape:window-y="22"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="WORKING_ICONS" />
+  <title
+     id="title2">direction</title>
+  <path
+     fill="#000000"
+     d="m 1.2905554,5.1406116 a 0.34068443,0.34068443 0 0 1 0.2193973,0.080336 L 3.8298776,7.1786554 A 7.8324646,7.8324646 0 0 1 6.3711238,13.492096 V 17.36335 A 0.33166872,0.33166872 0 0 1 6.0398242,17.694583 H 4.9139783 A 0.33124366,0.33124366 0 0 1 4.5826787,17.362847 l 0.00424,-4.014376 A 6.0626773,6.0626773 0 0 0 2.646,8.5206993 L 0.34467713,6.5790098 A 0.34072918,0.34072918 0 0 1 0.30695873,6.0954945 L 1.032914,5.2581403 A 0.34078511,0.34078511 0 0 1 1.2905778,5.1406116 m 0,-0.223715 A 0.56314666,0.56314666 0 0 0 0.86387493,5.1115958 l -0.7259553,0.8373541 a 0.56441065,0.56441065 0 0 0 0.062506,0.8010453 L 2.5017486,8.6916853 a 5.8369489,5.8369489 0 0 1 1.8624276,4.6354317 l -0.00521,4.035439 a 0.55500343,0.55500343 0 0 0 0.5550146,0.555742 h 1.1258459 a 0.55499225,0.55499225 0 0 0 0.554981,-0.554981 V 13.492096 A 8.111426,8.111426 0 0 0 3.9775295,7.0105561 L 1.6542489,5.0499735 A 0.56224062,0.56224062 0 0 0 1.290533,4.916863 v 0 z m 9.7701052,1.7951677 h 2.223224 a 0.40000248,0.40000248 0 0 1 0.422128,0.6068046 l -1.503086,3.3018441 a 0.43242997,0.43242997 0 0 0 0.697477,0.457967 L 20,5.6139702 12.900403,0.1083433 a 0.43242997,0.43242997 0 0 0 -0.697476,0.4579671 l 1.503085,3.3018549 a 0.39996892,0.39996892 0 0 1 -0.422128,0.6067375 h -2.223201 v -0.00204 l -0.01231,0.00205 A 6.778778,6.778778 0 0 0 4.3492321,11.26829 v 4.412857 h 0.00348 l -0.00224,1.681409 a 0.55496988,0.55496988 0 0 0 0.5550481,0.555742 h 1.1258012 a 0.55505936,0.55505936 0 0 0 0.5550594,-0.55506 V 11.26829 A 4.5389766,4.5389766 0 0 1 11.048119,6.7120643 Z"
+     id="path4"
+     style="stroke-width:1.11858" />
+</svg>
diff --git a/src/displayapp/icons/navigation/unique/fork_slight_left.svg b/src/displayapp/icons/navigation/unique/fork_slight_left.svg
new file mode 100644
index 00000000..812b1faa
--- /dev/null
+++ b/src/displayapp/icons/navigation/unique/fork_slight_left.svg
@@ -0,0 +1,64 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   id="WORKING_ICONS"
+   data-name="WORKING ICONS"
+   width="18.546383"
+   height="20"
+   viewBox="0 0 18.546383 20"
+   version="1.1"
+   sodipodi:docname="fork_slight_left.svg"
+   inkscape:version="1.0 (4035a4fb49, 2020-05-01)">
+  <metadata
+     id="metadata11">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title>direction</dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs9" />
+  <sodipodi:namedview
+     fit-margin-bottom="0"
+     fit-margin-right="0"
+     fit-margin-left="0"
+     fit-margin-top="0"
+     inkscape:document-rotation="0"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1920"
+     inkscape:window-height="1027"
+     id="namedview7"
+     showgrid="false"
+     inkscape:zoom="21.5"
+     inkscape:cx="10.32292"
+     inkscape:cy="12.698104"
+     inkscape:window-x="-8"
+     inkscape:window-y="22"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="WORKING_ICONS" />
+  <title
+     id="title2">direction</title>
+  <path
+     fill="#000000"
+     d="m 17.008093,4.7690933 a 0.40628,0.40628 0 0 1 0.307134,0.1400934 l 0.865333,0.99812 A 0.40609333,0.40609333 0 0 1 18.13564,6.4836533 L 15.388387,8.801587 a 7.2118667,7.2118667 0 0 0 -2.310747,5.72612 l 0.0063,4.810253 a 0.39484,0.39484 0 0 1 -0.394854,0.395387 H 11.34708 a 0.39542667,0.39542667 0 0 1 -0.394973,-0.39496 l -7.74e-4,-4.635 a 9.32172,9.32172 0 0 1 3.02592,-7.501547 l 2.769334,-2.337 a 0.40614667,0.40614667 0 0 1 0.26156,-0.09576 m 0,-0.2666667 A 0.67017333,0.67017333 0 0 0 16.5746,4.66108 l -2.769333,2.337 a 9.66876,9.66876 0 0 0 -3.1198,7.72592 v 4.614427 A 0.66162667,0.66162667 0 0 0 11.34708,20 h 1.34196 a 0.66154667,0.66154667 0 0 0 0.661533,-0.662413 l -0.0063,-4.810227 a 6.9576,6.9576 0 0 1 2.22,-5.5254 l 2.743226,-2.3144933 a 0.67277333,0.67277333 0 0 0 0.07447,-0.95484 l -0.865333,-0.99812 a 0.67126667,0.67126667 0 0 0 -0.508627,-0.23208 v 0 z M 10.194813,6.9980267 6.91812,4.2329067 A 0.4768,0.4768 0 0 1 7.011707,3.3567733 L 10.9436,1.55656 A 0.51544,0.51544 0 0 0 10.673013,0.5995333 L 0,0 2.1072533,10.48 a 0.51550667,0.51550667 0 0 0 0.98584,0.13216 l 1.22424,-4.14748 a 0.47677333,0.47677333 0 0 1 0.854,-0.21688 L 8.435627,9.001947 a 6.9575867,6.9575867 0 0 1 2.22,5.525333 l -0.0063,4.810227 A 0.66152,0.66152 0 0 0 11.310947,20 h 1.34204 A 0.66161333,0.66161333 0 0 0 13.31452,19.338373 V 14.724 A 9.6687733,9.6687733 0 0 0 10.194733,6.9980533 Z"
+     id="path4"
+     style="stroke-width:1.33333" />
+</svg>
diff --git a/src/displayapp/icons/navigation/unique/fork_slight_right.svg b/src/displayapp/icons/navigation/unique/fork_slight_right.svg
new file mode 100644
index 00000000..4eedeab1
--- /dev/null
+++ b/src/displayapp/icons/navigation/unique/fork_slight_right.svg
@@ -0,0 +1,64 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   id="WORKING_ICONS"
+   data-name="WORKING ICONS"
+   width="18.513536"
+   height="20"
+   viewBox="0 0 18.513536 20"
+   version="1.1"
+   sodipodi:docname="fork_slight_right.svg"
+   inkscape:version="1.0 (4035a4fb49, 2020-05-01)">
+  <metadata
+     id="metadata11">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title>direction</dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs9" />
+  <sodipodi:namedview
+     fit-margin-bottom="0"
+     fit-margin-right="0"
+     fit-margin-left="0"
+     fit-margin-top="0"
+     inkscape:document-rotation="0"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1920"
+     inkscape:window-height="1027"
+     id="namedview7"
+     showgrid="false"
+     inkscape:zoom="21.5"
+     inkscape:cx="11.587053"
+     inkscape:cy="13.501857"
+     inkscape:window-x="-8"
+     inkscape:window-y="22"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="WORKING_ICONS" />
+  <title
+     id="title2">direction</title>
+  <path
+     fill="#000000"
+     d="m 1.5384024,4.7690933 a 0.40609333,0.40609333 0 0 1 0.26156,0.09576 L 4.5652958,7.198427 A 9.33624,9.33624 0 0 1 7.5943888,14.724 v 4.614507 a 0.39534667,0.39534667 0 0 1 -0.394893,0.394826 H 5.8574424 a 0.39482667,0.39482667 0 0 1 -0.3948533,-0.3954 L 5.4676391,14.5528 A 7.2266667,7.2266667 0 0 0 3.1540791,8.798133 L 0.41086909,6.4836533 a 0.40605333,0.40605333 0 0 1 -0.04496,-0.5763466 L 1.2312424,4.9091867 A 0.40621333,0.40621333 0 0 1 1.5383758,4.7690933 m 0,-0.2666666 a 0.67126667,0.67126667 0 0 0 -0.5086267,0.23208 l -0.86533332,0.99812 a 0.67273333,0.67273333 0 0 0 0.074507,0.95484 L 2.9821228,9.001947 a 6.9576,6.9576 0 0 1 2.22,5.5254 l -0.00627,4.810226 A 0.66152,0.66152 0 0 0 5.8574424,20 h 1.3420534 a 0.66154667,0.66154667 0 0 0 0.661533,-0.661533 V 14.724 A 9.66876,9.66876 0 0 0 4.7412424,6.9980533 l -2.7693333,-2.337 A 0.67018667,0.67018667 0 0 0 1.5383624,4.5023867 v 0 z M 5.1990024,14.724 v 4.614427 A 0.66161333,0.66161333 0 0 0 5.8605358,20 h 1.34204 a 0.66152,0.66152 0 0 0 0.661533,-0.66244 l -0.0063,-4.810227 A 6.9575867,6.9575867 0 0 1 10.077809,9.002 l 3.26424,-2.7541467 a 0.47677333,0.47677333 0 0 1 0.854,0.21688 L 15.420363,10.6122 A 0.51550667,0.51550667 0 0 0 16.406283,10.48 L 18.513536,0 7.8405228,0.5995333 A 0.51544,0.51544 0 0 0 7.5699358,1.55656 l 3.9318802,1.8002133 a 0.4768,0.4768 0 0 1 0.09359,0.8761334 L 8.3187888,6.9980533 A 9.66876,9.66876 0 0 0 5.1990024,14.724 Z"
+     id="path4"
+     style="stroke-width:1.33333" />
+</svg>
diff --git a/src/displayapp/icons/navigation/unique/fork_straight.svg b/src/displayapp/icons/navigation/unique/fork_straight.svg
new file mode 100644
index 00000000..0799e2e5
--- /dev/null
+++ b/src/displayapp/icons/navigation/unique/fork_straight.svg
@@ -0,0 +1,64 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   id="WORKING_ICONS"
+   data-name="WORKING ICONS"
+   width="20"
+   height="17.981112"
+   viewBox="0 0 20 17.981112"
+   version="1.1"
+   sodipodi:docname="fork_straight.svg"
+   inkscape:version="1.0 (4035a4fb49, 2020-05-01)">
+  <metadata
+     id="metadata11">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title>direction</dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs9" />
+  <sodipodi:namedview
+     fit-margin-bottom="0"
+     fit-margin-right="0"
+     fit-margin-left="0"
+     fit-margin-top="0"
+     inkscape:document-rotation="0"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1920"
+     inkscape:window-height="1027"
+     id="namedview7"
+     showgrid="false"
+     inkscape:zoom="15.202796"
+     inkscape:cx="13.834961"
+     inkscape:cy="19.722654"
+     inkscape:window-x="-8"
+     inkscape:window-y="22"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="WORKING_ICONS" />
+  <title
+     id="title2">direction</title>
+  <path
+     fill="#000000"
+     d="m 18.705082,5.1602187 a 0.34193747,0.34193747 0 0 1 0.258535,0.1179261 l 0.72841,0.8401857 a 0.34183646,0.34183646 0 0 1 -0.03781,0.4851503 L 17.341664,8.55461 a 6.0707201,6.0707201 0 0 0 -1.945113,4.820065 l 0.0053,4.049119 a 0.33236376,0.33236376 0 0 1 -0.332375,0.332824 h -1.12963 a 0.3328576,0.3328576 0 0 1 -0.332501,-0.332465 l -6.51e-4,-3.901562 a 7.8467275,7.8467275 0 0 1 2.547123,-6.3145635 l 2.331137,-1.9672123 a 0.34188135,0.34188135 0 0 1 0.220173,-0.080608 m 0,-0.2244715 a 0.56414183,0.56414183 0 0 0 -0.364946,0.1335608 l -2.331137,1.9672123 a 8.1388548,8.1388548 0 0 0 -2.626148,6.5033892 v 3.884277 a 0.55693629,0.55693629 0 0 0 0.556936,0.556937 h 1.129619 a 0.55686895,0.55686895 0 0 0 0.556858,-0.557599 l -0.0053,-4.049096 a 5.8566865,5.8566865 0 0 1 1.868725,-4.651106 l 2.30913,-1.9482554 a 0.56628553,0.56628553 0 0 0 0.06273,-0.8037764 L 19.133183,5.1310935 A 0.56505094,0.56505094 0 0 0 18.705037,4.935736 v 0 z M 1.2949138,5.1368288 a 0.34183646,0.34183646 0 0 1 0.2201729,0.080608 l 2.3277697,1.9643275 a 7.85895,7.85895 0 0 1 2.5497945,6.3347887 v 3.884345 A 0.33279026,0.33279026 0 0 1 6.0602422,17.73325 H 4.9305556 a 0.33236376,0.33236376 0 0 1 -0.332375,-0.332835 l 0.00424,-4.027973 A 6.0831783,6.0831783 0 0 0 2.6549419,8.528347 L 0.34583706,6.5800909 A 0.34183646,0.34183646 0 0 1 0.30802486,6.0949406 L 1.0364349,5.2547549 A 0.34193747,0.34193747 0 0 1 1.29497,5.1368288 m 0,-0.2244716 A 0.56505094,0.56505094 0 0 0 0.86682426,5.1077148 l -0.7284101,0.8401857 a 0.56628553,0.56628553 0 0 0 0.062684,0.8037539 L 2.5101914,8.69991 a 5.8566865,5.8566865 0 0 1 1.8687255,4.651106 l -0.00528,4.049096 a 0.55686895,0.55686895 0 0 0 0.5569138,0.55761 H 6.0602422 A 0.55686895,0.55686895 0 0 0 6.6171,17.400864 V 13.516553 A 8.1388548,8.1388548 0 0 0 3.9909627,7.0130964 L 1.659826,5.0458841 A 0.56414183,0.56414183 0 0 0 1.2948802,4.9123236 v 0 z M 15.514017,7.1189123 10.010278,0 4.506585,7.1189235 A 0.43389223,0.43389223 0 0 0 4.9661007,7.8187584 L 8.279132,6.3105904 A 0.40131019,0.40131019 0 0 1 8.8879212,6.7341457 V 17.392637 a 0.56506216,0.56506216 0 0 0 0.5650732,0.565085 H 10.567495 A 0.56506216,0.56506216 0 0 0 11.13258,17.392637 V 6.7341457 a 0.40129896,0.40129896 0 0 1 0.608789,-0.4235553 l 3.31302,1.508168 a 0.43390345,0.43390345 0 0 0 0.459572,-0.6998349 z"
+     id="path4"
+     style="stroke-width:1.12236" />
+</svg>
diff --git a/src/displayapp/icons/navigation/unique/merge_left.svg b/src/displayapp/icons/navigation/unique/merge_left.svg
new file mode 100644
index 00000000..6cfb14c4
--- /dev/null
+++ b/src/displayapp/icons/navigation/unique/merge_left.svg
@@ -0,0 +1,64 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   id="WORKING_ICONS"
+   data-name="WORKING ICONS"
+   width="20"
+   height="19.966091"
+   viewBox="0 0 20 19.966091"
+   version="1.1"
+   sodipodi:docname="merge_left.svg"
+   inkscape:version="1.0 (4035a4fb49, 2020-05-01)">
+  <metadata
+     id="metadata11">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title>direction</dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs9" />
+  <sodipodi:namedview
+     fit-margin-bottom="0"
+     fit-margin-right="0"
+     fit-margin-left="0"
+     fit-margin-top="0"
+     inkscape:document-rotation="0"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1920"
+     inkscape:window-height="1027"
+     id="namedview7"
+     showgrid="false"
+     inkscape:zoom="21.5"
+     inkscape:cx="8.9790409"
+     inkscape:cy="15.078787"
+     inkscape:window-x="-8"
+     inkscape:window-y="22"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="WORKING_ICONS" />
+  <title
+     id="title2">direction</title>
+  <path
+     fill="#000000"
+     d="M 7.26501,6.4819849 V 19.344974 A 0.37181176,0.37181176 0 0 1 6.8936103,19.716386 H 5.6387643 A 0.37181176,0.37181176 0 0 1 5.2673646,19.344974 V 6.4819849 H 7.26501 M 7.5147157,6.2322792 H 5.0176589 V 19.344974 a 0.62110542,0.62110542 0 0 0 0.6211054,0.621118 h 1.254846 A 0.62110542,0.62110542 0 0 0 7.5147157,19.344974 Z M 7.4918552,9.977864 V 7.4963518 A 0.44647376,0.44647376 0 0 1 8.1691564,7.0251821 L 11.854601,8.702892 A 0.48266859,0.48266859 0 0 0 12.365774,7.9243848 L 6.2661873,0 0.12093057,7.9244098 A 0.48266859,0.48266859 0 0 0 0.63210307,8.702917 L 4.3175716,7.0251821 A 0.4464363,0.4464363 0 0 1 4.9947984,7.4963518 V 9.977864 h -0.00228 l 0.00228,0.01373 a 7.5663193,7.5663193 0 0 0 7.5826136,7.477437 h 4.925532 v -0.0039 l 1.87675,0.0025 A 0.61944488,0.61944488 0 0 0 20,16.848111 V 15.591523 A 0.61954476,0.61954476 0 0 0 19.380456,14.971978 H 12.577412 A 5.0663035,5.0663035 0 0 1 7.4918552,9.991885 Z"
+     id="path4"
+     style="stroke-width:1.24853" />
+</svg>
diff --git a/src/displayapp/icons/navigation/unique/merge_right.svg b/src/displayapp/icons/navigation/unique/merge_right.svg
new file mode 100644
index 00000000..81ff110e
--- /dev/null
+++ b/src/displayapp/icons/navigation/unique/merge_right.svg
@@ -0,0 +1,64 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   id="WORKING_ICONS"
+   data-name="WORKING ICONS"
+   width="20"
+   height="19.966103"
+   viewBox="0 0 20 19.966103"
+   version="1.1"
+   sodipodi:docname="merge_right.svg"
+   inkscape:version="1.0 (4035a4fb49, 2020-05-01)">
+  <metadata
+     id="metadata11">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title>direction</dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs9" />
+  <sodipodi:namedview
+     fit-margin-bottom="0"
+     fit-margin-right="0"
+     fit-margin-left="0"
+     fit-margin-top="0"
+     inkscape:document-rotation="0"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1920"
+     inkscape:window-height="1027"
+     id="namedview7"
+     showgrid="false"
+     inkscape:zoom="21.5"
+     inkscape:cx="6.5541583"
+     inkscape:cy="11.782041"
+     inkscape:window-x="-8"
+     inkscape:window-y="22"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="WORKING_ICONS" />
+  <title
+     id="title2">direction</title>
+  <path
+     fill="#000000"
+     d="M 14.732643,6.4819883 V 19.340851 A 0.37595707,0.37595707 0 0 1 14.35711,19.716409 H 13.110541 A 0.37595707,0.37595707 0 0 1 12.734996,19.340851 V 6.4819883 h 1.997647 M 14.982349,6.2322825 H 12.485291 V 19.340851 a 0.62525086,0.62525086 0 0 0 0.62525,0.625251 h 1.246544 a 0.62525086,0.62525086 0 0 0 0.625264,-0.625251 z M 15.005209,9.97787 V 7.4963557 A 0.44643653,0.44643653 0 0 1 15.682436,7.0251858 L 19.367894,8.702897 A 0.48266885,0.48266885 0 0 0 19.87908,7.9244014 L 13.73382,0 7.6342058,7.9244139 A 0.48266885,0.48266885 0 0 0 8.145379,8.702922 l 3.685458,-1.6777112 a 0.44647399,0.44647399 0 0 1 0.677302,0.4711699 V 9.991916 a 5.0663062,5.0663062 0 0 1 -5.0855464,4.98007 H 0.6195451 A 0.61954509,0.61954509 0 0 0 0,15.591531 v 1.256607 a 0.6194452,0.6194452 0 0 0 0.6203067,0.619458 l 1.8767514,-0.0024 v 0.0039 H 7.4225926 A 7.5663233,7.5663233 0 0 0 15.005209,9.991655 l 0.0023,-0.01373"
+     id="path4"
+     style="stroke-width:1.24853" />
+</svg>
diff --git a/src/displayapp/icons/navigation/unique/merge_slight_left.svg b/src/displayapp/icons/navigation/unique/merge_slight_left.svg
new file mode 100644
index 00000000..1336109d
--- /dev/null
+++ b/src/displayapp/icons/navigation/unique/merge_slight_left.svg
@@ -0,0 +1,64 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   id="WORKING_ICONS"
+   data-name="WORKING ICONS"
+   width="15.275221"
+   height="20"
+   viewBox="0 0 15.275221 20"
+   version="1.1"
+   sodipodi:docname="merge_slight_left.svg"
+   inkscape:version="1.0 (4035a4fb49, 2020-05-01)">
+  <metadata
+     id="metadata11">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title>direction</dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs9" />
+  <sodipodi:namedview
+     fit-margin-bottom="0"
+     fit-margin-right="0"
+     fit-margin-left="0"
+     fit-margin-top="0"
+     inkscape:document-rotation="0"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1920"
+     inkscape:window-height="1027"
+     id="namedview7"
+     showgrid="false"
+     inkscape:zoom="21.5"
+     inkscape:cx="7.7746014"
+     inkscape:cy="12.003334"
+     inkscape:window-x="-8"
+     inkscape:window-y="22"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="WORKING_ICONS" />
+  <title
+     id="title2">direction</title>
+  <path
+     fill="#000000"
+     d="M 6.8383023,9.651259 V 19.4063 a 0.35891315,0.35891315 0 0 1 -0.35849,0.358501 H 5.3152383 A 0.35891315,0.35891315 0 0 1 4.9567485,19.406288 V 9.651259 H 6.8383373 M 7.0735363,9.416061 H 4.7215498 V 19.4063 A 0.59368844,0.59368844 0 0 0 5.3152383,20 h 1.164586 a 0.59371196,0.59371196 0 0 0 0.5937,-0.5937 v -9.990239 0 z M 0.5953658,8.1924043 4.0667215,6.6121633 a 0.42049991,0.42049991 0 0 1 0.6378823,0.4437963 h 0.00118 V 9.367257 a 7.762908,7.762908 0 0 0 3.9775856,6.726928 l 5.0695656,3.157883 a 0.59125414,0.59125414 0 0 0 0.814528,-0.189205 l 0.61829,-0.992174 A 0.59134822,0.59134822 0 0 0 14.996544,17.25602 L 9.9340694,14.102241 A 5.4759068,5.4759068 0 0 1 7.0549553,9.448835 l 0.0019,-2.3944042 A 0.42010008,0.42010008 0 0 1 7.6945664,6.6122574 L 11.16591,8.1924983 A 0.45462724,0.45462724 0 0 0 11.64735,7.4591372 L 5.880597,0 0.1138906,7.4591372 a 0.45462724,0.45462724 0 0 0 0.4814752,0.7332671 z"
+     id="path4"
+     style="stroke-width:1.17599" />
+</svg>
diff --git a/src/displayapp/icons/navigation/unique/merge_slight_right.svg b/src/displayapp/icons/navigation/unique/merge_slight_right.svg
new file mode 100644
index 00000000..a905aa06
--- /dev/null
+++ b/src/displayapp/icons/navigation/unique/merge_slight_right.svg
@@ -0,0 +1,64 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   id="WORKING_ICONS"
+   data-name="WORKING ICONS"
+   width="15.27524"
+   height="20"
+   viewBox="0 0 15.27524 20"
+   version="1.1"
+   sodipodi:docname="merge_slight_right.svg"
+   inkscape:version="1.0 (4035a4fb49, 2020-05-01)">
+  <metadata
+     id="metadata11">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title>direction</dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs9" />
+  <sodipodi:namedview
+     fit-margin-bottom="0"
+     fit-margin-right="0"
+     fit-margin-left="0"
+     fit-margin-top="0"
+     inkscape:document-rotation="0"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1920"
+     inkscape:window-height="1027"
+     id="namedview7"
+     showgrid="false"
+     inkscape:zoom="21.5"
+     inkscape:cx="6.453186"
+     inkscape:cy="14.591693"
+     inkscape:window-x="-8"
+     inkscape:window-y="22"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="WORKING_ICONS" />
+  <title
+     id="title2">direction</title>
+  <path
+     fill="#000000"
+     d="M 10.318493,9.651259 V 19.4063 A 0.35891315,0.35891315 0 0 1 9.9600031,19.764813 H 8.7954171 A 0.35891315,0.35891315 0 0 1 8.4369271,19.4063 V 9.651259 H 10.318517 M 10.553715,9.416061 H 8.2017291 V 19.4063 A 0.59368844,0.59368844 0 0 0 8.7954171,20 h 1.164586 a 0.59371196,0.59371196 0 0 0 0.5937009,-0.5937 v -9.990239 0 z M 15.161328,7.4591372 9.3946091,0 3.6278324,7.4591372 A 0.45462724,0.45462724 0 0 0 4.1093075,8.192416 L 7.5806631,6.6121633 a 0.42010008,0.42010008 0 0 1 0.637671,0.4421735 l 0.0019,2.3944512 A 5.4759068,5.4759068 0 0 1 5.3411605,14.102194 L 0.27867412,17.25602 a 0.59134822,0.59134822 0 0 0 -0.1892056,0.814669 l 0.6182903,0.992162 A 0.59125414,0.59125414 0 0 0 1.522287,19.252057 L 6.5917941,16.094185 A 7.762908,7.762908 0 0 0 10.56938,9.367257 V 7.0559596 h 0.0012 a 0.42049991,0.42049991 0 0 1 0.637917,-0.4437963 l 3.471344,1.580241 A 0.45462724,0.45462724 0 0 0 15.16134,7.4591372 Z"
+     id="path4"
+     style="stroke-width:1.17599" />
+</svg>
diff --git a/src/displayapp/icons/navigation/unique/new_name_sharp_left.svg b/src/displayapp/icons/navigation/unique/new_name_sharp_left.svg
new file mode 100644
index 00000000..fcd09494
--- /dev/null
+++ b/src/displayapp/icons/navigation/unique/new_name_sharp_left.svg
@@ -0,0 +1,58 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   inkscape:version="1.0 (4035a4fb49, 2020-05-01)"
+   sodipodi:docname="new_name_sharp_left.svg"
+   version="1.1"
+   viewBox="0 0 20 20"
+   height="20"
+   width="20"
+   data-name="WORKING ICONS"
+   id="WORKING_ICONS">
+  <metadata
+     id="metadata11">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs9" />
+  <sodipodi:namedview
+     inkscape:current-layer="WORKING_ICONS"
+     inkscape:window-maximized="1"
+     inkscape:window-y="22"
+     inkscape:window-x="-8"
+     inkscape:cy="13.910546"
+     inkscape:cx="10.232352"
+     inkscape:zoom="21.5"
+     showgrid="false"
+     id="namedview7"
+     inkscape:window-height="1027"
+     inkscape:window-width="1920"
+     inkscape:pageshadow="2"
+     inkscape:pageopacity="0"
+     guidetolerance="10"
+     gridtolerance="10"
+     objecttolerance="10"
+     borderopacity="1"
+     bordercolor="#666666"
+     pagecolor="#ffffff" />
+  <title
+     id="title2">direction</title>
+  <path
+     style="stroke-width:1.33234"
+     id="path4"
+     d="M 17.980077,19.999977 A 0.6632279,0.6632279 0 0 1 17.316849,19.336749 V 2.6847052 l -0.372777,-0.00846 a 3.4209018,3.4209018 0 0 0 -2.792195,1.052552 L 6.9635309,9.8747033 A 0.46522814,0.46522814 0 0 0 7.073476,10.716439 l 3.902131,1.856369 a 0.51505784,0.51505784 0 0 1 -0.284375,0.952254 L 0.018484,13.96752 2.2777144,3.5272667 A 0.51509781,0.51509781 0 0 1 3.2646088,3.4097539 l 1.1624708,4.1618724 a 0.47640652,0.47640652 0 0 0 0.8500359,0.229243 l 0.00504,0.006 7.1841365,-6.1408965 a 5.9507047,5.9507047 0 0 1 4.509667,-1.65378625 l 0.351952,0.00266 a 2.5705594,2.5705594 0 0 1 1.910689,0.7579043 2.8012149,2.8012149 0 0 1 0.74229,1.94582285 l 6.26e-4,16.6181893 a 0.6632279,0.6632279 0 0 1 -0.663232,0.663214 z"
+     fill="#000000" />
+</svg>
diff --git a/src/displayapp/icons/navigation/unique/new_name_sharp_right.svg b/src/displayapp/icons/navigation/unique/new_name_sharp_right.svg
new file mode 100644
index 00000000..46b8afa5
--- /dev/null
+++ b/src/displayapp/icons/navigation/unique/new_name_sharp_right.svg
@@ -0,0 +1,58 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   inkscape:version="1.0 (4035a4fb49, 2020-05-01)"
+   sodipodi:docname="new_name_sharp_right.svg"
+   version="1.1"
+   viewBox="0 0 20 20"
+   height="20"
+   width="20"
+   data-name="WORKING ICONS"
+   id="WORKING_ICONS">
+  <metadata
+     id="metadata11">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs9" />
+  <sodipodi:namedview
+     inkscape:current-layer="WORKING_ICONS"
+     inkscape:window-maximized="1"
+     inkscape:window-y="22"
+     inkscape:window-x="-8"
+     inkscape:cy="13.406497"
+     inkscape:cx="13.365628"
+     inkscape:zoom="21.5"
+     showgrid="false"
+     id="namedview7"
+     inkscape:window-height="1027"
+     inkscape:window-width="1920"
+     inkscape:pageshadow="2"
+     inkscape:pageopacity="0"
+     guidetolerance="10"
+     gridtolerance="10"
+     objecttolerance="10"
+     borderopacity="1"
+     bordercolor="#666666"
+     pagecolor="#ffffff" />
+  <title
+     id="title2">direction</title>
+  <path
+     style="stroke-width:1.33234"
+     id="path4"
+     d="M 0.6817139,19.999998 A 0.6632279,0.6632279 0 0 1 0.018486,19.336744 L 0.0191122,2.7185536 a 2.8012149,2.8012149 0 0 1 0.7422892,-1.94582289 2.5705594,2.5705594 0 0 1 1.910689,-0.7579043 l 0.3519522,-0.00266 A 5.9507047,5.9507047 0 0 1 7.53371,1.6659527 l 7.184136,6.1408968 0.005,-0.0059 a 0.47640652,0.47640652 0 0 0 0.850036,-0.229243 l 1.162471,-4.1618724 a 0.51509781,0.51509781 0 0 1 0.986894,0.1175128 L 19.981514,13.967554 9.308793,13.525096 A 0.51505784,0.51505784 0 0 1 9.024417,12.572842 l 3.902131,-1.856369 A 0.46522814,0.46522814 0 0 0 13.036494,9.8747375 L 5.8481205,3.7288707 A 3.4209018,3.4209018 0 0 0 3.0559256,2.6763183 l -0.3727767,0.00846 V 19.336824 A 0.6632279,0.6632279 0 0 1 2.019921,19.999998 Z"
+     fill="#000000" />
+</svg>
diff --git a/src/displayapp/icons/navigation/unique/off_ramp_left.svg b/src/displayapp/icons/navigation/unique/off_ramp_left.svg
new file mode 100644
index 00000000..f9e6eb2b
--- /dev/null
+++ b/src/displayapp/icons/navigation/unique/off_ramp_left.svg
@@ -0,0 +1,64 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   id="WORKING_ICONS"
+   data-name="WORKING ICONS"
+   width="17.469101"
+   height="20"
+   viewBox="0 0 17.469101 20"
+   version="1.1"
+   sodipodi:docname="off_ramp_left.svg"
+   inkscape:version="1.0 (4035a4fb49, 2020-05-01)">
+  <metadata
+     id="metadata11">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title>direction</dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs9" />
+  <sodipodi:namedview
+     fit-margin-bottom="0"
+     fit-margin-right="0"
+     fit-margin-left="0"
+     fit-margin-top="0"
+     inkscape:document-rotation="0"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1920"
+     inkscape:window-height="1027"
+     id="namedview7"
+     showgrid="false"
+     inkscape:zoom="15.202796"
+     inkscape:cx="14.34196"
+     inkscape:cy="19.152307"
+     inkscape:window-x="-8"
+     inkscape:window-y="22"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="WORKING_ICONS" />
+  <title
+     id="title2">direction</title>
+  <path
+     fill="#000000"
+     d="m 16.847413,0.27325624 a 0.37136219,0.37136219 0 0 1 0.370938,0.3709627 V 19.379332 a 0.37136219,0.37136219 0 0 1 -0.370938,0.370963 H 15.591644 A 0.37136219,0.37136219 0 0 1 15.220706,19.379332 V 0.64421894 a 0.37136219,0.37136219 0 0 1 0.370938,-0.3709627 h 1.255769 m 0,-0.2497056 H 15.591644 A 0.6206558,0.6206558 0 0 0 14.971,0.64421894 V 19.379332 A 0.6206558,0.6206558 0 0 0 15.591644,20 h 1.255769 a 0.6206558,0.6206558 0 0 0 0.620644,-0.620668 V 0.64421894 A 0.6206558,0.6206558 0 0 0 16.847413,0.02355064 Z M 9.9778623,4.9948025 H 7.4963499 A 0.44643619,0.44643619 0 0 1 7.0251804,4.3175759 L 8.70289,0.63212074 A 0.48266847,0.48266847 0 0 0 7.9243828,0.12093584 L 0,6.2661911 7.9244078,12.3658 A 0.48266847,0.48266847 0 0 0 8.70289,11.854603 L 7.0251804,8.1691598 A 0.44647364,0.44647364 0 0 1 7.4963499,7.4918587 h 2.4955204 a 5.0663022,5.0663022 0 0 1 4.9800917,5.0855543 v 6.803043 A 0.61954461,0.61954461 0 0 0 15.591519,20 h 1.256606 a 0.61944472,0.61944472 0 0 0 0.619457,-0.620306 l -0.0024,-1.87675 h 0.0039 V 12.577413 A 7.5663174,7.5663174 0 0 0 9.9915833,4.9948025 l -0.01373,-0.00228"
+     id="path4"
+     style="stroke-width:1.24853" />
+</svg>
diff --git a/src/displayapp/icons/navigation/unique/off_ramp_right.svg b/src/displayapp/icons/navigation/unique/off_ramp_right.svg
new file mode 100644
index 00000000..bb2fb532
--- /dev/null
+++ b/src/displayapp/icons/navigation/unique/off_ramp_right.svg
@@ -0,0 +1,64 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   id="WORKING_ICONS"
+   data-name="WORKING ICONS"
+   width="17.479399"
+   height="20"
+   viewBox="0 0 17.479399 20"
+   version="1.1"
+   sodipodi:docname="off_ramp_right.svg"
+   inkscape:version="1.0 (4035a4fb49, 2020-05-01)">
+  <metadata
+     id="metadata11">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title>direction</dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs9" />
+  <sodipodi:namedview
+     fit-margin-bottom="0"
+     fit-margin-right="0"
+     fit-margin-left="0"
+     fit-margin-top="0"
+     inkscape:document-rotation="0"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1920"
+     inkscape:window-height="1027"
+     id="namedview7"
+     showgrid="false"
+     inkscape:zoom="15.202796"
+     inkscape:cx="9.627001"
+     inkscape:cy="12.447827"
+     inkscape:window-x="-8"
+     inkscape:window-y="22"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="WORKING_ICONS" />
+  <title
+     id="title2">direction</title>
+  <path
+     fill="#000000"
+     d="m 1.8764133,0.27325207 a 0.37136229,0.37136229 0 0 1 0.3709378,0.3709628 V 19.379332 A 0.37136229,0.37136229 0 0 1 1.8764133,19.750295 H 0.6206435 A 0.37136229,0.37136229 0 0 1 0.2497057,19.379332 V 0.64421487 a 0.37136229,0.37136229 0 0 1 0.3709378,-0.3709628 h 1.2557698 m 0,-0.2497057 H 0.6206435 A 0.62065595,0.62065595 0 0 0 0,0.64421487 V 19.379332 A 0.62065595,0.62065595 0 0 0 0.6206435,20 H 1.8764133 A 0.62065595,0.62065595 0 0 0 2.4970568,19.379332 V 0.64421487 A 0.62065595,0.62065595 0 0 0 1.8764133,0.02354637 Z M 7.501533,7.4918562 h 2.481513 a 0.44647376,0.44647376 0 0 1 0.471169,0.6773012 l -1.67771,3.6854436 a 0.48266859,0.48266859 0 0 0 0.778508,0.511173 L 17.479398,6.2661883 9.554988,0.12093157 A 0.48266859,0.48266859 0 0 0 8.77648,0.63210407 L 10.45419,4.3175601 A 0.4464363,0.4464363 0 0 1 9.983021,4.9947869 H 7.501533 v -0.00227 l -0.01373,0.00228 A 7.5663193,7.5663193 0 0 0 0.0103668,12.577409 v 4.925532 h 0.00388 l -0.0025,1.87675 A 0.61944488,0.61944488 0 0 0 0.631279,19.999997 H 1.8878748 A 0.61954476,0.61954476 0 0 0 2.5074196,19.380456 V 12.577412 A 5.0663035,5.0663035 0 0 1 7.487512,7.4918562 Z"
+     id="path4"
+     style="stroke-width:1.24853" />
+</svg>
diff --git a/src/displayapp/icons/navigation/unique/off_ramp_slight_left.svg b/src/displayapp/icons/navigation/unique/off_ramp_slight_left.svg
new file mode 100644
index 00000000..867e76cd
--- /dev/null
+++ b/src/displayapp/icons/navigation/unique/off_ramp_slight_left.svg
@@ -0,0 +1,64 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   id="WORKING_ICONS"
+   data-name="WORKING ICONS"
+   width="12.5"
+   height="20"
+   viewBox="0 0 12.5 20"
+   version="1.1"
+   sodipodi:docname="off_ramp_slight_left.svg"
+   inkscape:version="1.0 (4035a4fb49, 2020-05-01)">
+  <metadata
+     id="metadata11">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title>direction</dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs9" />
+  <sodipodi:namedview
+     fit-margin-bottom="0"
+     fit-margin-right="0"
+     fit-margin-left="0"
+     fit-margin-top="0"
+     inkscape:document-rotation="0"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1920"
+     inkscape:window-height="1027"
+     id="namedview7"
+     showgrid="false"
+     inkscape:zoom="21.5"
+     inkscape:cx="9.465776"
+     inkscape:cy="13.801562"
+     inkscape:window-x="-8"
+     inkscape:window-y="22"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="WORKING_ICONS" />
+  <title
+     id="title2">direction</title>
+  <path
+     fill="#000000"
+     d="m 11.878625,0.24999999 a 0.3718,0.3718 0 0 1 0.371375,0.3714 V 19.3786 A 0.3718,0.3718 0 0 1 11.878625,19.75 h -1.25725 A 0.3718,0.3718 0 0 1 10.25,19.3786 V 0.62139999 a 0.3718,0.3718 0 0 1 0.371375,-0.3714 h 1.25725 M 11.878625,0 h -1.25725 A 0.6213875,0.6213875 0 0 0 10,0.62139999 V 19.3786 A 0.6213875,0.6213875 0 0 0 10.621375,20 h 1.25725 A 0.6213875,0.6213875 0 0 0 12.5,19.3786 V 0.62139999 A 0.6213875,0.6213875 0 0 0 11.878625,0 Z M 9.557575,7.810675 6.48575,5.21835 A 0.447,0.447 0 0 1 6.57349,4.396975 l 3.686138,-1.6877 A 0.483225,0.483225 0 0 0 10.00595,1.8120625 L 0,1.25 1.97555,11.075 a 0.4832875,0.4832875 0 0 0 0.924225,0.1239 L 4.0475,7.3106375 A 0.446975,0.446975 0 0 1 4.848125,7.1073125 L 7.90835,9.689325 a 6.5227375,6.5227375 0 0 1 2.08125,5.18 L 9.9837,19.378912 A 0.620175,0.620175 0 0 0 10.604025,20 h 1.258162 a 0.6202625,0.6202625 0 0 0 0.620188,-0.620275 V 15.05375 a 9.0644625,9.0644625 0 0 0 -2.9248,-7.243075 z"
+     id="path4"
+     style="stroke-width:1.25" />
+</svg>
diff --git a/src/displayapp/icons/navigation/unique/off_ramp_slight_right.svg b/src/displayapp/icons/navigation/unique/off_ramp_slight_right.svg
new file mode 100644
index 00000000..780d45f5
--- /dev/null
+++ b/src/displayapp/icons/navigation/unique/off_ramp_slight_right.svg
@@ -0,0 +1,64 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   id="WORKING_ICONS"
+   data-name="WORKING ICONS"
+   width="12.5"
+   height="20"
+   viewBox="0 0 12.5 20"
+   version="1.1"
+   sodipodi:docname="off_ramp_slight_right.svg"
+   inkscape:version="1.0 (4035a4fb49, 2020-05-01)">
+  <metadata
+     id="metadata11">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title>direction</dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs9" />
+  <sodipodi:namedview
+     fit-margin-bottom="0"
+     fit-margin-right="0"
+     fit-margin-left="0"
+     fit-margin-top="0"
+     inkscape:document-rotation="0"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1920"
+     inkscape:window-height="1027"
+     id="namedview7"
+     showgrid="false"
+     inkscape:zoom="21.5"
+     inkscape:cx="4.2754354"
+     inkscape:cy="12.26217"
+     inkscape:window-x="-8"
+     inkscape:window-y="22"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="WORKING_ICONS" />
+  <title
+     id="title2">direction</title>
+  <path
+     fill="#000000"
+     d="M 1.878625,0.25 A 0.3718,0.3718 0 0 1 2.25,0.6214 V 19.3786 A 0.3718,0.3718 0 0 1 1.878625,19.75 H 0.621375 A 0.3718,0.3718 0 0 1 0.25,19.3786 V 0.6214 A 0.3718,0.3718 0 0 1 0.621375,0.25 h 1.25725 m 0,-0.25 H 0.621375 A 0.6213875,0.6213875 0 0 0 0,0.6214 V 19.3786 A 0.6213875,0.6213875 0 0 0 0.621375,20 h 1.25725 A 0.6213875,0.6213875 0 0 0 2.5,19.3786 V 0.6214 A 0.6213875,0.6213875 0 0 0 1.878625,0 Z m -1.861,15.05375 v 4.326025 A 0.6202625,0.6202625 0 0 0 0.6378125,20 H 1.895975 a 0.620175,0.620175 0 0 0 0.6201875,-0.621038 l -0.00587,-4.509587 a 6.5227375,6.5227375 0 0 1 2.0812495,-5.18 L 7.651767,7.1073625 a 0.446975,0.446975 0 0 1 0.800625,0.203325 L 9.60015,11.198937 A 0.4832875,0.4832875 0 0 0 10.52445,11.075 L 12.5,1.25 2.49405,1.8120625 A 0.483225,0.483225 0 0 0 2.240375,2.709275 l 3.686137,1.6877 A 0.447,0.447 0 0 1 6.01425,5.21835 L 2.942425,7.810675 a 9.0644625,9.0644625 0 0 0 -2.9248,7.243075 z"
+     id="path4"
+     style="stroke-width:1.25" />
+</svg>
diff --git a/src/displayapp/icons/navigation/unique/roundabout.svg b/src/displayapp/icons/navigation/unique/roundabout.svg
new file mode 100644
index 00000000..08010720
--- /dev/null
+++ b/src/displayapp/icons/navigation/unique/roundabout.svg
@@ -0,0 +1,58 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   inkscape:version="1.0 (4035a4fb49, 2020-05-01)"
+   sodipodi:docname="roundabout.svg"
+   version="1.1"
+   viewBox="0 0 20 20"
+   height="20"
+   width="20"
+   data-name="WORKING ICONS"
+   id="WORKING_ICONS">
+  <metadata
+     id="metadata11">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs9" />
+  <sodipodi:namedview
+     inkscape:current-layer="WORKING_ICONS"
+     inkscape:window-maximized="1"
+     inkscape:window-y="22"
+     inkscape:window-x="-8"
+     inkscape:cy="12.987268"
+     inkscape:cx="9.3267761"
+     inkscape:zoom="15.202796"
+     showgrid="false"
+     id="namedview7"
+     inkscape:window-height="1027"
+     inkscape:window-width="1920"
+     inkscape:pageshadow="2"
+     inkscape:pageopacity="0"
+     guidetolerance="10"
+     gridtolerance="10"
+     objecttolerance="10"
+     borderopacity="1"
+     bordercolor="#666666"
+     pagecolor="#ffffff" />
+  <title
+     id="title2">direction</title>
+  <path
+     style="stroke-width:1.53314"
+     id="path4"
+     d="m 4.6342105,9.7711173 a 0.27410998,0.27410998 0 0 0 0.4158487,0.2892417 l 2.262745,-1.0300857 a 0.29635583,0.29635583 0 0 1 0.3138485,0.477987 L 3.8676408,14.370535 0.10862851,9.5081993 a 0.29635583,0.29635583 0 0 1 0.3138489,-0.477987 L 2.6853911,10.060298 A 0.27406399,0.27406399 0 0 0 3.1010712,9.7711173 v -0.0031 A 8.461212,8.461212 0 0 1 7.3216964,2.4616761 L 8.0882657,3.7881942 A 6.9275821,6.9275821 0 0 0 4.6342105,9.7680513 Z M 14.98514,3.7927783 a 6.9289926,6.9289926 0 0 1 3.447325,5.975273 h 1.533139 A 8.4664553,8.4664553 0 0 0 15.753212,2.4661682 l -0.0022,-9.2e-5 A 0.27409465,0.27409465 0 0 1 15.708398,1.9613054 L 17.73182,0.51672019 a 0.2963865,0.2963865 0 0 0 -0.257046,-0.5108267 l -6.09035,0.8243077 2.331338,5.68658211 a 0.29637116,0.29637116 0 0 0 0.57091,-0.03284 L 14.526026,4.0092269 A 0.27512185,0.27512185 0 0 1 14.98514,3.7927017 Z m 0.759548,13.2822147 a 0.27410998,0.27410998 0 0 1 0.458408,0.215452 l 0.239323,2.474671 a 0.29635583,0.29635583 0 0 0 0.570865,0.03282 l 2.331399,-5.686506 -6.09032,-0.824307 a 0.29635583,0.29635583 0 0 0 -0.257015,0.510796 l 2.023468,1.4446 a 0.27410998,0.27410998 0 0 1 -0.04264,0.504756 l 0.0055,-0.0039 a 7.0169334,7.0169334 0 0 1 -6.9021933,0 l -0.7681032,1.326519 a 8.4390428,8.4390428 0 0 0 8.4382615,0 z"
+     fill="#000000" />
+</svg>
diff --git a/src/displayapp/icons/navigation/unique/roundabout_left.svg b/src/displayapp/icons/navigation/unique/roundabout_left.svg
new file mode 100644
index 00000000..f0252d5d
--- /dev/null
+++ b/src/displayapp/icons/navigation/unique/roundabout_left.svg
@@ -0,0 +1,64 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   id="WORKING_ICONS"
+   data-name="WORKING ICONS"
+   width="20"
+   height="14.666661"
+   viewBox="0 0 20 14.666661"
+   version="1.1"
+   sodipodi:docname="roundabout_left.svg"
+   inkscape:version="1.0 (4035a4fb49, 2020-05-01)">
+  <metadata
+     id="metadata11">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title>direction</dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs9" />
+  <sodipodi:namedview
+     fit-margin-bottom="0"
+     fit-margin-right="0"
+     fit-margin-left="0"
+     fit-margin-top="0"
+     inkscape:document-rotation="0"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1920"
+     inkscape:window-height="1027"
+     id="namedview7"
+     showgrid="false"
+     inkscape:zoom="30.405592"
+     inkscape:cx="9.1908385"
+     inkscape:cy="9.2791705"
+     inkscape:window-x="-8"
+     inkscape:window-y="22"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="WORKING_ICONS" />
+  <title
+     id="title2">direction</title>
+  <path
+     fill="#000000"
+     d="M 14.666661,0.2666666 A 5.0666648,5.0666648 0 1 1 9.599996,5.333331 5.0723714,5.0723714 0 0 1 14.666661,0.2666666 m 0,9.3333299 A 4.2666651,4.2666651 0 1 0 10.399996,5.333331 4.2715051,4.2715051 0 0 0 14.666661,9.5999965 M 14.666661,0 A 5.3333313,5.3333313 0 1 0 19.999993,5.333331 5.339438,5.339438 0 0 0 14.666661,0 Z m 0,9.3333305 A 3.9999985,3.9999985 0 1 1 18.66666,5.333331 4.0043718,4.0043718 0 0 1 14.666661,9.3333305 Z M 18.43814,1.5624928 A 5.3753313,5.3753313 0 0 0 17.715473,0.956373 5.4373313,5.4373313 0 0 0 10.895809,1.5618394 5.2912247,5.2912247 0 0 0 9.374343,4.666665 H 3.9999985 A 0.23838658,0.23838658 0 0 1 3.7484519,4.305012 L 4.6442916,2.3371591 A 0.25773324,0.25773324 0 0 0 4.2285984,2.0642126 L 0,5.333331 4.2285984,8.6024495 A 0.25773324,0.25773324 0 0 0 4.6442916,8.3295035 L 3.7484519,6.361651 A 0.23838658,0.23838658 0 0 1 3.9999985,5.999998 H 10.666663 V 5.333331 a 3.9741719,3.9741719 0 0 1 1.171879,-2.8287719 4.0811718,4.0811718 0 0 1 5.113932,-0.4544265 4.0299718,4.0299718 0 0 1 0.542973,0.4550798 3.9996785,3.9996785 0 0 1 -2.828786,6.8281181 h -0.666666 v 5.3333315 h 1.333333 V 10.625648 A 5.333838,5.333838 0 0 0 18.43814,1.5624928 Z"
+     id="path4"
+     style="stroke-width:1.33333" />
+</svg>
diff --git a/src/displayapp/icons/navigation/unique/roundabout_right.svg b/src/displayapp/icons/navigation/unique/roundabout_right.svg
new file mode 100644
index 00000000..df002888
--- /dev/null
+++ b/src/displayapp/icons/navigation/unique/roundabout_right.svg
@@ -0,0 +1,64 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   id="WORKING_ICONS"
+   data-name="WORKING ICONS"
+   width="20"
+   height="14.657716"
+   viewBox="0 0 20 14.657716"
+   version="1.1"
+   sodipodi:docname="roundabout_right.svg"
+   inkscape:version="1.0 (4035a4fb49, 2020-05-01)">
+  <metadata
+     id="metadata11">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title>direction</dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs9" />
+  <sodipodi:namedview
+     fit-margin-bottom="0"
+     fit-margin-right="0"
+     fit-margin-left="0"
+     fit-margin-top="0"
+     inkscape:document-rotation="0"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1920"
+     inkscape:window-height="1027"
+     id="namedview7"
+     showgrid="false"
+     inkscape:zoom="21.5"
+     inkscape:cx="10.164237"
+     inkscape:cy="6.5667351"
+     inkscape:window-x="-8"
+     inkscape:window-y="22"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="WORKING_ICONS" />
+  <title
+     id="title2">direction</title>
+  <path
+     fill="#000000"
+     d="M 5.3300781,0.2665039 A 5.0635745,5.0635745 0 1 1 0.2665036,5.330078 5.0692777,5.0692777 0 0 1 5.3300781,0.2665039 m 0,9.3276371 A 4.2640627,4.2640627 0 1 0 1.0660154,5.330078 4.2688998,4.2688998 0 0 0 5.3300781,9.594141 M 5.3300781,0 A 5.3300784,5.3300784 0 1 0 10.660157,5.330078 5.3361814,5.3361814 0 0 0 5.3300781,0 Z m 0,9.327637 A 3.9975588,3.9975588 0 1 1 9.3276367,5.330078 4.0019295,4.0019295 0 0 1 5.3300781,9.327637 Z M 15.774061,2.0629536 a 0.25757604,0.25757604 0 0 0 -0.41544,0.27278 L 16.253914,4.302386 A 0.23826783,0.23826783 0 0 1 16.002441,4.663819 H 9.3276367 V 5.330078 A 3.9974789,3.9974789 0 0 1 5.3300781,9.327637 H 4.6638183 v 5.330079 H 5.9963379 V 10.619169 A 5.3343425,5.3343425 0 0 0 10.619169,5.996338 h 5.383272 a 0.23826783,0.23826783 0 0 1 0.251473,0.361433 l -0.895293,1.966652 a 0.25757604,0.25757604 0 0 0 0.41544,0.27278 L 20,5.330078 Z"
+     id="path4"
+     style="stroke-width:1.33252" />
+</svg>
diff --git a/src/displayapp/icons/navigation/unique/roundabout_sharp_left.svg b/src/displayapp/icons/navigation/unique/roundabout_sharp_left.svg
new file mode 100644
index 00000000..33e8a420
--- /dev/null
+++ b/src/displayapp/icons/navigation/unique/roundabout_sharp_left.svg
@@ -0,0 +1,58 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   inkscape:version="1.0 (4035a4fb49, 2020-05-01)"
+   sodipodi:docname="roundabout_sharp_left.svg"
+   version="1.1"
+   viewBox="0 0 20 20"
+   height="20"
+   width="20"
+   data-name="WORKING ICONS"
+   id="WORKING_ICONS">
+  <metadata
+     id="metadata11">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs9" />
+  <sodipodi:namedview
+     inkscape:current-layer="WORKING_ICONS"
+     inkscape:window-maximized="1"
+     inkscape:window-y="22"
+     inkscape:window-x="-8"
+     inkscape:cy="11.069249"
+     inkscape:cx="9.6724823"
+     inkscape:zoom="30.405592"
+     showgrid="false"
+     id="namedview7"
+     inkscape:window-height="1027"
+     inkscape:window-width="1920"
+     inkscape:pageshadow="2"
+     inkscape:pageopacity="0"
+     guidetolerance="10"
+     gridtolerance="10"
+     objecttolerance="10"
+     borderopacity="1"
+     bordercolor="#666666"
+     pagecolor="#ffffff" />
+  <title
+     id="title2">direction</title>
+  <path
+     style="stroke-width:1.6675"
+     id="path4"
+     d="M 13.329998,0.3346256 A 6.3365016,6.3365016 0 1 1 6.9934967,6.6711275 6.3436385,6.3436385 0 0 1 13.329998,0.3346256 m 0,11.6725034 A 5.3360013,5.3360013 0 1 0 7.993997,6.6711275 5.3420544,5.3420544 0 0 0 13.329998,12.007129 m 0,-12.0060035 A 6.6700017,6.6700017 0 1 0 20,6.6711275 6.6776388,6.6776388 0 0 0 13.329998,0.0011255 Z m 0,11.6725035 A 5.0025013,5.0025013 0 1 1 18.3325,6.6711275 5.0079707,5.0079707 0 0 1 13.329998,11.673629 Z M 18.047524,1.9552192 A 6.7297482,6.7297482 0 0 0 17.142938,1.1971902 6.8018343,6.8018343 0 0 0 8.61409,1.9544021 6.6709688,6.6709688 0 0 0 8.059613,10.760072 l -5.1121726,5.11219 a 0.29803235,0.29803235 0 0 1 -0.5419376,-0.0975 l -0.9481074,-2.5325 A 0.32236118,0.32236118 0 0 0 0.8483742,13.36846 L 0,19.998874 6.6304152,19.150466 a 0.32236118,0.32236118 0 0 0 0.1261964,-0.60902 L 4.2241121,17.593388 a 0.2981324,0.2981324 0 0 1 -0.097299,-0.542271 l -6.17e-4,-6.16e-4 5.6758049,-5.678956 0.564249,-0.588628 -0.575638,-0.577272 a 5.0016675,5.0016675 0 0 1 0.0025,-7.0722534 5.1036018,5.1036018 0 0 1 6.395615,-0.5683175 5.0470735,5.0470735 0 0 1 0.679856,0.5691346 5.0025013,5.0025013 0 0 1 -3.538536,8.5394203 h -0.83375 v 6.670002 h 1.667501 V 13.289837 A 6.671269,6.671269 0 0 0 18.047507,1.9552192 Z"
+     fill="#000000" />
+</svg>
diff --git a/src/displayapp/icons/navigation/unique/roundabout_sharp_right.svg b/src/displayapp/icons/navigation/unique/roundabout_sharp_right.svg
new file mode 100644
index 00000000..4b38c290
--- /dev/null
+++ b/src/displayapp/icons/navigation/unique/roundabout_sharp_right.svg
@@ -0,0 +1,58 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   inkscape:version="1.0 (4035a4fb49, 2020-05-01)"
+   sodipodi:docname="roundabout_sharp_right.svg"
+   version="1.1"
+   viewBox="0 0 20 20"
+   height="20"
+   width="20"
+   data-name="WORKING ICONS"
+   id="WORKING_ICONS">
+  <metadata
+     id="metadata11">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs9" />
+  <sodipodi:namedview
+     inkscape:current-layer="WORKING_ICONS"
+     inkscape:window-maximized="1"
+     inkscape:window-y="22"
+     inkscape:window-x="-8"
+     inkscape:cy="12.563422"
+     inkscape:cx="10.07814"
+     inkscape:zoom="15.202796"
+     showgrid="false"
+     id="namedview7"
+     inkscape:window-height="1027"
+     inkscape:window-width="1920"
+     inkscape:pageshadow="2"
+     inkscape:pageopacity="0"
+     guidetolerance="10"
+     gridtolerance="10"
+     objecttolerance="10"
+     borderopacity="1"
+     bordercolor="#666666"
+     pagecolor="#ffffff" />
+  <title
+     id="title2">direction</title>
+  <path
+     style="stroke-width:1.66667"
+     id="path4"
+     d="M 6.6668087,0.3333333 A 6.3333333,6.3333333 0 1 1 0.333475,6.666667 6.3405,6.3405 0 0 1 6.6668087,0.3333333 M 6.6668087,12 A 5.3333333,5.3333333 0 1 0 1.333475,6.666667 5.3393667,5.3393667 0 0 0 6.6668087,12 m 0,-12 A 6.6666667,6.6666667 0 1 0 13.333475,6.666667 6.6743,6.6743 0 0 0 6.6668087,0 Z m 0,11.666667 a 5,5 0 1 1 5.0000003,-5 5.0054667,5.0054667 0 0 1 -5.0000003,5 z M 19.151809,13.3729 A 0.32213333,0.32213333 0 0 0 18.543192,13.246767 L 17.595659,15.778 a 0.29805,0.29805 0 0 1 -0.5421,0.09725 l -3e-4,3e-4 -6.2621,-6.2621 -0.5892,0.5892 a 4.9670333,4.9670333 0 0 1 -3.5351503,1.464017 h -0.833334 v 6.666666 h 1.666667 v -5.051266 a 6.5936833,6.5936833 0 0 0 3.2544003,-1.34765 l 5.121867,5.12125 a 0.29735,0.29735 0 0 1 -0.09857,0.54 l -2.53115,0.947666 a 0.32216667,0.32216667 0 0 0 0.126133,0.608717 L 19.999859,20 Z"
+     fill="#000000" />
+</svg>
diff --git a/src/displayapp/icons/navigation/unique/roundabout_slight_left.svg b/src/displayapp/icons/navigation/unique/roundabout_slight_left.svg
new file mode 100644
index 00000000..73010de3
--- /dev/null
+++ b/src/displayapp/icons/navigation/unique/roundabout_slight_left.svg
@@ -0,0 +1,64 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   id="WORKING_ICONS"
+   data-name="WORKING ICONS"
+   width="15.99757"
+   height="20"
+   viewBox="0 0 15.99757 20"
+   version="1.1"
+   sodipodi:docname="roundabout_slight_left.svg"
+   inkscape:version="1.0 (4035a4fb49, 2020-05-01)">
+  <metadata
+     id="metadata11">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title>direction</dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs9" />
+  <sodipodi:namedview
+     fit-margin-bottom="0"
+     fit-margin-right="0"
+     fit-margin-left="0"
+     fit-margin-top="0"
+     inkscape:document-rotation="0"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1920"
+     inkscape:window-height="1027"
+     id="namedview7"
+     showgrid="false"
+     inkscape:zoom="21.5"
+     inkscape:cx="5.765385"
+     inkscape:cy="11.676383"
+     inkscape:window-x="-8"
+     inkscape:window-y="22"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="WORKING_ICONS" />
+  <title
+     id="title2">direction</title>
+  <path
+     fill="#000000"
+     d="M 10.653411,5.5707664 A 5.0769526,5.0769526 0 1 1 5.5764579,10.647719 5.0826708,5.0826708 0 0 1 10.653411,5.5707664 m 0,9.3522806 a 4.2753285,4.2753285 0 1 0 -4.275329,-4.275328 4.2801783,4.2801783 0 0 0 4.275329,4.275328 m 0,-9.6194887 A 5.3441606,5.3441606 0 1 0 15.99757,10.647719 5.3502797,5.3502797 0 0 0 10.653411,5.3035583 Z m 0,9.3522807 a 4.0081205,4.0081205 0 1 1 4.00812,-4.00812 4.0125027,4.0125027 0 0 1 -4.00812,4.00812 z M 3.3065257,2.3618117 A 0.23887062,0.23887062 0 0 1 3.3844836,1.9273849 L 5.4135545,1.1677258 A 0.25825656,0.25825656 0 0 0 5.3124163,0.6797906 L 0,0 0.6797906,5.3124296 A 0.25825656,0.25825656 0 0 0 1.1677258,5.4135679 L 1.9273181,3.384497 A 0.23887062,0.23887062 0 0 1 2.3618117,3.306539 M 11.321432,15.950823 A 5.3446683,5.3446683 0 0 0 14.432547,6.8692772 5.3862459,5.3862459 0 0 0 13.708414,6.2619267 5.4466482,5.4466482 0 0 0 7.375917,6.4256717 L 2.3618384,1.4168572 1.417258,2.3627736 7.34794,8.285587 7.819562,7.81327 a 4.0878954,4.0878954 0 0 1 5.124317,-0.45535 4.0381546,4.0381546 0 0 1 0.544075,0.456004 4.0077998,4.0077998 0 0 1 -2.834556,6.841915 H 9.9853775 V 20 h 1.3360405 v -4.049217 z"
+     id="path4"
+     style="stroke-width:1.33604" />
+</svg>
diff --git a/src/displayapp/icons/navigation/unique/roundabout_slight_right.svg b/src/displayapp/icons/navigation/unique/roundabout_slight_right.svg
new file mode 100644
index 00000000..abaace0e
--- /dev/null
+++ b/src/displayapp/icons/navigation/unique/roundabout_slight_right.svg
@@ -0,0 +1,64 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   id="WORKING_ICONS"
+   data-name="WORKING ICONS"
+   width="16.037371"
+   height="20"
+   viewBox="0 0 16.037371 20"
+   version="1.1"
+   sodipodi:docname="roundabout_slight_right.svg"
+   inkscape:version="1.0 (4035a4fb49, 2020-05-01)">
+  <metadata
+     id="metadata11">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title>direction</dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs9" />
+  <sodipodi:namedview
+     fit-margin-bottom="0"
+     fit-margin-right="0"
+     fit-margin-left="0"
+     fit-margin-top="0"
+     inkscape:document-rotation="0"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1920"
+     inkscape:window-height="1027"
+     id="namedview7"
+     showgrid="false"
+     inkscape:zoom="10.75"
+     inkscape:cx="8.2389368"
+     inkscape:cy="22.399161"
+     inkscape:window-x="-8"
+     inkscape:window-y="22"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="WORKING_ICONS" />
+  <title
+     id="title2">direction</title>
+  <path
+     fill="#000000"
+     d="M 5.3203227,5.6628325 A 5.0543072,5.0543072 0 1 1 0.2660159,10.71714 5.0599999,5.0599999 0 0 1 5.3203227,5.6628325 m 0,9.3105655 A 4.2562587,4.2562587 0 1 0 1.0640644,10.71714 4.2610869,4.2610869 0 0 0 5.3203227,14.973398 m 0,-9.5765817 A 5.3203234,5.3203234 0 1 0 10.640647,10.71714 5.3264151,5.3264151 0 0 0 5.3203227,5.3968163 Z m 0,9.3105657 A 3.9902425,3.9902425 0 1 1 9.3105658,10.71714 3.9946052,3.9946052 0 0 1 5.3203227,14.707382 Z M 10.748636,0.6767185 a 0.25707803,0.25707803 0 0 0 -0.100661,0.4857057 l 2.020047,0.7562839 a 0.23779185,0.23779185 0 0 1 0.07761,0.4325423 l 7.9e-5,7.98e-5 L 7.6713327,7.425708 8.1415438,7.895919 A 3.9899233,3.9899233 0 0 1 5.3203097,14.707382 H 4.6552693 V 20 H 5.9853497 V 15.99655 A 5.3219594,5.3219594 0 0 0 9.5235778,7.454292 L 13.686159,3.2917506 a 0.23779185,0.23779185 0 0 1 0.432543,0.07761 l 0.756151,2.020047 A 0.25713123,0.25713123 0 0 0 15.360638,5.2886674 L 16.03737,0 Z"
+     id="path4"
+     style="stroke-width:1.33008" />
+</svg>
diff --git a/src/displayapp/icons/navigation/unique/roundabout_straight.svg b/src/displayapp/icons/navigation/unique/roundabout_straight.svg
new file mode 100644
index 00000000..6891af67
--- /dev/null
+++ b/src/displayapp/icons/navigation/unique/roundabout_straight.svg
@@ -0,0 +1,64 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   id="WORKING_ICONS"
+   data-name="WORKING ICONS"
+   width="10.002602"
+   height="20"
+   viewBox="0 0 10.002602 20"
+   version="1.1"
+   sodipodi:docname="roundabout_straight.svg"
+   inkscape:version="1.0 (4035a4fb49, 2020-05-01)">
+  <metadata
+     id="metadata11">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title>direction</dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs9" />
+  <sodipodi:namedview
+     fit-margin-bottom="0"
+     fit-margin-right="0"
+     fit-margin-left="0"
+     fit-margin-top="0"
+     inkscape:document-rotation="0"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1920"
+     inkscape:window-height="1027"
+     id="namedview7"
+     showgrid="false"
+     inkscape:zoom="10.75"
+     inkscape:cx="-5.7312914"
+     inkscape:cy="22.862341"
+     inkscape:window-x="-8"
+     inkscape:window-y="22"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="WORKING_ICONS" />
+  <title
+     id="title2">direction</title>
+  <path
+     fill="#000000"
+     d="M 5.0012971,7.7468218 A 4.7512324,4.7512324 0 1 1 0.250065,12.498054 4.7565712,4.7565712 0 0 1 5.0012971,7.7468218 m 0,8.7522702 a 4.0010378,4.0010378 0 1 0 -4.0010376,-4.001038 4.0055764,4.0055764 0 0 0 4.0010376,4.001038 m 0,-9.002335 A 5.0012972,5.0012972 0 1 0 10.002594,12.498054 5.0070237,5.0070237 0 0 0 5.0012971,7.496757 Z m 0,8.75227 A 3.7509729,3.7509729 0 1 1 8.7522704,12.498054 3.755074,3.755074 0 0 1 5.0012971,16.249027 Z M 8.5404284,8.963812 A 4.9654754,4.9654754 0 0 0 5.6264594,7.5352169 v -3.784244 a 0.22357049,0.22357049 0 0 1 0.339138,-0.2359612 l 1.845341,0.8400554 A 0.24167518,0.24167518 0 0 0 8.0668924,3.9652535 L 5.0012971,0 1.9357022,3.965266 a 0.24168769,0.24168769 0 0 0 0.2559539,0.3898136 l 1.845479,-0.8400554 a 0.22354548,0.22354548 0 0 1 0.339,0.2359487 V 8.747081 h 0.625162 a 3.750973,3.750973 0 1 1 0,7.501946 H 4.3761351 V 20 h 1.2503243 v -2.539109 a 5.0022475,5.0022475 0 0 0 2.913969,-8.497079 z"
+     id="path4"
+     style="stroke-width:1.25032" />
+</svg>
diff --git a/src/displayapp/icons/navigation/unique/updown.svg b/src/displayapp/icons/navigation/unique/updown.svg
new file mode 100644
index 00000000..49ada251
--- /dev/null
+++ b/src/displayapp/icons/navigation/unique/updown.svg
@@ -0,0 +1,64 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   id="WORKING_ICONS"
+   data-name="WORKING ICONS"
+   width="11.117433"
+   height="20"
+   viewBox="0 0 11.117433 20"
+   version="1.1"
+   sodipodi:docname="updown.svg"
+   inkscape:version="1.0 (4035a4fb49, 2020-05-01)">
+  <metadata
+     id="metadata11">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title>direction</dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs9" />
+  <sodipodi:namedview
+     fit-margin-bottom="0"
+     fit-margin-right="0"
+     fit-margin-left="0"
+     fit-margin-top="0"
+     inkscape:document-rotation="0"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1920"
+     inkscape:window-height="1027"
+     id="namedview7"
+     showgrid="false"
+     inkscape:zoom="15.202796"
+     inkscape:cx="5.4827308"
+     inkscape:cy="16.878949"
+     inkscape:window-x="-8"
+     inkscape:window-y="22"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="WORKING_ICONS" />
+  <title
+     id="title2">direction</title>
+  <path
+     fill="#000000"
+     d="M 11.009776,12.94916 5.5587285,20 0.10767062,12.94916 a 0.4297426,0.4297426 0 0 1 0.455121,-0.693142 l 3.28133528,1.493744 a 0.39748328,0.39748328 0 0 0 0.602978,-0.419504 V 6.6697422 A 0.39748328,0.39748328 0 0 0 3.844138,6.2502376 L 0.56279162,7.7439819 A 0.4297426,0.4297426 0 0 1 0.10767062,7.0508401 L 5.5587285,0 11.009787,7.0508401 A 0.42975372,0.42975372 0 0 1 10.554666,7.7439819 L 7.2733075,6.2502376 a 0.39748328,0.39748328 0 0 0 -0.602967,0.4195046 v 6.6605158 a 0.39748328,0.39748328 0 0 0 0.602967,0.419504 l 3.2813355,-1.493744 a 0.42975372,0.42975372 0 0 1 0.455133,0.693142 z"
+     id="path4"
+     style="stroke-width:1.11162" />
+</svg>
diff --git a/src/displayapp/icons/navigation/updown-white.svg b/src/displayapp/icons/navigation/updown-white.svg
deleted file mode 100644
index 1dfbfbb6..00000000
--- a/src/displayapp/icons/navigation/updown-white.svg
+++ /dev/null
@@ -1,4 +0,0 @@
-<svg id="WORKING_ICONS" data-name="WORKING ICONS" xmlns="http://www.w3.org/2000/svg" width="20" height="20" viewBox="0 0 20 20">
-  <title>direction</title>
-  <path fill="#ffffff" d="M14.91284,12.65717L10.00916,19,5.10547,12.65717a0.38659,0.38659,0,0,1,.40942-0.62354l2.95184,1.34375A0.35757,0.35757,0,0,0,9.00916,13V7.0083a0.35757,0.35757,0,0,0-.54242-0.37738L5.51489,7.97467a0.38659,0.38659,0,0,1-.40942-0.62354L10.00916,1.0083l4.90369,6.34283a0.3866,0.3866,0,0,1-.40942.62354L11.55157,6.63092a0.35757,0.35757,0,0,0-.54242.37738V13a0.35757,0.35757,0,0,0,.54242.37738l2.95184-1.34375A0.3866,0.3866,0,0,1,14.91284,12.65717Z"/>
-</svg>
diff --git a/src/displayapp/icons/navigation/updown.c b/src/displayapp/icons/navigation/updown.c
deleted file mode 100644
index 3aae978d..00000000
--- a/src/displayapp/icons/navigation/updown.c
+++ /dev/null
@@ -1,97 +0,0 @@
-#if defined(LV_LVGL_H_INCLUDE_SIMPLE)
-#include "lvgl.h"
-#else
-#include "lvgl/lvgl.h"
-#endif
-
-
-#ifndef LV_ATTRIBUTE_MEM_ALIGN
-#define LV_ATTRIBUTE_MEM_ALIGN
-#endif
-
-#ifndef LV_ATTRIBUTE_IMG_UPDOWN
-#define LV_ATTRIBUTE_IMG_UPDOWN
-#endif
-
-const LV_ATTRIBUTE_MEM_ALIGN LV_ATTRIBUTE_LARGE_CONST LV_ATTRIBUTE_IMG_UPDOWN uint8_t updown_map[] = {
-  0x04, 0x02, 0x04, 0xff, 	/*Color of index 0*/
-  0xfc, 0xfe, 0xfc, 0xff, 	/*Color of index 1*/
-
-  0x00, 0x00, 0x00, 0x0f, 0xf0, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x0f, 0xf0, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x1f, 0xf8, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x3f, 0xfc, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x7f, 0xfe, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0xff, 0xff, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0xff, 0xff, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x01, 0xff, 0xff, 0x80, 0x00, 0x00, 
-  0x00, 0x00, 0x03, 0xff, 0xff, 0xc0, 0x00, 0x00, 
-  0x00, 0x00, 0x07, 0xff, 0xff, 0xe0, 0x00, 0x00, 
-  0x00, 0x00, 0x0f, 0xff, 0xff, 0xf0, 0x00, 0x00, 
-  0x00, 0x00, 0x0f, 0xff, 0xff, 0xf0, 0x00, 0x00, 
-  0x00, 0x00, 0x1f, 0xff, 0xff, 0xf8, 0x00, 0x00, 
-  0x00, 0x00, 0x3f, 0xff, 0xff, 0xfc, 0x00, 0x00, 
-  0x00, 0x00, 0x7f, 0xff, 0xff, 0xfe, 0x00, 0x00, 
-  0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 
-  0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 
-  0x00, 0x01, 0xff, 0xff, 0xff, 0xff, 0x80, 0x00, 
-  0x00, 0x03, 0xff, 0xff, 0xff, 0xff, 0xc0, 0x00, 
-  0x00, 0x03, 0xff, 0xff, 0xff, 0xff, 0xc0, 0x00, 
-  0x00, 0x03, 0xff, 0xff, 0xff, 0xff, 0xc0, 0x00, 
-  0x00, 0x03, 0xff, 0xff, 0xff, 0xff, 0xc0, 0x00, 
-  0x00, 0x03, 0xff, 0xff, 0xff, 0xff, 0xc0, 0x00, 
-  0x00, 0x03, 0xff, 0xbf, 0xfd, 0xff, 0xc0, 0x00, 
-  0x00, 0x03, 0xfe, 0x3f, 0xfc, 0x7f, 0xc0, 0x00, 
-  0x00, 0x03, 0xf8, 0x3f, 0xfc, 0x1f, 0xc0, 0x00, 
-  0x00, 0x03, 0xc0, 0x3f, 0xfc, 0x03, 0xc0, 0x00, 
-  0x00, 0x00, 0x00, 0x3f, 0xfc, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x3f, 0xfc, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x3f, 0xfc, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x3f, 0xfc, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x3f, 0xfc, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x3f, 0xfc, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x3f, 0xfc, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x3f, 0xfc, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x3f, 0xfc, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x3f, 0xfc, 0x00, 0x00, 0x00, 
-  0x00, 0x03, 0xc0, 0x3f, 0xfc, 0x03, 0xc0, 0x00, 
-  0x00, 0x03, 0xf8, 0x3f, 0xfc, 0x1f, 0xc0, 0x00, 
-  0x00, 0x03, 0xfe, 0x3f, 0xfc, 0x7f, 0xc0, 0x00, 
-  0x00, 0x03, 0xff, 0xbf, 0xfd, 0xff, 0xc0, 0x00, 
-  0x00, 0x03, 0xff, 0xff, 0xff, 0xff, 0xc0, 0x00, 
-  0x00, 0x03, 0xff, 0xff, 0xff, 0xff, 0xc0, 0x00, 
-  0x00, 0x03, 0xff, 0xff, 0xff, 0xff, 0xc0, 0x00, 
-  0x00, 0x03, 0xff, 0xff, 0xff, 0xff, 0xc0, 0x00, 
-  0x00, 0x03, 0xff, 0xff, 0xff, 0xff, 0xc0, 0x00, 
-  0x00, 0x01, 0xff, 0xff, 0xff, 0xff, 0x80, 0x00, 
-  0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 
-  0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 
-  0x00, 0x00, 0x7f, 0xff, 0xff, 0xfe, 0x00, 0x00, 
-  0x00, 0x00, 0x3f, 0xff, 0xff, 0xfc, 0x00, 0x00, 
-  0x00, 0x00, 0x1f, 0xff, 0xff, 0xf8, 0x00, 0x00, 
-  0x00, 0x00, 0x0f, 0xff, 0xff, 0xf0, 0x00, 0x00, 
-  0x00, 0x00, 0x0f, 0xff, 0xff, 0xf0, 0x00, 0x00, 
-  0x00, 0x00, 0x07, 0xff, 0xff, 0xe0, 0x00, 0x00, 
-  0x00, 0x00, 0x03, 0xff, 0xff, 0xc0, 0x00, 0x00, 
-  0x00, 0x00, 0x01, 0xff, 0xff, 0x80, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0xff, 0xff, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0xff, 0xff, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x7f, 0xfe, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x3f, 0xfc, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x1f, 0xfc, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x0f, 0xf0, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x0f, 0xf0, 0x00, 0x00, 0x00, 
-};
-
-const lv_img_dsc_t updown = {
-      {
-        LV_IMG_CF_INDEXED_1BIT,
-        0,
-        0,
-        64,
-        64
-    },
-    520,
-    
-updown_map,
-};
diff --git a/src/displayapp/icons/navigation/updown.png b/src/displayapp/icons/navigation/updown.png
deleted file mode 100644
index 4a550f83..00000000
--- a/src/displayapp/icons/navigation/updown.png
+++ /dev/null
diff --git a/src/displayapp/icons/navigation/updown.svg b/src/displayapp/icons/navigation/updown.svg
new file mode 100644
index 00000000..28668cb4
--- /dev/null
+++ b/src/displayapp/icons/navigation/updown.svg
@@ -0,0 +1,58 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   inkscape:version="1.0 (4035a4fb49, 2020-05-01)"
+   sodipodi:docname="updown.svg"
+   version="1.1"
+   viewBox="0 0 20 20"
+   height="20"
+   width="20"
+   data-name="WORKING ICONS"
+   id="WORKING_ICONS">
+  <metadata
+     id="metadata11">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs9" />
+  <sodipodi:namedview
+     inkscape:current-layer="WORKING_ICONS"
+     inkscape:window-maximized="1"
+     inkscape:window-y="22"
+     inkscape:window-x="-8"
+     inkscape:cy="16.878949"
+     inkscape:cx="9.9240143"
+     inkscape:zoom="15.202796"
+     showgrid="false"
+     id="namedview7"
+     inkscape:window-height="1027"
+     inkscape:window-width="1920"
+     inkscape:pageshadow="2"
+     inkscape:pageopacity="0"
+     guidetolerance="10"
+     gridtolerance="10"
+     objecttolerance="10"
+     borderopacity="1"
+     bordercolor="#666666"
+     pagecolor="#ffffff" />
+  <title
+     id="title2">direction</title>
+  <path
+     style="stroke-width:1.11162"
+     id="path4"
+     d="M 15.451059,12.94916 10.000012,20 4.5489541,12.94916 a 0.4297426,0.4297426 0 0 1 0.455121,-0.693142 l 3.2813353,1.493744 a 0.39748328,0.39748328 0 0 0 0.602978,-0.419504 V 6.6697422 A 0.39748328,0.39748328 0 0 0 8.2854215,6.2502376 L 5.0040751,7.7439819 A 0.4297426,0.4297426 0 0 1 4.5489541,7.0508401 L 10.000012,0 15.45107,7.0508401 A 0.42975372,0.42975372 0 0 1 14.995949,7.7439819 L 11.714591,6.2502376 a 0.39748328,0.39748328 0 0 0 -0.602967,0.4195046 v 6.6605158 a 0.39748328,0.39748328 0 0 0 0.602967,0.419504 l 3.281335,-1.493744 a 0.42975372,0.42975372 0 0 1 0.455133,0.693142 z"
+     fill="#000000" />
+</svg>
diff --git a/src/displayapp/icons/navigation/uturn-white.svg b/src/displayapp/icons/navigation/uturn-white.svg
deleted file mode 100644
index dc181dc6..00000000
--- a/src/displayapp/icons/navigation/uturn-white.svg
+++ /dev/null
@@ -1,4 +0,0 @@
-<svg id="WORKING_ICONS" data-name="WORKING ICONS" xmlns="http://www.w3.org/2000/svg" width="20" height="20" viewBox="0 0 20 20">
-  <title>direction</title>
-  <path fill="#ffffff" d="M17,8v9.49652A0.50346,0.50346,0,0,1,16.49652,18h-0.993A0.50346,0.50346,0,0,1,15,17.49652V8A3.5,3.5,0,0,0,8,8v4H7.99091a0.35757,0.35757,0,0,0,.54242.37738l2.95184-1.34375a0.3866,0.3866,0,0,1,.40942.62354L6.99091,18,2.08716,11.65717a0.3866,0.3866,0,0,1,.40942-0.62354l2.95184,1.34375A0.3576,0.3576,0,0,0,5.99091,12H6V8A5.5,5.5,0,0,1,17,8Z"/>
-</svg>
diff --git a/src/displayapp/icons/navigation/uturn.c b/src/displayapp/icons/navigation/uturn.c
deleted file mode 100644
index 30e11145..00000000
--- a/src/displayapp/icons/navigation/uturn.c
+++ /dev/null
@@ -1,96 +0,0 @@
-#if defined(LV_LVGL_H_INCLUDE_SIMPLE)
-#include "lvgl.h"
-#else
-#include "lvgl/lvgl.h"
-#endif
-
-
-#ifndef LV_ATTRIBUTE_MEM_ALIGN
-#define LV_ATTRIBUTE_MEM_ALIGN
-#endif
-
-#ifndef LV_ATTRIBUTE_IMG_UTURN
-#define LV_ATTRIBUTE_IMG_UTURN
-#endif
-
-const LV_ATTRIBUTE_MEM_ALIGN LV_ATTRIBUTE_LARGE_CONST LV_ATTRIBUTE_IMG_UTURN uint8_t uturn_map[] = {
-  0x04, 0x02, 0x04, 0xff, 	/*Color of index 0*/
-  0xfc, 0xfe, 0xfc, 0xff, 	/*Color of index 1*/
-
-  0x00, 0x00, 0x00, 0x0f, 0xff, 0xff, 0xf8, 0x00,
-  0x00, 0x00, 0x00, 0x3f, 0xff, 0xff, 0xfc, 0x00,
-  0x00, 0x00, 0x00, 0x7f, 0xff, 0xff, 0xff, 0x00,
-  0x00, 0x00, 0x01, 0xff, 0xff, 0xff, 0xff, 0x80,
-  0x00, 0x00, 0x03, 0xff, 0xff, 0xff, 0xff, 0xc0,
-  0x00, 0x00, 0x07, 0xff, 0xff, 0xff, 0xff, 0xe0,
-  0x00, 0x00, 0x07, 0xff, 0xff, 0xff, 0xff, 0xf0,
-  0x00, 0x00, 0x0f, 0xff, 0xff, 0xff, 0xff, 0xf8,
-  0x00, 0x00, 0x1f, 0xff, 0xff, 0xff, 0xff, 0xf8,
-  0x00, 0x00, 0x1f, 0xff, 0xff, 0xff, 0xff, 0xfc,
-  0x00, 0x00, 0x3f, 0xff, 0xff, 0x7f, 0xff, 0xfe,
-  0x00, 0x00, 0x3f, 0xff, 0xf0, 0x0f, 0xff, 0xfe,
-  0x00, 0x00, 0x7f, 0xff, 0xe0, 0x03, 0xff, 0xfe,
-  0x00, 0x00, 0x7f, 0xff, 0x80, 0x01, 0xff, 0xfe,
-  0x00, 0x00, 0x7f, 0xff, 0x00, 0x00, 0xff, 0xfe,
-  0x00, 0x00, 0xff, 0xfe, 0x00, 0x00, 0x7f, 0xfe,
-  0x00, 0x00, 0xff, 0xfc, 0x00, 0x00, 0x3f, 0xfe,
-  0x00, 0x00, 0xff, 0xfc, 0x00, 0x00, 0x1f, 0xfe,
-  0x00, 0x00, 0xff, 0xf8, 0x00, 0x00, 0x1f, 0xfe,
-  0x00, 0x00, 0xff, 0xf8, 0x00, 0x00, 0x0f, 0xfe,
-  0x00, 0x00, 0xff, 0xf0, 0x00, 0x00, 0x0f, 0xfe,
-  0x00, 0x00, 0xff, 0xf0, 0x00, 0x00, 0x0f, 0xfe,
-  0x00, 0x00, 0xff, 0xf0, 0x00, 0x00, 0x0f, 0xfe,
-  0x00, 0x00, 0xff, 0xf0, 0x00, 0x00, 0x07, 0xfe,
-  0x00, 0x00, 0xff, 0xf0, 0x00, 0x00, 0x07, 0xfe,
-  0x00, 0x00, 0xff, 0xf0, 0x00, 0x00, 0x07, 0xfe,
-  0x00, 0x00, 0xff, 0xf0, 0x00, 0x00, 0x07, 0xfe,
-  0x00, 0x00, 0xff, 0xf0, 0x00, 0x00, 0x07, 0xfe,
-  0x00, 0x00, 0xff, 0xf0, 0x00, 0x00, 0x07, 0xfe,
-  0x00, 0x00, 0xff, 0xf0, 0x00, 0x00, 0x07, 0xfe,
-  0x00, 0x00, 0xff, 0xf0, 0x00, 0x00, 0x07, 0xfe,
-  0x00, 0x00, 0xff, 0xf0, 0x00, 0x00, 0x07, 0xfe,
-  0x00, 0x00, 0xff, 0xf0, 0x00, 0x00, 0x07, 0xfe,
-  0x7c, 0x00, 0xff, 0xf0, 0x03, 0xf0, 0x07, 0xfe,
-  0x7f, 0x00, 0xff, 0xf0, 0x1f, 0xf0, 0x07, 0xfe,
-  0x7f, 0xc0, 0xff, 0xf0, 0x7f, 0xf0, 0x07, 0xfe,
-  0x7f, 0xf8, 0xff, 0xf1, 0xff, 0xf0, 0x07, 0xfe,
-  0x7f, 0xfe, 0xff, 0xf7, 0xff, 0xf0, 0x07, 0xfe,
-  0x7f, 0xff, 0xff, 0xff, 0xff, 0xf0, 0x07, 0xfe,
-  0x7f, 0xff, 0xff, 0xff, 0xff, 0xf0, 0x07, 0xfe,
-  0x7f, 0xff, 0xff, 0xff, 0xff, 0xe0, 0x07, 0xfe,
-  0x7f, 0xff, 0xff, 0xff, 0xff, 0xe0, 0x07, 0xfe,
-  0x3f, 0xff, 0xff, 0xff, 0xff, 0xc0, 0x07, 0xfe,
-  0x3f, 0xff, 0xff, 0xff, 0xff, 0x80, 0x07, 0xfe,
-  0x1f, 0xff, 0xff, 0xff, 0xff, 0x00, 0x07, 0xfe,
-  0x0f, 0xff, 0xff, 0xff, 0xff, 0x00, 0x07, 0xfe,
-  0x07, 0xff, 0xff, 0xff, 0xfe, 0x00, 0x07, 0xfe,
-  0x03, 0xff, 0xff, 0xff, 0xfc, 0x00, 0x07, 0xfe,
-  0x03, 0xff, 0xff, 0xff, 0xf8, 0x00, 0x07, 0xfe,
-  0x01, 0xff, 0xff, 0xff, 0xf0, 0x00, 0x07, 0xfe,
-  0x00, 0xff, 0xff, 0xff, 0xf0, 0x00, 0x07, 0xfe,
-  0x00, 0x7f, 0xff, 0xff, 0xe0, 0x00, 0x07, 0xfe,
-  0x00, 0x7f, 0xff, 0xff, 0xc0, 0x00, 0x07, 0xfe,
-  0x00, 0x3f, 0xff, 0xff, 0x80, 0x00, 0x07, 0xfe,
-  0x00, 0x1f, 0xff, 0xff, 0x80, 0x00, 0x07, 0xfe,
-  0x00, 0x0f, 0xff, 0xff, 0x00, 0x00, 0x07, 0xfe,
-  0x00, 0x07, 0xff, 0xfe, 0x00, 0x00, 0x07, 0xfe,
-  0x00, 0x07, 0xff, 0xfc, 0x00, 0x00, 0x07, 0xfe,
-  0x00, 0x03, 0xff, 0xfc, 0x00, 0x00, 0x07, 0xfe,
-  0x00, 0x01, 0xff, 0xf8, 0x00, 0x00, 0x07, 0xfe,
-  0x00, 0x00, 0xff, 0xf0, 0x00, 0x00, 0x07, 0xfe,
-  0x00, 0x00, 0xff, 0xe0, 0x00, 0x00, 0x07, 0xfe,
-  0x00, 0x00, 0x7f, 0xc0, 0x00, 0x00, 0x07, 0xfe,
-  0x00, 0x00, 0x3f, 0xc0, 0x00, 0x00, 0x07, 0xfe,
-};
-
-const lv_img_dsc_t uturn = {
-      {
-        LV_IMG_CF_INDEXED_1BIT,
-        0,
-        0,
-        64,
-        64
-    },
-    520,
-    uturn_map,
-};
diff --git a/src/displayapp/icons/navigation/uturn.png b/src/displayapp/icons/navigation/uturn.png
deleted file mode 100644
index 464d32e9..00000000
--- a/src/displayapp/icons/navigation/uturn.png
+++ /dev/null
diff --git a/src/displayapp/icons/navigation/uturn.svg b/src/displayapp/icons/navigation/uturn.svg
new file mode 100644
index 00000000..932751a0
--- /dev/null
+++ b/src/displayapp/icons/navigation/uturn.svg
@@ -0,0 +1,58 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   inkscape:version="1.0 (4035a4fb49, 2020-05-01)"
+   sodipodi:docname="uturn.svg"
+   version="1.1"
+   viewBox="0 0 20 20"
+   height="20"
+   width="20"
+   data-name="WORKING ICONS"
+   id="WORKING_ICONS">
+  <metadata
+     id="metadata11">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs9" />
+  <sodipodi:namedview
+     inkscape:current-layer="WORKING_ICONS"
+     inkscape:window-maximized="1"
+     inkscape:window-y="22"
+     inkscape:window-x="-8"
+     inkscape:cy="23.699023"
+     inkscape:cx="11.099225"
+     inkscape:zoom="15.202796"
+     showgrid="false"
+     id="namedview7"
+     inkscape:window-height="1027"
+     inkscape:window-width="1920"
+     inkscape:pageshadow="2"
+     inkscape:pageopacity="0"
+     guidetolerance="10"
+     gridtolerance="10"
+     objecttolerance="10"
+     borderopacity="1"
+     bordercolor="#666666"
+     pagecolor="#ffffff" />
+  <title
+     id="title2">direction</title>
+  <path
+     style="stroke-width:1.29032"
+     id="path4"
+     d="M 19.683663,7.0967742 V 19.350348 A 0.64962581,0.64962581 0 0 1 19.034012,20 H 17.752721 A 0.64962581,0.64962581 0 0 1 17.103018,19.350348 V 7.0967742 a 4.5161292,4.5161292 0 0 0 -9.0322585,0 v 5.1612908 h -0.011729 a 0.46138065,0.46138065 0 0 0 0.6998971,0.486941 l 3.8088254,-1.733871 a 0.49883871,0.49883871 0 0 1 0.528284,0.804568 L 6.7687079,20 0.44128854,11.815703 a 0.49883871,0.49883871 0 0 1 0.5282839,-0.804568 l 3.80882576,1.733871 a 0.46141935,0.46141935 0 0 0 0.6999871,-0.486941 h 0.011729 V 7.0967742 a 7.0967744,7.0967744 0 0 1 14.1935487,0 z"
+     fill="#000000" />
+</svg>
author	Joaquim <joaquim.org@gmail.com>	2021-04-04 03:08:51 +0100
committer	Joaquim <joaquim.org@gmail.com>	2021-04-04 03:08:51 +0100
commit	1d3742e14f09316a1d795527713eb8f9742f0ffb (patch)
tree	6bc6343538506b68256aa057121e063d22f8ed1a /src/displayapp/icons
parent	58a2d000c4d49d96121894d6dd6bb861d7564bea (diff)