diff --git a/gtk2_ardour/audio_region_view.cc b/gtk2_ardour/audio_region_view.cc
index c24facb8e4..966b77af87 100644
--- a/gtk2_ardour/audio_region_view.cc
+++ b/gtk2_ardour/audio_region_view.cc
@@ -1164,6 +1164,7 @@ AudioRegionView::create_one_wave (uint32_t which, bool /*direct*/)
 	wave->set_height (ht);
 	wave->set_samples_per_pixel (samples_per_pixel);
 	wave->set_show_zero_line (true);
+	wave->set_clip_level (Config->get_waveform_clip_level ());
 	
 	switch (Config->get_waveform_shape()) {
 	case Rectified:
diff --git a/libs/canvas/wave_view.cc b/libs/canvas/wave_view.cc
index 1c7e7a1922..b0c1c6dd93 100644
--- a/libs/canvas/wave_view.cc
+++ b/libs/canvas/wave_view.cc
@@ -460,9 +460,8 @@ WaveView::draw_image (Cairo::RefPtr<Cairo::ImageSurface>& image, PeakData* _peak
 	 */
 
 	if (_global_show_waveform_clipping) {
-		
-		set_source_rgba (context, _outline_color);
-		
+		set_source_rgba (context, _clip_color);
+
 		/* the height of the clip-indicator should be at most 7 pixels,
 		   or 5% of the height of the waveview item.
 		*/
@@ -475,25 +474,16 @@ WaveView::draw_image (Cairo::RefPtr<Cairo::ImageSurface>& image, PeakData* _peak
 				tips[i].clip_max;
 			
 			if (show_top_clip) {
-				set_source_rgba (context, _clip_color);
 				context->rel_line_to (0, clip_height);
-				set_source_rgba (context, _outline_color);
-			} else {
-				context->rel_line_to (0, 1.0);
 			}
 
 			if (_shape != WaveView::Rectified) {
 				context->move_to (i, tips[i].bot);
 				if (tips[i].clip_min) {
-					set_source_rgba (context, _clip_color);
 					context->rel_line_to (0, -clip_height);
-					set_source_rgba (context, _outline_color);
-				} else {
-					context->rel_line_to (0, -1.0);
 				}
 			}
 		}
-
 		context->stroke ();
 	}