diff --git a/configure.ac b/configure.ac
index 5a80c6b..fe95c88 100644
--- a/configure.ac
+++ b/configure.ac
@@ -51,7 +51,7 @@ PKG_CHECK_MODULES(AVCODEC, [libavcodec >= 59.37.100])
 PKG_CHECK_MODULES(AVUTIL, [libavutil >= 57.28.100])
 
 AM_OPTIONS_WXCONFIG
-reqwx=3.0.0
+reqwx=3.1.7
 AM_PATH_WXCONFIG($reqwx, wx=1)
 if test "$wx" != 1; then
 	AC_MSG_ERROR([
diff --git a/dist/osx/Info.plist.in b/dist/osx/Info.plist.in
index 6bb1018..eecc396 100644
--- a/dist/osx/Info.plist.in
+++ b/dist/osx/Info.plist.in
@@ -23,11 +23,11 @@
     <key>CFBundleVersion</key>
     <string>@VERSION@</string>
     <key>NSPrincipalClass</key>
-    <string>NSApplication</string>
+    <string>wxNSApplication</string>
     <key>NSHumanReadableCopyright</key>
     <string>Copyright (c) 2010-2013 Alexander Kojevnikov and contributors</string>
     <key>LSMinimumSystemVersion</key>
-    <string>10.5</string>
+    <string>10.15</string>
     <key>CFBundleDocumentTypes</key>
     <array>
         <dict>
diff --git a/dist/win/spek.ico b/dist/win/spek.ico
index 80d5757..031a1a1 100644
Binary files a/dist/win/spek.ico and b/dist/win/spek.ico differ
diff --git a/dist/win/spek.rc b/dist/win/spek.rc
index 5e9cb1e..59b3292 100644
--- a/dist/win/spek.rc
+++ b/dist/win/spek.rc
@@ -1,3 +1,4 @@
+#define wxUSE_DPI_AWARE_MANIFEST 2
 #include <wx/msw/wx.rc>
 
 aaaa ICON "spek.ico"
diff --git a/src/spek-artwork.cc b/src/spek-artwork.cc
index cd7e78c..23875f0 100644
--- a/src/spek-artwork.cc
+++ b/src/spek-artwork.cc
@@ -77,6 +77,10 @@ wxIconBundle SpekArtProvider::CreateIconBundle(const wxArtID& id, const wxArtCli
         bundle.AddIcon(wxIcon("aaaa", wxBITMAP_TYPE_ICO_RESOURCE, 24, 24));
         bundle.AddIcon(wxIcon("aaaa", wxBITMAP_TYPE_ICO_RESOURCE, 32, 32));
         bundle.AddIcon(wxIcon("aaaa", wxBITMAP_TYPE_ICO_RESOURCE, 48, 48));
+        bundle.AddIcon(wxIcon("aaaa", wxBITMAP_TYPE_ICO_RESOURCE, 64, 64));
+        bundle.AddIcon(wxIcon("aaaa", wxBITMAP_TYPE_ICO_RESOURCE, 96, 96));
+        bundle.AddIcon(wxIcon("aaaa", wxBITMAP_TYPE_ICO_RESOURCE, 128, 128));
+        bundle.AddIcon(wxIcon("aaaa", wxBITMAP_TYPE_ICO_RESOURCE, 256, 256));
         return bundle;
     }
 #endif
diff --git a/src/spek-spectrogram.cc b/src/spek-spectrogram.cc
index de27beb..9d025dc 100644
--- a/src/spek-spectrogram.cc
+++ b/src/spek-spectrogram.cc
@@ -27,12 +27,6 @@ enum
     FFT_BITS = 11,
     MIN_FFT_BITS = 8,
     MAX_FFT_BITS = 14,
-    LPAD = 60,
-    TPAD = 60,
-    RPAD = 90,
-    BPAD = 40,
-    GAP = 10,
-    RULER = 10,
 };
 
 // Forward declarations.
@@ -60,7 +54,13 @@ SpekSpectrogram::SpekSpectrogram(wxFrame *parent) :
     prev_width(-1),
     fft_bits(FFT_BITS),
     urange(URANGE),
-    lrange(LRANGE)
+    lrange(LRANGE),
+    LPAD(this->FromDIP(60)),
+    TPAD(this->FromDIP(60)),
+    RPAD(this->FromDIP(90)),
+    BPAD(this->FromDIP(40)),
+    GAP(this->FromDIP(10)),
+    RULER(this->FromDIP(10))
 {
     this->create_palette();
 
diff --git a/src/spek-spectrogram.h b/src/spek-spectrogram.h
index 7e6b38c..a657fbd 100644
--- a/src/spek-spectrogram.h
+++ b/src/spek-spectrogram.h
@@ -51,6 +51,12 @@ private:
     int fft_bits;
     int urange;
     int lrange;
+    const int LPAD;
+    const int TPAD;
+    const int RPAD;
+    const int BPAD;
+    const int GAP;
+    const int RULER;
 
     DECLARE_EVENT_TABLE()
 };
diff --git a/src/spek-window.cc b/src/spek-window.cc
index 918bf57..86d360c 100644
--- a/src/spek-window.cc
+++ b/src/spek-window.cc
@@ -52,10 +52,11 @@ private:
 };
 
 SpekWindow::SpekWindow(const wxString& path) :
-    wxFrame(NULL, -1, wxEmptyString, wxDefaultPosition, wxSize(640, 480)), path(path)
+    wxFrame(NULL, -1, wxEmptyString, wxDefaultPosition, wxDefaultSize), path(path)
 {
     this->description = _("Spek - Acoustic Spectrum Analyser");
     SetTitle(this->description);
+    SetSize(this->FromDIP(wxSize(640, 480)));
 
 #ifndef OS_OSX
     SetIcons(wxArtProvider::GetIconBundle(ART_SPEK, wxART_FRAME_ICON));