diff --git a/data/themes/default/knob01.png b/data/themes/default/knob01.png
index f8108ff14..b19b2529c 100644
Binary files a/data/themes/default/knob01.png and b/data/themes/default/knob01.png differ
diff --git a/data/themes/default/knob02.png b/data/themes/default/knob02.png
index 4913ed2cd..c4e84a314 100644
Binary files a/data/themes/default/knob02.png and b/data/themes/default/knob02.png differ
diff --git a/data/themes/default/knob03.png b/data/themes/default/knob03.png
index c6676c4cb..d620272bf 100644
Binary files a/data/themes/default/knob03.png and b/data/themes/default/knob03.png differ
diff --git a/src/gui/bb_editor.cpp b/src/gui/bb_editor.cpp
index e66e74da1..a26094e80 100644
--- a/src/gui/bb_editor.cpp
+++ b/src/gui/bb_editor.cpp
@@ -116,9 +116,6 @@ bbEditor::bbEditor( bbTrackContainer* tc ) :
 		tr( "Click here to stop playing of current "
 							"beat/bassline." ) );
 
-	QLabel * l = new QLabel( m_toolBar );
-	l->setPixmap( embed::getIconPixmap( "drum" ) );
-
 	m_bbComboBox = new comboBox( m_toolBar );
 	m_bbComboBox->setFixedSize( 200, 22 );
 	m_bbComboBox->setModel( &tc->m_bbComboBoxModel );
@@ -134,7 +131,6 @@ bbEditor::bbEditor( bbTrackContainer* tc ) :
 	tb_layout->addStretch();
 	tb_layout->addWidget( remove_bar );
 	tb_layout->addWidget( add_bar );
-	tb_layout->addWidget( l );
 	tb_layout->addSpacing( 15 );
 
 	engine::mainWindow()->workspace()->addSubWindow( this );
diff --git a/src/gui/widgets/knob.cpp b/src/gui/widgets/knob.cpp
index 208338663..1c8dc9eaf 100644
--- a/src/gui/widgets/knob.cpp
+++ b/src/gui/widgets/knob.cpp
@@ -328,8 +328,11 @@ void knob::drawKnob( QPainter * _p )
 
 	const int arcLineWidth = 2;
 	const int arcRectSize = m_knobPixmap->width() - arcLineWidth;
-
-	p.setPen( QPen( QColor( 255, 255, 255, 70 ), 2 ) );
+	
+	QColor col = QApplication::palette().color( QPalette::Active, QPalette::WindowText );
+	col.setAlpha( 70 );
+	
+	p.setPen( QPen( col, 2 ) );
 	p.drawArc( mid.x() - arcRectSize/2, 1, arcRectSize, arcRectSize, 315*16, 16*m_totalAngle );
 
 	switch( m_knobNum )