diff --git a/meson.build b/meson.build
index 785c3ba..0006390 100755
--- a/meson.build
+++ b/meson.build
@@ -87,13 +87,14 @@ if host_sys == 'linux'
   wx_toolkit = 'gtk3'
 elif host_sys == 'windows'
   wx_toolkit = 'msw'
+elif host_sys == 'darwin'
+  wx_toolkit = 'osx_cocoa'
 endif
 
 wx_opts = cmake.subproject_options()
 wx_opts.add_cmake_defines({'CMAKE_POSITION_INDEPENDENT_CODE': 'ON',
                            'CMAKE_INSTALL_PREFIX': prefix,
                            'CMAKE_BUILD_TYPE': 'Release',
-                           'CMAKE_CXX_COMPILER': 'g++',
                            'wxBUILD_SHARED': 'ON',
                            'wxBUILD_MONOLITHIC': 'OFF',
                            'wxBUILD_BENCHMARKS': 'OFF',
@@ -122,14 +123,12 @@ wx_opts.add_cmake_defines({'CMAKE_POSITION_INDEPENDENT_CODE': 'ON',
 taglib_opts = cmake.subproject_options()
 taglib_opts.add_cmake_defines({'CMAKE_POSITION_INDEPENDENT_CODE': 'ON',
                                'CMAKE_INSTALL_PREFIX': prefix,
-                               'CMAKE_BUILD_TYPE': 'Release',
-                               'CMAKE_CXX_COMPILER': 'g++'})
+                               'CMAKE_BUILD_TYPE': 'Release'})
 
 yaml_opts = cmake.subproject_options()
 yaml_opts.add_cmake_defines({'CMAKE_POSITION_INDEPENDENT_CODE': 'ON',
                              'CMAKE_INSTALL_PREFIX': prefix,
                              'CMAKE_BUILD_TYPE': 'Release',
-                             'CMAKE_CXX_COMPILER': 'g++',
                              'YAML_BUILD_SHARED_LIBS': 'ON',
                              'YAML_CPP_BUILD_TESTS': 'OFF',
                              'YAML_CPP_BUILD_CONTRIB': 'ON',
@@ -139,7 +138,6 @@ snd_opts = cmake.subproject_options()
 snd_opts.add_cmake_defines({'CMAKE_POSITION_INDEPENDENT_CODE': 'ON',
                             'CMAKE_INSTALL_PREFIX': prefix,
                             'CMAKE_BUILD_TYPE': 'Release',
-                            'CMAKE_CXX_COMPILER': 'g++',
                             'BUILD_SHARED_LIBS': 'ON',
                             'BUILD_PROGRAMS': 'OFF',
                             'BUILD_EXAMPLES': 'OFF',
@@ -189,10 +187,10 @@ wx_libs = []
 
 if not wx.found()
   wx_subproject = cmake.subproject('wxwidgets', options: wx_opts)
-  wx_base = wx_subproject.dependency('wxbase')
-  wx_core = wx_subproject.dependency('wxcore')
   wx_media = wx_subproject.dependency('wxmedia')
-  wx = [wx_core, wx_base, wx_media]
+  wx_core = wx_subproject.dependency('wxcore')
+  wx_base = wx_subproject.dependency('wxbase')
+  wx = [wx_media, wx_core, wx_base]
 else
   wxconfig = find_program(['wx-config', 'wx-config-gtk3'])
   wx_modules = ['media', 'std']
diff --git a/src/GUI/TransportControls.cpp b/src/GUI/TransportControls.cpp
index 84ee5b3..b00e1c9 100644
--- a/src/GUI/TransportControls.cpp
+++ b/src/GUI/TransportControls.cpp
@@ -30,8 +30,6 @@
 #include "Utility/Paths.hpp"
 #include "Utility/Utils.hpp"
 
-#include <wx/bmpbndl.h>
-
 cTransportControls::cTransportControls(wxWindow* window, wxMediaCtrl& mediaCtrl)
     : wxPanel(window, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL | wxNO_BORDER),
       m_MediaCtrl(mediaCtrl)
@@ -41,11 +39,11 @@ cTransportControls::cTransportControls(wxWindow* window, wxMediaCtrl& mediaCtrl)
     // Looping region controls
     if (m_Theme.IsDark())
         m_pLoopABButton = new wxBitmapToggleButton(this, SampleHive::ID::BC_LoopABButton,
-                                                   wxBitmapBundle::FromBitmap(static_cast<wxString>(ICON_AB_LIGHT_16px)),
+                                                   static_cast<wxString>(ICON_AB_LIGHT_16px),
                                                    wxDefaultPosition, wxDefaultSize, 0);
     else
         m_pLoopABButton = new wxBitmapToggleButton(this, SampleHive::ID::BC_LoopABButton,
-                                                   wxBitmapBundle::FromBitmap(static_cast<wxString>(ICON_AB_DARK_16px)),
+                                                   static_cast<wxString>(ICON_AB_DARK_16px),
                                                    wxDefaultPosition, wxDefaultSize, 0);
 
     m_pLoopABButton->SetToolTip(_("Loop selected region"));
@@ -69,31 +67,31 @@ cTransportControls::cTransportControls(wxWindow* window, wxMediaCtrl& mediaCtrl)
     if (m_Theme.IsDark())
     {
         m_pPlayButton = new wxBitmapButton(this, SampleHive::ID::BC_Play,
-                                           wxBitmapBundle::FromBitmap(static_cast<wxString>(ICON_PLAY_LIGHT_16px)),
+                                           static_cast<wxString>(ICON_PLAY_LIGHT_16px),
                                            wxDefaultPosition, wxDefaultSize, 0);
         m_pLoopButton = new wxBitmapToggleButton(this, SampleHive::ID::BC_Loop,
-                                                 wxBitmapBundle::FromBitmap(static_cast<wxString>(ICON_LOOP_LIGHT_16px)),
+                                                 static_cast<wxString>(ICON_LOOP_LIGHT_16px),
                                                  wxDefaultPosition, wxDefaultSize, 0);
         m_pStopButton = new wxBitmapButton(this, SampleHive::ID::BC_Stop,
-                                           wxBitmapBundle::FromBitmap(static_cast<wxString>(ICON_STOP_LIGHT_16px)),
+                                           static_cast<wxString>(ICON_STOP_LIGHT_16px),
                                            wxDefaultPosition, wxDefaultSize, 0);
         m_pMuteButton = new wxBitmapToggleButton(this, SampleHive::ID::BC_Mute,
-                                                 wxBitmapBundle::FromBitmap(static_cast<wxString>(ICON_MUTE_LIGHT_16px)),
+                                                 static_cast<wxString>(ICON_MUTE_LIGHT_16px),
                                                  wxDefaultPosition, wxDefaultSize, 0);
     }
     else
     {
         m_pPlayButton = new wxBitmapButton(this, SampleHive::ID::BC_Play,
-                                           wxBitmapBundle::FromBitmap(static_cast<wxString>(ICON_PLAY_DARK_16px)),
+                                           static_cast<wxString>(ICON_PLAY_DARK_16px),
                                            wxDefaultPosition, wxDefaultSize, 0);
         m_pLoopButton = new wxBitmapToggleButton(this, SampleHive::ID::BC_Loop,
-                                                 wxBitmapBundle::FromBitmap(static_cast<wxString>(ICON_LOOP_DARK_16px)),
+                                                 static_cast<wxString>(ICON_LOOP_DARK_16px),
                                                  wxDefaultPosition, wxDefaultSize, 0);
         m_pStopButton = new wxBitmapButton(this, SampleHive::ID::BC_Stop,
-                                           wxBitmapBundle::FromBitmap(static_cast<wxString>(ICON_STOP_DARK_16px)),
+                                           static_cast<wxString>(ICON_STOP_DARK_16px),
                                            wxDefaultPosition, wxDefaultSize, 0);
         m_pMuteButton = new wxBitmapToggleButton(this, SampleHive::ID::BC_Mute,
-                                                 wxBitmapBundle::FromBitmap(static_cast<wxString>(ICON_MUTE_DARK_16px)),
+                                                 static_cast<wxString>(ICON_MUTE_DARK_16px),
                                                  wxDefaultPosition, wxDefaultSize, 0);
     }
 
diff --git a/subprojects/wxwidgets.wrap b/subprojects/wxwidgets.wrap
index dbe112d..e300773 100644
--- a/subprojects/wxwidgets.wrap
+++ b/subprojects/wxwidgets.wrap
@@ -1,4 +1,4 @@
 [wrap-git]
 url = https://github.com/wxWidgets/wxWidgets
-revision = master
+revision = v3.1.5
 clone-recursive = true
\ No newline at end of file