diff --git a/lib/Slic3r/GUI/3DScene.pm b/lib/Slic3r/GUI/3DScene.pm
index 2a39bc875..889dc0741 100644
--- a/lib/Slic3r/GUI/3DScene.pm
+++ b/lib/Slic3r/GUI/3DScene.pm
@@ -370,6 +370,7 @@ sub select_view {
 
 sub zoom_to_bounding_box {
     my ($self, $bb) = @_;
+    return if ($bb->empty);
     
     # calculate the zoom factor needed to adjust viewport to
     # bounding box
diff --git a/var/Slic3r.ico b/var/Slic3r.ico
index b9cd58d97..5765f77d2 100644
Binary files a/var/Slic3r.ico and b/var/Slic3r.ico differ