diff --git a/src/openrct2-ui/windows/Scenery.cpp b/src/openrct2-ui/windows/Scenery.cpp
index 1ed73fb851..dfd401906f 100644
--- a/src/openrct2-ui/windows/Scenery.cpp
+++ b/src/openrct2-ui/windows/Scenery.cpp
@@ -597,31 +597,6 @@ namespace OpenRCT2::Ui::Windows
             invalidate();
         }
 
-        ScreenSize onScrollGetSize(int32_t scrollIndex) override
-        {
-            if (scrollIndex == kSceneryContentScrollIndex)
-            {
-                return ContentScrollGetSize();
-            }
-            return {};
-        }
-
-        void onScrollMouseDown(int32_t scrollIndex, const ScreenCoordsXY& screenCoords) override
-        {
-            if (scrollIndex == kSceneryContentScrollIndex)
-            {
-                ContentScrollMouseDown(screenCoords);
-            }
-        }
-
-        void onScrollMouseOver(int32_t scrollIndex, const ScreenCoordsXY& screenCoords) override
-        {
-            if (scrollIndex == kSceneryContentScrollIndex)
-            {
-                ContentScrollMouseOver(screenCoords);
-            }
-        }
-
         OpenRCT2String onTooltip(const WidgetIndex widgetIndex, const StringId fallback) override
         {
             if (widgetIndex >= WIDX_SCENERY_TAB_1)
@@ -907,47 +882,6 @@ namespace OpenRCT2::Ui::Windows
             }
         }
 
-        void onScrollDraw(int32_t scrollIndex, RenderTarget& rt) override
-        {
-            if (scrollIndex == kSceneryContentScrollIndex)
-            {
-                ContentScrollDraw(rt);
-            }
-        }
-
-        void onToolUpdate(WidgetIndex widgetIndex, const ScreenCoordsXY& screenCoords) override
-        {
-            switch (widgetIndex)
-            {
-                case WIDX_SCENERY_BACKGROUND:
-                    ToolUpdateScenery(screenCoords);
-                    break;
-            }
-        }
-
-        void onToolDown(WidgetIndex widgetIndex, const ScreenCoordsXY& screenCoords) override
-        {
-            switch (widgetIndex)
-            {
-                case WIDX_SCENERY_BACKGROUND:
-                    SceneryToolDown(screenCoords, widgetIndex);
-                    break;
-            }
-        }
-
-        void onToolDrag(WidgetIndex widgetIndex, const ScreenCoordsXY& screenCoords) override
-        {
-            switch (widgetIndex)
-            {
-                case WIDX_SCENERY_BACKGROUND:
-                    if (_sceneryPaintEnabled)
-                        SceneryToolDown(screenCoords, widgetIndex);
-                    if (gWindowSceneryEyedropperEnabled)
-                        SceneryToolDown(screenCoords, widgetIndex);
-                    break;
-            }
-        }
-
         void setSelectedItem(
             const ScenerySelection& scenery, const std::optional<colour_t> primary, const std::optional<colour_t> secondary,
             const std::optional<colour_t> tertiary, const std::optional<colour_t> rotation)
@@ -1499,13 +1433,13 @@ namespace OpenRCT2::Ui::Windows
             return scenery;
         }
 
-        ScreenSize ContentScrollGetSize() const
+        ScreenSize onScrollGetSize(int32_t scrollIndex) override
         {
             auto rows = CountRows();
             return { 0, ContentRowsHeight(rows) };
         }
 
-        void ContentScrollMouseDown(const ScreenCoordsXY& screenCoords)
+        void onScrollMouseDown(int32_t scrollIndex, const ScreenCoordsXY& screenCoords) override
         {
             const auto scenery = GetSceneryIdByCursorPos(screenCoords);
             if (scenery.IsUndefined())
@@ -1527,7 +1461,7 @@ namespace OpenRCT2::Ui::Windows
             invalidate();
         }
 
-        void ContentScrollMouseOver(const ScreenCoordsXY& screenCoords)
+        void onScrollMouseOver(int32_t scrollIndex, const ScreenCoordsXY& screenCoords) override
         {
             ScenerySelection scenery = GetSceneryIdByCursorPos(screenCoords);
             if (!scenery.IsUndefined() && _selectedScenery != scenery)
@@ -1722,7 +1656,7 @@ namespace OpenRCT2::Ui::Windows
             }
         }
 
-        void ContentScrollDraw(RenderTarget& rt)
+        void onScrollDraw(int32_t scrollIndex, RenderTarget& rt) override
         {
             GfxClear(rt, ColourMapA[colours[1].colour].mid_light);
 
@@ -1785,7 +1719,7 @@ namespace OpenRCT2::Ui::Windows
          *
          *  rct2: 0x006E287B
          */
-        void ToolUpdateScenery(const ScreenCoordsXY& screenPos)
+        void onToolUpdate(WidgetIndex widgetIndex, const ScreenCoordsXY& screenPos) override
         {
             MapInvalidateSelectionRect();
             MapInvalidateMapSelectionTiles();
@@ -2946,7 +2880,7 @@ namespace OpenRCT2::Ui::Windows
          *
          *  rct2: 0x006E2CC6
          */
-        void SceneryToolDown(const ScreenCoordsXY& screenCoords, WidgetIndex widgetIndex)
+        void onToolDown(WidgetIndex widgetIndex, const ScreenCoordsXY& screenCoords) override
         {
             SceneryRemoveGhostToolPlacement();
 
@@ -3247,6 +3181,12 @@ namespace OpenRCT2::Ui::Windows
                 }
             }
         }
+
+        void onToolDrag(WidgetIndex widgetIndex, const ScreenCoordsXY& screenCoords) override
+        {
+            if (_sceneryPaintEnabled || gWindowSceneryEyedropperEnabled)
+                onToolDown(widgetIndex, screenCoords);
+        }
     };
 
     WindowBase* SceneryOpen()