diff --git a/source/ubl-settings-logging.c b/source/ubl-settings-logging.c
index 543f783..9bfe20c 100644
--- a/source/ubl-settings-logging.c
+++ b/source/ubl-settings-logging.c
@@ -1354,7 +1354,6 @@ logrotate_configure_window *yon_logrotate_window_new(char *paths, logrotate_wind
     window->EndworkCommandEntry=yon_gtk_builder_get_widget(builder,"EndworkCommandEntry");
     window->StatusBox=yon_gtk_builder_get_widget(builder,"StatusBox");
 
-    yon_window_config_custom_window_get(GTK_WINDOW(window->MainWindow),"LogrotateWindow");
     gtk_window_set_title(GTK_WINDOW(window->MainWindow),LOGROTATE_TITLE_LABEL);
     if (dialog)
         gtk_window_set_transient_for(GTK_WINDOW(window->MainWindow),GTK_WINDOW(dialog->Window));
@@ -1698,7 +1697,7 @@ void on_log_edit_logrotate_settings(GtkWidget *, dictionary *dict){
            pathse=yon_char_unite(pathse ? yon_char_append(pathse,","):"",gtk_entry_get_text((GtkEntry*)g_list_nth_data(paths,1)),NULL);
         }
         logrotate_configure_window *dialog = yon_logrotate_window_new(pathse,NULL,name);
-        gtk_window_set_transient_for(GTK_WINDOW(dialog->MainWindow),GTK_WINDOW(window->MainWindow));
+        yon_gtk_window_setup(GTK_WINDOW(dialog->MainWindow),GTK_WINDOW(window->MainWindow),LOGROTATE_TITLE_LABEL,icon_path,"LogrotateWindow");
         gtk_widget_show(dialog->MainWindow);
         gtk_entry_set_text(GTK_ENTRY(dialog->LogNameEntry),name);
         gtk_entry_set_text(GTK_ENTRY(dialog->LogDescriptionEntry),description);
@@ -2940,7 +2939,14 @@ void yon_main_window_complete(template_main_window **window){
     g_signal_connect(G_OBJECT(widgets->ServicesStartStopButton),"clicked",G_CALLBACK(on_start_stop_clicked),widgets);
     g_signal_connect(G_OBJECT(widgets->ServicesEnableDisableButton),"clicked",G_CALLBACK(on_enable_disable_clicked),widgets);
 
-    yon_rmb_menu_setup(widgets->MainTree,(RmbCheck)gtk_widget_get_sensitive,widgets->MainTree,CONFIGURE_LOG_LABEL,edit_icon_name,G_CALLBACK(on_log_edit),widgets,ADD_LOG_LABEL,add_icon_name,G_CALLBACK(on_log_add),widgets,REMOVE_LOG_LABEL,remove_icon_name,G_CALLBACK(on_log_remove),widgets,NULL);
+    yon_rmb_menu_setup(widgets->MainTree,(RmbCheck)gtk_widget_get_sensitive,widgets->MainTree,
+    CONFIGURE_LOG_LABEL,edit_icon_name,G_CALLBACK(on_log_edit),widgets,
+    ADD_LOG_LABEL,add_icon_name,G_CALLBACK(on_log_add),widgets,
+    // REMOVE_LOG_LABEL,remove_icon_name,G_CALLBACK(on_log_remove),widgets,
+    NULL);
+    yon_rmb_menu_setup(widgets->ServicesTree,(RmbCheck)gtk_widget_get_sensitive,widgets->ServicesTree,
+    CONFIGURE_SERVICE_LABEL,settings_icon_name,G_CALLBACK(on_service_edit),widgets,
+    NULL);
     // yon_rmb_menu_setup(widgets->ServicesTree,(RmbCheck)gtk_widget_get_sensitive,widgets->MainTree,CONFIGURE_LOG_LABEL,edit_icon_name,G_CALLBACK(on_log_edit),widgets,ADD_LOG_LABEL,add_icon_name,G_CALLBACK(on_log_add),widgets,REMOVE_LOG_LABEL,remove_icon_name,G_CALLBACK(on_log_remove),widgets,NULL);
     gtk_widget_show(widgets->Window);
 
diff --git a/source/ubl-settings-logging.h b/source/ubl-settings-logging.h
index 32cb8e8..2501b9d 100644
--- a/source/ubl-settings-logging.h
+++ b/source/ubl-settings-logging.h
@@ -78,6 +78,7 @@
 #define add_icon_name "com.ublinux.ubl-settings-logging.increase-symbolic"
 #define remove_icon_name "com.ublinux.libublsettingsui-gtk3.trash-symbolic"
 
+#define settings_icon_name "com.ublinux.ubl-settings-logging.settings-symbolic"
 #define start_icon_name "com.ublinux.ubl-settings-logging.play-symbolic"
 #define stop_icon_name "com.ublinux.ubl-settings-logging.stop-symbolic"
 #define enable_icon_name "com.ublinux.ubl-settings-logging.check-symbolic"