diff --git a/data/themes/default/add_controller.png b/data/themes/default/add_controller.png
deleted file mode 100644
index bdcaf4b55..000000000
Binary files a/data/themes/default/add_controller.png and /dev/null differ
diff --git a/src/gui/bb_editor.cpp b/src/gui/bb_editor.cpp
index 4630223f6..939b8f631 100644
--- a/src/gui/bb_editor.cpp
+++ b/src/gui/bb_editor.cpp
@@ -61,7 +61,7 @@ bbEditor::bbEditor( bbTrackContainer* tc ) :
 	tb_layout->setMargin( 0 );
 
 
-	setWindowIcon( embed::getIconPixmap( "bb_track" ) );
+	setWindowIcon( embed::getIconPixmap( "bb_track_btn" ) );
 	setWindowTitle( tr( "Beat+Bassline Editor" ) );
 	// TODO: Use style sheet
 	if( configManager::inst()->value( "ui",