diff --git a/data/themes/default/env_lfo_active.png b/data/themes/default/env_lfo_active.png
new file mode 100644
index 000000000..3336e9038
Binary files /dev/null and b/data/themes/default/env_lfo_active.png differ
diff --git a/data/themes/default/env_lfo_inactive.png b/data/themes/default/env_lfo_inactive.png
new file mode 100644
index 000000000..6ee2a633b
Binary files /dev/null and b/data/themes/default/env_lfo_inactive.png differ
diff --git a/data/themes/default/functions_active.png b/data/themes/default/functions_active.png
new file mode 100644
index 000000000..6f6bb96be
Binary files /dev/null and b/data/themes/default/functions_active.png differ
diff --git a/data/themes/default/functions_inactive.png b/data/themes/default/functions_inactive.png
new file mode 100644
index 000000000..e107b3db4
Binary files /dev/null and b/data/themes/default/functions_inactive.png differ
diff --git a/data/themes/default/fx_active.png b/data/themes/default/fx_active.png
new file mode 100644
index 000000000..b9cbd6485
Binary files /dev/null and b/data/themes/default/fx_active.png differ
diff --git a/data/themes/default/fx_inactive.png b/data/themes/default/fx_inactive.png
new file mode 100644
index 000000000..901f730ad
Binary files /dev/null and b/data/themes/default/fx_inactive.png differ
diff --git a/data/themes/default/midi_active.png b/data/themes/default/midi_active.png
new file mode 100644
index 000000000..f7ea1e830
Binary files /dev/null and b/data/themes/default/midi_active.png differ
diff --git a/data/themes/default/midi_inactive.png b/data/themes/default/midi_inactive.png
new file mode 100644
index 000000000..bbf6a4976
Binary files /dev/null and b/data/themes/default/midi_inactive.png differ
diff --git a/data/themes/default/miscellaneous_active.png b/data/themes/default/miscellaneous_active.png
new file mode 100644
index 000000000..e0823df29
Binary files /dev/null and b/data/themes/default/miscellaneous_active.png differ
diff --git a/data/themes/default/miscellaneous_inactive.png b/data/themes/default/miscellaneous_inactive.png
new file mode 100644
index 000000000..af5052159
Binary files /dev/null and b/data/themes/default/miscellaneous_inactive.png differ
diff --git a/data/themes/default/plugin_active.png b/data/themes/default/plugin_active.png
new file mode 100644
index 000000000..d170d8996
Binary files /dev/null and b/data/themes/default/plugin_active.png differ
diff --git a/data/themes/default/plugin_inactive.png b/data/themes/default/plugin_inactive.png
new file mode 100644
index 000000000..c58b05f3b
Binary files /dev/null and b/data/themes/default/plugin_inactive.png differ
diff --git a/src/gui/widgets/TabWidget.cpp b/src/gui/widgets/TabWidget.cpp
index 9e99ea3b0..d068ea9a9 100644
--- a/src/gui/widgets/TabWidget.cpp
+++ b/src/gui/widgets/TabWidget.cpp
@@ -79,7 +79,7 @@ void TabWidget::addTab( QWidget * _w, const QString & _name,  const char * pixma
 	if ( pixmapName == NULL ) {
 		w = fontMetrics().width( _name ) + 10;
 	} else {
-		w = 30; 
+		w = 28; // artwork's width
 	}
 
         // Register new tab
diff --git a/src/tracks/InstrumentTrack.cpp b/src/tracks/InstrumentTrack.cpp
index fd200280c..be42007fc 100644
--- a/src/tracks/InstrumentTrack.cpp
+++ b/src/tracks/InstrumentTrack.cpp
@@ -1434,11 +1434,11 @@ InstrumentTrackWindow::InstrumentTrackWindow( InstrumentTrackView * _itv ) :
 	m_miscView = new InstrumentMiscView( m_track, m_tabWidget );
 
 
-	m_tabWidget->addTab( m_ssView, tr( "ENV/LFO" ), "usr_wave", 1 );
-	m_tabWidget->addTab( instrumentFunctions, tr( "FUNC" ), "sin_wave", 2 );
-	m_tabWidget->addTab( m_effectView, tr( "FX" ), "saw_wave", 3 );
-	m_tabWidget->addTab( m_midiView, tr( "MIDI" ), "round_square_wave", 4 );
-	m_tabWidget->addTab( m_miscView, tr( "MISC" ), "exp_wave", 5 );
+	m_tabWidget->addTab( m_ssView, tr( "ENV/LFO" ), "env_lfo", 1 );
+	m_tabWidget->addTab( instrumentFunctions, tr( "FUNC" ), "functions", 2 );
+	m_tabWidget->addTab( m_effectView, tr( "FX" ), "fx", 3 );
+	m_tabWidget->addTab( m_midiView, tr( "MIDI" ), "midi", 4 );
+	m_tabWidget->addTab( m_miscView, tr( "MISC" ), "miscellaneous", 5 );
 
 	// setup piano-widget
 	m_pianoView = new PianoView( this );
@@ -1611,7 +1611,7 @@ void InstrumentTrackWindow::updateInstrumentView()
 	if( m_track->m_instrument != NULL )
 	{
 		m_instrumentView = m_track->m_instrument->createView( m_tabWidget );
-		m_tabWidget->addTab( m_instrumentView, tr( "PLUGIN" ), "moog_saw_wave", 0 );
+		m_tabWidget->addTab( m_instrumentView, tr( "PLUGIN" ), "plugin", 0 );
 		m_tabWidget->setActiveTab( 0 );
 
 		m_ssView->setFunctionsHidden( m_track->m_instrument->flags().testFlag( Instrument::IsSingleStreamed ) );