From 60fc61091d0f4a706aff2a7b6d7a2a1b0910d7dd Mon Sep 17 00:00:00 2001
From: =?utf8?q?Basti=C3=A1n=20D=C3=ADaz?= <diaz.bastian@ymail.com>
Date: Mon, 30 Sep 2013 18:22:37 -0300
Subject: [PATCH] gui: Support for more flat icons and tag loss fixing in some
 menus.
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

→ Icons for "new syntax", "new data", "Display information in working
file and external file are added.
→ Add the reference to the new icons to Smake an *.ui files
→ Replacement of some icons (bug fixes)
---
 Smake                                         |   5 +
 .../actions/16x16/analyze-compare-means.svg   |   4 +-
 .../analyze-non-parametric-statistics.svg     |  10 +-
 .../artwork/actions/16x16/data-sort-cases.svg |   8 +-
 .../actions/16x16/data-weight-cases.svg       |  41 ++---
 .../display-information-external-file.svg     | 136 ++++++++++++++
 .../display-information-working-file.svg      | 139 ++++++++++++++
 .../actions/16x16/file-syntax-data.svg        | 172 ++++++++++++++++++
 .../actions/16x16/file-system-data.svg        | 124 +++++++++++++
 .../gui/artwork/actions/16x16/help-about.svg  |  16 +-
 src/ui/gui/artwork/actions/16x16/run-all.svg  |  13 +-
 .../actions/16x16/run-current-line.svg        |  52 ++++--
 .../artwork/actions/16x16/run-selection.svg   |  15 +-
 .../gui/artwork/actions/16x16/run-to-end.svg  |  36 ++--
 .../16x16/transform-automatic-recode.svg      |  14 +-
 .../actions/16x16/transform-compute.svg       |   8 +-
 .../transform-in-to-different-variables.svg   |  26 +--
 .../16x16/transform-in-to-same-variables.svg  |  26 +--
 .../actions/16x16/transform-rank-cases.svg    |  12 +-
 .../actions/24x24/data-weight-cases.svg       |  41 ++---
 .../artwork/actions/24x24/edit-go-to-case.svg |  10 +-
 .../actions/24x24/edit-go-to-variable.svg     |  10 +-
 .../actions/24x24/edit-insert-case.svg        |  10 +-
 .../actions/24x24/edit-insert-variable.svg    |  14 +-
 .../actions/32x32/data-weight-cases.svg       |  41 ++---
 .../artwork/actions/32x32/edit-go-to-case.svg |  14 +-
 .../actions/32x32/edit-insert-case.svg        |  10 +-
 .../16x16/measure-currency-nominal.svg        |  71 ++++----
 .../16x16/measure-string-ordinal.svg          |  61 +++----
 .../categories/16x16/measure-time-nominal.svg | 132 +++++++++-----
 .../categories/16x16/measure-time-scale.svg   | 103 ++++++++---
 src/ui/gui/data-editor.ui                     |   5 +
 src/ui/gui/output-viewer.ui                   |   2 +
 src/ui/gui/syntax-editor.ui                   |   7 +
 34 files changed, 1025 insertions(+), 363 deletions(-)
 create mode 100644 src/ui/gui/artwork/actions/16x16/display-information-external-file.svg
 create mode 100644 src/ui/gui/artwork/actions/16x16/display-information-working-file.svg
 create mode 100644 src/ui/gui/artwork/actions/16x16/file-syntax-data.svg
 create mode 100644 src/ui/gui/artwork/actions/16x16/file-system-data.svg

diff --git a/Smake b/Smake
index 6c5f98b234..9630a4f82c 100644
--- a/Smake
+++ b/Smake
@@ -125,6 +125,7 @@ src/ui/gui/icons/apps/24x24/pspp.png \
 src/ui/gui/icons/apps/256x256/pspp.png \
 src/ui/gui/icons/apps/16x16/pspp.png \
 src/ui/gui/icons/apps/48x48/pspp.png \
+src/ui/gui/icons/apps/scalable/pspp.svg \
 
 
 
@@ -200,6 +201,8 @@ src/ui/gui/icons/actions/24x24/file-open-data.png \
 src/ui/gui/icons/actions/24x24/file-save-data.png \
 src/ui/gui/icons/actions/24x24/view-value-labels.png \
 src/ui/gui/icons/actions/16x16/file-new-data.png \
+src/ui/gui/icons/actions/16x16/file-syntax-data.png \
+src/ui/gui/icons/actions/16x16/file-system-data.png \
 src/ui/gui/icons/actions/16x16/file-open-data.png \
 src/ui/gui/icons/actions/16x16/file-import-data.png \
 src/ui/gui/icons/actions/16x16/file-export-data.png \
@@ -208,6 +211,8 @@ src/ui/gui/icons/actions/16x16/file-save-as.png \
 src/ui/gui/icons/actions/16x16/file-print.png \
 src/ui/gui/icons/actions/16x16/file-rename-data-set.png \
 src/ui/gui/icons/actions/16x16/file-display-information.png \
+src/ui/gui/icons/actions/16x16/display-information-working-file.png \
+src/ui/gui/icons/actions/16x16/display-information-external-file.png \
 src/ui/gui/icons/actions/16x16/file-recently-used.png \
 src/ui/gui/icons/actions/16x16/file-quit.png \
 src/ui/gui/icons/actions/16x16/file-display-information.png \
diff --git a/src/ui/gui/artwork/actions/16x16/analyze-compare-means.svg b/src/ui/gui/artwork/actions/16x16/analyze-compare-means.svg
index 3152716f16..74e19a9541 100644
--- a/src/ui/gui/artwork/actions/16x16/analyze-compare-means.svg
+++ b/src/ui/gui/artwork/actions/16x16/analyze-compare-means.svg
@@ -106,11 +106,11 @@
     <g
        transform="translate(335,805.00002)"
        style="display:inline"
-       id="g6175">
+       id="g5180">
       <path
          inkscape:connector-curvature="0"
          id="rect6117"
-         d="m -330,232.375 c -2.216,0 -4,1.784 -4,4 l 0,6 c 0,2.216 1.784,4 4,4 l 6,0 c 2.216,0 4,-1.784 4,-4 l 0,-6 c 0,-2.216 -1.784,-4 -4,-4 l -6,0 z m -1,2 8,0 0,2 -8,0 0,-2 z m 1.625,3.21875 2.375,1.96875 2.375,-1.96875 1.25,1.53125 -2.09375,1.75 2.09375,1.71875 -1.25,1.53125 -2.375,-1.96875 -2.375,1.96875 -1.25,-1.53125 2.09375,-1.71875 -2.09375,-1.75 1.25,-1.53125 z"
+         d="m -330,232.375 c -2.216,0 -4,1.784 -4,4 l 0,6 c 0,2.216 1.784,4 4,4 l 6,0 c 2.216,0 4,-1.784 4,-4 l 0,-6 c 0,-2.216 -1.784,-4 -4,-4 l -6,0 z m 0,2 6,0 0,2 -6,0 0,-2 z m 0.625,3.21875 2.375,1.96875 2.375,-1.96875 1.25,1.53125 -2.09375,1.75 2.09375,1.71875 -1.25,1.53125 -2.375,-1.96875 -2.375,1.96875 -1.25,-1.53125 2.09375,-1.71875 -2.09375,-1.75 1.25,-1.53125 z"
          style="fill:#555753;fill-opacity:1;stroke:none" />
       <rect
          y="231.36218"
diff --git a/src/ui/gui/artwork/actions/16x16/analyze-non-parametric-statistics.svg b/src/ui/gui/artwork/actions/16x16/analyze-non-parametric-statistics.svg
index 220535fb63..50998d596e 100644
--- a/src/ui/gui/artwork/actions/16x16/analyze-non-parametric-statistics.svg
+++ b/src/ui/gui/artwork/actions/16x16/analyze-non-parametric-statistics.svg
@@ -14,7 +14,7 @@
    id="svg3991"
    version="1.1"
    inkscape:version="0.48.4 r9939"
-   sodipodi:docname="analyze-regression.svg">
+   sodipodi:docname="analyze-non-parametric-statistics.svg">
   <title
      id="title4018">GNU PSPP flat icon set</title>
   <defs
@@ -33,7 +33,7 @@
      inkscape:current-layer="layer1"
      showgrid="true"
      inkscape:window-width="683"
-     inkscape:window-height="709"
+     inkscape:window-height="708"
      inkscape:window-x="0"
      inkscape:window-y="27"
      inkscape:window-maximized="0"
@@ -106,7 +106,7 @@
     <g
        transform="translate(290,774.9872)"
        style="display:inline"
-       id="g5182">
+       id="g5163">
       <path
          inkscape:connector-curvature="0"
          id="rect3682-7"
@@ -120,9 +120,9 @@
          id="rect4992"
          style="fill:#555753;fill-opacity:1;stroke:none" />
       <rect
-         y="268.36218"
+         y="269.36218"
          x="-284"
-         height="7"
+         height="6"
          width="1"
          id="rect4992-2"
          style="fill:#555753;fill-opacity:1;stroke:none;display:inline" />
diff --git a/src/ui/gui/artwork/actions/16x16/data-sort-cases.svg b/src/ui/gui/artwork/actions/16x16/data-sort-cases.svg
index 6a8118c890..f281e742c5 100644
--- a/src/ui/gui/artwork/actions/16x16/data-sort-cases.svg
+++ b/src/ui/gui/artwork/actions/16x16/data-sort-cases.svg
@@ -14,7 +14,7 @@
    id="svg3991"
    version="1.1"
    inkscape:version="0.48.4 r9939"
-   sodipodi:docname="data-weight-cases.svg">
+   sodipodi:docname="data-sort-cases.svg">
   <title
      id="title4018">GNU PSPP flat icon set</title>
   <defs
@@ -33,7 +33,7 @@
      inkscape:current-layer="layer1"
      showgrid="true"
      inkscape:window-width="683"
-     inkscape:window-height="709"
+     inkscape:window-height="708"
      inkscape:window-x="0"
      inkscape:window-y="27"
      inkscape:window-maximized="0"
@@ -106,7 +106,7 @@
     <g
        transform="translate(-190,885.00002)"
        style="display:inline"
-       id="g5913">
+       id="g4197">
       <path
          style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#555753;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.50793636;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:new;font-family:Sans;-inkscape-font-specification:Sans"
          id="rect4513"
@@ -127,7 +127,7 @@
          style="fill:none;stroke:none" />
       <path
          id="path5386-2-7-0"
-         d="m 195.53033,153.87604 c -1.10457,0 -2,0.89543 -2,2 0,1.10457 0.89543,2 2,2 1.10457,0 2,-0.89543 2,-2 0,-1.10457 -0.89543,-2 -2,-2 z m -1,4 c -1.10457,0 -2,0.89543 -2,2 0,1.10457 1.34315,2 3,2 1.65685,0 3,-0.89543 3,-2 0,-1.10457 -0.89543,-2 -2,-2 l 0,1 -2,0 0,-1 z"
+         d="m 195.5,154.36218 c -0.92047,0 -1.66667,0.7835 -1.66667,1.75001 0,0.96649 0.7462,1.74999 1.66667,1.74999 0.92047,0 1.66667,-0.7835 1.66667,-1.74999 0,-0.96651 -0.7462,-1.75001 -1.66667,-1.75001 z m -0.83334,3.5 c -0.92047,0 -1.66666,0.78351 -1.66666,1.75001 0,0.96649 1.11929,1.74999 2.5,1.74999 1.38071,0 2.5,-0.7835 2.5,-1.74999 0,-0.9665 -0.74619,-1.75001 -1.66666,-1.75001 l 0,0.875 -1.66668,0 0,-0.875 z"
          style="fill:#555753;fill-opacity:1;stroke:none;display:inline"
          inkscape:connector-curvature="0" />
     </g>
diff --git a/src/ui/gui/artwork/actions/16x16/data-weight-cases.svg b/src/ui/gui/artwork/actions/16x16/data-weight-cases.svg
index 9d4f7717ac..af37b89a36 100644
--- a/src/ui/gui/artwork/actions/16x16/data-weight-cases.svg
+++ b/src/ui/gui/artwork/actions/16x16/data-weight-cases.svg
@@ -104,36 +104,19 @@
      id="layer1"
      transform="translate(0,-1036.3622)">
     <g
-       transform="translate(-145,885.00002)"
-       style="display:inline"
-       id="g4848">
-      <g
-         id="g4786">
-        <path
-           inkscape:connector-curvature="0"
-           style="fill:#555753;stroke:none"
-           d="m 153,151.375 c -1.65685,0 -3,1.34315 -3,3 l 0,1 -1,0 -4,11 3,0 10,0 3,0 -4,-11 -1,0 0,-1 c 0,-1.65685 -1.34315,-3 -3,-3 z m 0,2 c 0.55228,0 1,0.44772 1,1 l 0,1 -2,0 0,-1 c 0,-0.55228 0.44772,-1 1,-1 z m 0,4 c 1.10457,0 2,0.89543 2,2 0,1.10457 -0.89543,2 -2,2 -1.10457,0 -2,-0.89543 -2,-2 0,-1.10457 0.89543,-2 2,-2 z m -1,4 0,1 2,0 0,-1 c 1.10457,0 2,0.89543 2,2 0,1.10457 -1.34315,2 -3,2 -1.65685,0 -3,-0.89543 -3,-2 0,-1.10457 0.89543,-2 2,-2 z"
-           id="path5845" />
-        <rect
-           style="fill:none;stroke:none"
-           id="rect5669"
-           width="16"
-           height="16"
-           x="145"
-           y="151.36218" />
-        <path
-           style="fill:#555753;fill-opacity:1;stroke:none"
-           d="m 145,166.36218 c 0,0.554 0.446,1 1,1 l 14,0 c 0.554,0 1,-0.446 1,-1 l -16,0 z"
-           id="rect4781"
-           inkscape:connector-curvature="0" />
-      </g>
-      <rect
-         y="166.36218"
-         x="145"
-         height="1"
-         width="16"
-         id="rect4846"
+       transform="translate(-145,884.9872)"
+       style="display:inline;fill:#555753"
+       id="g5308">
+      <path
+         inkscape:connector-curvature="0"
+         id="path5246"
+         d="m 153,151.36218 c -1.65685,0 -3,1.34315 -3,3 0,1.65685 1.34315,3 3,3 1.65685,0 3,-1.34315 3,-3 0,-1.65685 -1.34315,-3 -3,-3 z m 0,1.5 c 0.82843,0 1.5,0.67157 1.5,1.5 0,0.82843 -0.67157,1.5 -1.5,1.5 -0.82843,0 -1.5,-0.67157 -1.5,-1.5 0,-0.82843 0.67157,-1.5 1.5,-1.5 z"
          style="fill:#555753;fill-opacity:1;stroke:none" />
+      <path
+         inkscape:connector-curvature="0"
+         id="path5287"
+         d="m 149,155.375 -4,12 16,0 -4,-12 -8,0 z m 4,2 c 1.10457,0 2,0.89543 2,2 0,1.10457 -0.89543,2 -2,2 -1.10457,0 -2,-0.89543 -2,-2 0,-1.10457 0.89543,-2 2,-2 z m -1,4 0,1 2,0 0,-1 c 1.10457,0 2,0.89543 2,2 0,1.10457 -1.34315,2 -3,2 -1.65685,0 -3,-0.89543 -3,-2 0,-1.10457 0.89543,-2 2,-2 z"
+         style="fill:#555753;stroke:none" />
     </g>
   </g>
 </svg>
diff --git a/src/ui/gui/artwork/actions/16x16/display-information-external-file.svg b/src/ui/gui/artwork/actions/16x16/display-information-external-file.svg
new file mode 100644
index 0000000000..45b23ebb54
--- /dev/null
+++ b/src/ui/gui/artwork/actions/16x16/display-information-external-file.svg
@@ -0,0 +1,136 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<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"
+   width="16"
+   height="16"
+   id="svg3991"
+   version="1.1"
+   inkscape:version="0.48.4 r9939"
+   sodipodi:docname="display-information-external-file.svg">
+  <title
+     id="title4018">GNU PSPP flat icon set</title>
+  <defs
+     id="defs3993" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="22.4"
+     inkscape:cx="8"
+     inkscape:cy="7.9640184"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     inkscape:window-width="683"
+     inkscape:window-height="708"
+     inkscape:window-x="0"
+     inkscape:window-y="27"
+     inkscape:window-maximized="0"
+     showborder="false"
+     inkscape:snap-bbox="true">
+    <inkscape:grid
+       type="xygrid"
+       id="grid2983"
+       empspacing="5"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true" />
+    <sodipodi:guide
+       position="0,0"
+       orientation="0,16"
+       id="guide2985" />
+    <sodipodi:guide
+       position="16,0"
+       orientation="-16,0"
+       id="guide2987" />
+    <sodipodi:guide
+       position="16,16"
+       orientation="0,-16"
+       id="guide2989" />
+    <sodipodi:guide
+       position="0,16"
+       orientation="16,0"
+       id="guide2991" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata3996">
+    <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>GNU PSPP flat icon set</dc:title>
+        <cc:license
+           rdf:resource="http://creativecommons.org/licenses/by-sa/3.0/" />
+        <dc:creator>
+          <cc:Agent>
+            <dc:title>Bastián Díaz</dc:title>
+          </cc:Agent>
+        </dc:creator>
+        <dc:source>https://github.com/bedf/PSPPire-artwork</dc:source>
+      </cc:Work>
+      <cc:License
+         rdf:about="http://creativecommons.org/licenses/by-sa/3.0/">
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Reproduction" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Distribution" />
+        <cc:requires
+           rdf:resource="http://creativecommons.org/ns#Notice" />
+        <cc:requires
+           rdf:resource="http://creativecommons.org/ns#Attribution" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
+        <cc:requires
+           rdf:resource="http://creativecommons.org/ns#ShareAlike" />
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,-1036.3622)">
+    <g
+       style="display:inline"
+       id="g6341"
+       transform="translate(485,885.00002)">
+      <path
+         style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#bebebe;fill:#555753;fill-opacity:1;stroke:none;stroke-width:1.99999988;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans"
+         id="rect5028"
+         d="m -481.81841,151.36558 c -1.2016,0 -2.1875,0.98758 -2.1875,2.1875 l 0,11.625 c 0,1.19992 0.9859,2.1875 2.1875,2.1875 l 9.625,0 c 1.2016,0 2.1875,-0.98758 2.1875,-2.1875 l 0,-11.625 c 0,-1.19992 -0.9859,-2.1875 -2.1875,-2.1875 l -9.625,0 z m 0,2 9.625,0 c 0.1238,0 0.1875,0.0566 0.1875,0.1875 l 0,11.625 c 0,0.1309 -0.0637,0.1875 -0.1875,0.1875 l -9.625,0 c -0.1238,0 -0.1875,-0.0566 -0.1875,-0.1875 l 0,-11.625 c 0,-0.1309 0.0637,-0.1875 0.1875,-0.1875 z"
+         inkscape:connector-curvature="0" />
+      <path
+         style="color:#000000;fill:#555753;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         sodipodi:nodetypes="ccssccssssccssc"
+         id="path5030"
+         d="m -477.16216,154.36558 c -0.26556,0.0109 -0.54445,0.0586 -0.8125,0.125 -2.14441,0.53085 -3.4371,2.69934 -2.90625,4.84375 0.4498,1.81699 2.07532,3.0225 3.86571,3.02533 0.16806,2.7e-4 0.33757,-0.0101 0.5077,-0.0315 l -0.3888,-2.97965 c -0.0347,0.01 -0.0704,0.017 -0.10961,0.017 -0.55254,0 -1,-0.44746 -1,-1 0,-0.55254 0.44746,-1 1,-1 0.55254,0 1,0.44746 1,1 0,0.11765 -0.0285,0.22486 -0.0726,0.32494 l 2.70058,1.38685 c 0.38616,-0.83016 0.46978,-1.78065 0.24701,-2.68054 -0.46449,-1.87636 -2.1723,-3.10719 -4.03125,-3.03125 z"
+         inkscape:connector-curvature="0" />
+      <path
+         style="color:#000000;fill:#555753;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         sodipodi:nodetypes="cccc"
+         id="path5032"
+         d="m -476.34496,159.36558 1.33905,4 c 0.73426,2.05595 3,0.38433 1.4966,-1 z"
+         inkscape:connector-curvature="0" />
+      <rect
+         y="151.36218"
+         x="-485"
+         height="16"
+         width="16"
+         id="rect6339"
+         style="fill:none;stroke:none" />
+    </g>
+  </g>
+</svg>
diff --git a/src/ui/gui/artwork/actions/16x16/display-information-working-file.svg b/src/ui/gui/artwork/actions/16x16/display-information-working-file.svg
new file mode 100644
index 0000000000..d02fcfd6d2
--- /dev/null
+++ b/src/ui/gui/artwork/actions/16x16/display-information-working-file.svg
@@ -0,0 +1,139 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<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"
+   width="16"
+   height="16"
+   id="svg3991"
+   version="1.1"
+   inkscape:version="0.48.4 r9939"
+   sodipodi:docname="display-information-external-file.svg">
+  <title
+     id="title4018">GNU PSPP flat icon set</title>
+  <defs
+     id="defs3993" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="22.4"
+     inkscape:cx="8"
+     inkscape:cy="7.9640184"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     inkscape:window-width="683"
+     inkscape:window-height="708"
+     inkscape:window-x="0"
+     inkscape:window-y="27"
+     inkscape:window-maximized="0"
+     showborder="false"
+     inkscape:snap-bbox="true">
+    <inkscape:grid
+       type="xygrid"
+       id="grid2983"
+       empspacing="5"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true" />
+    <sodipodi:guide
+       position="0,0"
+       orientation="0,16"
+       id="guide2985" />
+    <sodipodi:guide
+       position="16,0"
+       orientation="-16,0"
+       id="guide2987" />
+    <sodipodi:guide
+       position="16,16"
+       orientation="0,-16"
+       id="guide2989" />
+    <sodipodi:guide
+       position="0,16"
+       orientation="16,0"
+       id="guide2991" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata3996">
+    <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>GNU PSPP flat icon set</dc:title>
+        <cc:license
+           rdf:resource="http://creativecommons.org/licenses/by-sa/3.0/" />
+        <dc:creator>
+          <cc:Agent>
+            <dc:title>Bastián Díaz</dc:title>
+          </cc:Agent>
+        </dc:creator>
+        <dc:source>https://github.com/bedf/PSPPire-artwork</dc:source>
+      </cc:Work>
+      <cc:License
+         rdf:about="http://creativecommons.org/licenses/by-sa/3.0/">
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Reproduction" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Distribution" />
+        <cc:requires
+           rdf:resource="http://creativecommons.org/ns#Notice" />
+        <cc:requires
+           rdf:resource="http://creativecommons.org/ns#Attribution" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
+        <cc:requires
+           rdf:resource="http://creativecommons.org/ns#ShareAlike" />
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,-1036.3622)">
+    <g
+       style="display:inline"
+       id="g4856"
+       transform="translate(485,885.00002)">
+      <g
+         style="fill:#555753"
+         id="g3600"
+         transform="translate(-533.02362,-246.63782)">
+        <path
+           style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;color:#bebebe;fill:#555753;fill-opacity:1;stroke:none;stroke-width:1.99999976;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Andale Mono;-inkscape-font-specification:Andale Mono"
+           id="rect11749-5-91"
+           d="M 51.1875,398 C 49.985903,398 49,398.98758 49,400.1875 l 0,5.625 C 49,407.01242 49.985903,408 51.1875,408 l 9.625,0 C 62.014097,408 63,407.01242 63,405.8125 l 0,-5.625 C 63,398.98758 62.014097,398 60.8125,398 l -9.625,0 z m 0,2 9.625,0 C 60.936295,400 61,400.0566 61,400.1875 l 0,5.625 C 61,405.9434 60.936295,406 60.8125,406 l -9.625,0 C 51.063705,406 51,405.9434 51,405.8125 l 0,-5.625 C 51,400.0566 51.063705,400 51.1875,400 z"
+           inkscape:connector-curvature="0" />
+        <path
+           style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;color:#bebebe;fill:#555753;fill-opacity:1;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Andale Mono;-inkscape-font-specification:Andale Mono"
+           id="path11751-2-7"
+           d="m 53.90625,409.03125 a 0.50219246,0.50219246 0 1 0 0.09375,1 l 4,0 a 0.50005,0.50005 0 1 0 0,-1 l -4,0 a 0.50005,0.50005 0 0 0 -0.09375,0 z"
+           inkscape:connector-curvature="0" />
+        <path
+           style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;color:#bebebe;fill:#555753;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Andale Mono;-inkscape-font-specification:Andale Mono"
+           id="rect4340"
+           d="m 50.90625,411 a 1.0001,1.0001 0 0 0 -0.625,0.28125 l -1,1 A 1.0001,1.0001 0 0 0 50,414 l 12,0 a 1.0001,1.0001 0 0 0 0.71875,-1.71875 l -1,-1 A 1.0001,1.0001 0 0 0 61,411 l -10,0 a 1.0001,1.0001 0 0 0 -0.09375,0 z"
+           inkscape:connector-curvature="0" />
+      </g>
+      <rect
+         y="151.36218"
+         x="-485"
+         height="16"
+         width="16"
+         id="rect4854"
+         style="fill:none;stroke:none" />
+    </g>
+  </g>
+</svg>
diff --git a/src/ui/gui/artwork/actions/16x16/file-syntax-data.svg b/src/ui/gui/artwork/actions/16x16/file-syntax-data.svg
new file mode 100644
index 0000000000..5dd78a58f5
--- /dev/null
+++ b/src/ui/gui/artwork/actions/16x16/file-syntax-data.svg
@@ -0,0 +1,172 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<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"
+   width="16"
+   height="16"
+   id="svg3991"
+   version="1.1"
+   inkscape:version="0.48.4 r9939"
+   sodipodi:docname="file-syntax-data.svg">
+  <title
+     id="title4018">GNU PSPP flat icon set</title>
+  <defs
+     id="defs3993" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="22.4"
+     inkscape:cx="8"
+     inkscape:cy="6.1783041"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     inkscape:window-width="683"
+     inkscape:window-height="708"
+     inkscape:window-x="0"
+     inkscape:window-y="27"
+     inkscape:window-maximized="0"
+     showborder="false"
+     inkscape:snap-bbox="true">
+    <inkscape:grid
+       type="xygrid"
+       id="grid2983"
+       empspacing="5"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true" />
+    <sodipodi:guide
+       position="0,0"
+       orientation="0,16"
+       id="guide2985" />
+    <sodipodi:guide
+       position="16,0"
+       orientation="-16,0"
+       id="guide2987" />
+    <sodipodi:guide
+       position="16,16"
+       orientation="0,-16"
+       id="guide2989" />
+    <sodipodi:guide
+       position="0,16"
+       orientation="16,0"
+       id="guide2991" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata3996">
+    <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>GNU PSPP flat icon set</dc:title>
+        <cc:license
+           rdf:resource="http://creativecommons.org/licenses/by-sa/3.0/" />
+        <dc:creator>
+          <cc:Agent>
+            <dc:title>Bastián Díaz</dc:title>
+          </cc:Agent>
+        </dc:creator>
+        <dc:source>https://github.com/bedf/PSPPire-artwork</dc:source>
+      </cc:Work>
+      <cc:License
+         rdf:about="http://creativecommons.org/licenses/by-sa/3.0/">
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Reproduction" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Distribution" />
+        <cc:requires
+           rdf:resource="http://creativecommons.org/ns#Notice" />
+        <cc:requires
+           rdf:resource="http://creativecommons.org/ns#Attribution" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
+        <cc:requires
+           rdf:resource="http://creativecommons.org/ns#ShareAlike" />
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,-1036.3622)">
+    <g
+       style="display:inline"
+       id="g5057"
+       transform="translate(620,915.00002)">
+      <path
+         style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;color:#bebebe;fill:#555753;fill-opacity:1;stroke:none;stroke-width:1.20000005;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Bitstream Vera Sans;-inkscape-font-specification:Bitstream Vera Sans"
+         id="path11751-2-3"
+         d="m -615.58436,126.39153 a 0.55101873,0.57222136 0 0 0 -0.22957,0.98341 l 1.4348,1.49001 -1.4348,1.49001 a 0.5681541,0.59001607 0 1 0 0.80349,0.83441 l 1.83655,-1.90722 a 0.55101873,0.57222136 0 0 0 0,-0.8344 l -1.83655,-1.90722 a 0.55101873,0.57222136 0 0 0 -0.57392,-0.149 z"
+         inkscape:connector-curvature="0" />
+      <rect
+         style="color:#bebebe;fill:#555753;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         width="3"
+         height="1"
+         id="rect4987"
+         y="130.36218"
+         x="-612" />
+      <rect
+         y="121.36218"
+         x="-620"
+         height="16"
+         width="16"
+         id="rect4022"
+         style="fill:none;stroke:none" />
+      <rect
+         ry="1"
+         y="122.36218"
+         x="-619"
+         height="2"
+         width="14"
+         id="rect5000"
+         style="fill:#555753;fill-opacity:1;stroke:none" />
+      <rect
+         ry="1"
+         y="133.36218"
+         x="-619"
+         height="2"
+         width="14"
+         id="rect5000-4"
+         style="fill:#555753;fill-opacity:1;stroke:none;display:inline" />
+      <rect
+         ry="1"
+         transform="matrix(0,1,-1,0,0,0)"
+         y="617"
+         x="122.36218"
+         height="2"
+         width="12.999997"
+         id="rect5000-49"
+         style="fill:#555753;fill-opacity:1;stroke:none;display:inline" />
+      <rect
+         ry="1"
+         transform="matrix(0,1,-1,0,0,0)"
+         y="605"
+         x="122.36218"
+         height="2"
+         width="12.999997"
+         id="rect5000-49-7"
+         style="fill:#555753;fill-opacity:1;stroke:none;display:inline" />
+      <rect
+         y="121.36218"
+         x="-620"
+         height="16"
+         width="16"
+         id="rect5045"
+         style="fill:none;stroke:none" />
+    </g>
+  </g>
+</svg>
diff --git a/src/ui/gui/artwork/actions/16x16/file-system-data.svg b/src/ui/gui/artwork/actions/16x16/file-system-data.svg
new file mode 100644
index 0000000000..dba8abd04b
--- /dev/null
+++ b/src/ui/gui/artwork/actions/16x16/file-system-data.svg
@@ -0,0 +1,124 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<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"
+   width="16"
+   height="16"
+   id="svg3991"
+   version="1.1"
+   inkscape:version="0.48.4 r9939"
+   sodipodi:docname="file-syntax-data.svg">
+  <title
+     id="title4018">GNU PSPP flat icon set</title>
+  <defs
+     id="defs3993" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="22.4"
+     inkscape:cx="8"
+     inkscape:cy="6.1783041"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     inkscape:window-width="683"
+     inkscape:window-height="708"
+     inkscape:window-x="0"
+     inkscape:window-y="27"
+     inkscape:window-maximized="0"
+     showborder="false"
+     inkscape:snap-bbox="true">
+    <inkscape:grid
+       type="xygrid"
+       id="grid2983"
+       empspacing="5"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true" />
+    <sodipodi:guide
+       position="0,0"
+       orientation="0,16"
+       id="guide2985" />
+    <sodipodi:guide
+       position="16,0"
+       orientation="-16,0"
+       id="guide2987" />
+    <sodipodi:guide
+       position="16,16"
+       orientation="0,-16"
+       id="guide2989" />
+    <sodipodi:guide
+       position="0,16"
+       orientation="16,0"
+       id="guide2991" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata3996">
+    <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>GNU PSPP flat icon set</dc:title>
+        <cc:license
+           rdf:resource="http://creativecommons.org/licenses/by-sa/3.0/" />
+        <dc:creator>
+          <cc:Agent>
+            <dc:title>Bastián Díaz</dc:title>
+          </cc:Agent>
+        </dc:creator>
+        <dc:source>https://github.com/bedf/PSPPire-artwork</dc:source>
+      </cc:Work>
+      <cc:License
+         rdf:about="http://creativecommons.org/licenses/by-sa/3.0/">
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Reproduction" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Distribution" />
+        <cc:requires
+           rdf:resource="http://creativecommons.org/ns#Notice" />
+        <cc:requires
+           rdf:resource="http://creativecommons.org/ns#Attribution" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
+        <cc:requires
+           rdf:resource="http://creativecommons.org/ns#ShareAlike" />
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,-1036.3622)">
+    <g
+       style="display:inline"
+       id="g4888"
+       transform="translate(620,915.00002)">
+      <path
+         inkscape:connector-curvature="0"
+         id="rect3998"
+         d="m -617,123.36218 c -0.554,0 -1,0.446 -1,1 l 0,2 0,2 0,1 0,2 0,1 0,2 0,1 0,1 8,0 1,0 3,0 1,0 0,-2 0,-9 0,-1 c 0,-0.554 -0.446,-1 -1,-1 l -11,0 z m 0,3 3,0 0,2 -3,0 0,-2 z m 4,0 3,0 0,2 -3,0 0,-2 z m 4,0 3,0 0,2 -3,0 0,-2 z m -8,3 3,0 0,2 -3,0 0,-2 z m 4,0 3,0 0,2 -3,0 0,-2 z m 4,0 3,0 0,2 -3,0 0,-2 z m -8,3 3,0 0,2 -3,0 0,-2 z m 4,0 3,0 0,2 -3,0 0,-2 z m 4,0 3,0 0,2 -3,0 0,-2 z"
+         style="fill:#555753;stroke:none" />
+      <rect
+         y="121.36218"
+         x="-620"
+         height="16"
+         width="16"
+         id="rect4886"
+         style="fill:none;stroke:none" />
+    </g>
+  </g>
+</svg>
diff --git a/src/ui/gui/artwork/actions/16x16/help-about.svg b/src/ui/gui/artwork/actions/16x16/help-about.svg
index 3f72eef9ab..089f057dd9 100644
--- a/src/ui/gui/artwork/actions/16x16/help-about.svg
+++ b/src/ui/gui/artwork/actions/16x16/help-about.svg
@@ -104,24 +104,22 @@
      id="layer1"
      transform="translate(0,-1036.3622)">
     <g
-       transform="translate(-385,805.00006)"
-       style="display:inline"
-       id="g4776">
+       id="g3018">
       <rect
-         y="231.36218"
-         x="385"
+         y="1036.3622"
+         x="0"
          height="16"
          width="16"
          id="rect7355"
          style="fill:none;stroke:none" />
       <path
-         inkscape:connector-curvature="0"
          id="path3999"
-         d="m 393.5,232.36218 c -4.14213,0 -7.5,3.35786 -7.5,7.5 0,4.14214 3.35787,7.5 7.5,7.5 4.14213,0 7.5,-3.35786 7.5,-7.5 0,-4.14214 -3.35787,-7.5 -7.5,-7.5 z m 0,3 c 0.82843,0 1.5,0.67157 1.5,1.5 0,0.82843 -0.67157,1.5 -1.5,1.5 -0.82843,0 -1.5,-0.67157 -1.5,-1.5 0,-0.82843 0.67157,-1.5 1.5,-1.5 z m -1.5,4 3,0 0,6 -3,0 0,-6 z"
+         transform="translate(0,1036.3622)"
+         d="M 8.5 1 C 4.35787 1 1 4.3579 1 8.5 C 1 12.6421 4.35787 16 8.5 16 C 12.64213 16 16 12.6421 16 8.5 C 16 4.3579 12.64213 1 8.5 1 z M 8.5 4 C 9.32843 4 10 4.6716 10 5.5 C 10 6.3284 9.32843 7 8.5 7 C 7.67157 7 7 6.3284 7 5.5 C 7 4.6716 7.67157 4 8.5 4 z M 7 8 L 10 8 L 10 13 L 7 13 L 7 8 z "
          style="fill:#555753;stroke:none" />
       <rect
-         y="231.36218"
-         x="385"
+         y="1036.3622"
+         x="0"
          height="16"
          width="16"
          id="rect4006"
diff --git a/src/ui/gui/artwork/actions/16x16/run-all.svg b/src/ui/gui/artwork/actions/16x16/run-all.svg
index 9917af246c..054810fdc7 100644
--- a/src/ui/gui/artwork/actions/16x16/run-all.svg
+++ b/src/ui/gui/artwork/actions/16x16/run-all.svg
@@ -14,7 +14,7 @@
    id="svg3991"
    version="1.1"
    inkscape:version="0.48.4 r9939"
-   sodipodi:docname="data-sort-cases.svg">
+   sodipodi:docname="run-all.svg">
   <title
      id="title4018">GNU PSPP flat icon set</title>
   <defs
@@ -33,7 +33,7 @@
      inkscape:current-layer="layer1"
      showgrid="true"
      inkscape:window-width="683"
-     inkscape:window-height="709"
+     inkscape:window-height="708"
      inkscape:window-x="0"
      inkscape:window-y="27"
      inkscape:window-maximized="0"
@@ -106,12 +106,12 @@
     <g
        transform="translate(-340,915.00002)"
        style="display:inline"
-       id="g7432">
+       id="g5352">
       <path
          style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;color:#000000;fill:#555753;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Bitstream Vera Sans;-inkscape-font-specification:Bitstream Vera Sans"
          sodipodi:nodetypes="ccccccsccccc"
          id="path3807-1-1-9-38-4"
-         d="m 344.0313,124.36216 0,10 0.90625,0 0.0937,0 c 0.17491,0.001 0.34778,-0.0388 0.5,-0.125 l 7,-4 c 0.3107,-0.17189 0.46875,-0.52345 0.46875,-0.875 0,-0.35155 -0.15805,-0.70311 -0.46875,-0.875 l -7,-4 c -0.15222,-0.0862 -0.32509,-0.12631 -0.5,-0.125 l -0.0937,0 z"
+         d="m 345.03135,125.36216 0,7.00001 0.6031,0 0.0624,0 c 0.1164,7e-4 0.23144,-0.0271 0.33275,-0.0875 l 4.65849,-2.80001 c 0.20676,-0.12032 0.31195,-0.36642 0.31195,-0.6125 0,-0.24609 -0.10519,-0.49218 -0.31195,-0.6125 l -4.65849,-2.8 c -0.10131,-0.0604 -0.21635,-0.0884 -0.33275,-0.0875 l -0.0624,0 z"
          inkscape:connector-curvature="0" />
       <rect
          y="121.36218"
@@ -120,6 +120,11 @@
          width="16"
          id="rect4993"
          style="fill:none;stroke:none" />
+      <path
+         inkscape:connector-curvature="0"
+         id="rect5000-1"
+         d="m 342,122.36218 c -0.554,0 -1,0.446 -1,1 l 0,11 c 0,0.554 0.446,1 1,1 l 12,0 c 0.1385,0 0.25528,-0.0433 0.375,-0.0937 0.35916,-0.15141 0.625,-0.49075 0.625,-0.90625 l 0,-11 c 0,-0.554 -0.446,-1 -1,-1 l -12,0 z m 1,2 10,0 0,9 -10,0 0,-9 z"
+         style="opacity:0.35;fill:#555753;fill-opacity:1;stroke:none" />
     </g>
   </g>
 </svg>
diff --git a/src/ui/gui/artwork/actions/16x16/run-current-line.svg b/src/ui/gui/artwork/actions/16x16/run-current-line.svg
index fa3c9c94ab..c83ddac77f 100644
--- a/src/ui/gui/artwork/actions/16x16/run-current-line.svg
+++ b/src/ui/gui/artwork/actions/16x16/run-current-line.svg
@@ -14,7 +14,7 @@
    id="svg3991"
    version="1.1"
    inkscape:version="0.48.4 r9939"
-   sodipodi:docname="run-selection.svg">
+   sodipodi:docname="run-current-line.svg">
   <title
      id="title4018">GNU PSPP flat icon set</title>
   <defs
@@ -33,7 +33,7 @@
      inkscape:current-layer="layer1"
      showgrid="true"
      inkscape:window-width="683"
-     inkscape:window-height="709"
+     inkscape:window-height="708"
      inkscape:window-x="0"
      inkscape:window-y="27"
      inkscape:window-maximized="0"
@@ -106,20 +106,7 @@
     <g
        transform="translate(-430,915.00002)"
        style="display:inline"
-       id="g7054">
-      <rect
-         y="130.36218"
-         x="438"
-         height="2"
-         width="6"
-         id="rect5061"
-         style="fill:#555753;fill-opacity:1;stroke:none" />
-      <path
-         id="path8864-9-6-3"
-         style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;color:#bebebe;fill:#555753;fill-opacity:1;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Bitstream Vera Sans;-inkscape-font-specification:Bitstream Vera Sans"
-         inkscape:connector-curvature="0"
-         d="m 432,126.36218 0,1 c 0,0.25689 0.12983,0.52846 0.3125,0.71875 l 1.28125,1.28125 -1.28125,1.28125 C 432.12983,130.83372 432,131.10529 432,131.36218 l 0,1 1,0 c 0.30945,0 0.55232,-0.0903 0.75,-0.28125 l 2.65625,-2.71875 -2.65625,-2.71875 c -0.19768,-0.19095 -0.44055,-0.28125 -0.75,-0.28125 l -1,0 z"
-         sodipodi:nodetypes="ccccccccccccc" />
+       id="g5461">
       <rect
          y="121.36218"
          x="430"
@@ -127,6 +114,39 @@
          width="16"
          id="rect5006"
          style="fill:none;stroke:none" />
+      <path
+         inkscape:connector-curvature="0"
+         id="rect5000-1-2-0"
+         d="m 432,122.36218 c -0.554,0 -1,0.446 -1,1 l 0,11 c 0,0.554 0.446,1 1,1 l 12,0 c 0.1385,0 0.25528,-0.0433 0.375,-0.0937 0.35916,-0.15141 0.625,-0.49075 0.625,-0.90625 l 0,-11 c 0,-0.554 -0.446,-1 -1,-1 l -12,0 z m 1,2 10,0 0,9 -10,0 0,-9 z"
+         style="opacity:0.35;fill:#555753;fill-opacity:1;stroke:none;display:inline" />
+      <rect
+         y="126.36218"
+         x="431"
+         height="2"
+         width="14"
+         id="rect5405"
+         style="fill:#555753;fill-opacity:1;stroke:none" />
+      <rect
+         y="130.36218"
+         x="431"
+         height="2"
+         width="14"
+         id="rect5405-4"
+         style="fill:#555753;fill-opacity:1;stroke:none;display:inline" />
+      <rect
+         y="126.36218"
+         x="431"
+         height="6"
+         width="2"
+         id="rect5405-0"
+         style="fill:#555753;fill-opacity:1;stroke:none;display:inline" />
+      <rect
+         y="126.36218"
+         x="443"
+         height="6"
+         width="2"
+         id="rect5405-0-7"
+         style="fill:#555753;fill-opacity:1;stroke:none;display:inline" />
     </g>
   </g>
 </svg>
diff --git a/src/ui/gui/artwork/actions/16x16/run-selection.svg b/src/ui/gui/artwork/actions/16x16/run-selection.svg
index b61acd62cc..1c200838aa 100644
--- a/src/ui/gui/artwork/actions/16x16/run-selection.svg
+++ b/src/ui/gui/artwork/actions/16x16/run-selection.svg
@@ -14,7 +14,7 @@
    id="svg3991"
    version="1.1"
    inkscape:version="0.48.4 r9939"
-   sodipodi:docname="run-all.svg">
+   sodipodi:docname="run-selection.svg">
   <title
      id="title4018">GNU PSPP flat icon set</title>
   <defs
@@ -33,7 +33,7 @@
      inkscape:current-layer="layer1"
      showgrid="true"
      inkscape:window-width="683"
-     inkscape:window-height="709"
+     inkscape:window-height="708"
      inkscape:window-x="0"
      inkscape:window-y="27"
      inkscape:window-maximized="0"
@@ -106,18 +106,18 @@
     <g
        transform="translate(-385,915.00002)"
        style="display:inline"
-       id="g5001">
+       id="g5399">
       <path
          id="path8864-9-6"
          style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;color:#bebebe;fill:#555753;fill-opacity:1;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Bitstream Vera Sans;-inkscape-font-specification:Bitstream Vera Sans"
          inkscape:connector-curvature="0"
-         d="m 387,126.36218 0,1 c 0,0.25689 0.12983,0.52846 0.3125,0.71875 l 1.28125,1.28125 -1.28125,1.28125 C 387.12983,130.83372 387,131.10529 387,131.36218 l 0,1 1,0 c 0.30945,0 0.55232,-0.0903 0.75,-0.28125 l 2.65625,-2.71875 -2.65625,-2.71875 c -0.19768,-0.19095 -0.44055,-0.28125 -0.75,-0.28125 l -1,0 z"
+         d="m 389,126.36218 0,0.83334 c 0,0.21407 0.0884,0.44038 0.21277,0.59895 l 0.87234,1.06771 -0.87234,1.06771 C 389.08839,130.08846 389,130.31477 389,130.52885 l 0,0.83333 0.68085,0 c 0.21069,0 0.37605,-0.0752 0.51064,-0.23437 L 392,128.86218 l -1.80851,-2.26562 c -0.13459,-0.15913 -0.29995,-0.23438 -0.51064,-0.23438 l -0.68085,0 z"
          sodipodi:nodetypes="ccccccccccccc" />
       <path
          id="path8866-7-0"
          style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;color:#bebebe;fill:#555753;fill-opacity:1;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Bitstream Vera Sans;-inkscape-font-specification:Bitstream Vera Sans"
          inkscape:connector-curvature="0"
-         d="m 399,126.36218 0,1 c 0,0.25689 -0.12982,0.52846 -0.3125,0.71875 l -1.28125,1.28125 1.28125,1.28125 c 0.18268,0.19029 0.3125,0.46186 0.3125,0.71875 l 0,1 -1,0 c -0.30944,0 -0.55232,-0.0903 -0.75,-0.28125 l -2.65625,-2.71875 2.65625,-2.71875 c 0.19768,-0.19095 0.44056,-0.28125 0.75,-0.28125 l 1,0 z"
+         d="m 397,126.36218 0,0.83334 c 0,0.21407 -0.0884,0.44038 -0.21277,0.59895 l -0.87234,1.06771 0.87234,1.06771 c 0.12438,0.15857 0.21277,0.38488 0.21277,0.59896 l 0,0.83333 -0.68085,0 c -0.21068,0 -0.37605,-0.0752 -0.51064,-0.23437 L 394,128.86218 l 1.80851,-2.26562 c 0.13459,-0.15913 0.29996,-0.23438 0.51064,-0.23438 l 0.68085,0 z"
          sodipodi:nodetypes="ccccccccccccc" />
       <rect
          y="121.36218"
@@ -126,6 +126,11 @@
          width="16"
          id="rect4999"
          style="fill:none;stroke:none" />
+      <path
+         inkscape:connector-curvature="0"
+         id="rect5000-1-2-6"
+         d="m 387,122.36218 c -0.554,0 -1,0.446 -1,1 l 0,11 c 0,0.554 0.446,1 1,1 l 12,0 c 0.1385,0 0.25528,-0.0433 0.375,-0.0937 0.35916,-0.15141 0.625,-0.49075 0.625,-0.90625 l 0,-11 c 0,-0.554 -0.446,-1 -1,-1 l -12,0 z m 1,2 10,0 0,9 -10,0 0,-9 z"
+         style="opacity:0.35;fill:#555753;fill-opacity:1;stroke:none;display:inline" />
     </g>
   </g>
 </svg>
diff --git a/src/ui/gui/artwork/actions/16x16/run-to-end.svg b/src/ui/gui/artwork/actions/16x16/run-to-end.svg
index 1aadd3fabb..78d973808c 100644
--- a/src/ui/gui/artwork/actions/16x16/run-to-end.svg
+++ b/src/ui/gui/artwork/actions/16x16/run-to-end.svg
@@ -14,7 +14,7 @@
    id="svg3991"
    version="1.1"
    inkscape:version="0.48.4 r9939"
-   sodipodi:docname="run-current-line.svg">
+   sodipodi:docname="run-to-end.svg">
   <title
      id="title4018">GNU PSPP flat icon set</title>
   <defs
@@ -33,7 +33,7 @@
      inkscape:current-layer="layer1"
      showgrid="true"
      inkscape:window-width="683"
-     inkscape:window-height="709"
+     inkscape:window-height="708"
      inkscape:window-x="0"
      inkscape:window-y="27"
      inkscape:window-maximized="0"
@@ -106,28 +106,32 @@
     <g
        transform="translate(-475,915.00002)"
        style="display:inline"
-       id="g4203">
+       id="g5389">
+      <path
+         style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;color:#000000;fill:#555753;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Bitstream Vera Sans;-inkscape-font-specification:Bitstream Vera Sans"
+         sodipodi:nodetypes="ccccccsccccc"
+         id="path3807-1-1-9-38-4-1"
+         d="m 480.03134,126.36215 0,5.00002 0.40101,0 0.0415,0 c 0.0774,5e-4 0.15389,-0.0194 0.22125,-0.0625 l 3.09748,-2.00001 c 0.13748,-0.0859 0.20742,-0.26173 0.20742,-0.4375 0,-0.17578 -0.0699,-0.35156 -0.20742,-0.4375 l -3.09748,-2.00001 c -0.0674,-0.0431 -0.14386,-0.0631 -0.22125,-0.0625 l -0.0415,0 z"
+         inkscape:connector-curvature="0" />
       <rect
          y="121.36218"
          x="475"
          height="16"
          width="16"
-         id="rect5015"
+         id="rect4993-9"
          style="fill:none;stroke:none" />
-      <rect
-         transform="matrix(0,1,-1,0,0,0)"
-         y="-489"
-         x="124.36218"
-         height="2"
-         width="10"
-         id="rect5061-5"
-         style="fill:#555753;fill-opacity:1;stroke:none;display:inline" />
       <path
          inkscape:connector-curvature="0"
-         d="m 477,130.36218 5.5625,0 -1.28125,1.28125 c -0.18815,0.18816 -0.28124,0.45345 -0.28125,0.71875 l 0,1 1,0 c 0.2653,-1e-5 0.53058,-0.0931 0.71875,-0.28125 l 3,-3 0.28125,-0.28125 0,-0.875 -0.28125,-0.28125 -3,-3 C 482.53058,125.45524 482.2653,125.36219 482,125.36218 l -1,0 0,1 c 10e-6,0.2653 0.0931,0.53059 0.28125,0.71875 l 1.28125,1.28125 -5.5625,0 z"
-         id="path3613-3"
-         sodipodi:nodetypes="ccccccccccccccccccc"
-         style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;color:#000000;fill:#555753;fill-opacity:1;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Bitstream Vera Sans;-inkscape-font-specification:Bitstream Vera Sans" />
+         id="rect5000-1-8"
+         d="m 477,122.36218 c -0.554,0 -1,0.446 -1,1 l 0,11 c 0,0.554 0.446,1 1,1 l 12,0 c 0.1385,0 0.25528,-0.0433 0.375,-0.0937 0.35916,-0.15141 0.625,-0.49075 0.625,-0.90625 l 0,-11 c 0,-0.554 -0.446,-1 -1,-1 l -12,0 z m 1,2 10,0 0,9 -10,0 0,-9 z"
+         style="opacity:0.35;fill:#555753;fill-opacity:1;stroke:none" />
+      <rect
+         y="126.36218"
+         x="484"
+         height="5"
+         width="2"
+         id="rect5387"
+         style="fill:#555753;fill-opacity:1;stroke:none" />
     </g>
   </g>
 </svg>
diff --git a/src/ui/gui/artwork/actions/16x16/transform-automatic-recode.svg b/src/ui/gui/artwork/actions/16x16/transform-automatic-recode.svg
index 7e3218197a..5ad19c5307 100644
--- a/src/ui/gui/artwork/actions/16x16/transform-automatic-recode.svg
+++ b/src/ui/gui/artwork/actions/16x16/transform-automatic-recode.svg
@@ -14,7 +14,7 @@
    id="svg3991"
    version="1.1"
    inkscape:version="0.48.4 r9939"
-   sodipodi:docname="transform-rank-cases.svg">
+   sodipodi:docname="transform-automatic-recode.svg">
   <title
      id="title4018">GNU PSPP flat icon set</title>
   <defs
@@ -33,7 +33,7 @@
      inkscape:current-layer="layer1"
      showgrid="true"
      inkscape:window-width="683"
-     inkscape:window-height="709"
+     inkscape:window-height="708"
      inkscape:window-x="0"
      inkscape:window-y="27"
      inkscape:window-maximized="0"
@@ -106,7 +106,7 @@
     <g
        transform="translate(485,805.00002)"
        style="display:inline"
-       id="g7184">
+       id="g6156">
       <path
          inkscape:connector-curvature="0"
          id="path6429"
@@ -118,13 +118,13 @@
          inkscape:connector-curvature="0"
          d="m -473.91774,239.3649 c -0.25505,0.0518 -0.49195,0.14383 -0.72728,0.24026 -0.0185,0.68573 0.0963,1.58356 -0.17316,1.81914 -0.26483,0.23149 -1.15073,0.0377 -1.83549,-0.0344 -0.14561,0.25975 -0.26073,0.53295 -0.34633,0.82376 0.52984,0.43479 1.26394,0.92153 1.28139,1.26996 0.0177,0.35278 -0.69421,0.88405 -1.17749,1.37294 0.11457,0.28319 0.27721,0.54208 0.45022,0.78944 0.67415,-0.13885 1.51427,-0.41028 1.80086,-0.20594 0.29181,0.20804 0.29391,1.10421 0.38096,1.78481 0.27655,0.0824 0.56797,0.11478 0.8658,0.13729 0.3118,-0.60917 0.62882,-1.4496 0.96969,-1.54455 0.34993,-0.0974 1.06783,0.50319 1.66234,0.85808 0.24238,-0.1665 0.45763,-0.3702 0.65801,-0.5835 -0.28131,-0.6286 -0.79913,-1.41897 -0.65801,-1.75049 0.14125,-0.33181 1.08097,-0.51581 1.7316,-0.75511 0.004,-0.0807 0.0346,-0.15831 0.0346,-0.24026 0,-0.21019 -0.0382,-0.41626 -0.0693,-0.61782 -0.6717,-0.17663 -1.626,-0.26503 -1.80087,-0.58349 -0.17371,-0.31634 0.26795,-1.1658 0.48485,-1.81914 -0.22294,-0.19615 -0.46481,-0.37032 -0.72728,-0.51485 -0.5551,0.41202 -1.20168,1.09215 -1.55844,1.02969 -0.35118,-0.0615 -0.73463,-0.90015 -1.10822,-1.4759 -0.0445,0.008 -0.0944,-0.009 -0.13853,0 z m 0.69263,2.0594 c 1.03285,0 1.87014,0.82982 1.87014,1.85346 0,1.02363 -0.83729,1.85346 -1.87014,1.85346 -1.03283,0 -1.87012,-0.82983 -1.87012,-1.85346 0,-1.02364 0.83729,-1.85346 1.87012,-1.85346 z" />
       <path
-         id="rect6194-2-6"
-         d="m -483,231.36218 c -1.108,0 -2,0.892 -2,2 l 0,4 c 0,1.108 0.892,2 2,2 l 4,0 c 1.108,0 2,-0.892 2,-2 l 0,-4 c 0,-1.108 -0.892,-2 -2,-2 l -4,0 z m 0.71875,1.28125 1.28125,1.28125 1.28125,-1.28125 1.4375,1.40625 -1.28125,1.3125 1.28125,1.28125 -1.4375,1.40625 -1.28125,-1.28125 -1.28125,1.28125 -1.4375,-1.40625 1.28125,-1.28125 -1.28125,-1.3125 1.4375,-1.40625 z"
+         id="path6429-3"
+         d="m -469,237.36218 c 0,-2.20914 -1.79086,-4 -4,-4 l 0,-2 -3,3 3,3 0,-2 c 1.10457,0 2,0.89542 2,2 l 2,0 z"
          style="fill:#555753;fill-opacity:1;stroke:none;display:inline"
          inkscape:connector-curvature="0" />
       <path
-         id="path6429-3"
-         d="m -469,237.36218 c 0,-2.20914 -1.79086,-4 -4,-4 l 0,-2 -3,3 3,3 0,-2 c 1.10457,0 2,0.89542 2,2 l 2,0 z"
+         id="rect6016-6"
+         d="m -483,231.375 c -1.108,0 -2,0.892 -2,2 l 0,4 c 0,1.108 0.892,2 2,2 l 4,0 c 1.108,0 2,-0.892 2,-2 l 0,-4 c 0,-1.108 -0.892,-2 -2,-2 l -4,0 z m 0.53125,1.46875 1.46875,1.46875 1.46875,-1.46875 1.0625,1.0625 -1.46875,1.46875 1.46875,1.46875 -1.0625,1.0625 -1.46875,-1.46875 -1.46875,1.46875 -1.0625,-1.0625 1.46875,-1.46875 -1.46875,-1.46875 1.0625,-1.0625 z"
          style="fill:#555753;fill-opacity:1;stroke:none;display:inline"
          inkscape:connector-curvature="0" />
     </g>
diff --git a/src/ui/gui/artwork/actions/16x16/transform-compute.svg b/src/ui/gui/artwork/actions/16x16/transform-compute.svg
index 0a07df95a6..6728049a57 100644
--- a/src/ui/gui/artwork/actions/16x16/transform-compute.svg
+++ b/src/ui/gui/artwork/actions/16x16/transform-compute.svg
@@ -14,7 +14,7 @@
    id="svg3991"
    version="1.1"
    inkscape:version="0.48.4 r9939"
-   sodipodi:docname="analyze-regression.svg">
+   sodipodi:docname="transform-compute.svg">
   <title
      id="title4018">GNU PSPP flat icon set</title>
   <defs
@@ -33,7 +33,7 @@
      inkscape:current-layer="layer1"
      showgrid="true"
      inkscape:window-width="683"
-     inkscape:window-height="709"
+     inkscape:window-height="708"
      inkscape:window-x="0"
      inkscape:window-y="27"
      inkscape:window-maximized="0"
@@ -106,11 +106,11 @@
     <g
        transform="translate(620,805.00002)"
        style="display:inline"
-       id="g5710">
+       id="g5474">
       <path
          inkscape:connector-curvature="0"
          id="rect3725-0-9-5-1"
-         d="m -617,232.375 c -0.554,0 -1,0.446 -1,1 l 0,3 0,9 0,1 1,0 10,0 1,0 0,-1 0,-9 0,-3 c 0,-0.554 -0.446,-1 -1,-1 l -10,0 z m 1,2 8,0 0,2 -8,0 0,-2 z m 0,3 2,0 0,2 -2,0 0,-2 z m 3,0 2,0 0,2 -2,0 0,-2 z m 3,0 2,0 0,2 -2,0 0,-2 z m -6,3 2,0 0,2 -2,0 0,-2 z m 3,0 2,0 0,2 -2,0 0,-2 z m 3,0 2,0 0,2 -2,0 0,-2 z m -6,3 2,0 0,2 -2,0 0,-2 z m 3,0 2,0 0,2 -2,0 0,-2 z m 3,0 2,0 0,2 -2,0 0,-2 z"
+         d="m -617,232.375 c -0.554,0 -1,0.446 -1,1 l 0,3 0,9 0,1 0,1 12,0 0,-1 0,-1 0,-9 0,-3 c 0,-0.554 -0.446,-1 -1,-1 l -10,0 z m 1,2 8,0 0,2 -8,0 0,-2 z m 0,3 2,0 0,2 -2,0 0,-2 z m 3,0 2,0 0,2 -2,0 0,-2 z m 3,0 2,0 0,2 -2,0 0,-2 z m -6,3 2,0 0,2 -2,0 0,-2 z m 3,0 2,0 0,2 -2,0 0,-2 z m 3,0 2,0 0,2 -2,0 0,-2 z m -6,3 2,0 0,2 -2,0 0,-2 z m 3,0 2,0 0,2 -2,0 0,-2 z m 3,0 2,0 0,2 -2,0 0,-2 z"
          style="fill:#555753;display:inline" />
       <rect
          y="231.36218"
diff --git a/src/ui/gui/artwork/actions/16x16/transform-in-to-different-variables.svg b/src/ui/gui/artwork/actions/16x16/transform-in-to-different-variables.svg
index cadf8d6000..796dcba27d 100644
--- a/src/ui/gui/artwork/actions/16x16/transform-in-to-different-variables.svg
+++ b/src/ui/gui/artwork/actions/16x16/transform-in-to-different-variables.svg
@@ -14,7 +14,7 @@
    id="svg3991"
    version="1.1"
    inkscape:version="0.48.4 r9939"
-   sodipodi:docname="transform-in-to-same-variables.svg">
+   sodipodi:docname="transform-in-to-different-variables.svg">
   <title
      id="title4018">GNU PSPP flat icon set</title>
   <defs
@@ -33,7 +33,7 @@
      inkscape:current-layer="layer1"
      showgrid="true"
      inkscape:window-width="683"
-     inkscape:window-height="709"
+     inkscape:window-height="708"
      inkscape:window-x="0"
      inkscape:window-y="27"
      inkscape:window-maximized="0"
@@ -106,17 +106,7 @@
     <g
        transform="translate(620,775.00002)"
        style="display:inline"
-       id="g5867">
-      <path
-         id="rect6194-0"
-         d="m -610,269.36218 c -1.108,0 -2,0.892 -2,2 l 0,4 c 0,1.108 0.892,2 2,2 l 4,0 c 1.108,0 2,-0.892 2,-2 l 0,-4 c 0,-1.108 -0.892,-2 -2,-2 l -4,0 z m 0.71875,1.28125 1.28125,1.28125 1.28125,-1.28125 1.4375,1.40625 -1.71875,1.71875 0,2.59375 -2,0 0,-2.59375 -1.71875,-1.71875 1.4375,-1.40625 z"
-         style="fill:#555753;fill-opacity:1;stroke:none;display:inline"
-         inkscape:connector-curvature="0" />
-      <path
-         inkscape:connector-curvature="0"
-         id="rect6194-2-8"
-         d="m -618,261.36218 c -1.108,0 -2,0.892 -2,2 l 0,4 c 0,1.108 0.892,2 2,2 l 4,0 c 1.108,0 2,-0.892 2,-2 l 0,-4 c 0,-1.108 -0.892,-2 -2,-2 l -4,0 z m 0.71875,1.28125 1.28125,1.28125 1.28125,-1.28125 1.4375,1.40625 -1.28125,1.3125 1.28125,1.28125 -1.4375,1.40625 -1.28125,-1.28125 -1.28125,1.28125 -1.4375,-1.40625 1.28125,-1.28125 -1.28125,-1.3125 1.4375,-1.40625 z"
-         style="fill:#555753;fill-opacity:1;stroke:none;display:inline" />
+       id="g6183">
       <path
          inkscape:connector-curvature="0"
          id="path6429-8"
@@ -129,6 +119,16 @@
          width="16"
          id="rect6590"
          style="fill:none;stroke:none" />
+      <path
+         id="rect6016-0"
+         d="m -618,261.36218 c -1.108,0 -2,0.892 -2,2 l 0,4 c 0,1.108 0.892,2 2,2 l 4,0 c 1.108,0 2,-0.892 2,-2 l 0,-4 c 0,-1.108 -0.892,-2 -2,-2 l -4,0 z m 0.53125,1.46875 1.46875,1.46875 1.46875,-1.46875 1.0625,1.0625 -1.46875,1.46875 1.46875,1.46875 -1.0625,1.0625 -1.46875,-1.46875 -1.46875,1.46875 -1.0625,-1.0625 1.46875,-1.46875 -1.46875,-1.46875 1.0625,-1.0625 z"
+         style="fill:#555753;fill-opacity:1;stroke:none;display:inline"
+         inkscape:connector-curvature="0" />
+      <path
+         id="rect6009-6"
+         d="m -610,269.36218 c -1.108,0 -2,0.892 -2,2 l 0,4 c 0,1.108 0.892,2 2,2 l 4,0 c 1.108,0 2,-0.892 2,-2 l 0,-4 c 0,-1.108 -0.892,-2 -2,-2 l -4,0 z m 0.53125,1.46875 1.46875,1.46875 1.46875,-1.46875 1.0625,1.0625 -1.78125,1.78125 0,2.6875 -1.5,0 0,-2.6875 -1.78125,-1.78125 1.0625,-1.0625 z"
+         style="fill:#555753;fill-opacity:1;stroke:none;display:inline"
+         inkscape:connector-curvature="0" />
     </g>
   </g>
 </svg>
diff --git a/src/ui/gui/artwork/actions/16x16/transform-in-to-same-variables.svg b/src/ui/gui/artwork/actions/16x16/transform-in-to-same-variables.svg
index 499faf4095..2064245e56 100644
--- a/src/ui/gui/artwork/actions/16x16/transform-in-to-same-variables.svg
+++ b/src/ui/gui/artwork/actions/16x16/transform-in-to-same-variables.svg
@@ -14,7 +14,7 @@
    id="svg3991"
    version="1.1"
    inkscape:version="0.48.4 r9939"
-   sodipodi:docname="transform-automatic-recode.svg">
+   sodipodi:docname="transform-in-to-same-variables.svg">
   <title
      id="title4018">GNU PSPP flat icon set</title>
   <defs
@@ -33,7 +33,7 @@
      inkscape:current-layer="layer1"
      showgrid="true"
      inkscape:window-width="683"
-     inkscape:window-height="709"
+     inkscape:window-height="708"
      inkscape:window-x="0"
      inkscape:window-y="27"
      inkscape:window-maximized="0"
@@ -106,17 +106,7 @@
     <g
        transform="translate(440,805.00002)"
        style="display:inline"
-       id="g6604">
-      <path
-         inkscape:connector-curvature="0"
-         id="rect6194-2-4"
-         d="m -438,231.36218 c -1.108,0 -2,0.892 -2,2 l 0,4 c 0,1.108 0.892,2 2,2 l 4,0 c 1.108,0 2,-0.892 2,-2 l 0,-4 c 0,-1.108 -0.892,-2 -2,-2 l -4,0 z m 0.71875,1.28125 1.28125,1.28125 1.28125,-1.28125 1.4375,1.40625 -1.28125,1.3125 1.28125,1.28125 -1.4375,1.40625 -1.28125,-1.28125 -1.28125,1.28125 -1.4375,-1.40625 1.28125,-1.28125 -1.28125,-1.3125 1.4375,-1.40625 z"
-         style="fill:#555753;fill-opacity:1;stroke:none;display:inline" />
-      <path
-         inkscape:connector-curvature="0"
-         id="rect6194-2-62"
-         d="m -430,239.36218 c -1.108,0 -2,0.892 -2,2 l 0,4 c 0,1.108 0.892,2 2,2 l 4,0 c 1.108,0 2,-0.892 2,-2 l 0,-4 c 0,-1.108 -0.892,-2 -2,-2 l -4,0 z m 0.71875,1.28125 1.28125,1.28125 1.28125,-1.28125 1.4375,1.40625 -1.28125,1.3125 1.28125,1.28125 -1.4375,1.40625 -1.28125,-1.28125 -1.28125,1.28125 -1.4375,-1.40625 1.28125,-1.28125 -1.28125,-1.3125 1.4375,-1.40625 z"
-         style="fill:#555753;fill-opacity:1;stroke:none;display:inline" />
+       id="g6150">
       <path
          id="path6429-50"
          d="m -440,241.36218 c 0,2.20914 1.79086,4 4,4 l 0,2 3,-3 -3,-3 0,2 c -1.10457,0 -2,-0.89542 -2,-2 l -2,0 z"
@@ -127,6 +117,16 @@
          d="m -424,237.36218 c 0,-2.20914 -1.79086,-4 -4,-4 l 0,-2 -3,3 3,3 0,-2 c 1.10457,0 2,0.89542 2,2 l 2,0 z"
          style="fill:#555753;fill-opacity:1;stroke:none;display:inline"
          inkscape:connector-curvature="0" />
+      <path
+         id="rect6016-1"
+         d="m -438,231.36218 c -1.108,0 -2,0.892 -2,2 l 0,4 c 0,1.108 0.892,2 2,2 l 4,0 c 1.108,0 2,-0.892 2,-2 l 0,-4 c 0,-1.108 -0.892,-2 -2,-2 l -4,0 z m 0.53125,1.46875 1.46875,1.46875 1.46875,-1.46875 1.0625,1.0625 -1.46875,1.46875 1.46875,1.46875 -1.0625,1.0625 -1.46875,-1.46875 -1.46875,1.46875 -1.0625,-1.0625 1.46875,-1.46875 -1.46875,-1.46875 1.0625,-1.0625 z"
+         style="fill:#555753;fill-opacity:1;stroke:none;display:inline"
+         inkscape:connector-curvature="0" />
+      <path
+         id="rect6016-5"
+         d="m -430,239.36218 c -1.108,0 -2,0.892 -2,2 l 0,4 c 0,1.108 0.892,2 2,2 l 4,0 c 1.108,0 2,-0.892 2,-2 l 0,-4 c 0,-1.108 -0.892,-2 -2,-2 l -4,0 z m 0.53125,1.46875 1.46875,1.46875 1.46875,-1.46875 1.0625,1.0625 -1.46875,1.46875 1.46875,1.46875 -1.0625,1.0625 -1.46875,-1.46875 -1.46875,1.46875 -1.0625,-1.0625 1.46875,-1.46875 -1.46875,-1.46875 1.0625,-1.0625 z"
+         style="fill:#555753;fill-opacity:1;stroke:none;display:inline"
+         inkscape:connector-curvature="0" />
     </g>
   </g>
 </svg>
diff --git a/src/ui/gui/artwork/actions/16x16/transform-rank-cases.svg b/src/ui/gui/artwork/actions/16x16/transform-rank-cases.svg
index 67404fa240..4831e03bde 100644
--- a/src/ui/gui/artwork/actions/16x16/transform-rank-cases.svg
+++ b/src/ui/gui/artwork/actions/16x16/transform-rank-cases.svg
@@ -14,7 +14,7 @@
    id="svg3991"
    version="1.1"
    inkscape:version="0.48.4 r9939"
-   sodipodi:docname="transform-compute.svg">
+   sodipodi:docname="transform-rank-cases.svg">
   <title
      id="title4018">GNU PSPP flat icon set</title>
   <defs
@@ -33,7 +33,7 @@
      inkscape:current-layer="layer1"
      showgrid="true"
      inkscape:window-width="683"
-     inkscape:window-height="709"
+     inkscape:window-height="708"
      inkscape:window-x="0"
      inkscape:window-y="27"
      inkscape:window-maximized="0"
@@ -106,7 +106,7 @@
     <g
        transform="translate(530,805.00002)"
        style="display:inline"
-       id="g5610">
+       id="g5195">
       <path
          inkscape:connector-curvature="0"
          id="path4625"
@@ -131,9 +131,9 @@
          style="fill:none;stroke:none" />
       <path
          inkscape:connector-curvature="0"
-         id="path5338-7"
-         d="m -522.5,232.36218 c -2.52128,0.25605 -4.5,2.41117 -4.5,5 0,2.76142 2.23858,5 5,5 2.76142,0 5,-2.23858 5,-5 0,-2.76142 -2.23858,-5 -5,-5 -0.17259,0 -0.33191,-0.0171 -0.5,0 z m 0.5,1 c 1.10457,0 2,0.89543 2,2 0,1.10457 -0.89543,2 -2,2 -1.10457,0 -2,-0.89543 -2,-2 0,-1.10457 0.89543,-2 2,-2 z m -1,4 0,1 2,0 0,-1 c 1.10457,0 2,0.89543 2,2 0,1.10457 -1.34315,2 -3,2 -1.65685,0 -3,-0.89543 -3,-2 0,-1.10457 0.89543,-2 2,-2 z"
-         style="fill:#555753;fill-opacity:1;stroke:none;display:inline" />
+         id="path5185"
+         d="m -522.5,232.375 c -2.52128,0.25605 -4.5,2.41116 -4.5,5 0,2.76143 2.23858,5 5,5 2.76142,0 5,-2.23857 5,-5 0,-2.76143 -2.23858,-5 -5,-5 -0.17259,0 -0.33191,-0.0171 -0.5,0 z m 0.5,1.5 c 0.92047,0 1.65625,0.78349 1.65625,1.75 0,0.96649 -0.73578,1.75 -1.65625,1.75 -0.92047,0 -1.65625,-0.78351 -1.65625,-1.75 0,-0.96651 0.73578,-1.75 1.65625,-1.75 z m -0.84375,3.5 0,0.875 1.6875,0 0,-0.875 c 0.92047,0 1.65625,0.7835 1.65625,1.75 0,0.96649 -1.11929,1.75 -2.5,1.75 -1.38071,0 -2.5,-0.78351 -2.5,-1.75 0,-0.9665 0.73578,-1.75 1.65625,-1.75 z"
+         style="fill:#555753;fill-opacity:1;stroke:none" />
     </g>
   </g>
 </svg>
diff --git a/src/ui/gui/artwork/actions/24x24/data-weight-cases.svg b/src/ui/gui/artwork/actions/24x24/data-weight-cases.svg
index b3b2013658..dfdf9e3497 100644
--- a/src/ui/gui/artwork/actions/24x24/data-weight-cases.svg
+++ b/src/ui/gui/artwork/actions/24x24/data-weight-cases.svg
@@ -104,36 +104,19 @@
      id="layer1"
      transform="translate(0,-1028.3622)">
     <g
-       transform="matrix(1.5,0,0,1.5,-217.5,801.31893)"
-       style="display:inline"
-       id="g4848-2">
-      <g
-         id="g4786-9">
-        <path
-           inkscape:connector-curvature="0"
-           style="fill:#555753;stroke:none"
-           d="m 153,151.375 c -1.65685,0 -3,1.34315 -3,3 l 0,1 -1,0 -4,11 3,0 10,0 3,0 -4,-11 -1,0 0,-1 c 0,-1.65685 -1.34315,-3 -3,-3 z m 0,2 c 0.55228,0 1,0.44772 1,1 l 0,1 -2,0 0,-1 c 0,-0.55228 0.44772,-1 1,-1 z m 0,4 c 1.10457,0 2,0.89543 2,2 0,1.10457 -0.89543,2 -2,2 -1.10457,0 -2,-0.89543 -2,-2 0,-1.10457 0.89543,-2 2,-2 z m -1,4 0,1 2,0 0,-1 c 1.10457,0 2,0.89543 2,2 0,1.10457 -1.34315,2 -3,2 -1.65685,0 -3,-0.89543 -3,-2 0,-1.10457 0.89543,-2 2,-2 z"
-           id="path5845-5" />
-        <rect
-           style="fill:none;stroke:none"
-           id="rect5669-9"
-           width="16"
-           height="16"
-           x="145"
-           y="151.36218" />
-        <path
-           style="fill:#555753;fill-opacity:1;stroke:none"
-           d="m 145,166.36218 c 0,0.554 0.446,1 1,1 l 14,0 c 0.554,0 1,-0.446 1,-1 l -16,0 z"
-           id="rect4781-9"
-           inkscape:connector-curvature="0" />
-      </g>
-      <rect
-         y="166.36218"
-         x="145"
-         height="1"
-         width="16"
-         id="rect4846-7"
+       transform="matrix(1.5,0,0,1.4987994,-217.5,801.50066)"
+       id="g5308-5-8"
+       style="fill:#555753;display:inline">
+      <path
+         inkscape:connector-curvature="0"
+         id="path5246-2-3"
+         d="m 153,151.36218 c -1.65685,0 -3,1.34315 -3,3 0,1.65685 1.34315,3 3,3 1.65685,0 3,-1.34315 3,-3 0,-1.65685 -1.34315,-3 -3,-3 z m 0,1.5 c 0.82843,0 1.5,0.67157 1.5,1.5 0,0.82843 -0.67157,1.5 -1.5,1.5 -0.82843,0 -1.5,-0.67157 -1.5,-1.5 0,-0.82843 0.67157,-1.5 1.5,-1.5 z"
          style="fill:#555753;fill-opacity:1;stroke:none" />
+      <path
+         inkscape:connector-curvature="0"
+         id="path5287-0-4"
+         d="m 149,155.375 -4,12 16,0 -4,-12 -8,0 z m 4,2 c 1.10457,0 2,0.89543 2,2 0,1.10457 -0.89543,2 -2,2 -1.10457,0 -2,-0.89543 -2,-2 0,-1.10457 0.89543,-2 2,-2 z m -1,4 0,1 2,0 0,-1 c 1.10457,0 2,0.89543 2,2 0,1.10457 -1.34315,2 -3,2 -1.65685,0 -3,-0.89543 -3,-2 0,-1.10457 0.89543,-2 2,-2 z"
+         style="fill:#555753;stroke:none" />
     </g>
   </g>
 </svg>
diff --git a/src/ui/gui/artwork/actions/24x24/edit-go-to-case.svg b/src/ui/gui/artwork/actions/24x24/edit-go-to-case.svg
index ced8fe9c52..189d5b2840 100644
--- a/src/ui/gui/artwork/actions/24x24/edit-go-to-case.svg
+++ b/src/ui/gui/artwork/actions/24x24/edit-go-to-case.svg
@@ -14,7 +14,7 @@
    id="svg3991"
    version="1.1"
    inkscape:version="0.48.4 r9939"
-   sodipodi:docname="edit-insert-variable.svg">
+   sodipodi:docname="edit-go-to-case.svg">
   <title
      id="title4018">GNU PSPP flat icon set</title>
   <defs
@@ -106,7 +106,7 @@
     <g
        transform="translate(395,540.00002)"
        style="display:inline"
-       id="g5961">
+       id="g5745">
       <rect
          style="opacity:0;fill:#ffffff;fill-opacity:1;stroke:none;display:inline"
          id="rect4902-1-1-5"
@@ -123,9 +123,9 @@
          style="fill:none;stroke:none;display:inline" />
       <path
          inkscape:connector-curvature="0"
-         id="path5338-0-1-3-8"
-         d="m -382.25,497.36932 c -3.78192,0.38389 -6.75,3.61504 -6.75,7.49643 0,4.14016 3.35787,7.49644 7.5,7.49644 4.14213,0 7.5,-3.35628 7.5,-7.49644 0,-4.14016 -3.35787,-7.49643 -7.5,-7.49643 -0.25889,0 -0.49786,-0.0256 -0.75,0 z m 0.75,1.49929 c 1.65686,0 3,1.3425 3,2.99857 0,1.65607 -1.34314,2.99857 -3,2.99857 -1.65685,0 -3,-1.3425 -3,-2.99857 0,-1.65607 1.34315,-2.99857 3,-2.99857 z m -1.5,5.99714 0,1.49929 3,0 0,-1.49929 c 1.65686,0 3,1.34251 3,2.99858 0,1.65606 -2.01472,2.99857 -4.5,2.99857 -2.48527,0 -4.5,-1.34251 -4.5,-2.99857 0,-1.65607 1.34315,-2.99858 3,-2.99858 z"
-         style="fill:#555753;fill-opacity:1;stroke:none;display:inline" />
+         id="path5531"
+         d="m -381.5,497.36218 c -4.14214,0 -7.5,3.35786 -7.5,7.5 0,4.14214 3.35786,7.5 7.5,7.5 4.14214,0 7.5,-3.35786 7.5,-7.5 0,-4.14214 -3.35786,-7.5 -7.5,-7.5 z m 0,2.5 c 1.47276,0 2.65625,1.11929 2.65625,2.5 0,1.38071 -1.18349,2.5 -2.65625,2.5 -1.47276,0 -2.65625,-1.11929 -2.65625,-2.5 0,-1.38071 1.18349,-2.5 2.65625,-2.5 z m -1.34375,5 0,1.25 2.6875,0 0,-1.25 c 1.47276,0 2.65625,1.11929 2.65625,2.5 0,1.38071 -1.79087,2.5 -4,2.5 -2.20913,0 -4,-1.11929 -4,-2.5 0,-1.38071 1.18349,-2.5 2.65625,-2.5 z"
+         style="fill:#555753;fill-opacity:1;stroke:none" />
       <path
          inkscape:connector-curvature="0"
          id="path6429-5-2-9-5-8-8-9"
diff --git a/src/ui/gui/artwork/actions/24x24/edit-go-to-variable.svg b/src/ui/gui/artwork/actions/24x24/edit-go-to-variable.svg
index 215a306fec..eecd8b5a8f 100644
--- a/src/ui/gui/artwork/actions/24x24/edit-go-to-variable.svg
+++ b/src/ui/gui/artwork/actions/24x24/edit-go-to-variable.svg
@@ -14,7 +14,7 @@
    id="svg3991"
    version="1.1"
    inkscape:version="0.48.4 r9939"
-   sodipodi:docname="edit-go-to-case.svg">
+   sodipodi:docname="edit-go-to-variable.svg">
   <title
      id="title4018">GNU PSPP flat icon set</title>
   <defs
@@ -106,7 +106,7 @@
     <g
        transform="translate(470,540.00002)"
        style="display:inline"
-       id="g6036">
+       id="g5888">
       <rect
          style="opacity:0;fill:#ffffff;fill-opacity:1;stroke:none;display:inline"
          id="rect4898-0"
@@ -122,10 +122,10 @@
          id="rect5357-05"
          style="fill:none;stroke:none" />
       <path
+         inkscape:connector-curvature="0"
          id="rect5340-3-4"
-         d="m -459.50352,497.3622 c -2.49216,0 -4.49849,2.007 -4.49849,4.5 l 0,5.99999 c 0,2.49299 2.00633,4.49999 4.49849,4.49999 l 5.99799,0 c 2.49216,0 4.49849,-2.007 4.49849,-4.49999 l 0,-5.99999 c 0,-2.493 -2.00633,-4.5 -4.49849,-4.5 l -5.99799,0 z m -0.42173,1.92187 3.42073,3.42188 3.42072,-3.42188 2.15553,2.10938 -3.42073,3.46874 3.42073,3.42187 -2.15553,2.10937 -3.42072,-3.42187 -3.42073,3.42187 -2.15553,-2.10937 3.42073,-3.42187 -3.42073,-3.46874 2.15553,-2.10938 z"
-         style="fill:#555753;fill-opacity:1;stroke:none;display:inline"
-         inkscape:connector-curvature="0" />
+         d="m -459.5,497.375 c -2.49216,0 -4.5,2.007 -4.5,4.5 l 0,6 c 0,2.49299 2.00784,4.5 4.5,4.5 l 6,0 c 2.49216,0 4.5,-2.00701 4.5,-4.5 l 0,-6 c 0,-2.493 -2.00784,-4.5 -4.5,-4.5 l -6,0 z m -0.5,2 3.625,3.625 3.625,-3.625 1.75,1.78125 -3.625,3.625 3.625,3.59375 -1.75,1.78125 -3.625,-3.625 -3.625,3.625 -1.75,-1.78125 3.625,-3.59375 -3.625,-3.625 1.75,-1.78125 z"
+         style="fill:#555753;fill-opacity:1;stroke:none;display:inline" />
       <path
          inkscape:connector-curvature="0"
          id="path6429-5-2-9-5-8-8"
diff --git a/src/ui/gui/artwork/actions/24x24/edit-insert-case.svg b/src/ui/gui/artwork/actions/24x24/edit-insert-case.svg
index 6537f0f50f..a86a33929b 100644
--- a/src/ui/gui/artwork/actions/24x24/edit-insert-case.svg
+++ b/src/ui/gui/artwork/actions/24x24/edit-insert-case.svg
@@ -14,7 +14,7 @@
    id="svg3991"
    version="1.1"
    inkscape:version="0.48.4 r9939"
-   sodipodi:docname="view-value-labels.svg">
+   sodipodi:docname="edit-insert-case.svg">
   <title
      id="title4018">GNU PSPP flat icon set</title>
   <defs
@@ -106,7 +106,7 @@
     <g
        transform="translate(170,540.00002)"
        style="display:inline"
-       id="g5554">
+       id="g5792">
       <rect
          style="opacity:0;fill:#ffffff;fill-opacity:1;stroke:none;display:inline"
          id="rect4893-90-1"
@@ -122,9 +122,9 @@
          inkscape:connector-curvature="0" />
       <path
          inkscape:connector-curvature="0"
-         id="path5338-2-6"
-         d="m -158.25,490.3622 c -3.78192,0.38407 -6.75,3.61675 -6.75,7.49999 0,4.14212 3.35787,7.49999 7.5,7.49999 4.14213,0 7.5,-3.35787 7.5,-7.49999 0,-4.14213 -3.35787,-7.49999 -7.5,-7.49999 -0.25889,0 -0.49786,-0.0256 -0.75,0 z m 0.75,1.5 c 1.65686,0 3,1.34314 3,2.99999 0,1.65685 -1.34314,3 -3,3 -1.65686,0 -3,-1.34315 -3,-3 0,-1.65685 1.34314,-2.99999 3,-2.99999 z m -1.5,5.99999 0,1.5 3,0 0,-1.5 c 1.65686,0 3,1.34314 3,2.99999 0,1.65686 -2.01472,3 -4.5,3 -2.48528,0 -4.5,-1.34314 -4.5,-3 0,-1.65685 1.34314,-2.99999 3,-2.99999 z"
-         style="fill:#555753;fill-opacity:1;stroke:none" />
+         id="path5531-9"
+         d="m -157.5,490.36218 c -4.14214,0 -7.5,3.35786 -7.5,7.5 0,4.14214 3.35786,7.5 7.5,7.5 4.14214,0 7.5,-3.35786 7.5,-7.5 0,-4.14214 -3.35786,-7.5 -7.5,-7.5 z m 0,2.5 c 1.47276,0 2.65625,1.11929 2.65625,2.5 0,1.38071 -1.18349,2.5 -2.65625,2.5 -1.47276,0 -2.65625,-1.11929 -2.65625,-2.5 0,-1.38071 1.18349,-2.5 2.65625,-2.5 z m -1.34375,5 0,1.25 2.6875,0 0,-1.25 c 1.47276,0 2.65625,1.11929 2.65625,2.5 0,1.38071 -1.79087,2.5 -4,2.5 -2.20913,0 -4,-1.11929 -4,-2.5 0,-1.38071 1.18349,-2.5 2.65625,-2.5 z"
+         style="fill:#555753;fill-opacity:1;stroke:none;display:inline" />
     </g>
   </g>
 </svg>
diff --git a/src/ui/gui/artwork/actions/24x24/edit-insert-variable.svg b/src/ui/gui/artwork/actions/24x24/edit-insert-variable.svg
index 737541ba6a..73a55ff537 100644
--- a/src/ui/gui/artwork/actions/24x24/edit-insert-variable.svg
+++ b/src/ui/gui/artwork/actions/24x24/edit-insert-variable.svg
@@ -14,7 +14,7 @@
    id="svg3991"
    version="1.1"
    inkscape:version="0.48.4 r9939"
-   sodipodi:docname="edit-insert-case.svg">
+   sodipodi:docname="edit-insert-variable.svg">
   <title
      id="title4018">GNU PSPP flat icon set</title>
   <defs
@@ -106,12 +106,7 @@
     <g
        transform="translate(245,540.00002)"
        style="display:inline"
-       id="g5651">
-      <path
-         inkscape:connector-curvature="0"
-         id="rect5340-6"
-         d="m -235.5,490.36218 c -2.493,0 -4.5,2.007 -4.5,4.5 l 0,6 c 0,2.493 2.007,4.5 4.5,4.5 l 6,0 c 2.493,0 4.5,-2.007 4.5,-4.5 l 0,-6 c 0,-2.493 -2.007,-4.5 -4.5,-4.5 l -6,0 z m -0.42187,1.92188 3.42187,3.42187 3.42188,-3.42187 2.15625,2.10937 -3.42188,3.46875 3.42188,3.42188 -2.15625,2.10937 -3.42188,-3.42187 -3.42187,3.42187 -2.15625,-2.10937 3.42187,-3.42188 -3.42187,-3.46875 2.15625,-2.10937 z"
-         style="fill:#555753;fill-opacity:1;stroke:none" />
+       id="g5883">
       <rect
          style="opacity:0;fill:#ffffff;fill-opacity:1;stroke:none;display:inline"
          id="rect4889-8"
@@ -125,6 +120,11 @@
          id="path15265-7-0"
          d="m -228.00003,506.36218 -1.49999,0 c -0.38534,10e-6 -0.79267,0.17679 -1.07812,0.42553 l -1.92185,1.74464 -1.92184,-1.74465 c -0.28506,-0.24909 -0.69278,-0.42552 -1.07816,-0.42546 l -1.5,0 -1e-5,1.36168 c 0,0.42137 0.1353,0.75206 0.42195,1.02123 l 4.07811,3.61692 4.07807,-3.61692 c 0.28639,-0.26923 0.42187,-0.59989 0.42187,-1.02126 l 0,-1.36167 z"
          inkscape:connector-curvature="0" />
+      <path
+         id="rect5340-3-4-8"
+         d="m -235.5,490.36218 c -2.49216,0 -4.5,2.007 -4.5,4.5 l 0,6 c 0,2.49299 2.00784,4.5 4.5,4.5 l 6,0 c 2.49216,0 4.5,-2.00701 4.5,-4.5 l 0,-6 c 0,-2.493 -2.00784,-4.5 -4.5,-4.5 l -6,0 z m -0.5,2 3.625,3.625 3.625,-3.625 1.75,1.78125 -3.625,3.625 3.625,3.59375 -1.75,1.78125 -3.625,-3.625 -3.625,3.625 -1.75,-1.78125 3.625,-3.59375 -3.625,-3.625 1.75,-1.78125 z"
+         style="fill:#555753;fill-opacity:1;stroke:none;display:inline"
+         inkscape:connector-curvature="0" />
     </g>
   </g>
 </svg>
diff --git a/src/ui/gui/artwork/actions/32x32/data-weight-cases.svg b/src/ui/gui/artwork/actions/32x32/data-weight-cases.svg
index 6aa4a5b4d3..09a302c224 100644
--- a/src/ui/gui/artwork/actions/32x32/data-weight-cases.svg
+++ b/src/ui/gui/artwork/actions/32x32/data-weight-cases.svg
@@ -104,36 +104,19 @@
      id="layer1"
      transform="translate(0,-1020.3622)">
     <g
-       transform="matrix(2,0,0,2,-290,717.63783)"
-       style="display:inline"
-       id="g4848-9">
-      <g
-         id="g4786-6">
-        <path
-           inkscape:connector-curvature="0"
-           style="fill:#555753;stroke:none"
-           d="m 153,151.375 c -1.65685,0 -3,1.34315 -3,3 l 0,1 -1,0 -4,11 3,0 10,0 3,0 -4,-11 -1,0 0,-1 c 0,-1.65685 -1.34315,-3 -3,-3 z m 0,2 c 0.55228,0 1,0.44772 1,1 l 0,1 -2,0 0,-1 c 0,-0.55228 0.44772,-1 1,-1 z m 0,4 c 1.10457,0 2,0.89543 2,2 0,1.10457 -0.89543,2 -2,2 -1.10457,0 -2,-0.89543 -2,-2 0,-1.10457 0.89543,-2 2,-2 z m -1,4 0,1 2,0 0,-1 c 1.10457,0 2,0.89543 2,2 0,1.10457 -1.34315,2 -3,2 -1.65685,0 -3,-0.89543 -3,-2 0,-1.10457 0.89543,-2 2,-2 z"
-           id="path5845-54" />
-        <rect
-           style="fill:none;stroke:none"
-           id="rect5669-1"
-           width="16"
-           height="16"
-           x="145"
-           y="151.36218" />
-        <path
-           style="fill:#555753;fill-opacity:1;stroke:none"
-           d="m 145,166.36218 c 0,0.554 0.446,1 1,1 l 14,0 c 0.554,0 1,-0.446 1,-1 l -16,0 z"
-           id="rect4781-2"
-           inkscape:connector-curvature="0" />
-      </g>
-      <rect
-         y="166.36218"
-         x="145"
-         height="1"
-         width="16"
-         id="rect4846-4"
+       transform="matrix(2,0,0,1.9983986,-290,717.88023)"
+       id="g5308-5"
+       style="fill:#555753;display:inline">
+      <path
+         inkscape:connector-curvature="0"
+         id="path5246-2"
+         d="m 153,151.36218 c -1.65685,0 -3,1.34315 -3,3 0,1.65685 1.34315,3 3,3 1.65685,0 3,-1.34315 3,-3 0,-1.65685 -1.34315,-3 -3,-3 z m 0,1.5 c 0.82843,0 1.5,0.67157 1.5,1.5 0,0.82843 -0.67157,1.5 -1.5,1.5 -0.82843,0 -1.5,-0.67157 -1.5,-1.5 0,-0.82843 0.67157,-1.5 1.5,-1.5 z"
          style="fill:#555753;fill-opacity:1;stroke:none" />
+      <path
+         inkscape:connector-curvature="0"
+         id="path5287-0"
+         d="m 149,155.375 -4,12 16,0 -4,-12 -8,0 z m 4,2 c 1.10457,0 2,0.89543 2,2 0,1.10457 -0.89543,2 -2,2 -1.10457,0 -2,-0.89543 -2,-2 0,-1.10457 0.89543,-2 2,-2 z m -1,4 0,1 2,0 0,-1 c 1.10457,0 2,0.89543 2,2 0,1.10457 -1.34315,2 -3,2 -1.65685,0 -3,-0.89543 -3,-2 0,-1.10457 0.89543,-2 2,-2 z"
+         style="fill:#555753;stroke:none" />
     </g>
   </g>
 </svg>
diff --git a/src/ui/gui/artwork/actions/32x32/edit-go-to-case.svg b/src/ui/gui/artwork/actions/32x32/edit-go-to-case.svg
index a7c12b8da9..37271d3d3c 100644
--- a/src/ui/gui/artwork/actions/32x32/edit-go-to-case.svg
+++ b/src/ui/gui/artwork/actions/32x32/edit-go-to-case.svg
@@ -14,7 +14,7 @@
    id="svg3991"
    version="1.1"
    inkscape:version="0.48.4 r9939"
-   sodipodi:docname="edit-insert-variable.svg">
+   sodipodi:docname="edit-go-to-case.svg">
   <title
      id="title4018">GNU PSPP flat icon set</title>
   <defs
@@ -106,7 +106,12 @@
     <g
        transform="translate(365,540.00002)"
        style="display:inline"
-       id="g5806">
+       id="g5751">
+      <path
+         inkscape:connector-curvature="0"
+         id="path5531-0"
+         d="m -347,492.36218 c -5.52285,0 -10,4.47715 -10,10 0,5.52286 4.47715,10 10,10 5.52285,0 10,-4.47714 10,-10 0,-5.52285 -4.47715,-10 -10,-10 z m 0,3.33333 c 1.96368,0 3.54167,1.49239 3.54167,3.33334 0,1.84094 -1.57799,3.33333 -3.54167,3.33333 -1.96368,0 -3.54167,-1.49239 -3.54167,-3.33333 0,-1.84095 1.57799,-3.33334 3.54167,-3.33334 z m -1.79167,6.66667 0,1.66667 3.58334,0 0,-1.66667 c 1.96368,0 3.54166,1.49239 3.54166,3.33334 0,1.84094 -2.38782,3.33333 -5.33333,3.33333 -2.94551,0 -5.33333,-1.49239 -5.33333,-3.33333 0,-1.84095 1.57798,-3.33334 3.54166,-3.33334 z"
+         style="fill:#555753;fill-opacity:1;stroke:none;display:inline" />
       <rect
          style="opacity:0;fill:#ffffff;fill-opacity:1;stroke:none;display:inline"
          id="rect4902-1-1"
@@ -121,11 +126,6 @@
          width="32"
          id="rect5357-0-8-1"
          style="fill:none;stroke:none;display:inline" />
-      <path
-         inkscape:connector-curvature="0"
-         id="path5338-0-1-3"
-         d="m -348,492.37169 c -5.04256,0.51186 -9,4.82005 -9,9.99525 0,5.52021 4.47716,9.99524 10,9.99524 5.52284,0 10,-4.47503 10,-9.99524 0,-5.52022 -4.47716,-9.99525 -10,-9.99525 -0.34518,0 -0.66382,-0.0342 -1,0 z m 1,1.99905 c 2.20914,0 4,1.79001 4,3.9981 0,2.20809 -1.79086,3.9981 -4,3.9981 -2.20914,0 -4,-1.79001 -4,-3.9981 0,-2.20809 1.79086,-3.9981 4,-3.9981 z m -2,7.9962 0,1.99905 4,0 0,-1.99905 c 2.20914,0 4,1.79 4,3.99809 0,2.20809 -2.6863,3.9981 -6,3.9981 -3.3137,0 -6,-1.79001 -6,-3.9981 0,-2.20809 1.79086,-3.99809 4,-3.99809 z"
-         style="fill:#555753;fill-opacity:1;stroke:none;display:inline" />
       <path
          id="rect5382-3-4-2-4-5"
          d="m -357,480.36221 c -4.41828,0 -8,3.58001 -8,7.99619 0,1.10748 0.892,1.99905 2,1.99905 1.108,0 2,-0.89157 2,-1.99905 0,-2.20809 1.79084,-3.99809 4,-3.99809 l 2,0 c 1.62696,0 3.00006,0.98015 3.625,2.37387 l -3.625,3.62327 10,0 0,-9.99524 -3.4375,3.43586 c -1.44376,-2.08552 -3.83312,-3.43586 -6.5625,-3.43586 l -2,0 z"
diff --git a/src/ui/gui/artwork/actions/32x32/edit-insert-case.svg b/src/ui/gui/artwork/actions/32x32/edit-insert-case.svg
index b823502091..3ebd504272 100644
--- a/src/ui/gui/artwork/actions/32x32/edit-insert-case.svg
+++ b/src/ui/gui/artwork/actions/32x32/edit-insert-case.svg
@@ -14,7 +14,7 @@
    id="svg3991"
    version="1.1"
    inkscape:version="0.48.4 r9939"
-   sodipodi:docname="data-weight-cases.svg">
+   sodipodi:docname="edit-insert-case.svg">
   <title
      id="title4018">GNU PSPP flat icon set</title>
   <defs
@@ -106,7 +106,7 @@
     <g
        transform="translate(140,540.00002)"
        style="display:inline"
-       id="g6143">
+       id="g5787">
       <rect
          style="opacity:0;fill:#ffffff;fill-opacity:1;stroke:none;display:inline"
          id="rect4893-90"
@@ -122,9 +122,9 @@
          inkscape:connector-curvature="0" />
       <path
          inkscape:connector-curvature="0"
-         id="path5338-2"
-         d="m -125,482.3774 c -5.04256,0.5121 -9,4.82233 -9,9.99999 0,5.52283 4.47716,9.99998 10,9.99998 5.52284,0 10,-4.47715 10,-9.99998 0,-5.52284 -4.47716,-9.99999 -10,-9.99999 -0.34518,0 -0.66382,-0.0342 -1,0 z m 1,2 c 2.20914,0 4,1.79085 4,3.99999 0,2.20914 -1.79086,4 -4,4 -2.20914,0 -4,-1.79086 -4,-4 0,-2.20914 1.79086,-3.99999 4,-3.99999 z m -2,7.99999 0,1.99999 4,0 0,-1.99999 c 2.20914,0 4,1.79085 4,3.99999 0,2.20914 -2.6863,4 -6,4 -3.3137,0 -6,-1.79086 -6,-4 0,-2.20914 1.79086,-3.99999 4,-3.99999 z"
-         style="fill:#555753;fill-opacity:1;stroke:none" />
+         id="path5531-0-5"
+         d="m -124,482.36218 c -5.52285,0 -10,4.47715 -10,10 0,5.52286 4.47715,10 10,10 5.52285,0 10,-4.47714 10,-10 0,-5.52285 -4.47715,-10 -10,-10 z m 0,3.33333 c 1.96368,0 3.54167,1.49239 3.54167,3.33334 0,1.84094 -1.57799,3.33333 -3.54167,3.33333 -1.96368,0 -3.54167,-1.49239 -3.54167,-3.33333 0,-1.84095 1.57799,-3.33334 3.54167,-3.33334 z m -1.79167,6.66667 0,1.66667 3.58334,0 0,-1.66667 c 1.96368,0 3.54166,1.49239 3.54166,3.33334 0,1.84094 -2.38782,3.33333 -5.33333,3.33333 -2.94551,0 -5.33333,-1.49239 -5.33333,-3.33333 0,-1.84095 1.57798,-3.33334 3.54166,-3.33334 z"
+         style="fill:#555753;fill-opacity:1;stroke:none;display:inline" />
     </g>
   </g>
 </svg>
diff --git a/src/ui/gui/artwork/categories/16x16/measure-currency-nominal.svg b/src/ui/gui/artwork/categories/16x16/measure-currency-nominal.svg
index 11b389f70d..c8dcafd337 100644
--- a/src/ui/gui/artwork/categories/16x16/measure-currency-nominal.svg
+++ b/src/ui/gui/artwork/categories/16x16/measure-currency-nominal.svg
@@ -14,7 +14,7 @@
    id="svg3991"
    version="1.1"
    inkscape:version="0.48.4 r9939"
-   sodipodi:docname="measure-currency-scale.svg">
+   sodipodi:docname="measure-currency-nominal.svg">
   <title
      id="title4018">GNU PSPP flat icon set</title>
   <defs
@@ -106,42 +106,39 @@
     <g
        transform="translate(290,610.00002)"
        style="display:inline"
-       id="g6525">
-      <g
-         id="g5718">
-        <path
-           sodipodi:cx="-9"
-           sodipodi:cy="321"
-           d="m -2,321 c 0,3.86599 -3.1340068,7 -7,7 -3.865993,0 -7,-3.13401 -7,-7 0,-3.86599 3.134007,-7 7,-7 3.8659932,0 7,3.13401 7,7 z"
-           id="path8593-0-6"
-           sodipodi:rx="7"
-           sodipodi:ry="7"
-           style="color:#000000;fill:#2e3436;fill-opacity:1;stroke:none;stroke-width:2.15384626;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:new"
-           transform="matrix(0.49987831,0,0,0.4999999,-280.99853,277.36222)"
-           sodipodi:type="arc" />
-        <path
-           sodipodi:cx="-9"
-           sodipodi:cy="321"
-           d="m -2,321 c 0,3.86599 -3.1340068,7 -7,7 -3.865993,0 -7,-3.13401 -7,-7 0,-3.86599 3.134007,-7 7,-7 3.8659932,0 7,3.13401 7,7 z"
-           id="path8593-0-7-1"
-           sodipodi:rx="7"
-           sodipodi:ry="7"
-           style="color:#000000;fill:#2e3436;fill-opacity:1;stroke:none;stroke-width:2.15384626;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:new"
-           transform="matrix(0.49987831,0,0,0.4999999,-277.00024,270.36222)"
-           sodipodi:type="arc" />
-        <rect
-           style="fill:none;stroke:none"
-           id="rect5426"
-           width="16"
-           height="16"
-           x="-290"
-           y="426.36218" />
-        <path
-           style="fill:#2e3436;fill-opacity:1;stroke:none;display:inline"
-           d="m -279,434.36218 0,1 -0.5,0 c -0.831,0 -1.5,0.669 -1.5,1.5 0,0.831 0.669,1.5 1.5,1.5 l 0.5,0 2,0 0.5,0 c 0.277,0 0.5,0.223 0.5,0.5 0,0.277 -0.223,0.5 -0.5,0.5 l -0.5,0 -4,0 0,1 2,0 0,1 2,0 0,-1 0.5,0 c 0.831,0 1.5,-0.669 1.5,-1.5 0,-0.831 -0.669,-1.5 -1.5,-1.5 l -0.5,0 -2,0 -0.5,0 c -0.277,0 -0.5,-0.223 -0.5,-0.5 0,-0.277 0.223,-0.5 0.5,-0.5 l 0.5,0 4,0 0,-1 -2,0 0,-1 -2,0 z"
-           id="rect5488-8"
-           inkscape:connector-curvature="0" />
-      </g>
+       id="g4088">
+      <path
+         sodipodi:type="arc"
+         transform="matrix(0.49987831,0,0,0.4999999,-280.99853,277.36222)"
+         style="color:#000000;fill:#2e3436;fill-opacity:1;stroke:none;stroke-width:2.15384626;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:new"
+         sodipodi:ry="7"
+         sodipodi:rx="7"
+         id="path8593-0-6"
+         d="m -2,321 c 0,3.86599 -3.1340068,7 -7,7 -3.865993,0 -7,-3.13401 -7,-7 0,-3.86599 3.134007,-7 7,-7 3.8659932,0 7,3.13401 7,7 z"
+         sodipodi:cy="321"
+         sodipodi:cx="-9" />
+      <path
+         sodipodi:type="arc"
+         transform="matrix(0.49987831,0,0,0.4999999,-277.00024,270.36222)"
+         style="color:#000000;fill:#2e3436;fill-opacity:1;stroke:none;stroke-width:2.15384626;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:new"
+         sodipodi:ry="7"
+         sodipodi:rx="7"
+         id="path8593-0-7-1"
+         d="m -2,321 c 0,3.86599 -3.1340068,7 -7,7 -3.865993,0 -7,-3.13401 -7,-7 0,-3.86599 3.134007,-7 7,-7 3.8659932,0 7,3.13401 7,7 z"
+         sodipodi:cy="321"
+         sodipodi:cx="-9" />
+      <rect
+         y="426.36218"
+         x="-290"
+         height="16"
+         width="16"
+         id="rect5426"
+         style="fill:none;stroke:none" />
+      <path
+         inkscape:connector-curvature="0"
+         id="rect5488-8"
+         d="m -278,435.36218 0,1 -0.5,0 c -0.831,0 -1.5,0.669 -1.5,1.5 0,0.831 0.669,1.5 1.5,1.5 l 0.5,0 2,0 0.5,0 c 0.277,0 0.5,0.223 0.5,0.5 0,0.277 -0.223,0.5 -0.5,0.5 l -0.5,0 -4,0 0,1 2,0 0,1 2,0 0,-1 0.5,0 c 0.831,0 1.5,-0.669 1.5,-1.5 0,-0.831 -0.669,-1.5 -1.5,-1.5 l -0.5,0 -2,0 -0.5,0 c -0.277,0 -0.5,-0.223 -0.5,-0.5 0,-0.277 0.223,-0.5 0.5,-0.5 l 0.5,0 4,0 0,-1 -2,0 0,-1 -2,0 z"
+         style="fill:#2e3436;fill-opacity:1;stroke:none;display:inline" />
     </g>
   </g>
 </svg>
diff --git a/src/ui/gui/artwork/categories/16x16/measure-string-ordinal.svg b/src/ui/gui/artwork/categories/16x16/measure-string-ordinal.svg
index a470db0367..dd55809e35 100644
--- a/src/ui/gui/artwork/categories/16x16/measure-string-ordinal.svg
+++ b/src/ui/gui/artwork/categories/16x16/measure-string-ordinal.svg
@@ -14,7 +14,7 @@
    id="svg3991"
    version="1.1"
    inkscape:version="0.48.4 r9939"
-   sodipodi:docname="measure-string-nominal.svg">
+   sodipodi:docname="measure-string-ordinal.svg">
   <title
      id="title4018">GNU PSPP flat icon set</title>
   <defs
@@ -106,37 +106,34 @@
     <g
        transform="translate(380,610.00002)"
        style="display:inline"
-       id="g6557">
-      <g
-         id="g5477">
-        <path
-           style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;color:#000000;fill:#2e3436;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:3;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans"
-           id="path11930-0-3"
-           d="m -374,432.375 0,2.22363 0,4.53992 0,2.22363 3,0 0,-2.22363 0,-4.53992 0,-2.22363 -3,0 z"
-           inkscape:connector-curvature="0" />
-        <path
-           inkscape:connector-curvature="0"
-           style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;color:#000000;fill:#2e3436;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:3;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans"
-           d="m -369,429.375 0,2.96875 0,2.5625 c 0.58804,-0.33985 1.27199,-0.53125 2,-0.53125 0.34518,0 0.68048,0.0428 1,0.125 l 0,-2.15625 0,-2.96875 -3,0 z"
-           id="path11930-0-4" />
-        <path
-           style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;color:#000000;fill:#2e3436;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:3;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans"
-           id="path11930-0"
-           d="m -379,435.29968 0,1.5 0,3.0625 0,1.5 3,0 0,-1.5 0,-3.0625 0,-1.5 -3,0 z"
-           inkscape:connector-curvature="0" />
-        <rect
-           style="fill:none;stroke:none"
-           id="rect5402"
-           width="16"
-           height="16"
-           x="-380"
-           y="426.36218" />
-        <path
-           style="fill:#2e3436;fill-opacity:1;stroke:none;display:inline"
-           d="m -367,435.36218 c -1.65685,0 -3,1.34315 -3,3 l 0,4 2,0 0,-2 2,0 0,2 2,0 0,-4 c 0,-1.65685 -1.34315,-3 -3,-3 z m 0,2 c 0.55228,0 1,0.44772 1,1 l 0,1 -2,0 0,-1 c 0,-0.55228 0.44772,-1 1,-1 z"
-           id="path7755-2-3"
-           inkscape:connector-curvature="0" />
-      </g>
+       id="g6625">
+      <path
+         inkscape:connector-curvature="0"
+         id="path11930-0-3"
+         d="m -374,432.375 0,2.21875 0,4.53125 0,2.25 2.75,0 0,-3 c 0,-0.47121 0.10586,-0.91879 0.25,-1.34375 l 0,-2.4375 0,-2.21875 -3,0 z"
+         style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;color:#000000;fill:#2e3436;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:3;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans" />
+      <path
+         id="path11930-0-4"
+         d="m -369,429.375 0,2.96875 0,2.3125 c 0.59905,-0.3245 1.27611,-0.53125 2,-0.53125 0.34907,0 0.67455,0.0754 1,0.15625 l 0,-1.9375 0,-2.96875 -3,0 z"
+         style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;color:#000000;fill:#2e3436;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:3;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans"
+         inkscape:connector-curvature="0" />
+      <path
+         inkscape:connector-curvature="0"
+         d="m -379,435.29968 0,1.5 0,3.0625 0,1.5 3,0 0,-1.5 0,-3.0625 0,-1.5 -3,0 z"
+         id="path11930-0"
+         style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;color:#000000;fill:#2e3436;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:3;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans" />
+      <rect
+         y="426.36218"
+         x="-380"
+         height="16"
+         width="16"
+         id="rect5402"
+         style="fill:none;stroke:none" />
+      <path
+         inkscape:connector-curvature="0"
+         id="path7755-2-3-2-2"
+         d="m -367,435.36218 c -1.65685,0 -3,1.34315 -3,3 l 0,4 2,0 0,-2 2,0 0,2 2,0 0,-4 c 0,-1.65685 -1.34315,-3 -3,-3 z m 0,2 c 0.55228,0 1,0.44772 1,1 l 0,1 -2,0 0,-1 c 0,-0.55228 0.44772,-1 1,-1 z"
+         style="fill:#2e3436;fill-opacity:1;stroke:none;display:inline" />
     </g>
   </g>
 </svg>
diff --git a/src/ui/gui/artwork/categories/16x16/measure-time-nominal.svg b/src/ui/gui/artwork/categories/16x16/measure-time-nominal.svg
index 61238cf428..5ac284ceb3 100644
--- a/src/ui/gui/artwork/categories/16x16/measure-time-nominal.svg
+++ b/src/ui/gui/artwork/categories/16x16/measure-time-nominal.svg
@@ -14,7 +14,7 @@
    id="svg3991"
    version="1.1"
    inkscape:version="0.48.4 r9939"
-   sodipodi:docname="measure-time-scale.svg">
+   sodipodi:docname="measure-time-nominal.svg">
   <title
      id="title4018">GNU PSPP flat icon set</title>
   <defs
@@ -106,51 +106,99 @@
     <g
        transform="translate(290,640.00002)"
        style="display:inline"
-       id="g6532">
+       id="g6264">
+      <path
+         sodipodi:type="arc"
+         transform="matrix(0.49987831,0,0,0.4999999,-281.00024,247.36221)"
+         style="color:#000000;fill:#2e3436;fill-opacity:1;stroke:none;stroke-width:2.15384626;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:new"
+         sodipodi:ry="7"
+         sodipodi:rx="7"
+         id="path8593-0-71"
+         d="m -2,321 c 0,3.86599 -3.1340068,7 -7,7 -3.865993,0 -7,-3.13401 -7,-7 0,-3.86599 3.134007,-7 7,-7 3.8659932,0 7,3.13401 7,7 z"
+         sodipodi:cy="321"
+         sodipodi:cx="-9" />
+      <path
+         sodipodi:type="arc"
+         transform="matrix(0.49987831,0,0,0.4999999,-277.00195,240.36221)"
+         style="color:#000000;fill:#2e3436;fill-opacity:1;stroke:none;stroke-width:2.15384626;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:new"
+         sodipodi:ry="7"
+         sodipodi:rx="7"
+         id="path8593-0-7-6"
+         d="m -2,321 c 0,3.86599 -3.1340068,7 -7,7 -3.865993,0 -7,-3.13401 -7,-7 0,-3.86599 3.134007,-7 7,-7 3.8659932,0 7,3.13401 7,7 z"
+         sodipodi:cy="321"
+         sodipodi:cx="-9" />
+      <rect
+         y="396.36218"
+         x="-290"
+         height="16"
+         width="16"
+         id="rect5372"
+         style="fill:none;stroke:none" />
       <g
-         id="g5262">
+         transform="translate(-3,3.9999966)"
+         id="g6255">
+        <rect
+           style="fill:#2e3436;fill-opacity:1;stroke:none;display:inline"
+           id="rect5780-7"
+           width="6"
+           height="1"
+           x="-277"
+           y="401.36218" />
+        <rect
+           style="fill:#2e3436;fill-opacity:1;stroke:none;display:inline"
+           id="rect5780-9-7"
+           width="6"
+           height="1"
+           x="-277"
+           y="407.36218" />
         <path
-           sodipodi:cx="-9"
-           sodipodi:cy="321"
-           d="m -2,321 c 0,3.86599 -3.1340068,7 -7,7 -3.865993,0 -7,-3.13401 -7,-7 0,-3.86599 3.134007,-7 7,-7 3.8659932,0 7,3.13401 7,7 z"
-           id="path8593-0-71"
-           sodipodi:rx="7"
-           sodipodi:ry="7"
-           style="color:#000000;fill:#2e3436;fill-opacity:1;stroke:none;stroke-width:2.15384626;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:new"
-           transform="matrix(0.49987831,0,0,0.4999999,-281.00024,247.36221)"
-           sodipodi:type="arc" />
+           sodipodi:type="arc"
+           style="fill:none;stroke:#2d3335;stroke-width:0.467879;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline"
+           id="path5800-2"
+           sodipodi:cx="-267"
+           sodipodi:cy="404.36218"
+           sodipodi:rx="1"
+           sodipodi:ry="1"
+           d="m -268,404.36218 c 0,-0.55228 0.44772,-1 1,-1 0.55228,0 1,0.44772 1,1 l -1,0 z"
+           sodipodi:start="3.1415927"
+           sodipodi:end="6.2831853"
+           transform="matrix(-1.8029863,0,0,-2.3240972,-755.39735,1341.6181)" />
         <path
-           sodipodi:cx="-9"
-           sodipodi:cy="321"
-           d="m -2,321 c 0,3.86599 -3.1340068,7 -7,7 -3.865993,0 -7,-3.13401 -7,-7 0,-3.86599 3.134007,-7 7,-7 3.8659932,0 7,3.13401 7,7 z"
-           id="path8593-0-7-6"
-           sodipodi:rx="7"
-           sodipodi:ry="7"
-           style="color:#000000;fill:#2e3436;fill-opacity:1;stroke:none;stroke-width:2.15384626;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:new"
-           transform="matrix(0.49987831,0,0,0.4999999,-277.00195,240.36221)"
-           sodipodi:type="arc" />
+           sodipodi:type="arc"
+           style="fill:none;stroke:#2d3335;stroke-width:0.46787143;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline"
+           id="path5800-6-4"
+           sodipodi:cx="-267"
+           sodipodi:cy="404.36218"
+           sodipodi:rx="1"
+           sodipodi:ry="1"
+           d="m -268,404.36218 c 0,-0.55228 0.44772,-1 1,-1 0.55228,0 1,0.44772 1,1 l -1,0 z"
+           sodipodi:start="3.1415927"
+           sodipodi:end="6.2831853"
+           transform="matrix(1.8029849,0,0,2.3241078,207.39698,-531.89799)" />
+        <path
+           sodipodi:type="arc"
+           style="fill:#2e3436;fill-opacity:1;stroke:none;display:inline"
+           id="path5820-1"
+           sodipodi:cx="-266.5"
+           sodipodi:cy="408.86218"
+           sodipodi:rx="0.5"
+           sodipodi:ry="0.5"
+           d="m -266,408.86218 c 0,0.27614 -0.22386,0.5 -0.5,0.5 -0.27614,0 -0.5,-0.22386 -0.5,-0.5 0,-0.27614 0.22386,-0.5 0.5,-0.5 0.27614,0 0.5,0.22386 0.5,0.5 z"
+           transform="matrix(2,0,0,1,259,-3.9999974)" />
+        <rect
+           style="fill:#2e3436;fill-opacity:1;stroke:none;display:inline"
+           id="rect5889-1"
+           width="3.198874"
+           height="0.49719238"
+           x="-275.62976"
+           y="407.36218" />
         <rect
-           style="fill:none;stroke:none"
-           id="rect5372"
-           width="16"
-           height="16"
-           x="-290"
-           y="396.36218" />
-        <g
-           style="display:inline"
-           id="g5140-3-3"
-           transform="translate(36,2.6171874e-6)">
-          <path
-             inkscape:connector-curvature="0"
-             id="path4334-7-7"
-             d="m -313.5,404.36218 c -1.933,0 -3.5,1.567 -3.5,3.5 0,1.933 1.567,3.5 3.5,3.5 1.933,0 3.5,-1.567 3.5,-3.5 0,-1.933 -1.567,-3.5 -3.5,-3.5 z m 0,1 c 1.38071,0 2.5,1.11929 2.5,2.5 0,1.38071 -1.11929,2.5 -2.5,2.5 -1.38071,0 -2.5,-1.11929 -2.5,-2.5 0,-1.38071 1.11929,-2.5 2.5,-2.5 z"
-             style="fill:#2e3436;fill-opacity:1;stroke:none" />
-          <path
-             inkscape:connector-curvature="0"
-             id="path4341-5-1"
-             d="m -312.28125,406.34375 a 0.250025,0.250025 0 0 0 -0.125,0.0937 L -313.5,407.5 l -0.4375,-0.4375 a 0.250025,0.250025 0 0 0 -0.0313,-0.0313 0.250025,0.250025 0 0 0 -0.0937,-0.0313 0.250025,0.250025 0 0 0 -0.125,0 0.250025,0.250025 0 0 0 -0.0625,0.0313 0.250025,0.250025 0 0 0 -0.125,0.15625 0.250025,0.250025 0 0 0 0.0937,0.21875 l 0.625,0.625 0.1875,0.1875 0.15625,-0.1875 1.25,-1.25 a 0.250025,0.250025 0 0 0 0.0313,-0.0313 0.250025,0.250025 0 0 0 0.0313,-0.0625 0.250025,0.250025 0 0 0 0,-0.125 0.250025,0.250025 0 0 0 -0.0313,-0.0937 0.250025,0.250025 0 0 0 -0.0625,-0.0625 0.250025,0.250025 0 0 0 -0.0625,-0.0313 0.250025,0.250025 0 0 0 -0.125,-0.0313 z"
-             style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#2e3436;fill-opacity:1;stroke:none;stroke-width:0.5;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans" />
-        </g>
+           style="fill:#2e3436;fill-opacity:1;stroke:none;display:inline"
+           id="rect5889-4-2"
+           width="1.7073205"
+           height="0.38128155"
+           x="-274.7879"
+           y="403.64651" />
       </g>
     </g>
   </g>
diff --git a/src/ui/gui/artwork/categories/16x16/measure-time-scale.svg b/src/ui/gui/artwork/categories/16x16/measure-time-scale.svg
index 9cebea3278..a48b617fb3 100644
--- a/src/ui/gui/artwork/categories/16x16/measure-time-scale.svg
+++ b/src/ui/gui/artwork/categories/16x16/measure-time-scale.svg
@@ -14,7 +14,7 @@
    id="svg3991"
    version="1.1"
    inkscape:version="0.48.4 r9939"
-   sodipodi:docname="measure-date-ordinal.svg">
+   sodipodi:docname="measure-time-scale.svg">
   <title
      id="title4018">GNU PSPP flat icon set</title>
   <defs
@@ -106,35 +106,84 @@
     <g
        transform="translate(335,640.00002)"
        style="display:inline"
-       id="g6541">
+       id="g6494">
+      <rect
+         y="396.36218"
+         x="-335"
+         height="16"
+         width="16"
+         id="rect5382"
+         style="fill:none;stroke:none" />
+      <path
+         inkscape:connector-curvature="0"
+         id="rect5888-4"
+         d="m -332,397.375 0,12 0,1 0,1 6,0 0,-2 -4,0 0,-1 1,0 0.5,0 0.5,0 0,-0.5 0,-0.5 -0.5,0 -0.5,0 -1,0 0,-1 2,0 0.5,0 0.5,0 0,-0.5 0,-0.5 -0.5,0 -0.5,0 -2,0 0,-1 1,0 0.5,0 0.5,0 0,-0.5 0,-0.5 -0.5,0 -0.5,0 -1,0 0,-1 2,0 0.5,0 0.5,0 0,-0.5 0,-0.5 -0.5,0 -0.5,0 -2,0 0,-2 4,0 c 1.06188,-0.0309 2.16571,-0.0829 2,2 l 0,1 0,2 2,0 0,-3 c 0,-3 -1,-4 -4,-4 l -4,0 -2,0 z"
+         style="fill:#2e3436;fill-opacity:1;display:inline" />
       <g
-         id="g5187">
+         transform="translate(-17,-3.4210825e-6)"
+         id="g6335">
         <rect
-           style="fill:none;stroke:none"
-           id="rect5382"
-           width="16"
-           height="16"
-           x="-335"
-           y="396.36218" />
-        <g
-           id="g5140"
-           transform="translate(-9,1.0000026)">
-          <path
-             inkscape:connector-curvature="0"
-             id="path4334"
-             d="m -313.5,404.36218 c -1.933,0 -3.5,1.567 -3.5,3.5 0,1.933 1.567,3.5 3.5,3.5 1.933,0 3.5,-1.567 3.5,-3.5 0,-1.933 -1.567,-3.5 -3.5,-3.5 z m 0,1 c 1.38071,0 2.5,1.11929 2.5,2.5 0,1.38071 -1.11929,2.5 -2.5,2.5 -1.38071,0 -2.5,-1.11929 -2.5,-2.5 0,-1.38071 1.11929,-2.5 2.5,-2.5 z"
-             style="fill:#2e3436;fill-opacity:1;stroke:none" />
-          <path
-             inkscape:connector-curvature="0"
-             id="path4341"
-             d="m -312.28125,406.34375 a 0.250025,0.250025 0 0 0 -0.125,0.0937 L -313.5,407.5 l -0.4375,-0.4375 a 0.250025,0.250025 0 0 0 -0.0313,-0.0313 0.250025,0.250025 0 0 0 -0.0937,-0.0313 0.250025,0.250025 0 0 0 -0.125,0 0.250025,0.250025 0 0 0 -0.0625,0.0313 0.250025,0.250025 0 0 0 -0.125,0.15625 0.250025,0.250025 0 0 0 0.0937,0.21875 l 0.625,0.625 0.1875,0.1875 0.15625,-0.1875 1.25,-1.25 a 0.250025,0.250025 0 0 0 0.0313,-0.0313 0.250025,0.250025 0 0 0 0.0313,-0.0625 0.250025,0.250025 0 0 0 0,-0.125 0.250025,0.250025 0 0 0 -0.0313,-0.0937 0.250025,0.250025 0 0 0 -0.0625,-0.0625 0.250025,0.250025 0 0 0 -0.0625,-0.0313 0.250025,0.250025 0 0 0 -0.125,-0.0313 z"
-             style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#2e3436;fill-opacity:1;stroke:none;stroke-width:0.5;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans" />
-        </g>
+           style="fill:#2e3436;fill-opacity:1;stroke:none;display:inline"
+           id="rect5780-8"
+           width="6"
+           height="1"
+           x="-308"
+           y="405.36218" />
+        <rect
+           style="fill:#2e3436;fill-opacity:1;stroke:none;display:inline"
+           id="rect5780-9-8"
+           width="6"
+           height="1"
+           x="-308"
+           y="411.36218" />
+        <path
+           sodipodi:type="arc"
+           style="fill:none;stroke:#2d3335;stroke-width:0.467879;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline"
+           id="path5800-9"
+           sodipodi:cx="-267"
+           sodipodi:cy="404.36218"
+           sodipodi:rx="1"
+           sodipodi:ry="1"
+           d="m -268,404.36218 c 0,-0.55228 0.44772,-1 1,-1 0.55228,0 1,0.44772 1,1 l -1,0 z"
+           sodipodi:start="3.1415927"
+           sodipodi:end="6.2831853"
+           transform="matrix(-1.8029863,0,0,-2.3240972,-786.39735,1345.6181)" />
+        <path
+           sodipodi:type="arc"
+           style="fill:none;stroke:#2d3335;stroke-width:0.46787143;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline"
+           id="path5800-6-1"
+           sodipodi:cx="-267"
+           sodipodi:cy="404.36218"
+           sodipodi:rx="1"
+           sodipodi:ry="1"
+           d="m -268,404.36218 c 0,-0.55228 0.44772,-1 1,-1 0.55228,0 1,0.44772 1,1 l -1,0 z"
+           sodipodi:start="3.1415927"
+           sodipodi:end="6.2831853"
+           transform="matrix(1.8029849,0,0,2.3241078,176.39698,-527.89799)" />
         <path
-           inkscape:connector-curvature="0"
-           style="fill:#2e3436;fill-opacity:1;display:inline"
-           d="m -332,397.375 0,12 0,1 0,1 5.78125,0 c -0.39578,-0.58583 -0.63582,-1.26195 -0.71875,-2 l -3.0625,0 0,-1 1,0 0.5,0 0.5,0 0,-0.5 0,-0.5 -0.5,0 -0.5,0 -1,0 0,-1 2,0 0.5,0 0.5,0 0,-0.5 0,-0.5 -0.5,0 -0.5,0 -2,0 0,-1 1,0 0.5,0 0.5,0 0,-0.5 0,-0.5 -0.5,0 -0.5,0 -1,0 0,-1 2,0 0.5,0 0.5,0 0,-0.5 0,-0.5 -0.5,0 -0.5,0 -2,0 0,-2 4,0 c 1.06188,-0.0309 2.16571,-0.0829 2,2 l 0,1 0,2.28125 c 0.47255,-0.16854 0.96957,-0.28125 1.5,-0.28125 0.17178,0 0.33323,0.0438 0.5,0.0625 l 0,-3.0625 c 0,-3 -1,-4 -4,-4 l -4,0 -2,0 z"
-           id="rect5888-5" />
+           sodipodi:type="arc"
+           style="fill:#2e3436;fill-opacity:1;stroke:none;display:inline"
+           id="path5820-6"
+           sodipodi:cx="-266.5"
+           sodipodi:cy="408.86218"
+           sodipodi:rx="0.5"
+           sodipodi:ry="0.5"
+           d="m -266,408.86218 c 0,0.27614 -0.22386,0.5 -0.5,0.5 -0.27614,0 -0.5,-0.22386 -0.5,-0.5 0,-0.27614 0.22386,-0.5 0.5,-0.5 0.27614,0 0.5,0.22386 0.5,0.5 z"
+           transform="matrix(2,0,0,1,228,2.6171874e-6)" />
+        <rect
+           style="fill:#2e3436;fill-opacity:1;stroke:none;display:inline"
+           id="rect5889-9"
+           width="3.198874"
+           height="0.49719238"
+           x="-306.62976"
+           y="411.36218" />
+        <rect
+           style="fill:#2e3436;fill-opacity:1;stroke:none;display:inline"
+           id="rect5889-4-7"
+           width="1.7073205"
+           height="0.38128155"
+           x="-305.7879"
+           y="407.64651" />
       </g>
     </g>
   </g>
diff --git a/src/ui/gui/data-editor.ui b/src/ui/gui/data-editor.ui
index 6d3b44a6c1..d5da4457b9 100644
--- a/src/ui/gui/data-editor.ui
+++ b/src/ui/gui/data-editor.ui
@@ -12,18 +12,21 @@
         <child>
           <object class="GtkAction" id="new1">
             <property name="stock-id">file-new-data</property>
+	    <property name="label" translatable="yes">_New...</property>
             <property name="name">new1</property>
           </object>
         </child>
         <child>
           <object class="GtkAction" id="file_new_syntax">
             <property name="name">file_new_syntax</property>
+	    <property name="stock-id">file-syntax-data</property>
             <property name="label" translatable="yes">_Syntax</property>
           </object>
         </child>
         <child>
           <object class="GtkAction" id="file_new_data">
             <property name="name">file_new_data</property>
+	    <property name="stock-id">file-system-data</property>
             <property name="label" translatable="yes">_Data</property>
           </object>
         </child>
@@ -73,12 +76,14 @@
           <object class="GtkAction" id="file_information_working-file">
             <property name="name">file_information_working-file</property>
             <property name="label" translatable="yes">Working File</property>
+	    <property name="stock-id">display-information-working-file</property>
           </object>
         </child>
         <child>
           <object class="GtkAction" id="file_information_external-file">
             <property name="name">file_information_external-file</property>
             <property name="label" translatable="yes">External File...</property>
+	    <property name="stock-id">display-information-external-file</property>
           </object>
         </child>
         <child>
diff --git a/src/ui/gui/output-viewer.ui b/src/ui/gui/output-viewer.ui
index 1f56cfa616..c8450264c7 100644
--- a/src/ui/gui/output-viewer.ui
+++ b/src/ui/gui/output-viewer.ui
@@ -33,12 +33,14 @@
           <object class="GtkAction" id="edit_select-all">
             <property name="name">edit_select-all</property>
             <property name="stock-id">edit-select-all</property>
+	    <property name="label" translatable="yes">Select _All</property>
           </object>
         </child>
         <child>
           <object class="GtkAction" id="edit_copy">
             <property name="stock-id">edit-copy</property>
             <property name="name">edit_copy</property>
+	    <property name="label" translatable="yes">_Copy</property>
           </object>
         </child>
         <child>
diff --git a/src/ui/gui/syntax-editor.ui b/src/ui/gui/syntax-editor.ui
index 405673e0dd..361ccfbd17 100644
--- a/src/ui/gui/syntax-editor.ui
+++ b/src/ui/gui/syntax-editor.ui
@@ -14,16 +14,19 @@
           <object class="GtkAction" id="new2">
             <property name="stock-id">file-new-data</property>
             <property name="name">new2</property>
+	    <property name="label" translatable="yes">_New...</property>
           </object>
         </child>
         <child>
           <object class="GtkAction" id="file_new_syntax">
+	    <property name="stock-id">file-syntax-data</property>
             <property name="name">file_new_syntax</property>
             <property name="label" translatable="yes">_Syntax</property>
           </object>
         </child>
         <child>
           <object class="GtkAction" id="file_new_data">
+	    <property name="stock-id">file-system-data</property>
             <property name="name">file_new_data</property>
             <property name="label" translatable="yes">_Data</property>
           </object>
@@ -39,6 +42,7 @@
           <object class="GtkAction" id="file_save">
             <property name="stock-id">file-save-data</property>
             <property name="name">file_save</property>
+	    <property name="label" translatable="yes">_Save...</property>
           </object>
         </child>
         <child>
@@ -52,6 +56,7 @@
           <object class="GtkAction" id="file_print">
             <property name="name">file_print</property>
             <property name="stock-id">file-print</property>
+	    <property name="label" translatable="yes">_Print...</property>
           </object>
         </child>
         <child>
@@ -98,12 +103,14 @@
           <object class="GtkAction" id="edit_undo">
             <property name="stock-id">edit-undo</property>
             <property name="name">edit_undo</property>
+	    <property name="sensitive">false</property>
           </object>
         </child>
         <child>
           <object class="GtkAction" id="edit_redo">
             <property name="stock-id">edit-redo</property>
             <property name="name">edit_redo</property>
+	    <property name="sensitive">false</property>
           </object>
         </child>
         <child>
-- 
2.30.2