diff --git a/krita/data/preset_icons/tool_icons/eraser-mechanical.png b/krita/data/preset_icons/tool_icons/00_01_eraser-mechanical.png
similarity index 100%
rename from krita/data/preset_icons/tool_icons/eraser-mechanical.png
rename to krita/data/preset_icons/tool_icons/00_01_eraser-mechanical.png
diff --git a/krita/data/preset_icons/tool_icons/eraser-large.png b/krita/data/preset_icons/tool_icons/00_02_eraser-large.png
similarity index 100%
rename from krita/data/preset_icons/tool_icons/eraser-large.png
rename to krita/data/preset_icons/tool_icons/00_02_eraser-large.png
diff --git a/krita/data/preset_icons/tool_icons/eraser-hard.png b/krita/data/preset_icons/tool_icons/00_03_eraser-hard.png
similarity index 100%
rename from krita/data/preset_icons/tool_icons/eraser-hard.png
rename to krita/data/preset_icons/tool_icons/00_03_eraser-hard.png
diff --git a/krita/data/preset_icons/tool_icons/eraser-kneaded.png b/krita/data/preset_icons/tool_icons/00_04_eraser-kneaded.png
similarity index 100%
rename from krita/data/preset_icons/tool_icons/eraser-kneaded.png
rename to krita/data/preset_icons/tool_icons/00_04_eraser-kneaded.png
diff --git a/krita/data/preset_icons/tool_icons/mechanical-pencil.png b/krita/data/preset_icons/tool_icons/01_01_mechanical-pencil.png
similarity index 100%
rename from krita/data/preset_icons/tool_icons/mechanical-pencil.png
rename to krita/data/preset_icons/tool_icons/01_01_mechanical-pencil.png
diff --git a/krita/data/preset_icons/tool_icons/pencil-black-stone.png b/krita/data/preset_icons/tool_icons/01_01_pencil-black-stone.png
similarity index 100%
rename from krita/data/preset_icons/tool_icons/pencil-black-stone.png
rename to krita/data/preset_icons/tool_icons/01_01_pencil-black-stone.png
diff --git a/krita/data/preset_icons/tool_icons/pencil-double-ring.png b/krita/data/preset_icons/tool_icons/01_02_pencil-double-ring.png
similarity index 100%
rename from krita/data/preset_icons/tool_icons/pencil-double-ring.png
rename to krita/data/preset_icons/tool_icons/01_02_pencil-double-ring.png
diff --git a/krita/data/preset_icons/tool_icons/graphite.png b/krita/data/preset_icons/tool_icons/01_04_graphite.png
similarity index 100%
rename from krita/data/preset_icons/tool_icons/graphite.png
rename to krita/data/preset_icons/tool_icons/01_04_graphite.png
diff --git a/krita/data/preset_icons/tool_icons/charcoal-pencil-thin.png b/krita/data/preset_icons/tool_icons/02_01_charcoal-pencil-thin.png
similarity index 100%
rename from krita/data/preset_icons/tool_icons/charcoal-pencil-thin.png
rename to krita/data/preset_icons/tool_icons/02_01_charcoal-pencil-thin.png
diff --git a/krita/data/preset_icons/tool_icons/charcoal-pencil-medium.png b/krita/data/preset_icons/tool_icons/02_02_charcoal-pencil-medium.png
similarity index 100%
rename from krita/data/preset_icons/tool_icons/charcoal-pencil-medium.png
rename to krita/data/preset_icons/tool_icons/02_02_charcoal-pencil-medium.png
diff --git a/krita/data/preset_icons/tool_icons/charcoal-pencil-large.png b/krita/data/preset_icons/tool_icons/02_03_charcoal-pencil-large.png
similarity index 100%
rename from krita/data/preset_icons/tool_icons/charcoal-pencil-large.png
rename to krita/data/preset_icons/tool_icons/02_03_charcoal-pencil-large.png
diff --git a/krita/data/preset_icons/tool_icons/charcoal-block.png b/krita/data/preset_icons/tool_icons/02_04_charcoal-block.png
similarity index 100%
rename from krita/data/preset_icons/tool_icons/charcoal-block.png
rename to krita/data/preset_icons/tool_icons/02_04_charcoal-block.png
diff --git a/krita/data/preset_icons/tool_icons/colored-pencil.png b/krita/data/preset_icons/tool_icons/03_01colored-pencil.png
similarity index 100%
rename from krita/data/preset_icons/tool_icons/colored-pencil.png
rename to krita/data/preset_icons/tool_icons/03_01colored-pencil.png
diff --git a/krita/data/preset_icons/tool_icons/chalk-square.png b/krita/data/preset_icons/tool_icons/03_02_chalk-square.png
similarity index 100%
rename from krita/data/preset_icons/tool_icons/chalk-square.png
rename to krita/data/preset_icons/tool_icons/03_02_chalk-square.png
diff --git a/krita/data/preset_icons/tool_icons/pastel.png b/krita/data/preset_icons/tool_icons/03_03_pastel.png
similarity index 100%
rename from krita/data/preset_icons/tool_icons/pastel.png
rename to krita/data/preset_icons/tool_icons/03_03_pastel.png
diff --git a/krita/data/preset_icons/tool_icons/technical-pen.png b/krita/data/preset_icons/tool_icons/04_01_technical-pen.png
similarity index 100%
rename from krita/data/preset_icons/tool_icons/technical-pen.png
rename to krita/data/preset_icons/tool_icons/04_01_technical-pen.png
diff --git a/krita/data/preset_icons/tool_icons/gel-pen.png b/krita/data/preset_icons/tool_icons/04_02_gel-pen.png
similarity index 100%
rename from krita/data/preset_icons/tool_icons/gel-pen.png
rename to krita/data/preset_icons/tool_icons/04_02_gel-pen.png
diff --git a/krita/data/preset_icons/tool_icons/inking_fine-line_tiny.png b/krita/data/preset_icons/tool_icons/04_03_inking_fine-line_tiny.png
similarity index 100%
rename from krita/data/preset_icons/tool_icons/inking_fine-line_tiny.png
rename to krita/data/preset_icons/tool_icons/04_03_inking_fine-line_tiny.png
diff --git a/krita/data/preset_icons/tool_icons/inking_fine-line_medium.png b/krita/data/preset_icons/tool_icons/04_04_inking_fine-line_medium.png
similarity index 100%
rename from krita/data/preset_icons/tool_icons/inking_fine-line_medium.png
rename to krita/data/preset_icons/tool_icons/04_04_inking_fine-line_medium.png
diff --git a/krita/data/preset_icons/tool_icons/ink-pen-atom.png b/krita/data/preset_icons/tool_icons/04_05_ink-pen-atom.png
similarity index 100%
rename from krita/data/preset_icons/tool_icons/ink-pen-atom.png
rename to krita/data/preset_icons/tool_icons/04_05_ink-pen-atom.png
diff --git a/krita/data/preset_icons/tool_icons/ink-G-pen.png b/krita/data/preset_icons/tool_icons/04_06_ink-G-pen.png
similarity index 100%
rename from krita/data/preset_icons/tool_icons/ink-G-pen.png
rename to krita/data/preset_icons/tool_icons/04_06_ink-G-pen.png
diff --git a/krita/data/preset_icons/tool_icons/inking_dynamic_pen.png b/krita/data/preset_icons/tool_icons/04_07_inking_dynamic_pen.png
similarity index 100%
rename from krita/data/preset_icons/tool_icons/inking_dynamic_pen.png
rename to krita/data/preset_icons/tool_icons/04_07_inking_dynamic_pen.png
diff --git a/krita/data/preset_icons/tool_icons/inking_dynamic_pen_though.png b/krita/data/preset_icons/tool_icons/04_08_inking_dynamic_pen_though.png
similarity index 100%
rename from krita/data/preset_icons/tool_icons/inking_dynamic_pen_though.png
rename to krita/data/preset_icons/tool_icons/04_08_inking_dynamic_pen_though.png
diff --git a/krita/data/preset_icons/tool_icons/inking_pen_bumpy.png b/krita/data/preset_icons/tool_icons/04_09_inking_pen_bumpy.png
similarity index 100%
rename from krita/data/preset_icons/tool_icons/inking_pen_bumpy.png
rename to krita/data/preset_icons/tool_icons/04_09_inking_pen_bumpy.png
diff --git a/krita/data/preset_icons/tool_icons/inking_pen_bumpy_though.png b/krita/data/preset_icons/tool_icons/04_10_inking_pen_bumpy_though.png
similarity index 100%
rename from krita/data/preset_icons/tool_icons/inking_pen_bumpy_though.png
rename to krita/data/preset_icons/tool_icons/04_10_inking_pen_bumpy_though.png
diff --git a/krita/data/preset_icons/tool_icons/inking_pen_calligraphic.png b/krita/data/preset_icons/tool_icons/04_11_inking_pen_calligraphic.png
similarity index 100%
rename from krita/data/preset_icons/tool_icons/inking_pen_calligraphic.png
rename to krita/data/preset_icons/tool_icons/04_11_inking_pen_calligraphic.png
diff --git a/krita/data/preset_icons/tool_icons/rigger-brush.png b/krita/data/preset_icons/tool_icons/04_12_rigger-brush.png
similarity index 100%
rename from krita/data/preset_icons/tool_icons/rigger-brush.png
rename to krita/data/preset_icons/tool_icons/04_12_rigger-brush.png
diff --git a/krita/data/preset_icons/tool_icons/inking_brush.png b/krita/data/preset_icons/tool_icons/04_13_inking_brush.png
similarity index 100%
rename from krita/data/preset_icons/tool_icons/inking_brush.png
rename to krita/data/preset_icons/tool_icons/04_13_inking_brush.png
diff --git a/krita/data/preset_icons/tool_icons/inking_brush_blurry.png b/krita/data/preset_icons/tool_icons/04_14_inking_brush_blurry.png
similarity index 100%
rename from krita/data/preset_icons/tool_icons/inking_brush_blurry.png
rename to krita/data/preset_icons/tool_icons/04_14_inking_brush_blurry.png
diff --git a/krita/data/preset_icons/tool_icons/ink-brush.png b/krita/data/preset_icons/tool_icons/04_15_ink-brush.png
similarity index 100%
rename from krita/data/preset_icons/tool_icons/ink-brush.png
rename to krita/data/preset_icons/tool_icons/04_15_ink-brush.png
diff --git a/krita/data/preset_icons/tool_icons/large-rounded-cut.png b/krita/data/preset_icons/tool_icons/04_16_large-rounded-cut.png
similarity index 100%
rename from krita/data/preset_icons/tool_icons/large-rounded-cut.png
rename to krita/data/preset_icons/tool_icons/04_16_large-rounded-cut.png
diff --git a/krita/data/preset_icons/tool_icons/ink-pen-glass.png b/krita/data/preset_icons/tool_icons/04_17_ink-pen-glass.png
similarity index 100%
rename from krita/data/preset_icons/tool_icons/ink-pen-glass.png
rename to krita/data/preset_icons/tool_icons/04_17_ink-pen-glass.png
diff --git a/krita/data/preset_icons/tool_icons/airbrush.png b/krita/data/preset_icons/tool_icons/05_01_airbrush.png
similarity index 100%
rename from krita/data/preset_icons/tool_icons/airbrush.png
rename to krita/data/preset_icons/tool_icons/05_01_airbrush.png
diff --git a/krita/data/preset_icons/tool_icons/thin-stylus-tablet.png b/krita/data/preset_icons/tool_icons/05_02_thin-stylus-tablet.png
similarity index 100%
rename from krita/data/preset_icons/tool_icons/thin-stylus-tablet.png
rename to krita/data/preset_icons/tool_icons/05_02_thin-stylus-tablet.png
diff --git a/krita/data/preset_icons/tool_icons/stylus-white.png b/krita/data/preset_icons/tool_icons/05_03_stylus-white.png
similarity index 100%
rename from krita/data/preset_icons/tool_icons/stylus-white.png
rename to krita/data/preset_icons/tool_icons/05_03_stylus-white.png
diff --git a/krita/data/preset_icons/tool_icons/stylus.png b/krita/data/preset_icons/tool_icons/05_04_stylus.png
similarity index 100%
rename from krita/data/preset_icons/tool_icons/stylus.png
rename to krita/data/preset_icons/tool_icons/05_04_stylus.png
diff --git a/krita/data/preset_icons/tool_icons/stylus-colored-ring.png b/krita/data/preset_icons/tool_icons/05_05_stylus-colored-ring.png
similarity index 100%
rename from krita/data/preset_icons/tool_icons/stylus-colored-ring.png
rename to krita/data/preset_icons/tool_icons/05_05_stylus-colored-ring.png
diff --git a/krita/data/preset_icons/tool_icons/stylus-colored.png b/krita/data/preset_icons/tool_icons/05_06_stylus-colored.png
similarity index 100%
rename from krita/data/preset_icons/tool_icons/stylus-colored.png
rename to krita/data/preset_icons/tool_icons/05_06_stylus-colored.png
diff --git a/krita/data/preset_icons/tool_icons/stylus-experimental.png b/krita/data/preset_icons/tool_icons/05_07_stylus-experimental.png
similarity index 100%
rename from krita/data/preset_icons/tool_icons/stylus-experimental.png
rename to krita/data/preset_icons/tool_icons/05_07_stylus-experimental.png
diff --git a/krita/data/preset_icons/tool_icons/marker.png b/krita/data/preset_icons/tool_icons/06_01_marker.png
similarity index 100%
rename from krita/data/preset_icons/tool_icons/marker.png
rename to krita/data/preset_icons/tool_icons/06_01_marker.png
diff --git a/krita/data/preset_icons/tool_icons/marker-old.png b/krita/data/preset_icons/tool_icons/06_02_marker-old.png
similarity index 100%
rename from krita/data/preset_icons/tool_icons/marker-old.png
rename to krita/data/preset_icons/tool_icons/06_02_marker-old.png
diff --git a/krita/data/preset_icons/tool_icons/marker-large.png b/krita/data/preset_icons/tool_icons/06_03_marker-large.png
similarity index 100%
rename from krita/data/preset_icons/tool_icons/marker-large.png
rename to krita/data/preset_icons/tool_icons/06_03_marker-large.png
diff --git a/krita/data/preset_icons/tool_icons/round_marker_detail.png b/krita/data/preset_icons/tool_icons/06_04_round_marker_detail.png
similarity index 100%
rename from krita/data/preset_icons/tool_icons/round_marker_detail.png
rename to krita/data/preset_icons/tool_icons/06_04_round_marker_detail.png
diff --git a/krita/data/preset_icons/tool_icons/sketching_wide_47.png b/krita/data/preset_icons/tool_icons/06_05_sketching_wide_47.png
similarity index 100%
rename from krita/data/preset_icons/tool_icons/sketching_wide_47.png
rename to krita/data/preset_icons/tool_icons/06_05_sketching_wide_47.png
diff --git a/krita/data/preset_icons/tool_icons/sketching_wide_bristles.png b/krita/data/preset_icons/tool_icons/06_06_sketching_wide_bristles.png
similarity index 100%
rename from krita/data/preset_icons/tool_icons/sketching_wide_bristles.png
rename to krita/data/preset_icons/tool_icons/06_06_sketching_wide_bristles.png
diff --git a/krita/data/preset_icons/tool_icons/synthetic-thin.png b/krita/data/preset_icons/tool_icons/07_01_synthetic-thin.png
similarity index 100%
rename from krita/data/preset_icons/tool_icons/synthetic-thin.png
rename to krita/data/preset_icons/tool_icons/07_01_synthetic-thin.png
diff --git a/krita/data/preset_icons/tool_icons/synthetic-medium.png b/krita/data/preset_icons/tool_icons/07_02_synthetic-medium.png
similarity index 100%
rename from krita/data/preset_icons/tool_icons/synthetic-medium.png
rename to krita/data/preset_icons/tool_icons/07_02_synthetic-medium.png
diff --git a/krita/data/preset_icons/tool_icons/synthetic-filbert.png b/krita/data/preset_icons/tool_icons/07_03_synthetic-filbert.png
similarity index 100%
rename from krita/data/preset_icons/tool_icons/synthetic-filbert.png
rename to krita/data/preset_icons/tool_icons/07_03_synthetic-filbert.png
diff --git a/krita/data/preset_icons/tool_icons/synthetic-large-bright.png b/krita/data/preset_icons/tool_icons/07_04_synthetic-large-bright.png
similarity index 100%
rename from krita/data/preset_icons/tool_icons/synthetic-large-bright.png
rename to krita/data/preset_icons/tool_icons/07_04_synthetic-large-bright.png
diff --git a/krita/data/preset_icons/tool_icons/synthetic-large-bright-used.png b/krita/data/preset_icons/tool_icons/07_05_synthetic-large-bright-used.png
similarity index 100%
rename from krita/data/preset_icons/tool_icons/synthetic-large-bright-used.png
rename to krita/data/preset_icons/tool_icons/07_05_synthetic-large-bright-used.png
diff --git a/krita/data/preset_icons/tool_icons/oil-filbert.png b/krita/data/preset_icons/tool_icons/07_06_oil-filbert.png
similarity index 100%
rename from krita/data/preset_icons/tool_icons/oil-filbert.png
rename to krita/data/preset_icons/tool_icons/07_06_oil-filbert.png
diff --git a/krita/data/preset_icons/tool_icons/oil-flat-large.png b/krita/data/preset_icons/tool_icons/07_07_oil-flat-large.png
similarity index 100%
rename from krita/data/preset_icons/tool_icons/oil-flat-large.png
rename to krita/data/preset_icons/tool_icons/07_07_oil-flat-large.png
diff --git a/krita/data/preset_icons/tool_icons/acrylic-rounded-used.png b/krita/data/preset_icons/tool_icons/07_08_acrylic-rounded-used.png
similarity index 100%
rename from krita/data/preset_icons/tool_icons/acrylic-rounded-used.png
rename to krita/data/preset_icons/tool_icons/07_08_acrylic-rounded-used.png
diff --git a/krita/data/preset_icons/tool_icons/acrylic-angled.png b/krita/data/preset_icons/tool_icons/07_09_acrylic-angled.png
similarity index 100%
rename from krita/data/preset_icons/tool_icons/acrylic-angled.png
rename to krita/data/preset_icons/tool_icons/07_09_acrylic-angled.png
diff --git a/krita/data/preset_icons/tool_icons/acrylic-flat.png b/krita/data/preset_icons/tool_icons/07_10_acrylic-flat.png
similarity index 100%
rename from krita/data/preset_icons/tool_icons/acrylic-flat.png
rename to krita/data/preset_icons/tool_icons/07_10_acrylic-flat.png
diff --git a/krita/data/preset_icons/tool_icons/acrylic-mop.png b/krita/data/preset_icons/tool_icons/07_11_acrylic-mop.png
similarity index 100%
rename from krita/data/preset_icons/tool_icons/acrylic-mop.png
rename to krita/data/preset_icons/tool_icons/07_11_acrylic-mop.png
diff --git a/krita/data/preset_icons/tool_icons/wide_dull_round.png b/krita/data/preset_icons/tool_icons/07_12_wide_dull_round.png
similarity index 100%
rename from krita/data/preset_icons/tool_icons/wide_dull_round.png
rename to krita/data/preset_icons/tool_icons/07_12_wide_dull_round.png
diff --git a/krita/data/preset_icons/tool_icons/wide_brush_blurry.png b/krita/data/preset_icons/tool_icons/07_13_wide_brush_blurry.png
similarity index 100%
rename from krita/data/preset_icons/tool_icons/wide_brush_blurry.png
rename to krita/data/preset_icons/tool_icons/07_13_wide_brush_blurry.png
diff --git a/krita/data/preset_icons/tool_icons/watercolor-flat.png b/krita/data/preset_icons/tool_icons/07_14_watercolor-flat.png
similarity index 100%
rename from krita/data/preset_icons/tool_icons/watercolor-flat.png
rename to krita/data/preset_icons/tool_icons/07_14_watercolor-flat.png
diff --git a/krita/data/preset_icons/tool_icons/acrylic-fan-used.png b/krita/data/preset_icons/tool_icons/07_15_acrylic-fan-used.png
similarity index 100%
rename from krita/data/preset_icons/tool_icons/acrylic-fan-used.png
rename to krita/data/preset_icons/tool_icons/07_15_acrylic-fan-used.png
diff --git a/krita/data/preset_icons/tool_icons/acrylic-flat-old.png b/krita/data/preset_icons/tool_icons/07_16_acrylic-flat-old.png
similarity index 100%
rename from krita/data/preset_icons/tool_icons/acrylic-flat-old.png
rename to krita/data/preset_icons/tool_icons/07_16_acrylic-flat-old.png
diff --git a/krita/data/preset_icons/tool_icons/synthetic-very-old.png b/krita/data/preset_icons/tool_icons/07_17_synthetic-very-old.png
similarity index 100%
rename from krita/data/preset_icons/tool_icons/synthetic-very-old.png
rename to krita/data/preset_icons/tool_icons/07_17_synthetic-very-old.png
diff --git a/krita/data/preset_icons/tool_icons/special-effect-used-brush.png b/krita/data/preset_icons/tool_icons/07_18_special-effect-used-brush.png
similarity index 100%
rename from krita/data/preset_icons/tool_icons/special-effect-used-brush.png
rename to krita/data/preset_icons/tool_icons/07_18_special-effect-used-brush.png
diff --git a/krita/data/preset_icons/tool_icons/watercolor-brush-medium.png b/krita/data/preset_icons/tool_icons/08_01_watercolor-brush-medium.png
similarity index 100%
rename from krita/data/preset_icons/tool_icons/watercolor-brush-medium.png
rename to krita/data/preset_icons/tool_icons/08_01_watercolor-brush-medium.png
diff --git a/krita/data/preset_icons/tool_icons/oil-round-hard.png b/krita/data/preset_icons/tool_icons/08_02_oil-round-hard.png
similarity index 100%
rename from krita/data/preset_icons/tool_icons/oil-round-hard.png
rename to krita/data/preset_icons/tool_icons/08_02_oil-round-hard.png
diff --git a/krita/data/preset_icons/tool_icons/sumi-e.png b/krita/data/preset_icons/tool_icons/08_03_sumi-e.png
similarity index 100%
rename from krita/data/preset_icons/tool_icons/sumi-e.png
rename to krita/data/preset_icons/tool_icons/08_03_sumi-e.png
diff --git a/krita/data/preset_icons/tool_icons/wide_brush_big.png b/krita/data/preset_icons/tool_icons/08_04_wide_brush_big.png
similarity index 100%
rename from krita/data/preset_icons/tool_icons/wide_brush_big.png
rename to krita/data/preset_icons/tool_icons/08_04_wide_brush_big.png
diff --git a/krita/data/preset_icons/tool_icons/blending-stump.png b/krita/data/preset_icons/tool_icons/09_01_blending-stump.png
similarity index 100%
rename from krita/data/preset_icons/tool_icons/blending-stump.png
rename to krita/data/preset_icons/tool_icons/09_01_blending-stump.png
diff --git a/krita/data/preset_icons/tool_icons/blur_soft.png b/krita/data/preset_icons/tool_icons/09_02_blur_soft.png
similarity index 100%
rename from krita/data/preset_icons/tool_icons/blur_soft.png
rename to krita/data/preset_icons/tool_icons/09_02_blur_soft.png
diff --git a/krita/data/preset_icons/tool_icons/knife.png b/krita/data/preset_icons/tool_icons/09_03_knife.png
similarity index 100%
rename from krita/data/preset_icons/tool_icons/knife.png
rename to krita/data/preset_icons/tool_icons/09_03_knife.png
diff --git a/krita/data/preset_icons/tool_icons/knife-rake.png b/krita/data/preset_icons/tool_icons/09_04_knife-rake.png
similarity index 100%
rename from krita/data/preset_icons/tool_icons/knife-rake.png
rename to krita/data/preset_icons/tool_icons/09_04_knife-rake.png
diff --git a/krita/data/preset_icons/tool_icons/paint-roller.png b/krita/data/preset_icons/tool_icons/09_05_paint-roller.png
similarity index 100%
rename from krita/data/preset_icons/tool_icons/paint-roller.png
rename to krita/data/preset_icons/tool_icons/09_05_paint-roller.png
diff --git a/krita/data/preset_icons/tool_icons/color-effect.png b/krita/data/preset_icons/tool_icons/10_01_color-effect.png
similarity index 100%
rename from krita/data/preset_icons/tool_icons/color-effect.png
rename to krita/data/preset_icons/tool_icons/10_01_color-effect.png
diff --git a/krita/data/preset_icons/tool_icons/adjustement-contrast.png b/krita/data/preset_icons/tool_icons/10_02_adjustement-contrast.png
similarity index 100%
rename from krita/data/preset_icons/tool_icons/adjustement-contrast.png
rename to krita/data/preset_icons/tool_icons/10_02_adjustement-contrast.png
diff --git a/krita/data/preset_icons/tool_icons/adjustement-dark.png b/krita/data/preset_icons/tool_icons/10_03_adjustement-dark.png
similarity index 100%
rename from krita/data/preset_icons/tool_icons/adjustement-dark.png
rename to krita/data/preset_icons/tool_icons/10_03_adjustement-dark.png
diff --git a/krita/data/preset_icons/tool_icons/filter.png b/krita/data/preset_icons/tool_icons/10_04_filter.png
similarity index 100%
rename from krita/data/preset_icons/tool_icons/filter.png
rename to krita/data/preset_icons/tool_icons/10_04_filter.png
diff --git a/krita/data/preset_icons/tool_icons/deform.png b/krita/data/preset_icons/tool_icons/10_05_deform.png
similarity index 100%
rename from krita/data/preset_icons/tool_icons/deform.png
rename to krita/data/preset_icons/tool_icons/10_05_deform.png
diff --git a/krita/data/preset_icons/tool_icons/clone.png b/krita/data/preset_icons/tool_icons/10_06_clone.png
similarity index 100%
rename from krita/data/preset_icons/tool_icons/clone.png
rename to krita/data/preset_icons/tool_icons/10_06_clone.png
diff --git a/krita/data/preset_icons/tool_icons/wand.png b/krita/data/preset_icons/tool_icons/11_01_wand.png
similarity index 100%
rename from krita/data/preset_icons/tool_icons/wand.png
rename to krita/data/preset_icons/tool_icons/11_01_wand.png
diff --git a/krita/data/preset_icons/tool_icons/shape.png b/krita/data/preset_icons/tool_icons/11_02_shape.png
similarity index 100%
rename from krita/data/preset_icons/tool_icons/shape.png
rename to krita/data/preset_icons/tool_icons/11_02_shape.png
diff --git a/krita/data/preset_icons/tool_icons/experimental.png b/krita/data/preset_icons/tool_icons/11_03_experimental.png
similarity index 100%
rename from krita/data/preset_icons/tool_icons/experimental.png
rename to krita/data/preset_icons/tool_icons/11_03_experimental.png
diff --git a/krita/data/preset_icons/tool_icons/stamp.png b/krita/data/preset_icons/tool_icons/11_03stamp.png
similarity index 100%
rename from krita/data/preset_icons/tool_icons/stamp.png
rename to krita/data/preset_icons/tool_icons/11_03stamp.png
diff --git a/krita/data/preset_icons/tool_icons/texture-indicator.png b/krita/data/preset_icons/tool_icons/11_04_texture-indicator.png
similarity index 100%
rename from krita/data/preset_icons/tool_icons/texture-indicator.png
rename to krita/data/preset_icons/tool_icons/11_04_texture-indicator.png
diff --git a/krita/data/preset_icons/tool_icons/screentone-indicator.png b/krita/data/preset_icons/tool_icons/11_05_screentone-indicator.png
similarity index 100%
rename from krita/data/preset_icons/tool_icons/screentone-indicator.png
rename to krita/data/preset_icons/tool_icons/11_05_screentone-indicator.png
diff --git a/krita/data/preset_icons/tool_icons/grid.png b/krita/data/preset_icons/tool_icons/11_06_grid.png
similarity index 100%
rename from krita/data/preset_icons/tool_icons/grid.png
rename to krita/data/preset_icons/tool_icons/11_06_grid.png
diff --git a/krita/data/preset_icons/tool_icons/12_01_Mechanical_Pencil.png b/krita/data/preset_icons/tool_icons/12_01_Mechanical_Pencil.png
new file mode 100644
index 0000000000..3388ab0621
Binary files /dev/null and b/krita/data/preset_icons/tool_icons/12_01_Mechanical_Pencil.png differ
diff --git a/krita/data/preset_icons/tool_icons/12_02_Fineliner.png b/krita/data/preset_icons/tool_icons/12_02_Fineliner.png
new file mode 100644
index 0000000000..0b5bf6693d
Binary files /dev/null and b/krita/data/preset_icons/tool_icons/12_02_Fineliner.png differ
diff --git a/krita/data/preset_icons/tool_icons/12_03_Marker_Permanent.png b/krita/data/preset_icons/tool_icons/12_03_Marker_Permanent.png
new file mode 100644
index 0000000000..55ff89f7b0
Binary files /dev/null and b/krita/data/preset_icons/tool_icons/12_03_Marker_Permanent.png differ
diff --git a/krita/data/preset_icons/tool_icons/12_04_PenBrush_01.png b/krita/data/preset_icons/tool_icons/12_04_PenBrush_01.png
new file mode 100644
index 0000000000..d8cc907ef9
Binary files /dev/null and b/krita/data/preset_icons/tool_icons/12_04_PenBrush_01.png differ
diff --git a/krita/data/preset_icons/tool_icons/12_05_Pen_01.png b/krita/data/preset_icons/tool_icons/12_05_Pen_01.png
new file mode 100644
index 0000000000..10b5c1ce60
Binary files /dev/null and b/krita/data/preset_icons/tool_icons/12_05_Pen_01.png differ
diff --git a/krita/data/preset_icons/tool_icons/12_06_Pen_02.png b/krita/data/preset_icons/tool_icons/12_06_Pen_02.png
new file mode 100644
index 0000000000..2efdbc6959
Binary files /dev/null and b/krita/data/preset_icons/tool_icons/12_06_Pen_02.png differ
diff --git a/krita/data/preset_icons/tool_icons/12_07_Pen_03.png b/krita/data/preset_icons/tool_icons/12_07_Pen_03.png
new file mode 100644
index 0000000000..030c19bdbc
Binary files /dev/null and b/krita/data/preset_icons/tool_icons/12_07_Pen_03.png differ
diff --git a/krita/data/preset_icons/tool_icons/12_08_Graphite_stick.png b/krita/data/preset_icons/tool_icons/12_08_Graphite_stick.png
new file mode 100644
index 0000000000..05112a6964
Binary files /dev/null and b/krita/data/preset_icons/tool_icons/12_08_Graphite_stick.png differ
diff --git a/krita/data/preset_icons/tool_icons/12_09_Pastel_Bar_01.png b/krita/data/preset_icons/tool_icons/12_09_Pastel_Bar_01.png
new file mode 100644
index 0000000000..72273d37be
Binary files /dev/null and b/krita/data/preset_icons/tool_icons/12_09_Pastel_Bar_01.png differ
diff --git a/krita/data/preset_icons/tool_icons/12_10_Pastel_Bar_04.png b/krita/data/preset_icons/tool_icons/12_10_Pastel_Bar_04.png
new file mode 100644
index 0000000000..5f58733f5a
Binary files /dev/null and b/krita/data/preset_icons/tool_icons/12_10_Pastel_Bar_04.png differ
diff --git a/krita/data/preset_icons/tool_icons/12_11_Pastel_Bar_02.png b/krita/data/preset_icons/tool_icons/12_11_Pastel_Bar_02.png
new file mode 100644
index 0000000000..b1ab53f790
Binary files /dev/null and b/krita/data/preset_icons/tool_icons/12_11_Pastel_Bar_02.png differ
diff --git a/krita/data/preset_icons/tool_icons/CMakeLists.txt b/krita/data/preset_icons/tool_icons/CMakeLists.txt
index 6c84fe2e4b..4655e9e67d 100644
--- a/krita/data/preset_icons/tool_icons/CMakeLists.txt
+++ b/krita/data/preset_icons/tool_icons/CMakeLists.txt
@@ -1,90 +1,102 @@
 ########### install files ###############
 
 install(FILES
-acrylic-angled.png
-acrylic-fan-used.png
-acrylic-flat-old.png
-acrylic-flat.png
-acrylic-mop.png
-acrylic-rounded-used.png
-adjustement-contrast.png
-adjustement-dark.png
-airbrush.png
-blending-stump.png
-blur_soft.png
-chalk-square.png
-charcoal-block.png
-charcoal-pencil-large.png
-charcoal-pencil-medium.png
-charcoal-pencil-thin.png
-clone.png
-colored-pencil.png
-color-effect.png
-deform.png
-eraser-hard.png
-eraser-kneaded.png
-eraser-large.png
-eraser-mechanical.png
-experimental.png
-filter.png
-gel-pen.png
-graphite.png
-grid.png
-ink-brush.png
-ink-G-pen.png
-inking_brush_blurry.png
-inking_brush.png
-inking_dynamic_pen.png
-inking_dynamic_pen_though.png
-inking_fine-line_medium.png
-inking_fine-line_tiny.png
-inking_pen_bumpy.png
-inking_pen_bumpy_though.png
-inking_pen_calligraphic.png
-ink-pen-atom.png
-ink-pen-glass.png
-knife.png
-knife-rake.png
-large-rounded-cut.png
-marker-large.png
-marker-old.png
-marker.png
-mechanical-pencil.png
-oil-filbert.png
-oil-flat-large.png
-oil-round-hard.png
-paint-roller.png
-pastel.png
-pencil-black-stone.png
-pencil-double-ring.png
-rigger-brush.png
-round_marker_detail.png
-screentone-indicator.png
-shape.png
-sketching_wide_47.png
-sketching_wide_bristles.png
-special-effect-used-brush.png
-stamp.png
-stylus-colored.png
-stylus-colored-ring.png
-stylus-experimental.png
-stylus.png
-stylus-white.png
-sumi-e.png
-synthetic-filbert.png
-synthetic-large-bright.png
-synthetic-large-bright-used.png
-synthetic-medium.png
-synthetic-thin.png
-synthetic-very-old.png
-technical-pen.png
-texture-indicator.png
-thin-stylus-tablet.png
-wand.png
-watercolor-brush-medium.png
-watercolor-flat.png
-wide_brush_big.png
-wide_brush_blurry.png
-wide_dull_round.png
+00_01_eraser-mechanical.png
+00_02_eraser-large.png
+00_03_eraser-hard.png
+00_04_eraser-kneaded.png
+01_01_mechanical-pencil.png
+01_01_pencil-black-stone.png
+01_02_pencil-double-ring.png
+01_04_graphite.png
+02_01_charcoal-pencil-thin.png
+02_02_charcoal-pencil-medium.png
+02_03_charcoal-pencil-large.png
+02_04_charcoal-block.png
+03_01colored-pencil.png
+03_02_chalk-square.png
+03_03_pastel.png
+04_01_technical-pen.png
+04_02_gel-pen.png
+04_03_inking_fine-line_tiny.png
+04_04_inking_fine-line_medium.png
+04_05_ink-pen-atom.png
+04_06_ink-G-pen.png
+04_07_inking_dynamic_pen.png
+04_08_inking_dynamic_pen_though.png
+04_09_inking_pen_bumpy.png
+04_10_inking_pen_bumpy_though.png
+04_11_inking_pen_calligraphic.png
+04_12_rigger-brush.png
+04_13_inking_brush.png
+04_14_inking_brush_blurry.png
+04_15_ink-brush.png
+04_16_large-rounded-cut.png
+04_17_ink-pen-glass.png
+05_01_airbrush.png
+05_02_thin-stylus-tablet.png
+05_03_stylus-white.png
+05_04_stylus.png
+05_05_stylus-colored-ring.png
+05_06_stylus-colored.png
+05_07_stylus-experimental.png
+06_01_marker.png
+06_02_marker-old.png
+06_03_marker-large.png
+06_04_round_marker_detail.png
+06_05_sketching_wide_47.png
+06_06_sketching_wide_bristles.png
+07_01_synthetic-thin.png
+07_02_synthetic-medium.png
+07_03_synthetic-filbert.png
+07_04_synthetic-large-bright.png
+07_05_synthetic-large-bright-used.png
+07_06_oil-filbert.png
+07_07_oil-flat-large.png
+07_08_acrylic-rounded-used.png
+07_09_acrylic-angled.png
+07_10_acrylic-flat.png
+07_11_acrylic-mop.png
+07_12_wide_dull_round.png
+07_13_wide_brush_blurry.png
+07_14_watercolor-flat.png
+07_15_acrylic-fan-used.png
+07_16_acrylic-flat-old.png
+07_17_synthetic-very-old.png
+07_18_special-effect-used-brush.png
+08_01_watercolor-brush-medium.png
+08_02_oil-round-hard.png
+08_03_sumi-e.png
+08_04_wide_brush_big.png
+09_01_blending-stump.png
+09_02_blur_soft.png
+09_03_knife.png
+09_04_knife-rake.png
+09_05_paint-roller.png
+10_01_color-effect.png
+10_02_adjustement-contrast.png
+10_03_adjustement-dark.png
+10_04_filter.png
+10_05_deform.png
+10_06_clone.png
+11_01_wand.png
+11_02_shape.png
+11_03_experimental.png
+11_03stamp.png
+11_04_texture-indicator.png
+11_05_screentone-indicator.png
+11_06_grid.png
+12_01_Mechanical_Pencil.png
+12_02_Fineliner.png
+12_03_Marker_Permanent.png
+12_04_PenBrush_01.png
+12_05_Pen_01.png
+12_06_Pen_02.png
+12_07_Pen_03.png
+12_08_Graphite_stick.png
+12_09_Pastel_Bar_01.png
+12_10_Pastel_Bar_04.png
+12_11_Pastel_Bar_02.png
+
     DESTINATION ${DATA_INSTALL_DIR}/krita/preset_icons/tool_icons)