diff --git a/src/slic3r/GUI/GLCanvas3D.cpp b/src/slic3r/GUI/GLCanvas3D.cpp
index 173000ab08..02fa09fcbe 100644
--- a/src/slic3r/GUI/GLCanvas3D.cpp
+++ b/src/slic3r/GUI/GLCanvas3D.cpp
@@ -1472,7 +1472,11 @@ GLCanvas3D::GLCanvas3D(wxGLCanvas* canvas, Bed3D& bed, Camera& camera, GLToolbar
 #if ENABLE_RETINA_GL
         m_retina_helper.reset(new RetinaHelper(canvas));
         // set default view_toolbar icons size equal to GLGizmosManager::Default_Icons_Size
+#if ENABLE_NON_STATIC_CANVAS_MANAGER
+        wxGetApp().plater()->get_view_toolbar().set_icons_size(GLGizmosManager::Default_Icons_Size);
+#else
         m_view_toolbar.set_icons_size(GLGizmosManager::Default_Icons_Size);
+#endif // ENABLE_NON_STATIC_CANVAS_MANAGER
 #endif
     }
 
diff --git a/src/slic3r/GUI/GLCanvas3DManager.cpp b/src/slic3r/GUI/GLCanvas3DManager.cpp
index 4c9344cd3e..1e53db2f17 100644
--- a/src/slic3r/GUI/GLCanvas3DManager.cpp
+++ b/src/slic3r/GUI/GLCanvas3DManager.cpp
@@ -8,7 +8,9 @@
 
 #include <boost/algorithm/string/split.hpp>
 #include <boost/algorithm/string/classification.hpp>
-
+#if ENABLE_NON_STATIC_CANVAS_MANAGER
+#include <boost/log/trivial.hpp>
+#endif // ENABLE_NON_STATIC_CANVAS_MANAGER
 #include <wx/glcanvas.h>
 #include <wx/timer.h>
 #include <wx/msgdlg.h>