Flush more stetic button-with-image generation fixes

3 files changed, 129 insertions, 205 deletions

diff --git a/main/src/tools/mdmonitor/gtk-gui/Mono.Instrumentation.Monitor.InstrumenationChartView.cs b/main/src/tools/mdmonitor/gtk-gui/Mono.Instrumentation.Monitor.InstrumenationChartView.cs
index b7813cde25..05dd0d25aa 100644
--- a/main/src/tools/mdmonitor/gtk-gui/Mono.Instrumentation.Monitor.InstrumenationChartView.cs
+++ b/main/src/tools/mdmonitor/gtk-gui/Mono.Instrumentation.Monitor.InstrumenationChartView.cs
@@ -21,7 +21,7 @@ namespace Mono.Instrumentation.Monitor
 		private global::Gtk.Button buttonAddCounter;
 		private global::Gtk.ScrolledWindow GtkScrolledWindow1;
 		private global::Gtk.TreeView listSeries;
-		
+
 		protected virtual void Build ()
 		{
 			global::Stetic.Gui.Initialize (this);
@@ -79,57 +79,37 @@ namespace Mono.Instrumentation.Monitor
 			this.buttonZoomOut.Name = "buttonZoomOut";
 			this.buttonZoomOut.UseUnderline = true;
 			this.buttonZoomOut.Relief = ((global::Gtk.ReliefStyle)(2));
-			// Container child buttonZoomOut.Gtk.Container+ContainerChild
-			global::Gtk.Alignment w3 = new global::Gtk.Alignment (0.5F, 0.5F, 0F, 0F);
-			// Container child GtkAlignment.Gtk.Container+ContainerChild
-			global::Gtk.HBox w4 = new global::Gtk.HBox ();
-			w4.Spacing = 2;
-			// Container child GtkHBox.Gtk.Container+ContainerChild
-			global::Gtk.Image w5 = new global::Gtk.Image ();
-			w5.Pixbuf = global::Stetic.IconLoader.LoadIcon (this, "gtk-zoom-out", global::Gtk.IconSize.Menu);
-			w4.Add (w5);
-			// Container child GtkHBox.Gtk.Container+ContainerChild
-			global::Gtk.Label w7 = new global::Gtk.Label ();
-			w4.Add (w7);
-			w3.Add (w4);
-			this.buttonZoomOut.Add (w3);
+			this.buttonZoomOut.Label = "";
+			global::Gtk.Image w3 = new global::Gtk.Image ();
+			w3.Pixbuf = global::Stetic.IconLoader.LoadIcon (this, "gtk-zoom-out", global::Gtk.IconSize.Menu);
+			this.buttonZoomOut.Image = w3;
 			this.hboxChartBar.Add (this.buttonZoomOut);
-			global::Gtk.Box.BoxChild w11 = ((global::Gtk.Box.BoxChild)(this.hboxChartBar [this.buttonZoomOut]));
-			w11.PackType = ((global::Gtk.PackType)(1));
-			w11.Position = 2;
-			w11.Expand = false;
-			w11.Fill = false;
+			global::Gtk.Box.BoxChild w4 = ((global::Gtk.Box.BoxChild)(this.hboxChartBar [this.buttonZoomOut]));
+			w4.PackType = ((global::Gtk.PackType)(1));
+			w4.Position = 2;
+			w4.Expand = false;
+			w4.Fill = false;
 			// Container child hboxChartBar.Gtk.Box+BoxChild
 			this.buttonZoomIn = new global::Gtk.Button ();
 			this.buttonZoomIn.CanFocus = true;
 			this.buttonZoomIn.Name = "buttonZoomIn";
 			this.buttonZoomIn.UseUnderline = true;
 			this.buttonZoomIn.Relief = ((global::Gtk.ReliefStyle)(2));
-			// Container child buttonZoomIn.Gtk.Container+ContainerChild
-			global::Gtk.Alignment w12 = new global::Gtk.Alignment (0.5F, 0.5F, 0F, 0F);
-			// Container child GtkAlignment.Gtk.Container+ContainerChild
-			global::Gtk.HBox w13 = new global::Gtk.HBox ();
-			w13.Spacing = 2;
-			// Container child GtkHBox.Gtk.Container+ContainerChild
-			global::Gtk.Image w14 = new global::Gtk.Image ();
-			w14.Pixbuf = global::Stetic.IconLoader.LoadIcon (this, "gtk-zoom-in", global::Gtk.IconSize.Menu);
-			w13.Add (w14);
-			// Container child GtkHBox.Gtk.Container+ContainerChild
-			global::Gtk.Label w16 = new global::Gtk.Label ();
-			w13.Add (w16);
-			w12.Add (w13);
-			this.buttonZoomIn.Add (w12);
+			this.buttonZoomIn.Label = "";
+			global::Gtk.Image w5 = new global::Gtk.Image ();
+			w5.Pixbuf = global::Stetic.IconLoader.LoadIcon (this, "gtk-zoom-in", global::Gtk.IconSize.Menu);
+			this.buttonZoomIn.Image = w5;
 			this.hboxChartBar.Add (this.buttonZoomIn);
-			global::Gtk.Box.BoxChild w20 = ((global::Gtk.Box.BoxChild)(this.hboxChartBar [this.buttonZoomIn]));
-			w20.PackType = ((global::Gtk.PackType)(1));
-			w20.Position = 3;
-			w20.Expand = false;
-			w20.Fill = false;
+			global::Gtk.Box.BoxChild w6 = ((global::Gtk.Box.BoxChild)(this.hboxChartBar [this.buttonZoomIn]));
+			w6.PackType = ((global::Gtk.PackType)(1));
+			w6.Position = 3;
+			w6.Expand = false;
+			w6.Fill = false;
 			this.boxCharts.Add (this.hboxChartBar);
-			global::Gtk.Box.BoxChild w21 = ((global::Gtk.Box.BoxChild)(this.boxCharts [this.hboxChartBar]));
-			w21.Position = 0;
-			w21.Expand = false;
-			w21.Fill = false;
+			global::Gtk.Box.BoxChild w7 = ((global::Gtk.Box.BoxChild)(this.boxCharts [this.hboxChartBar]));
+			w7.Position = 0;
+			w7.Expand = false;
+			w7.Fill = false;
 			// Container child boxCharts.Gtk.Box+BoxChild
 			this.frameCharts = new global::Gtk.VBox ();
 			this.frameCharts.Name = "frameCharts";
@@ -142,20 +122,20 @@ namespace Mono.Instrumentation.Monitor
 			this.chartScroller.Adjustment.PageSize = 10;
 			this.chartScroller.Adjustment.StepIncrement = 1;
 			this.frameCharts.Add (this.chartScroller);
-			global::Gtk.Box.BoxChild w22 = ((global::Gtk.Box.BoxChild)(this.frameCharts [this.chartScroller]));
-			w22.PackType = ((global::Gtk.PackType)(1));
-			w22.Position = 2;
-			w22.Expand = false;
-			w22.Fill = false;
+			global::Gtk.Box.BoxChild w8 = ((global::Gtk.Box.BoxChild)(this.frameCharts [this.chartScroller]));
+			w8.PackType = ((global::Gtk.PackType)(1));
+			w8.Position = 2;
+			w8.Expand = false;
+			w8.Fill = false;
 			this.boxCharts.Add (this.frameCharts);
-			global::Gtk.Box.BoxChild w23 = ((global::Gtk.Box.BoxChild)(this.boxCharts [this.frameCharts]));
-			w23.Position = 1;
+			global::Gtk.Box.BoxChild w9 = ((global::Gtk.Box.BoxChild)(this.boxCharts [this.frameCharts]));
+			w9.Position = 1;
 			this.hbox4.Add (this.boxCharts);
-			global::Gtk.Box.BoxChild w24 = ((global::Gtk.Box.BoxChild)(this.hbox4 [this.boxCharts]));
-			w24.Position = 0;
+			global::Gtk.Box.BoxChild w10 = ((global::Gtk.Box.BoxChild)(this.hbox4 [this.boxCharts]));
+			w10.Position = 0;
 			this.hpaned2.Add (this.hbox4);
-			global::Gtk.Paned.PanedChild w25 = ((global::Gtk.Paned.PanedChild)(this.hpaned2 [this.hbox4]));
-			w25.Resize = false;
+			global::Gtk.Paned.PanedChild w11 = ((global::Gtk.Paned.PanedChild)(this.hpaned2 [this.hbox4]));
+			w11.Resize = false;
 			// Container child hpaned2.Gtk.Paned+PanedChild
 			this.vbox5 = new global::Gtk.VBox ();
 			this.vbox5.Name = "vbox5";
@@ -173,11 +153,11 @@ namespace Mono.Instrumentation.Monitor
 			this.buttonRemoveCounter.Relief = ((global::Gtk.ReliefStyle)(2));
 			this.buttonRemoveCounter.Label = "gtk-remove";
 			this.hboxSeriesBar.Add (this.buttonRemoveCounter);
-			global::Gtk.Box.BoxChild w26 = ((global::Gtk.Box.BoxChild)(this.hboxSeriesBar [this.buttonRemoveCounter]));
-			w26.PackType = ((global::Gtk.PackType)(1));
-			w26.Position = 0;
-			w26.Expand = false;
-			w26.Fill = false;
+			global::Gtk.Box.BoxChild w12 = ((global::Gtk.Box.BoxChild)(this.hboxSeriesBar [this.buttonRemoveCounter]));
+			w12.PackType = ((global::Gtk.PackType)(1));
+			w12.Position = 0;
+			w12.Expand = false;
+			w12.Fill = false;
 			// Container child hboxSeriesBar.Gtk.Box+BoxChild
 			this.buttonAddCounter = new global::Gtk.Button ();
 			this.buttonAddCounter.CanFocus = true;
@@ -187,16 +167,16 @@ namespace Mono.Instrumentation.Monitor
 			this.buttonAddCounter.Relief = ((global::Gtk.ReliefStyle)(2));
 			this.buttonAddCounter.Label = "gtk-add";
 			this.hboxSeriesBar.Add (this.buttonAddCounter);
-			global::Gtk.Box.BoxChild w27 = ((global::Gtk.Box.BoxChild)(this.hboxSeriesBar [this.buttonAddCounter]));
-			w27.PackType = ((global::Gtk.PackType)(1));
-			w27.Position = 1;
-			w27.Expand = false;
-			w27.Fill = false;
+			global::Gtk.Box.BoxChild w13 = ((global::Gtk.Box.BoxChild)(this.hboxSeriesBar [this.buttonAddCounter]));
+			w13.PackType = ((global::Gtk.PackType)(1));
+			w13.Position = 1;
+			w13.Expand = false;
+			w13.Fill = false;
 			this.vbox5.Add (this.hboxSeriesBar);
-			global::Gtk.Box.BoxChild w28 = ((global::Gtk.Box.BoxChild)(this.vbox5 [this.hboxSeriesBar]));
-			w28.Position = 0;
-			w28.Expand = false;
-			w28.Fill = false;
+			global::Gtk.Box.BoxChild w14 = ((global::Gtk.Box.BoxChild)(this.vbox5 [this.hboxSeriesBar]));
+			w14.Position = 0;
+			w14.Expand = false;
+			w14.Fill = false;
 			// Container child vbox5.Gtk.Box+BoxChild
 			this.GtkScrolledWindow1 = new global::Gtk.ScrolledWindow ();
 			this.GtkScrolledWindow1.Name = "GtkScrolledWindow1";
@@ -209,15 +189,15 @@ namespace Mono.Instrumentation.Monitor
 			this.listSeries.HeadersVisible = false;
 			this.GtkScrolledWindow1.Add (this.listSeries);
 			this.vbox5.Add (this.GtkScrolledWindow1);
-			global::Gtk.Box.BoxChild w30 = ((global::Gtk.Box.BoxChild)(this.vbox5 [this.GtkScrolledWindow1]));
-			w30.Position = 1;
+			global::Gtk.Box.BoxChild w16 = ((global::Gtk.Box.BoxChild)(this.vbox5 [this.GtkScrolledWindow1]));
+			w16.Position = 1;
 			this.hpaned2.Add (this.vbox5);
-			global::Gtk.Paned.PanedChild w31 = ((global::Gtk.Paned.PanedChild)(this.hpaned2 [this.vbox5]));
-			w31.Resize = false;
-			w31.Shrink = false;
+			global::Gtk.Paned.PanedChild w17 = ((global::Gtk.Paned.PanedChild)(this.hpaned2 [this.vbox5]));
+			w17.Resize = false;
+			w17.Shrink = false;
 			this.vbox3.Add (this.hpaned2);
-			global::Gtk.Box.BoxChild w32 = ((global::Gtk.Box.BoxChild)(this.vbox3 [this.hpaned2]));
-			w32.Position = 0;
+			global::Gtk.Box.BoxChild w18 = ((global::Gtk.Box.BoxChild)(this.vbox3 [this.hpaned2]));
+			w18.Position = 0;
 			this.Add (this.vbox3);
 			if ((this.Child != null)) {
 				this.Child.ShowAll ();
diff --git a/main/src/tools/mdmonitor/gtk-gui/Mono.Instrumentation.Monitor.InstrumentationViewerDialog.cs b/main/src/tools/mdmonitor/gtk-gui/Mono.Instrumentation.Monitor.InstrumentationViewerDialog.cs
index e976a32e96..8f4d1022d3 100644
--- a/main/src/tools/mdmonitor/gtk-gui/Mono.Instrumentation.Monitor.InstrumentationViewerDialog.cs
+++ b/main/src/tools/mdmonitor/gtk-gui/Mono.Instrumentation.Monitor.InstrumentationViewerDialog.cs
@@ -26,7 +26,7 @@ namespace Mono.Instrumentation.Monitor
 		private global::Gtk.Button buttonSaveAs;
 		private global::Gtk.Button buttonDelete;
 		private global::Gtk.Alignment viewBox;
-		
+
 		protected virtual void Build ()
 		{
 			global::Stetic.Gui.Initialize (this);
@@ -120,105 +120,69 @@ namespace Mono.Instrumentation.Monitor
 			this.buttonSave.Name = "buttonSave";
 			this.buttonSave.UseUnderline = true;
 			this.buttonSave.Relief = ((global::Gtk.ReliefStyle)(2));
-			// Container child buttonSave.Gtk.Container+ContainerChild
-			global::Gtk.Alignment w6 = new global::Gtk.Alignment (0.5F, 0.5F, 0F, 0F);
-			// Container child GtkAlignment.Gtk.Container+ContainerChild
-			global::Gtk.HBox w7 = new global::Gtk.HBox ();
-			w7.Spacing = 2;
-			// Container child GtkHBox.Gtk.Container+ContainerChild
-			global::Gtk.Image w8 = new global::Gtk.Image ();
-			w8.Pixbuf = global::Stetic.IconLoader.LoadIcon (this, "gtk-save", global::Gtk.IconSize.Button);
-			w7.Add (w8);
-			// Container child GtkHBox.Gtk.Container+ContainerChild
-			global::Gtk.Label w10 = new global::Gtk.Label ();
-			w10.LabelProp = global::Mono.Unix.Catalog.GetString ("Save");
-			w10.UseUnderline = true;
-			w7.Add (w10);
-			w6.Add (w7);
-			this.buttonSave.Add (w6);
+			this.buttonSave.Label = global::Mono.Unix.Catalog.GetString ("Save");
+			global::Gtk.Image w6 = new global::Gtk.Image ();
+			w6.Pixbuf = global::Stetic.IconLoader.LoadIcon (this, "gtk-save", global::Gtk.IconSize.Button);
+			this.buttonSave.Image = w6;
 			this.buttonsBox.Add (this.buttonSave);
-			global::Gtk.Box.BoxChild w14 = ((global::Gtk.Box.BoxChild)(this.buttonsBox [this.buttonSave]));
-			w14.Position = 0;
-			w14.Expand = false;
-			w14.Fill = false;
+			global::Gtk.Box.BoxChild w7 = ((global::Gtk.Box.BoxChild)(this.buttonsBox [this.buttonSave]));
+			w7.Position = 0;
+			w7.Expand = false;
+			w7.Fill = false;
 			// Container child buttonsBox.Gtk.Box+BoxChild
 			this.buttonSaveAs = new global::Gtk.Button ();
 			this.buttonSaveAs.CanFocus = true;
 			this.buttonSaveAs.Name = "buttonSaveAs";
 			this.buttonSaveAs.UseUnderline = true;
 			this.buttonSaveAs.Relief = ((global::Gtk.ReliefStyle)(2));
-			// Container child buttonSaveAs.Gtk.Container+ContainerChild
-			global::Gtk.Alignment w15 = new global::Gtk.Alignment (0.5F, 0.5F, 0F, 0F);
-			// Container child GtkAlignment.Gtk.Container+ContainerChild
-			global::Gtk.HBox w16 = new global::Gtk.HBox ();
-			w16.Spacing = 2;
-			// Container child GtkHBox.Gtk.Container+ContainerChild
-			global::Gtk.Image w17 = new global::Gtk.Image ();
-			w17.Pixbuf = global::Stetic.IconLoader.LoadIcon (this, "gtk-copy", global::Gtk.IconSize.Button);
-			w16.Add (w17);
-			// Container child GtkHBox.Gtk.Container+ContainerChild
-			global::Gtk.Label w19 = new global::Gtk.Label ();
-			w19.LabelProp = global::Mono.Unix.Catalog.GetString ("Copy");
-			w19.UseUnderline = true;
-			w16.Add (w19);
-			w15.Add (w16);
-			this.buttonSaveAs.Add (w15);
+			this.buttonSaveAs.Label = global::Mono.Unix.Catalog.GetString ("Copy");
+			global::Gtk.Image w8 = new global::Gtk.Image ();
+			w8.Pixbuf = global::Stetic.IconLoader.LoadIcon (this, "gtk-copy", global::Gtk.IconSize.Button);
+			this.buttonSaveAs.Image = w8;
 			this.buttonsBox.Add (this.buttonSaveAs);
-			global::Gtk.Box.BoxChild w23 = ((global::Gtk.Box.BoxChild)(this.buttonsBox [this.buttonSaveAs]));
-			w23.Position = 1;
-			w23.Expand = false;
-			w23.Fill = false;
+			global::Gtk.Box.BoxChild w9 = ((global::Gtk.Box.BoxChild)(this.buttonsBox [this.buttonSaveAs]));
+			w9.Position = 1;
+			w9.Expand = false;
+			w9.Fill = false;
 			// Container child buttonsBox.Gtk.Box+BoxChild
 			this.buttonDelete = new global::Gtk.Button ();
 			this.buttonDelete.CanFocus = true;
 			this.buttonDelete.Name = "buttonDelete";
 			this.buttonDelete.UseUnderline = true;
 			this.buttonDelete.Relief = ((global::Gtk.ReliefStyle)(2));
-			// Container child buttonDelete.Gtk.Container+ContainerChild
-			global::Gtk.Alignment w24 = new global::Gtk.Alignment (0.5F, 0.5F, 0F, 0F);
-			// Container child GtkAlignment.Gtk.Container+ContainerChild
-			global::Gtk.HBox w25 = new global::Gtk.HBox ();
-			w25.Spacing = 2;
-			// Container child GtkHBox.Gtk.Container+ContainerChild
-			global::Gtk.Image w26 = new global::Gtk.Image ();
-			w26.Pixbuf = global::Stetic.IconLoader.LoadIcon (this, "gtk-delete", global::Gtk.IconSize.Button);
-			w25.Add (w26);
-			// Container child GtkHBox.Gtk.Container+ContainerChild
-			global::Gtk.Label w28 = new global::Gtk.Label ();
-			w28.LabelProp = global::Mono.Unix.Catalog.GetString ("Delete");
-			w28.UseUnderline = true;
-			w25.Add (w28);
-			w24.Add (w25);
-			this.buttonDelete.Add (w24);
+			this.buttonDelete.Label = global::Mono.Unix.Catalog.GetString ("Delete");
+			global::Gtk.Image w10 = new global::Gtk.Image ();
+			w10.Pixbuf = global::Stetic.IconLoader.LoadIcon (this, "gtk-delete", global::Gtk.IconSize.Button);
+			this.buttonDelete.Image = w10;
 			this.buttonsBox.Add (this.buttonDelete);
-			global::Gtk.Box.BoxChild w32 = ((global::Gtk.Box.BoxChild)(this.buttonsBox [this.buttonDelete]));
-			w32.Position = 2;
-			w32.Expand = false;
-			w32.Fill = false;
+			global::Gtk.Box.BoxChild w11 = ((global::Gtk.Box.BoxChild)(this.buttonsBox [this.buttonDelete]));
+			w11.Position = 2;
+			w11.Expand = false;
+			w11.Fill = false;
 			this.hbox1.Add (this.buttonsBox);
-			global::Gtk.Box.BoxChild w33 = ((global::Gtk.Box.BoxChild)(this.hbox1 [this.buttonsBox]));
-			w33.Position = 1;
-			w33.Expand = false;
-			w33.Fill = false;
+			global::Gtk.Box.BoxChild w12 = ((global::Gtk.Box.BoxChild)(this.hbox1 [this.buttonsBox]));
+			w12.Position = 1;
+			w12.Expand = false;
+			w12.Fill = false;
 			this.headerBox.Add (this.hbox1);
 			this.vbox3.Add (this.headerBox);
-			global::Gtk.Box.BoxChild w35 = ((global::Gtk.Box.BoxChild)(this.vbox3 [this.headerBox]));
-			w35.Position = 0;
-			w35.Expand = false;
-			w35.Fill = false;
+			global::Gtk.Box.BoxChild w14 = ((global::Gtk.Box.BoxChild)(this.vbox3 [this.headerBox]));
+			w14.Position = 0;
+			w14.Expand = false;
+			w14.Fill = false;
 			// Container child vbox3.Gtk.Box+BoxChild
 			this.viewBox = new global::Gtk.Alignment (0.5F, 0.5F, 1F, 1F);
 			this.viewBox.Name = "viewBox";
 			this.vbox3.Add (this.viewBox);
-			global::Gtk.Box.BoxChild w36 = ((global::Gtk.Box.BoxChild)(this.vbox3 [this.viewBox]));
-			w36.Position = 1;
+			global::Gtk.Box.BoxChild w15 = ((global::Gtk.Box.BoxChild)(this.vbox3 [this.viewBox]));
+			w15.Position = 1;
 			this.hpaned.Add (this.vbox3);
 			this.vbox2.Add (this.hpaned);
-			global::Gtk.Box.BoxChild w38 = ((global::Gtk.Box.BoxChild)(this.vbox2 [this.hpaned]));
-			w38.Position = 0;
+			global::Gtk.Box.BoxChild w17 = ((global::Gtk.Box.BoxChild)(this.vbox2 [this.hpaned]));
+			w17.Position = 0;
 			this.dialog1_VBox.Add (this.vbox2);
-			global::Gtk.Box.BoxChild w39 = ((global::Gtk.Box.BoxChild)(this.dialog1_VBox [this.vbox2]));
-			w39.Position = 1;
+			global::Gtk.Box.BoxChild w18 = ((global::Gtk.Box.BoxChild)(this.dialog1_VBox [this.vbox2]));
+			w18.Position = 1;
 			this.Add (this.dialog1_VBox);
 			if ((this.Child != null)) {
 				this.Child.ShowAll ();
diff --git a/main/src/tools/mdmonitor/gtk-gui/Mono.Instrumentation.Monitor.TimeLineViewWindow.cs b/main/src/tools/mdmonitor/gtk-gui/Mono.Instrumentation.Monitor.TimeLineViewWindow.cs
index 41819b9d87..42c8abce6c 100644
--- a/main/src/tools/mdmonitor/gtk-gui/Mono.Instrumentation.Monitor.TimeLineViewWindow.cs
+++ b/main/src/tools/mdmonitor/gtk-gui/Mono.Instrumentation.Monitor.TimeLineViewWindow.cs
@@ -18,7 +18,7 @@ namespace Mono.Instrumentation.Monitor
 		private global::Gtk.Label label2;
 		private global::Gtk.Button buttonResetScale;
 		private global::Gtk.VScale vscaleScale;
-		
+
 		protected virtual void Build ()
 		{
 			global::Stetic.Gui.Initialize (this);
@@ -106,25 +106,15 @@ namespace Mono.Instrumentation.Monitor
 			this.button3.CanFocus = true;
 			this.button3.Name = "button3";
 			this.button3.UseUnderline = true;
-			// Container child button3.Gtk.Container+ContainerChild
-			global::Gtk.Alignment w9 = new global::Gtk.Alignment (0.5F, 0.5F, 0F, 0F);
-			// Container child GtkAlignment.Gtk.Container+ContainerChild
-			global::Gtk.HBox w10 = new global::Gtk.HBox ();
-			w10.Spacing = 2;
-			// Container child GtkHBox.Gtk.Container+ContainerChild
-			global::Gtk.Image w11 = new global::Gtk.Image ();
-			w11.Pixbuf = global::Stetic.IconLoader.LoadIcon (this, "gtk-zoom-100", global::Gtk.IconSize.Menu);
-			w10.Add (w11);
-			// Container child GtkHBox.Gtk.Container+ContainerChild
-			global::Gtk.Label w13 = new global::Gtk.Label ();
-			w10.Add (w13);
-			w9.Add (w10);
-			this.button3.Add (w9);
+			this.button3.Label = "";
+			global::Gtk.Image w9 = new global::Gtk.Image ();
+			w9.Pixbuf = global::Stetic.IconLoader.LoadIcon (this, "gtk-zoom-100", global::Gtk.IconSize.Menu);
+			this.button3.Image = w9;
 			this.vbox1.Add (this.button3);
-			global::Gtk.Box.BoxChild w17 = ((global::Gtk.Box.BoxChild)(this.vbox1 [this.button3]));
-			w17.Position = 0;
-			w17.Expand = false;
-			w17.Fill = false;
+			global::Gtk.Box.BoxChild w10 = ((global::Gtk.Box.BoxChild)(this.vbox1 [this.button3]));
+			w10.Position = 0;
+			w10.Expand = false;
+			w10.Fill = false;
 			// Container child vbox1.Gtk.Box+BoxChild
 			this.vscaleZoom = new global::Gtk.VScale (null);
 			this.vscaleZoom.HeightRequest = 150;
@@ -139,42 +129,32 @@ namespace Mono.Instrumentation.Monitor
 			this.vscaleZoom.Digits = 0;
 			this.vscaleZoom.ValuePos = ((global::Gtk.PositionType)(2));
 			this.vbox1.Add (this.vscaleZoom);
-			global::Gtk.Box.BoxChild w18 = ((global::Gtk.Box.BoxChild)(this.vbox1 [this.vscaleZoom]));
-			w18.Position = 1;
-			w18.Expand = false;
-			w18.Fill = false;
+			global::Gtk.Box.BoxChild w11 = ((global::Gtk.Box.BoxChild)(this.vbox1 [this.vscaleZoom]));
+			w11.Position = 1;
+			w11.Expand = false;
+			w11.Fill = false;
 			// Container child vbox1.Gtk.Box+BoxChild
 			this.label2 = new global::Gtk.Label ();
 			this.label2.Name = "label2";
 			this.vbox1.Add (this.label2);
-			global::Gtk.Box.BoxChild w19 = ((global::Gtk.Box.BoxChild)(this.vbox1 [this.label2]));
-			w19.Position = 2;
-			w19.Expand = false;
-			w19.Fill = false;
+			global::Gtk.Box.BoxChild w12 = ((global::Gtk.Box.BoxChild)(this.vbox1 [this.label2]));
+			w12.Position = 2;
+			w12.Expand = false;
+			w12.Fill = false;
 			// Container child vbox1.Gtk.Box+BoxChild
 			this.buttonResetScale = new global::Gtk.Button ();
 			this.buttonResetScale.CanFocus = true;
 			this.buttonResetScale.Name = "buttonResetScale";
 			this.buttonResetScale.UseUnderline = true;
-			// Container child buttonResetScale.Gtk.Container+ContainerChild
-			global::Gtk.Alignment w20 = new global::Gtk.Alignment (0.5F, 0.5F, 0F, 0F);
-			// Container child GtkAlignment.Gtk.Container+ContainerChild
-			global::Gtk.HBox w21 = new global::Gtk.HBox ();
-			w21.Spacing = 2;
-			// Container child GtkHBox.Gtk.Container+ContainerChild
-			global::Gtk.Image w22 = new global::Gtk.Image ();
-			w22.Pixbuf = global::Stetic.IconLoader.LoadIcon (this, "stock_draw-dimension-line", global::Gtk.IconSize.Menu);
-			w21.Add (w22);
-			// Container child GtkHBox.Gtk.Container+ContainerChild
-			global::Gtk.Label w24 = new global::Gtk.Label ();
-			w21.Add (w24);
-			w20.Add (w21);
-			this.buttonResetScale.Add (w20);
+			this.buttonResetScale.Label = "";
+			global::Gtk.Image w13 = new global::Gtk.Image ();
+			w13.Pixbuf = global::Stetic.IconLoader.LoadIcon (this, "stock_draw-dimension-line", global::Gtk.IconSize.Menu);
+			this.buttonResetScale.Image = w13;
 			this.vbox1.Add (this.buttonResetScale);
-			global::Gtk.Box.BoxChild w28 = ((global::Gtk.Box.BoxChild)(this.vbox1 [this.buttonResetScale]));
-			w28.Position = 3;
-			w28.Expand = false;
-			w28.Fill = false;
+			global::Gtk.Box.BoxChild w14 = ((global::Gtk.Box.BoxChild)(this.vbox1 [this.buttonResetScale]));
+			w14.Position = 3;
+			w14.Expand = false;
+			w14.Fill = false;
 			// Container child vbox1.Gtk.Box+BoxChild
 			this.vscaleScale = new global::Gtk.VScale (null);
 			this.vscaleScale.HeightRequest = 150;
@@ -189,18 +169,18 @@ namespace Mono.Instrumentation.Monitor
 			this.vscaleScale.Digits = 0;
 			this.vscaleScale.ValuePos = ((global::Gtk.PositionType)(2));
 			this.vbox1.Add (this.vscaleScale);
-			global::Gtk.Box.BoxChild w29 = ((global::Gtk.Box.BoxChild)(this.vbox1 [this.vscaleScale]));
-			w29.Position = 4;
-			w29.Expand = false;
-			w29.Fill = false;
+			global::Gtk.Box.BoxChild w15 = ((global::Gtk.Box.BoxChild)(this.vbox1 [this.vscaleScale]));
+			w15.Position = 4;
+			w15.Expand = false;
+			w15.Fill = false;
 			this.hbox2.Add (this.vbox1);
-			global::Gtk.Box.BoxChild w30 = ((global::Gtk.Box.BoxChild)(this.hbox2 [this.vbox1]));
-			w30.Position = 1;
-			w30.Expand = false;
-			w30.Fill = false;
+			global::Gtk.Box.BoxChild w16 = ((global::Gtk.Box.BoxChild)(this.hbox2 [this.vbox1]));
+			w16.Position = 1;
+			w16.Expand = false;
+			w16.Fill = false;
 			this.vbox2.Add (this.hbox2);
-			global::Gtk.Box.BoxChild w31 = ((global::Gtk.Box.BoxChild)(this.vbox2 [this.hbox2]));
-			w31.Position = 1;
+			global::Gtk.Box.BoxChild w17 = ((global::Gtk.Box.BoxChild)(this.vbox2 [this.hbox2]));
+			w17.Position = 1;
 			this.Add (this.vbox2);
 			if ((this.Child != null)) {
 				this.Child.ShowAll ();