diff --git a/ivolution/data/media/icons/0_Readme_First.txt b/ivolution/data/media/0_Readme_First.txt
similarity index 100%
rename from ivolution/data/media/icons/0_Readme_First.txt
rename to ivolution/data/media/0_Readme_First.txt
diff --git a/ivolution/data/media/icons/accepted_48.png b/ivolution/data/media/accepted_48.png
similarity index 100%
rename from ivolution/data/media/icons/accepted_48.png
rename to ivolution/data/media/accepted_48.png
diff --git a/ivolution/data/media/background.png b/ivolution/data/media/background.png
deleted file mode 100644
index 7bd54d7..0000000
Binary files a/ivolution/data/media/background.png and /dev/null differ
diff --git a/ivolution/data/media/icons/cancel_48.png b/ivolution/data/media/cancel_48.png
similarity index 100%
rename from ivolution/data/media/icons/cancel_48.png
rename to ivolution/data/media/cancel_48.png
diff --git a/ivolution/data/media/icons/folder_add_48.png b/ivolution/data/media/folder_add_48.png
similarity index 100%
rename from ivolution/data/media/icons/folder_add_48.png
rename to ivolution/data/media/folder_add_48.png
diff --git a/ivolution/data/media/icons/spanner_48.ico b/ivolution/data/media/icons/spanner_48.ico
deleted file mode 100644
index da40555..0000000
Binary files a/ivolution/data/media/icons/spanner_48.ico and /dev/null differ
diff --git a/ivolution/data/media/icons/spanner_48.png b/ivolution/data/media/spanner_48.png
similarity index 100%
rename from ivolution/data/media/icons/spanner_48.png
rename to ivolution/data/media/spanner_48.png
diff --git a/ivolution/data/media/tipi.ico b/ivolution/data/media/tipi.ico
deleted file mode 100644
index 58e777d..0000000
Binary files a/ivolution/data/media/tipi.ico and /dev/null differ
diff --git a/ivolution/gui/IvolutionTemplate.py b/ivolution/gui/IvolutionTemplate.py
index 95a62b6..d39407e 100644
--- a/ivolution/gui/IvolutionTemplate.py
+++ b/ivolution/gui/IvolutionTemplate.py
@@ -61,18 +61,18 @@ class IvolutionTemplate ( wx.Frame ):
 		self.toolbar.SetMinSize( wx.Size( -1,30 ) )
 		self.toolbar.SetMaxSize( wx.Size( -1,35 ) )
 
-		self.toolbar.AddTool( inputid, u"Input", wx.Bitmap( u"ivolution/data/media/icons/folder_add_48.png", wx.BITMAP_TYPE_ANY ), wx.NullBitmap, wx.ITEM_NORMAL, wx.EmptyString, wx.EmptyString, None )
+		self.toolbar.AddTool( inputid, u"Input", wx.Bitmap( u"ivolution/data/media/folder_add_48.png", wx.BITMAP_TYPE_ANY ), wx.NullBitmap, wx.ITEM_NORMAL, wx.EmptyString, wx.EmptyString, None )
 
 
-		self.toolbar.AddTool( settingsid, u"Settings", wx.Bitmap( u"ivolution/data/media/icons/spanner_48.png", wx.BITMAP_TYPE_ANY ), wx.NullBitmap, wx.ITEM_NORMAL, wx.EmptyString, wx.EmptyString, None )
+		self.toolbar.AddTool( settingsid, u"Settings", wx.Bitmap( u"ivolution/data/media/spanner_48.png", wx.BITMAP_TYPE_ANY ), wx.NullBitmap, wx.ITEM_NORMAL, wx.EmptyString, wx.EmptyString, None )
 
 
 		self.toolbar.AddSeparator()
 
-		self.toolbar.AddTool( startid, u"Go!", wx.Bitmap( u"ivolution/data/media/icons/accepted_48.png", wx.BITMAP_TYPE_ANY ), wx.NullBitmap, wx.ITEM_NORMAL, wx.EmptyString, wx.EmptyString, None )
+		self.toolbar.AddTool( startid, u"Go!", wx.Bitmap( u"ivolution/data/media/accepted_48.png", wx.BITMAP_TYPE_ANY ), wx.NullBitmap, wx.ITEM_NORMAL, wx.EmptyString, wx.EmptyString, None )
 
 
-		self.toolbar.AddTool( stopid, u"Stop!", wx.Bitmap( u"ivolution/data/media/icons/cancel_48.png", wx.BITMAP_TYPE_ANY ), wx.NullBitmap, wx.ITEM_NORMAL, wx.EmptyString, wx.EmptyString, None )
+		self.toolbar.AddTool( stopid, u"Stop!", wx.Bitmap( u"ivolution/data/media/cancel_48.png", wx.BITMAP_TYPE_ANY ), wx.NullBitmap, wx.ITEM_NORMAL, wx.EmptyString, wx.EmptyString, None )
 
 
 		self.toolbar.AddSeparator()