diff --git a/core/test/net/sf/openrocket/rocketcomponent/SymmetricComponentVolumeTest.java b/core/test/net/sf/openrocket/rocketcomponent/SymmetricComponentVolumeTest.java
index 0a2170188..abbc5159e 100644
--- a/core/test/net/sf/openrocket/rocketcomponent/SymmetricComponentVolumeTest.java
+++ b/core/test/net/sf/openrocket/rocketcomponent/SymmetricComponentVolumeTest.java
@@ -18,7 +18,7 @@ public class SymmetricComponentVolumeTest extends BaseTestCase {
 
         nc.setLength(1.0);
         nc.setFilled(true);
-        nc.setType(Transition.Shape.CONICAL);
+        nc.setShapeType(Transition.Shape.CONICAL);
         nc.setAftRadius(1.0);
         nc.setMaterial(Material.newMaterial(Material.Type.BULK, "test", density, true));
 
@@ -42,7 +42,7 @@ public class SymmetricComponentVolumeTest extends BaseTestCase {
 
         nc.setLength(1.0);
         nc.setFilled(true);
-        nc.setType(Transition.Shape.CONICAL);
+        nc.setShapeType(Transition.Shape.CONICAL);
         nc.setAftRadius(1.0);
         nc.setAftShoulderRadius(1.0);
         nc.setAftShoulderLength(1.0);
@@ -72,7 +72,7 @@ public class SymmetricComponentVolumeTest extends BaseTestCase {
         nc.setLength(1.0);
         nc.setAftRadius(1.0);
         nc.setThickness(0.5);
-        nc.setType(Transition.Shape.CONICAL);
+        nc.setShapeType(Transition.Shape.CONICAL);
         nc.setMaterial(Material.newMaterial(Material.Type.BULK, "test", density, true));
 
         Coordinate cg = nc.getCG();
@@ -104,7 +104,7 @@ public class SymmetricComponentVolumeTest extends BaseTestCase {
         final double density = 2.0;
 
         nc.setLength(1.0);
-        nc.setType(Transition.Shape.CONICAL);
+        nc.setShapeType(Transition.Shape.CONICAL);
         nc.setAftRadius(1.0);
         nc.setThickness(0.5);
         nc.setAftShoulderRadius(1.0);
@@ -142,7 +142,7 @@ public class SymmetricComponentVolumeTest extends BaseTestCase {
 
         nc.setLength(4.0);
         nc.setFilled(true);
-        nc.setType(Transition.Shape.CONICAL);
+        nc.setShapeType(Transition.Shape.CONICAL);
         nc.setForeRadius(1.0);
         nc.setAftRadius(2.0);
         nc.setMaterial(Material.newMaterial(Material.Type.BULK, "test", density, true));
@@ -167,7 +167,7 @@ public class SymmetricComponentVolumeTest extends BaseTestCase {
 
         nc.setLength(4.0);
         nc.setFilled(true);
-        nc.setType(Transition.Shape.CONICAL);
+        nc.setShapeType(Transition.Shape.CONICAL);
         nc.setForeRadius(1.0);
         nc.setAftRadius(2.0);
         nc.setAftShoulderLength(1.0);
@@ -202,7 +202,7 @@ public class SymmetricComponentVolumeTest extends BaseTestCase {
         final double density = 2.0;
 
         nc.setLength(1.0);
-        nc.setType(Transition.Shape.CONICAL);
+        nc.setShapeType(Transition.Shape.CONICAL);
         nc.setForeRadius(0.5);
         nc.setAftRadius(1.0);
         nc.setThickness(0.5);
@@ -242,7 +242,7 @@ public class SymmetricComponentVolumeTest extends BaseTestCase {
         final double density = 2.0;
 
         nc.setLength(1.0);
-        nc.setType(Transition.Shape.CONICAL);
+        nc.setShapeType(Transition.Shape.CONICAL);
         nc.setForeRadius(0.5);
         nc.setAftRadius(1.0);
         nc.setThickness(0.5);
@@ -295,7 +295,7 @@ public class SymmetricComponentVolumeTest extends BaseTestCase {
         final double density = 2.0;
 
         nc.setLength(1.0);
-        nc.setType(Transition.Shape.CONICAL);
+        nc.setShapeType(Transition.Shape.CONICAL);
         nc.setForeRadius(0.5);
         nc.setAftRadius(1.0);
         nc.setThickness(0.25);
@@ -337,7 +337,7 @@ public class SymmetricComponentVolumeTest extends BaseTestCase {
         final double density = 2.0;
 
         nc.setLength(1.0);
-        nc.setType(Transition.Shape.CONICAL);
+        nc.setShapeType(Transition.Shape.CONICAL);
         nc.setForeRadius(0.5);
         nc.setAftRadius(1.0);
         nc.setThickness(0.25);
diff --git a/swing/src/net/sf/openrocket/gui/main/BasicFrame.java b/swing/src/net/sf/openrocket/gui/main/BasicFrame.java
index 3fb4410a0..414344bb7 100644
--- a/swing/src/net/sf/openrocket/gui/main/BasicFrame.java
+++ b/swing/src/net/sf/openrocket/gui/main/BasicFrame.java
@@ -463,7 +463,6 @@ public class BasicFrame extends JFrame {
 			}
 		});
 		fileMenu.add(item);
-		fileMenu.addSeparator();
 
 		//  export sim table...
 		AbstractAction simTableExportAction = simulationPanel.getSimulationTableAsCSVExportAction();
diff --git a/swing/src/net/sf/openrocket/gui/util/Icons.java b/swing/src/net/sf/openrocket/gui/util/Icons.java
index 47f2da838..89f827483 100644
--- a/swing/src/net/sf/openrocket/gui/util/Icons.java
+++ b/swing/src/net/sf/openrocket/gui/util/Icons.java
@@ -79,7 +79,8 @@ public class Icons {
 	public static final Icon HELP_BUG_REPORT = loadImageIcon("pix/icons/help-bug.png", "Bug report");
 	public static final Icon HELP_DEBUG_LOG = loadImageIcon("pix/icons/help-log.png", "Debug log");
 	public static final Icon HELP_TOURS = loadImageIcon("pix/icons/help-tours.png", "Guided tours");
-	
+	public static final Icon WIKI = loadImageIcon("pix/icons/wiki.png", "Wiki (Documentation)");
+
 	public static final Icon ZOOM_IN = loadImageIcon("pix/icons/zoom-in.png", "Zoom in");
 	public static final Icon ZOOM_OUT = loadImageIcon("pix/icons/zoom-out.png", "Zoom out");
 	public static final Icon ZOOM_RESET = loadImageIcon("pix/icons/zoom-reset.png", "Reset Zoom & Pan");