diff --git a/src/ui/zcl_abapgit_gui_buttons.clas.abap b/src/ui/zcl_abapgit_gui_buttons.clas.abap
index f38dc3e90..1498b5800 100644
--- a/src/ui/zcl_abapgit_gui_buttons.clas.abap
+++ b/src/ui/zcl_abapgit_gui_buttons.clas.abap
@@ -19,6 +19,9 @@ CLASS zcl_abapgit_gui_buttons DEFINITION
     CLASS-METHODS repo_list
       RETURNING VALUE(rv_html_string) TYPE string.
 
+    CLASS-METHODS settings
+      RETURNING VALUE(rv_html_string) TYPE string.
+
   PROTECTED SECTION.
   PRIVATE SECTION.
 ENDCLASS.
@@ -47,4 +50,8 @@ CLASS zcl_abapgit_gui_buttons IMPLEMENTATION.
     rv_html_string = `<i class="icon icon-bars"></i> Repository List`.
   ENDMETHOD.
 
+  METHOD settings.
+    rv_html_string = `<i class="icon icon-cog"></i> Settings`.
+  ENDMETHOD.
+
 ENDCLASS.
diff --git a/src/ui/zcl_abapgit_gui_chunk_lib.clas.abap b/src/ui/zcl_abapgit_gui_chunk_lib.clas.abap
index 1030f6fe3..203014eac 100644
--- a/src/ui/zcl_abapgit_gui_chunk_lib.clas.abap
+++ b/src/ui/zcl_abapgit_gui_chunk_lib.clas.abap
@@ -177,10 +177,7 @@ CLASS ZCL_ABAPGIT_GUI_CHUNK_LIB IMPLEMENTATION.
       iv_act = zif_abapgit_definitions=>c_action-go_debuginfo
     )->add(
       iv_txt = 'Performance Test'
-      iv_act = zif_abapgit_definitions=>c_action-performance_test
-    )->add(
-      iv_txt = 'Settings'
-      iv_act = zif_abapgit_definitions=>c_action-go_settings ).
+      iv_act = zif_abapgit_definitions=>c_action-performance_test ).
 
   ENDMETHOD.
 
diff --git a/src/ui/zcl_abapgit_gui_page_main.clas.abap b/src/ui/zcl_abapgit_gui_page_main.clas.abap
index 36f764d4b..cb8c3e787 100644
--- a/src/ui/zcl_abapgit_gui_page_main.clas.abap
+++ b/src/ui/zcl_abapgit_gui_page_main.clas.abap
@@ -54,10 +54,13 @@ CLASS ZCL_ABAPGIT_GUI_PAGE_MAIN IMPLEMENTATION.
       iv_txt = zcl_abapgit_gui_buttons=>new_offline( )
       iv_act = zif_abapgit_definitions=>c_action-repo_newoffline
     )->add(
-      iv_txt = '<i class="icon icon-tools-solid"></i>'
+      iv_txt = zcl_abapgit_gui_buttons=>settings( )
+      iv_act = zif_abapgit_definitions=>c_action-go_settings
+    )->add(
+      iv_txt = zcl_abapgit_gui_buttons=>advanced( )
       io_sub = zcl_abapgit_gui_chunk_lib=>advanced_submenu( )
     )->add(
-      iv_txt = '<i class="icon icon-question-circle-solid"></i>'
+      iv_txt = zcl_abapgit_gui_buttons=>help( )
       io_sub = zcl_abapgit_gui_chunk_lib=>help_submenu( ) ).
 
   ENDMETHOD.
diff --git a/src/ui/zcl_abapgit_gui_page_tutorial.clas.abap b/src/ui/zcl_abapgit_gui_page_tutorial.clas.abap
index e81b55408..81508399c 100644
--- a/src/ui/zcl_abapgit_gui_page_tutorial.clas.abap
+++ b/src/ui/zcl_abapgit_gui_page_tutorial.clas.abap
@@ -41,6 +41,9 @@ CLASS ZCL_ABAPGIT_GUI_PAGE_TUTORIAL IMPLEMENTATION.
     )->add(
       iv_txt = zcl_abapgit_gui_buttons=>new_offline( )
       iv_act = zif_abapgit_definitions=>c_action-repo_newoffline
+    )->add(
+      iv_txt = zcl_abapgit_gui_buttons=>settings( )
+      iv_act = zif_abapgit_definitions=>c_action-go_settings
     )->add(
       iv_txt = zcl_abapgit_gui_buttons=>advanced( )
       io_sub = zcl_abapgit_gui_chunk_lib=>advanced_submenu( )
diff --git a/src/ui/zcl_abapgit_gui_page_view_repo.clas.abap b/src/ui/zcl_abapgit_gui_page_view_repo.clas.abap
index 6ff4d0764..908c29546 100644
--- a/src/ui/zcl_abapgit_gui_page_view_repo.clas.abap
+++ b/src/ui/zcl_abapgit_gui_page_view_repo.clas.abap
@@ -424,6 +424,9 @@ CLASS ZCL_ABAPGIT_GUI_PAGE_VIEW_REPO IMPLEMENTATION.
     ro_menu->add(
       iv_txt = zcl_abapgit_gui_buttons=>repo_list( )
       iv_act = zif_abapgit_definitions=>c_action-abapgit_home
+    )->add(
+      iv_txt = zcl_abapgit_gui_buttons=>settings( )
+      iv_act = zif_abapgit_definitions=>c_action-go_settings
     )->add(
       iv_txt = zcl_abapgit_gui_buttons=>advanced( )
       io_sub = zcl_abapgit_gui_chunk_lib=>advanced_submenu( )