From f9df98058549b938e2b93d8a60e66e9701a1ad35 Mon Sep 17 00:00:00 2001
From: Alx Sa <cmyk.student@gmail.com>
Date: Fri, 2 Aug 2024 00:01:55 +0000
Subject: [PATCH] plug-ins: Convert custom ImageMap icons to vectors

Adds SVG versions of ImageMap custom
icons and conditionally uses them if
have_vector_icons is enabled. If not, we
fall back to the original PNG icons.
Since ImageMap mixes custom and
stock icons, this keeps the icon size
consistent across the UI.

Per Denis Rangelov, tooltips for the
coordinates and area displays as well
as the shortcut menu were added.

Also, removes a reference to IMAP_ARROW
which no longer applies since that icon
was removed in favor of using the stock
cursor icon.
---
 plug-ins/imagemap/images/imagemap-circle.svg  |  69 +++++++++
 plug-ins/imagemap/images/imagemap-coord.svg   |  56 ++++++++
 .../imagemap/images/imagemap-dimension.svg    | 131 ++++++++++++++++++
 ...imagemap-icon-legacy-images.gresource.xml} |   0
 ...magemap-icon-scalable-images.gresource.xml |  13 ++
 plug-ins/imagemap/images/imagemap-java.svg    |  93 +++++++++++++
 plug-ins/imagemap/images/imagemap-polygon.svg |  42 ++++++
 .../imagemap/images/imagemap-rectangle.svg    |  48 +++++++
 plug-ins/imagemap/images/imagemap-to-back.svg |  36 +++++
 .../imagemap/images/imagemap-to-front.svg     |  60 ++++++++
 plug-ins/imagemap/images/meson.build          |  26 ++--
 plug-ins/imagemap/imap_icons.h                |   1 -
 plug-ins/imagemap/imap_preview.c              |   3 +
 plug-ins/imagemap/imap_statusbar.c            |   8 +-
 14 files changed, 574 insertions(+), 12 deletions(-)
 create mode 100644 plug-ins/imagemap/images/imagemap-circle.svg
 create mode 100644 plug-ins/imagemap/images/imagemap-coord.svg
 create mode 100644 plug-ins/imagemap/images/imagemap-dimension.svg
 rename plug-ins/imagemap/images/{imagemap-icon-images.gresource.xml => imagemap-icon-legacy-images.gresource.xml} (100%)
 create mode 100644 plug-ins/imagemap/images/imagemap-icon-scalable-images.gresource.xml
 create mode 100644 plug-ins/imagemap/images/imagemap-java.svg
 create mode 100644 plug-ins/imagemap/images/imagemap-polygon.svg
 create mode 100644 plug-ins/imagemap/images/imagemap-rectangle.svg
 create mode 100644 plug-ins/imagemap/images/imagemap-to-back.svg
 create mode 100644 plug-ins/imagemap/images/imagemap-to-front.svg

diff --git a/plug-ins/imagemap/images/imagemap-circle.svg b/plug-ins/imagemap/images/imagemap-circle.svg
new file mode 100644
index 0000000000..64a9008aaf
--- /dev/null
+++ b/plug-ins/imagemap/images/imagemap-circle.svg
@@ -0,0 +1,69 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   version="1.1"
+   id="svg1"
+   width="16"
+   height="16"
+   viewBox="0 0 16 16"
+   sodipodi:docname="imagemap-circle.svg"
+   inkscape:version="1.3.2 (091e20e, 2023-11-25, custom)"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg">
+  <defs
+     id="defs1">
+    <linearGradient
+       id="linearGradient1"
+       inkscape:collect="always">
+      <stop
+         style="stop-color:#7fbaef;stop-opacity:1;"
+         offset="0"
+         id="stop1" />
+      <stop
+         style="stop-color:#7a96ef;stop-opacity:1;"
+         offset="1"
+         id="stop2" />
+    </linearGradient>
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient1"
+       id="radialGradient2"
+       cx="8.0395555"
+       cy="7.8912234"
+       fx="8.0395555"
+       fy="7.8912234"
+       r="7.0865269"
+       gradientUnits="userSpaceOnUse" />
+  </defs>
+  <sodipodi:namedview
+     id="namedview1"
+     pagecolor="#ffffff"
+     bordercolor="#999999"
+     borderopacity="1"
+     inkscape:showpageshadow="0"
+     inkscape:pageopacity="0"
+     inkscape:pagecheckerboard="0"
+     inkscape:deskcolor="#d1d1d1"
+     inkscape:zoom="50.5625"
+     inkscape:cx="7.9901112"
+     inkscape:cy="8"
+     inkscape:window-width="1920"
+     inkscape:window-height="1002"
+     inkscape:window-x="-8"
+     inkscape:window-y="-8"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="g1" />
+  <g
+     inkscape:groupmode="layer"
+     inkscape:label="imagemap-circle"
+     id="g1">
+    <circle
+       style="fill:url(#radialGradient2);stroke:#000000;stroke-width:0.779;paint-order:markers fill stroke;stroke-dasharray:none"
+       id="path1"
+       cx="8.0395555"
+       cy="7.8912234"
+       r="6.651" />
+  </g>
+</svg>
diff --git a/plug-ins/imagemap/images/imagemap-coord.svg b/plug-ins/imagemap/images/imagemap-coord.svg
new file mode 100644
index 0000000000..63baef103d
--- /dev/null
+++ b/plug-ins/imagemap/images/imagemap-coord.svg
@@ -0,0 +1,56 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   version="1.1"
+   id="svg1"
+   width="16"
+   height="16"
+   viewBox="0 0 16 16"
+   sodipodi:docname="imagemap-coord.svg"
+   inkscape:version="1.3.2 (091e20e, 2023-11-25, custom)"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg">
+  <defs
+     id="defs1" />
+  <sodipodi:namedview
+     id="namedview1"
+     pagecolor="#ffffff"
+     bordercolor="#999999"
+     borderopacity="1"
+     inkscape:showpageshadow="0"
+     inkscape:pageopacity="0"
+     inkscape:pagecheckerboard="0"
+     inkscape:deskcolor="#d1d1d1"
+     inkscape:zoom="32"
+     inkscape:cx="-0.5"
+     inkscape:cy="5.921875"
+     inkscape:window-width="1920"
+     inkscape:window-height="1002"
+     inkscape:window-x="-8"
+     inkscape:window-y="-8"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="g1" />
+  <g
+     inkscape:groupmode="layer"
+     inkscape:label="imagemap-coord"
+     id="g1"
+     style="fill:none;stroke:#000000;stroke-opacity:1">
+    <path
+       id="path9"
+       style="fill:#000000;fill-opacity:1;stroke:#ffffff;stroke-width:2.7;stroke-linecap:square;stroke-linejoin:bevel;stroke-dasharray:2.7, 1.35;stroke-dashoffset:0;stroke-opacity:1"
+       d="m 3.5203953,9.3439096 v 4.4967454 m -0.01458,0.748967 H 13.28225 M 14.507,5.0545 v 8.476735 M 8.8933301,3.9097707 h 5.6201029"
+       inkscape:label="dotted outline"
+       sodipodi:nodetypes="cccccccc" />
+    <path
+       id="path4"
+       style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:1.3;stroke-linecap:butt;stroke-linejoin:miter;stroke-dasharray:1.3, 0.65;stroke-dashoffset:0;stroke-opacity:1"
+       d="M 3.5203953,8.3227324 V 13.840655 M 2.865,14.589622 H 14.276619 M 14.507,5.0545 v 9.493201 M 7.988,3.9097707 h 7.475607"
+       inkscape:label="dotted" />
+    <path
+       id="path8"
+       style="fill:#ff0000;fill-opacity:1;stroke:#ff0000;stroke-width:1.3;stroke-linecap:butt;stroke-linejoin:miter;stroke-dasharray:none;stroke-opacity:1"
+       d="m 3.522,3.313 v -3 m 0,7.321875 V 4.5255 M 4.159,3.916125 h 2.9381505 m -7.0694005,0 H 2.8715"
+       inkscape:label="plus" />
+  </g>
+</svg>
diff --git a/plug-ins/imagemap/images/imagemap-dimension.svg b/plug-ins/imagemap/images/imagemap-dimension.svg
new file mode 100644
index 0000000000..8ad0a29989
--- /dev/null
+++ b/plug-ins/imagemap/images/imagemap-dimension.svg
@@ -0,0 +1,131 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   version="1.1"
+   id="svg1"
+   width="16"
+   height="16"
+   viewBox="0 0 16 16"
+   sodipodi:docname="imagemap-dimension.svg"
+   inkscape:version="1.3.2 (091e20e, 2023-11-25, custom)"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg">
+  <defs
+     id="defs1">
+    <marker
+       style="overflow:visible"
+       id="marker3"
+       refX="0"
+       refY="0"
+       orient="auto-start-reverse"
+       inkscape:stockid="Triangle arrow"
+       markerWidth="0.4"
+       markerHeight="0.4"
+       viewBox="0 0 1 1"
+       inkscape:isstock="true"
+       inkscape:collect="always"
+       preserveAspectRatio="xMidYMid">
+      <path
+         style="fill:context-stroke;fill-rule:evenodd;stroke:context-stroke;stroke-width:1pt"
+         d="M 5.77,0 -2.88,5 V -5 Z"
+         id="path3"
+         transform="scale(0.5)" />
+    </marker>
+    <marker
+       style="overflow:visible"
+       id="Triangle"
+       refX="0"
+       refY="0"
+       orient="auto-start-reverse"
+       inkscape:stockid="Triangle arrow"
+       markerWidth="0.4"
+       markerHeight="0.4"
+       viewBox="0 0 1 1"
+       inkscape:isstock="true"
+       inkscape:collect="always"
+       preserveAspectRatio="xMidYMid">
+      <path
+         transform="scale(0.5)"
+         style="fill:context-stroke;fill-rule:evenodd;stroke:context-stroke;stroke-width:1pt"
+         d="M 5.77,0 -2.88,5 V -5 Z"
+         id="path135" />
+    </marker>
+  </defs>
+  <sodipodi:namedview
+     id="namedview1"
+     pagecolor="#ffffff"
+     bordercolor="#999999"
+     borderopacity="1"
+     inkscape:showpageshadow="0"
+     inkscape:pageopacity="0"
+     inkscape:pagecheckerboard="0"
+     inkscape:deskcolor="#d1d1d1"
+     inkscape:zoom="22.627417"
+     inkscape:cx="0.30935922"
+     inkscape:cy="4.7066795"
+     inkscape:window-width="1920"
+     inkscape:window-height="1002"
+     inkscape:window-x="-8"
+     inkscape:window-y="-8"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="g1" />
+  <g
+     inkscape:groupmode="layer"
+     inkscape:label="imagemap-dimension"
+     id="g1">
+    <rect
+       style="fill:none;stroke:#ffffff;stroke-width:2.819;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:3.3;stroke-dasharray:none;paint-order:markers fill stroke;stroke-opacity:1"
+       id="rect7"
+       width="8.2481375"
+       height="9.0985699"
+       x="6.3580084"
+       y="5.3691325"
+       rx="1.0241469e-16"
+       ry="0.4500989"
+       inkscape:label="rect outline" />
+    <rect
+       style="fill:none;stroke:#000000;stroke-width:1.01885;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:3.3;stroke-dasharray:none;paint-order:markers fill stroke"
+       id="rect1"
+       width="8.2481375"
+       height="9.0985699"
+       x="6.3580084"
+       y="5.3691325"
+       rx="1.0241469e-16"
+       ry="0.4500989"
+       inkscape:label="rect" />
+    <path
+       style="display:inline;fill:none;stroke:#ffffff;stroke-width:1.882;stroke-linecap:butt;stroke-linejoin:miter;stroke-dasharray:none;stroke-opacity:1;marker-end:url(#marker3)"
+       d="M 3.0618869,6.4052233 V 10.981959"
+       id="path8"
+       inkscape:label="side-arrow outline"
+       sodipodi:nodetypes="cc" />
+    <path
+       style="fill:none;stroke:#000000;stroke-width:0.977;stroke-linecap:butt;stroke-linejoin:miter;stroke-dasharray:none;stroke-opacity:1;marker-end:url(#marker3)"
+       d="M 3.0618869,6.8250679 V 10.995768"
+       id="path2"
+       inkscape:label="side-arrow" />
+    <path
+       style="fill:none;stroke:#ffffff;stroke-width:1.881;stroke-linecap:butt;stroke-linejoin:miter;stroke-dasharray:none;stroke-opacity:1;marker-end:url(#Triangle)"
+       d="m 7.395835,2.315656 3.944554,0"
+       id="path9"
+       inkscape:label="top-arrow outline"
+       sodipodi:nodetypes="cc" />
+    <path
+       style="fill:none;stroke:#000000;stroke-width:0.977;stroke-linecap:butt;stroke-linejoin:miter;stroke-dasharray:none;stroke-opacity:1;marker-end:url(#Triangle)"
+       d="m 7.948,2.3317623 h 3.448874"
+       id="path1"
+       inkscape:label="top-arrow" />
+    <path
+       id="path5"
+       style="fill:none;fill-opacity:1;stroke:#ff0000;stroke-width:1.4;stroke-linecap:butt;stroke-linejoin:miter;stroke-dasharray:1.4, 0.7;stroke-dashoffset:0;stroke-opacity:1"
+       inkscape:label="side dots"
+       d="M 0.24721878,5.565 H 5.9629172 M 0.24721878,14.279 H 5.9629172" />
+    <path
+       id="path7"
+       style="fill:#ff0000;fill-opacity:1;stroke:#ff0000;stroke-width:1.4;stroke-linecap:butt;stroke-linejoin:miter;stroke-dasharray:1.4, 0.42;stroke-dashoffset:0;stroke-opacity:1"
+       inkscape:label="top dots"
+       d="M 14.432097,4.8704214 V 0.02 M 6.5802686,4.8704214 V 0.02"
+       sodipodi:nodetypes="cccc" />
+  </g>
+</svg>
diff --git a/plug-ins/imagemap/images/imagemap-icon-images.gresource.xml b/plug-ins/imagemap/images/imagemap-icon-legacy-images.gresource.xml
similarity index 100%
rename from plug-ins/imagemap/images/imagemap-icon-images.gresource.xml
rename to plug-ins/imagemap/images/imagemap-icon-legacy-images.gresource.xml
diff --git a/plug-ins/imagemap/images/imagemap-icon-scalable-images.gresource.xml b/plug-ins/imagemap/images/imagemap-icon-scalable-images.gresource.xml
new file mode 100644
index 0000000000..bddfaef782
--- /dev/null
+++ b/plug-ins/imagemap/images/imagemap-icon-scalable-images.gresource.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<gresources>
+  <gresource prefix="/org/gimp/imagemap/icons">
+    <file>imagemap-circle.svg</file>
+    <file>imagemap-coord.svg</file>
+    <file>imagemap-dimension.svg</file>
+    <file>imagemap-java.svg</file>
+    <file>imagemap-polygon.svg</file>
+    <file>imagemap-rectangle.svg</file>
+    <file>imagemap-to-back.svg</file>
+    <file>imagemap-to-front.svg</file>
+  </gresource>
+</gresources>
diff --git a/plug-ins/imagemap/images/imagemap-java.svg b/plug-ins/imagemap/images/imagemap-java.svg
new file mode 100644
index 0000000000..4a88bd3ddb
--- /dev/null
+++ b/plug-ins/imagemap/images/imagemap-java.svg
@@ -0,0 +1,93 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   version="1.1"
+   id="svg1"
+   width="16"
+   height="16"
+   viewBox="0 0 16 16"
+   xml:space="preserve"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"><defs
+     id="defs1" /><g
+     id="g1"><g
+       id="g2"
+       transform="matrix(0.03866004,0,0,0.03866004,3.6490115,0.15197798)"><path
+         fill-rule="evenodd"
+         clip-rule="evenodd"
+         d="m 48.859,43.518 c 8.424,17.64 2.736,140.832 -7.128,184.032 -9.864,43.272 -19.728,98.28 -22.032,144.576 -1.008,19.728 2.016,27.504 14.904,27.504 22.752,0 51.624,-47.952 87.84,-46.872 36.288,1.08 47.808,55.008 64.8,54.648 16.992,-0.36 30.672,-6.264 30.816,-58.752 C 218.563,191.981 87.235,64.973 48.859,43.518 Z"
+         id="path1" /><path
+         fill-rule="evenodd"
+         clip-rule="evenodd"
+         d="m 162.763,168.726 c 7.992,13.464 28.368,3.096 29.232,-12.096 0.864,-15.192 -1.368,-34.344 -11.232,-35.064 -9.864,-0.72 -16.92,-10.584 -26.784,-11.304 -9.864,-0.72 -20.448,9.144 -25.056,-3.96 -4.608,-13.104 12.384,-18.648 25.056,-20.736 -11.304,-11.304 -17.928,-23.832 -22.896,-36.864 -4.968,-13.032 -8.64,-24.984 5.256,-30.096 13.896,-5.112 12.744,21.168 28.656,33.192 -4.68,-17.712 -6.408,-25.056 -6.048,-35.352 0.36,-10.296 -0.36,-18.144 14.256,-16.128 14.616,2.016 8.28,32.4 19.656,44.784 3.456,-11.736 5.544,-26.64 13.896,-32.76 8.352,-6.12 27.36,-6.264 15.264,18.864 -12.096,25.128 3.528,38.736 -0.144,58.536 -3.672,19.8 -15.048,16.2 -19.944,28.944 -4.896,12.744 2.88,41.76 -6.336,54.792 -9.216,13.032 -10.872,33.048 -4.896,49.032 -18.36,-17.136 -27.936,-53.784 -27.936,-53.784 z"
+         id="path2" /><path
+         fill-rule="evenodd"
+         clip-rule="evenodd"
+         d="m 48.355,185.646 c -7.416,50.832 -33.192,56.88 -34.488,77.976 -1.296,21.096 6.84,23.112 6.336,42.624 -0.504,19.512 -17.856,27.432 -19.944,38.016 -2.088,10.584 8.928,13.968 15.336,13.968 6.408,0 12.816,-28.08 15.408,-45.936 2.592,-17.856 -8.496,-28.368 -8.496,-40.608 0,-12.24 16.056,-34.632 13.104,-14.976 13.32,-21.024 19.657,-47.809 12.744,-71.064 z"
+         id="path3" /><path
+         fill-rule="evenodd"
+         clip-rule="evenodd"
+         fill="#ffffff"
+         d="m 58.292,205.013 c -5.616,27.504 -40.68,181.08 -22.824,183.024 17.856,1.944 43.272,-47.52 84.888,-47.16 41.688,0.36 58.104,55.44 68.256,55.08 10.152,-0.36 16.848,3.6 17.928,-58.464 1.08,-62.064 -36.792,-141.336 -59.184,-176.256 -30.385,1.944 -63.073,26.281 -89.064,43.776 z"
+         id="path4" /><g
+         id="g15">
+	<path
+   fill="none"
+   d="m 139.162,172.181 c -1.95,-18.251 -19.12,-25.421 -35.661,-23.168 -13.889,1.893 -32.403,13.613 -34.107,28.64 -1.921,16.937 11.402,32.522 28.361,33.203 15.03,0.604 31.176,-6.668 37.93,-20.79 2.73,-5.704 3.797,-11.578 3.477,-17.885"
+   id="path5" />
+	<path
+   d="m 147.082,171.533 c -1.662,-17.195 -14.407,-27.988 -30.895,-30.627 -15.924,-2.549 -33.26,4.998 -44.408,16.146 -12.538,12.538 -13.039,29.978 -4.26,44.833 8.661,14.657 27.847,19.501 43.563,15.835 21.506,-5.015 37.398,-23.824 36,-46.187"
+   id="path6" />
+	<radialGradient
+   id="SVGID_1_"
+   cx="86.629898"
+   cy="167.06931"
+   r="54.7155"
+   gradientUnits="userSpaceOnUse">
+		<stop
+   offset="0"
+   style="stop-color:#FFFFFF"
+   id="stop6" />
+		<stop
+   offset="0.0604"
+   style="stop-color:#FBC8B4"
+   id="stop7" />
+		<stop
+   offset="0.0712"
+   style="stop-color:#FBC3B0"
+   id="stop8" />
+		<stop
+   offset="0.1829"
+   style="stop-color:#F7978B"
+   id="stop9" />
+		<stop
+   offset="0.2995"
+   style="stop-color:#F4716B"
+   id="stop10" />
+		<stop
+   offset="0.4199"
+   style="stop-color:#F15251"
+   id="stop11" />
+		<stop
+   offset="0.5453"
+   style="stop-color:#EF3A3D"
+   id="stop12" />
+		<stop
+   offset="0.6778"
+   style="stop-color:#EE292F"
+   id="stop13" />
+		<stop
+   offset="0.822"
+   style="stop-color:#ED1F27"
+   id="stop14" />
+		<stop
+   offset="1"
+   style="stop-color:#ED1C24"
+   id="stop15" />
+	</radialGradient>
+	<path
+   fill="url(#SVGID_1_)"
+   stroke="#000000"
+   d="m 139.162,177.941 c -1.493,15.627 -13.947,28.182 -28.944,31.824 -15.87,3.854 -33.393,-2.257 -39.096,-18.576 -2.912,-8.332 -2.37,-16.879 2.637,-24.198 4.223,-6.171 11.033,-11 17.779,-14.066 13.924,-6.326 33.832,-7.029 43.531,7.077 3.675,5.346 4.318,11.639 4.093,17.939"
+   id="path15"
+   style="fill:url(#SVGID_1_)" />
+</g></g></g></svg>
diff --git a/plug-ins/imagemap/images/imagemap-polygon.svg b/plug-ins/imagemap/images/imagemap-polygon.svg
new file mode 100644
index 0000000000..42c5e3ad99
--- /dev/null
+++ b/plug-ins/imagemap/images/imagemap-polygon.svg
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   version="1.1"
+   id="svg1"
+   width="16"
+   height="16"
+   viewBox="0 0 16 16"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg">
+  <defs
+     id="defs1">
+    <linearGradient
+       id="linearGradient1">
+      <stop
+         style="stop-color:#7db3e9;stop-opacity:1;"
+         offset="0.40645161"
+         id="stop2" />
+      <stop
+         style="stop-color:#7a96d3;stop-opacity:1;"
+         offset="0.7870968"
+         id="stop1" />
+    </linearGradient>
+    <radialGradient
+       xlink:href="#linearGradient1"
+       id="radialGradient2"
+       cx="8.4153271"
+       cy="7.9126863"
+       fx="8.4153271"
+       fy="7.9126863"
+       r="6.4431396"
+       gradientTransform="matrix(1,0,0,1.0938826,0,-0.74286389)"
+       gradientUnits="userSpaceOnUse" />
+  </defs>
+  <g
+     id="g1">
+    <path
+       style="fill:url(#radialGradient2);stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;fill-opacity:1"
+       d="M 2.4721879,14.378245 V 7.3967862 L 8.5043263,1.3646477 h 5.8541407 v 1.1075402 l -2.927748,5.0710085 v 1.0006849 l 2.819237,4.8830607 v 1.030413 z"
+       id="path1" />
+  </g>
+</svg>
diff --git a/plug-ins/imagemap/images/imagemap-rectangle.svg b/plug-ins/imagemap/images/imagemap-rectangle.svg
new file mode 100644
index 0000000000..73e43932ce
--- /dev/null
+++ b/plug-ins/imagemap/images/imagemap-rectangle.svg
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   version="1.1"
+   id="svg1"
+   width="16"
+   height="16"
+   viewBox="0 0 16 16"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg">
+  <defs
+     id="defs1">
+    <linearGradient
+       id="linearGradient1">
+      <stop
+         style="stop-color:#7fbaef;stop-opacity:1;"
+         offset="0"
+         id="stop3" />
+      <stop
+         style="stop-color:#7a96d3;stop-opacity:1;"
+         offset="1"
+         id="stop1" />
+    </linearGradient>
+    <radialGradient
+       xlink:href="#linearGradient1"
+       id="radialGradient7"
+       cx="8.3559942"
+       cy="8.3856611"
+       fx="8.3559942"
+       fy="8.3856611"
+       r="6.8281827"
+       gradientTransform="matrix(1.0049029,0,0,0.8282624,-0.22222359,1.6023426)"
+       gradientUnits="userSpaceOnUse"
+       spreadMethod="reflect" />
+  </defs>
+  <g
+     id="g1">
+    <rect
+       style="display:inline;fill:url(#radialGradient7);stroke:#000000;stroke-width:0.778898;stroke-linejoin:miter;stroke-dasharray:none;stroke-opacity:1;paint-order:markers fill stroke"
+       id="rect1"
+       width="12.95658"
+       height="10.519808"
+       x="1.696449"
+       y="3.2879653"
+       rx="1.0082678e-16"
+       ry="0.44396254" />
+  </g>
+</svg>
diff --git a/plug-ins/imagemap/images/imagemap-to-back.svg b/plug-ins/imagemap/images/imagemap-to-back.svg
new file mode 100644
index 0000000000..31089ab610
--- /dev/null
+++ b/plug-ins/imagemap/images/imagemap-to-back.svg
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   version="1.1"
+   id="svg1"
+   width="16"
+   height="16"
+   viewBox="0 0 16 16"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg">
+  <defs
+     id="defs1" />
+  <g
+     id="g1">
+    <rect
+       style="display:inline;fill:#798fce;fill-opacity:1;stroke:#2f4aaa;stroke-width:0.779;stroke-opacity:1;paint-order:markers fill stroke"
+       id="rect1"
+       width="9.8689737"
+       height="9.8096418"
+       x="3.1644003"
+       y="2.9666255"
+       rx="1.0019313e-16"
+       ry="0.44320479" />
+    <circle
+       style="fill:#ffff00;fill-opacity:1;stroke:#f7a559;stroke-width:0.828217;stroke-opacity:1;paint-order:markers fill stroke"
+       id="path1"
+       cx="3.5995054"
+       cy="3.619283"
+       r="3.0804596" />
+    <circle
+       style="fill:#ffff00;fill-opacity:1;stroke:#f7a559;stroke-width:0.828217;stroke-opacity:1;paint-order:markers fill stroke"
+       id="circle1"
+       cx="12.420272"
+       cy="12.440049"
+       r="3.0804596" />
+  </g>
+</svg>
diff --git a/plug-ins/imagemap/images/imagemap-to-front.svg b/plug-ins/imagemap/images/imagemap-to-front.svg
new file mode 100644
index 0000000000..608d67915b
--- /dev/null
+++ b/plug-ins/imagemap/images/imagemap-to-front.svg
@@ -0,0 +1,60 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   version="1.1"
+   id="svg1"
+   width="16"
+   height="16"
+   viewBox="0 0 16 16"
+   sodipodi:docname="imagemap-to-front.svg"
+   inkscape:version="1.3.2 (091e20e, 2023-11-25, custom)"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg">
+  <defs
+     id="defs1" />
+  <sodipodi:namedview
+     id="namedview1"
+     pagecolor="#ffffff"
+     bordercolor="#999999"
+     borderopacity="1"
+     inkscape:showpageshadow="0"
+     inkscape:pageopacity="0"
+     inkscape:pagecheckerboard="0"
+     inkscape:deskcolor="#d1d1d1"
+     inkscape:zoom="50.5625"
+     inkscape:cx="7.9901112"
+     inkscape:cy="8"
+     inkscape:window-width="1920"
+     inkscape:window-height="1002"
+     inkscape:window-x="-8"
+     inkscape:window-y="-8"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="g1" />
+  <g
+     inkscape:groupmode="layer"
+     inkscape:label="imagemap-to-front"
+     id="g1">
+    <circle
+       style="fill:#ffff00;fill-opacity:1;stroke:#f7a559;stroke-width:0.828217;stroke-opacity:1;paint-order:markers fill stroke"
+       id="path1"
+       cx="3.5995054"
+       cy="3.619283"
+       r="3.0804596" />
+    <circle
+       style="fill:#ffff00;fill-opacity:1;stroke:#f7a559;stroke-width:0.828217;stroke-opacity:1;paint-order:markers fill stroke"
+       id="circle1"
+       cx="12.420272"
+       cy="12.440049"
+       r="3.0804596" />
+    <rect
+       style="display:inline;fill:#798fce;fill-opacity:1;stroke:#2f4aaa;stroke-width:0.779;stroke-opacity:1;paint-order:markers fill stroke"
+       id="rect1"
+       width="9.8689737"
+       height="9.8096418"
+       x="3.1644003"
+       y="2.9666255"
+       rx="1.0019313e-16"
+       ry="0.44320479" />
+  </g>
+</svg>
diff --git a/plug-ins/imagemap/images/meson.build b/plug-ins/imagemap/images/meson.build
index fb093a7130..b70be2d69e 100644
--- a/plug-ins/imagemap/images/meson.build
+++ b/plug-ins/imagemap/images/meson.build
@@ -1,16 +1,24 @@
+icon_type = 'scalable'
+icon_format = 'svg'
+
+if not have_vector_icons
+  icon_type = 'legacy'
+  icon_format = 'png'
+endif
+
 stock_images = [
-  'imagemap-circle.png',
-  'imagemap-coord.png',
-  'imagemap-dimension.png',
-  'imagemap-java.png',
-  'imagemap-polygon.png',
-  'imagemap-rectangle.png',
-  'imagemap-to-back.png',
-  'imagemap-to-front.png',
+  'imagemap-circle' + icon_format,
+  'imagemap-coord' + icon_format,
+  'imagemap-dimension' + icon_format,
+  'imagemap-java' + icon_format,
+  'imagemap-polygon' + icon_format,
+  'imagemap-rectangle' + icon_format,
+  'imagemap-to-back' + icon_format,
+  'imagemap-to-front' + icon_format,
 ]
 
 imagemap_icon_sources = gnome.compile_resources(
   'imagemap-icon-images',
-  'imagemap-icon-images.gresource.xml',
+  'imagemap-icon-' + icon_type + '-images.gresource.xml',
   # source_dir: meson.current_source_directory(),
 )
diff --git a/plug-ins/imagemap/imap_icons.h b/plug-ins/imagemap/imap_icons.h
index 195d2b568d..330cf3f9a8 100644
--- a/plug-ins/imagemap/imap_icons.h
+++ b/plug-ins/imagemap/imap_icons.h
@@ -23,7 +23,6 @@
 #ifndef _IMAP_ICONS_H
 #define _IMAP_ICONS_H
 
-#define IMAP_ARROW        "imagemap-arrow"
 #define IMAP_CIRCLE       "imagemap-circle"
 #define IMAP_COORD        "imagemap-coord"
 #define IMAP_DIMENSION    "imagemap-dimension"
diff --git a/plug-ins/imagemap/imap_preview.c b/plug-ins/imagemap/imap_preview.c
index 7d45ecfb45..65abbbcaba 100644
--- a/plug-ins/imagemap/imap_preview.c
+++ b/plug-ins/imagemap/imap_preview.c
@@ -31,6 +31,8 @@
 #include "imap_menu.h"
 #include "imap_preview.h"
 
+#include "libgimp/stdplugins-intl.h"
+
 #define PREVIEW_MASK  (GDK_EXPOSURE_MASK       | \
                        GDK_POINTER_MOTION_MASK | \
                        GDK_BUTTON_PRESS_MASK   | \
@@ -308,6 +310,7 @@ make_preview (GimpDrawable *drawable,
    /* Create button with arrow */
    button = gtk_button_new ();
    gtk_widget_set_can_focus (button, FALSE);
+   gtk_widget_set_tooltip_text (button, _("Shortcut Menu"));
    gtk_grid_attach (GTK_GRID (grid), button, 0, 0, 1, 1);
                      // GTK_FILL, GTK_FILL, 0, 0);
    gtk_widget_set_events (button,
diff --git a/plug-ins/imagemap/imap_statusbar.c b/plug-ins/imagemap/imap_statusbar.c
index d5c6987cd0..52e6296421 100644
--- a/plug-ins/imagemap/imap_statusbar.c
+++ b/plug-ins/imagemap/imap_statusbar.c
@@ -31,6 +31,8 @@
 #include "imap_icons.h"
 #include "imap_statusbar.h"
 
+#include "libgimp/stdplugins-intl.h"
+
 StatusBar_t*
 make_statusbar(GtkWidget *main_vbox, GtkWidget *window)
 {
@@ -50,6 +52,7 @@ make_statusbar(GtkWidget *main_vbox, GtkWidget *window)
    /* (x, y) coordinate */
    iconw = gtk_image_new_from_icon_name (IMAP_COORD,
                                          GTK_ICON_SIZE_SMALL_TOOLBAR);
+   gtk_widget_set_tooltip_text (iconw, _("Coordinates:"));
 
    gtk_box_pack_start(GTK_BOX(hbox), iconw, FALSE, FALSE, 10);
    gtk_widget_show(iconw);
@@ -64,8 +67,9 @@ make_statusbar(GtkWidget *main_vbox, GtkWidget *window)
    /* Dimension info */
    iconw = gtk_image_new_from_icon_name (IMAP_DIMENSION,
                                          GTK_ICON_SIZE_SMALL_TOOLBAR);
-   gtk_box_pack_start(GTK_BOX(hbox), iconw, FALSE, FALSE, 10);
-   gtk_widget_show(iconw);
+   gtk_widget_set_tooltip_text (iconw, _("Active Area Size:"));
+   gtk_box_pack_start (GTK_BOX (hbox), iconw, FALSE, FALSE, 10);
+   gtk_widget_set_visible (iconw, TRUE);
 
    statusbar->dimension = gtk_entry_new();
    gtk_widget_set_size_request(statusbar->dimension, 96, -1);