diff --git a/lib/Slic3r/GUI/Plater.pm b/lib/Slic3r/GUI/Plater.pm
index 04c0ae50d..a5124fa8d 100644
--- a/lib/Slic3r/GUI/Plater.pm
+++ b/lib/Slic3r/GUI/Plater.pm
@@ -139,7 +139,6 @@ sub new {
             export_gcode    cog_go.png
             export_stl      brick_go.png
             
-            info            package.png
             increase        add.png
             decrease        delete.png
             rotate45cw      arrow_rotate_clockwise.png
@@ -147,6 +146,8 @@ sub new {
             rotate          arrow_rotate_clockwise.png
             changescale     arrow_out.png
             split           shape_ungroup.png
+            view            package.png
+            settings        cog.png
         );
         for (grep $self->{"btn_$_"}, keys %icons) {
             $self->{"btn_$_"}->SetBitmap(Wx::Bitmap->new("$Slic3r::var/$icons{$_}", wxBITMAP_TYPE_PNG));
diff --git a/lib/Slic3r/GUI/Plater/ObjectSettingsDialog.pm b/lib/Slic3r/GUI/Plater/ObjectSettingsDialog.pm
index f284db678..fb7b68209 100644
--- a/lib/Slic3r/GUI/Plater/ObjectSettingsDialog.pm
+++ b/lib/Slic3r/GUI/Plater/ObjectSettingsDialog.pm
@@ -73,7 +73,9 @@ sub new {
         # create the button
         my $btn = Wx::BitmapButton->new($self, -1, Wx::Bitmap->new("$Slic3r::var/add.png", wxBITMAP_TYPE_PNG));
         EVT_BUTTON($self, $btn, sub {
-            my $opt_key = $self->{options}[$choice->GetSelection];
+            my $idx = $choice->GetSelection;
+            return if $idx == -1;  # lack of selected item, can happen on Windows
+            my $opt_key = $self->{options}[$idx];
             $self->{object}->config->apply(Slic3r::Config->new_from_defaults($opt_key));
             $self->update_optgroup;
         });