diff --git a/data/themes/default/track_op_menu.png b/data/themes/default/track_op_menu.png
deleted file mode 100755
index 50c2b478c..000000000
Binary files a/data/themes/default/track_op_menu.png and /dev/null differ
diff --git a/data/themes/default/track_op_menu_active.png b/data/themes/default/track_op_menu_active.png
deleted file mode 100755
index b26dd6ef2..000000000
Binary files a/data/themes/default/track_op_menu_active.png and /dev/null differ
diff --git a/plugins/VstEffect/VstEffectControlDialog.cpp b/plugins/VstEffect/VstEffectControlDialog.cpp
index 49fa13315..3c6c84c89 100644
--- a/plugins/VstEffect/VstEffectControlDialog.cpp
+++ b/plugins/VstEffect/VstEffectControlDialog.cpp
@@ -88,9 +88,9 @@ VstEffectControlDialog::VstEffectControlDialog( VstEffectControls * _ctl ) :
 		m_managePluginButton->setCheckable( false );
 		m_managePluginButton->setCursor( Qt::PointingHandCursor );
 		m_managePluginButton->setActiveGraphic( PLUGIN_NAME::getIconPixmap(
-							"track_op_menu" ) );
+							"controls_active" ) );
 		m_managePluginButton->setInactiveGraphic( PLUGIN_NAME::getIconPixmap(
-							"track_op_menu" ) );
+							"controls" ) );
 		connect( m_managePluginButton, SIGNAL( clicked() ),  _ctl,
 						SLOT( managePlugin() ) );
 		ToolTip::add( m_managePluginButton, tr( "Control VST-plugin from LMMS host" ) );
@@ -98,8 +98,8 @@ VstEffectControlDialog::VstEffectControlDialog( VstEffectControls * _ctl ) :
 		m_managePluginButton->setWhatsThis(
 			tr( "Click here, if you want to control VST-plugin from host." ) );
 
-		m_managePluginButton->setMinimumWidth( 21 );
-		m_managePluginButton->setMaximumWidth( 21 );
+		m_managePluginButton->setMinimumWidth( 26 );
+		m_managePluginButton->setMaximumWidth( 26 );
 		m_managePluginButton->setMinimumHeight( 21 );
 		m_managePluginButton->setMaximumHeight( 21 );
 
@@ -216,7 +216,7 @@ VstEffectControlDialog::VstEffectControlDialog( VstEffectControls * _ctl ) :
 		space1->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Preferred);
 		QFont f( "Arial", 10 );
 
-		l->addItem( new QSpacerItem( newSize - 20, 30, QSizePolicy::Fixed, 
+		l->addItem( new QSpacerItem( newSize - 20, 30, QSizePolicy::Fixed,
 						QSizePolicy::Fixed ), 1, 0 );
 		l->addWidget( resize, 2, 0, 1, 1, Qt::AlignCenter );
 		l->addWidget( m_pluginWidget, 3, 0, 1, 1, Qt::AlignCenter );
@@ -250,8 +250,8 @@ void VstEffectControlDialog::paintEvent( QPaintEvent * )
 {
 	if( m_plugin != NULL && tbLabel != NULL )
 	{
-		tbLabel->setText( tr( "Effect by: " ) + m_plugin->vendorString() + 
-			tr( "&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<br />" ) + 
+		tbLabel->setText( tr( "Effect by: " ) + m_plugin->vendorString() +
+			tr( "&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<br />" ) +
 			m_plugin->currentProgramName() );
 	}
 }
diff --git a/data/themes/classic/track_op_menu.png b/plugins/VstEffect/controls.png
similarity index 100%
rename from data/themes/classic/track_op_menu.png
rename to plugins/VstEffect/controls.png
diff --git a/data/themes/classic/track_op_menu_active.png b/plugins/VstEffect/controls_active.png
similarity index 100%
rename from data/themes/classic/track_op_menu_active.png
rename to plugins/VstEffect/controls_active.png
diff --git a/plugins/vestige/controls.png b/plugins/vestige/controls.png
new file mode 100644
index 000000000..4e03eb351
Binary files /dev/null and b/plugins/vestige/controls.png differ
diff --git a/plugins/vestige/controls_active.png b/plugins/vestige/controls_active.png
new file mode 100644
index 000000000..5759cd7bb
Binary files /dev/null and b/plugins/vestige/controls_active.png differ
diff --git a/plugins/vestige/vestige.cpp b/plugins/vestige/vestige.cpp
index 403d24bbd..650af5c52 100644
--- a/plugins/vestige/vestige.cpp
+++ b/plugins/vestige/vestige.cpp
@@ -415,9 +415,9 @@ VestigeInstrumentView::VestigeInstrumentView( Instrument * _instrument,
 	m_managePluginButton->setCursor( Qt::PointingHandCursor );
 	m_managePluginButton->move( 216, 101 );
 	m_managePluginButton->setActiveGraphic( PLUGIN_NAME::getIconPixmap(
-							"track_op_menu_active" ) );
+							"controls_active" ) );
 	m_managePluginButton->setInactiveGraphic( PLUGIN_NAME::getIconPixmap(
-							"track_op_menu" ) );
+							"controls" ) );
 	connect( m_managePluginButton, SIGNAL( clicked() ), this,
 						SLOT( managePlugin() ) );
 	ToolTip::add( m_managePluginButton, tr( "Control VST-plugin from LMMS host" ) );