diff --git a/app/actions/brushes-actions.c b/app/actions/brushes-actions.c
index dffbe95e33..4646ca3212 100644
--- a/app/actions/brushes-actions.c
+++ b/app/actions/brushes-actions.c
@@ -67,7 +67,7 @@ static const GimpActionEntry brushes_actions[] =
     G_CALLBACK (data_copy_location_cmd_callback),
     GIMP_HELP_BRUSH_COPY_LOCATION },
 
-  { "brushes-show-in-file-manager", "gtk-directory",
+  { "brushes-show-in-file-manager", GIMP_STOCK_FILE_MANAGER,
     NC_("brushes-action", "Show in _File Manager"), NULL,
     NC_("brushes-action", "Show brush file location in the file manager"),
     G_CALLBACK (data_show_in_file_manager_cmd_callback),
diff --git a/app/actions/dock-actions.c b/app/actions/dock-actions.c
index dfc41d6b32..097dd67382 100644
--- a/app/actions/dock-actions.c
+++ b/app/actions/dock-actions.c
@@ -46,7 +46,7 @@ static const GimpActionEntry dock_actions[] =
     NC_("dock-action", "M_ove to Screen"), NULL, NULL, NULL,
     GIMP_HELP_DOCK_CHANGE_SCREEN },
 
-  { "dock-close", "window-close",
+  { "dock-close", GIMP_STOCK_QUIT,
     NC_("dock-action", "Close Dock"), "", NULL,
     G_CALLBACK (window_close_cmd_callback),
     GIMP_HELP_DOCK_CLOSE },
diff --git a/app/actions/dockable-actions.c b/app/actions/dockable-actions.c
index e0e20647f2..7ebe4fd8fd 100644
--- a/app/actions/dockable-actions.c
+++ b/app/actions/dockable-actions.c
@@ -57,7 +57,7 @@ static const GimpActionEntry dockable_actions[] =
   { "dockable-tab-style-menu",    NULL, NC_("dockable-action",
                                             "_Tab Style")      },
 
-  { "dockable-close-tab", "window-close",
+  { "dockable-close-tab", GIMP_STOCK_QUIT,
     NC_("dockable-action", "_Close Tab"), "", NULL,
     G_CALLBACK (dockable_close_tab_cmd_callback),
     GIMP_HELP_DOCK_TAB_CLOSE },
diff --git a/app/actions/documents-actions.c b/app/actions/documents-actions.c
index 350e59f148..c4b4991c4d 100644
--- a/app/actions/documents-actions.c
+++ b/app/actions/documents-actions.c
@@ -66,7 +66,7 @@ static const GimpActionEntry documents_actions[] =
     G_CALLBACK (documents_copy_location_cmd_callback),
     GIMP_HELP_DOCUMENT_COPY_LOCATION },
 
-  { "documents-show-in-file-manager", "gtk-directory",
+  { "documents-show-in-file-manager", GIMP_STOCK_FILE_MANAGER,
     NC_("documents-action", "Show in _File Manager"), NULL,
     NC_("documents-action", "Show image location in the file manager"),
     G_CALLBACK (documents_show_in_file_manager_cmd_callback),
diff --git a/app/actions/dynamics-actions.c b/app/actions/dynamics-actions.c
index 074712a244..7b4c7d2e95 100644
--- a/app/actions/dynamics-actions.c
+++ b/app/actions/dynamics-actions.c
@@ -61,7 +61,7 @@ static const GimpActionEntry dynamics_actions[] =
     G_CALLBACK (data_copy_location_cmd_callback),
     GIMP_HELP_DYNAMICS_COPY_LOCATION },
 
-  { "dynamics-show-in-file-manager", "gtk-directory",
+  { "dynamics-show-in-file-manager", GIMP_STOCK_FILE_MANAGER,
     NC_("dynamics-action", "Show in _File Manager"), NULL,
     NC_("dynamics-action", "Show dynamics file location in the file manager"),
     G_CALLBACK (data_show_in_file_manager_cmd_callback),
diff --git a/app/actions/gradient-editor-actions.c b/app/actions/gradient-editor-actions.c
index 1cbfc75787..50b173d496 100644
--- a/app/actions/gradient-editor-actions.c
+++ b/app/actions/gradient-editor-actions.c
@@ -48,14 +48,14 @@ static const GimpActionEntry gradient_editor_actions[] =
 
   { "gradient-editor-left-color-type", NULL,
     NC_("gradient-editor-action", "Left Color Type") },
-  { "gradient-editor-load-left-color", "document-revert",
+  { "gradient-editor-load-left-color", GIMP_STOCK_REVERT,
     NC_("gradient-editor-action", "_Load Left Color From") },
   { "gradient-editor-save-left-color", GIMP_STOCK_SAVE,
     NC_("gradient-editor-action", "_Save Left Color To") },
 
   { "gradient-editor-right-color-type", NULL,
     NC_("gradient-editor-action", "Right Color Type") },
-  { "gradient-editor-load-right-color", "document-revert",
+  { "gradient-editor-load-right-color", GIMP_STOCK_REVERT,
     NC_("gradient-editor-action", "Load Right Color Fr_om") },
   { "gradient-editor-save-right-color", GIMP_STOCK_SAVE,
     NC_("gradient-editor-action", "Sa_ve Right Color To") },
diff --git a/app/actions/gradients-actions.c b/app/actions/gradients-actions.c
index 04bafdba9c..b7083274ae 100644
--- a/app/actions/gradients-actions.c
+++ b/app/actions/gradients-actions.c
@@ -62,7 +62,7 @@ static const GimpActionEntry gradients_actions[] =
     G_CALLBACK (data_copy_location_cmd_callback),
     GIMP_HELP_GRADIENT_COPY_LOCATION },
 
-  { "gradients-show-in-file-manager", "gtk-directory",
+  { "gradients-show-in-file-manager", GIMP_STOCK_FILE_MANAGER,
     NC_("gradients-action", "Show in _File Manager"), NULL,
     NC_("gradients-action", "Show gradient file location in the file manager"),
     G_CALLBACK (data_show_in_file_manager_cmd_callback),
diff --git a/app/actions/mypaint-brushes-actions.c b/app/actions/mypaint-brushes-actions.c
index 32f165bb5f..f8e3b0618d 100644
--- a/app/actions/mypaint-brushes-actions.c
+++ b/app/actions/mypaint-brushes-actions.c
@@ -61,7 +61,7 @@ static const GimpActionEntry mypaint_brushes_actions[] =
     G_CALLBACK (data_copy_location_cmd_callback),
     GIMP_HELP_MYPAINT_BRUSH_COPY_LOCATION },
 
-  { "mypaint-brushes-show-in-file-manager", "gtk-directory",
+  { "mypaint-brushes-show-in-file-manager", GIMP_STOCK_FILE_MANAGER,
     NC_("mypaint-brushes-action", "Show in _File Manager"), NULL,
     NC_("mypaint-brushes-action", "Show MyPaint brush file location in the file manager"),
     G_CALLBACK (data_show_in_file_manager_cmd_callback),
diff --git a/app/actions/palettes-actions.c b/app/actions/palettes-actions.c
index 33c2c5a4fd..ebc0f359f4 100644
--- a/app/actions/palettes-actions.c
+++ b/app/actions/palettes-actions.c
@@ -74,7 +74,7 @@ static const GimpActionEntry palettes_actions[] =
     G_CALLBACK (data_copy_location_cmd_callback),
     GIMP_HELP_PALETTE_COPY_LOCATION },
 
-  { "palettes-show-in-file-manager", "gtk-directory",
+  { "palettes-show-in-file-manager", GIMP_STOCK_FILE_MANAGER,
     NC_("palettes-action", "Show in _File Manager"), NULL,
     NC_("palettes-action", "Show palette file location in the file manager"),
     G_CALLBACK (data_show_in_file_manager_cmd_callback),
diff --git a/app/actions/patterns-actions.c b/app/actions/patterns-actions.c
index 2ce840cfc7..4b71b10e02 100644
--- a/app/actions/patterns-actions.c
+++ b/app/actions/patterns-actions.c
@@ -67,7 +67,7 @@ static const GimpActionEntry patterns_actions[] =
     G_CALLBACK (data_copy_location_cmd_callback),
     GIMP_HELP_PATTERN_COPY_LOCATION },
 
-  { "patterns-show-in-file-manager", "gtk-directory",
+  { "patterns-show-in-file-manager", GIMP_STOCK_FILE_MANAGER,
     NC_("patterns-action", "Show in _File Manager"), NULL,
     NC_("patterns-action", "Show pattern file location in the file manager"),
     G_CALLBACK (data_show_in_file_manager_cmd_callback),
diff --git a/app/actions/tool-options-actions.c b/app/actions/tool-options-actions.c
index 548d98e539..f251f5591b 100644
--- a/app/actions/tool-options-actions.c
+++ b/app/actions/tool-options-actions.c
@@ -61,7 +61,7 @@ static const GimpActionEntry tool_options_actions[] =
     NC_("tool-options-action", "_Save Tool Preset"), "", NULL, NULL,
     GIMP_HELP_TOOL_OPTIONS_SAVE },
 
-  { "tool-options-restore-preset-menu", "document-revert",
+  { "tool-options-restore-preset-menu", GIMP_STOCK_REVERT,
     NC_("tool-options-action", "_Restore Tool Preset"), "", NULL, NULL,
     GIMP_HELP_TOOL_OPTIONS_RESTORE },
 
diff --git a/app/actions/tool-presets-actions.c b/app/actions/tool-presets-actions.c
index 66c5e28391..8417c9d141 100644
--- a/app/actions/tool-presets-actions.c
+++ b/app/actions/tool-presets-actions.c
@@ -64,13 +64,13 @@ static const GimpActionEntry tool_presets_actions[] =
     G_CALLBACK (data_copy_location_cmd_callback),
     GIMP_HELP_TOOL_PRESET_COPY_LOCATION },
 
-  { "tool-presets-show-in-file-manager", "gtk-directory",
+  { "tool-presets-show-in-file-manager", GIMP_STOCK_FILE_MANAGER,
     NC_("tool-presets-action", "Show in _File Manager"), NULL,
     NC_("tool-presets-action", "Show tool preset file location in the file manager"),
     G_CALLBACK (data_show_in_file_manager_cmd_callback),
     GIMP_HELP_TOOL_PRESET_SHOW_IN_FILE_MANAGER },
 
-  { "tool-presets-restore", "document-revert",
+  { "tool-presets-restore", GIMP_STOCK_REVERT,
     NC_("tool-presets-action", "_Restore Tool Preset"), NULL,
     NC_("tool-presets-action", "Restore this tool preset"),
     G_CALLBACK (tool_presets_restore_cmd_callback),
diff --git a/app/actions/view-actions.c b/app/actions/view-actions.c
index 5323fdf5dc..9e57083c6d 100644
--- a/app/actions/view-actions.c
+++ b/app/actions/view-actions.c
@@ -91,7 +91,7 @@ static const GimpActionEntry view_actions[] =
     G_CALLBACK (view_new_cmd_callback),
     GIMP_HELP_VIEW_NEW },
 
-  { "view-close", "window-close",
+  { "view-close", GIMP_STOCK_QUIT,
     NC_("view-action",  "_Close View"), "<primary>W",
     NC_("view-action", "Close the active image view"),
     G_CALLBACK (view_close_cmd_callback),
diff --git a/app/widgets/gimpdataeditor.c b/app/widgets/gimpdataeditor.c
index f1216ce61d..8152120863 100644
--- a/app/widgets/gimpdataeditor.c
+++ b/app/widgets/gimpdataeditor.c
@@ -219,7 +219,7 @@ gimp_data_editor_constructed (GObject *object)
 
   editor->revert_button =
     gimp_editor_add_button (GIMP_EDITOR (editor),
-                            "document-revert",
+                            GIMP_STOCK_REVERT,
                             _("Revert"), NULL,
                             G_CALLBACK (gimp_data_editor_revert_clicked),
                             NULL,
diff --git a/app/widgets/gimptooloptionseditor.c b/app/widgets/gimptooloptionseditor.c
index 19fb081b83..803b6621bc 100644
--- a/app/widgets/gimptooloptionseditor.c
+++ b/app/widgets/gimptooloptionseditor.c
@@ -206,7 +206,7 @@ gimp_tool_options_editor_constructed (GObject *object)
                             editor);
 
   editor->p->restore_button =
-    gimp_editor_add_button (GIMP_EDITOR (editor), "document-revert",
+    gimp_editor_add_button (GIMP_EDITOR (editor), GIMP_STOCK_REVERT,
                             _("Restore Tool Preset..."),
                             GIMP_HELP_TOOL_OPTIONS_RESTORE,
                             G_CALLBACK (gimp_tool_options_editor_restore_clicked),
diff --git a/icons/Color/16/gimp-revert.png b/icons/Color/16/gimp-revert.png
new file mode 100644
index 0000000000..106bee69ba
Binary files /dev/null and b/icons/Color/16/gimp-revert.png differ
diff --git a/icons/Color/scalable/gimp-revert.svg b/icons/Color/scalable/gimp-revert.svg
new file mode 100644
index 0000000000..54204d4585
--- /dev/null
+++ b/icons/Color/scalable/gimp-revert.svg
@@ -0,0 +1,109 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="16"
+   height="16"
+   viewBox="0 0 16 16"
+   id="svg30571"
+   version="1.1"
+   inkscape:version="0.92pre1 unknown"
+   sodipodi:docname="gimp-reverta.svg">
+  <defs
+     id="defs30573" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="21.232704"
+     inkscape:cx="7.2618067"
+     inkscape:cy="9.375823"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     units="px"
+     inkscape:snap-page="true"
+     inkscape:snap-bbox="true"
+     inkscape:bbox-paths="true"
+     inkscape:bbox-nodes="true"
+     inkscape:snap-bbox-edge-midpoints="true"
+     inkscape:snap-bbox-midpoints="true"
+     inkscape:object-paths="true"
+     inkscape:snap-intersection-paths="true"
+     inkscape:object-nodes="true"
+     inkscape:snap-smooth-nodes="true"
+     inkscape:snap-midpoints="true"
+     inkscape:snap-object-midpoints="true"
+     inkscape:snap-center="true"
+     inkscape:snap-text-baseline="true"
+     showborder="false"
+     inkscape:window-width="1606"
+     inkscape:window-height="871"
+     inkscape:window-x="0"
+     inkscape:window-y="27"
+     inkscape:window-maximized="0"
+     showguides="true">
+    <inkscape:grid
+       type="xygrid"
+       id="grid4240" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata30576">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>
+          image/svg+xml
+        </dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:creator>
+          <cc:Agent>
+            <dc:title>Klaus Staedtler       </dc:title>
+          </cc:Agent>
+        </dc:creator>
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,-1036.3622)">
+    <g
+       id="g4237">
+      <g
+         style="fill:#4e9a06"
+         transform="matrix(1.0376102,0,0,1.0091341,0.21343527,-9.8486241)"
+         id="g3946">
+        <g
+           style="fill:#4e9a06"
+           id="refresh"
+           transform="matrix(0.74272062,0,0,0.74272062,31.29055,291.82008)">
+          <path
+             id="path4874"
+             transform="matrix(1.3056012,0,0,1.3056012,-42.119746,1003.0953)"
+             d="M 13.669922,0.76171875 A 1.1490108,1.1490108 0 0 0 12.539062,1.9277344 V 2.875 C 11.580602,2.023266 10.401786,1.4430604 9.125,1.2304688 8.3630798,1.1036306 7.5695734,1.1033626 6.7734375,1.2480469 3.5888993,1.8249458 1.198036,4.5477589 1.0332031,7.7792969 0.86836872,11.010911 2.9713663,13.915672 6.0839844,14.746094 9.1966032,15.576439 12.506084,14.113891 14.023438,11.242188 L 12.003906,10.191406 C 10.982525,12.124462 8.7875478,13.09283 6.6972656,12.535156 4.6069827,11.977635 3.2073278,10.047869 3.3183594,7.8710938 3.4293887,5.6943955 5.0198611,3.885378 7.1582031,3.4980469 8.78968,3.2025274 10.3876,3.8003497 11.419922,4.9902344 H 9.4746094 a 1.149414,1.149414 0 1 0 0,2.2988281 H 14.835938 V 1.9277344 A 1.1490108,1.1490108 0 0 0 13.669922,0.76171875 Z"
+             style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#73d216;fill-opacity:1;fill-rule:nonzero;stroke:#4e9a06;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+             inkscape:connector-curvature="0" />
+        </g>
+      </g>
+      <rect
+         y="1036.3622"
+         x="0"
+         height="16"
+         width="16"
+         id="rect3999-8"
+         style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.10246458;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
+    </g>
+  </g>
+</svg>
diff --git a/icons/Prototype/Color/16/gimp-refresh.png b/icons/Prototype/Color/16/gimp-refresh.png
deleted file mode 100644
index fa8ec9d1ee..0000000000
Binary files a/icons/Prototype/Color/16/gimp-refresh.png and /dev/null differ
diff --git a/icons/Prototype/Symbolic/16/gimp-refresh.png b/icons/Prototype/Symbolic/16/gimp-refresh.png
deleted file mode 100644
index 2b6c7af5c3..0000000000
Binary files a/icons/Prototype/Symbolic/16/gimp-refresh.png and /dev/null differ
diff --git a/icons/Symbolic/16/gimp-revert.png b/icons/Symbolic/16/gimp-revert.png
new file mode 100644
index 0000000000..33502286b0
Binary files /dev/null and b/icons/Symbolic/16/gimp-revert.png differ
diff --git a/icons/Symbolic/16/gimp-save-as.png b/icons/Symbolic/16/gimp-save-as.png
index 487b42b7ba..441d9c5ff9 100644
Binary files a/icons/Symbolic/16/gimp-save-as.png and b/icons/Symbolic/16/gimp-save-as.png differ
diff --git a/icons/Symbolic/scalable/gimp-revert.svg b/icons/Symbolic/scalable/gimp-revert.svg
new file mode 100644
index 0000000000..c4c4ee54f7
--- /dev/null
+++ b/icons/Symbolic/scalable/gimp-revert.svg
@@ -0,0 +1,120 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="16"
+   height="16"
+   viewBox="0 0 16 16"
+   id="svg30571"
+   version="1.1"
+   inkscape:version="0.92pre1 unknown"
+   sodipodi:docname="gimp-revert.svg">
+  <defs
+     id="defs30573" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="16"
+     inkscape:cx="4.3423913"
+     inkscape:cy="9.988086"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     units="px"
+     inkscape:snap-page="true"
+     inkscape:snap-bbox="true"
+     inkscape:bbox-paths="true"
+     inkscape:bbox-nodes="true"
+     inkscape:snap-bbox-edge-midpoints="true"
+     inkscape:snap-bbox-midpoints="true"
+     inkscape:object-paths="true"
+     inkscape:snap-intersection-paths="true"
+     inkscape:object-nodes="true"
+     inkscape:snap-smooth-nodes="true"
+     inkscape:snap-midpoints="true"
+     inkscape:snap-object-midpoints="true"
+     inkscape:snap-center="true"
+     inkscape:snap-text-baseline="true"
+     showborder="false"
+     inkscape:window-width="1920"
+     inkscape:window-height="1016"
+     inkscape:window-x="0"
+     inkscape:window-y="27"
+     inkscape:window-maximized="1"
+     showguides="false">
+    <inkscape:grid
+       type="xygrid"
+       id="grid4233" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata30576">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>
+          image/svg+xml
+        </dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:creator>
+          <cc:Agent>
+            <dc:title>Klaus Staedtler       </dc:title>
+          </cc:Agent>
+        </dc:creator>
+        <dc:title />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,-1036.3622)">
+    <g
+       id="g3946"
+       transform="matrix(1.03125,0,0,1.03125,-0.00757575,-32.87871)">
+      <g
+         transform="matrix(0.74272062,0,0,0.74272062,31.29055,291.82008)"
+         id="refresh">
+        <path
+           sodipodi:type="arc"
+           style="display:inline;opacity:1;fill:none;stroke:#bebebe;stroke-width:3.00320578;stroke-linecap:butt;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+           id="path4874"
+           sodipodi:cx="-20.820019"
+           sodipodi:cy="1013.6003"
+           sodipodi:rx="7.513957"
+           sodipodi:ry="7.6384649"
+           d="m -14.150104,1017.1176 a 7.513957,7.6384649 0 0 1 -8.596684,3.8657 7.513957,7.6384649 0 0 1 -5.581145,-7.6893 7.513957,7.6384649 0 0 1 6.169308,-7.21 7.513957,7.6384649 0 0 1 8.264328,4.5536"
+           transform="matrix(1,0,-0.01083068,0.99994135,0,0)"
+           sodipodi:start="0.4785358"
+           sodipodi:end="5.8848662"
+           sodipodi:open="true" />
+        <path
+           sodipodi:nodetypes="ccc"
+           inkscape:connector-curvature="0"
+           id="path8393-3-8-4-9-3-7"
+           d="m -29.507039,1011.1182 h 5.477342 v -5.4773"
+           style="display:inline;opacity:1;fill:none;stroke:#bebebe;stroke-width:2.9876411;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+           inkscape:export-filename="/home/matthias/Arbeitsfläche/sifr/von Jay Philipz/Matti/navigation.png"
+           inkscape:export-xdpi="89"
+           inkscape:export-ydpi="89" />
+      </g>
+      <rect
+         y="1036.6046"
+         x="0.24242425"
+         height="15.515152"
+         width="15.515152"
+         id="rect3999"
+         style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.4848485;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
+    </g>
+  </g>
+</svg>
diff --git a/icons/Symbolic/scalable/gimp-save-as.svg b/icons/Symbolic/scalable/gimp-save-as.svg
index 4f097eb029..b2c3ae560d 100644
--- a/icons/Symbolic/scalable/gimp-save-as.svg
+++ b/icons/Symbolic/scalable/gimp-save-as.svg
@@ -24,8 +24,8 @@
      inkscape:pageopacity="0"
      inkscape:pageshadow="2"
      inkscape:zoom="16"
-     inkscape:cx="14.900652"
-     inkscape:cy="17.081836"
+     inkscape:cx="9.5160701"
+     inkscape:cy="17.488086"
      inkscape:document-units="px"
      inkscape:current-layer="layer1"
      showgrid="true"
@@ -69,7 +69,7 @@
             <dc:title>Klaus Staedtler       </dc:title>
           </cc:Agent>
         </dc:creator>
-        <dc:title></dc:title>
+        <dc:title />
       </cc:Work>
     </rdf:RDF>
   </metadata>
@@ -79,101 +79,47 @@
      id="layer1"
      transform="translate(0,-1036.3622)">
     <g
-       id="g4282">
+       id="g4286">
       <g
-         inkscape:label="gimp-save-tool-preset"
          id="gimp-save"
          style="display:inline"
-         transform="translate(-41.0002,617.3622)">
-        <g
-           id="g932"
-           inkscape:label="gimp-save-tool-preset">
-          <g
-             inkscape:label="document-save"
-             transform="translate(-118.9998,-119)"
-             id="g4561"
-             style="display:inline">
-            <rect
-               width="16"
-               height="16"
-               x="538"
-               y="160"
-               id="rect10837-5-8-4-4-4-1"
-               style="color:#bebebe;display:inline;overflow:visible;visibility:visible;fill:none;stroke:none;stroke-width:1;marker:none;enable-background:new"
-               transform="matrix(0,1,1,0,0,0)" />
-            <g
-               id="g4555" />
-          </g>
-        </g>
-        <g
-           transform="translate(-2.9960276)"
-           id="g4265">
-          <path
-             sodipodi:nodetypes="cccc"
-             inkscape:connector-curvature="0"
-             id="path11635"
-             d="m 49.0002,429 -4.02308,-4 h 8 z"
-             style="fill:#bebebe;fill-opacity:1;stroke:none" />
-          <path
-             transform="translate(-118.9998,-119)"
-             style="color:#bebebe;display:inline;overflow:visible;visibility:visible;fill:none;stroke:#bebebe;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
-             d="m 163.5,549 1,-1.5 m 7,0 1,1.5"
-             id="rect4390-9"
-             inkscape:connector-curvature="0"
-             sodipodi:nodetypes="cccc" />
-          <path
-             transform="translate(-118.9998,-119)"
-             style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#bebebe;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;marker:none;enable-background:accumulate"
-             d="m 163,549 v 4 h 10 v -4 z m 3.34375,1.4375 c 0.0208,-10e-4 0.0417,-10e-4 0.0625,0 0.29096,-0.0556 0.59898,0.20383 0.59375,0.5 V 551 h 2 v -0.0625 c -0.004,-0.26416 0.23582,-0.50712 0.5,-0.50712 0.26418,0 0.50373,0.24296 0.5,0.50712 V 551 c 0,0.54535 -0.45465,1 -1,1 h -2 c -0.54535,0 -1,-0.45465 -1,-1 v -0.0625 c -0.0108,-0.21706 0.13723,-0.43234 0.34375,-0.5 z"
-             id="rect11668-7-5"
-             sodipodi:nodetypes="ccccccsccccsccccccc"
-             inkscape:connector-curvature="0" />
-          <rect
-             y="420"
-             x="48.000198"
-             height="7"
-             width="2"
-             id="rect11650"
-             style="fill:#bebebe;fill-opacity:1;stroke:none" />
-        </g>
-      </g>
+         transform="translate(-41.0002,617.3622)" />
       <g
-         id="g3943"
-         transform="matrix(0.51881117,0,0,0.51934226,8.459839,499.3457)">
-        <g
-           id="g3939"
-           transform="matrix(0.75258206,0.75039082,-0.75039082,0.75258206,803.6233,277.20486)">
-          <g
-             id="g3936">
-            <rect
-               transform="matrix(0.99999992,4.0424081e-4,4.7678433e-4,0.99999989,0,0)"
-               style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#bebebe;stroke-width:2.8874321;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
-               id="rect3935"
-               width="0.3149831"
-               height="9.6140842"
-               x="-21.06229"
-               y="1034.1587" />
-            <path
-               sodipodi:type="star"
-               style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:0.5;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#bebebe;stroke-width:2.91199994;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
-               id="path3937"
-               sodipodi:sides="3"
-               sodipodi:cx="-20.516788"
-               sodipodi:cy="1049.0612"
-               sodipodi:r1="0.42613241"
-               sodipodi:r2="0.21306621"
-               sodipodi:arg1="1.3734008"
-               sodipodi:arg2="2.4205983"
-               inkscape:flatsided="false"
-               inkscape:rounded="0"
-               inkscape:randomized="0"
-               d="m -20.433217,1049.479 -0.243616,-0.2772 -0.243616,-0.2772 0.361875,-0.072 0.361875,-0.072 -0.118259,0.3495 z"
-               inkscape:transform-center-x="-0.00088224651"
-               inkscape:transform-center-y="0.060034831"
-               transform="matrix(0.55885439,0.11601918,-0.11601918,0.55885439,112.74961,463.25289)" />
-          </g>
-        </g>
+         transform="translate(-101,389.3622)"
+         id="layer12">
+        <path
+           inkscape:connector-curvature="0"
+           d="m 105,652 v 1 c 1e-5,0.2653 0.0931,0.53058 0.28125,0.71875 l 3,3 L 108.5625,657 h 0.875 l 0.28125,-0.28125 3,-3 C 112.90694,653.53058 112.99999,653.2653 113,653 v -1 h -1 c -0.2653,10e-6 -0.53059,0.0931 -0.71875,0.28125 l -2.2812,2.2812 -2.2812,-2.2812 c -0.19,-0.19 -0.45,-0.28 -0.72,-0.28 h -1 z"
+           style="color:#000000;text-indent:0;text-transform:none;fill:#bebebe"
+           id="path3613-6" />
+        <path
+           inkscape:connector-curvature="0"
+           d="m 108,650 v 5 h 2 v -5 z"
+           style="color:#000000;text-indent:0;text-transform:none;fill:#bebebe"
+           id="path4388-5" />
+        <path
+           inkscape:connector-curvature="0"
+           d="m 104,658 v 4 h 10 v -4 z m 3.3438,1.4375 c 0.0208,-10e-4 0.0417,-10e-4 0.0625,0 0.29096,-0.0556 0.59898,0.20383 0.59375,0.5 V 660 h 2 v -0.0625 c -0.004,-0.26416 0.23582,-0.50712 0.5,-0.50712 0.26418,0 0.50373,0.24296 0.5,0.50712 V 660 c 0,0.54535 -0.45465,1 -1,1 h -2 c -0.54535,0 -1,-0.45465 -1,-1 v -0.0625 c -0.0108,-0.21706 0.13723,-0.43234 0.34375,-0.5 z"
+           style="color:#000000;fill:#bebebe;fill-rule:evenodd"
+           id="rect11668-7-5-4" />
+        <path
+           inkscape:connector-curvature="0"
+           d="m 104,647 c -0.54535,0 -1,0.45465 -1,1 v 2 c 0,0.54535 0.45465,1 1,1 h 10 c 0.54535,0 1,-0.45465 1,-1 v -2 c 0,-0.54535 -0.45465,-1 -1,-1 z m 0,1 h 10 v 2 h -10 z"
+           style="color:#bebebe;text-indent:0;text-transform:none;fill:#bebebe"
+           id="rect4390" />
+        <path
+           inkscape:connector-curvature="0"
+           d="m 105.41,656 a 0.50005,0.50005 0 0 0 -0.3125,0.21875 l -1,1.5 a 0.50005,0.50005 0 1 0 0.8125,0.5625 l 1,-1.5 A 0.50005,0.50005 0 0 0 105.41,656 Z m 7,0 a 0.50005,0.50005 0 0 0 -0.3125,0.78125 l 1,1.5 a 0.50005,0.50005 0 1 0 0.8125,-0.5625 l -1,-1.5 A 0.50005,0.50005 0 0 0 112.41,656 Z"
+           style="color:#bebebe;text-indent:0;text-transform:none;fill:#bebebe"
+           id="rect4390-9-1" />
       </g>
+      <rect
+         y="1036.5532"
+         x="0.19097593"
+         height="15.618048"
+         width="15.618048"
+         id="rect4276"
+         style="opacity:0;fill:none;fill-opacity:1;stroke:#f57900;stroke-width:0.38195187;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
     </g>
   </g>
 </svg>
diff --git a/libgimpwidgets/gimpfileentry.c b/libgimpwidgets/gimpfileentry.c
index 56dc1f5c30..386530e4e0 100644
--- a/libgimpwidgets/gimpfileentry.c
+++ b/libgimpwidgets/gimpfileentry.c
@@ -138,7 +138,7 @@ gimp_file_entry_init (GimpFileEntry *entry)
 
   gtk_widget_set_sensitive (button, FALSE);
 
-  image = gtk_image_new_from_icon_name ("gtk-directory", GTK_ICON_SIZE_BUTTON);
+  image = gtk_image_new_from_icon_name (GIMP_STOCK_FILE_MANGER, GTK_ICON_SIZE_BUTTON);
   gtk_container_add (GTK_CONTAINER (button), image);
   gtk_widget_show (image);
 
diff --git a/libgimpwidgets/gimpicons.c b/libgimpwidgets/gimpicons.c
index b4ca0371d0..fbda3fa62a 100644
--- a/libgimpwidgets/gimpicons.c
+++ b/libgimpwidgets/gimpicons.c
@@ -76,6 +76,7 @@ static const GtkStockItem gimp_stock_items[] =
 
   { GIMP_STOCK_IMAGE_OPEN,                    NULL,   0, 0, LIBGIMP_DOMAIN },
   { GIMP_STOCK_IMAGE_RELOAD,                  NULL,   0, 0, LIBGIMP_DOMAIN },
+  { GIMP_STOCK_REVERT,                        NULL,   0, 0, LIBGIMP_DOMAIN },
   { GIMP_STOCK_CLOSE_ALL,                     NULL,   0, 0, LIBGIMP_DOMAIN },
   { GIMP_STOCK_CLIPBOARD,                     NULL,   0, 0, LIBGIMP_DOMAIN },
   { GIMP_STOCK_FILE_MANAGER,                  NULL,   0, 0, LIBGIMP_DOMAIN },
diff --git a/libgimpwidgets/gimpicons.h b/libgimpwidgets/gimpicons.h
index 7ced0ae612..c5dc202a8a 100644
--- a/libgimpwidgets/gimpicons.h
+++ b/libgimpwidgets/gimpicons.h
@@ -52,6 +52,7 @@ G_BEGIN_DECLS
 #define GIMP_STOCK_IMAGE_OPEN               "gimp-image-open"
 #define GIMP_STOCK_IMAGE_RELOAD             "gimp-image-reload"
 #define GIMP_STOCK_CLOSE_ALL                "gimp-close-all"
+#define GIMP_STOCK_REVERT                   "gimp-revert"
 #define GIMP_STOCK_CLIPBOARD                "gimp-clipboard"
 #define GIMP_STOCK_FILE_MANAGER             "gimp-file-manager"