diff --git a/icons/coord_cartesian.png b/icons/coord_cartesian.png
index 0428e0970e..7fe1775019 100644
Binary files a/icons/coord_cartesian.png and b/icons/coord_cartesian.png differ
diff --git a/icons/coord_fixed.png b/icons/coord_fixed.png
index d8bf5e9670..a5e00ccfbc 100644
Binary files a/icons/coord_fixed.png and b/icons/coord_fixed.png differ
diff --git a/icons/coord_flip.png b/icons/coord_flip.png
index bbbf31bcfb..a466f7e368 100644
Binary files a/icons/coord_flip.png and b/icons/coord_flip.png differ
diff --git a/icons/coord_map.png b/icons/coord_map.png
index 01eb332f3d..48a78c2c2a 100644
Binary files a/icons/coord_map.png and b/icons/coord_map.png differ
diff --git a/icons/coord_polar.png b/icons/coord_polar.png
index e7c049e140..a27dd04144 100644
Binary files a/icons/coord_polar.png and b/icons/coord_polar.png differ
diff --git a/icons/coord_transform.png b/icons/coord_transform.png
index 230e576bf9..068e2cbf9d 100644
Binary files a/icons/coord_transform.png and b/icons/coord_transform.png differ
diff --git a/icons/facet_grid.png b/icons/facet_grid.png
index 576221f5ce..1fd8b22092 100644
Binary files a/icons/facet_grid.png and b/icons/facet_grid.png differ
diff --git a/icons/geom_hline.png b/icons/facet_wrap.png
similarity index 67%
rename from icons/geom_hline.png
rename to icons/facet_wrap.png
index 5f65941c1e..ed32684ba4 100644
Binary files a/icons/geom_hline.png and b/icons/facet_wrap.png differ
diff --git a/icons/geom_abline.png b/icons/geom_abline.png
index b1fca60d43..a45013e5d1 100644
Binary files a/icons/geom_abline.png and b/icons/geom_abline.png differ
diff --git a/icons/geom_area.png b/icons/geom_area.png
index c64dfa29a7..55209c49ea 100644
Binary files a/icons/geom_area.png and b/icons/geom_area.png differ
diff --git a/icons/geom_bar.png b/icons/geom_bar.png
index ba4bbebb33..511b21d283 100644
Binary files a/icons/geom_bar.png and b/icons/geom_bar.png differ
diff --git a/icons/geom_errorbar.png b/icons/geom_bin2d.png
similarity index 52%
rename from icons/geom_errorbar.png
rename to icons/geom_bin2d.png
index 5e166f2b35..141a3b7cfd 100644
Binary files a/icons/geom_errorbar.png and b/icons/geom_bin2d.png differ
diff --git a/icons/geom_vline.png b/icons/geom_blank.png
similarity index 67%
rename from icons/geom_vline.png
rename to icons/geom_blank.png
index cf4771d6a7..68ab2ac009 100644
Binary files a/icons/geom_vline.png and b/icons/geom_blank.png differ
diff --git a/icons/geom_boxplot.png b/icons/geom_boxplot.png
index 9359937a3e..dd95ee2da4 100644
Binary files a/icons/geom_boxplot.png and b/icons/geom_boxplot.png differ
diff --git a/icons/geom_contour.png b/icons/geom_contour.png
index 23446b0f75..9db6ebc114 100644
Binary files a/icons/geom_contour.png and b/icons/geom_contour.png differ
diff --git a/icons/geom_count.png b/icons/geom_count.png
new file mode 100644
index 0000000000..6fbadb45ca
Binary files /dev/null and b/icons/geom_count.png differ
diff --git a/icons/geom_crossbar.png b/icons/geom_crossbar.png
index d21a09977e..8ae64e995d 100644
Binary files a/icons/geom_crossbar.png and b/icons/geom_crossbar.png differ
diff --git a/icons/geom_density.png b/icons/geom_density.png
index 59bcdf3d6f..d8737c0682 100644
Binary files a/icons/geom_density.png and b/icons/geom_density.png differ
diff --git a/icons/geom_dotplot.png b/icons/geom_dotplot.png
index d903de2c60..666660c014 100644
Binary files a/icons/geom_dotplot.png and b/icons/geom_dotplot.png differ
diff --git a/icons/geom_freqpoly.png b/icons/geom_freqpoly.png
index d460945d89..cc3e9286da 100644
Binary files a/icons/geom_freqpoly.png and b/icons/geom_freqpoly.png differ
diff --git a/icons/geom_errorbarh.png b/icons/geom_hex.png
similarity index 50%
rename from icons/geom_errorbarh.png
rename to icons/geom_hex.png
index 4bed664032..5e80a080ec 100644
Binary files a/icons/geom_errorbarh.png and b/icons/geom_hex.png differ
diff --git a/icons/geom_histogram.png b/icons/geom_histogram.png
index 2ffda893ba..c764dbf06b 100644
Binary files a/icons/geom_histogram.png and b/icons/geom_histogram.png differ
diff --git a/icons/geom_jitter.png b/icons/geom_jitter.png
index 77cc2fe298..e5b93c3c47 100644
Binary files a/icons/geom_jitter.png and b/icons/geom_jitter.png differ
diff --git a/icons/geom_line.png b/icons/geom_line.png
index 42a22e0473..3cb07b407d 100644
Binary files a/icons/geom_line.png and b/icons/geom_line.png differ
diff --git a/icons/geom_linerange.png b/icons/geom_linerange.png
deleted file mode 100644
index 8e97d3d310..0000000000
Binary files a/icons/geom_linerange.png and /dev/null differ
diff --git a/icons/geom_map.png b/icons/geom_map.png
new file mode 100644
index 0000000000..48a78c2c2a
Binary files /dev/null and b/icons/geom_map.png differ
diff --git a/icons/geom_path.png b/icons/geom_path.png
index 7654632c55..ca6fe841d7 100644
Binary files a/icons/geom_path.png and b/icons/geom_path.png differ
diff --git a/icons/geom_point.png b/icons/geom_point.png
index 3309ec1fe7..f9c401a690 100644
Binary files a/icons/geom_point.png and b/icons/geom_point.png differ
diff --git a/icons/geom_pointrange.png b/icons/geom_pointrange.png
index a365f0165e..cfb0f961ba 100644
Binary files a/icons/geom_pointrange.png and b/icons/geom_pointrange.png differ
diff --git a/icons/geom_polygon.png b/icons/geom_polygon.png
index 564c7c727d..a62b0872f4 100644
Binary files a/icons/geom_polygon.png and b/icons/geom_polygon.png differ
diff --git a/icons/geom_quantile.png b/icons/geom_quantile.png
index f4104868d3..750143b69e 100644
Binary files a/icons/geom_quantile.png and b/icons/geom_quantile.png differ
diff --git a/icons/geom_raster.png b/icons/geom_raster.png
index 85b30a3ea3..b00e6fbb27 100644
Binary files a/icons/geom_raster.png and b/icons/geom_raster.png differ
diff --git a/icons/geom_rect.png b/icons/geom_rect.png
index ba4bbebb33..511b21d283 100644
Binary files a/icons/geom_rect.png and b/icons/geom_rect.png differ
diff --git a/icons/geom_ribbon.png b/icons/geom_ribbon.png
index fc78ba0ed3..0b41680d06 100644
Binary files a/icons/geom_ribbon.png and b/icons/geom_ribbon.png differ
diff --git a/icons/facet_null.png b/icons/geom_rug.png
similarity index 57%
rename from icons/facet_null.png
rename to icons/geom_rug.png
index 576221f5ce..7a1d354673 100644
Binary files a/icons/facet_null.png and b/icons/geom_rug.png differ
diff --git a/icons/geom_segment.png b/icons/geom_segment.png
index 6d91de689b..b9167dc9bd 100644
Binary files a/icons/geom_segment.png and b/icons/geom_segment.png differ
diff --git a/icons/geom_sf.png b/icons/geom_sf.png
new file mode 100644
index 0000000000..48a78c2c2a
Binary files /dev/null and b/icons/geom_sf.png differ
diff --git a/icons/geom_smooth.png b/icons/geom_smooth.png
index 7abf115e9f..9bf8cc900b 100644
Binary files a/icons/geom_smooth.png and b/icons/geom_smooth.png differ
diff --git a/icons/geom_spoke.png b/icons/geom_spoke.png
new file mode 100644
index 0000000000..7a624dd9b6
Binary files /dev/null and b/icons/geom_spoke.png differ
diff --git a/icons/geom_step.png b/icons/geom_step.png
index ed18980c72..8404508ffb 100644
Binary files a/icons/geom_step.png and b/icons/geom_step.png differ
diff --git a/icons/geom_text.png b/icons/geom_text.png
index 3390a32659..7614ffb036 100644
Binary files a/icons/geom_text.png and b/icons/geom_text.png differ
diff --git a/icons/geom_tile.png b/icons/geom_tile.png
index 85b30a3ea3..b00e6fbb27 100644
Binary files a/icons/geom_tile.png and b/icons/geom_tile.png differ
diff --git a/icons/geom_violin.png b/icons/geom_violin.png
index b187e77f44..637a504443 100644
Binary files a/icons/geom_violin.png and b/icons/geom_violin.png differ
diff --git a/icons/icons.R b/icons/icons.R
index b8c4f9522d..f207b01c60 100644
--- a/icons/icons.R
+++ b/icons/icons.R
@@ -8,7 +8,7 @@ set.seed(1014)
 
 write_icon <- function(name, code) {
   path <- paste0("icons/", name, ".png")
-  png(path, width = 80, height = 80, pointsize = 18)
+  png(path, width = 60, height = 60, pointsize = 18)
   on.exit(dev.off())
 
   grid.draw(code)
@@ -62,6 +62,9 @@ write_icon("coord_map", {
   linesGrob(nz$x, nz$y, default.units = "npc")
 })
 
+file.copy("icons/coord_map.png", "icons/geom_map.png")
+file.copy("icons/coord_map.png", "icons/geom_sf.png")
+
 write_icon("coord_polar", {
   circleGrob(r = c(0.1, 0.25, 0.45),  gp = gpar(fill = NA))
 })
@@ -100,27 +103,18 @@ write_icon("facet_grid", {
   ))
 })
 
-write_icon("facet_null", {
+write_icon("facet_wrap", {
   gTree(children = gList(
     rectGrob(
       0,
-      1,
-      width = 0.95,
+      c(0.49, 1),
+      width = 1,
       height = 0.05,
       hjust = 0,
       vjust = 1,
       gp = gpar(fill = "grey60", col = NA)
     ),
-    rectGrob(
-      0.95,
-      0.95,
-      width = 0.05,
-      height = 0.95,
-      hjust = 0,
-      vjust = 1,
-      gp = gpar(fill = "grey60", col = NA)
-    ),
-    segmentsGrob(c(0, 0.475), c(0.475, 0), c(1, 0.475), c(0.475, 1))
+    segmentsGrob(c(0, 0.5), c(0.5, 0), c(1, 0.5), c(0.5, 1))
   ))
 })
 
@@ -139,6 +133,34 @@ write_icon("geom_bar", {
   )
 })
 
+write_icon("geom_bin2d", {
+  n <- 5
+  x <- seq(0, 1, length = n + 1)[-(n + 1)]
+  out <- expand.grid(x = x, y = x)
+  fill <- sqrt((out$x - 0.5) ^ 2 + (out$y - 0.5) ^ 2)
+
+  pal <- scales::seq_gradient_pal("#56B1F7", "#132B43")
+  rectGrob(
+    out$x + 1/n/2,
+    out$y + 1/n/2,
+    width = 1/n,
+    height = 1/n,
+    gp = gpar(col = "grey20", fill = pal(scales::rescale(fill)))
+  )
+})
+
+write_icon("geom_blank", {
+  rectGrob(0.5, 0.5,
+    height = 1,
+    width = 1,
+    gp = gpar(fill = "white", col = "black", lwd = 3)
+  )
+})
+
+write_icon("geom_count", {
+  textGrob(expression(Sigma), gp = gpar(cex = 4))
+})
+
 write_icon("geom_histogram", {
   y <- c(0.2, 0.3, 0.5, 0.6, 0.2, 0.8, 0.5, 0.3)
   rectGrob(
@@ -167,14 +189,20 @@ write_icon("geom_boxplot", {
 
 write_icon("geom_crossbar", {
   gTree(children = gList(
+    # crossbar
     rectGrob(
-      c(0.3, 0.7),
-      c(0.6, 0.8),
+      0.3,
+      0.6,
       width = 0.3,
       height = c(0.4, 0.4),
       vjust = 1
     ),
-    segmentsGrob(c(0.15, 0.55), c(0.5, 0.6), c(0.45, 0.85), c(0.5, 0.6))
+    segmentsGrob(c(0.15), c(0.5), c(0.45), c(0.5)),
+
+    # error bar
+    segmentsGrob(0.70, 0.5, 0.70, 0.90),
+    segmentsGrob(0.55, 0.5, 0.85, 0.50),
+    segmentsGrob(0.55, 0.9, 0.85, 0.90)
   ))
 })
 
@@ -191,35 +219,11 @@ write_icon("geom_dotplot", {
   )
 })
 
-write_icon("geom_errorbar", {
-  gTree(children = gList(
-    segmentsGrob(c(0.3, 0.7), c(0.3, 0.5), c(0.3, 0.7), c(0.7, 0.9)),
-    segmentsGrob(c(0.15, 0.55), c(0.3, 0.5), c(0.45, 0.85), c(0.3, 0.5)),
-    segmentsGrob(c(0.15, 0.55), c(0.7, 0.9), c(0.45, 0.85), c(0.7, 0.9))
-  ))
-})
-
-write_icon("geom_errorbarh", {
-  gTree(children = gList(
-    segmentsGrob(c(0.5, 0.3), c(0.70, 0.30), c(0.9, 0.7), c(0.70, 0.30)),
-    segmentsGrob(c(0.5, 0.3), c(0.55, 0.15), c(0.5, 0.3), c(0.85, 0.45)),
-    segmentsGrob(c(0.9, 0.7), c(0.55, 0.15), c(0.9, 0.7), c(0.85, 0.45))
-  ))
-})
-
 write_icon("geom_freqpoly", {
   y <- c(0.2, 0.3, 0.5, 0.6, 0.2, 0.8, 0.5, 0.3)
   linesGrob(seq(0.1, 0.9, by = 0.1), y, gp = gpar(col = "grey20"))
 })
 
-write_icon("geom_hline", {
-  linesGrob(c(0, 1), c(0.5, 0.5))
-})
-
-write_icon("geom_linerange", {
-  segmentsGrob(c(0.3, 0.7), c(0.1, 0.2), c(0.3, 0.7), c(0.7, 0.95))
-})
-
 write_icon("geom_path", {
   linesGrob(c(0.2, 0.4, 0.8, 0.6, 0.5), c(0.2, 0.7, 0.4, 0.1, 0.5))
 })
@@ -234,16 +238,25 @@ write_icon("geom_contour", {
     )))
 })
 
+write_icon("geom_hex", {
+  theta <- seq(0, 2 * pi, length = 7)[-1]
+  polygonGrob(
+    0.5 + 0.4 * sin(theta),
+    0.5 + 0.4 * cos(theta),
+    gp = gpar(fill = "grey50", col = NA)
+  )
+})
+
 write_icon("geom_line", {
   pos <- seq(0, 1, length.out = 5)
-  linesGrob(pos, c(0.2, 0.7, 0.4, 0.8, 0.3))
+  linesGrob(pos, c(0.2, 0.7, 0.4, 0.8, 0.3), gp = gpar(lwd = 3))
 })
 
 write_icon("geom_step", {
-  n <- 15
-  xs <- rep(0:n, each = 2)[-2 * (n + 1)] / 15
-  ys <- c(0, rep(1:n, each = 2)) / 15
-  linesGrob(xs, ys, gp = gpar(col = "grey20"))
+  n <- 10
+  xs <- rep(0:n, each = 2)[-2 * (n + 1)] / n
+  ys <- c(0, rep(1:n, each = 2)) / n
+  linesGrob(xs, ys, gp = gpar(col = "grey20", lwd = 3))
 })
 
 write_icon("geom_point", {
@@ -258,10 +271,9 @@ write_icon("geom_point", {
 })
 
 write_icon("geom_jitter", {
-  pos <- seq(0.1, 0.9, length.out = 6)
   pointsGrob(
-    x = pos,
-    y = jitter(pos, 3),
+    x = c(0.25, 0.22, 0.34, 0.70, 0.77, 0.80),
+    y = c(0.15, 0.24, 0.28, 0.65, 0.90, 0.75),
     pch = 19,
     gp = gpar(col = "black", cex = 0.5),
     default.units = "npc"
@@ -330,6 +342,17 @@ write_icon("geom_ribbon", {
   )
 })
 
+write_icon("geom_spoke", {
+  theta <- seq(0, 2 * pi, length = 10)[-1]
+  r <- seq(0.1, 0.45, length = length(theta))
+  segmentsGrob(
+    0.5, 0.5,
+    0.5 + sin(theta) * r,
+    0.5 + cos(theta) * r,
+    gp = gpar(col = "grey20")
+  )
+})
+
 write_icon("geom_area", {
   polygonGrob(c(0, 0, 0.3, 0.5, 0.8, 1, 1),
     c(0, 1, 0.5, 0.6, 0.3, 0.8, 0),
@@ -342,6 +365,15 @@ write_icon("geom_density", {
   linesGrob(x, 0.05 + y / max(y) * 0.9, default.units = "npc")
 })
 
+
+write_icon("geom_rug", {
+  x <- seq(0.15, 0.95, length = 8)
+  gList(
+    segmentsGrob(x, 0, x, 0 + 0.1, gp = gpar(lwd = 2)),
+    segmentsGrob(0, x, 0 + 0.1, x, gp = gpar(lwd = 2))
+  )
+})
+
 write_icon("geom_segment", {
   segmentsGrob(c(0.1, 0.3, 0.5, 0.7),
     c(0.3, 0.5, 0.1, 0.9),
@@ -391,10 +423,6 @@ write_icon("geom_violin", {
   ))
 })
 
-write_icon("geom_vline", {
-  linesGrob(c(0.5, 0.5), c(0, 1))
-})
-
 # Position adjustments --------------------------------------------------------
 
 write_icon("position_dodge", {
@@ -451,7 +479,8 @@ write_icon("position_stack", {
 write_icon("scale_alpha", {
   x <- c(0.1, 0.3, 0.5, 0.7, 0.9)
   rectGrob(x,
-    width = 0.25,
+    width = 0.3,
+    height = x,
     gp = gpar(fill = scales::alpha("black", x), col = NA))
 })
 
@@ -463,9 +492,24 @@ write_icon("scale_colour_brewer", {
   )
 })
 
-write_icon("scale_colour_gradient", {
-  g <- scale_fill_gradient()
-  g$train(1:5)
+write_icon("scale_colour_continuous", {
+  g1 <- scale_fill_gradient()
+  g1$train(1:5)
+
+  g2 <- scale_fill_viridis_c()
+  g2$train(1:5)
+
+  x <- c(0.1, 0.3, 0.5, 0.7, 0.9)
+  rectGrob(
+    c(x, x),
+    rep(c(0.25, 0.75), each = 5),
+    width = 0.21,
+    height = 0.5,
+    gp = gpar(fill = c(g1$map(1:5), g2$map(5:1)), col = NA)
+  )
+})
+
+write_icon("scale_colour_viridis_d", {
   rectGrob(
     c(0.1, 0.3, 0.5, 0.7, 0.9),
     width = 0.21,
@@ -473,18 +517,18 @@ write_icon("scale_colour_gradient", {
   )
 })
 
-write_icon("scale_colour_gradient2", {
-  g <- scale_fill_gradient2()
-  g$train(1:5 - 3)
+write_icon("scale_colour_gradient", {
+  g <- scale_fill_gradient()
+  g$train(1:5)
   rectGrob(
     c(0.1, 0.3, 0.5, 0.7, 0.9),
     width = 0.21,
-    gp = gpar(fill = g$map(1:5 - 3), col = NA)
+    gp = gpar(fill = g$map(1:5), col = NA)
   )
 })
 
-write_icon("scale_colour_gradientn", {
-  g <- scale_fill_gradientn(colours = rainbow(7))
+write_icon("scale_colour_viridis", {
+  g <- scale_fill_viridis_c()
   g$train(1:5)
   rectGrob(
     c(0.1, 0.3, 0.5, 0.7, 0.9),
@@ -493,10 +537,11 @@ write_icon("scale_colour_gradientn", {
   )
 })
 
+
 write_icon("scale_colour_grey", {
   rectGrob(c(0.1, 0.3, 0.5, 0.7, 0.9),
     width = 0.21,
-    gp = gpar(fill = gray(seq(0, 1, length.out = 5)), col = NA))
+    gp = gpar(fill = gray(seq(0, 0.9, length.out = 5)), col = NA))
 })
 
 write_icon("scale_colour_hue", {
@@ -507,15 +552,11 @@ write_icon("scale_colour_hue", {
     ), col = NA))
 })
 
-write_icon("scale_colour_identity", {
-  textGrob("f(x) = x", gp = gpar(cex = 1.2))
-})
-
 write_icon("scale_linetype", {
   gTree(children = gList(
-    segmentsGrob(0, 0.25, 1, 0.25, gp = gpar(lty = 1)),
-    segmentsGrob(0, 0.50, 1, 0.50, gp = gpar(lty = 2)),
-    segmentsGrob(0, 0.75, 1, 0.75, gp = gpar(lty = 3))
+    segmentsGrob(0, 0.25, 1, 0.25, gp = gpar(lty = 1, lwd = 3)),
+    segmentsGrob(0, 0.50, 1, 0.50, gp = gpar(lty = 2, lwd = 3)),
+    segmentsGrob(0, 0.75, 1, 0.75, gp = gpar(lty = 3, lwd = 3))
   ))
 })
 
@@ -524,12 +565,13 @@ write_icon("scale_colour_manual", {
 })
 
 write_icon("scale_shape", {
+  gp <- gpar(lwd = 3)
   gTree(children = gList(
-    circleGrob(0.7, 0.7, r = 0.1),
-    segmentsGrob(0.2, 0.3, 0.4, 0.3),
-    segmentsGrob(0.3, 0.2, 0.3, 0.4),
-    polygonGrob(c(0.2, 0.2, 0.4, 0.4), c(0.8, 0.6, 0.6, 0.8)),
-    polygonGrob(c(0.6, 0.7, 0.8), c(0.2, 0.4, 0.2))
+    circleGrob(0.7, 0.7, r = 0.1, gp = gp),
+    segmentsGrob(0.2, 0.3, 0.4, 0.3, gp = gp),
+    segmentsGrob(0.3, 0.2, 0.3, 0.4, gp = gp),
+    polygonGrob(c(0.2, 0.2, 0.4, 0.4), c(0.8, 0.6, 0.6, 0.8), gp = gp),
+    polygonGrob(c(0.6, 0.7, 0.8), c(0.2, 0.4, 0.2), gp = gp)
   ))
 })
 
@@ -542,15 +584,5 @@ write_icon("scale_size", {
 })
 
 write_icon("scale_x_date", {
-  textGrob("14/10/1979", gp = gpar(cex = 1))
-})
-
-# Statistics -------------------------------------------------------------------
-
-write_icon("stat_identity", {
-  textGrob('f(x) = x', gp = gpar(cex = 1.2))
-})
-
-write_icon("stat_sum", {
-  textGrob(expression(Sigma), gp = gpar(cex = 4))
+  textGrob("14/10/1979", gp = gpar(cex = 0.9), rot = 45)
 })
diff --git a/icons/position_dodge.png b/icons/position_dodge.png
index beaa767eca..4096291d39 100644
Binary files a/icons/position_dodge.png and b/icons/position_dodge.png differ
diff --git a/icons/position_fill.png b/icons/position_fill.png
index f6b3fdbd1b..44d76d3d11 100644
Binary files a/icons/position_fill.png and b/icons/position_fill.png differ
diff --git a/icons/position_identity.png b/icons/position_identity.png
index e794dbd4e0..3f400edb6a 100644
Binary files a/icons/position_identity.png and b/icons/position_identity.png differ
diff --git a/icons/position_jitter.png b/icons/position_jitter.png
index a52fc66644..e5b93c3c47 100644
Binary files a/icons/position_jitter.png and b/icons/position_jitter.png differ
diff --git a/icons/position_stack.png b/icons/position_stack.png
index 6edbd224c6..be4b270b57 100644
Binary files a/icons/position_stack.png and b/icons/position_stack.png differ
diff --git a/icons/scale_alpha.png b/icons/scale_alpha.png
index 0bac133fb0..82f0ac579d 100644
Binary files a/icons/scale_alpha.png and b/icons/scale_alpha.png differ
diff --git a/icons/scale_colour_brewer.png b/icons/scale_colour_brewer.png
index 8677fbd4ff..1449536be5 100644
Binary files a/icons/scale_colour_brewer.png and b/icons/scale_colour_brewer.png differ
diff --git a/icons/scale_colour_gradientn.png b/icons/scale_colour_continuous.png
similarity index 67%
rename from icons/scale_colour_gradientn.png
rename to icons/scale_colour_continuous.png
index 65e9f29e75..9e26b25650 100644
Binary files a/icons/scale_colour_gradientn.png and b/icons/scale_colour_continuous.png differ
diff --git a/icons/scale_colour_gradient.png b/icons/scale_colour_gradient.png
index 35706feec4..62e3615c2e 100644
Binary files a/icons/scale_colour_gradient.png and b/icons/scale_colour_gradient.png differ
diff --git a/icons/scale_colour_grey.png b/icons/scale_colour_grey.png
index 165b37c662..e4050737d6 100644
Binary files a/icons/scale_colour_grey.png and b/icons/scale_colour_grey.png differ
diff --git a/icons/scale_colour_hue.png b/icons/scale_colour_hue.png
index f7738e5c22..95f6903f5c 100644
Binary files a/icons/scale_colour_hue.png and b/icons/scale_colour_hue.png differ
diff --git a/icons/scale_colour_identity.png b/icons/scale_colour_identity.png
deleted file mode 100644
index a579fb0857..0000000000
Binary files a/icons/scale_colour_identity.png and /dev/null differ
diff --git a/icons/scale_colour_manual.png b/icons/scale_colour_manual.png
index 9e5a2ed18b..e58878e567 100644
Binary files a/icons/scale_colour_manual.png and b/icons/scale_colour_manual.png differ
diff --git a/icons/scale_colour_gradient2.png b/icons/scale_colour_viridis.png
similarity index 66%
rename from icons/scale_colour_gradient2.png
rename to icons/scale_colour_viridis.png
index c0e9faf1c1..e474e680cf 100644
Binary files a/icons/scale_colour_gradient2.png and b/icons/scale_colour_viridis.png differ
diff --git a/icons/scale_colour_viridis_d.png b/icons/scale_colour_viridis_d.png
new file mode 100644
index 0000000000..e474e680cf
Binary files /dev/null and b/icons/scale_colour_viridis_d.png differ
diff --git a/icons/scale_identity.png b/icons/scale_identity.png
deleted file mode 100644
index a579fb0857..0000000000
Binary files a/icons/scale_identity.png and /dev/null differ
diff --git a/icons/scale_linetype.png b/icons/scale_linetype.png
index e6be5cca76..a86c399e3e 100644
Binary files a/icons/scale_linetype.png and b/icons/scale_linetype.png differ
diff --git a/icons/scale_manual.png b/icons/scale_manual.png
deleted file mode 100644
index 9e5a2ed18b..0000000000
Binary files a/icons/scale_manual.png and /dev/null differ
diff --git a/icons/scale_shape.png b/icons/scale_shape.png
index 6d55b9b82e..68f13017db 100644
Binary files a/icons/scale_shape.png and b/icons/scale_shape.png differ
diff --git a/icons/scale_size.png b/icons/scale_size.png
index a31e3655c3..d0a7b01caa 100644
Binary files a/icons/scale_size.png and b/icons/scale_size.png differ
diff --git a/icons/scale_x_date.png b/icons/scale_x_date.png
index d4b8e9f297..8ff15b5ae5 100644
Binary files a/icons/scale_x_date.png and b/icons/scale_x_date.png differ
diff --git a/icons/scale_x_datetime.png b/icons/scale_x_datetime.png
deleted file mode 100644
index 4118c74dd0..0000000000
Binary files a/icons/scale_x_datetime.png and /dev/null differ
diff --git a/icons/stat_identity.png b/icons/stat_identity.png
deleted file mode 100644
index a579fb0857..0000000000
Binary files a/icons/stat_identity.png and /dev/null differ
diff --git a/icons/stat_sum.png b/icons/stat_sum.png
deleted file mode 100644
index 98abb24fdb..0000000000
Binary files a/icons/stat_sum.png and /dev/null differ