diff --git a/gtk2_ardour/editing_context.cc b/gtk2_ardour/editing_context.cc
index f786cd9dbc..5b1ab8c702 100644
--- a/gtk2_ardour/editing_context.cc
+++ b/gtk2_ardour/editing_context.cc
@@ -123,7 +123,7 @@ EditingContext::EditingContext (std::string const & name)
 	, _draw_channel (DRAW_CHAN_AUTO)
 	, _timeline_origin (0.)
 	, play_note_selection_button (ArdourButton::default_elements)
-	, follow_playhead_button (_("F"), ArdourButton::Text, true)
+	, follow_playhead_button (ArdourButton::default_elements, true)
 	, visible_channel_label (_("MIDI Channel"))
 	, _drags (new DragManager (this))
 	, _leftmost_sample (0)
@@ -214,6 +214,8 @@ EditingContext::EditingContext (std::string const & name)
 	follow_playhead_button.signal_clicked.connect (sigc::mem_fun (*this, &EditingContext::follow_playhead_clicked));
 	full_zoom_button.signal_clicked.connect (sigc::mem_fun (*this, &EditingContext::full_zoom_clicked));
 
+	follow_playhead_button.set_icon (ArdourIcon::EditorFollowPlayhead);
+
 	zoom_in_button.set_name ("zoom button");
 	zoom_in_button.set_icon (ArdourIcon::ZoomIn);