diff --git a/src/components.scad b/src/components.scad
index f4d1460..53d06ff 100644
--- a/src/components.scad
+++ b/src/components.scad
@@ -92,6 +92,13 @@ module frame_cutout() {
 	cube([36.5, 8, frame_z-(top_plate_z*2)], center=true);
 }
 
+// bank of three 24mm buttons, commonly on a frame face
+module aux_control_three_button_cluster() {
+	translate([-40, 0, 0]) button_24mm_hole();
+	translate([0, 0, 0]) button_24mm_hole();
+	translate([40, 0, 0]) button_24mm_hole();
+}
+
 module m2_mount_post() {
 	difference() {
 		cylinder(r=m2_screw_selftap_radius*2.25, h=3, $fn=6, center=true);
diff --git a/src/frame-left.scad b/src/frame-left.scad
index 9f8f668..1dec435 100644
--- a/src/frame-left.scad
+++ b/src/frame-left.scad
@@ -37,11 +37,9 @@ module left_frame() {
 		frame_cable_routing_hole();
 
 		// aux button holes
-		translate([-30, 101.5, 0]) rotate([270, 0, 0]) button_24mm_hole();
+		translate([-30, 101.5, 0]) rotate([270, 0, 0]) aux_control_three_button_cluster();
 		translate([-30, (frame_y/2)-neutrik_panel_thickness-4, 0]) frame_cutout();
-		translate([-70, 101.5, 0]) rotate([270, 0, 0]) button_24mm_hole();
 		translate([-70, (frame_y/2)-neutrik_panel_thickness-4, 0]) frame_cutout();
-		translate([10, 101.5, 0]) rotate([270, 0, 0]) button_24mm_hole();
 		translate([10, (frame_y/2)-neutrik_panel_thickness-4, 0]) frame_cutout();
 
 		// neutrix button hole
diff --git a/src/frame-right.scad b/src/frame-right.scad
index a7de9bd..646c989 100644
--- a/src/frame-right.scad
+++ b/src/frame-right.scad
@@ -37,11 +37,9 @@ module right_frame() {
 		mirror([1, 0, 0]) frame_cable_routing_hole();
 
 		// aux button holes
-		translate([30, 101.5, 0]) rotate([270, 0, 0]) button_24mm_hole();
+		translate([30, 101.5, 0]) rotate([270, 0, 0]) aux_control_three_button_cluster();
 		translate([30, (frame_y/2)-neutrik_panel_thickness-4, 0]) frame_cutout();
-		translate([70, 101.5, 0]) rotate([270, 0, 0]) button_24mm_hole();
 		translate([70, (frame_y/2)-neutrik_panel_thickness-4, 0]) frame_cutout();
-		translate([-10, 101.5, 0]) rotate([270, 0, 0]) button_24mm_hole();
 		translate([-10, (frame_y/2)-neutrik_panel_thickness-4, 0]) frame_cutout();
 
 		// neutrix button hole
diff --git a/src/frame-solo.scad b/src/frame-solo.scad
index 23d6f70..cb34dee 100644
--- a/src/frame-solo.scad
+++ b/src/frame-solo.scad
@@ -32,23 +32,14 @@ module solo_frame() {
 		translate([40, (frame_y/2)-neutrik_panel_thickness-4, 0]) frame_cutout();
 
 		// aux button holes
-		translate([-frame_x/2+2.5, 0, 0]) rotate([0, 0, 270])
-			translate([0, 0, 0]) rotate([90, 0, 0]) button_24mm_hole();
+		translate([-frame_x/2+2.5, 0, 0]) rotate([90, 0, 270]) aux_control_three_button_cluster();
 		translate([(frame_x/2)-neutrik_panel_thickness-4, 0, 0]) rotate([0, 0, 90]) frame_cutout();
-		translate([-frame_x/2+2.5, 0, 0]) rotate([0, 0, 270])
-			translate([-40, 0, 0]) rotate([90, 0, 0]) button_24mm_hole();
 		translate([(frame_x/2)-neutrik_panel_thickness-4, -40, 0]) rotate([0, 0, 90]) frame_cutout();
-		translate([-frame_x/2+2.5, 0, 0]) rotate([0, 0, 270])
-			translate([40, 0, 0]) rotate([90, 0, 0]) button_24mm_hole();
 		translate([(frame_x/2)-neutrik_panel_thickness-4, 40, 0]) rotate([0, 0, 90]) frame_cutout();
-		translate([frame_x/2-2.5, 0, 0]) rotate([0, 0, 90])
-			translate([0, 0, 0]) rotate([90, 0, 0]) button_24mm_hole();
+
+		translate([frame_x/2+2.5, 0, 0]) rotate([90, 0, 270]) aux_control_three_button_cluster();
 		translate([-(frame_x/2)+neutrik_panel_thickness+4, 0, 0]) rotate([0, 0, 90]) frame_cutout();
-		translate([frame_x/2-2.5, 0, 0]) rotate([0, 0, 90])
-			translate([-40, 0, 0]) rotate([90, 0, 0]) button_24mm_hole();
 		translate([-(frame_x/2)+neutrik_panel_thickness+4, -40, 0]) rotate([0, 0, 90]) frame_cutout();
-		translate([frame_x/2-2.5, 0, 0]) rotate([0, 0, 90])
-			translate([40, 0, 0]) rotate([90, 0, 0]) button_24mm_hole();
 		translate([-(frame_x/2)+neutrik_panel_thickness+4, 40, 0]) rotate([0, 0, 90]) frame_cutout();
 	}
 }