diff --git a/ChangeLog b/ChangeLog
index 017e4e48b..5f24896ef 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,68 @@
 2008-05-13	Tobias Doerffel	<tobydox/at/users/dot/sourceforge/dot/net>
 
+	* include/track.h:
+	* include/pixmap_button.h:
+	* src/core/track.cpp:
+	* src/gui/widgets/pixmap_button.cpp:
+	toggle solo via Ctrl+left mouse button
+
+	* src/gui/fx_mixer_view.cpp:
+	set window-icon
+
+	* src/gui/widgets/tab_widget.cpp:
+	use colors from active palette
+
+	* src/gui/widgets/project_notes.cpp:
+	hide per default
+
+	* src/gui/main_window.cpp:
+	* src/core/timeline.cpp:
+	* data/themes/default/project_export.png:
+	* data/themes/default/hourglass.png:
+	* data/themes/default/hq_mode.png:
+	* data/themes/default/edit_paste.png:
+	* data/themes/default/text_bold.png:
+	* data/themes/default/project_save.png:
+	* data/themes/default/playpos_marker.png:
+	* data/themes/default/exit.png:
+	* data/themes/default/text_center.png:
+	* data/themes/default/error.png:
+	* data/themes/default/edit_cut.png:
+	* data/themes/default/mute_on.png:
+	* data/themes/default/project_saveas.png:
+	* data/themes/default/loop_point_disabled.png:
+	* data/themes/default/arp_random_on.png:
+	* data/themes/default/edit_copy.png:
+	* data/themes/default/edit_redo.png:
+	* data/themes/default/arp_down_on.png:
+	* data/themes/default/track_op_menu_disabled.png:
+	* data/themes/default/project_notes.png:
+	* data/themes/default/track_op_menu.png:
+	* data/themes/default/groupbox_led_bg.png:
+	* data/themes/default/arp_down_off.png:
+	* data/themes/default/mute_off.png:
+	* data/themes/default/text_italic.png:
+	* data/themes/default/arp_random_off.png:
+	* data/themes/default/root.png:
+	* data/themes/default/apply.png:
+	* data/themes/default/text_block.png:
+	* data/themes/default/text_left.png:
+	* data/themes/default/arp_up_off.png:
+	* data/themes/default/text_right.png:
+	* data/themes/default/project_open.png:
+	* data/themes/default/arp_up_and_down_off.png:
+	* data/themes/default/edit_undo.png:
+	* data/themes/default/loop_point.png:
+	* data/themes/default/cancel.png:
+	* data/themes/default/add.png:
+	* data/themes/default/arp_up_and_down_on.png:
+	* data/themes/default/project_open_down.png:
+	* data/themes/default/text_under.png:
+	* data/themes/default/fx_mixer.png:
+	* data/themes/default/arp_up_on.png:
+	* data/themes/default/home.png:
+	integrated improved artwork (more to come)
+
 	* src/core/track.cpp:
 	do not crash when removing TCOs
 
diff --git a/data/themes/default/add.png b/data/themes/default/add.png
index 97514fbd4..e029787c7 100644
Binary files a/data/themes/default/add.png and b/data/themes/default/add.png differ
diff --git a/data/themes/default/apply.png b/data/themes/default/apply.png
index 31c064ba9..4f7534626 100644
Binary files a/data/themes/default/apply.png and b/data/themes/default/apply.png differ
diff --git a/data/themes/default/arp_down_off.png b/data/themes/default/arp_down_off.png
index a284a95e2..813662cdb 100644
Binary files a/data/themes/default/arp_down_off.png and b/data/themes/default/arp_down_off.png differ
diff --git a/data/themes/default/arp_down_on.png b/data/themes/default/arp_down_on.png
index 6c54f5b94..6ae1a8942 100644
Binary files a/data/themes/default/arp_down_on.png and b/data/themes/default/arp_down_on.png differ
diff --git a/data/themes/default/arp_random_off.png b/data/themes/default/arp_random_off.png
index 7010f389d..d2ecee978 100644
Binary files a/data/themes/default/arp_random_off.png and b/data/themes/default/arp_random_off.png differ
diff --git a/data/themes/default/arp_random_on.png b/data/themes/default/arp_random_on.png
index 3b741c986..6de1d2e8d 100644
Binary files a/data/themes/default/arp_random_on.png and b/data/themes/default/arp_random_on.png differ
diff --git a/data/themes/default/arp_up_and_down_off.png b/data/themes/default/arp_up_and_down_off.png
index 21bb3546b..029355bdf 100644
Binary files a/data/themes/default/arp_up_and_down_off.png and b/data/themes/default/arp_up_and_down_off.png differ
diff --git a/data/themes/default/arp_up_and_down_on.png b/data/themes/default/arp_up_and_down_on.png
index 2b8dbe29d..bb4b23a6c 100644
Binary files a/data/themes/default/arp_up_and_down_on.png and b/data/themes/default/arp_up_and_down_on.png differ
diff --git a/data/themes/default/arp_up_off.png b/data/themes/default/arp_up_off.png
index f890242cc..6209938c4 100644
Binary files a/data/themes/default/arp_up_off.png and b/data/themes/default/arp_up_off.png differ
diff --git a/data/themes/default/arp_up_on.png b/data/themes/default/arp_up_on.png
index b33e8f560..78e7ad37f 100644
Binary files a/data/themes/default/arp_up_on.png and b/data/themes/default/arp_up_on.png differ
diff --git a/data/themes/default/cancel.png b/data/themes/default/cancel.png
index e8165a101..b0de61d22 100644
Binary files a/data/themes/default/cancel.png and b/data/themes/default/cancel.png differ
diff --git a/data/themes/default/edit_copy.png b/data/themes/default/edit_copy.png
index f50cef5c7..03ec42747 100644
Binary files a/data/themes/default/edit_copy.png and b/data/themes/default/edit_copy.png differ
diff --git a/data/themes/default/edit_cut.png b/data/themes/default/edit_cut.png
index 8ab1f10ee..472b48847 100644
Binary files a/data/themes/default/edit_cut.png and b/data/themes/default/edit_cut.png differ
diff --git a/data/themes/default/edit_paste.png b/data/themes/default/edit_paste.png
index f0c4d5b9f..df468cef4 100644
Binary files a/data/themes/default/edit_paste.png and b/data/themes/default/edit_paste.png differ
diff --git a/data/themes/default/edit_redo.png b/data/themes/default/edit_redo.png
index 808c944aa..45f045028 100644
Binary files a/data/themes/default/edit_redo.png and b/data/themes/default/edit_redo.png differ
diff --git a/data/themes/default/edit_undo.png b/data/themes/default/edit_undo.png
index 702422135..57abbe17d 100644
Binary files a/data/themes/default/edit_undo.png and b/data/themes/default/edit_undo.png differ
diff --git a/data/themes/default/error.png b/data/themes/default/error.png
index d514fb322..5492295e7 100644
Binary files a/data/themes/default/error.png and b/data/themes/default/error.png differ
diff --git a/data/themes/default/exit.png b/data/themes/default/exit.png
index 119e5ef7f..ed5f8b251 100644
Binary files a/data/themes/default/exit.png and b/data/themes/default/exit.png differ
diff --git a/data/themes/default/fx_mixer.png b/data/themes/default/fx_mixer.png
new file mode 100644
index 000000000..09b33994f
Binary files /dev/null and b/data/themes/default/fx_mixer.png differ
diff --git a/data/themes/default/groupbox_led_bg.png b/data/themes/default/groupbox_led_bg.png
index 04b16efa6..bf474d457 100644
Binary files a/data/themes/default/groupbox_led_bg.png and b/data/themes/default/groupbox_led_bg.png differ
diff --git a/data/themes/default/home.png b/data/themes/default/home.png
index 3afa80337..61cd604e9 100644
Binary files a/data/themes/default/home.png and b/data/themes/default/home.png differ
diff --git a/data/themes/default/hourglass.png b/data/themes/default/hourglass.png
deleted file mode 100644
index 8d8753336..000000000
Binary files a/data/themes/default/hourglass.png and /dev/null differ
diff --git a/data/themes/default/hq_mode.png b/data/themes/default/hq_mode.png
index 871e25ecd..ced82b2ba 100644
Binary files a/data/themes/default/hq_mode.png and b/data/themes/default/hq_mode.png differ
diff --git a/data/themes/default/loop_point.png b/data/themes/default/loop_point.png
index 1e20c8060..64e748dd1 100644
Binary files a/data/themes/default/loop_point.png and b/data/themes/default/loop_point.png differ
diff --git a/data/themes/default/loop_point_disabled.png b/data/themes/default/loop_point_disabled.png
index de31811ed..fe69b228e 100644
Binary files a/data/themes/default/loop_point_disabled.png and b/data/themes/default/loop_point_disabled.png differ
diff --git a/data/themes/default/mute_off.png b/data/themes/default/mute_off.png
index b5eb1cac4..22f0a800b 100644
Binary files a/data/themes/default/mute_off.png and b/data/themes/default/mute_off.png differ
diff --git a/data/themes/default/mute_on.png b/data/themes/default/mute_on.png
index 1921ccb3f..6b576f217 100644
Binary files a/data/themes/default/mute_on.png and b/data/themes/default/mute_on.png differ
diff --git a/data/themes/default/playpos_marker.png b/data/themes/default/playpos_marker.png
index 9e51cfa50..cc47800d6 100644
Binary files a/data/themes/default/playpos_marker.png and b/data/themes/default/playpos_marker.png differ
diff --git a/data/themes/default/project_export.png b/data/themes/default/project_export.png
index 5c9dbf84f..999a415b4 100644
Binary files a/data/themes/default/project_export.png and b/data/themes/default/project_export.png differ
diff --git a/data/themes/default/project_notes.png b/data/themes/default/project_notes.png
index 45aef7732..528a2bb36 100644
Binary files a/data/themes/default/project_notes.png and b/data/themes/default/project_notes.png differ
diff --git a/data/themes/default/project_open.png b/data/themes/default/project_open.png
index bd433f4bf..7422ad333 100644
Binary files a/data/themes/default/project_open.png and b/data/themes/default/project_open.png differ
diff --git a/data/themes/default/project_open_down.png b/data/themes/default/project_open_down.png
index 09f972521..057c6269f 100644
Binary files a/data/themes/default/project_open_down.png and b/data/themes/default/project_open_down.png differ
diff --git a/data/themes/default/project_save.png b/data/themes/default/project_save.png
index d4514cb68..7fa489c0f 100644
Binary files a/data/themes/default/project_save.png and b/data/themes/default/project_save.png differ
diff --git a/data/themes/default/project_saveas.png b/data/themes/default/project_saveas.png
index 069ee85af..9695a5642 100644
Binary files a/data/themes/default/project_saveas.png and b/data/themes/default/project_saveas.png differ
diff --git a/data/themes/default/root.png b/data/themes/default/root.png
index aaa4d6136..a34c6fd60 100644
Binary files a/data/themes/default/root.png and b/data/themes/default/root.png differ
diff --git a/data/themes/default/text_block.png b/data/themes/default/text_block.png
index a5c8d9197..e69a9f246 100644
Binary files a/data/themes/default/text_block.png and b/data/themes/default/text_block.png differ
diff --git a/data/themes/default/text_bold.png b/data/themes/default/text_bold.png
index f64f38bc0..9abb008bc 100644
Binary files a/data/themes/default/text_bold.png and b/data/themes/default/text_bold.png differ
diff --git a/data/themes/default/text_center.png b/data/themes/default/text_center.png
index b5648c5e5..eb8428fd3 100644
Binary files a/data/themes/default/text_center.png and b/data/themes/default/text_center.png differ
diff --git a/data/themes/default/text_italic.png b/data/themes/default/text_italic.png
index 8f825f961..f2d582368 100644
Binary files a/data/themes/default/text_italic.png and b/data/themes/default/text_italic.png differ
diff --git a/data/themes/default/text_left.png b/data/themes/default/text_left.png
index 3d39abd15..ae817ca88 100644
Binary files a/data/themes/default/text_left.png and b/data/themes/default/text_left.png differ
diff --git a/data/themes/default/text_right.png b/data/themes/default/text_right.png
index 75843f67a..38129a211 100644
Binary files a/data/themes/default/text_right.png and b/data/themes/default/text_right.png differ
diff --git a/data/themes/default/text_under.png b/data/themes/default/text_under.png
index 50944345e..4504d7c00 100644
Binary files a/data/themes/default/text_under.png and b/data/themes/default/text_under.png differ
diff --git a/data/themes/default/track_op_menu.png b/data/themes/default/track_op_menu.png
index ee7cc531f..4207a3ea1 100644
Binary files a/data/themes/default/track_op_menu.png and b/data/themes/default/track_op_menu.png differ
diff --git a/data/themes/default/track_op_menu_disabled.png b/data/themes/default/track_op_menu_disabled.png
index 7a50a2399..3bcdda467 100644
Binary files a/data/themes/default/track_op_menu_disabled.png and b/data/themes/default/track_op_menu_disabled.png differ
diff --git a/include/pixmap_button.h b/include/pixmap_button.h
index 065c47c6d..955c38cc3 100644
--- a/include/pixmap_button.h
+++ b/include/pixmap_button.h
@@ -44,7 +44,7 @@ public:
 
 signals:
 	void doubleClicked( void );
-	void clickedRight( void );
+	void ctrlClick( void );
 
 
 protected:
diff --git a/include/track.h b/include/track.h
index 96b1eddce..55f67a5b6 100644
--- a/include/track.h
+++ b/include/track.h
@@ -306,7 +306,7 @@ private slots:
 	void disableAutomation( void );
 	void enableAutomation( void );
 	void removeTrack( void );
-	void muteBtnRightClicked( void );
+	void toggleSolo( void );
 	void updateMenu( void );
 
 
diff --git a/src/core/timeline.cpp b/src/core/timeline.cpp
index df91b2e01..5c7d2ef02 100644
--- a/src/core/timeline.cpp
+++ b/src/core/timeline.cpp
@@ -241,8 +241,8 @@ void timeLine::paintEvent( QPaintEvent * )
 	const QPixmap & lpoint = loopPointsEnabled() ?
 						*s_loopPointPixmap :
 						*s_loopPointDisabledPixmap;
-	p.drawPixmap( markerX( loopBegin() ), 7, lpoint );
-	p.drawPixmap( markerX( loopEnd() ), 7, lpoint );
+	p.drawPixmap( markerX( loopBegin() ), 4, lpoint );
+	p.drawPixmap( markerX( loopEnd() ), 4, lpoint );
 
 
 	tact tact_num = m_begin.getTact();
diff --git a/src/core/track.cpp b/src/core/track.cpp
index 9d286b89f..014cc9a62 100644
--- a/src/core/track.cpp
+++ b/src/core/track.cpp
@@ -1037,15 +1037,15 @@ trackOperationsWidget::trackOperationsWidget( trackView * _parent ) :
 
 
 	m_muteBtn = new pixmapButton( this, tr( "Mute" ) );
-	m_muteBtn->setActiveGraphic( *s_muteOnEnabled );
-	m_muteBtn->setInactiveGraphic( *s_muteOffEnabled );
+	m_muteBtn->setActiveGraphic( *s_muteOffEnabled );
+	m_muteBtn->setInactiveGraphic( *s_muteOnEnabled );
 	m_muteBtn->setCheckable( TRUE );
 	m_muteBtn->move( 44, 4 );
 	m_muteBtn->show();
 	connect( m_muteBtn, SIGNAL( toggled( bool ) ), this,
 						SLOT( setMuted( bool ) ) );
-	connect( m_muteBtn, SIGNAL( clickedRight() ), this,
-					SLOT( muteBtnRightClicked() ) );
+	connect( m_muteBtn, SIGNAL( ctrlClick() ), this,
+					SLOT( toggleSolo() ) );
 	m_muteBtn->setWhatsThis(
 		tr( "With this switch you can either mute this track or mute "
 			"all other tracks.\nBy clicking left, this track is "
@@ -1128,9 +1128,9 @@ void trackOperationsWidget::paintEvent( QPaintEvent * _pe )
 					setObjectName( "automationDisabled" );
 					setStyle( NULL );
 					m_muteBtn->setActiveGraphic(
-							*s_muteOnDisabled );
+							*s_muteOffEnabled );
 					m_muteBtn->setInactiveGraphic(
-							*s_muteOffDisabled );
+							*s_muteOnEnabled );
 				}
 			}
 			else
@@ -1141,9 +1141,9 @@ void trackOperationsWidget::paintEvent( QPaintEvent * _pe )
 					setObjectName( "automationEnabled" );
 					setStyle( NULL );
 					m_muteBtn->setActiveGraphic(
-							*s_muteOnEnabled );
-					m_muteBtn->setInactiveGraphic(
 							*s_muteOffEnabled );
+					m_muteBtn->setInactiveGraphic(
+							*s_muteOnEnabled );
 				}
 			}
 		}
@@ -1191,7 +1191,7 @@ void trackOperationsWidget::setMuted( bool _muted )
 
 
 
-void trackOperationsWidget::muteBtnRightClicked( void )
+void trackOperationsWidget::toggleSolo( void )
 {
 	const bool m = muted();	// next function might modify our mute-state,
 				// so save it now
diff --git a/src/gui/fx_mixer_view.cpp b/src/gui/fx_mixer_view.cpp
index 74b9d9d69..45c104b63 100644
--- a/src/gui/fx_mixer_view.cpp
+++ b/src/gui/fx_mixer_view.cpp
@@ -123,7 +123,7 @@ fxMixerView::fxMixerView() :
 	setSizePolicy( QSizePolicy::Preferred, QSizePolicy::Minimum );
 
 	setWindowTitle( tr( "FX-Mixer" ) );
-//	setWindowIcon( embed::getIconPixmap( "fxmixer" ) );
+	setWindowIcon( embed::getIconPixmap( "fx_mixer" ) );
 
 	m_fxLineBanks = new QStackedLayout;
 	m_fxLineBanks->setSpacing( 0 );
diff --git a/src/gui/main_window.cpp b/src/gui/main_window.cpp
index 51cc8f1c1..ba08d7e4c 100644
--- a/src/gui/main_window.cpp
+++ b/src/gui/main_window.cpp
@@ -317,7 +317,7 @@ void mainWindow::finalize( void )
 				) );
 
 	toolButton * fx_mixer_window = new toolButton(
-					embed::getIconPixmap( "effect_board" ),
+					embed::getIconPixmap( "fx_mixer" ),
 					tr( "Show/hide FX Mixer" ) + " (F11)",
 					this, SLOT( toggleFxMixerWin() ), m_toolBar );
 	fx_mixer_window->setShortcut( Qt::Key_F11 );
diff --git a/src/gui/widgets/pixmap_button.cpp b/src/gui/widgets/pixmap_button.cpp
index 980a87534..99604d74e 100644
--- a/src/gui/widgets/pixmap_button.cpp
+++ b/src/gui/widgets/pixmap_button.cpp
@@ -4,7 +4,7 @@
  * pixmap_button.cpp - implementation of pixmap-button (often used as "themed"
  *                     checkboxes/radiobuttons etc)
  *
- * Copyright (c) 2004-2007 Tobias Doerffel <tobydox/at/users.sourceforge.net>
+ * Copyright (c) 2004-2008 Tobias Doerffel <tobydox/at/users.sourceforge.net>
  * 
  * This file is part of Linux MultiMedia Studio - http://lmms.sourceforge.net
  *
@@ -30,6 +30,7 @@
 #include <QtGui/QPainter>
 
 #include "pixmap_button.h"
+#include "main_window.h"
 #include "embed.h"
 
 
@@ -76,9 +77,10 @@ void pixmapButton::paintEvent( QPaintEvent * )
 
 void pixmapButton::mousePressEvent( QMouseEvent * _me )
 {
-	if( _me->button() == Qt::RightButton )
+	if( _me->button() == Qt::LeftButton &&
+				engine::getMainWindow()->isCtrlPressed() )
 	{
-		emit( clickedRight() );
+		emit( ctrlClick() );
 		_me->accept();
 	}
 	else
diff --git a/src/gui/widgets/project_notes.cpp b/src/gui/widgets/project_notes.cpp
index 6f73265e3..73e0c2aa8 100644
--- a/src/gui/widgets/project_notes.cpp
+++ b/src/gui/widgets/project_notes.cpp
@@ -76,7 +76,8 @@ projectNotes::projectNotes( void ) :
 		engine::getMainWindow()->workspace()->addSubWindow( this );
 		parentWidget()->setAttribute( Qt::WA_DeleteOnClose, FALSE );
 		parentWidget()->move( 700, 10 );
-		parentWidget()->resize( 300, 200 );
+		parentWidget()->resize( 400, 300 );
+		parentWidget()->hide();
 	}
 	else
 	{
diff --git a/src/gui/widgets/tab_widget.cpp b/src/gui/widgets/tab_widget.cpp
index 070ea3510..042abde7d 100644
--- a/src/gui/widgets/tab_widget.cpp
+++ b/src/gui/widgets/tab_widget.cpp
@@ -149,23 +149,25 @@ void tabWidget::paintEvent( QPaintEvent * _pe )
 	setFont( pointSize<7>( font() ) );
 	QPainter p( this );
 
-	p.fillRect( 0, 0, width() - 1, height() - 1, QColor( 96, 96, 96 ) );
+	QColor bg_color = QApplication::palette().color( QPalette::Active,
+							QPalette::Background );
+	p.fillRect( 0, 0, width() - 1, height() - 1, bg_color.dark( 132 ) );
 
 	const int c = 0;
 	bool big_tab_captions = ( m_caption == "" );
 	int add = big_tab_captions ? 1 : 0;
 
-	p.setPen( QColor( 64, 64, 64 ) );
+	p.setPen( bg_color.dark( 200 ) );
 	p.drawRect( 0, 0, width() - 1 + c, height() - 1 + c );
 
-	p.setPen( QColor( 160, 160, 160 ) );
+	p.setPen( bg_color.light( 125 ) );
 	p.drawLine( width() - 1, 0, width() - 1, height() - 1 );
 	p.drawLine( 0, height() - 1, width() - 1, height() - 1 );
 
 	p.setPen( QColor( 0, 0, 0 ) );
 	p.drawRect( 1, 1, width() - 3 + c, height() - 3 + c );
 
-	p.fillRect( 2, 2, width() - 4, 9 + add, QColor( 30, 45, 60 ) );
+	p.fillRect( 2, 2, width() - 4, 9 + add, bg_color.dark( 300 ) );
 	p.drawLine( 2, 11 + add, width() - 3, 11 + add );
 
 	if( !big_tab_captions )