diff --git a/src/AdornedRulerPanel.cpp b/src/AdornedRulerPanel.cpp
index 7528daaca..61fae93a1 100644
--- a/src/AdornedRulerPanel.cpp
+++ b/src/AdornedRulerPanel.cpp
@@ -46,6 +46,7 @@
 #include "ViewInfo.h"
 #include "prefs/TracksBehaviorsPrefs.h"
 #include "prefs/TracksPrefs.h"
+#include "prefs/ThemePrefs.h"
 #include "toolbars/ToolBar.h"
 #include "tracks/ui/Scrubbing.h"
 #include "tracks/ui/TrackView.h"
@@ -938,6 +939,8 @@ AdornedRulerPanel::AdornedRulerPanel(AudacityProject* project,
 
    // Delay until after CommandManager has been populated:
    this->CallAfter( &AdornedRulerPanel::UpdatePrefs );
+
+   wxTheApp->Bind(EVT_THEME_CHANGE, &AdornedRulerPanel::OnThemeChange, this);
 }
 
 AdornedRulerPanel::~AdornedRulerPanel()
@@ -1185,6 +1188,11 @@ void AdornedRulerPanel::OnSize(wxSizeEvent &evt)
    OverlayPanel::OnSize(evt);
 }
 
+void AdornedRulerPanel::OnThemeChange(wxCommandEvent& evt)
+{
+   ReCreateButtons();
+}
+
 void AdornedRulerPanel::UpdateRects()
 {
    mInner = mOuter;
diff --git a/src/AdornedRulerPanel.h b/src/AdornedRulerPanel.h
index 1f4ede0e3..d5f667150 100644
--- a/src/AdornedRulerPanel.h
+++ b/src/AdornedRulerPanel.h
@@ -79,6 +79,7 @@ private:
    void OnRecordStartStop(wxCommandEvent & evt);
    void OnPaint(wxPaintEvent &evt);
    void OnSize(wxSizeEvent &evt);
+   void OnThemeChange(wxCommandEvent& evt);
    void UpdateRects();
    void HandleQPClick(wxMouseEvent &event, wxCoord mousePosX);
    void HandleQPDrag(wxMouseEvent &event, wxCoord mousePosX);
diff --git a/src/ProjectWindow.cpp b/src/ProjectWindow.cpp
index afe3ff237..dac88c3fa 100644
--- a/src/ProjectWindow.cpp
+++ b/src/ProjectWindow.cpp
@@ -734,7 +734,6 @@ void ProjectWindow::OnThemeChange(wxCommandEvent& evt)
       if( pToolBar )
          pToolBar->ReCreateButtons();
    }
-   AdornedRulerPanel::Get( project ).ReCreateButtons();
 }
 
 void ProjectWindow::UpdatePrefs()