diff --git a/src/juce_appframework/audio/devices/juce_AudioDeviceManager.cpp b/src/juce_appframework/audio/devices/juce_AudioDeviceManager.cpp
index 1015c93289..9b3ad974f6 100644
--- a/src/juce_appframework/audio/devices/juce_AudioDeviceManager.cpp
+++ b/src/juce_appframework/audio/devices/juce_AudioDeviceManager.cpp
@@ -105,7 +105,7 @@ const String AudioDeviceManager::initialise (const int numInputChannelsNeeded,
             setMidiInputEnabled (allMidiIns[i], enabledMidiIns.contains (allMidiIns[i]));
 
         if (error.isNotEmpty() && selectDefaultDeviceOnFailure)
-            initialise (numInputChannelsNeeded, numOutputChannelsNeeded, 0, false);
+            error = initialise (numInputChannelsNeeded, numOutputChannelsNeeded, 0, false);
 
         setDefaultMidiOutput (e->getStringAttribute (T("defaultMidiOutput")));
 
diff --git a/src/juce_appframework/gui/components/controls/juce_ComboBox.h b/src/juce_appframework/gui/components/controls/juce_ComboBox.h
index 4f20baf817..87581ed9d7 100644
--- a/src/juce_appframework/gui/components/controls/juce_ComboBox.h
+++ b/src/juce_appframework/gui/components/controls/juce_ComboBox.h
@@ -326,6 +326,7 @@ public:
         textColourId        = 0x1000a00,    /**< The colour for the text in the box. */
         outlineColourId     = 0x1000c00,    /**< The colour for an outline around the box. */
         buttonColourId      = 0x1000d00,    /**< The base colour for the button (a LookAndFeel class will probably use variations on this). */
+        arrowColourId       = 0x1000e00,    /**< The colour for the arrow shape that pops up the menu */
     };
 
     //==============================================================================
diff --git a/src/juce_appframework/gui/components/lookandfeel/juce_LookAndFeel.cpp b/src/juce_appframework/gui/components/lookandfeel/juce_LookAndFeel.cpp
index 7aeb41a126..f1e8b8ed3f 100644
--- a/src/juce_appframework/gui/components/lookandfeel/juce_LookAndFeel.cpp
+++ b/src/juce_appframework/gui/components/lookandfeel/juce_LookAndFeel.cpp
@@ -142,6 +142,7 @@ LookAndFeel::LookAndFeel()
 
         ComboBox::textColourId,                     0xff000000,
         ComboBox::backgroundColourId,               0xffffffff,
+        ComboBox::arrowColourId,                    0x99000000,
 
         ListBox::backgroundColourId,                0xffffffff,
         ListBox::outlineColourId,                   standardOutlineColour,
@@ -1114,15 +1115,14 @@ void LookAndFeel::drawComboBox (Graphics& g, int width, int height,
                        buttonX + buttonW * (1.0f - arrowX), buttonY + buttonH * 0.55f,
                        buttonX + buttonW * arrowX,          buttonY + buttonH * 0.55f);
 
-        g.setColour (Colour (0x99000000));
+        g.setColour (box.findColour (ComboBox::arrowColourId));
         g.fillPath (p);
     }
 }
 
 const Font LookAndFeel::getComboBoxFont (ComboBox& box)
 {
-    const Font f (jmin (15.0f, box.getHeight() * 0.85f));
-    return f;
+    return Font (jmin (15.0f, box.getHeight() * 0.85f));
 }
 
 Label* LookAndFeel::createComboBoxTextBox (ComboBox&)