diff --git a/data/themes/cusis/controller_bg.png b/data/themes/cusis/controller_bg.png
index 16688164e..b42d15dfc 100644
Binary files a/data/themes/cusis/controller_bg.png and b/data/themes/cusis/controller_bg.png differ
diff --git a/data/themes/cusis/effect_plugin.png b/data/themes/cusis/effect_plugin.png
index b31dec56d..ed320ac7d 100644
Binary files a/data/themes/cusis/effect_plugin.png and b/data/themes/cusis/effect_plugin.png differ
diff --git a/data/themes/cusis/fader_background.png b/data/themes/cusis/fader_background.png
index 4cba1e84e..422556be8 100644
Binary files a/data/themes/cusis/fader_background.png and b/data/themes/cusis/fader_background.png differ
diff --git a/data/themes/cusis/fader_knob.png b/data/themes/cusis/fader_knob.png
index e6f416f25..e444a4a4d 100644
Binary files a/data/themes/cusis/fader_knob.png and b/data/themes/cusis/fader_knob.png differ
diff --git a/data/themes/cusis/fader_leds.png b/data/themes/cusis/fader_leds.png
index cb4b346cd..20f47ef74 100644
Binary files a/data/themes/cusis/fader_leds.png and b/data/themes/cusis/fader_leds.png differ
diff --git a/data/themes/cusis/led_green.png b/data/themes/cusis/led_green.png
index 411f10877..3dd701fcc 100644
Binary files a/data/themes/cusis/led_green.png and b/data/themes/cusis/led_green.png differ
diff --git a/data/themes/cusis/led_off.png b/data/themes/cusis/led_off.png
index 2121158c1..cdac4693c 100644
Binary files a/data/themes/cusis/led_off.png and b/data/themes/cusis/led_off.png differ
diff --git a/data/themes/cusis/scrollarea_corner.png b/data/themes/cusis/scrollarea_corner.png
index 59d5bdcbb..9e2f86ae5 100644
Binary files a/data/themes/cusis/scrollarea_corner.png and b/data/themes/cusis/scrollarea_corner.png differ
diff --git a/data/themes/cusis/toolbar_bg.png b/data/themes/cusis/toolbar_bg.png
index 6c1e13544..ada851ff2 100644
Binary files a/data/themes/cusis/toolbar_bg.png and b/data/themes/cusis/toolbar_bg.png differ
diff --git a/data/themes/default/add_automation.png b/data/themes/default/add_automation.png
index 2d0c7ba4d..434cd5135 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 a42e8b517..cdce22a99 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_sample_track.png b/data/themes/default/add_sample_track.png
index 3e9caf262..67984f8b1 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/arp_down.png b/data/themes/default/arp_down.png
index b0ce4a5cc..0dafc648e 100644
Binary files a/data/themes/default/arp_down.png and b/data/themes/default/arp_down.png differ
diff --git a/data/themes/default/arp_up.png b/data/themes/default/arp_up.png
index 78e7ad37f..e3c1ee04d 100644
Binary files a/data/themes/default/arp_up.png and b/data/themes/default/arp_up.png differ
diff --git a/data/themes/default/arp_up_and_down.png b/data/themes/default/arp_up_and_down.png
index f72c0c940..ddfa28a5e 100644
Binary files a/data/themes/default/arp_up_and_down.png and b/data/themes/default/arp_up_and_down.png differ
diff --git a/data/themes/default/automation.png b/data/themes/default/automation.png
index 65a0a83d0..11524e951 100644
Binary files a/data/themes/default/automation.png and b/data/themes/default/automation.png differ
diff --git a/data/themes/default/automation_track.png b/data/themes/default/automation_track.png
index 40fc9a50b..5a168cf93 100644
Binary files a/data/themes/default/automation_track.png and b/data/themes/default/automation_track.png differ
diff --git a/data/themes/default/autoscroll_on.png b/data/themes/default/autoscroll_on.png
index fd87c9248..0d651e02c 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/back_to_start.png b/data/themes/default/back_to_start.png
index 6a7224a8f..4936fe6cd 100644
Binary files a/data/themes/default/back_to_start.png and b/data/themes/default/back_to_start.png differ
diff --git a/data/themes/default/bb_track.png b/data/themes/default/bb_track.png
index 40f58e139..e60293985 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/cancel.png b/data/themes/default/cancel.png
index b0de61d22..5264666dd 100644
Binary files a/data/themes/default/cancel.png and b/data/themes/default/cancel.png differ
diff --git a/data/themes/default/clock.png b/data/themes/default/clock.png
index cfc84a5cd..429a067f5 100644
Binary files a/data/themes/default/clock.png and b/data/themes/default/clock.png differ
diff --git a/data/themes/default/colorize.png b/data/themes/default/colorize.png
index e31f00e9f..51f14439b 100644
Binary files a/data/themes/default/colorize.png and b/data/themes/default/colorize.png differ
diff --git a/data/themes/default/dont_know.png b/data/themes/default/dont_know.png
index 21a0cab62..26ec9e8ce 100644
Binary files a/data/themes/default/dont_know.png and b/data/themes/default/dont_know.png differ
diff --git a/data/themes/default/edit_copy.png b/data/themes/default/edit_copy.png
index 03ec42747..d662d5fdb 100644
Binary files a/data/themes/default/edit_copy.png and b/data/themes/default/edit_copy.png differ
diff --git a/data/themes/default/edit_draw.png b/data/themes/default/edit_draw.png
index 45ddf2ccd..dc6030cd8 100644
Binary files a/data/themes/default/edit_draw.png and b/data/themes/default/edit_draw.png differ
diff --git a/data/themes/default/edit_erase.png b/data/themes/default/edit_erase.png
index e19451370..4325f81a4 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..0c9ca3642 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_redo.png b/data/themes/default/edit_redo.png
index 45f045028..86224882b 100644
Binary files a/data/themes/default/edit_redo.png and b/data/themes/default/edit_redo.png differ
diff --git a/data/themes/default/edit_rename.png b/data/themes/default/edit_rename.png
index ea8872fea..2febcbefd 100644
Binary files a/data/themes/default/edit_rename.png and b/data/themes/default/edit_rename.png differ
diff --git a/data/themes/default/edit_select.png b/data/themes/default/edit_select.png
index 3019d54cf..27d1eccf0 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/edit_undo.png b/data/themes/default/edit_undo.png
index 57abbe17d..090c86759 100644
Binary files a/data/themes/default/edit_undo.png and b/data/themes/default/edit_undo.png differ
diff --git a/data/themes/default/envelope_graph.png b/data/themes/default/envelope_graph.png
index 343c1f724..87fc61a41 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/error.png b/data/themes/default/error.png
index 5492295e7..4ab7c530d 100644
Binary files a/data/themes/default/error.png and b/data/themes/default/error.png differ
diff --git a/data/themes/default/factory_files.png b/data/themes/default/factory_files.png
index 995bb19d5..7032de545 100644
Binary files a/data/themes/default/factory_files.png and b/data/themes/default/factory_files.png differ
diff --git a/data/themes/default/freeze.png b/data/themes/default/freeze.png
index e8f4882e2..12314f5c1 100644
Binary files a/data/themes/default/freeze.png and b/data/themes/default/freeze.png differ
diff --git a/data/themes/default/frozen.png b/data/themes/default/frozen.png
index ef38723e8..5969757ee 100644
Binary files a/data/themes/default/frozen.png and b/data/themes/default/frozen.png differ
diff --git a/data/themes/default/hand.png b/data/themes/default/hand.png
index 5fad2852d..77e37e3e1 100644
Binary files a/data/themes/default/hand.png and b/data/themes/default/hand.png differ
diff --git a/data/themes/default/help.png b/data/themes/default/help.png
index 86b64075f..99d75db54 100644
Binary files a/data/themes/default/help.png and b/data/themes/default/help.png differ
diff --git a/data/themes/default/home.png b/data/themes/default/home.png
index 647e75338..e91925856 100644
Binary files a/data/themes/default/home.png and b/data/themes/default/home.png differ
diff --git a/data/themes/default/hq_mode.png b/data/themes/default/hq_mode.png
index ced82b2ba..0bf969985 100644
Binary files a/data/themes/default/hq_mode.png and b/data/themes/default/hq_mode.png differ
diff --git a/data/themes/default/icon.png b/data/themes/default/icon.png
index 2753bc352..623dccc5d 100644
Binary files a/data/themes/default/icon.png and b/data/themes/default/icon.png differ
diff --git a/data/themes/default/knob01.png b/data/themes/default/knob01.png
index dbe551e2e..670cb2e85 100644
Binary files a/data/themes/default/knob01.png and b/data/themes/default/knob01.png differ
diff --git a/data/themes/default/knob04.png b/data/themes/default/knob04.png
index 0e3af11c8..2f9d8d7b5 100644
Binary files a/data/themes/default/knob04.png and b/data/themes/default/knob04.png differ
diff --git a/data/themes/default/lcd_19green.png b/data/themes/default/lcd_19green.png
index d1dd66571..b388b6752 100644
Binary files a/data/themes/default/lcd_19green.png and b/data/themes/default/lcd_19green.png differ
diff --git a/data/themes/default/lcd_19red.png b/data/themes/default/lcd_19red.png
index 3238cc3eb..a7e6dab8c 100644
Binary files a/data/themes/default/lcd_19red.png and b/data/themes/default/lcd_19red.png differ
diff --git a/data/themes/default/lcd_21pink.png b/data/themes/default/lcd_21pink.png
index 2f4c360da..964cbe1ce 100644
Binary files a/data/themes/default/lcd_21pink.png and b/data/themes/default/lcd_21pink.png differ
diff --git a/data/themes/default/led_green.png b/data/themes/default/led_green.png
index 270849195..336116438 100644
Binary files a/data/themes/default/led_green.png and b/data/themes/default/led_green.png differ
diff --git a/data/themes/default/led_off.png b/data/themes/default/led_off.png
index e61b3a584..92961ad9e 100644
Binary files a/data/themes/default/led_off.png and b/data/themes/default/led_off.png differ
diff --git a/data/themes/default/led_red.png b/data/themes/default/led_red.png
index f553b2c4a..1dbd64277 100644
Binary files a/data/themes/default/led_red.png and b/data/themes/default/led_red.png differ
diff --git a/data/themes/default/led_yellow.png b/data/themes/default/led_yellow.png
index 7030bbd08..49aa6d16c 100644
Binary files a/data/themes/default/led_yellow.png and b/data/themes/default/led_yellow.png differ
diff --git a/data/themes/default/lfo_controller_artwork.png b/data/themes/default/lfo_controller_artwork.png
index 812ee37ad..709de347c 100644
Binary files a/data/themes/default/lfo_controller_artwork.png and b/data/themes/default/lfo_controller_artwork.png differ
diff --git a/data/themes/default/lfo_d100_active.png b/data/themes/default/lfo_d100_active.png
index f2a05b555..542ac245c 100644
Binary files a/data/themes/default/lfo_d100_active.png and b/data/themes/default/lfo_d100_active.png differ
diff --git a/data/themes/default/lfo_d100_inactive.png b/data/themes/default/lfo_d100_inactive.png
index 239be1e00..4a55e07c8 100644
Binary files a/data/themes/default/lfo_d100_inactive.png and b/data/themes/default/lfo_d100_inactive.png differ
diff --git a/data/themes/default/lfo_graph.png b/data/themes/default/lfo_graph.png
index 3b381618d..abf47bd00 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/lfo_x100_active.png b/data/themes/default/lfo_x100_active.png
index 479ff38c1..3f4eadb2f 100644
Binary files a/data/themes/default/lfo_x100_active.png and b/data/themes/default/lfo_x100_active.png differ
diff --git a/data/themes/default/lfo_x100_inactive.png b/data/themes/default/lfo_x100_inactive.png
index e0058926e..20b8c2131 100644
Binary files a/data/themes/default/lfo_x100_inactive.png and b/data/themes/default/lfo_x100_inactive.png differ
diff --git a/data/themes/default/lfo_x1_active.png b/data/themes/default/lfo_x1_active.png
index 3a44b3e28..97af31434 100644
Binary files a/data/themes/default/lfo_x1_active.png and b/data/themes/default/lfo_x1_active.png differ
diff --git a/data/themes/default/lfo_x1_inactive.png b/data/themes/default/lfo_x1_inactive.png
index 1947a4c93..56e09005a 100644
Binary files a/data/themes/default/lfo_x1_inactive.png and b/data/themes/default/lfo_x1_inactive.png differ
diff --git a/data/themes/default/loop_point.png b/data/themes/default/loop_point.png
index 2f60a2297..b35993b31 100644
Binary files a/data/themes/default/loop_point.png and b/data/themes/default/loop_point.png differ
diff --git a/data/themes/default/loop_points_on.png b/data/themes/default/loop_points_on.png
index 9d4fb7283..9a750330f 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/master_pitch.png b/data/themes/default/master_pitch.png
index a975cd450..f9116e0e2 100644
Binary files a/data/themes/default/master_pitch.png and b/data/themes/default/master_pitch.png differ
diff --git a/data/themes/default/master_volume.png b/data/themes/default/master_volume.png
index 2c11f078f..5652026db 100644
Binary files a/data/themes/default/master_volume.png and b/data/themes/default/master_volume.png differ
diff --git a/data/themes/default/muted.png b/data/themes/default/muted.png
index 6ba32f2f5..e83d001a0 100644
Binary files a/data/themes/default/muted.png and b/data/themes/default/muted.png differ
diff --git a/data/themes/default/note.png b/data/themes/default/note.png
index 3f475b0ea..d86cc1067 100644
Binary files a/data/themes/default/note.png and b/data/themes/default/note.png differ
diff --git a/data/themes/default/note_double_whole.png b/data/themes/default/note_double_whole.png
index 90b7a7c0e..f7079c2d5 100644
Binary files a/data/themes/default/note_double_whole.png and b/data/themes/default/note_double_whole.png differ
diff --git a/data/themes/default/note_eighth.png b/data/themes/default/note_eighth.png
index 762888208..cad8830e7 100644
Binary files a/data/themes/default/note_eighth.png and b/data/themes/default/note_eighth.png differ
diff --git a/data/themes/default/note_half.png b/data/themes/default/note_half.png
index d73ccb4f5..3ec267471 100644
Binary files a/data/themes/default/note_half.png and b/data/themes/default/note_half.png differ
diff --git a/data/themes/default/note_quarter.png b/data/themes/default/note_quarter.png
index 017468855..daf0aff96 100644
Binary files a/data/themes/default/note_quarter.png and b/data/themes/default/note_quarter.png differ
diff --git a/data/themes/default/note_sixteenth.png b/data/themes/default/note_sixteenth.png
index 33cb9ad7a..99cd99121 100644
Binary files a/data/themes/default/note_sixteenth.png and b/data/themes/default/note_sixteenth.png differ
diff --git a/data/themes/default/note_thirtysecond.png b/data/themes/default/note_thirtysecond.png
index 80f970a7c..0cf923f87 100644
Binary files a/data/themes/default/note_thirtysecond.png and b/data/themes/default/note_thirtysecond.png differ
diff --git a/data/themes/default/note_tripleteighth.png b/data/themes/default/note_tripleteighth.png
index b33cd4fb6..23d9efdcb 100644
Binary files a/data/themes/default/note_tripleteighth.png and b/data/themes/default/note_tripleteighth.png differ
diff --git a/data/themes/default/note_triplethalf.png b/data/themes/default/note_triplethalf.png
index 58343a8fc..97e5f39b7 100644
Binary files a/data/themes/default/note_triplethalf.png and b/data/themes/default/note_triplethalf.png differ
diff --git a/data/themes/default/note_tripletquarter.png b/data/themes/default/note_tripletquarter.png
index 032549b9c..9ea31fb3e 100644
Binary files a/data/themes/default/note_tripletquarter.png and b/data/themes/default/note_tripletquarter.png differ
diff --git a/data/themes/default/note_tripletsixteenth.png b/data/themes/default/note_tripletsixteenth.png
index 6314c398a..991baa4d9 100644
Binary files a/data/themes/default/note_tripletsixteenth.png and b/data/themes/default/note_tripletsixteenth.png differ
diff --git a/data/themes/default/note_tripletthirtysecond.png b/data/themes/default/note_tripletthirtysecond.png
index 81ab31411..b580406ea 100644
Binary files a/data/themes/default/note_tripletthirtysecond.png and b/data/themes/default/note_tripletthirtysecond.png differ
diff --git a/data/themes/default/note_whole.png b/data/themes/default/note_whole.png
index 3764b94b9..c2601bd68 100644
Binary files a/data/themes/default/note_whole.png and b/data/themes/default/note_whole.png differ
diff --git a/data/themes/default/playpos_marker.png b/data/themes/default/playpos_marker.png
index fb4befbb0..9423b2866 100644
Binary files a/data/themes/default/playpos_marker.png and b/data/themes/default/playpos_marker.png differ
diff --git a/data/themes/default/plugins.png b/data/themes/default/plugins.png
index b7cff0117..7865c9cbe 100644
Binary files a/data/themes/default/plugins.png and b/data/themes/default/plugins.png differ
diff --git a/data/themes/default/ports.png b/data/themes/default/ports.png
index de9036262..2fc349436 100644
Binary files a/data/themes/default/ports.png and b/data/themes/default/ports.png differ
diff --git a/data/themes/default/project_export.png b/data/themes/default/project_export.png
index 999a415b4..89465a188 100644
Binary files a/data/themes/default/project_export.png and b/data/themes/default/project_export.png differ
diff --git a/data/themes/default/project_import.png b/data/themes/default/project_import.png
index 6680f2416..511babce4 100644
Binary files a/data/themes/default/project_import.png and b/data/themes/default/project_import.png differ
diff --git a/data/themes/default/project_new_from_template.png b/data/themes/default/project_new_from_template.png
index 3d0f5cc1d..92642a9a0 100644
Binary files a/data/themes/default/project_new_from_template.png and b/data/themes/default/project_new_from_template.png differ
diff --git a/data/themes/default/record.png b/data/themes/default/record.png
index 7f3eef114..fa0efa36a 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 1a58c2a12..2c0c0a4b2 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/reload.png b/data/themes/default/reload.png
index 699153a93..ce2498f8a 100644
Binary files a/data/themes/default/reload.png and b/data/themes/default/reload.png differ
diff --git a/data/themes/default/round_square_wave_inactive.png b/data/themes/default/round_square_wave_inactive.png
index 3e1f9c0b0..de1af0d40 100644
Binary files a/data/themes/default/round_square_wave_inactive.png and b/data/themes/default/round_square_wave_inactive.png differ
diff --git a/data/themes/default/sample_track.png b/data/themes/default/sample_track.png
index d65bc0752..bbb5c31a1 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/setup_general.png b/data/themes/default/setup_general.png
index 0795ef56e..71f44d405 100644
Binary files a/data/themes/default/setup_general.png and b/data/themes/default/setup_general.png differ
diff --git a/data/themes/default/songeditor.png b/data/themes/default/songeditor.png
index 4f5203878..2edcc0e5a 100644
Binary files a/data/themes/default/songeditor.png and b/data/themes/default/songeditor.png differ
diff --git a/data/themes/default/step_btn_off.png b/data/themes/default/step_btn_off.png
index 2948422e9..ca4580746 100644
Binary files a/data/themes/default/step_btn_off.png and b/data/themes/default/step_btn_off.png differ
diff --git a/data/themes/default/step_btn_off_light.png b/data/themes/default/step_btn_off_light.png
index c069d5e98..e0777d34e 100644
Binary files a/data/themes/default/step_btn_off_light.png and b/data/themes/default/step_btn_off_light.png differ
diff --git a/data/themes/default/step_btn_on.png b/data/themes/default/step_btn_on.png
index 7d520bc74..b4b030d0d 100644
Binary files a/data/themes/default/step_btn_on.png and b/data/themes/default/step_btn_on.png differ
diff --git a/data/themes/default/step_btn_on_100.png b/data/themes/default/step_btn_on_100.png
index d3b4f15f9..2f4359834 100644
Binary files a/data/themes/default/step_btn_on_100.png and b/data/themes/default/step_btn_on_100.png differ
diff --git a/data/themes/default/step_btn_on_yellow.png b/data/themes/default/step_btn_on_yellow.png
index 827a3ca1a..acdaefe13 100644
Binary files a/data/themes/default/step_btn_on_yellow.png and b/data/themes/default/step_btn_on_yellow.png differ
diff --git a/data/themes/default/tempo_sync.png b/data/themes/default/tempo_sync.png
index cfc84a5cd..429a067f5 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/text_block.png b/data/themes/default/text_block.png
index e69a9f246..f8eb1d927 100644
Binary files a/data/themes/default/text_block.png and b/data/themes/default/text_block.png differ
diff --git a/data/themes/default/text_bold.png b/data/themes/default/text_bold.png
index 9abb008bc..aa7e38662 100644
Binary files a/data/themes/default/text_bold.png and b/data/themes/default/text_bold.png differ
diff --git a/data/themes/default/text_center.png b/data/themes/default/text_center.png
index eb8428fd3..bf0c8f416 100644
Binary files a/data/themes/default/text_center.png and b/data/themes/default/text_center.png differ
diff --git a/data/themes/default/text_italic.png b/data/themes/default/text_italic.png
index f2d582368..43ad5d9bf 100644
Binary files a/data/themes/default/text_italic.png and b/data/themes/default/text_italic.png differ
diff --git a/data/themes/default/text_left.png b/data/themes/default/text_left.png
index ae817ca88..e10a80f9a 100644
Binary files a/data/themes/default/text_left.png and b/data/themes/default/text_left.png differ
diff --git a/data/themes/default/text_right.png b/data/themes/default/text_right.png
index 38129a211..ac5608b24 100644
Binary files a/data/themes/default/text_right.png and b/data/themes/default/text_right.png differ
diff --git a/data/themes/default/text_under.png b/data/themes/default/text_under.png
index 4504d7c00..f49833adb 100644
Binary files a/data/themes/default/text_under.png and b/data/themes/default/text_under.png differ
diff --git a/data/themes/default/track_op_menu.png b/data/themes/default/track_op_menu.png
index 4207a3ea1..aff64f62f 100644
Binary files a/data/themes/default/track_op_menu.png and b/data/themes/default/track_op_menu.png differ
diff --git a/data/themes/default/uhoh.png b/data/themes/default/uhoh.png
index 9b2b70930..1bd14d6a8 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..bf0b9ad2a 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/unfreeze.png b/data/themes/default/unfreeze.png
index 6f28cf1a7..0f640998f 100644
Binary files a/data/themes/default/unfreeze.png and b/data/themes/default/unfreeze.png differ
diff --git a/data/themes/default/zoom.png b/data/themes/default/zoom.png
index 959217ed6..84583c4e5 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..317b21af5 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..5237eede0 100644
Binary files a/data/themes/default/zoom_y.png and b/data/themes/default/zoom_y.png differ
diff --git a/plugins/zynaddsubfx/fltk/FL/Fl_Menu_Item.H b/plugins/zynaddsubfx/fltk/FL/Fl_Menu_Item.H
index 33e520a67..80ee5b272 100644
--- a/plugins/zynaddsubfx/fltk/FL/Fl_Menu_Item.H
+++ b/plugins/zynaddsubfx/fltk/FL/Fl_Menu_Item.H
@@ -88,7 +88,7 @@ struct FL_EXPORT Fl_Menu_Item {
   void callback(Fl_Callback1*c, long p=0) {callback_=(Fl_Callback*)c; user_data_=(void*)p;}
   void* user_data() const {return user_data_;}
   void user_data(void* v) {user_data_ = v;}
-  long argument() const {return (long)user_data_;}
+  long argument() const {return (long long)user_data_;}
   void argument(long v) {user_data_ = (void*)v;}
   int shortcut() const {return shortcut_;}
   void shortcut(int s) {shortcut_ = s;}
diff --git a/plugins/zynaddsubfx/fltk/FL/x.H b/plugins/zynaddsubfx/fltk/FL/x.H
index 3a3139317..88802b98b 100644
--- a/plugins/zynaddsubfx/fltk/FL/x.H
+++ b/plugins/zynaddsubfx/fltk/FL/x.H
@@ -65,34 +65,10 @@ extern FL_EXPORT int fl_screen;
 extern FL_EXPORT XVisualInfo *fl_visual;
 extern FL_EXPORT Colormap fl_colormap;
 
-#if USE_XFT
-// access to core fonts
-FL_EXPORT XFontStruct* fl_xxfont();
-class Fl_XFont_On_Demand
-{
-public:
-  Fl_XFont_On_Demand(XFontStruct* p = NULL) : ptr(p) { }
-  Fl_XFont_On_Demand& operator=(const Fl_XFont_On_Demand& x)
-    { ptr = x.ptr;  return *this; }
-  Fl_XFont_On_Demand& operator=(XFontStruct* p)
-    { ptr = p;  return *this; }
-  XFontStruct* value() { if (!ptr) { ptr = fl_xxfont(); }  return ptr; }
-  operator XFontStruct*() { return value(); }
-  XFontStruct& operator*() { return *value(); }
-  XFontStruct* operator->() { return value(); }
-  bool operator==(const Fl_XFont_On_Demand& x) { return ptr == x.ptr; }
-  bool operator!=(const Fl_XFont_On_Demand& x) { return ptr != x.ptr; }
-private:
-  XFontStruct* ptr;
-};
-extern FL_EXPORT Fl_XFont_On_Demand fl_xfont;
-#else
-extern FL_EXPORT XFontStruct* fl_xfont;
-#endif
-
 // drawing functions:
 extern FL_EXPORT GC fl_gc;
 extern FL_EXPORT Window fl_window;
+extern FL_EXPORT XFontStruct* fl_xfont;
 extern FL_EXPORT void *fl_xftfont;
 FL_EXPORT ulong fl_xpixel(Fl_Color i);
 FL_EXPORT ulong fl_xpixel(uchar r, uchar g, uchar b);