diff --git a/source/ubl-settings-repomanager.c b/source/ubl-settings-repomanager.c
index 0899251..d505a43 100644
--- a/source/ubl-settings-repomanager.c
+++ b/source/ubl-settings-repomanager.c
@@ -874,7 +874,7 @@ void on_move_accept(GtkWidget *self, repo_add_window *window){
         char *command = yon_move_packages_command(source_path,arch,source_repo, target_repo, yon_char_parsed_to_string(packages,size," "));
         yon_debug_output("%s\n",command);
         if (!system(command)){
-            yon_ubl_status_box_render(PACKAGES_ADD_SUCCESS_LABEL,BACKGROUND_IMAGE_SUCCESS_TYPE);
+            yon_ubl_status_box_render(PACKAGES_MOVE_SUCCESS_LABEL,BACKGROUND_IMAGE_SUCCESS_TYPE);
             on_subwindow_close(window->MainWindow);
         }
     } else {
@@ -982,16 +982,18 @@ void on_remove_accept(GtkWidget *self, repo_add_window *window){
                 command = yon_delete_packages_sign_command(storage_path,arch,repo,yon_char_parsed_to_string(packages,size," "),sign);
             }
             yon_debug_output("%s\n",command);
-            if (system(command)){
-                yon_ubl_status_box_spawn(GTK_CONTAINER(window->StatusBox),NOTHING_TO_SAVE_LABEL,5,BACKGROUND_IMAGE_FAIL_TYPE);
-                gtk_widget_destroy(window->MainWindow);
+            if (!system(command)){
+                yon_ubl_status_box_render(PACKAGES_MOVE_SUCCESS_LABEL,BACKGROUND_IMAGE_SUCCESS_TYPE);
             }
         } else {
             yon_ubl_status_box_spawn(GTK_CONTAINER(window->StatusBox),NOTHING_TO_SAVE_LABEL,5,BACKGROUND_IMAGE_FAIL_TYPE); 
+            return;
         }
     }else {
-            yon_ubl_status_box_spawn(GTK_CONTAINER(window->StatusBox),NOTHING_TO_SAVE_LABEL,5,BACKGROUND_IMAGE_FAIL_TYPE); 
-        }
+        yon_ubl_status_box_spawn(GTK_CONTAINER(window->StatusBox),NOTHING_TO_SAVE_LABEL,5,BACKGROUND_IMAGE_FAIL_TYPE);
+        return;
+    }
+    gtk_widget_destroy(window->MainWindow);
 }
 
 void on_remove_clicked(GtkWidget *self, main_window *widgets){
@@ -1013,6 +1015,8 @@ void on_remove_clicked(GtkWidget *self, main_window *widgets){
 
     gtk_widget_hide(gtk_widget_get_parent(window->PackageSignCombo));
 
+    gtk_button_set_label(GTK_BUTTON(window->AddButton),REMOVE_PACKAGES_TOOLTIP_LABEL);
+
     g_signal_connect(G_OBJECT(window->ArchitectureCombo),"changed",G_CALLBACK(on_arch_chosen),window);
     g_signal_connect(G_OBJECT(window->StorageCombo),"changed",G_CALLBACK(on_add_target_repo_selection_changed),window);
     g_signal_connect(G_OBJECT(window->RepositoryCombo),"changed",G_CALLBACK(on_add_target_arch_selection_changed),window);