diff --git a/src/dialog_colorpicker.cpp b/src/dialog_colorpicker.cpp
index 2f0a03479..4266eb83d 100644
--- a/src/dialog_colorpicker.cpp
+++ b/src/dialog_colorpicker.cpp
@@ -89,13 +89,19 @@ class ColorPickerSpectrum final : public wxControl {
 	void OnPaint(wxPaintEvent &evt) {
 		if (!background) return;
 
+#if wxCHECK_VERSION(3, 1, 0)
+		int height = FromDIP(background->GetHeight());
+		int width = FromDIP(background->GetWidth());
+#else
 		int height = background->GetHeight();
 		int width = background->GetWidth();
+#endif
 		wxPaintDC dc(this);
 
 		wxMemoryDC memdc;
 		memdc.SelectObject(*background);
-		dc.Blit(1, 1, width, height, &memdc, 0, 0);
+		wxSize size = memdc.GetSize();
+		dc.StretchBlit(1, 1, width, height, &memdc, 0, 0, size.GetWidth(), size.GetHeight());
 
 		wxPoint arrow[3];
 		wxRect arrow_box;
@@ -105,19 +111,27 @@ class ColorPickerSpectrum final : public wxControl {
 		dc.SetLogicalFunction(wxXOR);
 		dc.SetPen(invpen);
 
+#if wxCHECK_VERSION(3, 1, 0)
+		// These are Logical Coordinates of the selected point
+		int xx = FromDIP(x);
+		int yy = FromDIP(y);
+#else
+		int xx = x, yy = y;
+#endif
+
 		switch (direction) {
 			case PickerDirection::HorzVert:
 				// Make a little cross
-				dc.DrawLine(x-4, y+1, x+7, y+1);
-				dc.DrawLine(x+1, y-4, x+1, y+7);
+				dc.DrawLine(xx-4, yy+1, xx+7, yy+1);
+				dc.DrawLine(xx+1, yy-4, xx+1, yy+7);
 				break;
 			case PickerDirection::Horz:
 				// Make a vertical line stretching all the way across
-				dc.DrawLine(x+1, 1, x+1, height+1);
+				dc.DrawLine(xx+1, 1, xx+1, height+1);
 				// Points for arrow
-				arrow[0] = wxPoint(x+1, height+2);
-				arrow[1] = wxPoint(x+1-spectrum_horz_vert_arrow_size, height+2+spectrum_horz_vert_arrow_size);
-				arrow[2] = wxPoint(x+1+spectrum_horz_vert_arrow_size, height+2+spectrum_horz_vert_arrow_size);
+				arrow[0] = wxPoint(xx+1, height+2);
+				arrow[1] = wxPoint(xx+1-spectrum_horz_vert_arrow_size, height+2+spectrum_horz_vert_arrow_size);
+				arrow[2] = wxPoint(xx+1+spectrum_horz_vert_arrow_size, height+2+spectrum_horz_vert_arrow_size);
 
 				arrow_box.SetLeft(0);
 				arrow_box.SetTop(height + 2);
@@ -126,11 +140,11 @@ class ColorPickerSpectrum final : public wxControl {
 				break;
 			case PickerDirection::Vert:
 				// Make a horizontal line stretching all the way across
-				dc.DrawLine(1, y+1, width+1, y+1);
+				dc.DrawLine(1, yy+1, width+1, yy+1);
 				// Points for arrow
-				arrow[0] = wxPoint(width+2, y+1);
-				arrow[1] = wxPoint(width+2+spectrum_horz_vert_arrow_size, y+1-spectrum_horz_vert_arrow_size);
-				arrow[2] = wxPoint(width+2+spectrum_horz_vert_arrow_size, y+1+spectrum_horz_vert_arrow_size);
+				arrow[0] = wxPoint(width+2, yy+1);
+				arrow[1] = wxPoint(width+2+spectrum_horz_vert_arrow_size, yy+1-spectrum_horz_vert_arrow_size);
+				arrow[2] = wxPoint(width+2+spectrum_horz_vert_arrow_size, yy+1+spectrum_horz_vert_arrow_size);
 
 				arrow_box.SetLeft(width + 2);
 				arrow_box.SetTop(0);
@@ -159,7 +173,7 @@ class ColorPickerSpectrum final : public wxControl {
 		dc.SetLogicalFunction(wxCOPY);
 		dc.SetPen(blkpen);
 		dc.SetBrush(*wxTRANSPARENT_BRUSH);
-		dc.DrawRectangle(0, 0, background->GetWidth()+2, background->GetHeight()+2);
+		dc.DrawRectangle(0, 0, width + 2, height + 2);
 	}
 
 	void OnMouse(wxMouseEvent &evt) {
@@ -182,7 +196,11 @@ class ColorPickerSpectrum final : public wxControl {
 			// Adjust for the 1px black border around the control
 			int newx = mid(0, evt.GetX() - 1, GetClientSize().x - 3);
 			int newy = mid(0, evt.GetY() - 1, GetClientSize().y - 3);
+#if wxCHECK_VERSION(3, 1, 0)
+			SetXY(ToDIP(newx), ToDIP(newy));
+#else
 			SetXY(newx, newy);
+#endif
 			wxCommandEvent evt2(EVT_SPECTRUM_CHANGE, GetId());
 			AddPendingEvent(evt2);
 		}
@@ -268,9 +286,7 @@ class ColorPickerRecent final : public wxStaticBitmap {
 	}
 
 	void UpdateBitmap() {
-		wxSize sz = GetClientSize();
-
-		wxBitmap background(sz.x, sz.y);
+		wxBitmap background(cols * cellsize, rows * cellsize);
 		wxMemoryDC dc(background);
 
 		dc.SetPen(*wxTRANSPARENT_PEN);
@@ -307,7 +323,11 @@ class ColorPickerRecent final : public wxStaticBitmap {
 	, cellsize(cellsize)
 	{
 		colors.resize(rows * cols);
-		SetClientSize(cols*cellsize, rows*cellsize);
+#if wxCHECK_VERSION(3, 1, 0)
+		SetClientSize(cols * FromDIP(cellsize), rows * FromDIP(cellsize));
+#else
+		SetClientSize(cols * cellsize, rows * cellsize);
+#endif
 		SetMinSize(GetSize());
 		SetMaxSize(GetSize());
 		SetCursor(*wxCROSS_CURSOR);
@@ -570,9 +590,15 @@ DialogColorPicker::DialogColorPicker(wxWindow *parent, agi::Color initial_color,
 
 	// Create the controls for the dialog
 	wxSizer *spectrum_box = new wxStaticBoxSizer(wxVERTICAL, this, _("Color spectrum"));
+#if wxCHECK_VERSION(3, 1, 0)
+	spectrum = new ColorPickerSpectrum(this, PickerDirection::HorzVert, FromDIP(wxSize(256, 256)));
+	slider = new ColorPickerSpectrum(this, PickerDirection::Vert, FromDIP(wxSize(slider_width, 256)));
+	alpha_slider = new ColorPickerSpectrum(this, PickerDirection::Vert, FromDIP(wxSize(slider_width, 256)));
+#else
 	spectrum = new ColorPickerSpectrum(this, PickerDirection::HorzVert, wxSize(256, 256));
 	slider = new ColorPickerSpectrum(this, PickerDirection::Vert, wxSize(slider_width, 256));
 	alpha_slider = new ColorPickerSpectrum(this, PickerDirection::Vert, wxSize(slider_width, 256));
+#endif
 	wxString modes[] = { _("RGB/R"), _("RGB/G"), _("RGB/B"), _("HSL/L"), _("HSV/H") };
 	colorspace_choice = new wxChoice(this, -1, wxDefaultPosition, wxDefaultSize, 5, modes);
 
@@ -601,7 +627,11 @@ DialogColorPicker::DialogColorPicker(wxWindow *parent, agi::Color initial_color,
 	for (auto& elem : hsv_input)
 		elem = new wxSpinCtrl(this, -1, "", wxDefaultPosition, colorinput_size, wxSP_ARROW_KEYS, 0, 255);
 
+#if wxCHECK_VERSION(3, 1, 0)
+	preview_box = new wxStaticBitmap(this, -1, wxBitmap(40, 40, 24), wxDefaultPosition, FromDIP(wxSize(40, 40)), STATIC_BORDER_FLAG);
+#else
 	preview_box = new wxStaticBitmap(this, -1, wxBitmap(40, 40, 24), wxDefaultPosition, wxSize(40, 40), STATIC_BORDER_FLAG);
+#endif
 	recent_box = new ColorPickerRecent(this, 8, 4, 16);
 
 #if wxCHECK_VERSION(3, 1, 6)
@@ -617,7 +647,11 @@ DialogColorPicker::DialogColorPicker(wxWindow *parent, agi::Color initial_color,
 #else
 	screen_dropper_icon = new wxStaticBitmap(this, -1, eyedropper_bitmap, wxDefaultPosition, wxDefaultSize, wxRAISED_BORDER);
 #endif
+#if wxCHECK_VERSION(3, 1, 0)
+	screen_dropper = new ColorPickerScreenDropper(this, 7, 7, FromDIP(8));
+#else
 	screen_dropper = new ColorPickerScreenDropper(this, 7, 7, 8);
+#endif
 
 	// Arrange the controls in a nice way
 	wxSizer *spectop_sizer = new wxBoxSizer(wxHORIZONTAL);
@@ -896,9 +930,8 @@ void DialogColorPicker::UpdateSpectrumDisplay() {
 	{
 		wxMemoryDC previewdc;
 		previewdc.SelectObject(tempBmp);
-		previewdc.SetPen(*wxTRANSPARENT_PEN);
-		previewdc.SetBrush(wxBrush(to_wx(cur_color)));
-		previewdc.DrawRectangle(0, 0, 40, 40);
+		previewdc.SetBackground(wxBrush(to_wx(cur_color)));
+		previewdc.Clear();
 	}
 	preview_box->SetBitmap(tempBmp);