diff --git a/aegisub/src/bitmaps/16/about_menu.png b/aegisub/src/bitmaps/button/about_menu_16.png
similarity index 100%
rename from aegisub/src/bitmaps/16/about_menu.png
rename to aegisub/src/bitmaps/button/about_menu_16.png
diff --git a/aegisub/src/bitmaps/24/about_menu.png b/aegisub/src/bitmaps/button/about_menu_24.png
similarity index 100%
rename from aegisub/src/bitmaps/24/about_menu.png
rename to aegisub/src/bitmaps/button/about_menu_24.png
diff --git a/aegisub/src/bitmaps/16/arrow_down.png b/aegisub/src/bitmaps/button/arrow_down_16.png
similarity index 100%
rename from aegisub/src/bitmaps/16/arrow_down.png
rename to aegisub/src/bitmaps/button/arrow_down_16.png
diff --git a/aegisub/src/bitmaps/24/arrow_down.png b/aegisub/src/bitmaps/button/arrow_down_24.png
similarity index 100%
rename from aegisub/src/bitmaps/24/arrow_down.png
rename to aegisub/src/bitmaps/button/arrow_down_24.png
diff --git a/aegisub/src/bitmaps/16/arrow_down_stop.png b/aegisub/src/bitmaps/button/arrow_down_stop_16.png
similarity index 100%
rename from aegisub/src/bitmaps/16/arrow_down_stop.png
rename to aegisub/src/bitmaps/button/arrow_down_stop_16.png
diff --git a/aegisub/src/bitmaps/24/arrow_down_stop.png b/aegisub/src/bitmaps/button/arrow_down_stop_24.png
similarity index 100%
rename from aegisub/src/bitmaps/24/arrow_down_stop.png
rename to aegisub/src/bitmaps/button/arrow_down_stop_24.png
diff --git a/aegisub/src/bitmaps/16/arrow_sort.png b/aegisub/src/bitmaps/button/arrow_sort_16.png
similarity index 100%
rename from aegisub/src/bitmaps/16/arrow_sort.png
rename to aegisub/src/bitmaps/button/arrow_sort_16.png
diff --git a/aegisub/src/bitmaps/24/arrow_sort.png b/aegisub/src/bitmaps/button/arrow_sort_24.png
similarity index 100%
rename from aegisub/src/bitmaps/24/arrow_sort.png
rename to aegisub/src/bitmaps/button/arrow_sort_24.png
diff --git a/aegisub/src/bitmaps/16/arrow_up.png b/aegisub/src/bitmaps/button/arrow_up_16.png
similarity index 100%
rename from aegisub/src/bitmaps/16/arrow_up.png
rename to aegisub/src/bitmaps/button/arrow_up_16.png
diff --git a/aegisub/src/bitmaps/24/arrow_up.png b/aegisub/src/bitmaps/button/arrow_up_24.png
similarity index 100%
rename from aegisub/src/bitmaps/24/arrow_up.png
rename to aegisub/src/bitmaps/button/arrow_up_24.png
diff --git a/aegisub/src/bitmaps/16/arrow_up_stop.png b/aegisub/src/bitmaps/button/arrow_up_stop_16.png
similarity index 100%
rename from aegisub/src/bitmaps/16/arrow_up_stop.png
rename to aegisub/src/bitmaps/button/arrow_up_stop_16.png
diff --git a/aegisub/src/bitmaps/24/arrow_up_stop.png b/aegisub/src/bitmaps/button/arrow_up_stop_24.png
similarity index 100%
rename from aegisub/src/bitmaps/24/arrow_up_stop.png
rename to aegisub/src/bitmaps/button/arrow_up_stop_24.png
diff --git a/aegisub/src/bitmaps/16/assdraw.png b/aegisub/src/bitmaps/button/assdraw_16.png
similarity index 100%
rename from aegisub/src/bitmaps/16/assdraw.png
rename to aegisub/src/bitmaps/button/assdraw_16.png
diff --git a/aegisub/src/bitmaps/24/assdraw.png b/aegisub/src/bitmaps/button/assdraw_24.png
similarity index 100%
rename from aegisub/src/bitmaps/24/assdraw.png
rename to aegisub/src/bitmaps/button/assdraw_24.png
diff --git a/aegisub/src/bitmaps/16/attach_button.png b/aegisub/src/bitmaps/button/attach_button_16.png
similarity index 100%
rename from aegisub/src/bitmaps/16/attach_button.png
rename to aegisub/src/bitmaps/button/attach_button_16.png
diff --git a/aegisub/src/bitmaps/24/attach_button.png b/aegisub/src/bitmaps/button/attach_button_24.png
similarity index 100%
rename from aegisub/src/bitmaps/24/attach_button.png
rename to aegisub/src/bitmaps/button/attach_button_24.png
diff --git a/aegisub/src/bitmaps/16/automation_toolbutton.png b/aegisub/src/bitmaps/button/automation_toolbutton_16.png
similarity index 100%
rename from aegisub/src/bitmaps/16/automation_toolbutton.png
rename to aegisub/src/bitmaps/button/automation_toolbutton_16.png
diff --git a/aegisub/src/bitmaps/24/automation_toolbutton.png b/aegisub/src/bitmaps/button/automation_toolbutton_24.png
similarity index 100%
rename from aegisub/src/bitmaps/24/automation_toolbutton.png
rename to aegisub/src/bitmaps/button/automation_toolbutton_24.png
diff --git a/aegisub/src/bitmaps/16/blank_button.png b/aegisub/src/bitmaps/button/blank_button_16.png
similarity index 100%
rename from aegisub/src/bitmaps/16/blank_button.png
rename to aegisub/src/bitmaps/button/blank_button_16.png
diff --git a/aegisub/src/bitmaps/24/blank_button.png b/aegisub/src/bitmaps/button/blank_button_24.png
similarity index 100%
rename from aegisub/src/bitmaps/24/blank_button.png
rename to aegisub/src/bitmaps/button/blank_button_24.png
diff --git a/aegisub/src/bitmaps/16/bugtracker_button.png b/aegisub/src/bitmaps/button/bugtracker_button_16.png
similarity index 100%
rename from aegisub/src/bitmaps/16/bugtracker_button.png
rename to aegisub/src/bitmaps/button/bugtracker_button_16.png
diff --git a/aegisub/src/bitmaps/24/bugtracker_button.png b/aegisub/src/bitmaps/button/bugtracker_button_24.png
similarity index 100%
rename from aegisub/src/bitmaps/24/bugtracker_button.png
rename to aegisub/src/bitmaps/button/bugtracker_button_24.png
diff --git a/aegisub/src/bitmaps/16/button_audio_commit.png b/aegisub/src/bitmaps/button/button_audio_commit_16.png
similarity index 100%
rename from aegisub/src/bitmaps/16/button_audio_commit.png
rename to aegisub/src/bitmaps/button/button_audio_commit_16.png
diff --git a/aegisub/src/bitmaps/24/button_audio_commit.png b/aegisub/src/bitmaps/button/button_audio_commit_24.png
similarity index 100%
rename from aegisub/src/bitmaps/24/button_audio_commit.png
rename to aegisub/src/bitmaps/button/button_audio_commit_24.png
diff --git a/aegisub/src/bitmaps/16/button_audio_goto.png b/aegisub/src/bitmaps/button/button_audio_goto_16.png
similarity index 100%
rename from aegisub/src/bitmaps/16/button_audio_goto.png
rename to aegisub/src/bitmaps/button/button_audio_goto_16.png
diff --git a/aegisub/src/bitmaps/24/button_audio_goto.png b/aegisub/src/bitmaps/button/button_audio_goto_24.png
similarity index 100%
rename from aegisub/src/bitmaps/24/button_audio_goto.png
rename to aegisub/src/bitmaps/button/button_audio_goto_24.png
diff --git a/aegisub/src/bitmaps/16/button_bold.png b/aegisub/src/bitmaps/button/button_bold_16.png
similarity index 100%
rename from aegisub/src/bitmaps/16/button_bold.png
rename to aegisub/src/bitmaps/button/button_bold_16.png
diff --git a/aegisub/src/bitmaps/24/button_bold.png b/aegisub/src/bitmaps/button/button_bold_24.png
similarity index 100%
rename from aegisub/src/bitmaps/24/button_bold.png
rename to aegisub/src/bitmaps/button/button_bold_24.png
diff --git a/aegisub/src/bitmaps/16/button_color_four.png b/aegisub/src/bitmaps/button/button_color_four_16.png
similarity index 100%
rename from aegisub/src/bitmaps/16/button_color_four.png
rename to aegisub/src/bitmaps/button/button_color_four_16.png
diff --git a/aegisub/src/bitmaps/24/button_color_four.png b/aegisub/src/bitmaps/button/button_color_four_24.png
similarity index 100%
rename from aegisub/src/bitmaps/24/button_color_four.png
rename to aegisub/src/bitmaps/button/button_color_four_24.png
diff --git a/aegisub/src/bitmaps/16/button_color_one.png b/aegisub/src/bitmaps/button/button_color_one_16.png
similarity index 100%
rename from aegisub/src/bitmaps/16/button_color_one.png
rename to aegisub/src/bitmaps/button/button_color_one_16.png
diff --git a/aegisub/src/bitmaps/24/button_color_one.png b/aegisub/src/bitmaps/button/button_color_one_24.png
similarity index 100%
rename from aegisub/src/bitmaps/24/button_color_one.png
rename to aegisub/src/bitmaps/button/button_color_one_24.png
diff --git a/aegisub/src/bitmaps/16/button_color_three.png b/aegisub/src/bitmaps/button/button_color_three_16.png
similarity index 100%
rename from aegisub/src/bitmaps/16/button_color_three.png
rename to aegisub/src/bitmaps/button/button_color_three_16.png
diff --git a/aegisub/src/bitmaps/24/button_color_three.png b/aegisub/src/bitmaps/button/button_color_three_24.png
similarity index 100%
rename from aegisub/src/bitmaps/24/button_color_three.png
rename to aegisub/src/bitmaps/button/button_color_three_24.png
diff --git a/aegisub/src/bitmaps/16/button_color_two.png b/aegisub/src/bitmaps/button/button_color_two_16.png
similarity index 100%
rename from aegisub/src/bitmaps/16/button_color_two.png
rename to aegisub/src/bitmaps/button/button_color_two_16.png
diff --git a/aegisub/src/bitmaps/24/button_color_two.png b/aegisub/src/bitmaps/button/button_color_two_24.png
similarity index 100%
rename from aegisub/src/bitmaps/24/button_color_two.png
rename to aegisub/src/bitmaps/button/button_color_two_24.png
diff --git a/aegisub/src/bitmaps/16/button_fontname.png b/aegisub/src/bitmaps/button/button_fontname_16.png
similarity index 100%
rename from aegisub/src/bitmaps/16/button_fontname.png
rename to aegisub/src/bitmaps/button/button_fontname_16.png
diff --git a/aegisub/src/bitmaps/24/button_fontname.png b/aegisub/src/bitmaps/button/button_fontname_24.png
similarity index 100%
rename from aegisub/src/bitmaps/24/button_fontname.png
rename to aegisub/src/bitmaps/button/button_fontname_24.png
diff --git a/aegisub/src/bitmaps/16/button_italics.png b/aegisub/src/bitmaps/button/button_italics_16.png
similarity index 100%
rename from aegisub/src/bitmaps/16/button_italics.png
rename to aegisub/src/bitmaps/button/button_italics_16.png
diff --git a/aegisub/src/bitmaps/24/button_italics.png b/aegisub/src/bitmaps/button/button_italics_24.png
similarity index 100%
rename from aegisub/src/bitmaps/24/button_italics.png
rename to aegisub/src/bitmaps/button/button_italics_24.png
diff --git a/aegisub/src/bitmaps/16/button_leadin.png b/aegisub/src/bitmaps/button/button_leadin_16.png
similarity index 100%
rename from aegisub/src/bitmaps/16/button_leadin.png
rename to aegisub/src/bitmaps/button/button_leadin_16.png
diff --git a/aegisub/src/bitmaps/24/button_leadin.png b/aegisub/src/bitmaps/button/button_leadin_24.png
similarity index 100%
rename from aegisub/src/bitmaps/24/button_leadin.png
rename to aegisub/src/bitmaps/button/button_leadin_24.png
diff --git a/aegisub/src/bitmaps/16/button_leadout.png b/aegisub/src/bitmaps/button/button_leadout_16.png
similarity index 100%
rename from aegisub/src/bitmaps/16/button_leadout.png
rename to aegisub/src/bitmaps/button/button_leadout_16.png
diff --git a/aegisub/src/bitmaps/24/button_leadout.png b/aegisub/src/bitmaps/button/button_leadout_24.png
similarity index 100%
rename from aegisub/src/bitmaps/24/button_leadout.png
rename to aegisub/src/bitmaps/button/button_leadout_24.png
diff --git a/aegisub/src/bitmaps/16/button_next.png b/aegisub/src/bitmaps/button/button_next_16.png
similarity index 100%
rename from aegisub/src/bitmaps/16/button_next.png
rename to aegisub/src/bitmaps/button/button_next_16.png
diff --git a/aegisub/src/bitmaps/24/button_next.png b/aegisub/src/bitmaps/button/button_next_24.png
similarity index 100%
rename from aegisub/src/bitmaps/24/button_next.png
rename to aegisub/src/bitmaps/button/button_next_24.png
diff --git a/aegisub/src/bitmaps/16/button_pause.png b/aegisub/src/bitmaps/button/button_pause_16.png
similarity index 100%
rename from aegisub/src/bitmaps/16/button_pause.png
rename to aegisub/src/bitmaps/button/button_pause_16.png
diff --git a/aegisub/src/bitmaps/24/button_pause.png b/aegisub/src/bitmaps/button/button_pause_24.png
similarity index 100%
rename from aegisub/src/bitmaps/24/button_pause.png
rename to aegisub/src/bitmaps/button/button_pause_24.png
diff --git a/aegisub/src/bitmaps/16/button_play.png b/aegisub/src/bitmaps/button/button_play_16.png
similarity index 100%
rename from aegisub/src/bitmaps/16/button_play.png
rename to aegisub/src/bitmaps/button/button_play_16.png
diff --git a/aegisub/src/bitmaps/24/button_play.png b/aegisub/src/bitmaps/button/button_play_24.png
similarity index 100%
rename from aegisub/src/bitmaps/24/button_play.png
rename to aegisub/src/bitmaps/button/button_play_24.png
diff --git a/aegisub/src/bitmaps/16/button_playfirstfiveh.png b/aegisub/src/bitmaps/button/button_playfirstfiveh_16.png
similarity index 100%
rename from aegisub/src/bitmaps/16/button_playfirstfiveh.png
rename to aegisub/src/bitmaps/button/button_playfirstfiveh_16.png
diff --git a/aegisub/src/bitmaps/24/button_playfirstfiveh.png b/aegisub/src/bitmaps/button/button_playfirstfiveh_24.png
similarity index 100%
rename from aegisub/src/bitmaps/24/button_playfirstfiveh.png
rename to aegisub/src/bitmaps/button/button_playfirstfiveh_24.png
diff --git a/aegisub/src/bitmaps/16/button_playfivehafter.png b/aegisub/src/bitmaps/button/button_playfivehafter_16.png
similarity index 100%
rename from aegisub/src/bitmaps/16/button_playfivehafter.png
rename to aegisub/src/bitmaps/button/button_playfivehafter_16.png
diff --git a/aegisub/src/bitmaps/24/button_playfivehafter.png b/aegisub/src/bitmaps/button/button_playfivehafter_24.png
similarity index 100%
rename from aegisub/src/bitmaps/24/button_playfivehafter.png
rename to aegisub/src/bitmaps/button/button_playfivehafter_24.png
diff --git a/aegisub/src/bitmaps/16/button_playfivehbefore.png b/aegisub/src/bitmaps/button/button_playfivehbefore_16.png
similarity index 100%
rename from aegisub/src/bitmaps/16/button_playfivehbefore.png
rename to aegisub/src/bitmaps/button/button_playfivehbefore_16.png
diff --git a/aegisub/src/bitmaps/24/button_playfivehbefore.png b/aegisub/src/bitmaps/button/button_playfivehbefore_24.png
similarity index 100%
rename from aegisub/src/bitmaps/24/button_playfivehbefore.png
rename to aegisub/src/bitmaps/button/button_playfivehbefore_24.png
diff --git a/aegisub/src/bitmaps/16/button_playlastfiveh.png b/aegisub/src/bitmaps/button/button_playlastfiveh_16.png
similarity index 100%
rename from aegisub/src/bitmaps/16/button_playlastfiveh.png
rename to aegisub/src/bitmaps/button/button_playlastfiveh_16.png
diff --git a/aegisub/src/bitmaps/24/button_playlastfiveh.png b/aegisub/src/bitmaps/button/button_playlastfiveh_24.png
similarity index 100%
rename from aegisub/src/bitmaps/24/button_playlastfiveh.png
rename to aegisub/src/bitmaps/button/button_playlastfiveh_24.png
diff --git a/aegisub/src/bitmaps/16/button_playline.png b/aegisub/src/bitmaps/button/button_playline_16.png
similarity index 100%
rename from aegisub/src/bitmaps/16/button_playline.png
rename to aegisub/src/bitmaps/button/button_playline_16.png
diff --git a/aegisub/src/bitmaps/24/button_playline.png b/aegisub/src/bitmaps/button/button_playline_24.png
similarity index 100%
rename from aegisub/src/bitmaps/24/button_playline.png
rename to aegisub/src/bitmaps/button/button_playline_24.png
diff --git a/aegisub/src/bitmaps/16/button_playsel.png b/aegisub/src/bitmaps/button/button_playsel_16.png
similarity index 100%
rename from aegisub/src/bitmaps/16/button_playsel.png
rename to aegisub/src/bitmaps/button/button_playsel_16.png
diff --git a/aegisub/src/bitmaps/24/button_playsel.png b/aegisub/src/bitmaps/button/button_playsel_24.png
similarity index 100%
rename from aegisub/src/bitmaps/24/button_playsel.png
rename to aegisub/src/bitmaps/button/button_playsel_24.png
diff --git a/aegisub/src/bitmaps/16/button_playtoend.png b/aegisub/src/bitmaps/button/button_playtoend_16.png
similarity index 100%
rename from aegisub/src/bitmaps/16/button_playtoend.png
rename to aegisub/src/bitmaps/button/button_playtoend_16.png
diff --git a/aegisub/src/bitmaps/24/button_playtoend.png b/aegisub/src/bitmaps/button/button_playtoend_24.png
similarity index 100%
rename from aegisub/src/bitmaps/24/button_playtoend.png
rename to aegisub/src/bitmaps/button/button_playtoend_24.png
diff --git a/aegisub/src/bitmaps/16/button_prev.png b/aegisub/src/bitmaps/button/button_prev_16.png
similarity index 100%
rename from aegisub/src/bitmaps/16/button_prev.png
rename to aegisub/src/bitmaps/button/button_prev_16.png
diff --git a/aegisub/src/bitmaps/24/button_prev.png b/aegisub/src/bitmaps/button/button_prev_24.png
similarity index 100%
rename from aegisub/src/bitmaps/24/button_prev.png
rename to aegisub/src/bitmaps/button/button_prev_24.png
diff --git a/aegisub/src/bitmaps/16/button_stop.png b/aegisub/src/bitmaps/button/button_stop_16.png
similarity index 100%
rename from aegisub/src/bitmaps/16/button_stop.png
rename to aegisub/src/bitmaps/button/button_stop_16.png
diff --git a/aegisub/src/bitmaps/24/button_stop.png b/aegisub/src/bitmaps/button/button_stop_24.png
similarity index 100%
rename from aegisub/src/bitmaps/24/button_stop.png
rename to aegisub/src/bitmaps/button/button_stop_24.png
diff --git a/aegisub/src/bitmaps/16/button_strikeout.png b/aegisub/src/bitmaps/button/button_strikeout_16.png
similarity index 100%
rename from aegisub/src/bitmaps/16/button_strikeout.png
rename to aegisub/src/bitmaps/button/button_strikeout_16.png
diff --git a/aegisub/src/bitmaps/24/button_strikeout.png b/aegisub/src/bitmaps/button/button_strikeout_24.png
similarity index 100%
rename from aegisub/src/bitmaps/24/button_strikeout.png
rename to aegisub/src/bitmaps/button/button_strikeout_24.png
diff --git a/aegisub/src/bitmaps/16/button_track_move.png b/aegisub/src/bitmaps/button/button_track_move_16.png
similarity index 100%
rename from aegisub/src/bitmaps/16/button_track_move.png
rename to aegisub/src/bitmaps/button/button_track_move_16.png
diff --git a/aegisub/src/bitmaps/24/button_track_move.png b/aegisub/src/bitmaps/button/button_track_move_24.png
similarity index 100%
rename from aegisub/src/bitmaps/24/button_track_move.png
rename to aegisub/src/bitmaps/button/button_track_move_24.png
diff --git a/aegisub/src/bitmaps/16/button_track_movement.png b/aegisub/src/bitmaps/button/button_track_movement_16.png
similarity index 100%
rename from aegisub/src/bitmaps/16/button_track_movement.png
rename to aegisub/src/bitmaps/button/button_track_movement_16.png
diff --git a/aegisub/src/bitmaps/24/button_track_movement.png b/aegisub/src/bitmaps/button/button_track_movement_24.png
similarity index 100%
rename from aegisub/src/bitmaps/24/button_track_movement.png
rename to aegisub/src/bitmaps/button/button_track_movement_24.png
diff --git a/aegisub/src/bitmaps/16/button_track_point_add.png b/aegisub/src/bitmaps/button/button_track_point_add_16.png
similarity index 100%
rename from aegisub/src/bitmaps/16/button_track_point_add.png
rename to aegisub/src/bitmaps/button/button_track_point_add_16.png
diff --git a/aegisub/src/bitmaps/24/button_track_point_add.png b/aegisub/src/bitmaps/button/button_track_point_add_24.png
similarity index 100%
rename from aegisub/src/bitmaps/24/button_track_point_add.png
rename to aegisub/src/bitmaps/button/button_track_point_add_24.png
diff --git a/aegisub/src/bitmaps/16/button_track_point_del.png b/aegisub/src/bitmaps/button/button_track_point_del_16.png
similarity index 100%
rename from aegisub/src/bitmaps/16/button_track_point_del.png
rename to aegisub/src/bitmaps/button/button_track_point_del_16.png
diff --git a/aegisub/src/bitmaps/24/button_track_point_del.png b/aegisub/src/bitmaps/button/button_track_point_del_24.png
similarity index 100%
rename from aegisub/src/bitmaps/24/button_track_point_del.png
rename to aegisub/src/bitmaps/button/button_track_point_del_24.png
diff --git a/aegisub/src/bitmaps/16/button_track_points.png b/aegisub/src/bitmaps/button/button_track_points_16.png
similarity index 100%
rename from aegisub/src/bitmaps/16/button_track_points.png
rename to aegisub/src/bitmaps/button/button_track_points_16.png
diff --git a/aegisub/src/bitmaps/24/button_track_points.png b/aegisub/src/bitmaps/button/button_track_points_24.png
similarity index 100%
rename from aegisub/src/bitmaps/24/button_track_points.png
rename to aegisub/src/bitmaps/button/button_track_points_24.png
diff --git a/aegisub/src/bitmaps/16/button_track_split_line.png b/aegisub/src/bitmaps/button/button_track_split_line_16.png
similarity index 100%
rename from aegisub/src/bitmaps/16/button_track_split_line.png
rename to aegisub/src/bitmaps/button/button_track_split_line_16.png
diff --git a/aegisub/src/bitmaps/24/button_track_split_line.png b/aegisub/src/bitmaps/button/button_track_split_line_24.png
similarity index 100%
rename from aegisub/src/bitmaps/24/button_track_split_line.png
rename to aegisub/src/bitmaps/button/button_track_split_line_24.png
diff --git a/aegisub/src/bitmaps/16/button_track_trail.png b/aegisub/src/bitmaps/button/button_track_trail_16.png
similarity index 100%
rename from aegisub/src/bitmaps/16/button_track_trail.png
rename to aegisub/src/bitmaps/button/button_track_trail_16.png
diff --git a/aegisub/src/bitmaps/24/button_track_trail.png b/aegisub/src/bitmaps/button/button_track_trail_24.png
similarity index 100%
rename from aegisub/src/bitmaps/24/button_track_trail.png
rename to aegisub/src/bitmaps/button/button_track_trail_24.png
diff --git a/aegisub/src/bitmaps/16/button_underline.png b/aegisub/src/bitmaps/button/button_underline_16.png
similarity index 100%
rename from aegisub/src/bitmaps/16/button_underline.png
rename to aegisub/src/bitmaps/button/button_underline_16.png
diff --git a/aegisub/src/bitmaps/24/button_underline.png b/aegisub/src/bitmaps/button/button_underline_24.png
similarity index 100%
rename from aegisub/src/bitmaps/24/button_underline.png
rename to aegisub/src/bitmaps/button/button_underline_24.png
diff --git a/aegisub/src/bitmaps/16/close_audio_menu.png b/aegisub/src/bitmaps/button/close_audio_menu_16.png
similarity index 100%
rename from aegisub/src/bitmaps/16/close_audio_menu.png
rename to aegisub/src/bitmaps/button/close_audio_menu_16.png
diff --git a/aegisub/src/bitmaps/24/close_audio_menu.png b/aegisub/src/bitmaps/button/close_audio_menu_24.png
similarity index 100%
rename from aegisub/src/bitmaps/24/close_audio_menu.png
rename to aegisub/src/bitmaps/button/close_audio_menu_24.png
diff --git a/aegisub/src/bitmaps/16/close_keyframes_menu.png b/aegisub/src/bitmaps/button/close_keyframes_menu_16.png
similarity index 100%
rename from aegisub/src/bitmaps/16/close_keyframes_menu.png
rename to aegisub/src/bitmaps/button/close_keyframes_menu_16.png
diff --git a/aegisub/src/bitmaps/24/close_keyframes_menu.png b/aegisub/src/bitmaps/button/close_keyframes_menu_24.png
similarity index 100%
rename from aegisub/src/bitmaps/24/close_keyframes_menu.png
rename to aegisub/src/bitmaps/button/close_keyframes_menu_24.png
diff --git a/aegisub/src/bitmaps/16/close_timecodes_menu.png b/aegisub/src/bitmaps/button/close_timecodes_menu_16.png
similarity index 100%
rename from aegisub/src/bitmaps/16/close_timecodes_menu.png
rename to aegisub/src/bitmaps/button/close_timecodes_menu_16.png
diff --git a/aegisub/src/bitmaps/24/close_timecodes_menu.png b/aegisub/src/bitmaps/button/close_timecodes_menu_24.png
similarity index 100%
rename from aegisub/src/bitmaps/24/close_timecodes_menu.png
rename to aegisub/src/bitmaps/button/close_timecodes_menu_24.png
diff --git a/aegisub/src/bitmaps/16/close_video_menu.png b/aegisub/src/bitmaps/button/close_video_menu_16.png
similarity index 100%
rename from aegisub/src/bitmaps/16/close_video_menu.png
rename to aegisub/src/bitmaps/button/close_video_menu_16.png
diff --git a/aegisub/src/bitmaps/24/close_video_menu.png b/aegisub/src/bitmaps/button/close_video_menu_24.png
similarity index 100%
rename from aegisub/src/bitmaps/24/close_video_menu.png
rename to aegisub/src/bitmaps/button/close_video_menu_24.png
diff --git a/aegisub/src/bitmaps/16/contents_button.png b/aegisub/src/bitmaps/button/contents_button_16.png
similarity index 100%
rename from aegisub/src/bitmaps/16/contents_button.png
rename to aegisub/src/bitmaps/button/contents_button_16.png
diff --git a/aegisub/src/bitmaps/24/contents_button.png b/aegisub/src/bitmaps/button/contents_button_24.png
similarity index 100%
rename from aegisub/src/bitmaps/24/contents_button.png
rename to aegisub/src/bitmaps/button/contents_button_24.png
diff --git a/aegisub/src/bitmaps/16/copy_button.png b/aegisub/src/bitmaps/button/copy_button_16.png
similarity index 100%
rename from aegisub/src/bitmaps/16/copy_button.png
rename to aegisub/src/bitmaps/button/copy_button_16.png
diff --git a/aegisub/src/bitmaps/24/copy_button.png b/aegisub/src/bitmaps/button/copy_button_24.png
similarity index 100%
rename from aegisub/src/bitmaps/24/copy_button.png
rename to aegisub/src/bitmaps/button/copy_button_24.png
diff --git a/aegisub/src/bitmaps/16/cut_button.png b/aegisub/src/bitmaps/button/cut_button_16.png
similarity index 100%
rename from aegisub/src/bitmaps/16/cut_button.png
rename to aegisub/src/bitmaps/button/cut_button_16.png
diff --git a/aegisub/src/bitmaps/24/cut_button.png b/aegisub/src/bitmaps/button/cut_button_24.png
similarity index 100%
rename from aegisub/src/bitmaps/24/cut_button.png
rename to aegisub/src/bitmaps/button/cut_button_24.png
diff --git a/aegisub/src/bitmaps/16/delete_button.png b/aegisub/src/bitmaps/button/delete_button_16.png
similarity index 100%
rename from aegisub/src/bitmaps/16/delete_button.png
rename to aegisub/src/bitmaps/button/delete_button_16.png
diff --git a/aegisub/src/bitmaps/24/delete_button.png b/aegisub/src/bitmaps/button/delete_button_24.png
similarity index 100%
rename from aegisub/src/bitmaps/24/delete_button.png
rename to aegisub/src/bitmaps/button/delete_button_24.png
diff --git a/aegisub/src/bitmaps/16/detach_video_menu.png b/aegisub/src/bitmaps/button/detach_video_menu_16.png
similarity index 100%
rename from aegisub/src/bitmaps/16/detach_video_menu.png
rename to aegisub/src/bitmaps/button/detach_video_menu_16.png
diff --git a/aegisub/src/bitmaps/24/detach_video_menu.png b/aegisub/src/bitmaps/button/detach_video_menu_24.png
similarity index 100%
rename from aegisub/src/bitmaps/24/detach_video_menu.png
rename to aegisub/src/bitmaps/button/detach_video_menu_24.png
diff --git a/aegisub/src/bitmaps/16/exit_button.png b/aegisub/src/bitmaps/button/exit_button_16.png
similarity index 100%
rename from aegisub/src/bitmaps/16/exit_button.png
rename to aegisub/src/bitmaps/button/exit_button_16.png
diff --git a/aegisub/src/bitmaps/24/exit_button.png b/aegisub/src/bitmaps/button/exit_button_24.png
similarity index 100%
rename from aegisub/src/bitmaps/24/exit_button.png
rename to aegisub/src/bitmaps/button/exit_button_24.png
diff --git a/aegisub/src/bitmaps/16/export_menu.png b/aegisub/src/bitmaps/button/export_menu_16.png
similarity index 100%
rename from aegisub/src/bitmaps/16/export_menu.png
rename to aegisub/src/bitmaps/button/export_menu_16.png
diff --git a/aegisub/src/bitmaps/24/export_menu.png b/aegisub/src/bitmaps/button/export_menu_24.png
similarity index 100%
rename from aegisub/src/bitmaps/24/export_menu.png
rename to aegisub/src/bitmaps/button/export_menu_24.png
diff --git a/aegisub/src/bitmaps/16/eyedropper_tool.png b/aegisub/src/bitmaps/button/eyedropper_tool_16.png
similarity index 100%
rename from aegisub/src/bitmaps/16/eyedropper_tool.png
rename to aegisub/src/bitmaps/button/eyedropper_tool_16.png
diff --git a/aegisub/src/bitmaps/24/eyedropper_tool.png b/aegisub/src/bitmaps/button/eyedropper_tool_24.png
similarity index 100%
rename from aegisub/src/bitmaps/24/eyedropper_tool.png
rename to aegisub/src/bitmaps/button/eyedropper_tool_24.png
diff --git a/aegisub/src/bitmaps/16/find_button.png b/aegisub/src/bitmaps/button/find_button_16.png
similarity index 100%
rename from aegisub/src/bitmaps/16/find_button.png
rename to aegisub/src/bitmaps/button/find_button_16.png
diff --git a/aegisub/src/bitmaps/24/find_button.png b/aegisub/src/bitmaps/button/find_button_24.png
similarity index 100%
rename from aegisub/src/bitmaps/24/find_button.png
rename to aegisub/src/bitmaps/button/find_button_24.png
diff --git a/aegisub/src/bitmaps/16/find_next_menu.png b/aegisub/src/bitmaps/button/find_next_menu_16.png
similarity index 100%
rename from aegisub/src/bitmaps/16/find_next_menu.png
rename to aegisub/src/bitmaps/button/find_next_menu_16.png
diff --git a/aegisub/src/bitmaps/24/find_next_menu.png b/aegisub/src/bitmaps/button/find_next_menu_24.png
similarity index 100%
rename from aegisub/src/bitmaps/24/find_next_menu.png
rename to aegisub/src/bitmaps/button/find_next_menu_24.png
diff --git a/aegisub/src/bitmaps/16/find_replace_menu.png b/aegisub/src/bitmaps/button/find_replace_menu_16.png
similarity index 100%
rename from aegisub/src/bitmaps/16/find_replace_menu.png
rename to aegisub/src/bitmaps/button/find_replace_menu_16.png
diff --git a/aegisub/src/bitmaps/24/find_replace_menu.png b/aegisub/src/bitmaps/button/find_replace_menu_24.png
similarity index 100%
rename from aegisub/src/bitmaps/24/find_replace_menu.png
rename to aegisub/src/bitmaps/button/find_replace_menu_24.png
diff --git a/aegisub/src/bitmaps/16/font_collector_button.png b/aegisub/src/bitmaps/button/font_collector_button_16.png
similarity index 100%
rename from aegisub/src/bitmaps/16/font_collector_button.png
rename to aegisub/src/bitmaps/button/font_collector_button_16.png
diff --git a/aegisub/src/bitmaps/24/font_collector_button.png b/aegisub/src/bitmaps/button/font_collector_button_24.png
similarity index 100%
rename from aegisub/src/bitmaps/24/font_collector_button.png
rename to aegisub/src/bitmaps/button/font_collector_button_24.png
diff --git a/aegisub/src/bitmaps/16/forums_button.png b/aegisub/src/bitmaps/button/forums_button_16.png
similarity index 100%
rename from aegisub/src/bitmaps/16/forums_button.png
rename to aegisub/src/bitmaps/button/forums_button_16.png
diff --git a/aegisub/src/bitmaps/24/forums_button.png b/aegisub/src/bitmaps/button/forums_button_24.png
similarity index 100%
rename from aegisub/src/bitmaps/24/forums_button.png
rename to aegisub/src/bitmaps/button/forums_button_24.png
diff --git a/aegisub/src/bitmaps/16/hotkeys_button.png b/aegisub/src/bitmaps/button/hotkeys_button_16.png
similarity index 100%
rename from aegisub/src/bitmaps/16/hotkeys_button.png
rename to aegisub/src/bitmaps/button/hotkeys_button_16.png
diff --git a/aegisub/src/bitmaps/24/hotkeys_button.png b/aegisub/src/bitmaps/button/hotkeys_button_24.png
similarity index 100%
rename from aegisub/src/bitmaps/24/hotkeys_button.png
rename to aegisub/src/bitmaps/button/hotkeys_button_24.png
diff --git a/aegisub/src/bitmaps/16/irc_button.png b/aegisub/src/bitmaps/button/irc_button_16.png
similarity index 100%
rename from aegisub/src/bitmaps/16/irc_button.png
rename to aegisub/src/bitmaps/button/irc_button_16.png
diff --git a/aegisub/src/bitmaps/24/irc_button.png b/aegisub/src/bitmaps/button/irc_button_24.png
similarity index 100%
rename from aegisub/src/bitmaps/24/irc_button.png
rename to aegisub/src/bitmaps/button/irc_button_24.png
diff --git a/aegisub/src/bitmaps/16/jumpto_button.png b/aegisub/src/bitmaps/button/jumpto_button_16.png
similarity index 100%
rename from aegisub/src/bitmaps/16/jumpto_button.png
rename to aegisub/src/bitmaps/button/jumpto_button_16.png
diff --git a/aegisub/src/bitmaps/24/jumpto_button.png b/aegisub/src/bitmaps/button/jumpto_button_24.png
similarity index 100%
rename from aegisub/src/bitmaps/24/jumpto_button.png
rename to aegisub/src/bitmaps/button/jumpto_button_24.png
diff --git a/aegisub/src/bitmaps/16/kara_join.png b/aegisub/src/bitmaps/button/kara_join_16.png
similarity index 100%
rename from aegisub/src/bitmaps/16/kara_join.png
rename to aegisub/src/bitmaps/button/kara_join_16.png
diff --git a/aegisub/src/bitmaps/24/kara_join.png b/aegisub/src/bitmaps/button/kara_join_24.png
similarity index 100%
rename from aegisub/src/bitmaps/24/kara_join.png
rename to aegisub/src/bitmaps/button/kara_join_24.png
diff --git a/aegisub/src/bitmaps/16/kara_mode.png b/aegisub/src/bitmaps/button/kara_mode_16.png
similarity index 100%
rename from aegisub/src/bitmaps/16/kara_mode.png
rename to aegisub/src/bitmaps/button/kara_mode_16.png
diff --git a/aegisub/src/bitmaps/24/kara_mode.png b/aegisub/src/bitmaps/button/kara_mode_24.png
similarity index 100%
rename from aegisub/src/bitmaps/24/kara_mode.png
rename to aegisub/src/bitmaps/button/kara_mode_24.png
diff --git a/aegisub/src/bitmaps/16/kara_split.png b/aegisub/src/bitmaps/button/kara_split_16.png
similarity index 100%
rename from aegisub/src/bitmaps/16/kara_split.png
rename to aegisub/src/bitmaps/button/kara_split_16.png
diff --git a/aegisub/src/bitmaps/24/kara_split.png b/aegisub/src/bitmaps/button/kara_split_24.png
similarity index 100%
rename from aegisub/src/bitmaps/24/kara_split.png
rename to aegisub/src/bitmaps/button/kara_split_24.png
diff --git a/aegisub/src/bitmaps/16/kara_split_accept.png b/aegisub/src/bitmaps/button/kara_split_accept_16.png
similarity index 100%
rename from aegisub/src/bitmaps/16/kara_split_accept.png
rename to aegisub/src/bitmaps/button/kara_split_accept_16.png
diff --git a/aegisub/src/bitmaps/24/kara_split_accept.png b/aegisub/src/bitmaps/button/kara_split_accept_24.png
similarity index 100%
rename from aegisub/src/bitmaps/24/kara_split_accept.png
rename to aegisub/src/bitmaps/button/kara_split_accept_24.png
diff --git a/aegisub/src/bitmaps/16/kara_split_cancel.png b/aegisub/src/bitmaps/button/kara_split_cancel_16.png
similarity index 100%
rename from aegisub/src/bitmaps/16/kara_split_cancel.png
rename to aegisub/src/bitmaps/button/kara_split_cancel_16.png
diff --git a/aegisub/src/bitmaps/24/kara_split_cancel.png b/aegisub/src/bitmaps/button/kara_split_cancel_24.png
similarity index 100%
rename from aegisub/src/bitmaps/24/kara_split_cancel.png
rename to aegisub/src/bitmaps/button/kara_split_cancel_24.png
diff --git a/aegisub/src/bitmaps/16/kara_timing_copier.png b/aegisub/src/bitmaps/button/kara_timing_copier_16.png
similarity index 100%
rename from aegisub/src/bitmaps/16/kara_timing_copier.png
rename to aegisub/src/bitmaps/button/kara_timing_copier_16.png
diff --git a/aegisub/src/bitmaps/24/kara_timing_copier.png b/aegisub/src/bitmaps/button/kara_timing_copier_24.png
similarity index 100%
rename from aegisub/src/bitmaps/24/kara_timing_copier.png
rename to aegisub/src/bitmaps/button/kara_timing_copier_24.png
diff --git a/aegisub/src/bitmaps/16/languages_menu.png b/aegisub/src/bitmaps/button/languages_menu_16.png
similarity index 100%
rename from aegisub/src/bitmaps/16/languages_menu.png
rename to aegisub/src/bitmaps/button/languages_menu_16.png
diff --git a/aegisub/src/bitmaps/24/languages_menu.png b/aegisub/src/bitmaps/button/languages_menu_24.png
similarity index 100%
rename from aegisub/src/bitmaps/24/languages_menu.png
rename to aegisub/src/bitmaps/button/languages_menu_24.png
diff --git a/aegisub/src/bitmaps/16/menu_check.png b/aegisub/src/bitmaps/button/menu_check_16.png
similarity index 100%
rename from aegisub/src/bitmaps/16/menu_check.png
rename to aegisub/src/bitmaps/button/menu_check_16.png
diff --git a/aegisub/src/bitmaps/24/menu_check.png b/aegisub/src/bitmaps/button/menu_check_24.png
similarity index 100%
rename from aegisub/src/bitmaps/24/menu_check.png
rename to aegisub/src/bitmaps/button/menu_check_24.png
diff --git a/aegisub/src/bitmaps/16/new_toolbutton.png b/aegisub/src/bitmaps/button/new_toolbutton_16.png
similarity index 100%
rename from aegisub/src/bitmaps/16/new_toolbutton.png
rename to aegisub/src/bitmaps/button/new_toolbutton_16.png
diff --git a/aegisub/src/bitmaps/24/new_toolbutton.png b/aegisub/src/bitmaps/button/new_toolbutton_24.png
similarity index 100%
rename from aegisub/src/bitmaps/24/new_toolbutton.png
rename to aegisub/src/bitmaps/button/new_toolbutton_24.png
diff --git a/aegisub/src/bitmaps/16/new_window_menu.png b/aegisub/src/bitmaps/button/new_window_menu_16.png
similarity index 100%
rename from aegisub/src/bitmaps/16/new_window_menu.png
rename to aegisub/src/bitmaps/button/new_window_menu_16.png
diff --git a/aegisub/src/bitmaps/24/new_window_menu.png b/aegisub/src/bitmaps/button/new_window_menu_24.png
similarity index 100%
rename from aegisub/src/bitmaps/24/new_window_menu.png
rename to aegisub/src/bitmaps/button/new_window_menu_24.png
diff --git a/aegisub/src/bitmaps/16/null_button.png b/aegisub/src/bitmaps/button/null_button_16.png
similarity index 100%
rename from aegisub/src/bitmaps/16/null_button.png
rename to aegisub/src/bitmaps/button/null_button_16.png
diff --git a/aegisub/src/bitmaps/24/null_button.png b/aegisub/src/bitmaps/button/null_button_24.png
similarity index 100%
rename from aegisub/src/bitmaps/24/null_button.png
rename to aegisub/src/bitmaps/button/null_button_24.png
diff --git a/aegisub/src/bitmaps/16/open_audio_from_video_menu.png b/aegisub/src/bitmaps/button/open_audio_from_video_menu_16.png
similarity index 100%
rename from aegisub/src/bitmaps/16/open_audio_from_video_menu.png
rename to aegisub/src/bitmaps/button/open_audio_from_video_menu_16.png
diff --git a/aegisub/src/bitmaps/24/open_audio_from_video_menu.png b/aegisub/src/bitmaps/button/open_audio_from_video_menu_24.png
similarity index 100%
rename from aegisub/src/bitmaps/24/open_audio_from_video_menu.png
rename to aegisub/src/bitmaps/button/open_audio_from_video_menu_24.png
diff --git a/aegisub/src/bitmaps/16/open_audio_menu.png b/aegisub/src/bitmaps/button/open_audio_menu_16.png
similarity index 100%
rename from aegisub/src/bitmaps/16/open_audio_menu.png
rename to aegisub/src/bitmaps/button/open_audio_menu_16.png
diff --git a/aegisub/src/bitmaps/24/open_audio_menu.png b/aegisub/src/bitmaps/button/open_audio_menu_24.png
similarity index 100%
rename from aegisub/src/bitmaps/24/open_audio_menu.png
rename to aegisub/src/bitmaps/button/open_audio_menu_24.png
diff --git a/aegisub/src/bitmaps/16/open_keyframes_menu.png b/aegisub/src/bitmaps/button/open_keyframes_menu_16.png
similarity index 100%
rename from aegisub/src/bitmaps/16/open_keyframes_menu.png
rename to aegisub/src/bitmaps/button/open_keyframes_menu_16.png
diff --git a/aegisub/src/bitmaps/24/open_keyframes_menu.png b/aegisub/src/bitmaps/button/open_keyframes_menu_24.png
similarity index 100%
rename from aegisub/src/bitmaps/24/open_keyframes_menu.png
rename to aegisub/src/bitmaps/button/open_keyframes_menu_24.png
diff --git a/aegisub/src/bitmaps/16/open_timecodes_menu.png b/aegisub/src/bitmaps/button/open_timecodes_menu_16.png
similarity index 100%
rename from aegisub/src/bitmaps/16/open_timecodes_menu.png
rename to aegisub/src/bitmaps/button/open_timecodes_menu_16.png
diff --git a/aegisub/src/bitmaps/24/open_timecodes_menu.png b/aegisub/src/bitmaps/button/open_timecodes_menu_24.png
similarity index 100%
rename from aegisub/src/bitmaps/24/open_timecodes_menu.png
rename to aegisub/src/bitmaps/button/open_timecodes_menu_24.png
diff --git a/aegisub/src/bitmaps/16/open_toolbutton.png b/aegisub/src/bitmaps/button/open_toolbutton_16.png
similarity index 100%
rename from aegisub/src/bitmaps/16/open_toolbutton.png
rename to aegisub/src/bitmaps/button/open_toolbutton_16.png
diff --git a/aegisub/src/bitmaps/24/open_toolbutton.png b/aegisub/src/bitmaps/button/open_toolbutton_24.png
similarity index 100%
rename from aegisub/src/bitmaps/24/open_toolbutton.png
rename to aegisub/src/bitmaps/button/open_toolbutton_24.png
diff --git a/aegisub/src/bitmaps/16/open_video_menu.png b/aegisub/src/bitmaps/button/open_video_menu_16.png
similarity index 100%
rename from aegisub/src/bitmaps/16/open_video_menu.png
rename to aegisub/src/bitmaps/button/open_video_menu_16.png
diff --git a/aegisub/src/bitmaps/24/open_video_menu.png b/aegisub/src/bitmaps/button/open_video_menu_24.png
similarity index 100%
rename from aegisub/src/bitmaps/24/open_video_menu.png
rename to aegisub/src/bitmaps/button/open_video_menu_24.png
diff --git a/aegisub/src/bitmaps/16/open_with_toolbutton.png b/aegisub/src/bitmaps/button/open_with_toolbutton_16.png
similarity index 100%
rename from aegisub/src/bitmaps/16/open_with_toolbutton.png
rename to aegisub/src/bitmaps/button/open_with_toolbutton_16.png
diff --git a/aegisub/src/bitmaps/24/open_with_toolbutton.png b/aegisub/src/bitmaps/button/open_with_toolbutton_24.png
similarity index 100%
rename from aegisub/src/bitmaps/24/open_with_toolbutton.png
rename to aegisub/src/bitmaps/button/open_with_toolbutton_24.png
diff --git a/aegisub/src/bitmaps/16/options_button.png b/aegisub/src/bitmaps/button/options_button_16.png
similarity index 100%
rename from aegisub/src/bitmaps/16/options_button.png
rename to aegisub/src/bitmaps/button/options_button_16.png
diff --git a/aegisub/src/bitmaps/24/options_button.png b/aegisub/src/bitmaps/button/options_button_24.png
similarity index 100%
rename from aegisub/src/bitmaps/24/options_button.png
rename to aegisub/src/bitmaps/button/options_button_24.png
diff --git a/aegisub/src/bitmaps/16/override_aspect_menu.png b/aegisub/src/bitmaps/button/override_aspect_menu_16.png
similarity index 100%
rename from aegisub/src/bitmaps/16/override_aspect_menu.png
rename to aegisub/src/bitmaps/button/override_aspect_menu_16.png
diff --git a/aegisub/src/bitmaps/24/override_aspect_menu.png b/aegisub/src/bitmaps/button/override_aspect_menu_24.png
similarity index 100%
rename from aegisub/src/bitmaps/24/override_aspect_menu.png
rename to aegisub/src/bitmaps/button/override_aspect_menu_24.png
diff --git a/aegisub/src/bitmaps/16/paste_button.png b/aegisub/src/bitmaps/button/paste_button_16.png
similarity index 100%
rename from aegisub/src/bitmaps/16/paste_button.png
rename to aegisub/src/bitmaps/button/paste_button_16.png
diff --git a/aegisub/src/bitmaps/24/paste_button.png b/aegisub/src/bitmaps/button/paste_button_24.png
similarity index 100%
rename from aegisub/src/bitmaps/24/paste_button.png
rename to aegisub/src/bitmaps/button/paste_button_24.png
diff --git a/aegisub/src/bitmaps/16/paste_over_button.png b/aegisub/src/bitmaps/button/paste_over_button_16.png
similarity index 100%
rename from aegisub/src/bitmaps/16/paste_over_button.png
rename to aegisub/src/bitmaps/button/paste_over_button_16.png
diff --git a/aegisub/src/bitmaps/24/paste_over_button.png b/aegisub/src/bitmaps/button/paste_over_button_24.png
similarity index 100%
rename from aegisub/src/bitmaps/24/paste_over_button.png
rename to aegisub/src/bitmaps/button/paste_over_button_24.png
diff --git a/aegisub/src/bitmaps/16/properties_toolbutton.png b/aegisub/src/bitmaps/button/properties_toolbutton_16.png
similarity index 100%
rename from aegisub/src/bitmaps/16/properties_toolbutton.png
rename to aegisub/src/bitmaps/button/properties_toolbutton_16.png
diff --git a/aegisub/src/bitmaps/24/properties_toolbutton.png b/aegisub/src/bitmaps/button/properties_toolbutton_24.png
similarity index 100%
rename from aegisub/src/bitmaps/24/properties_toolbutton.png
rename to aegisub/src/bitmaps/button/properties_toolbutton_24.png
diff --git a/aegisub/src/bitmaps/16/redo_button.png b/aegisub/src/bitmaps/button/redo_button_16.png
similarity index 100%
rename from aegisub/src/bitmaps/16/redo_button.png
rename to aegisub/src/bitmaps/button/redo_button_16.png
diff --git a/aegisub/src/bitmaps/24/redo_button.png b/aegisub/src/bitmaps/button/redo_button_24.png
similarity index 100%
rename from aegisub/src/bitmaps/24/redo_button.png
rename to aegisub/src/bitmaps/button/redo_button_24.png
diff --git a/aegisub/src/bitmaps/16/resample_toolbutton.png b/aegisub/src/bitmaps/button/resample_toolbutton_16.png
similarity index 100%
rename from aegisub/src/bitmaps/16/resample_toolbutton.png
rename to aegisub/src/bitmaps/button/resample_toolbutton_16.png
diff --git a/aegisub/src/bitmaps/24/resample_toolbutton.png b/aegisub/src/bitmaps/button/resample_toolbutton_24.png
similarity index 100%
rename from aegisub/src/bitmaps/24/resample_toolbutton.png
rename to aegisub/src/bitmaps/button/resample_toolbutton_24.png
diff --git a/aegisub/src/bitmaps/16/save_as_toolbutton.png b/aegisub/src/bitmaps/button/save_as_toolbutton_16.png
similarity index 100%
rename from aegisub/src/bitmaps/16/save_as_toolbutton.png
rename to aegisub/src/bitmaps/button/save_as_toolbutton_16.png
diff --git a/aegisub/src/bitmaps/24/save_as_toolbutton.png b/aegisub/src/bitmaps/button/save_as_toolbutton_24.png
similarity index 100%
rename from aegisub/src/bitmaps/24/save_as_toolbutton.png
rename to aegisub/src/bitmaps/button/save_as_toolbutton_24.png
diff --git a/aegisub/src/bitmaps/16/save_keyframes_menu.png b/aegisub/src/bitmaps/button/save_keyframes_menu_16.png
similarity index 100%
rename from aegisub/src/bitmaps/16/save_keyframes_menu.png
rename to aegisub/src/bitmaps/button/save_keyframes_menu_16.png
diff --git a/aegisub/src/bitmaps/24/save_keyframes_menu.png b/aegisub/src/bitmaps/button/save_keyframes_menu_24.png
similarity index 100%
rename from aegisub/src/bitmaps/24/save_keyframes_menu.png
rename to aegisub/src/bitmaps/button/save_keyframes_menu_24.png
diff --git a/aegisub/src/bitmaps/16/save_timecodes_menu.png b/aegisub/src/bitmaps/button/save_timecodes_menu_16.png
similarity index 100%
rename from aegisub/src/bitmaps/16/save_timecodes_menu.png
rename to aegisub/src/bitmaps/button/save_timecodes_menu_16.png
diff --git a/aegisub/src/bitmaps/24/save_timecodes_menu.png b/aegisub/src/bitmaps/button/save_timecodes_menu_24.png
similarity index 100%
rename from aegisub/src/bitmaps/24/save_timecodes_menu.png
rename to aegisub/src/bitmaps/button/save_timecodes_menu_24.png
diff --git a/aegisub/src/bitmaps/16/save_toolbutton.png b/aegisub/src/bitmaps/button/save_toolbutton_16.png
similarity index 100%
rename from aegisub/src/bitmaps/16/save_toolbutton.png
rename to aegisub/src/bitmaps/button/save_toolbutton_16.png
diff --git a/aegisub/src/bitmaps/24/save_toolbutton.png b/aegisub/src/bitmaps/button/save_toolbutton_24.png
similarity index 100%
rename from aegisub/src/bitmaps/24/save_toolbutton.png
rename to aegisub/src/bitmaps/button/save_toolbutton_24.png
diff --git a/aegisub/src/bitmaps/16/select_lines_button.png b/aegisub/src/bitmaps/button/select_lines_button_16.png
similarity index 100%
rename from aegisub/src/bitmaps/16/select_lines_button.png
rename to aegisub/src/bitmaps/button/select_lines_button_16.png
diff --git a/aegisub/src/bitmaps/24/select_lines_button.png b/aegisub/src/bitmaps/button/select_lines_button_24.png
similarity index 100%
rename from aegisub/src/bitmaps/24/select_lines_button.png
rename to aegisub/src/bitmaps/button/select_lines_button_24.png
diff --git a/aegisub/src/bitmaps/16/select_visible_button.png b/aegisub/src/bitmaps/button/select_visible_button_16.png
similarity index 100%
rename from aegisub/src/bitmaps/16/select_visible_button.png
rename to aegisub/src/bitmaps/button/select_visible_button_16.png
diff --git a/aegisub/src/bitmaps/24/select_visible_button.png b/aegisub/src/bitmaps/button/select_visible_button_24.png
similarity index 100%
rename from aegisub/src/bitmaps/24/select_visible_button.png
rename to aegisub/src/bitmaps/button/select_visible_button_24.png
diff --git a/aegisub/src/bitmaps/16/set_zoom_menu.png b/aegisub/src/bitmaps/button/set_zoom_menu_16.png
similarity index 100%
rename from aegisub/src/bitmaps/16/set_zoom_menu.png
rename to aegisub/src/bitmaps/button/set_zoom_menu_16.png
diff --git a/aegisub/src/bitmaps/24/set_zoom_menu.png b/aegisub/src/bitmaps/button/set_zoom_menu_24.png
similarity index 100%
rename from aegisub/src/bitmaps/24/set_zoom_menu.png
rename to aegisub/src/bitmaps/button/set_zoom_menu_24.png
diff --git a/aegisub/src/bitmaps/16/shift_times_toolbutton.png b/aegisub/src/bitmaps/button/shift_times_toolbutton_16.png
similarity index 100%
rename from aegisub/src/bitmaps/16/shift_times_toolbutton.png
rename to aegisub/src/bitmaps/button/shift_times_toolbutton_16.png
diff --git a/aegisub/src/bitmaps/24/shift_times_toolbutton.png b/aegisub/src/bitmaps/button/shift_times_toolbutton_24.png
similarity index 100%
rename from aegisub/src/bitmaps/24/shift_times_toolbutton.png
rename to aegisub/src/bitmaps/button/shift_times_toolbutton_24.png
diff --git a/aegisub/src/bitmaps/16/shift_to_frame.png b/aegisub/src/bitmaps/button/shift_to_frame_16.png
similarity index 100%
rename from aegisub/src/bitmaps/16/shift_to_frame.png
rename to aegisub/src/bitmaps/button/shift_to_frame_16.png
diff --git a/aegisub/src/bitmaps/24/shift_to_frame.png b/aegisub/src/bitmaps/button/shift_to_frame_24.png
similarity index 100%
rename from aegisub/src/bitmaps/24/shift_to_frame.png
rename to aegisub/src/bitmaps/button/shift_to_frame_24.png
diff --git a/aegisub/src/bitmaps/16/show_overscan_menu_checked.png b/aegisub/src/bitmaps/button/show_overscan_menu_checked_16.png
similarity index 100%
rename from aegisub/src/bitmaps/16/show_overscan_menu_checked.png
rename to aegisub/src/bitmaps/button/show_overscan_menu_checked_16.png
diff --git a/aegisub/src/bitmaps/24/show_overscan_menu_checked.png b/aegisub/src/bitmaps/button/show_overscan_menu_checked_24.png
similarity index 100%
rename from aegisub/src/bitmaps/24/show_overscan_menu_checked.png
rename to aegisub/src/bitmaps/button/show_overscan_menu_checked_24.png
diff --git a/aegisub/src/bitmaps/16/show_video_details_menu.png b/aegisub/src/bitmaps/button/show_video_details_menu_16.png
similarity index 100%
rename from aegisub/src/bitmaps/16/show_video_details_menu.png
rename to aegisub/src/bitmaps/button/show_video_details_menu_16.png
diff --git a/aegisub/src/bitmaps/24/show_video_details_menu.png b/aegisub/src/bitmaps/button/show_video_details_menu_24.png
similarity index 100%
rename from aegisub/src/bitmaps/24/show_video_details_menu.png
rename to aegisub/src/bitmaps/button/show_video_details_menu_24.png
diff --git a/aegisub/src/bitmaps/16/snap_subs_to_scene.png b/aegisub/src/bitmaps/button/snap_subs_to_scene_16.png
similarity index 100%
rename from aegisub/src/bitmaps/16/snap_subs_to_scene.png
rename to aegisub/src/bitmaps/button/snap_subs_to_scene_16.png
diff --git a/aegisub/src/bitmaps/24/snap_subs_to_scene.png b/aegisub/src/bitmaps/button/snap_subs_to_scene_24.png
similarity index 100%
rename from aegisub/src/bitmaps/24/snap_subs_to_scene.png
rename to aegisub/src/bitmaps/button/snap_subs_to_scene_24.png
diff --git a/aegisub/src/bitmaps/16/sort_times_button.png b/aegisub/src/bitmaps/button/sort_times_button_16.png
similarity index 100%
rename from aegisub/src/bitmaps/16/sort_times_button.png
rename to aegisub/src/bitmaps/button/sort_times_button_16.png
diff --git a/aegisub/src/bitmaps/24/sort_times_button.png b/aegisub/src/bitmaps/button/sort_times_button_24.png
similarity index 100%
rename from aegisub/src/bitmaps/24/sort_times_button.png
rename to aegisub/src/bitmaps/button/sort_times_button_24.png
diff --git a/aegisub/src/bitmaps/16/spellcheck_toolbutton.png b/aegisub/src/bitmaps/button/spellcheck_toolbutton_16.png
similarity index 100%
rename from aegisub/src/bitmaps/16/spellcheck_toolbutton.png
rename to aegisub/src/bitmaps/button/spellcheck_toolbutton_16.png
diff --git a/aegisub/src/bitmaps/24/spellcheck_toolbutton.png b/aegisub/src/bitmaps/button/spellcheck_toolbutton_24.png
similarity index 100%
rename from aegisub/src/bitmaps/24/spellcheck_toolbutton.png
rename to aegisub/src/bitmaps/button/spellcheck_toolbutton_24.png
diff --git a/aegisub/src/bitmaps/16/style_toolbutton.png b/aegisub/src/bitmaps/button/style_toolbutton_16.png
similarity index 100%
rename from aegisub/src/bitmaps/16/style_toolbutton.png
rename to aegisub/src/bitmaps/button/style_toolbutton_16.png
diff --git a/aegisub/src/bitmaps/24/style_toolbutton.png b/aegisub/src/bitmaps/button/style_toolbutton_24.png
similarity index 100%
rename from aegisub/src/bitmaps/24/style_toolbutton.png
rename to aegisub/src/bitmaps/button/style_toolbutton_24.png
diff --git a/aegisub/src/bitmaps/16/styling_toolbutton.png b/aegisub/src/bitmaps/button/styling_toolbutton_16.png
similarity index 100%
rename from aegisub/src/bitmaps/16/styling_toolbutton.png
rename to aegisub/src/bitmaps/button/styling_toolbutton_16.png
diff --git a/aegisub/src/bitmaps/24/styling_toolbutton.png b/aegisub/src/bitmaps/button/styling_toolbutton_24.png
similarity index 100%
rename from aegisub/src/bitmaps/24/styling_toolbutton.png
rename to aegisub/src/bitmaps/button/styling_toolbutton_24.png
diff --git a/aegisub/src/bitmaps/16/subend_to_video.png b/aegisub/src/bitmaps/button/subend_to_video_16.png
similarity index 100%
rename from aegisub/src/bitmaps/16/subend_to_video.png
rename to aegisub/src/bitmaps/button/subend_to_video_16.png
diff --git a/aegisub/src/bitmaps/24/subend_to_video.png b/aegisub/src/bitmaps/button/subend_to_video_24.png
similarity index 100%
rename from aegisub/src/bitmaps/24/subend_to_video.png
rename to aegisub/src/bitmaps/button/subend_to_video_24.png
diff --git a/aegisub/src/bitmaps/16/substart_to_video.png b/aegisub/src/bitmaps/button/substart_to_video_16.png
similarity index 100%
rename from aegisub/src/bitmaps/16/substart_to_video.png
rename to aegisub/src/bitmaps/button/substart_to_video_16.png
diff --git a/aegisub/src/bitmaps/24/substart_to_video.png b/aegisub/src/bitmaps/button/substart_to_video_24.png
similarity index 100%
rename from aegisub/src/bitmaps/24/substart_to_video.png
rename to aegisub/src/bitmaps/button/substart_to_video_24.png
diff --git a/aegisub/src/bitmaps/16/timing_processor_toolbutton.png b/aegisub/src/bitmaps/button/timing_processor_toolbutton_16.png
similarity index 100%
rename from aegisub/src/bitmaps/16/timing_processor_toolbutton.png
rename to aegisub/src/bitmaps/button/timing_processor_toolbutton_16.png
diff --git a/aegisub/src/bitmaps/24/timing_processor_toolbutton.png b/aegisub/src/bitmaps/button/timing_processor_toolbutton_24.png
similarity index 100%
rename from aegisub/src/bitmaps/24/timing_processor_toolbutton.png
rename to aegisub/src/bitmaps/button/timing_processor_toolbutton_24.png
diff --git a/aegisub/src/bitmaps/16/toggle_audio_autocommit.png b/aegisub/src/bitmaps/button/toggle_audio_autocommit_16.png
similarity index 100%
rename from aegisub/src/bitmaps/16/toggle_audio_autocommit.png
rename to aegisub/src/bitmaps/button/toggle_audio_autocommit_16.png
diff --git a/aegisub/src/bitmaps/24/toggle_audio_autocommit.png b/aegisub/src/bitmaps/button/toggle_audio_autocommit_24.png
similarity index 100%
rename from aegisub/src/bitmaps/24/toggle_audio_autocommit.png
rename to aegisub/src/bitmaps/button/toggle_audio_autocommit_24.png
diff --git a/aegisub/src/bitmaps/16/toggle_audio_autoscroll.png b/aegisub/src/bitmaps/button/toggle_audio_autoscroll_16.png
similarity index 100%
rename from aegisub/src/bitmaps/16/toggle_audio_autoscroll.png
rename to aegisub/src/bitmaps/button/toggle_audio_autoscroll_16.png
diff --git a/aegisub/src/bitmaps/24/toggle_audio_autoscroll.png b/aegisub/src/bitmaps/button/toggle_audio_autoscroll_24.png
similarity index 100%
rename from aegisub/src/bitmaps/24/toggle_audio_autoscroll.png
rename to aegisub/src/bitmaps/button/toggle_audio_autoscroll_24.png
diff --git a/aegisub/src/bitmaps/16/toggle_audio_link.png b/aegisub/src/bitmaps/button/toggle_audio_link_16.png
similarity index 100%
rename from aegisub/src/bitmaps/16/toggle_audio_link.png
rename to aegisub/src/bitmaps/button/toggle_audio_link_16.png
diff --git a/aegisub/src/bitmaps/24/toggle_audio_link.png b/aegisub/src/bitmaps/button/toggle_audio_link_24.png
similarity index 100%
rename from aegisub/src/bitmaps/24/toggle_audio_link.png
rename to aegisub/src/bitmaps/button/toggle_audio_link_24.png
diff --git a/aegisub/src/bitmaps/16/toggle_audio_medusa.png b/aegisub/src/bitmaps/button/toggle_audio_medusa_16.png
similarity index 100%
rename from aegisub/src/bitmaps/16/toggle_audio_medusa.png
rename to aegisub/src/bitmaps/button/toggle_audio_medusa_16.png
diff --git a/aegisub/src/bitmaps/24/toggle_audio_medusa.png b/aegisub/src/bitmaps/button/toggle_audio_medusa_24.png
similarity index 100%
rename from aegisub/src/bitmaps/24/toggle_audio_medusa.png
rename to aegisub/src/bitmaps/button/toggle_audio_medusa_24.png
diff --git a/aegisub/src/bitmaps/16/toggle_audio_nextcommit.png b/aegisub/src/bitmaps/button/toggle_audio_nextcommit_16.png
similarity index 100%
rename from aegisub/src/bitmaps/16/toggle_audio_nextcommit.png
rename to aegisub/src/bitmaps/button/toggle_audio_nextcommit_16.png
diff --git a/aegisub/src/bitmaps/24/toggle_audio_nextcommit.png b/aegisub/src/bitmaps/button/toggle_audio_nextcommit_24.png
similarity index 100%
rename from aegisub/src/bitmaps/24/toggle_audio_nextcommit.png
rename to aegisub/src/bitmaps/button/toggle_audio_nextcommit_24.png
diff --git a/aegisub/src/bitmaps/16/toggle_audio_spectrum.png b/aegisub/src/bitmaps/button/toggle_audio_spectrum_16.png
similarity index 100%
rename from aegisub/src/bitmaps/16/toggle_audio_spectrum.png
rename to aegisub/src/bitmaps/button/toggle_audio_spectrum_16.png
diff --git a/aegisub/src/bitmaps/24/toggle_audio_spectrum.png b/aegisub/src/bitmaps/button/toggle_audio_spectrum_24.png
similarity index 100%
rename from aegisub/src/bitmaps/24/toggle_audio_spectrum.png
rename to aegisub/src/bitmaps/button/toggle_audio_spectrum_24.png
diff --git a/aegisub/src/bitmaps/16/toggle_audio_ssa.png b/aegisub/src/bitmaps/button/toggle_audio_ssa_16.png
similarity index 100%
rename from aegisub/src/bitmaps/16/toggle_audio_ssa.png
rename to aegisub/src/bitmaps/button/toggle_audio_ssa_16.png
diff --git a/aegisub/src/bitmaps/24/toggle_audio_ssa.png b/aegisub/src/bitmaps/button/toggle_audio_ssa_24.png
similarity index 100%
rename from aegisub/src/bitmaps/24/toggle_audio_ssa.png
rename to aegisub/src/bitmaps/button/toggle_audio_ssa_24.png
diff --git a/aegisub/src/bitmaps/16/toggle_tag_hiding.png b/aegisub/src/bitmaps/button/toggle_tag_hiding_16.png
similarity index 100%
rename from aegisub/src/bitmaps/16/toggle_tag_hiding.png
rename to aegisub/src/bitmaps/button/toggle_tag_hiding_16.png
diff --git a/aegisub/src/bitmaps/24/toggle_tag_hiding.png b/aegisub/src/bitmaps/button/toggle_tag_hiding_24.png
similarity index 100%
rename from aegisub/src/bitmaps/24/toggle_tag_hiding.png
rename to aegisub/src/bitmaps/button/toggle_tag_hiding_24.png
diff --git a/aegisub/src/bitmaps/16/toggle_video_autoscroll.png b/aegisub/src/bitmaps/button/toggle_video_autoscroll_16.png
similarity index 100%
rename from aegisub/src/bitmaps/16/toggle_video_autoscroll.png
rename to aegisub/src/bitmaps/button/toggle_video_autoscroll_16.png
diff --git a/aegisub/src/bitmaps/24/toggle_video_autoscroll.png b/aegisub/src/bitmaps/button/toggle_video_autoscroll_24.png
similarity index 100%
rename from aegisub/src/bitmaps/24/toggle_video_autoscroll.png
rename to aegisub/src/bitmaps/button/toggle_video_autoscroll_24.png
diff --git a/aegisub/src/bitmaps/16/translation_toolbutton.png b/aegisub/src/bitmaps/button/translation_toolbutton_16.png
similarity index 100%
rename from aegisub/src/bitmaps/16/translation_toolbutton.png
rename to aegisub/src/bitmaps/button/translation_toolbutton_16.png
diff --git a/aegisub/src/bitmaps/24/translation_toolbutton.png b/aegisub/src/bitmaps/button/translation_toolbutton_24.png
similarity index 100%
rename from aegisub/src/bitmaps/24/translation_toolbutton.png
rename to aegisub/src/bitmaps/button/translation_toolbutton_24.png
diff --git a/aegisub/src/bitmaps/16/undo_button.png b/aegisub/src/bitmaps/button/undo_button_16.png
similarity index 100%
rename from aegisub/src/bitmaps/16/undo_button.png
rename to aegisub/src/bitmaps/button/undo_button_16.png
diff --git a/aegisub/src/bitmaps/24/undo_button.png b/aegisub/src/bitmaps/button/undo_button_24.png
similarity index 100%
rename from aegisub/src/bitmaps/24/undo_button.png
rename to aegisub/src/bitmaps/button/undo_button_24.png
diff --git a/aegisub/src/bitmaps/16/use_dummy_video_menu.png b/aegisub/src/bitmaps/button/use_dummy_video_menu_16.png
similarity index 100%
rename from aegisub/src/bitmaps/16/use_dummy_video_menu.png
rename to aegisub/src/bitmaps/button/use_dummy_video_menu_16.png
diff --git a/aegisub/src/bitmaps/24/use_dummy_video_menu.png b/aegisub/src/bitmaps/button/use_dummy_video_menu_24.png
similarity index 100%
rename from aegisub/src/bitmaps/24/use_dummy_video_menu.png
rename to aegisub/src/bitmaps/button/use_dummy_video_menu_24.png
diff --git a/aegisub/src/bitmaps/16/video_to_subend.png b/aegisub/src/bitmaps/button/video_to_subend_16.png
similarity index 100%
rename from aegisub/src/bitmaps/16/video_to_subend.png
rename to aegisub/src/bitmaps/button/video_to_subend_16.png
diff --git a/aegisub/src/bitmaps/24/video_to_subend.png b/aegisub/src/bitmaps/button/video_to_subend_24.png
similarity index 100%
rename from aegisub/src/bitmaps/24/video_to_subend.png
rename to aegisub/src/bitmaps/button/video_to_subend_24.png
diff --git a/aegisub/src/bitmaps/16/video_to_substart.png b/aegisub/src/bitmaps/button/video_to_substart_16.png
similarity index 100%
rename from aegisub/src/bitmaps/16/video_to_substart.png
rename to aegisub/src/bitmaps/button/video_to_substart_16.png
diff --git a/aegisub/src/bitmaps/24/video_to_substart.png b/aegisub/src/bitmaps/button/video_to_substart_24.png
similarity index 100%
rename from aegisub/src/bitmaps/24/video_to_substart.png
rename to aegisub/src/bitmaps/button/video_to_substart_24.png
diff --git a/aegisub/src/bitmaps/16/visual_clip.png b/aegisub/src/bitmaps/button/visual_clip_16.png
similarity index 100%
rename from aegisub/src/bitmaps/16/visual_clip.png
rename to aegisub/src/bitmaps/button/visual_clip_16.png
diff --git a/aegisub/src/bitmaps/24/visual_clip.png b/aegisub/src/bitmaps/button/visual_clip_24.png
similarity index 100%
rename from aegisub/src/bitmaps/24/visual_clip.png
rename to aegisub/src/bitmaps/button/visual_clip_24.png
diff --git a/aegisub/src/bitmaps/16/visual_help.png b/aegisub/src/bitmaps/button/visual_help_16.png
similarity index 100%
rename from aegisub/src/bitmaps/16/visual_help.png
rename to aegisub/src/bitmaps/button/visual_help_16.png
diff --git a/aegisub/src/bitmaps/24/visual_help.png b/aegisub/src/bitmaps/button/visual_help_24.png
similarity index 100%
rename from aegisub/src/bitmaps/24/visual_help.png
rename to aegisub/src/bitmaps/button/visual_help_24.png
diff --git a/aegisub/src/bitmaps/16/visual_move.png b/aegisub/src/bitmaps/button/visual_move_16.png
similarity index 100%
rename from aegisub/src/bitmaps/16/visual_move.png
rename to aegisub/src/bitmaps/button/visual_move_16.png
diff --git a/aegisub/src/bitmaps/24/visual_move.png b/aegisub/src/bitmaps/button/visual_move_24.png
similarity index 100%
rename from aegisub/src/bitmaps/24/visual_move.png
rename to aegisub/src/bitmaps/button/visual_move_24.png
diff --git a/aegisub/src/bitmaps/16/visual_move_conv_move.png b/aegisub/src/bitmaps/button/visual_move_conv_move_16.png
similarity index 100%
rename from aegisub/src/bitmaps/16/visual_move_conv_move.png
rename to aegisub/src/bitmaps/button/visual_move_conv_move_16.png
diff --git a/aegisub/src/bitmaps/24/visual_move_conv_move.png b/aegisub/src/bitmaps/button/visual_move_conv_move_24.png
similarity index 100%
rename from aegisub/src/bitmaps/24/visual_move_conv_move.png
rename to aegisub/src/bitmaps/button/visual_move_conv_move_24.png
diff --git a/aegisub/src/bitmaps/16/visual_move_conv_pos.png b/aegisub/src/bitmaps/button/visual_move_conv_pos_16.png
similarity index 100%
rename from aegisub/src/bitmaps/16/visual_move_conv_pos.png
rename to aegisub/src/bitmaps/button/visual_move_conv_pos_16.png
diff --git a/aegisub/src/bitmaps/24/visual_move_conv_pos.png b/aegisub/src/bitmaps/button/visual_move_conv_pos_24.png
similarity index 100%
rename from aegisub/src/bitmaps/24/visual_move_conv_pos.png
rename to aegisub/src/bitmaps/button/visual_move_conv_pos_24.png
diff --git a/aegisub/src/bitmaps/16/visual_realtime.png b/aegisub/src/bitmaps/button/visual_realtime_16.png
similarity index 100%
rename from aegisub/src/bitmaps/16/visual_realtime.png
rename to aegisub/src/bitmaps/button/visual_realtime_16.png
diff --git a/aegisub/src/bitmaps/24/visual_realtime.png b/aegisub/src/bitmaps/button/visual_realtime_24.png
similarity index 100%
rename from aegisub/src/bitmaps/24/visual_realtime.png
rename to aegisub/src/bitmaps/button/visual_realtime_24.png
diff --git a/aegisub/src/bitmaps/16/visual_rotatexy.png b/aegisub/src/bitmaps/button/visual_rotatexy_16.png
similarity index 100%
rename from aegisub/src/bitmaps/16/visual_rotatexy.png
rename to aegisub/src/bitmaps/button/visual_rotatexy_16.png
diff --git a/aegisub/src/bitmaps/24/visual_rotatexy.png b/aegisub/src/bitmaps/button/visual_rotatexy_24.png
similarity index 100%
rename from aegisub/src/bitmaps/24/visual_rotatexy.png
rename to aegisub/src/bitmaps/button/visual_rotatexy_24.png
diff --git a/aegisub/src/bitmaps/16/visual_rotatez.png b/aegisub/src/bitmaps/button/visual_rotatez_16.png
similarity index 100%
rename from aegisub/src/bitmaps/16/visual_rotatez.png
rename to aegisub/src/bitmaps/button/visual_rotatez_16.png
diff --git a/aegisub/src/bitmaps/24/visual_rotatez.png b/aegisub/src/bitmaps/button/visual_rotatez_24.png
similarity index 100%
rename from aegisub/src/bitmaps/24/visual_rotatez.png
rename to aegisub/src/bitmaps/button/visual_rotatez_24.png
diff --git a/aegisub/src/bitmaps/16/visual_scale.png b/aegisub/src/bitmaps/button/visual_scale_16.png
similarity index 100%
rename from aegisub/src/bitmaps/16/visual_scale.png
rename to aegisub/src/bitmaps/button/visual_scale_16.png
diff --git a/aegisub/src/bitmaps/24/visual_scale.png b/aegisub/src/bitmaps/button/visual_scale_24.png
similarity index 100%
rename from aegisub/src/bitmaps/24/visual_scale.png
rename to aegisub/src/bitmaps/button/visual_scale_24.png
diff --git a/aegisub/src/bitmaps/16/visual_standard.png b/aegisub/src/bitmaps/button/visual_standard_16.png
similarity index 100%
rename from aegisub/src/bitmaps/16/visual_standard.png
rename to aegisub/src/bitmaps/button/visual_standard_16.png
diff --git a/aegisub/src/bitmaps/24/visual_standard.png b/aegisub/src/bitmaps/button/visual_standard_24.png
similarity index 100%
rename from aegisub/src/bitmaps/24/visual_standard.png
rename to aegisub/src/bitmaps/button/visual_standard_24.png
diff --git a/aegisub/src/bitmaps/16/visual_vector_clip.png b/aegisub/src/bitmaps/button/visual_vector_clip_16.png
similarity index 100%
rename from aegisub/src/bitmaps/16/visual_vector_clip.png
rename to aegisub/src/bitmaps/button/visual_vector_clip_16.png
diff --git a/aegisub/src/bitmaps/24/visual_vector_clip.png b/aegisub/src/bitmaps/button/visual_vector_clip_24.png
similarity index 100%
rename from aegisub/src/bitmaps/24/visual_vector_clip.png
rename to aegisub/src/bitmaps/button/visual_vector_clip_24.png
diff --git a/aegisub/src/bitmaps/16/visual_vector_clip_bicubic.png b/aegisub/src/bitmaps/button/visual_vector_clip_bicubic_16.png
similarity index 100%
rename from aegisub/src/bitmaps/16/visual_vector_clip_bicubic.png
rename to aegisub/src/bitmaps/button/visual_vector_clip_bicubic_16.png
diff --git a/aegisub/src/bitmaps/24/visual_vector_clip_bicubic.png b/aegisub/src/bitmaps/button/visual_vector_clip_bicubic_24.png
similarity index 100%
rename from aegisub/src/bitmaps/24/visual_vector_clip_bicubic.png
rename to aegisub/src/bitmaps/button/visual_vector_clip_bicubic_24.png
diff --git a/aegisub/src/bitmaps/16/visual_vector_clip_convert.png b/aegisub/src/bitmaps/button/visual_vector_clip_convert_16.png
similarity index 100%
rename from aegisub/src/bitmaps/16/visual_vector_clip_convert.png
rename to aegisub/src/bitmaps/button/visual_vector_clip_convert_16.png
diff --git a/aegisub/src/bitmaps/24/visual_vector_clip_convert.png b/aegisub/src/bitmaps/button/visual_vector_clip_convert_24.png
similarity index 100%
rename from aegisub/src/bitmaps/24/visual_vector_clip_convert.png
rename to aegisub/src/bitmaps/button/visual_vector_clip_convert_24.png
diff --git a/aegisub/src/bitmaps/16/visual_vector_clip_drag.png b/aegisub/src/bitmaps/button/visual_vector_clip_drag_16.png
similarity index 100%
rename from aegisub/src/bitmaps/16/visual_vector_clip_drag.png
rename to aegisub/src/bitmaps/button/visual_vector_clip_drag_16.png
diff --git a/aegisub/src/bitmaps/24/visual_vector_clip_drag.png b/aegisub/src/bitmaps/button/visual_vector_clip_drag_24.png
similarity index 100%
rename from aegisub/src/bitmaps/24/visual_vector_clip_drag.png
rename to aegisub/src/bitmaps/button/visual_vector_clip_drag_24.png
diff --git a/aegisub/src/bitmaps/16/visual_vector_clip_freehand.png b/aegisub/src/bitmaps/button/visual_vector_clip_freehand_16.png
similarity index 100%
rename from aegisub/src/bitmaps/16/visual_vector_clip_freehand.png
rename to aegisub/src/bitmaps/button/visual_vector_clip_freehand_16.png
diff --git a/aegisub/src/bitmaps/24/visual_vector_clip_freehand.png b/aegisub/src/bitmaps/button/visual_vector_clip_freehand_24.png
similarity index 100%
rename from aegisub/src/bitmaps/24/visual_vector_clip_freehand.png
rename to aegisub/src/bitmaps/button/visual_vector_clip_freehand_24.png
diff --git a/aegisub/src/bitmaps/16/visual_vector_clip_freehand_smooth.png b/aegisub/src/bitmaps/button/visual_vector_clip_freehand_smooth_16.png
similarity index 100%
rename from aegisub/src/bitmaps/16/visual_vector_clip_freehand_smooth.png
rename to aegisub/src/bitmaps/button/visual_vector_clip_freehand_smooth_16.png
diff --git a/aegisub/src/bitmaps/24/visual_vector_clip_freehand_smooth.png b/aegisub/src/bitmaps/button/visual_vector_clip_freehand_smooth_24.png
similarity index 100%
rename from aegisub/src/bitmaps/24/visual_vector_clip_freehand_smooth.png
rename to aegisub/src/bitmaps/button/visual_vector_clip_freehand_smooth_24.png
diff --git a/aegisub/src/bitmaps/16/visual_vector_clip_insert.png b/aegisub/src/bitmaps/button/visual_vector_clip_insert_16.png
similarity index 100%
rename from aegisub/src/bitmaps/16/visual_vector_clip_insert.png
rename to aegisub/src/bitmaps/button/visual_vector_clip_insert_16.png
diff --git a/aegisub/src/bitmaps/24/visual_vector_clip_insert.png b/aegisub/src/bitmaps/button/visual_vector_clip_insert_24.png
similarity index 100%
rename from aegisub/src/bitmaps/24/visual_vector_clip_insert.png
rename to aegisub/src/bitmaps/button/visual_vector_clip_insert_24.png
diff --git a/aegisub/src/bitmaps/16/visual_vector_clip_line.png b/aegisub/src/bitmaps/button/visual_vector_clip_line_16.png
similarity index 100%
rename from aegisub/src/bitmaps/16/visual_vector_clip_line.png
rename to aegisub/src/bitmaps/button/visual_vector_clip_line_16.png
diff --git a/aegisub/src/bitmaps/24/visual_vector_clip_line.png b/aegisub/src/bitmaps/button/visual_vector_clip_line_24.png
similarity index 100%
rename from aegisub/src/bitmaps/24/visual_vector_clip_line.png
rename to aegisub/src/bitmaps/button/visual_vector_clip_line_24.png
diff --git a/aegisub/src/bitmaps/16/visual_vector_clip_remove.png b/aegisub/src/bitmaps/button/visual_vector_clip_remove_16.png
similarity index 100%
rename from aegisub/src/bitmaps/16/visual_vector_clip_remove.png
rename to aegisub/src/bitmaps/button/visual_vector_clip_remove_16.png
diff --git a/aegisub/src/bitmaps/24/visual_vector_clip_remove.png b/aegisub/src/bitmaps/button/visual_vector_clip_remove_24.png
similarity index 100%
rename from aegisub/src/bitmaps/24/visual_vector_clip_remove.png
rename to aegisub/src/bitmaps/button/visual_vector_clip_remove_24.png
diff --git a/aegisub/src/bitmaps/16/website_button.png b/aegisub/src/bitmaps/button/website_button_16.png
similarity index 100%
rename from aegisub/src/bitmaps/16/website_button.png
rename to aegisub/src/bitmaps/button/website_button_16.png
diff --git a/aegisub/src/bitmaps/24/website_button.png b/aegisub/src/bitmaps/button/website_button_24.png
similarity index 100%
rename from aegisub/src/bitmaps/24/website_button.png
rename to aegisub/src/bitmaps/button/website_button_24.png
diff --git a/aegisub/src/bitmaps/16/zoom_in_button.png b/aegisub/src/bitmaps/button/zoom_in_button_16.png
similarity index 100%
rename from aegisub/src/bitmaps/16/zoom_in_button.png
rename to aegisub/src/bitmaps/button/zoom_in_button_16.png
diff --git a/aegisub/src/bitmaps/24/zoom_in_button.png b/aegisub/src/bitmaps/button/zoom_in_button_24.png
similarity index 100%
rename from aegisub/src/bitmaps/24/zoom_in_button.png
rename to aegisub/src/bitmaps/button/zoom_in_button_24.png
diff --git a/aegisub/src/bitmaps/16/zoom_out_button.png b/aegisub/src/bitmaps/button/zoom_out_button_16.png
similarity index 100%
rename from aegisub/src/bitmaps/16/zoom_out_button.png
rename to aegisub/src/bitmaps/button/zoom_out_button_16.png
diff --git a/aegisub/src/bitmaps/24/zoom_out_button.png b/aegisub/src/bitmaps/button/zoom_out_button_24.png
similarity index 100%
rename from aegisub/src/bitmaps/24/zoom_out_button.png
rename to aegisub/src/bitmaps/button/zoom_out_button_24.png