diff --git a/DS_Map/Graphics/Program Icons/addIcon.png b/DS_Map/Graphics/Program Icons/addIcon.png
index 66ee59c..74aa94b 100644
Binary files a/DS_Map/Graphics/Program Icons/addIcon.png and b/DS_Map/Graphics/Program Icons/addIcon.png differ
diff --git a/DS_Map/Graphics/Program Icons/deleteIcon.png b/DS_Map/Graphics/Program Icons/deleteIcon.png
index 57bb0fb..5ad831d 100644
Binary files a/DS_Map/Graphics/Program Icons/deleteIcon.png and b/DS_Map/Graphics/Program Icons/deleteIcon.png differ
diff --git a/DS_Map/Main Window.cs b/DS_Map/Main Window.cs
index 30fd865..c255d16 100644
--- a/DS_Map/Main Window.cs	
+++ b/DS_Map/Main Window.cs	
@@ -4672,20 +4672,23 @@ namespace DSPRE {
             DisplayActiveEvents();
         }
         private void removeOverworldButton_Click(object sender, EventArgs e) {
-            if (overworldsListBox.Items.Count > 0) {
-                disableHandlers = true;
-
-                /* Remove overworld object from list and the corresponding entry in the ListBox */
-                int owNumber = overworldsListBox.SelectedIndex;
-                currentEventFile.overworlds.RemoveAt(owNumber);
-                overworldsListBox.Items.RemoveAt(owNumber);
-
-                FillOverworldsBox(); // Update ListBox
-                disableHandlers = false;
-
-                if (owNumber > 0) 
-                    overworldsListBox.SelectedIndex = owNumber - 1;
+            if (overworldsListBox.SelectedIndex < 0) {
+                return;
             }
+
+            disableHandlers = true;
+
+            /* Remove overworld object from list and the corresponding entry in the ListBox */
+            int owNumber = overworldsListBox.SelectedIndex;
+            currentEventFile.overworlds.RemoveAt(owNumber);
+            overworldsListBox.Items.RemoveAt(owNumber);
+
+            FillOverworldsBox(); // Update ListBox
+            disableHandlers = false;
+
+            if (owNumber > 0) 
+                overworldsListBox.SelectedIndex = owNumber - 1;
+            
         }
         #endregion