diff --git a/xs/src/slic3r/GUI/GUI.cpp b/xs/src/slic3r/GUI/GUI.cpp
index fc38173ed..7d8a9b9d5 100644
--- a/xs/src/slic3r/GUI/GUI.cpp
+++ b/xs/src/slic3r/GUI/GUI.cpp
@@ -1118,11 +1118,11 @@ void show_buttons(bool show)
 	}
 }
 
-void show_info_sizer(bool show)
+void show_info_sizer(const bool show, const bool is_update_settings/* = false*/)
 {
 	g_info_sizer->Show(static_cast<size_t>(0), show); 
 	g_info_sizer->Show(1, show && g_show_print_info);
-	g_manifold_warning_icon->Show(show && g_show_manifold_warning_icon);
+	g_manifold_warning_icon->Show(show && (!is_update_settings && g_show_manifold_warning_icon));
 }
 
 void show_object_name(bool show)
diff --git a/xs/src/slic3r/GUI/GUI.hpp b/xs/src/slic3r/GUI/GUI.hpp
index dd4387039..7e9acfabf 100644
--- a/xs/src/slic3r/GUI/GUI.hpp
+++ b/xs/src/slic3r/GUI/GUI.hpp
@@ -182,7 +182,7 @@ bool select_language(wxArrayString & names, wxArrayLong & identifiers);
 // update right panel of the Plater according to view mode
 void update_mode();
 
-void show_info_sizer(bool show);
+void show_info_sizer(const bool show, const bool is_update_settinfs = false);
 
 std::vector<Tab *>& get_tabs_list();
 bool checked_tab(Tab* tab);
diff --git a/xs/src/slic3r/GUI/GUI_ObjectParts.cpp b/xs/src/slic3r/GUI/GUI_ObjectParts.cpp
index 9343f667c..37f8fcf44 100644
--- a/xs/src/slic3r/GUI/GUI_ObjectParts.cpp
+++ b/xs/src/slic3r/GUI/GUI_ObjectParts.cpp
@@ -951,7 +951,7 @@ void update_settings_list()
 	}
 
     show_manipulation_og(show_manipulations);
-    show_info_sizer(show_manipulations);
+    show_info_sizer(show_manipulations, true);
 
 #ifdef __linux__
 	no_updates.reset(nullptr);
diff --git a/xs/src/slic3r/GUI/wxExtensions.cpp b/xs/src/slic3r/GUI/wxExtensions.cpp
index 80da9a148..12d42e60c 100644
--- a/xs/src/slic3r/GUI/wxExtensions.cpp
+++ b/xs/src/slic3r/GUI/wxExtensions.cpp
@@ -386,12 +386,12 @@ bool PrusaObjectDataViewModelNode::update_settings_digest(const std::vector<std:
         bmp = m_bitmap_cache->insert(m_name.ToStdString(), bmps);
     }
 
-    m_icon.CopyFromBitmap(*bmp);
-
 #ifdef __WXOSX__
-    if (m_icon.GetWidth() != m_icon.GetHeight())
-        m_icon.SetHeight(m_icon.GetWidth());
+    if (bmp->GetWidth() != bmp->GetHeight())
+        bmp->SetHeight(bmp->GetWidth());
 #endif // __WXOSX__
+
+    m_icon.CopyFromBitmap(*bmp);
     return true;
 }
 
diff --git a/xs/src/slic3r/GUI/wxExtensions.hpp b/xs/src/slic3r/GUI/wxExtensions.hpp
index e47681d6c..0dbf6f310 100644
--- a/xs/src/slic3r/GUI/wxExtensions.hpp
+++ b/xs/src/slic3r/GUI/wxExtensions.hpp
@@ -424,7 +424,7 @@ class PrusaIconTextRenderer : public wxDataViewCustomRenderer
 public:
     PrusaIconTextRenderer(  wxDataViewCellMode mode = wxDATAVIEW_CELL_INERT,
                             int align = wxDVR_DEFAULT_ALIGNMENT): 
-                            wxDataViewCustomRenderer(wxT("wxDataViewIconText"), mode, wxALIGN_CENTER) {}
+                            wxDataViewCustomRenderer(wxT("wxDataViewIconText"), mode, align) {}
 
     bool SetValue(const wxVariant &value);
     bool GetValue(wxVariant &value) const;