diff --git a/libs/gtkutil/toolbar.cpp b/libs/gtkutil/toolbar.cpp
index 9f1e81cb..37c52f8f 100644
--- a/libs/gtkutil/toolbar.cpp
+++ b/libs/gtkutil/toolbar.cpp
@@ -31,6 +31,12 @@
 #include "pointer.h"
 
 
+void toolbar_append_space( GtkToolbar* toolbar ){
+	GtkToolItem* space = gtk_separator_tool_item_new();
+	gtk_widget_show( GTK_WIDGET( space ) );
+	gtk_toolbar_insert( toolbar, space, -1 );
+}
+
 void toolbar_append( GtkToolbar* toolbar, GtkButton* button, const char* description ){
 	gtk_widget_show( GTK_WIDGET( button ) );
 	gtk_button_set_relief( button, GTK_RELIEF_NONE );
diff --git a/libs/gtkutil/toolbar.h b/libs/gtkutil/toolbar.h
index 6b9e32fb..91a76495 100644
--- a/libs/gtkutil/toolbar.h
+++ b/libs/gtkutil/toolbar.h
@@ -30,6 +30,7 @@ typedef struct _GtkToolbar GtkToolbar;
 class Command;
 class Toggle;
 
+void toolbar_append_space( GtkToolbar* toolbar );
 GtkButton* toolbar_append_button( GtkToolbar* toolbar, const char* description, const char* icon, const Callback& callback );
 GtkButton* toolbar_append_button( GtkToolbar* toolbar, const char* description, const char* icon, const Command& command );
 GtkToggleButton* toolbar_append_toggle_button( GtkToolbar* toolbar, const char* description, const char* icon, const Callback& callback );
diff --git a/radiant/filterbar.cpp b/radiant/filterbar.cpp
index e5e71b97..5614993b 100644
--- a/radiant/filterbar.cpp
+++ b/radiant/filterbar.cpp
@@ -2,6 +2,7 @@
 #include <gtk/gtk.h>
 #include "gtkmisc.h"
 #include "gtkutil/widget.h"
+#include "gtkutil/toolbar.h"
 #include "stream/stringstream.h"
 #include "select.h"
 #include "iundo.h"
@@ -232,7 +233,7 @@ GtkToolbar* create_filter_toolbar(){
 			g_signal_connect( G_OBJECT( button ), "button_press_event", G_CALLBACK( Func_Groups_button_press ), 0 );
 
 			toolbar_append_toggle_button( toolbar, "Patches (CTRL + P)", "patch_wireframe.png", "FilterPatches" );
-			gtk_toolbar_append_space( GTK_TOOLBAR( toolbar ) );
+			toolbar_append_space( toolbar );
 
 //			if ( g_pGameDescription->mGameType == "doom3" ) {
 //				button = toolbar_append_toggle_button( toolbar, "Visportals (ALT + 3)\nRightClick: toggle tex\n\tnoDraw\n\tnoDrawNonSolid", "f-areaportal.png", "FilterVisportals" );
@@ -259,7 +260,7 @@ GtkToolbar* create_filter_toolbar(){
 			g_signal_connect( G_OBJECT( button ), "button_press_event", G_CALLBACK( Hint_button_press ), 0 );
 
 			//toolbar_append_toggle_button( toolbar, "Paths (ALT + 8)", "texture_lock.png", "FilterPaths" );
-			gtk_toolbar_append_space( GTK_TOOLBAR( toolbar ) );
+			toolbar_append_space( toolbar );
 			toolbar_append_toggle_button( toolbar, "Entities (ALT + 2)", "f-entities.png", "FilterEntities" );
 			toolbar_append_toggle_button( toolbar, "Lights (ALT + 0)", "f-lights.png", "FilterLights" );
 			toolbar_append_toggle_button( toolbar, "Models (SHIFT + M)", "f-models.png", "FilterModels" );
@@ -268,12 +269,12 @@ GtkToolbar* create_filter_toolbar(){
 			g_signal_connect( G_OBJECT( button ), "button_press_event", G_CALLBACK( Trigger_button_press ), 0 );
 
 			//toolbar_append_toggle_button( toolbar, "Decals (SHIFT + D)", "f-decals.png", "FilterDecals" );
-			gtk_toolbar_append_space( GTK_TOOLBAR( toolbar ) );
+			toolbar_append_space( toolbar );
 			//toolbar_append_button( toolbar, "InvertFilters", "f-invert.png", "InvertFilters" );
 
 			toolbar_append_button( toolbar, "ResetFilters", "f-reset.png", "ResetFilters" );
 
-			gtk_toolbar_append_space( GTK_TOOLBAR( toolbar ) );
+			toolbar_append_space( toolbar );
 			button = toolbar_append_toggle_button( toolbar, "Region Set Selection (CTRL + SHIFT + R)\nRightClick: Region Off", "f-region.png", "RegionSetSelection" );
 			g_signal_connect( G_OBJECT( button ), "button_press_event", G_CALLBACK( Region_button_press ), 0 );
 
diff --git a/radiant/mainframe.cpp b/radiant/mainframe.cpp
index a337b9ba..375d0989 100644
--- a/radiant/mainframe.cpp
+++ b/radiant/mainframe.cpp
@@ -62,6 +62,7 @@
 #include "gtkutil/image.h"
 #include "gtkutil/menu.h"
 #include "gtkutil/paned.h"
+#include "gtkutil/toolbar.h"
 #include "gtkutil/widget.h"
 
 #include "autosave.h"
@@ -2570,46 +2571,45 @@ GtkToolbar* create_main_toolbar( MainFrame::EViewStyle style ){
 	gtk_toolbar_set_style( toolbar, GTK_TOOLBAR_ICONS );
 //	gtk_toolbar_set_show_arrow( toolbar, TRUE );
 	//gtk_orientable_set_orientation( GTK_ORIENTABLE( toolbar ), GTK_ORIENTATION_HORIZONTAL );
-	//toolbar_append_space( toolbar );
 	gtk_widget_show( GTK_WIDGET( toolbar ) );
 
 	File_constructToolbar( toolbar );
-	gtk_toolbar_append_space( toolbar );
+	toolbar_append_space( toolbar );
 
 	UndoRedo_constructToolbar( toolbar );
-	gtk_toolbar_append_space( toolbar );
+	toolbar_append_space( toolbar );
 
 	RotateFlip_constructToolbar( toolbar );
-	gtk_toolbar_append_space( toolbar );
+	toolbar_append_space( toolbar );
 
 	Select_constructToolbar( toolbar );
-	gtk_toolbar_append_space( toolbar );
+	toolbar_append_space( toolbar );
 
 	CSG_constructToolbar( toolbar );
-	gtk_toolbar_append_space( toolbar );
+	toolbar_append_space( toolbar );
 
 	ComponentModes_constructToolbar( toolbar );
-	gtk_toolbar_append_space( toolbar );
+	toolbar_append_space( toolbar );
 
 	if ( style != MainFrame::eSplit ) {
 		XYWnd_constructToolbar( toolbar );
-		gtk_toolbar_append_space( toolbar );
+		toolbar_append_space( toolbar );
 	}
 
 	CamWnd_constructToolbar( toolbar );
-	gtk_toolbar_append_space( toolbar );
+	toolbar_append_space( toolbar );
 
 	Manipulators_constructToolbar( toolbar );
-	gtk_toolbar_append_space( toolbar );
+	toolbar_append_space( toolbar );
 
 	if ( g_Layout_enablePatchToolbar.m_value ) {
 		Patch_constructToolbar( toolbar );
-		gtk_toolbar_append_space( toolbar );
+		toolbar_append_space( toolbar );
 	}
 
 	toolbar_append_toggle_button( toolbar, "Texture Lock (SHIFT + T)", "texture_lock.png", "TogTexLock" );
 	toolbar_append_toggle_button( toolbar, "Texture Vertex Lock", "texture_vertexlock.png", "TogTexVertexLock" );
-	gtk_toolbar_append_space( toolbar );
+	toolbar_append_space( toolbar );
 
 	toolbar_append_button( toolbar, "Entities (N)", "entities.png", "ToggleEntityInspector" );
 	// disable the console and texture button in the regular layouts
@@ -2621,7 +2621,7 @@ GtkToolbar* create_main_toolbar( MainFrame::EViewStyle style ){
 	// TODO: call light inspector
 	//GtkButton* g_view_lightinspector_button = toolbar_append_button(toolbar, "Light Inspector", "lightinspector.png", "ToggleLightInspector");
 
-	gtk_toolbar_append_space( toolbar );
+	toolbar_append_space( toolbar );
 	toolbar_append_button( toolbar, "Refresh Models", "refresh_models.png", "RefreshReferences" );
 
 	return toolbar;