diff --git a/src/gui/control/graph.cpp b/src/gui/control/graph.cpp
index 8ef0bea1..8dc4aedd 100644
--- a/src/gui/control/graph.cpp
+++ b/src/gui/control/graph.cpp
@@ -160,7 +160,7 @@ void BarGraph::draw(RotatedDC& dc, int current) const {
 	}
 	// How many labels and lines to draw?
 	dc.SetFont(*wxNORMAL_FONT);
-	UInt label_step = UInt(max(1.0, dc.GetCharHeight() / step_height));
+	UInt label_step = UInt(max(1.0, (dc.GetCharHeight() + 1) / step_height));
 	// Draw backlines (horizontal) and value labels
 	dc.SetPen(lerp(bg, fg, 0.5));
 	for (UInt i = 0 ; i <= axis.max ; ++i) {
@@ -218,6 +218,10 @@ int BarGraph::findItem(const RealPoint& pos, const RealRect& rect1) const {
 
 // ----------------------------------------------------------------------------- : Pie Graph
 
+// ----------------------------------------------------------------------------- : Scatter Graph
+
+
+
 // ----------------------------------------------------------------------------- : Graph Legend
 
 // ----------------------------------------------------------------------------- : GraphControl
diff --git a/src/gui/set/window.cpp b/src/gui/set/window.cpp
index 2bbf8d27..5ba5128a 100644
--- a/src/gui/set/window.cpp
+++ b/src/gui/set/window.cpp
@@ -54,11 +54,11 @@ SetWindow::SetWindow(Window* parent, const SetP& set)
 		menuFile->Append(ID_FILE_SAVE,		_("save"),		_MENU_("save set"),			_HELP_("save set"));
 		menuFile->Append(ID_FILE_SAVE_AS,					_MENU_("save set as"),		_HELP_("save set as"));
 		IconMenu* menuExport = new IconMenu();
-			menuExport->Append(ID_FILE_EXPORT_HTML,				_MENU_("export html"),		_HELP_("export html"));
-			menuExport->Append(ID_FILE_EXPORT_IMAGE,			_MENU_("export image"),		_HELP_("export image"));
-			menuExport->Append(ID_FILE_EXPORT_IMAGES,			_MENU_("export images"),	_HELP_("export images"));
-			menuExport->Append(ID_FILE_EXPORT_APPR,				_MENU_("export apprentice"),_HELP_("export apprentice"));
-			menuExport->Append(ID_FILE_EXPORT_MWS,				_MENU_("export mws"),		_HELP_("export mws"));
+			menuExport->Append(ID_FILE_EXPORT_HTML,		_("export_html"),		_MENU_("export html"),		_HELP_("export html"));
+			menuExport->Append(ID_FILE_EXPORT_IMAGE,	_("export_image"),		_MENU_("export image"),		_HELP_("export image"));
+			menuExport->Append(ID_FILE_EXPORT_IMAGES,	_("export_images"),		_MENU_("export images"),	_HELP_("export images"));
+			menuExport->Append(ID_FILE_EXPORT_APPR,		_("export_apprentice"),	_MENU_("export apprentice"),_HELP_("export apprentice"));
+			menuExport->Append(ID_FILE_EXPORT_MWS,		_("export_mws"),		_MENU_("export mws"),		_HELP_("export mws"));
 		menuFile->Append(ID_FILE_EXPORT,					_MENU_("export"),					_("Export the set..."), menuExport);
 		menuFile->AppendSeparator();
 //		menuFile->Append(ID_FILE_INSPECT,					_("Inspect Internal Data..."),	_("Shows a the data in the set using a tree structure"));
diff --git a/src/resource/msw/mse.rc b/src/resource/msw/mse.rc
index 4470fffd..0db79006 100644
--- a/src/resource/msw/mse.rc
+++ b/src/resource/msw/mse.rc
@@ -22,6 +22,11 @@ cursor/rot_text			CURSOR	"cursor/rot_text.cur"
 tool/new				IMAGE	"tool/new.png"
 tool/open				IMAGE	"tool/open.png"
 tool/save				IMAGE	"tool/save.png"
+tool/export_html		IMAGE	"tool/export_html.png"
+tool/export_image		IMAGE	"tool/export_image.png"
+tool/export_images		IMAGE	"tool/export_images.png"
+tool/export_mws			IMAGE	"tool/export_mws.png"
+tool/export_apprentice	IMAGE	"tool/export_apprentice.png"
 
 tool/undo				IMAGE	"tool/undo.png"
 tool/redo				IMAGE	"tool/redo.png"
diff --git a/src/resource/msw/tool/export_apprentice.png b/src/resource/msw/tool/export_apprentice.png
new file mode 100644
index 00000000..2a31978a
Binary files /dev/null and b/src/resource/msw/tool/export_apprentice.png differ
diff --git a/src/resource/msw/tool/export_html.png b/src/resource/msw/tool/export_html.png
new file mode 100644
index 00000000..ff0f1f06
Binary files /dev/null and b/src/resource/msw/tool/export_html.png differ
diff --git a/src/resource/msw/tool/export_image.png b/src/resource/msw/tool/export_image.png
new file mode 100644
index 00000000..299b9f10
Binary files /dev/null and b/src/resource/msw/tool/export_image.png differ
diff --git a/src/resource/msw/tool/export_images.png b/src/resource/msw/tool/export_images.png
new file mode 100644
index 00000000..bcdc14d7
Binary files /dev/null and b/src/resource/msw/tool/export_images.png differ
diff --git a/src/resource/msw/tool/export_mws.png b/src/resource/msw/tool/export_mws.png
new file mode 100644
index 00000000..2fa7c1aa
Binary files /dev/null and b/src/resource/msw/tool/export_mws.png differ