diff --git a/data/themes/default/add_bb_track.png b/data/themes/default/add_bb_track.png
index fd9cb7f1d..ba6a58379 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/autoscroll_off.png b/data/themes/default/autoscroll_off.png
index 2942c9a72..c0a4f37c8 100644
Binary files a/data/themes/default/autoscroll_off.png and b/data/themes/default/autoscroll_off.png differ
diff --git a/data/themes/default/autoscroll_on.png b/data/themes/default/autoscroll_on.png
index fd87c9248..29da5c1dc 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..5eb2c12bc 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/back_to_zero.png b/data/themes/default/back_to_zero.png
index 3f5b1d670..b89c2107a 100644
Binary files a/data/themes/default/back_to_zero.png and b/data/themes/default/back_to_zero.png differ
diff --git a/data/themes/default/bb_track.png b/data/themes/default/bb_track.png
index 9e353be47..155664925 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/drum.png b/data/themes/default/drum.png
index b9cb37624..45c785663 100644
Binary files a/data/themes/default/drum.png and b/data/themes/default/drum.png differ
diff --git a/data/themes/default/edit_copy.png b/data/themes/default/edit_copy.png
index 03ec42747..bf4b3669d 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..a0bb1db93 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..a34793475 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_paste.png b/data/themes/default/edit_paste.png
index df468cef4..cb6b9a934 100644
Binary files a/data/themes/default/edit_paste.png and b/data/themes/default/edit_paste.png differ
diff --git a/data/themes/default/edit_select.png b/data/themes/default/edit_select.png
index 3019d54cf..5019cd89a 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/keep_stop_position.png b/data/themes/default/keep_stop_position.png
index 36c4813ef..060297da2 100644
Binary files a/data/themes/default/keep_stop_position.png and b/data/themes/default/keep_stop_position.png differ
diff --git a/data/themes/default/loop_point.png b/data/themes/default/loop_point.png
index 2f60a2297..be6499207 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_off.png b/data/themes/default/loop_points_off.png
index 6d2ea290b..d0f74259f 100644
Binary files a/data/themes/default/loop_points_off.png and b/data/themes/default/loop_points_off.png differ
diff --git a/data/themes/default/loop_points_on.png b/data/themes/default/loop_points_on.png
index 9d4fb7283..4d22bf2e7 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/step_btn_add.png b/data/themes/default/step_btn_add.png
index 50e89e13c..60fbf9944 100644
Binary files a/data/themes/default/step_btn_add.png and b/data/themes/default/step_btn_add.png differ
diff --git a/data/themes/default/step_btn_on.png b/data/themes/default/step_btn_on.png
index fc7fde9f7..d4d207d83 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 3d21b87c6..faa9b462f 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 cce0c10ed..b69defeb9 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/step_btn_remove.png b/data/themes/default/step_btn_remove.png
index 1a75ebf80..69383af18 100644
Binary files a/data/themes/default/step_btn_remove.png and b/data/themes/default/step_btn_remove.png differ
diff --git a/data/themes/default/style.css b/data/themes/default/style.css
index 81043c3fa..0d199ba12 100644
--- a/data/themes/default/style.css
+++ b/data/themes/default/style.css
@@ -214,6 +214,13 @@ TrackContainerView QFrame{
 	background-color: #49515b;
 }
 
+nStateButton {
+	max-height: 26px;
+	max-width: 26px;
+	min-height: 26px;
+	min-width: 26px;
+}
+
 trackOperationsWidget > QPushButton {
 	max-height: 26px;
 	max-width: 26px;