diff --git a/data/themes/default/add_automation.png b/data/themes/default/add_automation.png
index 71e147425..58f13909b 100644
Binary files a/data/themes/default/add_automation.png and b/data/themes/default/add_automation.png differ
diff --git a/data/themes/default/add_bb_track.png b/data/themes/default/add_bb_track.png
index ba6a58379..3379a094b 100644
Binary files a/data/themes/default/add_bb_track.png and b/data/themes/default/add_bb_track.png differ
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/data/themes/default/add_sample_track.png b/data/themes/default/add_sample_track.png
index 2f7500a7d..0c094b369 100644
Binary files a/data/themes/default/add_sample_track.png and b/data/themes/default/add_sample_track.png differ
diff --git a/data/themes/default/analysis.png b/data/themes/default/analysis.png
index 81ca022dc..dd6f48476 100644
Binary files a/data/themes/default/analysis.png and b/data/themes/default/analysis.png differ
diff --git a/data/themes/default/arp_free.png b/data/themes/default/arp_free.png
index a4e9b5251..19ebc3a53 100644
Binary files a/data/themes/default/arp_free.png and b/data/themes/default/arp_free.png differ
diff --git a/data/themes/default/arp_random.png b/data/themes/default/arp_random.png
index d2ecee978..608fc6df7 100644
Binary files a/data/themes/default/arp_random.png and b/data/themes/default/arp_random.png differ
diff --git a/data/themes/default/arp_sort.png b/data/themes/default/arp_sort.png
index c9f0f41c7..a89bf913b 100644
Binary files a/data/themes/default/arp_sort.png and b/data/themes/default/arp_sort.png differ
diff --git a/data/themes/default/arp_sync.png b/data/themes/default/arp_sync.png
index 7cd0491b7..c9c44a9ba 100644
Binary files a/data/themes/default/arp_sync.png and b/data/themes/default/arp_sync.png differ
diff --git a/data/themes/default/autoscroll_off.png b/data/themes/default/autoscroll_off.png
index a2d56e672..526e20bf8 100644
Binary files a/data/themes/default/autoscroll_off.png and b/data/themes/default/autoscroll_off.png differ
diff --git a/data/themes/default/autoscroll_on.png b/data/themes/default/autoscroll_on.png
index 8c4bb5690..d2567f253 100644
Binary files a/data/themes/default/autoscroll_on.png and b/data/themes/default/autoscroll_on.png differ
diff --git a/data/themes/default/bb_track.png b/data/themes/default/bb_track.png
index a26017741..1c72caa39 100644
Binary files a/data/themes/default/bb_track.png and b/data/themes/default/bb_track.png differ
diff --git a/data/themes/default/bb_track_btn.png b/data/themes/default/bb_track_btn.png
index 515e9711c..f67714607 100644
Binary files a/data/themes/default/bb_track_btn.png and b/data/themes/default/bb_track_btn.png differ
diff --git a/data/themes/default/clock.png b/data/themes/default/clock.png
index cfc84a5cd..4cd3f082a 100644
Binary files a/data/themes/default/clock.png and b/data/themes/default/clock.png differ
diff --git a/data/themes/default/edit_cut.png b/data/themes/default/edit_cut.png
index 472b48847..fbc333368 100644
Binary files a/data/themes/default/edit_cut.png and b/data/themes/default/edit_cut.png differ
diff --git a/data/themes/default/edit_erase.png b/data/themes/default/edit_erase.png
index a34793475..143400a9b 100644
Binary files a/data/themes/default/edit_erase.png and b/data/themes/default/edit_erase.png differ
diff --git a/data/themes/default/edit_move.png b/data/themes/default/edit_move.png
index d9d7536c2..28a634171 100644
Binary files a/data/themes/default/edit_move.png and b/data/themes/default/edit_move.png differ
diff --git a/data/themes/default/edit_paste.png b/data/themes/default/edit_paste.png
index cb6b9a934..766e86325 100644
Binary files a/data/themes/default/edit_paste.png and b/data/themes/default/edit_paste.png differ
diff --git a/data/themes/default/edit_select.png b/data/themes/default/edit_select.png
index 11b674a60..842d690f1 100644
Binary files a/data/themes/default/edit_select.png and b/data/themes/default/edit_select.png differ
diff --git a/data/themes/default/envelope_graph.png b/data/themes/default/envelope_graph.png
index 100eeac23..c6f904103 100644
Binary files a/data/themes/default/envelope_graph.png and b/data/themes/default/envelope_graph.png differ
diff --git a/data/themes/default/folder.png b/data/themes/default/folder.png
index 33b653b4c..ec0cecdae 100644
Binary files a/data/themes/default/folder.png and b/data/themes/default/folder.png differ
diff --git a/data/themes/default/folder_locked.png b/data/themes/default/folder_locked.png
index 1eae80119..d3e18e50b 100644
Binary files a/data/themes/default/folder_locked.png and b/data/themes/default/folder_locked.png differ
diff --git a/data/themes/default/folder_opened.png b/data/themes/default/folder_opened.png
index 9611735ea..b7b03bb3c 100644
Binary files a/data/themes/default/folder_opened.png and b/data/themes/default/folder_opened.png differ
diff --git a/data/themes/default/fx_mixer.png b/data/themes/default/fx_mixer.png
index bfde545d5..f26d53bd9 100644
Binary files a/data/themes/default/fx_mixer.png and b/data/themes/default/fx_mixer.png differ
diff --git a/data/themes/default/lfo_graph.png b/data/themes/default/lfo_graph.png
index 3b381618d..aa8faf5a0 100644
Binary files a/data/themes/default/lfo_graph.png and b/data/themes/default/lfo_graph.png differ
diff --git a/data/themes/default/loop_points_off.png b/data/themes/default/loop_points_off.png
index d0f74259f..924c487e8 100644
Binary files a/data/themes/default/loop_points_off.png and b/data/themes/default/loop_points_off.png differ
diff --git a/data/themes/default/loop_points_on.png b/data/themes/default/loop_points_on.png
index 4d22bf2e7..1bbacf260 100644
Binary files a/data/themes/default/loop_points_on.png and b/data/themes/default/loop_points_on.png differ
diff --git a/data/themes/default/muted.png b/data/themes/default/muted.png
index 6ba32f2f5..cedddf703 100644
Binary files a/data/themes/default/muted.png and b/data/themes/default/muted.png differ
diff --git a/data/themes/default/note_none.png b/data/themes/default/note_none.png
index 00c18a3ce..8a82a4ae6 100644
Binary files a/data/themes/default/note_none.png and b/data/themes/default/note_none.png differ
diff --git a/data/themes/default/pause.png b/data/themes/default/pause.png
index 04725f997..719f67675 100644
Binary files a/data/themes/default/pause.png and b/data/themes/default/pause.png differ
diff --git a/data/themes/default/play.png b/data/themes/default/play.png
index ee66b4929..81d25ba4a 100644
Binary files a/data/themes/default/play.png and b/data/themes/default/play.png differ
diff --git a/data/themes/default/record.png b/data/themes/default/record.png
index fc1d435d3..9c478745b 100644
Binary files a/data/themes/default/record.png and b/data/themes/default/record.png differ
diff --git a/data/themes/default/record_accompany.png b/data/themes/default/record_accompany.png
index 7dd091a12..005a1c18c 100644
Binary files a/data/themes/default/record_accompany.png and b/data/themes/default/record_accompany.png differ
diff --git a/data/themes/default/sample_track.png b/data/themes/default/sample_track.png
index 4df4ca8e1..d459e7fa5 100644
Binary files a/data/themes/default/sample_track.png and b/data/themes/default/sample_track.png differ
diff --git a/data/themes/default/songeditor.png b/data/themes/default/songeditor.png
index 1f7f39c66..ecfb65b24 100644
Binary files a/data/themes/default/songeditor.png and b/data/themes/default/songeditor.png differ
diff --git a/data/themes/default/stop.png b/data/themes/default/stop.png
index 2d204586a..b589f6178 100644
Binary files a/data/themes/default/stop.png and b/data/themes/default/stop.png differ
diff --git a/data/themes/default/tempo_sync.png b/data/themes/default/tempo_sync.png
index cfc84a5cd..4cd3f082a 100644
Binary files a/data/themes/default/tempo_sync.png and b/data/themes/default/tempo_sync.png differ
diff --git a/data/themes/default/uhoh.png b/data/themes/default/uhoh.png
index 9b2b70930..09dc577df 100644
Binary files a/data/themes/default/uhoh.png and b/data/themes/default/uhoh.png differ
diff --git a/data/themes/default/unavailable_sound.png b/data/themes/default/unavailable_sound.png
index 611fd9a07..7a3106541 100644
Binary files a/data/themes/default/unavailable_sound.png and b/data/themes/default/unavailable_sound.png differ
diff --git a/data/themes/default/zoom.png b/data/themes/default/zoom.png
index 959217ed6..cfb50f543 100644
Binary files a/data/themes/default/zoom.png and b/data/themes/default/zoom.png differ
diff --git a/data/themes/default/zoom_x.png b/data/themes/default/zoom_x.png
index 30c9f43b9..435cc440c 100644
Binary files a/data/themes/default/zoom_x.png and b/data/themes/default/zoom_x.png differ
diff --git a/data/themes/default/zoom_y.png b/data/themes/default/zoom_y.png
index 1144e9ce5..906d070e9 100644
Binary files a/data/themes/default/zoom_y.png and b/data/themes/default/zoom_y.png 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",