diff --git a/data/macos/build.sh b/data/macos/build.sh
index ba1656665..15ae4745f 100755
--- a/data/macos/build.sh
+++ b/data/macos/build.sh
@@ -36,6 +36,7 @@ rm -rf ./data/macos/Carla
 cp ./source/carla ./source/carla.pyw
 # python3 ./data/macos/bundle.py bdist_mac --bundle-name=Carla 
 $CXFREEZE --include-modules=re,sip,subprocess,inspect --target-dir=./data/macos/Carla ./source/carla.pyw
+rm -rf ./data/macos/Carla/imageformats/
 rm ./source/carla.pyw
 
 cd data/macos
diff --git a/source/carla b/source/carla
index b55abc04a..f5830a47f 100755
--- a/source/carla
+++ b/source/carla
@@ -193,7 +193,7 @@ class CarlaMultiW(QTabWidget):
     def paintEvent(self, event):
         QTabWidget.paintEvent(self, event)
 
-        if not self.fUseCustomPaint:
+        if MACOS or not self.fUseCustomPaint:
             return
 
         painter = QPainter(self)
@@ -230,7 +230,7 @@ class CarlaHostW(HostWindow):
         self.fInfoLabel.setAlignment(Qt.AlignRight|Qt.AlignVCenter)
         self.fInfoLabel.setText("Engine stopped")
 
-        if MACOS and False: # TODO: check if NOT using pro theme
+        if MACOS: # TODO: check if NOT using pro theme
             self.fInfoLabel.hide()
             self.setUnifiedTitleAndToolBarOnMac(True)
 
diff --git a/source/carla_settings.py b/source/carla_settings.py
index bc521abea..dd6ce6da1 100755
--- a/source/carla_settings.py
+++ b/source/carla_settings.py
@@ -284,7 +284,7 @@ class CarlaSettingsW(QDialog):
             if gCarla.isPlugin:
                 self.ui.lw_page.hideRow(self.TAB_INDEX_PATHS)
 
-        if WINDOWS:
+        if WINDOWS or MACOS:
             self.ui.group_main_theme.setEnabled(False)
             self.ui.ch_main_theme_pro.setChecked(False)
 
diff --git a/source/carla_skin.py b/source/carla_skin.py
index e8b34fec2..da5bec82e 100644
--- a/source/carla_skin.py
+++ b/source/carla_skin.py
@@ -445,6 +445,9 @@ class AbstractPluginSlot(QFrame):
     #------------------------------------------------------------------
 
     def drawOutline(self):
+        # FIXME - broken in Qt4
+        if MACOS: return
+
         painter = QPainter(self)
 
         if self.fIsSelected:
diff --git a/source/carla_style.py b/source/carla_style.py
index f2ef54e14..e1c0398ed 100644
--- a/source/carla_style.py
+++ b/source/carla_style.py
@@ -67,7 +67,7 @@ class CarlaApplication(object):
         settings    = QSettings("falkTX", appName)
         useProTheme = settings.value(CARLA_KEY_MAIN_USE_PRO_THEME, True, type=bool)
 
-        if WINDOWS or not useProTheme:
+        if WINDOWS or MACOS or not useProTheme:
             self._createApp(appName)
             return