diff --git a/data/themes/default/knob04.png b/data/themes/default/knob04.png
deleted file mode 100644
index 0e3af11c8..000000000
Binary files a/data/themes/default/knob04.png and /dev/null differ
diff --git a/include/Knob.h b/include/Knob.h
index c41ebf08d..0d031ba4f 100644
--- a/include/Knob.h
+++ b/include/Knob.h
@@ -38,7 +38,7 @@ class TextFloat;
 
 enum knobTypes
 {
-	knobDark_28, knobBright_26, knobSmall_17, knobGreen_17, knobVintage_32, knobStyled
+	knobDark_28, knobBright_26, knobSmall_17, knobVintage_32, knobStyled
 } ;
 
 
diff --git a/src/gui/widgets/Knob.cpp b/src/gui/widgets/Knob.cpp
index f13dcc1dd..6c2a9c74d 100644
--- a/src/gui/widgets/Knob.cpp
+++ b/src/gui/widgets/Knob.cpp
@@ -111,8 +111,27 @@ void Knob::onKnobNumUpdated()
 {
 	if( m_knobNum != knobStyled )
 	{
-		m_knobPixmap = new QPixmap( embed::getIconPixmap( QString( "knob0" +
-			QString::number( m_knobNum + 1 ) ).toUtf8().constData() ) );
+		QString knobFilename;
+		switch (m_knobNum)
+		{
+		case knobDark_28:
+			knobFilename = "knob01";
+			break;
+		case knobBright_26:
+			knobFilename = "knob02";
+			break;
+		case knobSmall_17:
+			knobFilename = "knob03";
+			break;
+		case knobVintage_32:
+			knobFilename = "knob05";
+			break;
+		case knobStyled: // only here to stop the compiler from complaining
+			break;
+		}
+
+		// If knobFilename is still empty here we should get the fallback pixmap of size 1x1
+		m_knobPixmap = new QPixmap( embed::getIconPixmap( knobFilename.toUtf8().constData() ) );
 
 		setFixedSize( m_knobPixmap->width(), m_knobPixmap->height() );
 	}
@@ -431,13 +450,6 @@ void Knob::drawKnob( QPainter * _p )
 			p.drawLine( ln );
 			break;
 		}
-		case knobGreen_17:
-		{
-			p.setPen( QPen( QApplication::palette().color( QPalette::Active,
-							QPalette::BrightText), 2 ) );
-			p.drawLine( calculateLine( mid, radius ) );
-			break;
-		}
 		case knobVintage_32:
 		{
 			p.setPen( QPen( QApplication::palette().color( QPalette::Active,