diff --git a/LiteEditor/quickfindbarbase.cpp b/LiteEditor/quickfindbarbase.cpp
index 98422ea94a..a5cd344108 100644
--- a/LiteEditor/quickfindbarbase.cpp
+++ b/LiteEditor/quickfindbarbase.cpp
@@ -254,18 +254,18 @@ clFindReplaceDialogBase::clFindReplaceDialogBase(
 
     flexGridSizer107->Add(m_textCtrlFind, 0, wxALL | wxEXPAND | wxALIGN_CENTER_VERTICAL, WXC_FROM_DIP(2));
 
-    m_buttonFind = new clThemedButton(
-        m_mainPanel, wxID_FIND, _("Find"), wxDefaultPosition, wxDLG_UNIT(m_mainPanel, wxSize(-1, -1)), 0);
+    m_buttonFind =
+        new wxButton(m_mainPanel, wxID_FIND, _("Find"), wxDefaultPosition, wxDLG_UNIT(m_mainPanel, wxSize(-1, -1)), 0);
     m_buttonFind->SetDefault();
 
     flexGridSizer107->Add(m_buttonFind, 0, wxALL | wxEXPAND, WXC_FROM_DIP(2));
 
-    m_buttonFindPrev = new clThemedButton(
+    m_buttonFindPrev = new wxButton(
         m_mainPanel, wxID_BACKWARD, _("Find Prev"), wxDefaultPosition, wxDLG_UNIT(m_mainPanel, wxSize(-1, -1)), 0);
 
     flexGridSizer107->Add(m_buttonFindPrev, 0, wxALL | wxEXPAND, WXC_FROM_DIP(2));
 
-    m_buttonFindAll = new clThemedButton(
+    m_buttonFindAll = new wxButton(
         m_mainPanel, wxID_FIND_ALL, _("Find All"), wxDefaultPosition, wxDLG_UNIT(m_mainPanel, wxSize(-1, -1)), 0);
 
     flexGridSizer107->Add(m_buttonFindAll, 0, wxALL | wxEXPAND, WXC_FROM_DIP(2));
@@ -278,12 +278,12 @@ clFindReplaceDialogBase::clFindReplaceDialogBase(
 
     flexGridSizer107->Add(m_textCtrlReplace, 0, wxALL | wxEXPAND | wxALIGN_CENTER_VERTICAL, WXC_FROM_DIP(2));
 
-    m_buttonReplace = new clThemedButton(
+    m_buttonReplace = new wxButton(
         m_mainPanel, wxID_REPLACE, _("Replace"), wxDefaultPosition, wxDLG_UNIT(m_mainPanel, wxSize(-1, -1)), 0);
 
     flexGridSizer107->Add(m_buttonReplace, 0, wxALL | wxEXPAND, WXC_FROM_DIP(2));
 
-    m_buttonReplaceAll = new clThemedButton(
+    m_buttonReplaceAll = new wxButton(
         m_mainPanel, wxID_REPLACE_ALL, _("Replace All"), wxDefaultPosition, wxDLG_UNIT(m_mainPanel, wxSize(-1, -1)), 0);
 
     flexGridSizer107->Add(m_buttonReplaceAll, 0, wxALL | wxEXPAND, WXC_FROM_DIP(2));
diff --git a/LiteEditor/quickfindbarbase.h b/LiteEditor/quickfindbarbase.h
index c758f95218..b1ef35c96b 100644
--- a/LiteEditor/quickfindbarbase.h
+++ b/LiteEditor/quickfindbarbase.h
@@ -27,7 +27,6 @@
 #include <wx/textctrl.h>
 #include "clThemedTextCtrl.hpp"
 #include <wx/button.h>
-#include "clThemedButton.h"
 #if wxVERSION_NUMBER >= 2900
 #include <wx/persist.h>
 #include <wx/persist/toplevel.h>
@@ -107,12 +106,12 @@ class clFindReplaceDialogBase : public wxDialog
     clToolBar* m_toolbar;
     wxPanel* m_mainPanel;
     clThemedTextCtrl* m_textCtrlFind;
-    clThemedButton* m_buttonFind;
-    clThemedButton* m_buttonFindPrev;
-    clThemedButton* m_buttonFindAll;
+    wxButton* m_buttonFind;
+    wxButton* m_buttonFindPrev;
+    wxButton* m_buttonFindAll;
     clThemedTextCtrl* m_textCtrlReplace;
-    clThemedButton* m_buttonReplace;
-    clThemedButton* m_buttonReplaceAll;
+    wxButton* m_buttonReplace;
+    wxButton* m_buttonReplaceAll;
 
 protected:
     virtual void OnEnter(wxCommandEvent& event) { event.Skip(); }
@@ -136,12 +135,12 @@ class clFindReplaceDialogBase : public wxDialog
 public:
     clToolBar* GetToolbar() { return m_toolbar; }
     clThemedTextCtrl* GetTextCtrlFind() { return m_textCtrlFind; }
-    clThemedButton* GetButtonFind() { return m_buttonFind; }
-    clThemedButton* GetButtonFindPrev() { return m_buttonFindPrev; }
-    clThemedButton* GetButtonFindAll() { return m_buttonFindAll; }
+    wxButton* GetButtonFind() { return m_buttonFind; }
+    wxButton* GetButtonFindPrev() { return m_buttonFindPrev; }
+    wxButton* GetButtonFindAll() { return m_buttonFindAll; }
     clThemedTextCtrl* GetTextCtrlReplace() { return m_textCtrlReplace; }
-    clThemedButton* GetButtonReplace() { return m_buttonReplace; }
-    clThemedButton* GetButtonReplaceAll() { return m_buttonReplaceAll; }
+    wxButton* GetButtonReplace() { return m_buttonReplace; }
+    wxButton* GetButtonReplaceAll() { return m_buttonReplaceAll; }
     wxPanel* GetMainPanel() { return m_mainPanel; }
     clFindReplaceDialogBase(wxWindow* parent,
                             wxWindowID id = wxID_ANY,
diff --git a/LiteEditor/quickfindbarbase.wxcp b/LiteEditor/quickfindbarbase.wxcp
index 3484fa94f2..0b88b65f43 100644
--- a/LiteEditor/quickfindbarbase.wxcp
+++ b/LiteEditor/quickfindbarbase.wxcp
@@ -1306,11 +1306,11 @@
 														}, {
 															"type":	"string",
 															"m_label":	"Class Name:",
-															"m_value":	"clThemedButton"
+															"m_value":	""
 														}, {
 															"type":	"string",
 															"m_label":	"Include File:",
-															"m_value":	"clThemedButton.h"
+															"m_value":	""
 														}, {
 															"type":	"string",
 															"m_label":	"Style:",
@@ -1412,11 +1412,11 @@
 														}, {
 															"type":	"string",
 															"m_label":	"Class Name:",
-															"m_value":	"clThemedButton"
+															"m_value":	""
 														}, {
 															"type":	"string",
 															"m_label":	"Include File:",
-															"m_value":	"clThemedButton.h"
+															"m_value":	""
 														}, {
 															"type":	"string",
 															"m_label":	"Style:",
@@ -1518,11 +1518,11 @@
 														}, {
 															"type":	"string",
 															"m_label":	"Class Name:",
-															"m_value":	"clThemedButton"
+															"m_value":	""
 														}, {
 															"type":	"string",
 															"m_label":	"Include File:",
-															"m_value":	"clThemedButton.h"
+															"m_value":	""
 														}, {
 															"type":	"string",
 															"m_label":	"Style:",
@@ -1739,11 +1739,11 @@
 														}, {
 															"type":	"string",
 															"m_label":	"Class Name:",
-															"m_value":	"clThemedButton"
+															"m_value":	""
 														}, {
 															"type":	"string",
 															"m_label":	"Include File:",
-															"m_value":	"clThemedButton.h"
+															"m_value":	""
 														}, {
 															"type":	"string",
 															"m_label":	"Style:",
@@ -1845,11 +1845,11 @@
 														}, {
 															"type":	"string",
 															"m_label":	"Class Name:",
-															"m_value":	"clThemedButton"
+															"m_value":	""
 														}, {
 															"type":	"string",
 															"m_label":	"Include File:",
-															"m_value":	"clThemedButton.h"
+															"m_value":	""
 														}, {
 															"type":	"string",
 															"m_label":	"Style:",
diff --git a/Plugin/wxCustomControlsMacOS.hpp b/Plugin/wxCustomControlsMacOS.hpp
index 00a3f87e72..881b0c0e31 100644
--- a/Plugin/wxCustomControlsMacOS.hpp
+++ b/Plugin/wxCustomControlsMacOS.hpp
@@ -1,5 +1,5 @@
 #define wxUSE_NATIVE_CHOICE 1
-#define wxUSE_NATIVE_BUTTON 1
+#define wxUSE_NATIVE_BUTTON 0
 #define wxUSE_NATIVE_SCROLLBAR 1
 #define wxUSE_NATIVE_MENUBAR 1
 #define wxUSE_NATIVE_CAPTION 1