diff --git a/bitmaps_png/CMakeLists.txt b/bitmaps_png/CMakeLists.txt
index 7275672cd8..0cb4b78f7a 100644
--- a/bitmaps_png/CMakeLists.txt
+++ b/bitmaps_png/CMakeLists.txt
@@ -365,7 +365,6 @@ set( BMAPS_MID
     pagelayout_special_view_mode
     part_properties
     paste
-    pcb_offset
     pin2pin
     pin_size_to
     pin_show_etype
@@ -432,6 +431,7 @@ set( BMAPS_MID
     sim_add_signal
     sim_settings
     search_tree
+    set_origin
     setcolor_3d_bg
     setcolor_silkscreen
     setcolor_soldermask
diff --git a/bitmaps_png/cpp_24/pcb_offset.cpp b/bitmaps_png/cpp_24/pcb_offset.cpp
deleted file mode 100644
index b6a95e4770..0000000000
--- a/bitmaps_png/cpp_24/pcb_offset.cpp
+++ /dev/null
@@ -1,51 +0,0 @@
-
-/* Do not modify this file, it was automatically generated by the
- * PNG2cpp CMake script, using a *.png file as input.
- */
-
-#include <bitmaps_png/bitmaps_list.h>
-
-static const unsigned char png[] = {
- 0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
- 0x00, 0x00, 0x00, 0x18, 0x00, 0x00, 0x00, 0x18, 0x08, 0x06, 0x00, 0x00, 0x00, 0xe0, 0x77, 0x3d,
- 0xf8, 0x00, 0x00, 0x02, 0x21, 0x49, 0x44, 0x41, 0x54, 0x48, 0xc7, 0xb5, 0x96, 0xcd, 0x4b, 0x1b,
- 0x41, 0x18, 0x87, 0x17, 0x73, 0xc8, 0xc2, 0x7e, 0xce, 0x24, 0xd9, 0x6c, 0x10, 0x05, 0x31, 0xe0,
- 0x49, 0x34, 0x82, 0x67, 0x89, 0x87, 0xa2, 0x60, 0xea, 0xc7, 0xc1, 0x42, 0xfb, 0x37, 0xd8, 0x43,
- 0x11, 0x85, 0x52, 0xc1, 0x1e, 0x5a, 0x45, 0x50, 0x0f, 0x7a, 0x53, 0xec, 0x41, 0xc1, 0xbb, 0x78,
- 0x10, 0xf4, 0xa4, 0x87, 0xfe, 0x01, 0xed, 0x46, 0x45, 0xf4, 0x22, 0x36, 0x46, 0x5b, 0xdb, 0xe0,
- 0x4d, 0x85, 0xed, 0x6f, 0x64, 0xb6, 0x5d, 0x97, 0x24, 0xbb, 0x1b, 0xcc, 0x0b, 0x0f, 0x61, 0xc3,
- 0xec, 0x3c, 0xef, 0xfb, 0xce, 0xee, 0xcc, 0x0a, 0xc2, 0xff, 0x68, 0x00, 0x9d, 0x42, 0x1d, 0xa3,
- 0x1f, 0xac, 0xd7, 0x53, 0x30, 0x0f, 0xf6, 0x01, 0xf5, 0x1b, 0x48, 0x29, 0x6d, 0x0a, 0x3b, 0xb9,
- 0x08, 0xf6, 0xc0, 0x01, 0x78, 0x55, 0x6d, 0xa0, 0xaa, 0xaa, 0x54, 0xd7, 0x75, 0xab, 0x96, 0xf6,
- 0x1c, 0x70, 0xd6, 0x2a, 0x0d, 0x52, 0x14, 0x25, 0x06, 0xc1, 0x6b, 0x70, 0xa1, 0x69, 0x5a, 0x2f,
- 0x4f, 0x2c, 0x50, 0x4c, 0x83, 0x19, 0xb0, 0x09, 0x96, 0x40, 0xda, 0x9b, 0x35, 0xf8, 0x62, 0x18,
- 0x6a, 0xb1, 0x37, 0x2b, 0x5b, 0x94, 0xea, 0x25, 0x42, 0xc8, 0x77, 0xfc, 0x57, 0x84, 0xe8, 0x3d,
- 0x86, 0x44, 0xfc, 0x04, 0x51, 0xd0, 0xce, 0x25, 0xce, 0xf5, 0x63, 0x48, 0x92, 0x94, 0xa4, 0x54,
- 0x3b, 0x1e, 0x7f, 0x27, 0xe6, 0x7f, 0x16, 0x05, 0xbb, 0x74, 0x23, 0xd8, 0x8d, 0x8d, 0xe4, 0x3c,
- 0x95, 0x4a, 0xd9, 0xa6, 0x69, 0x3e, 0x60, 0x3d, 0x98, 0x68, 0x2b, 0x88, 0xc4, 0x2d, 0xf8, 0x17,
- 0x84, 0x68, 0x3b, 0x9f, 0x3f, 0x45, 0x8f, 0xd9, 0xc4, 0x0e, 0x8e, 0xc0, 0x01, 0x92, 0x6f, 0xbc,
- 0x92, 0x70, 0x02, 0x64, 0xd6, 0x9d, 0x4e, 0xab, 0xa7, 0xee, 0xc9, 0xcb, 0x09, 0x50, 0xc9, 0x3d,
- 0x6b, 0x97, 0xbb, 0xf2, 0xa0, 0x82, 0xa9, 0xc9, 0x09, 0x31, 0xef, 0x27, 0x60, 0x60, 0x4d, 0x2c,
- 0x3c, 0x5d, 0xd9, 0x40, 0x02, 0x0c, 0xce, 0xa1, 0xe4, 0x53, 0x50, 0xea, 0xe8, 0x50, 0x6e, 0x5e,
- 0xe6, 0xe4, 0x4b, 0x87, 0xdc, 0x80, 0x7c, 0x65, 0x9a, 0xfa, 0x5d, 0x6b, 0x2b, 0xbd, 0x74, 0x13,
- 0x8b, 0x69, 0xb7, 0x7c, 0xd1, 0x8f, 0x70, 0x7f, 0xb3, 0x5f, 0x05, 0x11, 0x0c, 0x24, 0xb8, 0x61,
- 0x21, 0x1e, 0x8f, 0x9f, 0x78, 0xb3, 0x1d, 0x1a, 0x94, 0x2e, 0xbc, 0x55, 0x65, 0x7b, 0x64, 0x0b,
- 0xf7, 0x8c, 0xa2, 0x0a, 0x3d, 0x4c, 0x8b, 0xfa, 0x91, 0x4d, 0xde, 0x2b, 0x18, 0x1e, 0x92, 0xce,
- 0xdd, 0x93, 0x5f, 0x15, 0x04, 0x3b, 0x91, 0x78, 0xcc, 0x9e, 0x84, 0x7d, 0x8a, 0x22, 0x90, 0x58,
- 0x86, 0x61, 0x14, 0xaa, 0x09, 0xde, 0x8e, 0x89, 0x2c, 0xfb, 0x95, 0x9a, 0x1e, 0x53, 0x54, 0x9c,
- 0x81, 0xe4, 0x47, 0x32, 0x99, 0x2c, 0x78, 0x05, 0x7f, 0x7e, 0x09, 0xf6, 0xc7, 0xe9, 0xe8, 0x11,
- 0xde, 0x93, 0xc3, 0x6a, 0xad, 0xa9, 0x2a, 0x60, 0x81, 0xec, 0xba, 0x58, 0x25, 0xac, 0x5d, 0x6c,
- 0x4d, 0x32, 0x19, 0xe5, 0x9a, 0xbd, 0x78, 0x2d, 0x2d, 0xea, 0x19, 0x21, 0xfa, 0xb6, 0x2c, 0xcb,
- 0x89, 0x20, 0xdb, 0x45, 0x45, 0x81, 0xab, 0x5d, 0x7d, 0x60, 0x11, 0xc2, 0xdf, 0xf8, 0xfd, 0xc0,
- 0xc4, 0x61, 0x36, 0x3c, 0x3f, 0x81, 0xb3, 0xe1, 0xc5, 0x31, 0xf1, 0x61, 0x2d, 0xe7, 0x41, 0x20,
- 0x01, 0x3b, 0xf9, 0xd0, 0xee, 0xc1, 0x32, 0xdb, 0x7d, 0xdb, 0x73, 0x09, 0x2a, 0xc5, 0x32, 0x3f,
- 0x11, 0xdf, 0x80, 0x27, 0x6b, 0x32, 0xc3, 0x59, 0x05, 0x5f, 0x5d, 0xd7, 0x61, 0xd9, 0x74, 0x9d,
- 0x29, 0xec, 0x64, 0xdc, 0x00, 0x19, 0x27, 0x73, 0xc6, 0x08, 0x97, 0xb4, 0xd7, 0xc8, 0x2c, 0x9f,
- 0x7c, 0x17, 0xcc, 0x81, 0x17, 0xfc, 0x43, 0xe2, 0x59, 0x5a, 0xc4, 0xd6, 0x60, 0x8a, 0x4f, 0x2a,
- 0xd6, 0x6b, 0x0d, 0xca, 0xc6, 0x5f, 0xcb, 0x3e, 0xf0, 0xfb, 0xbd, 0xb3, 0xa0, 0xb3, 0x00, 0x00,
- 0x00, 0x00, 0x49, 0x45, 0x4e, 0x44, 0xae, 0x42, 0x60, 0x82,
-};
-
-const BITMAP_OPAQUE pcb_offset_xpm[1] = {{ png, sizeof( png ), "pcb_offset_xpm" }};
-
-//EOF
diff --git a/bitmaps_png/cpp_24/set_origin.cpp b/bitmaps_png/cpp_24/set_origin.cpp
new file mode 100644
index 0000000000..d047f1c565
--- /dev/null
+++ b/bitmaps_png/cpp_24/set_origin.cpp
@@ -0,0 +1,34 @@
+
+/* Do not modify this file, it was automatically generated by the
+ * PNG2cpp CMake script, using a *.png file as input.
+ */
+
+#include <bitmaps_png/bitmaps_list.h>
+
+static const unsigned char png[] = {
+ 0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
+ 0x00, 0x00, 0x00, 0x18, 0x00, 0x00, 0x00, 0x18, 0x08, 0x04, 0x00, 0x00, 0x00, 0x4a, 0x7e, 0xf5,
+ 0x73, 0x00, 0x00, 0x01, 0x09, 0x49, 0x44, 0x41, 0x54, 0x38, 0xcb, 0x63, 0x60, 0x20, 0x07, 0x84,
+ 0xfa, 0x91, 0xa4, 0xdc, 0x81, 0x25, 0xf8, 0x7e, 0x1a, 0x2b, 0xa6, 0xb8, 0x89, 0xa7, 0x89, 0x27,
+ 0x56, 0x0d, 0x41, 0x8e, 0x21, 0xff, 0x43, 0x1c, 0x30, 0xc5, 0x8d, 0xbf, 0x1b, 0x7f, 0xc7, 0xaa,
+ 0x21, 0xb8, 0x17, 0xa8, 0xa1, 0x07, 0x55, 0x6c, 0x3f, 0xcb, 0x6e, 0x1b, 0xe3, 0xff, 0xc6, 0xff,
+ 0x6b, 0x8b, 0x42, 0xd9, 0x30, 0x35, 0xdc, 0x04, 0x6a, 0xb8, 0x8d, 0x2c, 0xb2, 0xd3, 0x6a, 0xe7,
+ 0x95, 0x9d, 0xff, 0x41, 0x1a, 0x42, 0xfe, 0x27, 0xfc, 0xac, 0x49, 0xc5, 0xd0, 0x12, 0xf2, 0x1f,
+ 0x99, 0xb7, 0xdb, 0x62, 0xe7, 0xd7, 0x9d, 0xff, 0x61, 0x1a, 0x42, 0xfe, 0x87, 0xff, 0xaf, 0x4d,
+ 0xc1, 0xa3, 0xa1, 0x81, 0x69, 0xd7, 0x55, 0x90, 0x72, 0x84, 0x06, 0x90, 0x2d, 0x68, 0x81, 0x82,
+ 0xac, 0x61, 0x87, 0x23, 0x44, 0x39, 0xb2, 0x86, 0x90, 0xff, 0x55, 0x85, 0x58, 0x35, 0x98, 0x78,
+ 0x19, 0xff, 0x34, 0xfe, 0x8f, 0x03, 0xfe, 0x34, 0xf1, 0xa2, 0x5c, 0x03, 0x08, 0xd4, 0x95, 0xc3,
+ 0x9c, 0x01, 0x52, 0x06, 0x73, 0xde, 0x2e, 0x6b, 0x9c, 0x7e, 0xe8, 0xe3, 0x4c, 0xf8, 0x85, 0xa1,
+ 0xe1, 0xf2, 0x7e, 0x16, 0x3c, 0xc1, 0x5a, 0x97, 0x1d, 0x86, 0xaa, 0xe1, 0xcb, 0x6e, 0x0b, 0xbc,
+ 0xf1, 0xc0, 0xc0, 0xd0, 0x98, 0x99, 0xf8, 0x13, 0xae, 0xe1, 0xf2, 0x0e, 0x33, 0x02, 0x11, 0x07,
+ 0x8e, 0x0d, 0x8e, 0xba, 0x52, 0xb0, 0x06, 0xbb, 0xff, 0x8c, 0x58, 0x52, 0x13, 0xa6, 0x06, 0xbc,
+ 0x89, 0x0f, 0x97, 0x06, 0x9c, 0xc9, 0x1b, 0x97, 0x06, 0x3c, 0x80, 0xea, 0x1a, 0x42, 0xee, 0x86,
+ 0x4c, 0x0c, 0x76, 0x41, 0xca, 0x19, 0x21, 0xef, 0x43, 0xfe, 0x13, 0x01, 0xef, 0x06, 0xfb, 0x12,
+ 0xe9, 0x02, 0x60, 0x16, 0xeb, 0x09, 0x71, 0x70, 0x60, 0x21, 0xab, 0x84, 0x01, 0x00, 0x29, 0x03,
+ 0xe4, 0xb2, 0xd5, 0x4d, 0xcc, 0x8b, 0x00, 0x00, 0x00, 0x00, 0x49, 0x45, 0x4e, 0x44, 0xae, 0x42,
+ 0x60, 0x82,
+};
+
+const BITMAP_OPAQUE set_origin_xpm[1] = {{ png, sizeof( png ), "set_origin_xpm" }};
+
+//EOF
diff --git a/bitmaps_png/include/bitmaps_png/bitmaps_list.h b/bitmaps_png/include/bitmaps_png/bitmaps_list.h
index 56569be859..56e2529de2 100644
--- a/bitmaps_png/include/bitmaps_png/bitmaps_list.h
+++ b/bitmaps_png/include/bitmaps_png/bitmaps_list.h
@@ -359,7 +359,6 @@ EXTERN_BITMAP( paste_xpm )
 EXTERN_BITMAP( path_xpm )
 EXTERN_BITMAP( pcb_target_xpm )
 EXTERN_BITMAP( pcbnew_xpm )
-EXTERN_BITMAP( pcb_offset_xpm )
 EXTERN_BITMAP( pin2pin_xpm )
 EXTERN_BITMAP( pin_size_to_xpm )
 EXTERN_BITMAP( pin_show_etype_xpm )
@@ -458,6 +457,7 @@ EXTERN_BITMAP( select_layer_pair_xpm )
 EXTERN_BITMAP( select_w_layer_xpm )
 EXTERN_BITMAP( select_same_sheet_xpm )
 EXTERN_BITMAP( sheetset_xpm )
+EXTERN_BITMAP( set_origin_xpm )
 EXTERN_BITMAP( setcolor_3d_bg_xpm )
 EXTERN_BITMAP( setcolor_silkscreen_xpm )
 EXTERN_BITMAP( setcolor_soldermask_xpm )
diff --git a/bitmaps_png/sources/pcb_offset.svg b/bitmaps_png/sources/pcb_offset.svg
deleted file mode 100644
index dbb0cb0fe9..0000000000
--- a/bitmaps_png/sources/pcb_offset.svg
+++ /dev/null
@@ -1,83 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" height="26" width="26" version="1.1" id="svg2" inkscape:version="0.48.4 r9939" sodipodi:docname="pcb_offset.svg">
-   <metadata id="metadata22">
-      <rdf:RDF>
-         <cc:Work rdf:about="">
-            <dc:format>image/svg+xml</dc:format>
-            <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-            <dc:title />
-         </cc:Work>
-      </rdf:RDF>
-   </metadata>
-   <sodipodi:namedview pagecolor="#ffffff" bordercolor="#666666" borderopacity="1" objecttolerance="10" gridtolerance="10" guidetolerance="10" inkscape:pageopacity="0" inkscape:pageshadow="2" inkscape:window-width="1366" inkscape:window-height="744" id="namedview20" showgrid="true" inkscape:snap-to-guides="false" inkscape:snap-grids="true" inkscape:zoom="17.883066" inkscape:cx="13.073079" inkscape:cy="13.503474" inkscape:window-x="0" inkscape:window-y="24" inkscape:window-maximized="1" inkscape:current-layer="svg2" showguides="true" inkscape:guide-bbox="true">
-      <inkscape:grid type="xygrid" id="grid2999" empspacing="2" visible="true" enabled="true" snapvisiblegridlinesonly="true" spacingx="0.5px" spacingy="0.5px" />
-   </sodipodi:namedview>
-   <defs id="defs4">
-      <marker inkscape:stockid="Arrow2Mend" orient="auto" refY="0.0" refX="0.0" id="Arrow2Mend" style="overflow:visible;">
-         <path id="path3800" style="fill-rule:evenodd;stroke-width:0.62500000;stroke-linejoin:round;" d="M 8.7185878,4.0337352 L -2.2072895,0.016013256 L 8.7185884,-4.0017078 C 6.9730900,-1.6296469 6.9831476,1.6157441 8.7185878,4.0337352 z " transform="scale(0.6) rotate(180) translate(0,0)" />
-      </marker>
-      <marker inkscape:stockid="Arrow2Mstart" orient="auto" refY="0.0" refX="0.0" id="Arrow2Mstart" style="overflow:visible">
-         <path id="path3797" style="fill-rule:evenodd;stroke-width:0.62500000;stroke-linejoin:round" d="M 8.7185878,4.0337352 L -2.2072895,0.016013256 L 8.7185884,-4.0017078 C 6.9730900,-1.6296469 6.9831476,1.6157441 8.7185878,4.0337352 z " transform="scale(0.6) translate(0,0)" />
-      </marker>
-      <marker inkscape:stockid="TriangleInS" orient="auto" refY="0.0" refX="0.0" id="TriangleInS" style="overflow:visible">
-         <path id="path3912" d="M 5.77,0.0 L -2.88,5.0 L -2.88,-5.0 L 5.77,0.0 z " style="fill-rule:evenodd;stroke:#000000;stroke-width:1.0pt" transform="scale(-0.2)" />
-      </marker>
-      <marker inkscape:stockid="Arrow1Sstart" orient="auto" refY="0.0" refX="0.0" id="Arrow1Sstart" style="overflow:visible">
-         <path id="path3785" d="M 0.0,0.0 L 5.0,-5.0 L -12.5,0.0 L 5.0,5.0 L 0.0,0.0 z " style="fill-rule:evenodd;stroke:#000000;stroke-width:1.0pt" transform="scale(0.2) translate(6,0)" />
-      </marker>
-      <marker inkscape:stockid="Arrow1Mstart" orient="auto" refY="0.0" refX="0.0" id="Arrow1Mstart" style="overflow:visible">
-         <path id="path3779" d="M 0.0,0.0 L 5.0,-5.0 L -12.5,0.0 L 5.0,5.0 L 0.0,0.0 z " style="fill-rule:evenodd;stroke:#000000;stroke-width:1.0pt" transform="scale(0.4) translate(10,0)" />
-      </marker>
-      <marker id="d" refY="0" refX="0" overflow="visible" orient="auto" style="overflow:visible">
-         <path d="M 5.77,0 -2.88,5 V -5 l 8.65,5 z" transform="scale(0.4,0.4)" id="path7" inkscape:connector-curvature="0" style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt" />
-      </marker>
-      <marker id="c" refY="0" refX="0" overflow="visible" orient="auto" style="overflow:visible">
-         <path d="M 5.77,0 -2.88,5 V -5 l 8.65,5 z" transform="scale(-0.4,-0.4)" id="path10" inkscape:connector-curvature="0" style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt" />
-      </marker>
-      <mask id="o">
-         <rect style="fill:#ffffff;fill-rule:evenodd" height="26.091999" width="25.032" y="-3.7337" x="-4.6403999" id="rect13" />
-      </mask>
-      <mask id="p">
-         <rect style="fill:#ffffff;fill-rule:evenodd" height="26.091999" width="25.032" y="-3.7337" x="-4.6403999" id="rect16" />
-      </mask>
-      <mask id="i">
-         <rect style="fill:#ffffff;fill-rule:evenodd" height="26.091999" width="25.032" y="-3.7337" x="-4.6403999" id="rect7" />
-      </mask>
-      <mask id="n">
-         <rect style="fill:#ffffff;fill-rule:evenodd" height="26.091999" width="25.032" y="-3.7337" x="-4.6403999" id="rect10" />
-      </mask>
-      <mask id="j">
-         <rect style="fill:#ffffff;fill-rule:evenodd" height="26.091999" width="25.032" y="-3.7337" x="-4.6403999" id="rect19" />
-      </mask>
-      <mask id="m">
-         <rect style="fill:#ffffff;fill-rule:evenodd" height="26.091999" width="25.032" y="-3.7337" x="-4.6403999" id="rect22" />
-      </mask>
-      <mask id="k">
-         <rect style="fill:#ffffff;fill-rule:evenodd" height="26.091999" width="25.032" y="-3.7337" x="-4.6403999" id="rect25" />
-      </mask>
-      <mask id="l">
-         <rect style="fill:#ffffff;fill-rule:evenodd" height="26.091999" width="25.032" y="-3.7337" x="-4.6403999" id="rect28" />
-      </mask>
-   </defs>
-   <path style="opacity:0.765625;fill:#eaeaea;fill-opacity:1;stroke:#000000;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;marker-start:none;marker-end:url(#Arrow2Mend)" inkscape:connector-curvature="0" id="path14" d="m 0,22.5 24.5,0" sodipodi:nodetypes="cc" />
-   <path sodipodi:nodetypes="cc" d="M 3.5,1.5 3.5,26" id="path2999" inkscape:connector-curvature="0" style="opacity:0.765625;fill:#eaeaea;fill-opacity:1;stroke:#000000;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;marker-start:url(#Arrow2Mstart);marker-end:none" />
-   <text xml:space="preserve" style="font-size:40px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans" x="17.246231" y="16.505861" id="text4587" sodipodi:linespacing="125%">
-      <tspan sodipodi:role="line" id="tspan4589" />
-   </text>
-   <text style="font-size:46.98844528px;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#3e3e3e;font-family:Sans" xml:space="preserve" transform="scale(0.95509561,1.0470156)" line-height="125%" font-size="86.157px" y="18.624365" x="14.658218" id="text4591" sodipodi:linespacing="125%">
-      <tspan font-size="23.693px" y="18.624365" x="14.658218" font-weight="bold" id="tspan4593" style="font-size:13px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;fill:#3e3e3e;font-family:OpenSymbol;-inkscape-font-specification:OpenSymbol" />
-   </text>
-   <path inkscape:connector-curvature="0" id="path3787" d="m 22.5,11.5 -16,0" style="fill:none;stroke:#0f0f0f;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" sodipodi:nodetypes="cc" />
-   <path style="fill:none;stroke:#0f0f0f;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" d="m 14.5,3.5 0,16" id="path3017" inkscape:connector-curvature="0" sodipodi:nodetypes="cc" />
-   <path style="fill:#191919;fill-opacity:1;stroke:none" d="m 14.875006,11.124999 5.25,0 c 0,-2.6249962 -2.625,-5.2499962 -5.25,-5.2499962 z" id="path3791" inkscape:connector-curvature="0" sodipodi:nodetypes="cccc" />
-   <path style="fill:#f1ee00;fill-opacity:1;stroke:none" d="m 14.125006,11.124999 0,-5.2499962 c -2.625,0 -5.25,2.625 -5.25,5.2499962 z" id="path3799" inkscape:connector-curvature="0" sodipodi:nodetypes="cccc" />
-   <path sodipodi:nodetypes="cccc" inkscape:connector-curvature="0" id="path3803" d="m 14.875006,11.874999 0,5.25 c 2.625,0 5.25,-2.625 5.25,-5.25 z" style="fill:#f1ee00;fill-opacity:1;stroke:none" />
-   <path sodipodi:nodetypes="cccc" inkscape:connector-curvature="0" id="path3801" d="m 14.125006,11.874999 -5.25,0 c 0,2.625 2.625,5.25 5.25,5.25 z" style="fill:#191919;fill-opacity:1;stroke:none" />
-   <path transform="matrix(0.75,0,0,0.75,4.75,1.7500028)" sodipodi:type="arc" style="fill:none;stroke:#0f0f0f;stroke-width:1.33333337;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0" id="path3789" sodipodi:cx="13" sodipodi:cy="13" sodipodi:rx="8" sodipodi:ry="8" d="M 21,13 A 8,8 0 1 1 5,13 8,8 0 1 1 21,13 z" />
-</svg>
diff --git a/bitmaps_png/sources/set_origin.svg b/bitmaps_png/sources/set_origin.svg
index 0bff2dc528..3737130731 100755
--- a/bitmaps_png/sources/set_origin.svg
+++ b/bitmaps_png/sources/set_origin.svg
@@ -12,7 +12,7 @@
    viewBox="0 0 24 24"
    version="1.1"
    sodipodi:docname="set_origin.svg"
-   inkscape:version="1.0.1 (3bc2e813f5, 2020-09-07)">
+   inkscape:version="1.0.1 (c497b03c, 2020-09-10)">
   <sodipodi:namedview
      pagecolor="#ffffff"
      bordercolor="#666666"
@@ -22,15 +22,15 @@
      guidetolerance="10"
      inkscape:pageopacity="0"
      inkscape:pageshadow="2"
-     inkscape:window-width="1609"
-     inkscape:window-height="1286"
+     inkscape:window-width="1280"
+     inkscape:window-height="715"
      id="namedview30"
      showgrid="true"
-     inkscape:zoom="27.961538"
-     inkscape:cx="3.3259971"
-     inkscape:cy="13"
+     inkscape:zoom="27.519496"
+     inkscape:cx="14.844667"
+     inkscape:cy="13.834754"
      inkscape:window-x="0"
-     inkscape:window-y="37"
+     inkscape:window-y="23"
      inkscape:window-maximized="0"
      inkscape:document-rotation="0"
      inkscape:current-layer="Слой_1">
@@ -79,16 +79,19 @@
   </defs>
   <title
      id="title159753">set_origin</title>
-  <polyline
-     class="cls-1"
-     points="22 22.5 3.522 22.5 3.537 6.582"
+  <path
      id="polyline159755"
-     transform="translate(-1,-1)" />
-  <polygon
-     class="cls-2"
-     points="3.542,2.153 2.084,7.572 4.989,7.575 "
+     transform="translate(-1,-1)"
+     style="fill:none;stroke:#545454;stroke-linecap:round;stroke-linejoin:round"
+     d="M 21,22.5 H 3.5 V 6"
+     class="cls-1"
+     sodipodi:nodetypes="ccc" />
+  <path
      id="polygon159757"
-     transform="translate(-1,-1)" />
+     style="fill:#545454"
+     d="M 2.5,1 1,6 h 3 z"
+     class="cls-2"
+     sodipodi:nodetypes="cccc" />
   <line
      class="cls-1"
      x1="3.9768"
@@ -96,35 +99,37 @@
      x2="19.5471"
      y2="21.5"
      id="line159759" />
-  <polygon
-     class="cls-2"
-     points="24.977,22.5 19.556,21.047 19.556,23.953 "
+  <path
      id="polygon159761"
-     transform="translate(-1,-1)" />
+     style="fill:#545454"
+     d="M 23,21.5 18,20 v 3 z"
+     class="cls-2"
+     sodipodi:nodetypes="cccc" />
   <path
      class="cls-3"
-     d="M 9.9461,9.49 A 5.5254,5.5254 0 1 1 15.4715,15.0153 5.5254,5.5254 0 0 1 9.9461,9.49 Z"
-     id="path159763" />
+     d="M 8.5,10.0001 A 5.5,5.5 0 1 1 14,15.5 5.5,5.5 0 0 1 8.5,10.0001 Z"
+     id="path159763"
+     style="stroke-width:1" />
   <path
      class="cls-2"
-     d="M 20.9968,9.4976 A 5.5254,5.5254 0 0 0 15.4789,3.9648 L 15.4715,9.49 Z"
-     id="path159765" />
+     d="M 19.499995,10 A 5.5000946,5.4926439 0 0 0 14.007366,4.5 L 14,9.9924451 Z"
+     id="path159765"
+     style="stroke-width:1" />
   <path
      class="cls-2"
-     d="m 9.9462,9.4658 a 5.5253,5.5253 0 0 0 5.5008,5.55 l 0.0245,-5.5252 z"
-     id="path159767" />
-  <line
+     d="m 8.5000552,10 a 5.4999453,5.4755225 0 0 0 5.4755568,5.5 L 14,10.024577 Z"
+     id="path159767"
+     style="stroke-width:0.999995" />
+  <path
+     id="line159769"
+     style="fill:none;stroke:#333333;stroke-width:2px;stroke-linecap:round;stroke-linejoin:round"
+     d="m 14,3.5 v 13"
      class="cls-4"
-     x1="15.4802"
-     y1="2.9999001"
-     x2="15.4802"
-     y2="15.9804"
-     id="line159769" />
-  <line
+     sodipodi:nodetypes="cc" />
+  <path
+     id="line159771"
+     style="fill:none;stroke:#333333;stroke-width:2px;stroke-linecap:round;stroke-linejoin:round"
+     d="M 20.5,10 H 7.5"
      class="cls-4"
-     x1="21.9704"
-     y1="9.4902"
-     x2="8.9899998"
-     y2="9.4902"
-     id="line159771" />
+     sodipodi:nodetypes="cc" />
 </svg>
diff --git a/pcbnew/tools/pcb_actions.cpp b/pcbnew/tools/pcb_actions.cpp
index 60606b7257..ea4bb97fb3 100644
--- a/pcbnew/tools/pcb_actions.cpp
+++ b/pcbnew/tools/pcb_actions.cpp
@@ -635,7 +635,7 @@ TOOL_ACTION PCB_ACTIONS::drillOrigin( "pcbnew.EditorControl.drillOrigin",
         AS_GLOBAL, 0, "",
         _( "Drill/Place File Origin" ),
         _( "Place origin point for drill files and footprint position files" ),
-        pcb_offset_xpm, AF_ACTIVATE );
+        set_origin_xpm, AF_ACTIVATE );
 
 TOOL_ACTION PCB_ACTIONS::toggleLock( "pcbnew.EditorControl.toggleLock",
         AS_GLOBAL,