diff --git a/ChangeLog b/ChangeLog
index 86dd19684..90bca4b46 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,36 @@
+2008-06-28	Tobias Doerffel	<tobydox/at/users/dot/sourceforge/dot/net>
+
+	* src/gui/main_window.cpp:
+	* src/gui/song_editor.cpp:
+	* src/tracks/instrument_track.cpp:
+	* data/themes/default/edit_draw.png:
+	* data/themes/default/add_bb_track.png:
+	* data/themes/default/edit_arrow.png:
+	* data/themes/default/stop.png:
+	* data/themes/default/mute_off_disabled.png:
+	* data/themes/default/mute_on_disabled.png:
+	* data/themes/default/style.css:
+	* data/themes/default/play.png:
+	* data/themes/default/mute_on.png:
+	* data/themes/default/record.png:
+	* data/themes/default/automation.png:
+	* data/themes/default/help.png:
+	* data/themes/default/sample_track.png:
+	* data/themes/default/track_op_menu_disabled.png:
+	* data/themes/default/edit_select.png:
+	* data/themes/default/effect_board.png:
+	* data/themes/default/mute_off.png:
+	* data/themes/default/pause.png:
+	* data/themes/default/bb_track.png:
+	* data/themes/default/add_automation.png:
+	* data/themes/default/edit_erase.png:
+	* data/themes/default/record_accompany.png:
+	* data/themes/default/edit_move.png:
+	* data/themes/default/add_sample_track.png:
+	* data/themes/default/songeditor.png:
+	* data/themes/default/fx_mixer.png:
+	improved artwork and maintoolbar
+
 2008-06-28	Paul Giblock <drfaygo/at/gmail/dot/com>
 
 	* configure.in:
diff --git a/data/themes/default/add_automation.png b/data/themes/default/add_automation.png
index dac8efe9d..640705753 100644
Binary files a/data/themes/default/add_automation.png and b/data/themes/default/add_automation.png differ
diff --git a/data/themes/default/add_bb_track.png b/data/themes/default/add_bb_track.png
index 9f99ff3a1..a42e8b517 100644
Binary files a/data/themes/default/add_bb_track.png and b/data/themes/default/add_bb_track.png differ
diff --git a/data/themes/default/add_sample_track.png b/data/themes/default/add_sample_track.png
index e820dd05a..b0130739c 100644
Binary files a/data/themes/default/add_sample_track.png and b/data/themes/default/add_sample_track.png differ
diff --git a/data/themes/default/automation.png b/data/themes/default/automation.png
index 66c0c9350..9461fd032 100644
Binary files a/data/themes/default/automation.png and b/data/themes/default/automation.png differ
diff --git a/data/themes/default/bb_track.png b/data/themes/default/bb_track.png
index c84b7ea49..40f58e139 100644
Binary files a/data/themes/default/bb_track.png and b/data/themes/default/bb_track.png differ
diff --git a/data/themes/default/edit_arrow.png b/data/themes/default/edit_arrow.png
deleted file mode 100644
index 10d570246..000000000
Binary files a/data/themes/default/edit_arrow.png and /dev/null differ
diff --git a/data/themes/default/edit_draw.png b/data/themes/default/edit_draw.png
index 141ed487e..45ddf2ccd 100644
Binary files a/data/themes/default/edit_draw.png and b/data/themes/default/edit_draw.png differ
diff --git a/data/themes/default/edit_erase.png b/data/themes/default/edit_erase.png
index 790d29bd0..e19451370 100644
Binary files a/data/themes/default/edit_erase.png and b/data/themes/default/edit_erase.png differ
diff --git a/data/themes/default/edit_move.png b/data/themes/default/edit_move.png
index 5930cd6a0..d9d7536c2 100644
Binary files a/data/themes/default/edit_move.png and b/data/themes/default/edit_move.png differ
diff --git a/data/themes/default/edit_select.png b/data/themes/default/edit_select.png
index 9cd8027c6..3019d54cf 100644
Binary files a/data/themes/default/edit_select.png and b/data/themes/default/edit_select.png differ
diff --git a/data/themes/default/effect_board.png b/data/themes/default/effect_board.png
deleted file mode 100644
index 9c10fddfb..000000000
Binary files a/data/themes/default/effect_board.png and /dev/null differ
diff --git a/data/themes/default/fx_mixer.png b/data/themes/default/fx_mixer.png
index 09b33994f..f5d9b032d 100644
Binary files a/data/themes/default/fx_mixer.png and b/data/themes/default/fx_mixer.png differ
diff --git a/data/themes/default/help.png b/data/themes/default/help.png
index 1b97035a1..86b64075f 100644
Binary files a/data/themes/default/help.png and b/data/themes/default/help.png differ
diff --git a/data/themes/default/mute_off.png b/data/themes/default/mute_off.png
deleted file mode 100644
index 22f0a800b..000000000
Binary files a/data/themes/default/mute_off.png and /dev/null differ
diff --git a/data/themes/default/mute_off_disabled.png b/data/themes/default/mute_off_disabled.png
deleted file mode 100644
index 136604dca..000000000
Binary files a/data/themes/default/mute_off_disabled.png and /dev/null differ
diff --git a/data/themes/default/mute_on.png b/data/themes/default/mute_on.png
deleted file mode 100644
index 6b576f217..000000000
Binary files a/data/themes/default/mute_on.png and /dev/null differ
diff --git a/data/themes/default/mute_on_disabled.png b/data/themes/default/mute_on_disabled.png
deleted file mode 100644
index 8e4e9ad4d..000000000
Binary files a/data/themes/default/mute_on_disabled.png and /dev/null differ
diff --git a/data/themes/default/pause.png b/data/themes/default/pause.png
index dba4a7670..d133bdc5f 100644
Binary files a/data/themes/default/pause.png and b/data/themes/default/pause.png differ
diff --git a/data/themes/default/play.png b/data/themes/default/play.png
index 4cb97c14e..2820368e8 100644
Binary files a/data/themes/default/play.png and b/data/themes/default/play.png differ
diff --git a/data/themes/default/record.png b/data/themes/default/record.png
index 1f84f7856..7f3eef114 100644
Binary files a/data/themes/default/record.png and b/data/themes/default/record.png differ
diff --git a/data/themes/default/record_accompany.png b/data/themes/default/record_accompany.png
index 166339f17..1a58c2a12 100644
Binary files a/data/themes/default/record_accompany.png and b/data/themes/default/record_accompany.png differ
diff --git a/data/themes/default/sample_track.png b/data/themes/default/sample_track.png
index 6cb8b311a..8a30401bf 100644
Binary files a/data/themes/default/sample_track.png and b/data/themes/default/sample_track.png differ
diff --git a/data/themes/default/songeditor.png b/data/themes/default/songeditor.png
index 3b39a9f87..4f5203878 100644
Binary files a/data/themes/default/songeditor.png and b/data/themes/default/songeditor.png differ
diff --git a/data/themes/default/stop.png b/data/themes/default/stop.png
index a5141591d..4ecbdf6ed 100644
Binary files a/data/themes/default/stop.png and b/data/themes/default/stop.png differ
diff --git a/data/themes/default/style.css b/data/themes/default/style.css
index 2a85ed935..961710a8e 100644
--- a/data/themes/default/style.css
+++ b/data/themes/default/style.css
@@ -93,13 +93,13 @@ QToolBar {
 QToolButton, toolButton {
 	padding: 2px 1px 1px 2px;
 	border-radius: 2px;
-	border: none;
+	border: 1px solid rgba(0,0,0,64);
 }
 
 QToolButton:hover {
-	background: rgba(255,255,255,96);
+	background: rgba(255,255,255,128);
 	border-radius: 3px;
-	border: 1px solid rgba(255,255,255,64);
+	border: 1px solid rgba(0,0,0,128);
 }
 
 QToolButton:pressed {
diff --git a/data/themes/default/track_op_menu_disabled.png b/data/themes/default/track_op_menu_disabled.png
deleted file mode 100644
index ecf3acba9..000000000
Binary files a/data/themes/default/track_op_menu_disabled.png and /dev/null differ
diff --git a/src/gui/main_window.cpp b/src/gui/main_window.cpp
index d20f6222b..b9e47d27a 100644
--- a/src/gui/main_window.cpp
+++ b/src/gui/main_window.cpp
@@ -220,6 +220,21 @@ void mainWindow::finalize( void )
 
 
 	// window-toolbar
+	toolButton * song_editor_window = new toolButton(
+					embed::getIconPixmap( "songeditor" ),
+					tr( "Show/hide Song-Editor" ) + " (F5)",
+					this, SLOT( toggleSongEditorWin() ),
+								m_toolBar );
+	song_editor_window->setShortcut( Qt::Key_F5 );
+	song_editor_window->setWhatsThis(
+		tr( "By pressing this button, you can show or hide the "
+			"Song-Editor. With the help of the Song-Editor you can "
+			"edit song-playlist and specify when which track "
+			"should be played. "
+			"You can also insert and move samples (e.g. "
+			"rap-samples) directly into the playlist." ) );
+
+
 	toolButton * bb_editor_window = new toolButton(
 					embed::getIconPixmap( "bb_track" ),
 					tr( "Show/hide Beat+Baseline Editor" ) +
@@ -249,29 +264,14 @@ void mainWindow::finalize( void )
 				"you can edit melody-patterns in an easy way."
 				) );
 
-	toolButton * song_editor_window = new toolButton(
-					embed::getIconPixmap( "songeditor" ),
-					tr( "Show/hide Song-Editor" ) + " (F8)",
-					this, SLOT( toggleSongEditorWin() ),
-								m_toolBar );
-	song_editor_window->setShortcut( Qt::Key_F8 );
-	song_editor_window->setWhatsThis(
-		tr( "By pressing this button, you can show or hide the "
-			"Song-Editor. With the help of the Song-Editor you can "
-			"edit song-playlist and specify when which track "
-			"should be played. "
-			"You can also insert and move samples (e.g. "
-			"rap-samples) directly into the playlist." ) );
-
-
 	toolButton * automation_editor_window = new toolButton(
 					embed::getIconPixmap( "automation" ),
 					tr( "Show/hide Automation Editor" ) +
-									" (F9)",
+									" (F8)",
 					this,
 					SLOT( toggleAutomationEditorWin() ),
 					m_toolBar );
-	automation_editor_window->setShortcut( Qt::Key_F9 );
+	automation_editor_window->setShortcut( Qt::Key_F8 );
 	automation_editor_window->setWhatsThis(
 			tr( "By pressing this button, you can show or hide the "
 				"Automation Editor. With the help of the "
@@ -281,9 +281,10 @@ void mainWindow::finalize( void )
 
 	toolButton * fx_mixer_window = new toolButton(
 					embed::getIconPixmap( "fx_mixer" ),
-					tr( "Show/hide FX Mixer" ) + " (F11)",
-					this, SLOT( toggleFxMixerWin() ), m_toolBar );
-	fx_mixer_window->setShortcut( Qt::Key_F11 );
+					tr( "Show/hide FX Mixer" ) + " (F9)",
+					this, SLOT( toggleFxMixerWin() ),
+					m_toolBar );
+	fx_mixer_window->setShortcut( Qt::Key_F9 );
 	fx_mixer_window->setWhatsThis( 
 		tr( "By pressing this button, you can show or hide the "
 			"FX Mixer. The FX Mixer is a very powerful tool "
@@ -302,9 +303,9 @@ void mainWindow::finalize( void )
 			"project notes window. In this window you can put "
 			"down your project notes.") );
 
-	m_toolBarLayout->addWidget( bb_editor_window, 1, 1 );
-	m_toolBarLayout->addWidget( piano_roll_window, 1, 2 );
-	m_toolBarLayout->addWidget( song_editor_window, 1, 3 );
+	m_toolBarLayout->addWidget( song_editor_window, 1, 1 );
+	m_toolBarLayout->addWidget( bb_editor_window, 1, 2 );
+	m_toolBarLayout->addWidget( piano_roll_window, 1, 3 );
 	m_toolBarLayout->addWidget( automation_editor_window, 1, 4 );
 	m_toolBarLayout->addWidget( fx_mixer_window, 1, 5 );
 	m_toolBarLayout->addWidget( project_notes_window, 1, 6 );
diff --git a/src/gui/song_editor.cpp b/src/gui/song_editor.cpp
index 9668873c4..c6115f0c6 100644
--- a/src/gui/song_editor.cpp
+++ b/src/gui/song_editor.cpp
@@ -250,7 +250,7 @@ songEditor::songEditor( song * _song, songEditor * & _engine_ptr ) :
 	m_drawModeButton->setChecked( TRUE );
 
 	m_editModeButton = new toolButton( embed::getIconPixmap(
-								"edit_arrow" ),
+								"edit_select" ),
 					tr( "Edit mode (select and move)" ),
 							NULL, NULL, m_toolBar );
 	m_editModeButton->setCheckable( TRUE );
diff --git a/src/tracks/instrument_track.cpp b/src/tracks/instrument_track.cpp
index 1ccb2be3b..5cafc452e 100644
--- a/src/tracks/instrument_track.cpp
+++ b/src/tracks/instrument_track.cpp
@@ -1485,7 +1485,7 @@ void instrumentTrackButton::paintEvent( QPaintEvent * _pe )
 					extra, height() / 2 + extra, in );
 	p.setPen( QColor( 0, 0, 0 ) );
 	p.drawText( ( width() - QFontMetrics( p.font() ).width( n ) ) /
-				2 + extra, height() / 2 +
+				2 + extra, height() / 2 - 2 +
 				QFontMetrics( p.font() ).height() + extra, n );
 }