diff --git a/gtk2_ardour/ui/mixer_gain_meter.xml b/gtk2_ardour/ui/mixer_gain_meter.xml
index ca0c4308c5..6d3614dbae 100644
--- a/gtk2_ardour/ui/mixer_gain_meter.xml
+++ b/gtk2_ardour/ui/mixer_gain_meter.xml
@@ -3,10 +3,9 @@
   <Adjustment id="gain_adjustment"
           minvalue="0"
           maxvalue="1"/>
-  <VBox Layout="" bgnormal="#380000" bgactive="#6A0000" width="57" height="260">
+  <VBox>
     <Button id="peak_display_button"
-            x="0" y="0"
-            width="59" height="18"
+            width="57" height="16"
             bgnormal="#B1B1B1"
             bgactive="#D83838"
             fgnormal="#000000"
@@ -52,6 +51,6 @@
             fgactive="#000000"
             bghover="#C47474"
             bordercolor="#C9C9C9"
-            _borderwidth="1 1 0 0"/>
+            borderwidth="1 1 0 0"/>
   </VBox>
 </GainSlider>
\ No newline at end of file
diff --git a/gtk2_ardour/ui/mixer_strip.xml b/gtk2_ardour/ui/mixer_strip.xml
index 80b3eb22d2..3ba3cfb920 100644
--- a/gtk2_ardour/ui/mixer_strip.xml
+++ b/gtk2_ardour/ui/mixer_strip.xml
@@ -4,12 +4,15 @@
   <HBox>
     <EventBox bgnormal="#383838" bgactive="#545454">
       <VBox>
-        <EventBox id="panners_home" bgnormal="#383838" bgactive="#545454" width="57" height="60"/>
+        <EventBox id="panners_home" bgnormal="#383838" bgactive="#545454" height="60"/>
         <HBox id="level_meter_home"/>
         <Vbox>
           <HBox id="gain_meter_home"/>
-          <EventBox borderwidth="1" bgnormal="#383838" bgactive="#545454">
+            <EventBox bgnormal="#383838" bgactive="#545454">
             <VBox>
+              <EventBox bgnormal="#000000"
+                        bgactive="#000000"
+                        height="1"/>
               <HBox>
                 <iconbutton id="rec_enable_button"
                             width="28"
@@ -55,9 +58,16 @@
               <Button id="name_button"
                       width="57"
                       height="28"/>
+              <EventBox bgnormal="#000000"
+                        bgactive="#000000"
+                        height="1"/>
             </VBox>
           </EventBox>
         </Vbox>
+        <EventBox bgnormal="#000000"
+                  bgactive="#000000"
+                  height="1"
+                  box.pack="end"/>
       </VBox>
     </EventBox>
     <EventBox bgnormal="#000000"
diff --git a/gtk2_ardour/waves_button.cc b/gtk2_ardour/waves_button.cc
index 9fc42a271e..9c6e704daf 100644
--- a/gtk2_ardour/waves_button.cc
+++ b/gtk2_ardour/waves_button.cc
@@ -115,25 +115,6 @@ WavesButton::set_angle (const double angle)
 void
 WavesButton::render (cairo_t* cr)
 {
-	void (*rounded_function)(cairo_t*, double, double, double, double, double);
-
-	switch (_corner_mask) {
-	case 0x1: /* upper left only */
-		rounded_function = Gtkmm2ext::rounded_top_left_rectangle;
-		break;
-	case 0x2: /* upper right only */
-		rounded_function = Gtkmm2ext::rounded_top_right_rectangle;
-		break;
-	case 0x3: /* upper only */
-		rounded_function = Gtkmm2ext::rounded_top_rectangle;
-		break;
-		/* should really have functions for lower right, lower left,
-		   lower only, but for now, we don't
-		*/
-	default:
-		rounded_function = Gtkmm2ext::rounded_rectangle;
-	}
-
 	Glib::RefPtr<Gtk::Style> style = get_style();
 	
 	Gdk::Color bgcolor = style->get_bg ((get_state() == Gtk::STATE_INSENSITIVE) ? Gtk::STATE_INSENSITIVE : 
@@ -145,21 +126,48 @@ WavesButton::render (cairo_t* cr)
 													Gtk::STATE_ACTIVE :
 													Gtk::STATE_NORMAL)));
 
-	if ((_left_border_width != 0) ||
-		(_top_border_width != 0) ||
-		(_right_border_width != 0) ||
-		(_bottom_border_width != 0)) {
-		cairo_set_source_rgba (cr, _border_color.get_red_p(), _border_color.get_blue_p(), _border_color.get_green_p(), 1);
-		rounded_function (cr, 0, 0, get_width(), get_height(), _corner_radius);
-		cairo_fill (cr);
+	int width = get_width ();
+	int height = get_height();
+
+	cairo_set_source_rgb (cr, _border_color.get_red_p(), _border_color.get_green_p(), _border_color.get_blue_p());
+	if (_left_border_width) {
+		cairo_set_line_width (cr, _left_border_width);
+		cairo_move_to (cr, _left_border_width/2.0, height);
+		cairo_line_to (cr, _left_border_width/2.0, 0);
+		cairo_stroke (cr);
 	}
 
-	rounded_function (cr, _left_border_width, _top_border_width, get_width()-_left_border_width-_right_border_width, get_height()-_top_border_width-_bottom_border_width, _corner_radius);
-	cairo_set_source_rgba (cr, bgcolor.get_red_p(), bgcolor.get_green_p(), bgcolor.get_blue_p(), 1);
+	if (_top_border_width) {
+		cairo_set_line_width (cr, _top_border_width);
+		cairo_move_to (cr, 0, _top_border_width/2.0);
+		cairo_line_to (cr, width, _top_border_width/2.0);
+		cairo_stroke (cr);
+	}
+
+	if (_right_border_width) {
+		cairo_set_line_width (cr, _right_border_width);
+		cairo_move_to (cr, width-_right_border_width/2.0, 0);
+		cairo_line_to (cr, width-_right_border_width/2.0, height);
+		cairo_stroke (cr);
+	}
+
+	if (_bottom_border_width != 0) {
+		cairo_set_line_width (cr, _bottom_border_width);
+		cairo_move_to (cr, width, height-_bottom_border_width/2.0);
+		cairo_line_to (cr, 0, height-_bottom_border_width/2.0);
+		cairo_stroke (cr);
+	}
+
+	cairo_rectangle (cr, 
+					 _left_border_width,
+					 _top_border_width,
+					 width-_left_border_width-_right_border_width,
+					 height-_top_border_width-_bottom_border_width);
+
+	cairo_set_source_rgb (cr, bgcolor.get_red_p(), bgcolor.get_green_p(), bgcolor.get_blue_p());
 	cairo_fill (cr);
 
 	// text, if any
-
 	if (!_text.empty()) {
 		cairo_save (cr);
 		cairo_rectangle (cr, 2, 1, get_width()-4, get_height()-2);
diff --git a/gtk2_ardour/waves_ui.cc b/gtk2_ardour/waves_ui.cc
index 345a3d2842..75b6608d37 100644
--- a/gtk2_ardour/waves_ui.cc
+++ b/gtk2_ardour/waves_ui.cc
@@ -547,7 +547,7 @@ WavesUI::set_attributes (Gtk::Widget& widget, const XMLNode& definition, const X
 	}
 
 	Gtk::Container* container = dynamic_cast<Gtk::Container*> (&widget);
-	if (container) {
+	if (container && !dynamic_cast<WavesButton*> (&widget)) {
 		container->set_border_width (xml_property (definition, "borderwidth", styles, 0));
 	}