diff --git a/src/state.hpp b/src/state.hpp
index 2a3d27e..05fc11c 100644
--- a/src/state.hpp
+++ b/src/state.hpp
@@ -2,6 +2,7 @@
 #define STATE_H
 
 #include <string>
+#include <cstdint>
 
 enum class DeviceMode
 {
diff --git a/src/wx/DfuPanel.cpp b/src/wx/DfuPanel.cpp
index 89eea93..cc37ac9 100644
--- a/src/wx/DfuPanel.cpp
+++ b/src/wx/DfuPanel.cpp
@@ -28,12 +28,6 @@
 
 #include <libirecovery.h>
 
-static const wxColour kActive =
-    wxSystemSettings::GetColour(wxSYS_COLOUR_HIGHLIGHTTEXT);
-
-static const wxColour kInactive =
-    wxSystemSettings::GetColour(wxSYS_COLOUR_GRAYTEXT);
-
 DfuPanel::DfuPanel(MainFrame* frame, wxWindow* parent)
     : DevicePanel(frame, parent)
 {
@@ -135,6 +129,12 @@ void DfuPanel::SetDeviceState(const DeviceState& state)
 
 void DfuPanel::LoadDevice(const std::string& productType)
 {
+    const wxColour kActive =
+        wxSystemSettings::GetColour(wxSYS_COLOUR_HIGHLIGHTTEXT);
+
+    const wxColour kInactive =
+        wxSystemSettings::GetColour(wxSYS_COLOUR_GRAYTEXT);
+
     m_sequence = ParseSequence(productType);
     m_index = 0;
 
@@ -284,6 +284,12 @@ void DfuPanel::RunStep()
     if (m_sequence.steps.empty())
         return;
 
+    const wxColour kActive =
+        wxSystemSettings::GetColour(wxSYS_COLOUR_HIGHLIGHTTEXT);
+
+    const wxColour kInactive =
+        wxSystemSettings::GetColour(wxSYS_COLOUR_GRAYTEXT);
+
     if (m_index >= m_sequence.steps.size())
     {
         for (auto* lbl : m_stepLabels)
diff --git a/src/wx/MainPanel.cpp b/src/wx/MainPanel.cpp
index a25acdf..f465c74 100644
--- a/src/wx/MainPanel.cpp
+++ b/src/wx/MainPanel.cpp
@@ -58,7 +58,7 @@ MainPanel::MainPanel(MainFrame* frame, wxWindow* parent)
         "Thanks to: itsnebulalol, llsc12, lrdsnow, nikias (libimobiledevice), Checkra1n\n"
         "(Siguza, axi0mx, littlelailo et al.), Procursus (Hayden Seay, Cameron Katri,\n"
         "Keto et al.)\n\n"
-        "With 💖 from C (claration)");
+        "With <3 from C (claration)");
 
     root->Add(credtext, 0, wxLEFT | wxRIGHT, 10);
 
@@ -70,7 +70,11 @@ MainPanel::MainPanel(MainFrame* frame, wxWindow* parent)
         "wrong. Use at your own risk.");
 
     wxFont notefont = wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT);
+    #ifdef __APPLE__
     notefont.SetPointSize(12);
+    #else
+    notefont.SetPointSize(9);
+    #endif
     notefont.SetStyle(wxFONTSTYLE_ITALIC);
     notetext->SetFont(notefont);
 
@@ -101,8 +105,8 @@ MainPanel::MainPanel(MainFrame* frame, wxWindow* parent)
 
     auto* bottomRow = new wxBoxSizer(wxHORIZONTAL);
     bottomRow->AddStretchSpacer();
-    bottomRow->Add(btn, 0, wxALL, 10);
-    bottomRow->Add(m_startButton, 0, wxALL, 10);
+    bottomRow->Add(btn, 0, wxRIGHT | wxBOTTOM, 10);
+    bottomRow->Add(m_startButton, 0, wxRIGHT | wxLEFT | wxBOTTOM, 10);
 
     root->Add(bottomRow, 0, wxEXPAND);