diff --git a/src/slic3r/GUI/GLCanvas3D.cpp b/src/slic3r/GUI/GLCanvas3D.cpp
index 7d47ff8f6..5db94b95f 100644
--- a/src/slic3r/GUI/GLCanvas3D.cpp
+++ b/src/slic3r/GUI/GLCanvas3D.cpp
@@ -2893,11 +2893,11 @@ void GLCanvas3D::reset_volumes()
             return;
 #endif // !ENABLE_USE_UNIQUE_GLCONTEXT
 
-        m_volumes.release_geometry();
-        m_volumes.clear();
 #if ENABLE_EXTENDED_SELECTION
         m_selection.clear();
 #endif // ENABLE_EXTENDED_SELECTION
+        m_volumes.release_geometry();
+        m_volumes.clear();
         m_dirty = true;
     }
 
diff --git a/src/slic3r/GUI/Tab.cpp b/src/slic3r/GUI/Tab.cpp
index 55aeaa234..1897b4779 100644
--- a/src/slic3r/GUI/Tab.cpp
+++ b/src/slic3r/GUI/Tab.cpp
@@ -234,9 +234,9 @@ Slic3r::GUI::PageShp Tab::add_options_page(const wxString& title, const std::str
 		icon_idx = (m_icon_index.find(icon) == m_icon_index.end()) ? -1 : m_icon_index.at(icon);
 		if (icon_idx == -1) {
 			// Add a new icon to the icon list.
-			const auto img_icon = new wxIcon(from_u8(Slic3r::var(icon)), wxBITMAP_TYPE_PNG);
-			m_icons->Add(*img_icon);
-			icon_idx = ++m_icon_count;
+            wxIcon img_icon(from_u8(Slic3r::var(icon)), wxBITMAP_TYPE_PNG);
+            m_icons->Add(img_icon);
+            icon_idx = ++m_icon_count;
 			m_icon_index[icon] = icon_idx;
 		}
 	}