diff --git a/collects/drracket/private/unit.rkt b/collects/drracket/private/unit.rkt
index 26c90a147e..58828d9c54 100644
--- a/collects/drracket/private/unit.rkt
+++ b/collects/drracket/private/unit.rkt
@@ -387,8 +387,7 @@ module browser threading seems wrong.
   
   (define execute-bitmap (icons:go-icon 'green (icons:toolbar-icon-height)))
   (define break-bitmap (icons:stop-icon 'red (icons:toolbar-icon-height)))
-  
-  (define save-bitmap (make-object bitmap% (collection-file-path "save.png" "icons") 'png/mask))
+  (define save-bitmap (icons:disk-icon #f (icons:toolbar-icon-height)))
   
   (define-values (get-program-editor-mixin add-to-program-editor-mixin)
     (let* ([program-editor-mixin
diff --git a/collects/icons/main.rkt b/collects/icons/main.rkt
index 2d5cbcf9b3..05d93bc3e5 100644
--- a/collects/icons/main.rkt
+++ b/collects/icons/main.rkt
@@ -17,46 +17,25 @@
           icon-categories
           icon-names
           
-          go-icon-pict
-          bar-icon-pict
-          back-icon-pict
-          stop-icon-pict
-          step-icon-pict
-          step-back-icon-pict
-          continue-icon-pict
-          continue-back-icon-pict
-          fast-forward-icon-pict
-          rewind-icon-pict
-          pause-icon-pict
-          stop-sign-icon-pict
-          check-icon-pict
-          magnifying-glass-icon-pict
-          magnifying-glass-left-icon-pict
-          stop-signs-icon-pict
-          macro-stepper-icon-pict
-          check-syntax-icon-pict
-          check-syntax-small-icon-pict
-          plt-logo-pict
-          planet-logo-pict
-          
-          go-icon
-          bar-icon
-          back-icon
-          stop-icon
-          step-icon
-          step-back-icon
-          continue-icon
-          continue-back-icon
-          fast-forward-icon
-          rewind-icon
-          pause-icon
-          stop-sign-icon
-          check-icon
-          magnifying-glass-icon
-          magnifying-glass-left-icon
-          stop-signs-icon
-          macro-stepper-icon
-          check-syntax-icon
-          check-syntax-small-icon
-          plt-logo
-          planet-logo))
+          go-icon go-icon-pict
+          bar-icon bar-icon-pict
+          back-icon back-icon-pict
+          stop-icon stop-icon-pict
+          step-icon step-icon-pict
+          step-back-icon step-back-icon-pict
+          continue-icon continue-icon-pict
+          continue-back-icon continue-back-icon-pict
+          fast-forward-icon fast-forward-icon-pict
+          rewind-icon rewind-icon-pict
+          pause-icon pause-icon-pict
+          stop-sign-icon stop-sign-icon-pict
+          check-icon check-icon-pict
+          magnifying-glass-icon magnifying-glass-icon-pict
+          magnifying-glass-left-icon magnifying-glass-left-icon-pict
+          disk-icon disk-icon-pict
+          stop-signs-icon stop-signs-icon-pict
+          macro-stepper-icon macro-stepper-icon-pict
+          check-syntax-icon check-syntax-icon-pict
+          check-syntax-small-icon check-syntax-small-icon-pict
+          plt-logo plt-logo-pict
+          planet-logo planet-logo-pict))
diff --git a/collects/icons/private/svg.rkt b/collects/icons/private/svg.rkt
index 2e7f472c73..784367b6db 100644
--- a/collects/icons/private/svg.rkt
+++ b/collects/icons/private/svg.rkt
@@ -129,6 +129,10 @@
                                           [style icon-style/c (default-icon-style)]) pict?
   (load-icon-pict "misc" (format-icon-name "magnifying-glass-left" color style) height))
 
+(defproc (disk-icon-pict [color icon-color/c] [height (>=/c 0)]
+                         [style icon-style/c (default-icon-style)]) pict?
+  (load-icon-pict "misc" (format-icon-name "disk" color style) height))
+
 ;; Icons for tools and other special uses
 
 (defproc (stop-signs-icon-pict [height (>=/c 0)] [style icon-style/c (default-icon-style)]) pict?
@@ -202,6 +206,7 @@
   check-icon
   magnifying-glass-icon
   magnifying-glass-left-icon
+  disk-icon
   planet-logo)
 
 (define-wrapped-icon-fun/no-color
diff --git a/collects/icons/private/svg/misc/16/black/disk-diffuse.png b/collects/icons/private/svg/misc/16/black/disk-diffuse.png
new file mode 100644
index 0000000000..d2e4e303f6
Binary files /dev/null and b/collects/icons/private/svg/misc/16/black/disk-diffuse.png differ
diff --git a/collects/icons/private/svg/misc/16/black/disk-shiny.png b/collects/icons/private/svg/misc/16/black/disk-shiny.png
new file mode 100644
index 0000000000..b70f6c01c8
Binary files /dev/null and b/collects/icons/private/svg/misc/16/black/disk-shiny.png differ
diff --git a/collects/icons/private/svg/misc/16/blue/disk-diffuse.png b/collects/icons/private/svg/misc/16/blue/disk-diffuse.png
new file mode 100644
index 0000000000..ab6f318bb5
Binary files /dev/null and b/collects/icons/private/svg/misc/16/blue/disk-diffuse.png differ
diff --git a/collects/icons/private/svg/misc/16/blue/disk-shiny.png b/collects/icons/private/svg/misc/16/blue/disk-shiny.png
new file mode 100644
index 0000000000..07ff1b601a
Binary files /dev/null and b/collects/icons/private/svg/misc/16/blue/disk-shiny.png differ
diff --git a/collects/icons/private/svg/misc/16/cyan/disk-diffuse.png b/collects/icons/private/svg/misc/16/cyan/disk-diffuse.png
new file mode 100644
index 0000000000..8ff05a8590
Binary files /dev/null and b/collects/icons/private/svg/misc/16/cyan/disk-diffuse.png differ
diff --git a/collects/icons/private/svg/misc/16/cyan/disk-shiny.png b/collects/icons/private/svg/misc/16/cyan/disk-shiny.png
new file mode 100644
index 0000000000..95f25993fd
Binary files /dev/null and b/collects/icons/private/svg/misc/16/cyan/disk-shiny.png differ
diff --git a/collects/icons/private/svg/misc/16/disk-diffuse.png b/collects/icons/private/svg/misc/16/disk-diffuse.png
new file mode 100644
index 0000000000..1ad4abeb53
Binary files /dev/null and b/collects/icons/private/svg/misc/16/disk-diffuse.png differ
diff --git a/collects/icons/private/svg/misc/16/disk-shiny.png b/collects/icons/private/svg/misc/16/disk-shiny.png
new file mode 100644
index 0000000000..7ca59ec40c
Binary files /dev/null and b/collects/icons/private/svg/misc/16/disk-shiny.png differ
diff --git a/collects/icons/private/svg/misc/16/green/disk-diffuse.png b/collects/icons/private/svg/misc/16/green/disk-diffuse.png
new file mode 100644
index 0000000000..aad88af4d4
Binary files /dev/null and b/collects/icons/private/svg/misc/16/green/disk-diffuse.png differ
diff --git a/collects/icons/private/svg/misc/16/green/disk-shiny.png b/collects/icons/private/svg/misc/16/green/disk-shiny.png
new file mode 100644
index 0000000000..0fd46bca33
Binary files /dev/null and b/collects/icons/private/svg/misc/16/green/disk-shiny.png differ
diff --git a/collects/icons/private/svg/misc/16/orange/disk-diffuse.png b/collects/icons/private/svg/misc/16/orange/disk-diffuse.png
new file mode 100644
index 0000000000..c7549849b0
Binary files /dev/null and b/collects/icons/private/svg/misc/16/orange/disk-diffuse.png differ
diff --git a/collects/icons/private/svg/misc/16/orange/disk-shiny.png b/collects/icons/private/svg/misc/16/orange/disk-shiny.png
new file mode 100644
index 0000000000..1882e4ee6f
Binary files /dev/null and b/collects/icons/private/svg/misc/16/orange/disk-shiny.png differ
diff --git a/collects/icons/private/svg/misc/16/purple/disk-diffuse.png b/collects/icons/private/svg/misc/16/purple/disk-diffuse.png
new file mode 100644
index 0000000000..b6da978dff
Binary files /dev/null and b/collects/icons/private/svg/misc/16/purple/disk-diffuse.png differ
diff --git a/collects/icons/private/svg/misc/16/purple/disk-shiny.png b/collects/icons/private/svg/misc/16/purple/disk-shiny.png
new file mode 100644
index 0000000000..e0e501af2e
Binary files /dev/null and b/collects/icons/private/svg/misc/16/purple/disk-shiny.png differ
diff --git a/collects/icons/private/svg/misc/16/red/disk-diffuse.png b/collects/icons/private/svg/misc/16/red/disk-diffuse.png
new file mode 100644
index 0000000000..eabc60d372
Binary files /dev/null and b/collects/icons/private/svg/misc/16/red/disk-diffuse.png differ
diff --git a/collects/icons/private/svg/misc/16/red/disk-shiny.png b/collects/icons/private/svg/misc/16/red/disk-shiny.png
new file mode 100644
index 0000000000..6dc86482a6
Binary files /dev/null and b/collects/icons/private/svg/misc/16/red/disk-shiny.png differ
diff --git a/collects/icons/private/svg/misc/16/white/disk-diffuse.png b/collects/icons/private/svg/misc/16/white/disk-diffuse.png
new file mode 100644
index 0000000000..f4a56c5dfe
Binary files /dev/null and b/collects/icons/private/svg/misc/16/white/disk-diffuse.png differ
diff --git a/collects/icons/private/svg/misc/16/white/disk-shiny.png b/collects/icons/private/svg/misc/16/white/disk-shiny.png
new file mode 100644
index 0000000000..ce46f21f5d
Binary files /dev/null and b/collects/icons/private/svg/misc/16/white/disk-shiny.png differ
diff --git a/collects/icons/private/svg/misc/32/black/disk-diffuse.png b/collects/icons/private/svg/misc/32/black/disk-diffuse.png
new file mode 100644
index 0000000000..6efc7c3e9e
Binary files /dev/null and b/collects/icons/private/svg/misc/32/black/disk-diffuse.png differ
diff --git a/collects/icons/private/svg/misc/32/black/disk-shiny.png b/collects/icons/private/svg/misc/32/black/disk-shiny.png
new file mode 100644
index 0000000000..3a3c4082b5
Binary files /dev/null and b/collects/icons/private/svg/misc/32/black/disk-shiny.png differ
diff --git a/collects/icons/private/svg/misc/32/blue/disk-diffuse.png b/collects/icons/private/svg/misc/32/blue/disk-diffuse.png
new file mode 100644
index 0000000000..f7159bad35
Binary files /dev/null and b/collects/icons/private/svg/misc/32/blue/disk-diffuse.png differ
diff --git a/collects/icons/private/svg/misc/32/blue/disk-shiny.png b/collects/icons/private/svg/misc/32/blue/disk-shiny.png
new file mode 100644
index 0000000000..21ab471d42
Binary files /dev/null and b/collects/icons/private/svg/misc/32/blue/disk-shiny.png differ
diff --git a/collects/icons/private/svg/misc/32/cyan/disk-diffuse.png b/collects/icons/private/svg/misc/32/cyan/disk-diffuse.png
new file mode 100644
index 0000000000..3f81e91f2d
Binary files /dev/null and b/collects/icons/private/svg/misc/32/cyan/disk-diffuse.png differ
diff --git a/collects/icons/private/svg/misc/32/cyan/disk-shiny.png b/collects/icons/private/svg/misc/32/cyan/disk-shiny.png
new file mode 100644
index 0000000000..dc5c1b5b8c
Binary files /dev/null and b/collects/icons/private/svg/misc/32/cyan/disk-shiny.png differ
diff --git a/collects/icons/private/svg/misc/32/disk-diffuse.png b/collects/icons/private/svg/misc/32/disk-diffuse.png
new file mode 100644
index 0000000000..6eb03c0520
Binary files /dev/null and b/collects/icons/private/svg/misc/32/disk-diffuse.png differ
diff --git a/collects/icons/private/svg/misc/32/disk-shiny.png b/collects/icons/private/svg/misc/32/disk-shiny.png
new file mode 100644
index 0000000000..8b50b9f88d
Binary files /dev/null and b/collects/icons/private/svg/misc/32/disk-shiny.png differ
diff --git a/collects/icons/private/svg/misc/32/green/disk-diffuse.png b/collects/icons/private/svg/misc/32/green/disk-diffuse.png
new file mode 100644
index 0000000000..c7bbd8dbcc
Binary files /dev/null and b/collects/icons/private/svg/misc/32/green/disk-diffuse.png differ
diff --git a/collects/icons/private/svg/misc/32/green/disk-shiny.png b/collects/icons/private/svg/misc/32/green/disk-shiny.png
new file mode 100644
index 0000000000..8b4e5983e8
Binary files /dev/null and b/collects/icons/private/svg/misc/32/green/disk-shiny.png differ
diff --git a/collects/icons/private/svg/misc/32/orange/disk-diffuse.png b/collects/icons/private/svg/misc/32/orange/disk-diffuse.png
new file mode 100644
index 0000000000..0bf63cc9cb
Binary files /dev/null and b/collects/icons/private/svg/misc/32/orange/disk-diffuse.png differ
diff --git a/collects/icons/private/svg/misc/32/orange/disk-shiny.png b/collects/icons/private/svg/misc/32/orange/disk-shiny.png
new file mode 100644
index 0000000000..9c97691b08
Binary files /dev/null and b/collects/icons/private/svg/misc/32/orange/disk-shiny.png differ
diff --git a/collects/icons/private/svg/misc/32/purple/disk-diffuse.png b/collects/icons/private/svg/misc/32/purple/disk-diffuse.png
new file mode 100644
index 0000000000..cf965fd915
Binary files /dev/null and b/collects/icons/private/svg/misc/32/purple/disk-diffuse.png differ
diff --git a/collects/icons/private/svg/misc/32/purple/disk-shiny.png b/collects/icons/private/svg/misc/32/purple/disk-shiny.png
new file mode 100644
index 0000000000..312ef80f26
Binary files /dev/null and b/collects/icons/private/svg/misc/32/purple/disk-shiny.png differ
diff --git a/collects/icons/private/svg/misc/32/red/disk-diffuse.png b/collects/icons/private/svg/misc/32/red/disk-diffuse.png
new file mode 100644
index 0000000000..166893703e
Binary files /dev/null and b/collects/icons/private/svg/misc/32/red/disk-diffuse.png differ
diff --git a/collects/icons/private/svg/misc/32/red/disk-shiny.png b/collects/icons/private/svg/misc/32/red/disk-shiny.png
new file mode 100644
index 0000000000..c7cb430ebc
Binary files /dev/null and b/collects/icons/private/svg/misc/32/red/disk-shiny.png differ
diff --git a/collects/icons/private/svg/misc/32/white/disk-diffuse.png b/collects/icons/private/svg/misc/32/white/disk-diffuse.png
new file mode 100644
index 0000000000..05c2ee2a30
Binary files /dev/null and b/collects/icons/private/svg/misc/32/white/disk-diffuse.png differ
diff --git a/collects/icons/private/svg/misc/32/white/disk-shiny.png b/collects/icons/private/svg/misc/32/white/disk-shiny.png
new file mode 100644
index 0000000000..1a21ed873f
Binary files /dev/null and b/collects/icons/private/svg/misc/32/white/disk-shiny.png differ
diff --git a/collects/icons/private/svg/misc/64/black/disk-diffuse.png b/collects/icons/private/svg/misc/64/black/disk-diffuse.png
new file mode 100644
index 0000000000..9423d00d78
Binary files /dev/null and b/collects/icons/private/svg/misc/64/black/disk-diffuse.png differ
diff --git a/collects/icons/private/svg/misc/64/black/disk-shiny.png b/collects/icons/private/svg/misc/64/black/disk-shiny.png
new file mode 100644
index 0000000000..718040d7e6
Binary files /dev/null and b/collects/icons/private/svg/misc/64/black/disk-shiny.png differ
diff --git a/collects/icons/private/svg/misc/64/blue/disk-diffuse.png b/collects/icons/private/svg/misc/64/blue/disk-diffuse.png
new file mode 100644
index 0000000000..66db4167dd
Binary files /dev/null and b/collects/icons/private/svg/misc/64/blue/disk-diffuse.png differ
diff --git a/collects/icons/private/svg/misc/64/blue/disk-shiny.png b/collects/icons/private/svg/misc/64/blue/disk-shiny.png
new file mode 100644
index 0000000000..2bbbea1e58
Binary files /dev/null and b/collects/icons/private/svg/misc/64/blue/disk-shiny.png differ
diff --git a/collects/icons/private/svg/misc/64/cyan/disk-diffuse.png b/collects/icons/private/svg/misc/64/cyan/disk-diffuse.png
new file mode 100644
index 0000000000..a199ed4b47
Binary files /dev/null and b/collects/icons/private/svg/misc/64/cyan/disk-diffuse.png differ
diff --git a/collects/icons/private/svg/misc/64/cyan/disk-shiny.png b/collects/icons/private/svg/misc/64/cyan/disk-shiny.png
new file mode 100644
index 0000000000..26663dbdf9
Binary files /dev/null and b/collects/icons/private/svg/misc/64/cyan/disk-shiny.png differ
diff --git a/collects/icons/private/svg/misc/64/disk-diffuse.png b/collects/icons/private/svg/misc/64/disk-diffuse.png
new file mode 100644
index 0000000000..a3db4c1c95
Binary files /dev/null and b/collects/icons/private/svg/misc/64/disk-diffuse.png differ
diff --git a/collects/icons/private/svg/misc/64/disk-shiny.png b/collects/icons/private/svg/misc/64/disk-shiny.png
new file mode 100644
index 0000000000..f62fd75a8b
Binary files /dev/null and b/collects/icons/private/svg/misc/64/disk-shiny.png differ
diff --git a/collects/icons/private/svg/misc/64/green/disk-diffuse.png b/collects/icons/private/svg/misc/64/green/disk-diffuse.png
new file mode 100644
index 0000000000..a702ee3762
Binary files /dev/null and b/collects/icons/private/svg/misc/64/green/disk-diffuse.png differ
diff --git a/collects/icons/private/svg/misc/64/green/disk-shiny.png b/collects/icons/private/svg/misc/64/green/disk-shiny.png
new file mode 100644
index 0000000000..6048b3149c
Binary files /dev/null and b/collects/icons/private/svg/misc/64/green/disk-shiny.png differ
diff --git a/collects/icons/private/svg/misc/64/orange/disk-diffuse.png b/collects/icons/private/svg/misc/64/orange/disk-diffuse.png
new file mode 100644
index 0000000000..a91913ec13
Binary files /dev/null and b/collects/icons/private/svg/misc/64/orange/disk-diffuse.png differ
diff --git a/collects/icons/private/svg/misc/64/orange/disk-shiny.png b/collects/icons/private/svg/misc/64/orange/disk-shiny.png
new file mode 100644
index 0000000000..85cac9b3ff
Binary files /dev/null and b/collects/icons/private/svg/misc/64/orange/disk-shiny.png differ
diff --git a/collects/icons/private/svg/misc/64/purple/disk-diffuse.png b/collects/icons/private/svg/misc/64/purple/disk-diffuse.png
new file mode 100644
index 0000000000..1915a80a65
Binary files /dev/null and b/collects/icons/private/svg/misc/64/purple/disk-diffuse.png differ
diff --git a/collects/icons/private/svg/misc/64/purple/disk-shiny.png b/collects/icons/private/svg/misc/64/purple/disk-shiny.png
new file mode 100644
index 0000000000..2c0eb24e7a
Binary files /dev/null and b/collects/icons/private/svg/misc/64/purple/disk-shiny.png differ
diff --git a/collects/icons/private/svg/misc/64/red/disk-diffuse.png b/collects/icons/private/svg/misc/64/red/disk-diffuse.png
new file mode 100644
index 0000000000..347cdc5fa9
Binary files /dev/null and b/collects/icons/private/svg/misc/64/red/disk-diffuse.png differ
diff --git a/collects/icons/private/svg/misc/64/red/disk-shiny.png b/collects/icons/private/svg/misc/64/red/disk-shiny.png
new file mode 100644
index 0000000000..ac17a829d6
Binary files /dev/null and b/collects/icons/private/svg/misc/64/red/disk-shiny.png differ
diff --git a/collects/icons/private/svg/misc/64/white/disk-diffuse.png b/collects/icons/private/svg/misc/64/white/disk-diffuse.png
new file mode 100644
index 0000000000..2fa16eddb8
Binary files /dev/null and b/collects/icons/private/svg/misc/64/white/disk-diffuse.png differ
diff --git a/collects/icons/private/svg/misc/64/white/disk-shiny.png b/collects/icons/private/svg/misc/64/white/disk-shiny.png
new file mode 100644
index 0000000000..f29153d56a
Binary files /dev/null and b/collects/icons/private/svg/misc/64/white/disk-shiny.png differ
diff --git a/collects/icons/private/svg/misc/disk-diffuse.svg b/collects/icons/private/svg/misc/disk-diffuse.svg
new file mode 100644
index 0000000000..c6ec92080b
--- /dev/null
+++ b/collects/icons/private/svg/misc/disk-diffuse.svg
@@ -0,0 +1,342 @@
+<?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:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="620"
+   height="620"
+   id="svg3993"
+   sodipodi:version="0.32"
+   inkscape:version="0.48.1 r9760"
+   sodipodi:docname="disk-diffuse.svg"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape"
+   version="1.0"
+   inkscape:export-filename="step-red-diffuse-24x24.png"
+   inkscape:export-xdpi="3.48"
+   inkscape:export-ydpi="3.48">
+  <defs
+     id="defs3995">
+    <linearGradient
+       id="linearGradient3837">
+      <stop
+         style="stop-color:#ffffff;stop-opacity:0;"
+         offset="0"
+         id="stop3839" />
+      <stop
+         id="stop3859"
+         offset="0.2703678"
+         style="stop-color:#ffffff;stop-opacity:1;" />
+      <stop
+         id="stop3855"
+         offset="0.49975938"
+         style="stop-color:#ffffff;stop-opacity:0;" />
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1;"
+         offset="0.67452139"
+         id="stop3857" />
+      <stop
+         id="stop3853"
+         offset="0.76147628"
+         style="stop-color:#ffffff;stop-opacity:0;" />
+      <stop
+         id="stop3851"
+         offset="0.8588925"
+         style="stop-color:#ffffff;stop-opacity:1;" />
+      <stop
+         style="stop-color:#ffffff;stop-opacity:0;"
+         offset="1"
+         id="stop3841" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3825">
+      <stop
+         id="stop3827"
+         offset="0"
+         style="stop-color:#bfbfbf;stop-opacity:0;" />
+      <stop
+         style="stop-color:#cbcbcb;stop-opacity:0.24705882;"
+         offset="0.0914095"
+         id="stop3849" />
+      <stop
+         style="stop-color:#d7d7d7;stop-opacity:0.49803922;"
+         offset="0.18281899"
+         id="stop3847" />
+      <stop
+         style="stop-color:#efefef;stop-opacity:1;"
+         offset="0.36563799"
+         id="stop3829" />
+      <stop
+         id="stop3845"
+         offset="0.48984748"
+         style="stop-color:#e1e1e1;stop-opacity:0.49803922;" />
+      <stop
+         style="stop-color:#d3d3d3;stop-opacity:0;"
+         offset="0.61405694"
+         id="stop3831" />
+      <stop
+         style="stop-color:#f3f3f3;stop-opacity:1;"
+         offset="0.82996744"
+         id="stop3833" />
+      <stop
+         id="stop3835"
+         offset="1"
+         style="stop-color:#afafaf;stop-opacity:0;" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3809">
+      <stop
+         style="stop-color:#fefbdc;stop-opacity:1;"
+         offset="0"
+         id="stop3811" />
+      <stop
+         style="stop-color:#fbf5bb;stop-opacity:1;"
+         offset="1"
+         id="stop3813" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3793">
+      <stop
+         style="stop-color:#bfbfbf;stop-opacity:1;"
+         offset="0"
+         id="stop3795" />
+      <stop
+         id="stop3805"
+         offset="0.41071466"
+         style="stop-color:#efefef;stop-opacity:1;" />
+      <stop
+         id="stop3803"
+         offset="0.61405694"
+         style="stop-color:#d3d3d3;stop-opacity:1;" />
+      <stop
+         id="stop3801"
+         offset="0.82996744"
+         style="stop-color:#f3f3f3;stop-opacity:1;" />
+      <stop
+         style="stop-color:#afafaf;stop-opacity:1;"
+         offset="1"
+         id="stop3797" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3200">
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1;"
+         offset="0"
+         id="stop3202" />
+      <stop
+         style="stop-color:#ffffff;stop-opacity:0;"
+         offset="1"
+         id="stop3204" />
+    </linearGradient>
+    <linearGradient
+       id="diffuseColorGradient">
+      <stop
+         id="stop3635"
+         offset="0"
+         style="stop-color:#00406b;stop-opacity:1;" />
+      <stop
+         id="stop3637"
+         offset="1"
+         style="stop-color:#0096ff;stop-opacity:1;" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#diffuseColorGradient"
+       id="linearGradient3774"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-5.665239,0,0,-1.036903,737.07139,588.523)"
+       x1="76.461472"
+       y1="53.08046"
+       x2="61.952564"
+       y2="553.60352" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#diffuseColorGradient"
+       id="linearGradient3776"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-5.665239,0,0,-1.036903,737.07139,588.523)"
+       x1="61.952564"
+       y1="553.60352"
+       x2="76.461472"
+       y2="53.08046" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3793"
+       id="linearGradient3799"
+       x1="241.84003"
+       y1="341.74835"
+       x2="435.5748"
+       y2="565.90118"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3809"
+       id="linearGradient3815"
+       x1="386.08783"
+       y1="25.700531"
+       x2="316.24945"
+       y2="331.70053"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.0108986,0,0,1,-5.6719464,0)" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3837"
+       id="linearGradient3843"
+       x1="30.09375"
+       y1="47.28125"
+       x2="497.84375"
+       y2="583.28125"
+       gradientUnits="userSpaceOnUse" />
+    <filter
+       inkscape:collect="always"
+       id="filter3794"
+       x="-0.11963994"
+       width="1.2392799"
+       y="-0.12036223"
+       height="1.2407245">
+      <feGaussianBlur
+         inkscape:collect="always"
+         stdDeviation="25.959375"
+         id="feGaussianBlur3796" />
+    </filter>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#diffuseColorGradient"
+       id="linearGradient3821"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-5.665239,0,0,-1.036903,737.07139,588.523)"
+       x1="76.461472"
+       y1="53.08046"
+       x2="61.952564"
+       y2="553.60352" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#diffuseColorGradient"
+       id="linearGradient3823"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-5.665239,0,0,-1.036903,737.07139,588.523)"
+       x1="61.952564"
+       y1="553.60352"
+       x2="76.461472"
+       y2="53.08046" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#diffuseColorGradient"
+       id="linearGradient3845"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-5.665239,0,0,-1.036903,737.07139,588.523)"
+       x1="76.461472"
+       y1="53.08046"
+       x2="61.952564"
+       y2="553.60352" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#diffuseColorGradient"
+       id="linearGradient3847"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-5.665239,0,0,-1.036903,737.07139,588.523)"
+       x1="61.952564"
+       y1="553.60352"
+       x2="76.461472"
+       y2="53.08046" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#diffuseColorGradient"
+       id="linearGradient3857"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-5.665239,0,0,-1.036903,737.07139,588.523)"
+       x1="76.461472"
+       y1="53.08046"
+       x2="61.952564"
+       y2="553.60352" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#diffuseColorGradient"
+       id="linearGradient3859"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-5.665239,0,0,-1.036903,737.07139,588.523)"
+       x1="61.952564"
+       y1="553.60352"
+       x2="76.461472"
+       y2="53.08046" />
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     gridtolerance="10000"
+     guidetolerance="10"
+     objecttolerance="10"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="0.70710678"
+     inkscape:cx="272.37912"
+     inkscape:cy="279.59917"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     inkscape:window-width="1024"
+     inkscape:window-height="719"
+     inkscape:window-x="439"
+     inkscape:window-y="242"
+     inkscape:window-maximized="0" />
+  <metadata
+     id="metadata3998">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1">
+    <path
+       inkscape:connector-curvature="0"
+       id="path3024"
+       d="m 570.84375,572.59375 0,-517.625 -520.75,0 0,457.21875 58.65625,60.40625 462.09375,0 z"
+       style="fill:#000000;fill-opacity:1;stroke:none;filter:url(#filter3794)" />
+    <path
+       style="fill:url(#linearGradient3857);fill-opacity:1;stroke:url(#linearGradient3859);stroke-width:12;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+       d="M 93.71875 18.96875 L 72.09375 40.375 L 72.09375 476.1875 L 130.75 536.59375 L 575.78125 536.59375 L 592.84375 519.6875 L 592.84375 38.25 L 573.375 18.96875 L 93.71875 18.96875 z "
+       id="rect3051" />
+    <path
+       inkscape:connector-curvature="0"
+       id="path3817"
+       d="m 586.84375,530.59375 1,-506.125 -509.75,-0.5 0.5,449.71875 55.15625,56.90625 z"
+       style="opacity:0.1841004;fill:url(#linearGradient3843);fill-opacity:1;stroke:none"
+       sodipodi:nodetypes="cccccc" />
+    <rect
+       style="fill:#000000;fill-opacity:0.23720931;stroke:none"
+       id="rect3778"
+       width="328.38086"
+       height="161.24117"
+       x="196.21387"
+       y="380.99789"
+       ry="0" />
+    <rect
+       style="fill:url(#linearGradient3815);fill-opacity:1;stroke:#269e24;stroke-width:11.70092106000000065;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+       id="rect3807"
+       width="374.56213"
+       height="297.94296"
+       x="145.86848"
+       y="30.729044"
+       ry="20.999998" />
+    <path
+       style="fill:url(#linearGradient3799);fill-opacity:1;stroke:none"
+       d="M 210.71875 388.78125 C 206.80137 388.78125 203.65625 391.92637 203.65625 395.84375 L 203.65625 537.96875 C 203.65625 541.88613 206.80137 545.03125 210.71875 545.03125 L 459.625 545.03125 C 463.54238 545.03125 466.6875 541.88613 466.6875 537.96875 L 466.6875 395.84375 C 466.6875 391.92637 463.54238 388.78125 459.625 388.78125 L 210.71875 388.78125 z M 228.28125 402.21875 L 267.40625 402.21875 C 271.25367 402.21875 274.34375 406.03813 274.34375 410.78125 L 274.34375 525.875 C 274.34375 530.61812 271.25367 534.4375 267.40625 534.4375 L 228.28125 534.4375 C 224.43383 534.4375 221.3125 530.61812 221.3125 525.875 L 221.3125 410.78125 C 221.3125 406.03813 224.43383 402.21875 228.28125 402.21875 z "
+       id="rect3780" />
+  </g>
+</svg>
diff --git a/collects/icons/private/svg/misc/disk-shiny.svg b/collects/icons/private/svg/misc/disk-shiny.svg
new file mode 100644
index 0000000000..ca07b4714a
--- /dev/null
+++ b/collects/icons/private/svg/misc/disk-shiny.svg
@@ -0,0 +1,400 @@
+<?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:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="620"
+   height="620"
+   id="svg3993"
+   sodipodi:version="0.32"
+   inkscape:version="0.48.1 r9760"
+   sodipodi:docname="disk-shiny.svg"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape"
+   version="1.0"
+   inkscape:export-filename="step-red-diffuse-24x24.png"
+   inkscape:export-xdpi="3.48"
+   inkscape:export-ydpi="3.48">
+  <defs
+     id="defs3995">
+    <linearGradient
+       id="linearGradient3837">
+      <stop
+         style="stop-color:#ffffff;stop-opacity:0;"
+         offset="0"
+         id="stop3839" />
+      <stop
+         id="stop3859"
+         offset="0.2703678"
+         style="stop-color:#ffffff;stop-opacity:1;" />
+      <stop
+         id="stop3855"
+         offset="0.49975938"
+         style="stop-color:#ffffff;stop-opacity:0;" />
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1;"
+         offset="0.67452139"
+         id="stop3857" />
+      <stop
+         id="stop3853"
+         offset="0.76147628"
+         style="stop-color:#ffffff;stop-opacity:0;" />
+      <stop
+         id="stop3851"
+         offset="0.8588925"
+         style="stop-color:#ffffff;stop-opacity:1;" />
+      <stop
+         style="stop-color:#ffffff;stop-opacity:0;"
+         offset="1"
+         id="stop3841" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3825">
+      <stop
+         id="stop3827"
+         offset="0"
+         style="stop-color:#bfbfbf;stop-opacity:0;" />
+      <stop
+         style="stop-color:#cbcbcb;stop-opacity:0.24705882;"
+         offset="0.0914095"
+         id="stop3849" />
+      <stop
+         style="stop-color:#d7d7d7;stop-opacity:0.49803922;"
+         offset="0.18281899"
+         id="stop3847" />
+      <stop
+         style="stop-color:#efefef;stop-opacity:1;"
+         offset="0.36563799"
+         id="stop3829" />
+      <stop
+         id="stop3845"
+         offset="0.48984748"
+         style="stop-color:#e1e1e1;stop-opacity:0.49803922;" />
+      <stop
+         style="stop-color:#d3d3d3;stop-opacity:0;"
+         offset="0.61405694"
+         id="stop3831" />
+      <stop
+         style="stop-color:#f3f3f3;stop-opacity:1;"
+         offset="0.82996744"
+         id="stop3833" />
+      <stop
+         id="stop3835"
+         offset="1"
+         style="stop-color:#afafaf;stop-opacity:0;" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3809">
+      <stop
+         style="stop-color:#fefbdc;stop-opacity:1;"
+         offset="0"
+         id="stop3811" />
+      <stop
+         style="stop-color:#fbf5bb;stop-opacity:1;"
+         offset="1"
+         id="stop3813" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3793">
+      <stop
+         style="stop-color:#bfbfbf;stop-opacity:1;"
+         offset="0"
+         id="stop3795" />
+      <stop
+         id="stop3805"
+         offset="0.41071466"
+         style="stop-color:#efefef;stop-opacity:1;" />
+      <stop
+         id="stop3803"
+         offset="0.61405694"
+         style="stop-color:#d3d3d3;stop-opacity:1;" />
+      <stop
+         id="stop3801"
+         offset="0.82996744"
+         style="stop-color:#f3f3f3;stop-opacity:1;" />
+      <stop
+         style="stop-color:#afafaf;stop-opacity:1;"
+         offset="1"
+         id="stop3797" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3200">
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1;"
+         offset="0"
+         id="stop3202" />
+      <stop
+         style="stop-color:#ffffff;stop-opacity:0;"
+         offset="1"
+         id="stop3204" />
+    </linearGradient>
+    <linearGradient
+       id="diffuseColorGradient">
+      <stop
+         id="stop3635"
+         offset="0"
+         style="stop-color:#00406b;stop-opacity:1;" />
+      <stop
+         id="stop3637"
+         offset="1"
+         style="stop-color:#0096ff;stop-opacity:1;" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3793"
+       id="linearGradient3799"
+       x1="241.84003"
+       y1="341.74835"
+       x2="435.5748"
+       y2="565.90118"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3809"
+       id="linearGradient3815"
+       x1="386.08783"
+       y1="25.700531"
+       x2="316.24945"
+       y2="331.70053"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.0108986,0,0,1,-5.6719464,0)" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3837"
+       id="linearGradient3843"
+       x1="30.09375"
+       y1="47.28125"
+       x2="497.84375"
+       y2="583.28125"
+       gradientUnits="userSpaceOnUse" />
+    <filter
+       inkscape:collect="always"
+       id="filter3794"
+       x="-0.11963994"
+       width="1.2392799"
+       y="-0.12036223"
+       height="1.2407245">
+      <feGaussianBlur
+         inkscape:collect="always"
+         stdDeviation="25.959375"
+         id="feGaussianBlur3796" />
+    </filter>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#diffuseColorGradient"
+       id="linearGradient3857"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-5.665239,0,0,-1.036903,737.07139,588.523)"
+       x1="76.461472"
+       y1="53.08046"
+       x2="61.952564"
+       y2="553.60352" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3200"
+       id="linearGradient3870"
+       x1="408"
+       y1="14.544876"
+       x2="388"
+       y2="186.54488"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3200-1"
+       id="linearGradient3777"
+       gradientUnits="userSpaceOnUse"
+       x1="445.52933"
+       y1="14.009476"
+       x2="372.28268"
+       y2="264.32529"
+       gradientTransform="translate(25.455844,-36.769553)" />
+    <linearGradient
+       id="linearGradient3200-1">
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1;"
+         offset="0"
+         id="stop3202-5" />
+      <stop
+         style="stop-color:#ffffff;stop-opacity:0;"
+         offset="1"
+         id="stop3204-0" />
+    </linearGradient>
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#undershineGradient"
+       id="radialGradient3965"
+       cx="252.63031"
+       cy="593.41302"
+       fx="252.63029"
+       fy="593.41302"
+       r="251.5229"
+       gradientTransform="matrix(1.4367184,0.12151411,-0.07407774,0.87585599,-45.19887,-54.651506)"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       id="undershineGradient">
+      <stop
+         style="stop-color:#5aecff;stop-opacity:1;"
+         offset="0"
+         id="stop3961" />
+      <stop
+         style="stop-color:#00cfee;stop-opacity:0;"
+         offset="1"
+         id="stop3963" />
+    </linearGradient>
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3951"
+       id="radialGradient3957"
+       cx="252.63277"
+       cy="593.40533"
+       fx="252.63277"
+       fy="593.40533"
+       r="251.0229"
+       gradientTransform="matrix(1.4395802,0.12175621,-0.07422531,0.87760064,-45.83838,-55.741493)"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       id="linearGradient3951">
+      <stop
+         style="stop-color:#ff0155;stop-opacity:0"
+         offset="0"
+         id="stop3953" />
+      <stop
+         style="stop-color:#ee004e;stop-opacity:0;"
+         offset="1"
+         id="stop3955" />
+    </linearGradient>
+    <linearGradient
+       y2="264.32529"
+       x2="372.28268"
+       y1="14.009476"
+       x1="445.52933"
+       gradientTransform="translate(24.986283,-35.820649)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3034"
+       xlink:href="#linearGradient3200-1"
+       inkscape:collect="always" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3200"
+       id="linearGradient3828"
+       x1="258.13742"
+       y1="570.4812"
+       x2="385.04425"
+       y2="-1.5188297"
+       gradientUnits="userSpaceOnUse" />
+    <filter
+       inkscape:collect="always"
+       id="filter3830">
+      <feGaussianBlur
+         inkscape:collect="always"
+         stdDeviation="5.2208356"
+         id="feGaussianBlur3832" />
+    </filter>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#diffuseColorGradient"
+       id="linearGradient3840"
+       x1="228.09375"
+       y1="633.78125"
+       x2="228.84375"
+       y2="691.78125"
+       gradientUnits="userSpaceOnUse" />
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     gridtolerance="10000"
+     guidetolerance="10"
+     objecttolerance="10"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="0.35355339"
+     inkscape:cx="-62.364133"
+     inkscape:cy="555.9806"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     inkscape:window-width="1338"
+     inkscape:window-height="799"
+     inkscape:window-x="254"
+     inkscape:window-y="172"
+     inkscape:window-maximized="0" />
+  <metadata
+     id="metadata3998">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1">
+    <path
+       inkscape:connector-curvature="0"
+       id="path3024"
+       d="m 570.84375,572.59375 0,-517.625 -520.75,0 0,457.21875 58.65625,60.40625 462.09375,0 z"
+       style="fill:#000000;fill-opacity:1;stroke:none;filter:url(#filter3794)" />
+    <path
+       style="fill:url(#linearGradient3857);fill-opacity:1;stroke:url(#linearGradient3840);stroke-width:12;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+       d="M 93.71875 18.96875 L 72.09375 40.375 L 72.09375 476.1875 L 130.75 536.59375 L 575.78125 536.59375 L 592.84375 519.6875 L 592.84375 38.25 L 573.375 18.96875 L 93.71875 18.96875 z "
+       id="rect3051" />
+    <path
+       inkscape:connector-curvature="0"
+       id="path3817"
+       d="m 586.84375,530.59375 1,-506.125 -509.75,-0.5 0.5,449.71875 55.15625,56.90625 z"
+       style="opacity:0.1841004;fill:url(#linearGradient3843);fill-opacity:1;stroke:none"
+       sodipodi:nodetypes="cccccc" />
+    <path
+       style="fill:url(#radialGradient3965);fill-opacity:1;stroke:url(#radialGradient3957)"
+       d="m 78.019295,103.16995 508.576135,-0.17677 0.17678,414.29956 -13.08148,13.2522 -440.40104,0.37297 -55.270395,-57.11829 z"
+       id="rect3949"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="ccccccc" />
+    <rect
+       style="fill:url(#linearGradient3815);fill-opacity:1;stroke:#269e24;stroke-width:11.70092106000000065;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+       id="rect3807"
+       width="374.56213"
+       height="297.94296"
+       x="145.86848"
+       y="30.729044"
+       ry="20.999998" />
+    <path
+       style="fill:url(#linearGradient3034);fill-opacity:1;stroke:none"
+       d="m 95.925767,25.192507 474.356033,-1.020864 16.54726,16.75399 0.0607,261.813797 C 438.7712,166.97493 626.71037,86.748621 78.369421,42.908009 z"
+       id="rect3051-8"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cccccc" />
+    <path
+       style="fill:none;stroke:url(#linearGradient3828);stroke-width:11.52587031999999923;stroke-miterlimit:4;stroke-opacity:1;filter:url(#filter3830)"
+       d="m 104.06133,27.949202 457.05901,0 c 11.16917,0 20.16096,8.991785 20.16096,20.160953 l 0,455.242025 c 0,11.16917 -8.99179,20.16096 -20.16096,20.16096 l -425.05901,1.5 -51.660955,-54.66096 -0.5,-422.242025 c -0.01323,-11.16916 8.991786,-20.160953 20.160955,-20.160953 z"
+       id="rect3043"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="sssssccss" />
+    <rect
+       style="fill:#000000;fill-opacity:0.33023257;stroke:none"
+       id="rect3778"
+       width="328.38086"
+       height="159.51324"
+       x="196.21387"
+       y="380.99789"
+       ry="0" />
+    <path
+       style="fill:url(#linearGradient3799);fill-opacity:1;stroke:none"
+       d="M 210.71875 388.78125 C 206.80137 388.78125 203.65625 391.92637 203.65625 395.84375 L 203.65625 537.96875 C 203.65625 541.88613 206.80137 545.03125 210.71875 545.03125 L 459.625 545.03125 C 463.54238 545.03125 466.6875 541.88613 466.6875 537.96875 L 466.6875 395.84375 C 466.6875 391.92637 463.54238 388.78125 459.625 388.78125 L 210.71875 388.78125 z M 228.28125 402.21875 L 267.40625 402.21875 C 271.25367 402.21875 274.34375 406.03813 274.34375 410.78125 L 274.34375 525.875 C 274.34375 530.61812 271.25367 534.4375 267.40625 534.4375 L 228.28125 534.4375 C 224.43383 534.4375 221.3125 530.61812 221.3125 525.875 L 221.3125 410.78125 C 221.3125 406.03813 224.43383 402.21875 228.28125 402.21875 z "
+       id="rect3780" />
+  </g>
+</svg>
diff --git a/collects/icons/scribblings/icons.scrbl b/collects/icons/scribblings/icons.scrbl
index 6f269e517c..13036228c3 100644
--- a/collects/icons/scribblings/icons.scrbl
+++ b/collects/icons/scribblings/icons.scrbl
@@ -129,11 +129,17 @@ The remaining icon @(bar-icon 'red 14 'diffuse), returned by @racket[bar-icon],
 }
 
 @doc-apply[stop-sign-icon]{
-@examples[#:eval icon-eval (map (λ (color) (stop-sign-icon color 23 'diffuse)) icon-colors)]
+@examples[#:eval icon-eval
+                 (for/list ([color  icon-colors]
+                            [style  (in-cycle icon-styles)])
+                   (stop-sign-icon color 24 style))]
 }
 
 @doc-apply[check-icon]{
-@examples[#:eval icon-eval (map (λ (color) (check-icon color 29 'shiny)) icon-colors)]
+@examples[#:eval icon-eval
+                 (for/list ([color  icon-colors]
+                            [style  (in-cycle icon-styles)])
+                   (check-icon color 29 style))]
 }
 
 @doc-apply[magnifying-glass-icon]{
@@ -149,6 +155,13 @@ Note that the uncolorized magnifying glass has a brown handle.
                       icon-colors)]
 }
 
+@doc-apply[disk-icon]{
+@examples[#:eval icon-eval
+                 (for/list ([color  icon-colors]
+                            [style  (in-cycle icon-styles)])
+                   (disk-icon color 33 style))]
+}
+
 @subsection{Tool Icons and Other Special Icons}
 
 @doc-apply[stop-signs-icon]{
@@ -166,13 +179,16 @@ Note that the uncolorized magnifying glass has a brown handle.
 }
 
 @doc-apply[plt-logo]{
-@examples[#:eval icon-eval (plt-logo 256 'shiny)]
+@examples[#:eval icon-eval
+                 (list (plt-logo 128 'diffuse) (plt-logo 128 'shiny))]
 }
 
 @doc-apply[planet-logo]{
 @examples[#:eval icon-eval
-                 (list (planet-logo #f 64)
-                       (planet-logo 'black 64 'shiny))]
+                 (for/list ([color  icon-colors])
+                     (planet-logo color 40 'diffuse))
+                 (for/list ([color  icon-colors])
+                     (planet-logo color 40 'shiny))]
 }
 
 
@@ -281,6 +297,7 @@ These return typical ``playback control'' icons, as @racket[pict]s.
 @doc-apply[check-icon-pict]{ Corresponds to @racket[check-icon]. }
 @doc-apply[magnifying-glass-icon-pict]{ Corresponds to @racket[magnifying-glass-icon]. }
 @doc-apply[magnifying-glass-left-icon-pict]{ Corresponds to @racket[magnifying-glass-left-icon]. }
+@doc-apply[disk-icon-pict]{ Corresponds to @racket[disk-icon]. }
 
 @doc-apply[stop-signs-icon-pict]{ Corresponds to @racket[stop-signs-icon]. }
 @doc-apply[macro-stepper-icon-pict]{ Corresponds to @racket[macro-stepper-icon]. }
diff --git a/collects/icons/tests/icon-tests.rkt b/collects/icons/tests/icon-tests.rkt
index fddf47a26e..f32f7c0ed7 100644
--- a/collects/icons/tests/icon-tests.rkt
+++ b/collects/icons/tests/icon-tests.rkt
@@ -35,6 +35,11 @@
               [style   icon-styles])
     (check-icon-pict color height style)))
 
+(for/list ([height  icon-heights])
+  (for*/list ([color   icon-colors]
+              [style   icon-styles])
+    (disk-icon-pict color height style)))
+
 (for/list ([height  icon-heights])
   (for*/list ([color   icon-colors]
               [style   icon-styles])
@@ -86,6 +91,7 @@
 (list not-blurry (pict-width not-blurry) (pict-height not-blurry))
 
 (plt-logo-pict 48 'shiny)
-(planet-logo-pict 'black 48 'shiny)
-(planet-logo-pict #f 24 'diffuse)
-(planet-logo-pict #f 16 'diffuse)
+
+(list (planet-logo-pict 'black 48 'shiny)
+      (planet-logo-pict #f 24 'diffuse)
+      (planet-logo-pict #f 16 'diffuse))