diff --git a/CMakeLists.txt b/CMakeLists.txt
index e4e686645..9c69052c8 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -227,6 +227,9 @@ endif(WIN32)
add_definitions(-DwxUSE_UNICODE -D_UNICODE -DUNICODE -DWXINTL_NO_GETTEXT_MACRO)
+# Disable unsafe implicit wxString to const char* / std::string and vice versa. This implicit conversion breaks the UTF-8 encoding quite often.
+add_definitions(-DwxNO_UNSAFE_WXSTRING_CONV)
+
if (SLIC3R_PROFILE)
message("PrusaSlicer will be built with a Shiny invasive profiler")
add_definitions(-DSLIC3R_PROFILE)
diff --git a/resources/icons/eject_sd.svg b/resources/icons/eject_sd.svg
new file mode 100644
index 000000000..0efe87bad
--- /dev/null
+++ b/resources/icons/eject_sd.svg
@@ -0,0 +1,11 @@
+
+
+
diff --git a/resources/icons/export_to_sd.svg b/resources/icons/export_to_sd.svg
index 516cec435..bd28c6a0a 100644
--- a/resources/icons/export_to_sd.svg
+++ b/resources/icons/export_to_sd.svg
@@ -1,168 +1,22 @@
-
-