diff --git a/src/ui/zabapgit_icon_font.w3mi.data.woff b/src/ui/zabapgit_icon_font.w3mi.data.woff
index 295c407b5..49127f4ee 100644
Binary files a/src/ui/zabapgit_icon_font.w3mi.data.woff and b/src/ui/zabapgit_icon_font.w3mi.data.woff differ
diff --git a/src/ui/zabapgit_icon_font_css.w3mi.data.css b/src/ui/zabapgit_icon_font_css.w3mi.data.css
index c77c1c440..c1925fedb 100644
--- a/src/ui/zabapgit_icon_font_css.w3mi.data.css
+++ b/src/ui/zabapgit_icon_font_css.w3mi.data.css
@@ -72,4 +72,5 @@
 .icon-times-solid:before { content: "\f12a"; }
 .icon-tools-solid:before { content: "\f12b"; }
 .icon-truck-solid:before { content: "\f12c"; }
-.icon-user-solid:before { content: "\f12d"; }
+.icon-user-cog-solid:before { content: "\f12d"; }
+.icon-user-solid:before { content: "\f12e"; }
\ No newline at end of file
diff --git a/src/ui/zcl_abapgit_gui_buttons.clas.abap b/src/ui/zcl_abapgit_gui_buttons.clas.abap
index 1498b5800..783b65c74 100644
--- a/src/ui/zcl_abapgit_gui_buttons.clas.abap
+++ b/src/ui/zcl_abapgit_gui_buttons.clas.abap
@@ -30,28 +30,33 @@ ENDCLASS.
 
 CLASS zcl_abapgit_gui_buttons IMPLEMENTATION.
 
-  METHOD new_online.
-    rv_html_string = `<i class="icon icon-cloud-upload-alt"></i> New Online`.
-  ENDMETHOD.
-
-  METHOD new_offline.
-    rv_html_string = `<i class="icon icon-plug"></i> New Offline`.
-  ENDMETHOD.
 
   METHOD advanced.
     rv_html_string = `<i class="icon icon-tools-solid"></i>`.
   ENDMETHOD.
 
+
   METHOD help.
     rv_html_string = `<i class="icon icon-question-circle-solid"></i>`.
   ENDMETHOD.
 
+
+  METHOD new_offline.
+    rv_html_string = `<i class="icon icon-plug"></i> New Offline`.
+  ENDMETHOD.
+
+
+  METHOD new_online.
+    rv_html_string = `<i class="icon icon-cloud-upload-alt"></i> New Online`.
+  ENDMETHOD.
+
+
   METHOD repo_list.
     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_page_repo_view.clas.abap b/src/ui/zcl_abapgit_gui_page_repo_view.clas.abap
index 33d5ecc9c..e467415dd 100644
--- a/src/ui/zcl_abapgit_gui_page_repo_view.clas.abap
+++ b/src/ui/zcl_abapgit_gui_page_repo_view.clas.abap
@@ -432,13 +432,6 @@ CLASS zcl_abapgit_gui_page_repo_view 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( )
-      iv_title = 'Utilities'
-      io_sub = zcl_abapgit_gui_chunk_lib=>advanced_submenu( )
     )->add(
       iv_txt = zcl_abapgit_gui_buttons=>help( )
       iv_title = 'Help'
@@ -517,8 +510,9 @@ CLASS zcl_abapgit_gui_page_repo_view IMPLEMENTATION.
                      iv_act = |{ zif_abapgit_definitions=>c_action-repo_refresh }?key={ mv_key }|
                      iv_opt = zif_abapgit_html=>c_html_opt-strong ).
 
-    ro_toolbar->add( iv_txt = zcl_abapgit_html=>icon( iv_name = 'cog' )
-                     iv_act = |{ zif_abapgit_definitions=>c_action-repo_settings }?key={ mv_key }|
+    ro_toolbar->add( iv_txt   = 'Settings'
+                     iv_act   = |{ zif_abapgit_definitions=>c_action-repo_settings }?key={ mv_key }|
+                     iv_opt   = zif_abapgit_html=>c_html_opt-strong
                      iv_title = `Repository Settings` ).
 
   ENDMETHOD.
@@ -760,6 +754,31 @@ CLASS zcl_abapgit_gui_page_repo_view IMPLEMENTATION.
   ENDMETHOD.
 
 
+  METHOD order_files.
+
+    DATA:
+      lt_sort TYPE abap_sortorder_tab,
+      ls_sort LIKE LINE OF lt_sort.
+
+    IF lines( ct_files ) = 0.
+      RETURN.
+    ENDIF.
+
+    ls_sort-descending = mv_order_descending.
+    ls_sort-astext     = abap_true.
+    ls_sort-name       = 'PATH'.
+    INSERT ls_sort INTO TABLE lt_sort.
+
+    ls_sort-descending = mv_order_descending.
+    ls_sort-astext     = abap_true.
+    ls_sort-name       = 'FILENAME'.
+    INSERT ls_sort INTO TABLE lt_sort.
+
+    SORT ct_files STABLE BY (lt_sort).
+
+  ENDMETHOD.
+
+
   METHOD render_content.
 
     DATA: lt_repo_items TYPE zif_abapgit_definitions=>ty_repo_item_tt,
@@ -1333,29 +1352,4 @@ CLASS zcl_abapgit_gui_page_repo_view IMPLEMENTATION.
     INSERT ls_hotkey_action INTO TABLE rt_hotkey_actions.
 
   ENDMETHOD.
-
-  METHOD order_files.
-
-    DATA:
-      lt_sort TYPE abap_sortorder_tab,
-      ls_sort LIKE LINE OF lt_sort.
-
-    IF lines( ct_files ) = 0.
-      RETURN.
-    ENDIF.
-
-    ls_sort-descending = mv_order_descending.
-    ls_sort-astext     = abap_true.
-    ls_sort-name       = 'PATH'.
-    INSERT ls_sort INTO TABLE lt_sort.
-
-    ls_sort-descending = mv_order_descending.
-    ls_sort-astext     = abap_true.
-    ls_sort-name       = 'FILENAME'.
-    INSERT ls_sort INTO TABLE lt_sort.
-
-    SORT ct_files STABLE BY (lt_sort).
-
-  ENDMETHOD.
-
 ENDCLASS.