diff --git a/src/ui/zabapgit_css_theme_default.w3mi.data.css b/src/ui/zabapgit_css_theme_default.w3mi.data.css
index ac1233363..f7efad4b4 100644
--- a/src/ui/zabapgit_css_theme_default.w3mi.data.css
+++ b/src/ui/zabapgit_css_theme_default.w3mi.data.css
@@ -364,6 +364,10 @@ table.db_tab th {
 table.db_tab tr.selected {
   background-color: rgba(191, 191, 191, 1) !important;
 }
+table.db_tab a.remote_repo {
+  color: var(--theme-primary-font-color-reduced);
+}
+table.db_tab a.remote_repo:hover { color: var(--theme-link-color); }
 
 /* DB ENTRY DISPLAY */
 div.db_entry {
diff --git a/src/ui/zcl_abapgit_gui_page_repo_over.clas.abap b/src/ui/zcl_abapgit_gui_page_repo_over.clas.abap
index 0af264cf0..63df30ed0 100644
--- a/src/ui/zcl_abapgit_gui_page_repo_over.clas.abap
+++ b/src/ui/zcl_abapgit_gui_page_repo_over.clas.abap
@@ -323,7 +323,8 @@ CLASS zcl_abapgit_gui_page_repo_over IMPLEMENTATION.
       lv_text                 TYPE string,
       lv_lock                 TYPE string,
       lv_toggle_favorite_link TYPE string,
-      lv_repo_go_link TYPE string.
+      lv_repo_go_link         TYPE string,
+      lv_remote_icon_link     TYPE string.
 
     FIELD-SYMBOLS: <ls_repo>     LIKE LINE OF it_repo_list.
 
@@ -378,8 +379,18 @@ CLASS zcl_abapgit_gui_page_repo_over IMPLEMENTATION.
                             iv_package = <ls_repo>-package
                             iv_suppress_title = abap_true )->render( ) ) ).
 
+
       IF <ls_repo>-type = abap_false.
-        lv_text = shorten_repo_url( <ls_repo>-url ).
+        lv_remote_icon_link = ii_html->a(
+          iv_txt   = ii_html->icon( iv_name  = 'edit-solid'
+                                    iv_class = 'pad-sides'
+                                    iv_hint  = 'Change remote' )
+          iv_act   = |{ zif_abapgit_definitions=>c_action-repo_remote_settings }?| &&
+                     |key={ <ls_repo>-key }|
+          iv_class = |remote_repo| ).
+
+        lv_text = shorten_repo_url( <ls_repo>-url ) && lv_remote_icon_link.
+
         ii_html->add( column( iv_content = |{ ii_html->a(
           iv_txt   = lv_text
           iv_title = <ls_repo>-url