diff --git a/bitmaps_png/cursors/cursor-place-black.xpm b/bitmaps_png/cursors/cursor-place-black.xpm
new file mode 100644
index 0000000000..ed75d073db
--- /dev/null
+++ b/bitmaps_png/cursors/cursor-place-black.xpm
@@ -0,0 +1,39 @@
+/* XPM */
+static const char * cursor_place_black_xpm[] = {
+"32 32 4 1",
+" 	c None",
+".	c #FFFFFF",
+"+	c #000000",
+"@	c #008000",
+".                               ",
+"..                              ",
+".+.                             ",
+".++.                            ",
+".+++.                           ",
+".++++.                          ",
+".+++++.                         ",
+".++++++.                        ",
+".+++++++.                       ",
+".++++++++.                      ",
+".+++++++++.                     ",
+".++++++.....                    ",
+".++++++.                        ",
+".++..++.                        ",
+".+. .+++.                       ",
+"..   .++.                       ",
+".    .+++.                      ",
+"      .+.                       ",
+"      ..             ..         ",
+"                    .@@.        ",
+"                    .@@.        ",
+"                  ...@@...      ",
+"                 .@@@@@@@@.     ",
+"                 .@@@@@@@@.     ",
+"                  ...@@...      ",
+"                    .@@.        ",
+"                    .@@.        ",
+"                     ..         ",
+"                                ",
+"                                ",
+"                                ",
+"                                "};
diff --git a/bitmaps_png/cursors/cursor-select-m-black.xpm b/bitmaps_png/cursors/cursor-select-m-black.xpm
new file mode 100644
index 0000000000..8772bb1d11
--- /dev/null
+++ b/bitmaps_png/cursors/cursor-select-m-black.xpm
@@ -0,0 +1,38 @@
+/* XPM */
+static const char * cursor_select_m_black_xpm[] = {
+"32 32 3 1",
+" 	c None",
+".	c #FFFFFF",
+"+	c #000000",
+".                               ",
+"..                              ",
+".+.                             ",
+".++.                            ",
+".+++.                           ",
+".++++.                          ",
+".+++++.                         ",
+".++++++.                        ",
+".+++++++.                       ",
+".++++++++.                      ",
+".+++++++++.                     ",
+".++++++.....                    ",
+".++++++.                        ",
+".++..++.                        ",
+".+. .+++.                       ",
+"..   .++.                       ",
+".    .+++.           .          ",
+"      .+.           .+.         ",
+"      ..           .+++.        ",
+"                  .+++++.       ",
+"                 . ..+.. .      ",
+"                .+. .+. .+.     ",
+"               .++...+...++.    ",
+"              .+++++++++++++.   ",
+"               .++...+...++.    ",
+"                .+. .+. .+.     ",
+"                 . ..+.. .      ",
+"                  .+++++.       ",
+"                   .+++.        ",
+"                    .+.         ",
+"                     .          ",
+"                                "};
diff --git a/common/cursors.cpp b/common/cursors.cpp
index 6e50076c8e..bd07bc0fc9 100644
--- a/common/cursors.cpp
+++ b/common/cursors.cpp
@@ -37,9 +37,7 @@
 #include <cursors/cursor-line-wire-add.xpm>
 #include <cursors/cursor-measure.xpm>
 #include <cursors/cursor-pencil.xpm>
-#include <cursors/cursor-place.xpm>
 #include <cursors/cursor-select-lasso.xpm>
-#include <cursors/cursor-select-m.xpm>
 #include <cursors/cursor-select-window.xpm>
 #include <cursors/cursor-subtract.xpm>
 #include <cursors/cursor-text.xpm>
@@ -47,6 +45,15 @@
 #include <cursors/cursor-zoom.xpm>
 #include <cursors/cursor-zoom-out.xpm>
 
+// Under MSW, the standard cursor is white on black.  Elsewhere it is black on white
+#ifdef __WINDOWS__
+#include <cursors/cursor-place.xpm>
+#include <cursors/cursor-select-m.xpm>
+#else
+#include <cursors/cursor-place-black.xpm>
+#include <cursors/cursor-select-m-black.xpm>
+#endif
+
 #include <wx/bitmap.h>
 #include <wx/debug.h>
 
@@ -129,7 +136,11 @@ static const std::vector<CURSOR_STORE::CURSOR_DEF> standard_cursors = {
         KICURSOR::MOVING,
         nullptr,
         nullptr,
+#ifdef __WINDOWS__
         cursor_select_m_xpm,
+#else
+        cursor_select_m_black_xpm,
+#endif
         { 32, 32 },
         { 1, 1 },
     },
@@ -281,7 +292,11 @@ static const std::vector<CURSOR_STORE::CURSOR_DEF> standard_cursors = {
         KICURSOR::PLACE,
         nullptr,
         nullptr,
+#ifdef __WINDOWS__
         cursor_place_xpm,
+#else
+        cursor_place_black_xpm,
+#endif
         { 32, 32 },
         { 1, 1 },
     },
@@ -416,4 +431,4 @@ const wxStockCursor CURSOR_STORE::GetStockCursor( KICURSOR aCursorType )
     }
 
     return stockCursor;
-}
\ No newline at end of file
+}
diff --git a/include/cursors.h b/include/cursors.h
index dbe78374c8..38236821ca 100644
--- a/include/cursors.h
+++ b/include/cursors.h
@@ -120,4 +120,4 @@ private:
     std::map<KICURSOR, wxCursor> m_store;
 };
 
-#endif // CURSOR_STORE__H
\ No newline at end of file
+#endif // CURSOR_STORE__H