implement the missing icon-sets

Artwork by Astron

Change-Id: I35261a233bee7ccb0181238e87d83e9c503b188e

59 files changed, 279 insertions, 73 deletions

diff --git a/icon-themes/galaxy/sc/res/cancel.png b/icon-themes/galaxy/sc/res/cancel.png
deleted file mode 100644
index ae3f7a60c9d0..000000000000
--- a/icon-themes/galaxy/sc/res/cancel.png
+++ /dev/null
diff --git a/icon-themes/galaxy/sc/res/exclamation_mark.png b/icon-themes/galaxy/sc/res/exclamation_mark.png
deleted file mode 100644
index 1c0ba39b2cca..000000000000
--- a/icon-themes/galaxy/sc/res/exclamation_mark.png
+++ /dev/null
diff --git a/icon-themes/galaxy/sc/res/icon-set-bars-empty.png b/icon-themes/galaxy/sc/res/icon-set-bars-empty.png
new file mode 100644
index 000000000000..7d322854752e
--- /dev/null
+++ b/icon-themes/galaxy/sc/res/icon-set-bars-empty.png
diff --git a/icon-themes/galaxy/sc/res/icon-set-bars-full.png b/icon-themes/galaxy/sc/res/icon-set-bars-full.png
new file mode 100644
index 000000000000..afd16cd76584
--- /dev/null
+++ b/icon-themes/galaxy/sc/res/icon-set-bars-full.png
diff --git a/icon-themes/galaxy/sc/res/icon-set-bars-half.png b/icon-themes/galaxy/sc/res/icon-set-bars-half.png
new file mode 100644
index 000000000000..94f5018e09d3
--- /dev/null
+++ b/icon-themes/galaxy/sc/res/icon-set-bars-half.png
diff --git a/icon-themes/galaxy/sc/res/icon-set-bars-one-quarter.png b/icon-themes/galaxy/sc/res/icon-set-bars-one-quarter.png
new file mode 100644
index 000000000000..1ea109beeec3
--- /dev/null
+++ b/icon-themes/galaxy/sc/res/icon-set-bars-one-quarter.png
diff --git a/icon-themes/galaxy/sc/res/icon-set-bars-three-quarters.png b/icon-themes/galaxy/sc/res/icon-set-bars-three-quarters.png
new file mode 100644
index 000000000000..cbac2d000443
--- /dev/null
+++ b/icon-themes/galaxy/sc/res/icon-set-bars-three-quarters.png
diff --git a/icon-themes/galaxy/sc/res/icon-set-circles1-gray.png b/icon-themes/galaxy/sc/res/icon-set-circles1-gray.png
new file mode 100644
index 000000000000..7b624dfedac8
--- /dev/null
+++ b/icon-themes/galaxy/sc/res/icon-set-circles1-gray.png
diff --git a/icon-themes/galaxy/sc/res/green_circle.png b/icon-themes/galaxy/sc/res/icon-set-circles1-green.png
index 82f9b226a776..82f9b226a776 100644
--- a/icon-themes/galaxy/sc/res/green_circle.png
+++ b/icon-themes/galaxy/sc/res/icon-set-circles1-green.png
diff --git a/icon-themes/galaxy/sc/res/red_circle.png b/icon-themes/galaxy/sc/res/icon-set-circles1-red.png
index 8da3f79a8920..8da3f79a8920 100644
--- a/icon-themes/galaxy/sc/res/red_circle.png
+++ b/icon-themes/galaxy/sc/res/icon-set-circles1-red.png
diff --git a/icon-themes/galaxy/sc/res/yellow_circle.png b/icon-themes/galaxy/sc/res/icon-set-circles1-yellow.png
index d39cc6643ed6..d39cc6643ed6 100644
--- a/icon-themes/galaxy/sc/res/yellow_circle.png
+++ b/icon-themes/galaxy/sc/res/icon-set-circles1-yellow.png
diff --git a/icon-themes/galaxy/sc/res/icon-set-circles2-dark-gray.png b/icon-themes/galaxy/sc/res/icon-set-circles2-dark-gray.png
new file mode 100644
index 000000000000..453def9441ce
--- /dev/null
+++ b/icon-themes/galaxy/sc/res/icon-set-circles2-dark-gray.png
diff --git a/icon-themes/galaxy/sc/res/icon-set-circles2-dark-red.png b/icon-themes/galaxy/sc/res/icon-set-circles2-dark-red.png
new file mode 100644
index 000000000000..484bcb014e6a
--- /dev/null
+++ b/icon-themes/galaxy/sc/res/icon-set-circles2-dark-red.png
diff --git a/icon-themes/galaxy/sc/res/icon-set-circles2-light-gray.png b/icon-themes/galaxy/sc/res/icon-set-circles2-light-gray.png
new file mode 100644
index 000000000000..e627b1ba49f2
--- /dev/null
+++ b/icon-themes/galaxy/sc/res/icon-set-circles2-light-gray.png
diff --git a/icon-themes/galaxy/sc/res/icon-set-circles2-light-red.png b/icon-themes/galaxy/sc/res/icon-set-circles2-light-red.png
new file mode 100644
index 000000000000..936e46fefbb8
--- /dev/null
+++ b/icon-themes/galaxy/sc/res/icon-set-circles2-light-red.png
diff --git a/icon-themes/galaxy/sc/res/red_arrow_down.png b/icon-themes/galaxy/sc/res/icon-set-colorarrows-down.png
index 7989707af07c..7989707af07c 100644
--- a/icon-themes/galaxy/sc/res/red_arrow_down.png
+++ b/icon-themes/galaxy/sc/res/icon-set-colorarrows-down.png
diff --git a/icon-themes/galaxy/sc/res/yellow_arrow_right.png b/icon-themes/galaxy/sc/res/icon-set-colorarrows-same.png
index f38d0d9d524a..f38d0d9d524a 100644
--- a/icon-themes/galaxy/sc/res/yellow_arrow_right.png
+++ b/icon-themes/galaxy/sc/res/icon-set-colorarrows-same.png
diff --git a/icon-themes/galaxy/sc/res/yellow_arrow_down_right.png b/icon-themes/galaxy/sc/res/icon-set-colorarrows-slightly-down.png
index 29355872462e..29355872462e 100644
--- a/icon-themes/galaxy/sc/res/yellow_arrow_down_right.png
+++ b/icon-themes/galaxy/sc/res/icon-set-colorarrows-slightly-down.png
diff --git a/icon-themes/galaxy/sc/res/yellow_arrow_up_right.png b/icon-themes/galaxy/sc/res/icon-set-colorarrows-slightly-up.png
index ea78f27a974d..ea78f27a974d 100644
--- a/icon-themes/galaxy/sc/res/yellow_arrow_up_right.png
+++ b/icon-themes/galaxy/sc/res/icon-set-colorarrows-slightly-up.png
diff --git a/icon-themes/galaxy/sc/res/green_arrow_up.png b/icon-themes/galaxy/sc/res/icon-set-colorarrows-up.png
index c407a3c2a779..c407a3c2a779 100644
--- a/icon-themes/galaxy/sc/res/green_arrow_up.png
+++ b/icon-themes/galaxy/sc/res/icon-set-colorarrows-up.png
diff --git a/icon-themes/galaxy/sc/res/icon-set-flags-green.png b/icon-themes/galaxy/sc/res/icon-set-flags-green.png
new file mode 100644
index 000000000000..b3ce53bec27b
--- /dev/null
+++ b/icon-themes/galaxy/sc/res/icon-set-flags-green.png
diff --git a/icon-themes/galaxy/sc/res/icon-set-flags-red.png b/icon-themes/galaxy/sc/res/icon-set-flags-red.png
new file mode 100644
index 000000000000..7f161389c93a
--- /dev/null
+++ b/icon-themes/galaxy/sc/res/icon-set-flags-red.png
diff --git a/icon-themes/galaxy/sc/res/icon-set-flags-yellow.png b/icon-themes/galaxy/sc/res/icon-set-flags-yellow.png
new file mode 100644
index 000000000000..7c980edd7560
--- /dev/null
+++ b/icon-themes/galaxy/sc/res/icon-set-flags-yellow.png
diff --git a/icon-themes/galaxy/sc/res/icon-set-grayarrows-down.png b/icon-themes/galaxy/sc/res/icon-set-grayarrows-down.png
new file mode 100644
index 000000000000..c27aefa7c9fd
--- /dev/null
+++ b/icon-themes/galaxy/sc/res/icon-set-grayarrows-down.png
diff --git a/icon-themes/galaxy/sc/res/icon-set-grayarrows-same.png b/icon-themes/galaxy/sc/res/icon-set-grayarrows-same.png
new file mode 100644
index 000000000000..6defc10f6654
--- /dev/null
+++ b/icon-themes/galaxy/sc/res/icon-set-grayarrows-same.png
diff --git a/icon-themes/galaxy/sc/res/icon-set-grayarrows-slightly-down.png b/icon-themes/galaxy/sc/res/icon-set-grayarrows-slightly-down.png
new file mode 100644
index 000000000000..1f05a1d91b87
--- /dev/null
+++ b/icon-themes/galaxy/sc/res/icon-set-grayarrows-slightly-down.png
diff --git a/icon-themes/galaxy/sc/res/icon-set-grayarrows-slightly-up.png b/icon-themes/galaxy/sc/res/icon-set-grayarrows-slightly-up.png
new file mode 100644
index 000000000000..b954d0ad73b5
--- /dev/null
+++ b/icon-themes/galaxy/sc/res/icon-set-grayarrows-slightly-up.png
diff --git a/icon-themes/galaxy/sc/res/icon-set-grayarrows-up.png b/icon-themes/galaxy/sc/res/icon-set-grayarrows-up.png
new file mode 100644
index 000000000000..3abc7c196d58
--- /dev/null
+++ b/icon-themes/galaxy/sc/res/icon-set-grayarrows-up.png
diff --git a/icon-themes/galaxy/sc/res/black_circle_empty.png b/icon-themes/galaxy/sc/res/icon-set-pies-empty.png
index 0b037e84ab28..0b037e84ab28 100644
--- a/icon-themes/galaxy/sc/res/black_circle_empty.png
+++ b/icon-themes/galaxy/sc/res/icon-set-pies-empty.png
diff --git a/icon-themes/galaxy/sc/res/black_circle_full.png b/icon-themes/galaxy/sc/res/icon-set-pies-full.png
index 8bfc1fea55a3..8bfc1fea55a3 100644
--- a/icon-themes/galaxy/sc/res/black_circle_full.png
+++ b/icon-themes/galaxy/sc/res/icon-set-pies-full.png
diff --git a/icon-themes/galaxy/sc/res/black_circle_half.png b/icon-themes/galaxy/sc/res/icon-set-pies-half.png
index 1b1328cbd189..1b1328cbd189 100644
--- a/icon-themes/galaxy/sc/res/black_circle_half.png
+++ b/icon-themes/galaxy/sc/res/icon-set-pies-half.png
diff --git a/icon-themes/galaxy/sc/res/black_circle_1_4th.png b/icon-themes/galaxy/sc/res/icon-set-pies-one-quarter.png
index f5390af43f71..f5390af43f71 100644
--- a/icon-themes/galaxy/sc/res/black_circle_1_4th.png
+++ b/icon-themes/galaxy/sc/res/icon-set-pies-one-quarter.png
diff --git a/icon-themes/galaxy/sc/res/black_circle_3_4th.png b/icon-themes/galaxy/sc/res/icon-set-pies-three-quarters.png
index 7fb720290c88..7fb720290c88 100644
--- a/icon-themes/galaxy/sc/res/black_circle_3_4th.png
+++ b/icon-themes/galaxy/sc/res/icon-set-pies-three-quarters.png
diff --git a/icon-themes/galaxy/sc/res/icon-set-shapes-circle.png b/icon-themes/galaxy/sc/res/icon-set-shapes-circle.png
new file mode 100644
index 000000000000..9bf4c538c812
--- /dev/null
+++ b/icon-themes/galaxy/sc/res/icon-set-shapes-circle.png
diff --git a/icon-themes/galaxy/sc/res/icon-set-shapes-diamond.png b/icon-themes/galaxy/sc/res/icon-set-shapes-diamond.png
new file mode 100644
index 000000000000..0545ccc44911
--- /dev/null
+++ b/icon-themes/galaxy/sc/res/icon-set-shapes-diamond.png
diff --git a/icon-themes/galaxy/sc/res/icon-set-shapes-triangle.png b/icon-themes/galaxy/sc/res/icon-set-shapes-triangle.png
new file mode 100644
index 000000000000..761be2c22aef
--- /dev/null
+++ b/icon-themes/galaxy/sc/res/icon-set-shapes-triangle.png
diff --git a/icon-themes/galaxy/sc/res/icon-set-squares-empty.png b/icon-themes/galaxy/sc/res/icon-set-squares-empty.png
new file mode 100644
index 000000000000..8d3ce848c55a
--- /dev/null
+++ b/icon-themes/galaxy/sc/res/icon-set-squares-empty.png
diff --git a/icon-themes/galaxy/sc/res/icon-set-squares-full.png b/icon-themes/galaxy/sc/res/icon-set-squares-full.png
new file mode 100644
index 000000000000..d05c79fb5f57
--- /dev/null
+++ b/icon-themes/galaxy/sc/res/icon-set-squares-full.png
diff --git a/icon-themes/galaxy/sc/res/icon-set-squares-half.png b/icon-themes/galaxy/sc/res/icon-set-squares-half.png
new file mode 100644
index 000000000000..a865124c2554
--- /dev/null
+++ b/icon-themes/galaxy/sc/res/icon-set-squares-half.png
diff --git a/icon-themes/galaxy/sc/res/icon-set-squares-one-quarter.png b/icon-themes/galaxy/sc/res/icon-set-squares-one-quarter.png
new file mode 100644
index 000000000000..aec93347989d
--- /dev/null
+++ b/icon-themes/galaxy/sc/res/icon-set-squares-one-quarter.png
diff --git a/icon-themes/galaxy/sc/res/icon-set-squares-three-quarters.png b/icon-themes/galaxy/sc/res/icon-set-squares-three-quarters.png
new file mode 100644
index 000000000000..358b1d2f91c7
--- /dev/null
+++ b/icon-themes/galaxy/sc/res/icon-set-squares-three-quarters.png
diff --git a/icon-themes/galaxy/sc/res/icon-set-stars-empty.png b/icon-themes/galaxy/sc/res/icon-set-stars-empty.png
new file mode 100644
index 000000000000..6107e73a0ac3
--- /dev/null
+++ b/icon-themes/galaxy/sc/res/icon-set-stars-empty.png
diff --git a/icon-themes/galaxy/sc/res/icon-set-stars-full.png b/icon-themes/galaxy/sc/res/icon-set-stars-full.png
new file mode 100644
index 000000000000..503199cfd15e
--- /dev/null
+++ b/icon-themes/galaxy/sc/res/icon-set-stars-full.png
diff --git a/icon-themes/galaxy/sc/res/icon-set-stars-half.png b/icon-themes/galaxy/sc/res/icon-set-stars-half.png
new file mode 100644
index 000000000000..2c966ad7a7d5
--- /dev/null
+++ b/icon-themes/galaxy/sc/res/icon-set-stars-half.png
diff --git a/icon-themes/galaxy/sc/res/icon-set-symbols1-check.png b/icon-themes/galaxy/sc/res/icon-set-symbols1-check.png
new file mode 100644
index 000000000000..7df727b5bb71
--- /dev/null
+++ b/icon-themes/galaxy/sc/res/icon-set-symbols1-check.png
diff --git a/icon-themes/galaxy/sc/res/icon-set-symbols1-cross.png b/icon-themes/galaxy/sc/res/icon-set-symbols1-cross.png
new file mode 100644
index 000000000000..09b7bae6e2fd
--- /dev/null
+++ b/icon-themes/galaxy/sc/res/icon-set-symbols1-cross.png
diff --git a/icon-themes/galaxy/sc/res/icon-set-symbols1-exclamation-mark.png b/icon-themes/galaxy/sc/res/icon-set-symbols1-exclamation-mark.png
new file mode 100644
index 000000000000..b16f3173db45
--- /dev/null
+++ b/icon-themes/galaxy/sc/res/icon-set-symbols1-exclamation-mark.png
diff --git a/icon-themes/galaxy/sc/res/icon-set-trafficlights-green.png b/icon-themes/galaxy/sc/res/icon-set-trafficlights-green.png
new file mode 100644
index 000000000000..38ddaa52f6c7
--- /dev/null
+++ b/icon-themes/galaxy/sc/res/icon-set-trafficlights-green.png
diff --git a/icon-themes/galaxy/sc/res/icon-set-trafficlights-red.png b/icon-themes/galaxy/sc/res/icon-set-trafficlights-red.png
new file mode 100644
index 000000000000..83857c8ce97e
--- /dev/null
+++ b/icon-themes/galaxy/sc/res/icon-set-trafficlights-red.png
diff --git a/icon-themes/galaxy/sc/res/icon-set-trafficlights-yellow.png b/icon-themes/galaxy/sc/res/icon-set-trafficlights-yellow.png
new file mode 100644
index 000000000000..daa4d16bf979
--- /dev/null
+++ b/icon-themes/galaxy/sc/res/icon-set-trafficlights-yellow.png
diff --git a/icon-themes/galaxy/sc/res/triangle_down_red.png b/icon-themes/galaxy/sc/res/icon-set-triangles-down.png
index 569e1c672aef..569e1c672aef 100644
--- a/icon-themes/galaxy/sc/res/triangle_down_red.png
+++ b/icon-themes/galaxy/sc/res/icon-set-triangles-down.png
diff --git a/icon-themes/galaxy/sc/res/icon-set-triangles-same.png b/icon-themes/galaxy/sc/res/icon-set-triangles-same.png
new file mode 100644
index 000000000000..28c871139e5d
--- /dev/null
+++ b/icon-themes/galaxy/sc/res/icon-set-triangles-same.png
diff --git a/icon-themes/galaxy/sc/res/triangle_up_green.png b/icon-themes/galaxy/sc/res/icon-set-triangles-up.png
index 216530a81947..216530a81947 100644
--- a/icon-themes/galaxy/sc/res/triangle_up_green.png
+++ b/icon-themes/galaxy/sc/res/icon-set-triangles-up.png
diff --git a/icon-themes/galaxy/sc/res/minus_black.png b/icon-themes/galaxy/sc/res/minus_black.png
deleted file mode 100644
index 3f02a7d5e311..000000000000
--- a/icon-themes/galaxy/sc/res/minus_black.png
+++ /dev/null
diff --git a/icon-themes/galaxy/sc/res/sign.png b/icon-themes/galaxy/sc/res/sign.png
deleted file mode 100644
index 58e4f2f5d639..000000000000
--- a/icon-themes/galaxy/sc/res/sign.png
+++ /dev/null
diff --git a/sc/source/core/data/colorscale.cxx b/sc/source/core/data/colorscale.cxx
index 4089bf919369..5c087e0f9c4e 100644
--- a/sc/source/core/data/colorscale.cxx
+++ b/sc/source/core/data/colorscale.cxx
@@ -1050,7 +1050,7 @@ ScIconSetMap* ScIconSetFormat::getIconSetMap()
         { "4TrafficLights", IconSet_4TrafficLights, 4 },
         { "5Arrows", IconSet_5Arrows, 5 },
         { "5ArrowsGray", IconSet_5ArrowsGray, 5 },
-        { "5Ratings", IconSet_5Ratings, 5 },
+        { "5Rating", IconSet_5Ratings, 5 },
         { "5Quarters", IconSet_5Quarters, 5 },
         { NULL, IconSet_3Arrows, 0 }
     };
diff --git a/sc/source/ui/inc/iconsets.hrc b/sc/source/ui/inc/iconsets.hrc
index 2173fd2da289..f4761c09afdc 100644
--- a/sc/source/ui/inc/iconsets.hrc
+++ b/sc/source/ui/inc/iconsets.hrc
@@ -7,25 +7,56 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-
-#define BMP_GREEN_CIRCLE 999
-#define BMP_YELLOW_CIRCLE 998
-#define BMP_RED_CIRCLE 997
-#define BMP_BLACK_CIRCLE 991
-#define BMP_BLACK_CIRCLE_EMPTY 990
-#define BMP_BLACK_CIRCLE_HALF 989
-#define BMP_BLACK_CIRCLE_1_4TH 988
-#define BMP_BLACK_CIRCLE_3_4TH 987
-#define BMP_ARROW_GREEN_UP 996
-#define BMP_ARROW_RED_DOWN 995
-#define BMP_ARROW_YELLOW_RIGHT 994
-#define BMP_ARROW_YELLOW_UP_RIGHT 993
-#define BMP_ARROW_YELLOW_DOWN_RIGHT 992
-#define BMP_GREEN_TRIANGLE_UP 986
-#define BMP_BLACK_MINUS 985
-#define BMP_RED_TRIANGLE_DOWN 984
-#define BMP_SIGN 983
-#define BMP_EXCLAMATION_MARK 982
-#define BMP_CANCEL 981
+#define BMP_ICON_SET_CIRCLES1_GRAY 999
+#define BMP_ICON_SET_CIRCLES1_GREEN 998
+#define BMP_ICON_SET_CIRCLES1_YELLOW 997
+#define BMP_ICON_SET_CIRCLES1_RED 996
+#define BMP_ICON_SET_BARS_EMPTY 995
+#define BMP_ICON_SET_BARS_ONE_QUARTER 994
+#define BMP_ICON_SET_BARS_HALF 993
+#define BMP_ICON_SET_BARS_THREE_QUARTER 992
+#define BMP_ICON_SET_BARS_FULL 991
+#define BMP_ICON_SET_CIRCLES2_DARK_GRAY 990
+#define BMP_ICON_SET_CIRCLES2_LIGHT_GRAY 989
+#define BMP_ICON_SET_CIRCLES2_LIGHT_RED 988
+#define BMP_ICON_SET_CIRCLES2_DARK_RED 987
+#define BMP_ICON_SET_COLORARROWS_DOWN 986
+#define BMP_ICON_SET_COLORARROWS_SLIGHTLY_DOWN 985
+#define BMP_ICON_SET_COLORARROWS_SAME 984
+#define BMP_ICON_SET_COLORARROWS_SLIGHTLY_UP 983
+#define BMP_ICON_SET_COLORARROWS_UP 982
+#define BMP_ICON_SET_FLAGS_RED 981
+#define BMP_ICON_SET_FLAGS_YELLOW 980
+#define BMP_ICON_SET_FLAGS_GREEN 979
+#define BMP_ICON_SET_GRAYARROWS_DOWN 978
+#define BMP_ICON_SET_GRAYARROWS_SLIGHTLY_DOWN 977
+#define BMP_ICON_SET_GRAYARROWS_SAME 976
+#define BMP_ICON_SET_GRAYARROWS_SLIGHTLY_UP 975
+#define BMP_ICON_SET_GRAYARROWS_UP 974
+#define BMP_ICON_SET_PIES_EMPTY 973
+#define BMP_ICON_SET_PIES_ONE_QUARTER 972
+#define BMP_ICON_SET_PIES_HALF 971
+#define BMP_ICON_SET_PIES_THREE_QUARTER 970
+#define BMP_ICON_SET_PIES_FULL 969
+#define BMP_ICON_SET_SHAPES_CIRCLE 968
+#define BMP_ICON_SET_SHAPES_TRIANGLE 967
+#define BMP_ICON_SET_SHAPES_DIAMOND 966
+#define BMP_ICON_SET_SQUARES_EMPTY 965
+#define BMP_ICON_SET_SQUARES_ONE_QUARTER 964
+#define BMP_ICON_SET_SQUARES_HALF 963
+#define BMP_ICON_SET_SQUARES_THREE_QUARTER 962
+#define BMP_ICON_SET_SQUARES_FULL 961
+#define BMP_ICON_SET_STARS_EMPTY 960
+#define BMP_ICON_SET_STARS_HALF 959
+#define BMP_ICON_SET_STARS_FULL 958
+#define BMP_ICON_SET_SYMBOLS1_CHECK 957
+#define BMP_ICON_SET_SYMBOLS1_EXCLAMATION_MARK 956
+#define BMP_ICON_SET_SYMBOLS1_CROSS 955
+#define BMP_ICON_SET_TRAFFICLIGHTS_RED 954
+#define BMP_ICON_SET_TRAFFICLIGHTS_YELLOW 953
+#define BMP_ICON_SET_TRAFFICLIGHTS_GREEN 952
+#define BMP_ICON_SET_TRIANGLES_DOWN 951
+#define BMP_ICON_SET_TRIANGLES_SAME 950
+#define BMP_ICON_SET_TRIANGLES_UP 949
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sc/source/ui/src/iconsets.src b/sc/source/ui/src/iconsets.src
index 4a7df5b314e3..da3c3509eca0 100644
--- a/sc/source/ui/src/iconsets.src
+++ b/sc/source/ui/src/iconsets.src
@@ -9,82 +9,209 @@
 
 #include "iconsets.hrc"
 
-Bitmap BMP_GREEN_CIRCLE
+Bitmap BMP_ICON_SET_CIRCLES1_GRAY
 {
-    File = "green_circle.png";
+    File = "icon-set-circles1-gray.png";
 };
-Bitmap BMP_YELLOW_CIRCLE
+Bitmap BMP_ICON_SET_CIRCLES1_GREEN
 {
-    File = "yellow_circle.png";
+    File = "icon-set-circles1-green.png";
 };
-Bitmap BMP_RED_CIRCLE
+Bitmap BMP_ICON_SET_CIRCLES1_YELLOW
 {
-    File = "red_circle.png";
+    File = "icon-set-circles1-yellow.png";
 };
-Bitmap BMP_BLACK_CIRCLE
+Bitmap BMP_ICON_SET_CIRCLES1_RED
 {
-    File = "black_circle_full.png";
+    File = "icon-set-circles1-red.png";
 };
-Bitmap BMP_BLACK_CIRCLE_EMPTY
+Bitmap BMP_ICON_SET_BARS_EMPTY
 {
-    File = "black_circle_empty.png";
+    File = "icon-set-bars-empty.png";
 };
-Bitmap BMP_BLACK_CIRCLE_HALF
+Bitmap BMP_ICON_SET_BARS_ONE_QUARTER
 {
-    File = "black_circle_half.png";
+    File = "icon-set-bars-one-quarter.png";
 };
-Bitmap BMP_BLACK_CIRCLE_1_4TH
+Bitmap BMP_ICON_SET_BARS_HALF
 {
-    File = "black_circle_1_4th.png";
+    File = "icon-set-bars-half.png";
 };
-Bitmap BMP_BLACK_CIRCLE_3_4TH
+Bitmap BMP_ICON_SET_BARS_THREE_QUARTER
 {
-    File = "black_circle_3_4th.png";
+    File = "icon-set-bars-three-quarters.png";
 };
-Bitmap BMP_ARROW_GREEN_UP
+Bitmap BMP_ICON_SET_BARS_FULL
 {
-    File = "green_arrow_up.png";
+    File = "icon-set-bars-full.png";
 };
-Bitmap BMP_ARROW_YELLOW_RIGHT
+Bitmap BMP_ICON_SET_CIRCLES2_DARK_GRAY
 {
-    File = "yellow_arrow_right.png";
+    File = "icon-set-circles2-dark-gray.png";
 };
-Bitmap BMP_ARROW_RED_DOWN
+Bitmap BMP_ICON_SET_CIRCLES2_LIGHT_GRAY
 {
-    File = "red_arrow_down.png";
+    File = "icon-set-circles2-light-gray.png";
 };
-Bitmap BMP_ARROW_YELLOW_UP_RIGHT
+Bitmap BMP_ICON_SET_CIRCLES2_LIGHT_RED
 {
-    File = "yellow_arrow_up_right.png";
+    File = "icon-set-circles2-light-red.png";
 };
-Bitmap BMP_ARROW_YELLOW_DOWN_RIGHT
+Bitmap BMP_ICON_SET_CIRCLES2_DARK_RED
 {
-    File = "yellow_arrow_down_right.png";
+    File = "icon-set-circles2-dark-red.png";
 };
-Bitmap BMP_GREEN_TRIANGLE_UP
+Bitmap BMP_ICON_SET_COLORARROWS_DOWN
 {
-    File = "triangle_up_green.png";
+    File = "icon-set-colorarrows-down.png";
 };
-Bitmap BMP_BLACK_MINUS
+Bitmap BMP_ICON_SET_COLORARROWS_SLIGHTLY_DOWN
 {
-    File = "minus.png";
+    File = "icon-set-colorarrows-slightly-down.png";
 };
-Bitmap BMP_RED_TRIANGLE_DOWN
+Bitmap BMP_ICON_SET_COLORARROWS_SAME
 {
-    File = "triangle_down_red.png";
+    File = "icon-set-colorarrows-same.png";
 };
-Bitmap BMP_SIGN
+Bitmap BMP_ICON_SET_COLORARROWS_SLIGHTLY_UP
 {
-    File = "sign.png";
+    File = "icon-set-colorarrows-slightly-up.png";
 };
-Bitmap BMP_EXCLAMATION_MARK
+Bitmap BMP_ICON_SET_COLORARROWS_UP
 {
-    File = "exclamation_mark.png";
+    File = "icon-set-colorarrows-up.png";
 };
-Bitmap BMP_CANCEL
+Bitmap BMP_ICON_SET_FLAGS_RED
 {
-    File = "cancel.png";
+    File = "icon-set-flags-red.png";
+};
+Bitmap BMP_ICON_SET_FLAGS_YELLOW
+{
+    File = "icon-set-flags-yellow.png";
+};
+Bitmap BMP_ICON_SET_FLAGS_GREEN
+{
+    File = "icon-set-flags-green.png";
+};
+Bitmap BMP_ICON_SET_GRAYARROWS_DOWN
+{
+    File = "icon-set-grayarrows-down.png";
+};
+Bitmap BMP_ICON_SET_GRAYARROWS_SLIGHTLY_DOWN
+{
+    File = "icon-set-grayarrows-slightly-down.png";
+};
+Bitmap BMP_ICON_SET_GRAYARROWS_SAME
+{
+    File = "icon-set-grayarrows-same.png";
+};
+Bitmap BMP_ICON_SET_GRAYARROWS_SLIGHTLY_UP
+{
+    File = "icon-set-grayarrows-slightly-up.png";
+};
+Bitmap BMP_ICON_SET_GRAYARROWS_UP
+{
+    File = "icon-set-grayarrows-up.png";
+};
+Bitmap BMP_ICON_SET_PIES_EMPTY
+{
+    File = "icon-set-pies-empty.png";
+};
+Bitmap BMP_ICON_SET_PIES_ONE_QUARTER
+{
+    File = "icon-set-pies-one-quarter.png";
+};
+Bitmap BMP_ICON_SET_PIES_HALF
+{
+    File = "icon-set-pies-half.png";
+};
+Bitmap BMP_ICON_SET_PIES_THREE_QUARTER
+{
+    File = "icon-set-pies-three-quarters.png";
+};
+Bitmap BMP_ICON_SET_PIES_FULL
+{
+    File = "icon-set-pies-full.png";
+};
+Bitmap BMP_ICON_SET_SHAPES_CIRCLE
+{
+    File = "icon-set-shapes-circle.png";
+};
+Bitmap BMP_ICON_SET_SHAPES_TRIANGLE
+{
+    File = "icon-set-shapes-triangle";
+};
+Bitmap BMP_ICON_SET_SHAPES_DIAMOND
+{
+    File = "icon-set-shapes-diamond.png";
+};
+Bitmap BMP_ICON_SET_SQUARES_EMPTY
+{
+    File = "icon-set-squares-empty.png";
+};
+Bitmap BMP_ICON_SET_SQUARES_ONE_QUARTER
+{
+    File = "icon-set-squares-one-quarter.png";
+};
+Bitmap BMP_ICON_SET_SQUARES_HALF
+{
+    File = "icon-set-squares-half.png";
+};
+Bitmap BMP_ICON_SET_SQUARES_THREE_QUARTER
+{
+    File = "icon-set-squares-three-quarters.png";
+};
+Bitmap BMP_ICON_SET_SQUARES_FULL
+{
+    File = "icon-set-squares-full.png";
+};
+Bitmap BMP_ICON_SET_STARS_EMPTY
+{
+    File = "icon-set-stars-empty.png";
+};
+Bitmap BMP_ICON_SET_STARS_HALF
+{
+    File = "icon-set-stars-half.png";
+};
+Bitmap BMP_ICON_SET_STARS_FULL
+{
+    File = "icon-set-stars-full.png";
+};
+Bitmap BMP_ICON_SET_SYMBOLS1_CHECK
+{
+    File = "icon-set-symbols1-check.png";
+};
+Bitmap BMP_ICON_SET_SYMBOLS1_EXCLAMATION_MARK
+{
+    File = "icon-set-symbols1-exclamation-mark.png";
+};
+Bitmap BMP_ICON_SET_SYMBOLS1_CROSS
+{
+    File = "icon-set-symbols1-cross.png";
+};
+Bitmap BMP_ICON_SET_TRAFFICLIGHTS_RED
+{
+    File = "icon-set-trafficlights-red.png";
+};
+Bitmap BMP_ICON_SET_TRAFFICLIGHTS_YELLOW
+{
+    File = "icon-set-trafficlights-yellow.png";
+};
+Bitmap BMP_ICON_SET_TRAFFICLIGHTS_GREEN
+{
+    File = "icon-set-trafficlights-green.png";
+};
+Bitmap BMP_ICON_SET_TRIANGLES_DOWN
+{
+    File = "icon-set-triangles-down.png";
+};
+Bitmap BMP_ICON_SET_TRIANGLES_SAME
+{
+    File = "icon-set-triangles-same.png";
+};
+Bitmap BMP_ICON_SET_TRIANGLES_UP
+{
+    File = "icon-set-triangles-up.png";
 };
-
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sc/source/ui/view/output.cxx b/sc/source/ui/view/output.cxx
index 81af7baaf2c8..16e253f56abb 100644
--- a/sc/source/ui/view/output.cxx
+++ b/sc/source/ui/view/output.cxx
@@ -94,31 +94,74 @@ static ColorData nAuthorColor[ SC_AUTHORCOLORCOUNT ] = {
                     COL_BROWN,          COL_MAGENTA,        COL_CYAN };
 
 sal_Int32 a3TrafficLights1[] = {
-    BMP_RED_CIRCLE, BMP_YELLOW_CIRCLE, BMP_GREEN_CIRCLE
+    BMP_ICON_SET_CIRCLES1_RED, BMP_ICON_SET_CIRCLES1_YELLOW, BMP_ICON_SET_CIRCLES1_GREEN
+};
+
+sal_Int32 a3TrafficLights2[] = {
+    BMP_ICON_SET_TRAFFICLIGHTS_RED, BMP_ICON_SET_TRAFFICLIGHTS_YELLOW, BMP_ICON_SET_TRAFFICLIGHTS_GREEN
 };
 
 sal_Int32 a3Arrows[] = {
-    BMP_ARROW_RED_DOWN, BMP_ARROW_YELLOW_RIGHT, BMP_ARROW_GREEN_UP
+    BMP_ICON_SET_COLORARROWS_DOWN, BMP_ICON_SET_COLORARROWS_SAME, BMP_ICON_SET_COLORARROWS_UP
+};
+
+sal_Int32 a3ArrowsGray[] = {
+    BMP_ICON_SET_GRAYARROWS_DOWN, BMP_ICON_SET_GRAYARROWS_SAME, BMP_ICON_SET_GRAYARROWS_UP
+};
+
+sal_Int32 a3Flags[] = {
+    BMP_ICON_SET_FLAGS_RED, BMP_ICON_SET_FLAGS_YELLOW, BMP_ICON_SET_FLAGS_GREEN
 };
 
 sal_Int32 a4Arrows[] = {
-    BMP_ARROW_RED_DOWN, BMP_ARROW_YELLOW_DOWN_RIGHT, BMP_ARROW_YELLOW_UP_RIGHT, BMP_ARROW_GREEN_UP
+    BMP_ICON_SET_COLORARROWS_DOWN, BMP_ICON_SET_COLORARROWS_SLIGHTLY_DOWN, BMP_ICON_SET_COLORARROWS_SLIGHTLY_UP, BMP_ICON_SET_COLORARROWS_UP
+};
+
+sal_Int32 a4ArrowsGray[] = {
+    BMP_ICON_SET_GRAYARROWS_DOWN, BMP_ICON_SET_GRAYARROWS_SLIGHTLY_DOWN, BMP_ICON_SET_GRAYARROWS_SLIGHTLY_UP, BMP_ICON_SET_GRAYARROWS_UP
 };
 
 sal_Int32 a5Arrows[] = {
-    BMP_ARROW_RED_DOWN, BMP_ARROW_YELLOW_DOWN_RIGHT, BMP_ARROW_YELLOW_RIGHT, BMP_ARROW_YELLOW_UP_RIGHT, BMP_ARROW_GREEN_UP
+    BMP_ICON_SET_COLORARROWS_DOWN, BMP_ICON_SET_COLORARROWS_SLIGHTLY_DOWN,
+    BMP_ICON_SET_COLORARROWS_SAME, BMP_ICON_SET_COLORARROWS_SLIGHTLY_UP, BMP_ICON_SET_COLORARROWS_UP
+};
+
+sal_Int32 a5ArrowsGray[] = {
+    BMP_ICON_SET_GRAYARROWS_DOWN, BMP_ICON_SET_GRAYARROWS_SLIGHTLY_DOWN,
+    BMP_ICON_SET_GRAYARROWS_SAME, BMP_ICON_SET_GRAYARROWS_SLIGHTLY_UP, BMP_ICON_SET_GRAYARROWS_UP
 };
 
 sal_Int32 a4TrafficLights[] = {
-    BMP_BLACK_CIRCLE, BMP_RED_CIRCLE, BMP_YELLOW_CIRCLE, BMP_GREEN_CIRCLE
+    BMP_ICON_SET_CIRCLES1_GRAY, BMP_ICON_SET_CIRCLES1_RED,
+    BMP_ICON_SET_CIRCLES1_YELLOW, BMP_ICON_SET_CIRCLES1_GREEN
 };
 
 sal_Int32 a5Quarters[] = {
-    BMP_BLACK_CIRCLE_EMPTY, BMP_BLACK_CIRCLE_1_4TH, BMP_BLACK_CIRCLE_HALF, BMP_BLACK_CIRCLE_3_4TH, BMP_BLACK_CIRCLE
+    BMP_ICON_SET_PIES_EMPTY, BMP_ICON_SET_PIES_ONE_QUARTER, BMP_ICON_SET_PIES_HALF,
+    BMP_ICON_SET_PIES_THREE_QUARTER, BMP_ICON_SET_PIES_FULL,
 };
 
 sal_Int32 a3Symbols1[] = {
-    BMP_CANCEL, BMP_EXCLAMATION_MARK, BMP_SIGN
+    BMP_ICON_SET_SYMBOLS1_CHECK, BMP_ICON_SET_SYMBOLS1_EXCLAMATION_MARK, BMP_ICON_SET_SYMBOLS1_CROSS
+};
+
+sal_Int32 a3Signs[] = {
+    BMP_ICON_SET_SHAPES_DIAMOND, BMP_ICON_SET_SHAPES_TRIANGLE, BMP_ICON_SET_SHAPES_CIRCLE
+};
+
+sal_Int32 a4RedToBlack[] = {
+    BMP_ICON_SET_CIRCLES2_DARK_GRAY, BMP_ICON_SET_CIRCLES2_LIGHT_GRAY,
+    BMP_ICON_SET_CIRCLES2_LIGHT_RED, BMP_ICON_SET_CIRCLES2_DARK_RED
+};
+
+sal_Int32 a4Ratings[] = {
+    BMP_ICON_SET_BARS_ONE_QUARTER, BMP_ICON_SET_BARS_HALF,
+    BMP_ICON_SET_BARS_THREE_QUARTER, BMP_ICON_SET_BARS_FULL
+};
+
+sal_Int32 a5Ratings[] = {
+    BMP_ICON_SET_BARS_EMPTY, BMP_ICON_SET_BARS_ONE_QUARTER, BMP_ICON_SET_BARS_HALF,
+    BMP_ICON_SET_BARS_THREE_QUARTER, BMP_ICON_SET_BARS_FULL
 };
 
 struct ScIconSetBitmapMap {
@@ -127,18 +170,23 @@ struct ScIconSetBitmapMap {
 };
 
 static ScIconSetBitmapMap aBitmapMap[] = {
-    { IconSet_3TrafficLights1, a3TrafficLights1 },
-    { IconSet_3TrafficLights2, a3TrafficLights1 },
     { IconSet_3Arrows, a3Arrows },
-    { IconSet_3ArrowsGray, a3Arrows },
+    { IconSet_3ArrowsGray, a3ArrowsGray },
+    { IconSet_3Flags, a3Flags },
+    { IconSet_3Signs, a3Signs },
     { IconSet_3Symbols, a3Symbols1 },
     { IconSet_3Symbols2, a3Symbols1 },
+    { IconSet_3TrafficLights1, a3TrafficLights1 },
+    { IconSet_3TrafficLights2, a3TrafficLights2 },
     { IconSet_4Arrows, a4Arrows },
-    { IconSet_4ArrowsGray, a4Arrows },
+    { IconSet_4ArrowsGray, a4ArrowsGray },
+    { IconSet_4Rating, a4Ratings },
+    { IconSet_4RedToBlack, a4RedToBlack },
     { IconSet_4TrafficLights, a4TrafficLights },
     { IconSet_5Arrows, a5Arrows },
-    { IconSet_5ArrowsGray, a5Arrows },
-    { IconSet_5Quarters, a5Quarters }
+    { IconSet_5ArrowsGray, a5ArrowsGray },
+    { IconSet_5Quarters, a5Quarters },
+    { IconSet_5Ratings, a5Ratings }
 };
 
 static std::map< sal_Int32, BitmapEx > aIconSetBitmaps;