diff --git a/modules/juce_gui_basics/buttons/juce_ToolbarButton.cpp b/modules/juce_gui_basics/buttons/juce_ToolbarButton.cpp
index 599a6280a6..dbb1a9b6fe 100644
--- a/modules/juce_gui_basics/buttons/juce_ToolbarButton.cpp
+++ b/modules/juce_gui_basics/buttons/juce_ToolbarButton.cpp
@@ -73,6 +73,7 @@ void ToolbarButton::updateDrawable()
 {
     if (currentImage != nullptr)
     {
+        currentImage->setInterceptsMouseClicks (false, false);
         currentImage->setTransformToFit (getContentArea().toFloat(), RectanglePlacement::centred);
         currentImage->setAlpha (isEnabled() ? 1.0f : 0.5f);
     }
diff --git a/modules/juce_gui_basics/widgets/juce_Toolbar.cpp b/modules/juce_gui_basics/widgets/juce_Toolbar.cpp
index 38454336e2..0cd09194dc 100644
--- a/modules/juce_gui_basics/widgets/juce_Toolbar.cpp
+++ b/modules/juce_gui_basics/widgets/juce_Toolbar.cpp
@@ -36,10 +36,6 @@ public:
     {
     }
 
-    ~ToolbarSpacerComp()
-    {
-    }
-
     bool getToolbarItemSizes (int toolbarThickness, bool /*isToolbarVertical*/,
                               int& preferredSize, int& minSize, int& maxSize)
     {