diff --git a/source/ubl-settings-update.c b/source/ubl-settings-update.c
index e89935b..b99852f 100644
--- a/source/ubl-settings-update.c
+++ b/source/ubl-settings-update.c
@@ -1077,8 +1077,9 @@ void on_repo_source_add(GtkWidget *, repo_add_window *window){
     g_signal_connect(gtk_builder_get_object(builder,"PathRemoveButton"),"clicked",G_CALLBACK(on_mirror_path_removed),window);
 }
 
-void on_file_chooser_open(GtkWidget *, GtkEntry *target){
+void on_file_chooser_open(GtkWidget *self, GtkEntry *target){
     filechooser_window *window = yon_file_chooser_window_new(GTK_FILE_CHOOSER_ACTION_OPEN);
+        yon_gtk_window_setup(GTK_WINDOW(window->Window),GTK_WINDOW(gtk_widget_get_toplevel(self)),yon_char_get_localised_from_lib(CHOOSE_FILE_LABEL),icon_path,"file_chooser");
     if (yon_file_chooser_start(window)){
         char *file = window->last_any_selection;
         if (!yon_char_is_empty(file)){
@@ -1094,11 +1095,13 @@ void on_repo_file_chooser_open(GtkWidget *, repo_add_window *window){
     if (yon_char_is_empty(source_type)){
         GtkFileFilter *filter = gtk_file_filter_new();
         fchwindow = yon_file_chooser_window_new(GTK_FILE_CHOOSER_ACTION_OPEN);
+        yon_gtk_window_setup(GTK_WINDOW(fchwindow->Window),GTK_WINDOW(window->Window),yon_char_get_localised_from_lib(CHOOSE_FILE_LABEL),icon_path,"file_chooser");
         gtk_file_filter_set_name(filter,"*ini");
         gtk_file_filter_add_pattern(filter,"*ini");
         gtk_file_chooser_add_filter(GTK_FILE_CHOOSER(fchwindow->MainFileChooser),filter);
     } else if (!strcmp(source_type,"file://")){
         fchwindow = yon_file_chooser_window_new(GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER);
+        yon_gtk_window_setup(GTK_WINDOW(fchwindow->Window),GTK_WINDOW(window->Window),yon_char_get_localised_from_lib(CHOOSE_FILE_LABEL),icon_path,"file_chooser");
         gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(fchwindow->ChooseFolderCheck),1);
     } else return;
 
diff --git a/source/ubl-strings.h b/source/ubl-strings.h
index 1afc4ab..e859d20 100644
--- a/source/ubl-strings.h
+++ b/source/ubl-strings.h
@@ -34,6 +34,9 @@ mirrorlist - mirrors file, make sure server URL is NOT included in this file! Si
     #define PASSWORD_INPUT_LABEL _("Password input")
     #define REMOVE_FTP_TITLE_LABEL _("Remove repository")
 
+    #define STORAGE_PATH_LABEL _("Storage path to publish")
+    #define PUBLICATION_DIR_PATH_LABEL _("Path to publication directory:")
+
     /*
 #define _LABEL _("Signature verification will not be performed")
 #define _LABEL _("Signatures will be verified if present, but unsigned databases and packages will also be accepted")
@@ -50,7 +53,6 @@ mirrorlist - mirrors file, make sure server URL is NOT included in this file! Si
     #define _LABEL _("Add source")
     #define _LABEL _("Username")
     #define _LABEL _("User password")
-    #define _LABEL _("Storage path to publish")
     #define _LABEL _("The full URL of where to find the database, packages, and signatures (if available) for this repository. Multiple can be specified, separated by commas (,)")
     #define _LABEL _("Update")
     #define _LABEL _("System update")
@@ -138,7 +140,6 @@ mirrorlist - mirrors file, make sure server URL is NOT included in this file! Si
     #define _LABEL _("Enable installation of packages from this repository during --sync operation")
     #define _LABEL _("Allow this repository to be a valid source of packages when running --sysupgrade")
     #define _LABEL _("Enable publishing of local repository as WEB resource")
-    #define _LABEL _("Path to publication directory:")
     #define _LABEL _("Port:")
     #define _LABEL _("Publishing parameters")
     #define _LABEL _("Enable WEB file browser")