diff --git a/krita/data/brushes/A_bamboo-leaves.gih b/krita/data/brushes/A_bamboo-leaves.gih
deleted file mode 100644
index 58e85fe54f..0000000000
Binary files a/krita/data/brushes/A_bamboo-leaves.gih and /dev/null differ
diff --git a/krita/data/brushes/A_distant-mountain.gih b/krita/data/brushes/A_distant-mountain.gih
deleted file mode 100644
index 320f3ed222..0000000000
Binary files a/krita/data/brushes/A_distant-mountain.gih and /dev/null differ
diff --git a/krita/data/brushes/A_eroded-cercle-anim.gih b/krita/data/brushes/A_eroded-cercle-anim.gih
deleted file mode 100644
index b28e28a479..0000000000
Binary files a/krita/data/brushes/A_eroded-cercle-anim.gih and /dev/null differ
diff --git a/krita/data/brushes/A_eroded_circle.gih b/krita/data/brushes/A_eroded_circle.gih
deleted file mode 100644
index 6e5fb3c3c3..0000000000
Binary files a/krita/data/brushes/A_eroded_circle.gih and /dev/null differ
diff --git a/krita/data/brushes/A_grass-floor.gih b/krita/data/brushes/A_grass-floor.gih
deleted file mode 100644
index 83898447f6..0000000000
Binary files a/krita/data/brushes/A_grass-floor.gih and /dev/null differ
diff --git a/krita/data/brushes/A_pin.gih b/krita/data/brushes/A_pin.gih
deleted file mode 100644
index b5de820a3d..0000000000
Binary files a/krita/data/brushes/A_pin.gih and /dev/null differ
diff --git a/krita/data/brushes/A_smoke.gbr b/krita/data/brushes/A_smoke.gbr
deleted file mode 100644
index e4425b289e..0000000000
Binary files a/krita/data/brushes/A_smoke.gbr and /dev/null differ
diff --git a/krita/data/brushes/A_snow-pack.gih b/krita/data/brushes/A_snow-pack.gih
deleted file mode 100644
index c8a280e88a..0000000000
Binary files a/krita/data/brushes/A_snow-pack.gih and /dev/null differ
diff --git a/krita/data/brushes/A_sparkle1.gbr b/krita/data/brushes/A_sparkle1.gbr
deleted file mode 100644
index 1e57a0b8e0..0000000000
Binary files a/krita/data/brushes/A_sparkle1.gbr and /dev/null differ
diff --git a/krita/data/brushes/A_sparkle2.gbr b/krita/data/brushes/A_sparkle2.gbr
deleted file mode 100644
index 3bcbcc456e..0000000000
Binary files a/krita/data/brushes/A_sparkle2.gbr and /dev/null differ
diff --git a/krita/data/brushes/A_sparkle3.gbr b/krita/data/brushes/A_sparkle3.gbr
deleted file mode 100644
index fc6c0cb667..0000000000
Binary files a/krita/data/brushes/A_sparkle3.gbr and /dev/null differ
diff --git a/krita/data/brushes/A_splat2.gih b/krita/data/brushes/A_splat2.gih
deleted file mode 100644
index 3a94572e23..0000000000
Binary files a/krita/data/brushes/A_splat2.gih and /dev/null differ
diff --git a/krita/data/brushes/A_starfield2.gbr b/krita/data/brushes/A_starfield2.gbr
deleted file mode 100644
index 4f7f1dcf47..0000000000
Binary files a/krita/data/brushes/A_starfield2.gbr and /dev/null differ
diff --git a/krita/data/brushes/A_wall-texture.gih b/krita/data/brushes/A_wall-texture.gih
deleted file mode 100644
index 863e3592e9..0000000000
Binary files a/krita/data/brushes/A_wall-texture.gih and /dev/null differ
diff --git a/krita/data/brushes/CMakeLists.txt b/krita/data/brushes/CMakeLists.txt
index 9ec77a292a..2687af71bf 100644
--- a/krita/data/brushes/CMakeLists.txt
+++ b/krita/data/brushes/CMakeLists.txt
@@ -1,50 +1,47 @@
 install( FILES
-3_brush.png
-3_dotted-flat.png
-3_eroded.gih
-3_splat.png
-3_texture.png
-A_bamboo-leaves.gih
-A_distant-mountain.gih
-A_eroded-cercle-anim.gih
-A_eroded_circle.gih
-A_grass-floor.gih
-A_pin.gih
-A_smoke.gbr
-A_snow-pack.gih
-A_sparkle1.gbr
-A_sparkle2.gbr
-A_sparkle3.gbr
-A_splat2.gih
-A_starfield2.gbr
-A_wall-texture.gih
-chalk.gbr
-chalk_sparse.gbr
-abominable_snowman.gbr
-chisel_smear.gbr
-Flat_textured1.gih
-freckles.gbr
-knife3.gbr
+abominable_snowman.png
+bamboo_leaves_random.gih
+brick.gih
+bristles_chisel_dense.png
+bristles_circle_dense.png
+bristles_circle_medium.png
+bristles_circle_random.gih
+bristles_circle_sparse.png
+bristles_circle_variable.svg
+chalk_chisel.gih
+chalk_chisel_random.gih
+chalk.png
+chalk_round_hard.png
+chalk_sparse.png
+chisel_bent_rough.gih
+chisel_dense_smear.png
+chisel_knife.svg
+circle_hard_eroded.gih
+freckles.png
+graphite_grain.gih
+grass.gih
+grass_patch.gih
+hearts.gih
+leaves.png
 leaves-scattered.svg
-MZ_leaves.gbr
-N_Grass_2.gih
-oil_bristle.gbr
-oil_knife.gbr
-P_Graphite_Pencil_grain.gih
-round_textured1.gbr
-R_Rake2.gbr
-R_Rake4.gbr
-reptile.gbr
+mountains_distant.gih
+oil_bristle.png
+oil_knife.png
+paint_splats.gih
+rake_dense.png
+rake_sparse.png
 rock_light.gih
 rock_pitted.gih
 rock_scraped.gih
-S_splats_02.gih
+scales.png
 scratches_rough.gih
-scribbles.gbr
-spines.gbr
-smear_paint.gbr
-water_still.gih
-w_hearts.gih
+scribbles.png
+smear_paint.png
+smoke.png
+snow.gih
+spines.png
+square_rough.png
+starfield.png
 watercolor.gih
-z_study_pencil_2H.gih
+water_still.gih
 DESTINATION  ${DATA_INSTALL_DIR}/krita/brushes)
diff --git a/krita/data/brushes/Flat_textured1.gih b/krita/data/brushes/Flat_textured1.gih
deleted file mode 100644
index 162fc0ea7e..0000000000
Binary files a/krita/data/brushes/Flat_textured1.gih and /dev/null differ
diff --git a/krita/data/brushes/MZ_leaves.gbr b/krita/data/brushes/MZ_leaves.gbr
deleted file mode 100644
index a0623743cd..0000000000
Binary files a/krita/data/brushes/MZ_leaves.gbr and /dev/null differ
diff --git a/krita/data/brushes/N_Grass_2.gih b/krita/data/brushes/N_Grass_2.gih
deleted file mode 100644
index 7714eec661..0000000000
Binary files a/krita/data/brushes/N_Grass_2.gih and /dev/null differ
diff --git a/krita/data/brushes/P_Graphite_Pencil_grain.gih b/krita/data/brushes/P_Graphite_Pencil_grain.gih
deleted file mode 100644
index 2ac0de1121..0000000000
Binary files a/krita/data/brushes/P_Graphite_Pencil_grain.gih and /dev/null differ
diff --git a/krita/data/brushes/R_Rake2.gbr b/krita/data/brushes/R_Rake2.gbr
deleted file mode 100644
index 72b154e38d..0000000000
Binary files a/krita/data/brushes/R_Rake2.gbr and /dev/null differ
diff --git a/krita/data/brushes/R_Rake4.gbr b/krita/data/brushes/R_Rake4.gbr
deleted file mode 100644
index c6e835faaf..0000000000
Binary files a/krita/data/brushes/R_Rake4.gbr and /dev/null differ
diff --git a/krita/data/brushes/S_splats_02.gih b/krita/data/brushes/S_splats_02.gih
deleted file mode 100644
index 6294cd6d0d..0000000000
Binary files a/krita/data/brushes/S_splats_02.gih and /dev/null differ
diff --git a/krita/data/brushes/abominable_snowman.gbr b/krita/data/brushes/abominable_snowman.gbr
deleted file mode 100644
index 1f9a1dc145..0000000000
Binary files a/krita/data/brushes/abominable_snowman.gbr and /dev/null differ
diff --git a/krita/data/brushes/abominable_snowman.png b/krita/data/brushes/abominable_snowman.png
new file mode 100644
index 0000000000..359dc30405
Binary files /dev/null and b/krita/data/brushes/abominable_snowman.png differ
diff --git a/krita/data/brushes/bamboo_leaves_random.gih b/krita/data/brushes/bamboo_leaves_random.gih
new file mode 100644
index 0000000000..e4326c9d7a
Binary files /dev/null and b/krita/data/brushes/bamboo_leaves_random.gih differ
diff --git a/krita/data/brushes/brick.gih b/krita/data/brushes/brick.gih
new file mode 100644
index 0000000000..7ecb874ec8
Binary files /dev/null and b/krita/data/brushes/brick.gih differ
diff --git a/krita/data/brushes/3_dotted-flat.png b/krita/data/brushes/bristles_chisel_dense.png
similarity index 100%
rename from krita/data/brushes/3_dotted-flat.png
rename to krita/data/brushes/bristles_chisel_dense.png
diff --git a/krita/data/brushes/3_brush.png b/krita/data/brushes/bristles_circle_dense.png
similarity index 100%
rename from krita/data/brushes/3_brush.png
rename to krita/data/brushes/bristles_circle_dense.png
diff --git a/krita/data/brushes/bristles_circle_medium.png b/krita/data/brushes/bristles_circle_medium.png
new file mode 100644
index 0000000000..87f7bd3374
Binary files /dev/null and b/krita/data/brushes/bristles_circle_medium.png differ
diff --git a/krita/data/brushes/3_eroded.gih b/krita/data/brushes/bristles_circle_random.gih
old mode 100755
new mode 100644
similarity index 50%
copy from krita/data/brushes/3_eroded.gih
copy to krita/data/brushes/bristles_circle_random.gih
index d9bc5b4140..84988a21b4
Binary files a/krita/data/brushes/3_eroded.gih and b/krita/data/brushes/bristles_circle_random.gih differ
diff --git a/krita/data/brushes/3_splat.png b/krita/data/brushes/bristles_circle_sparse.png
similarity index 100%
rename from krita/data/brushes/3_splat.png
rename to krita/data/brushes/bristles_circle_sparse.png
diff --git a/krita/data/brushes/bristles_circle_variable.svg b/krita/data/brushes/bristles_circle_variable.svg
new file mode 100644
index 0000000000..7f51a720e2
--- /dev/null
+++ b/krita/data/brushes/bristles_circle_variable.svg
@@ -0,0 +1,63 @@
+<?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:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="1000"
+   height="1000"
+   viewBox="0 0 1000 1000"
+   id="svg2"
+   version="1.1"
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="bristles_circle_variable.svg">
+  <defs
+     id="defs4" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="0.35"
+     inkscape:cx="6.0738625"
+     inkscape:cy="515.71429"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     units="px"
+     inkscape:window-width="1600"
+     inkscape:window-height="871"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="1" />
+  <metadata
+     id="metadata7">
+    <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></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,-52.362161)">
+    <path
+       style="fill:#000000"
+       d="m 520.23907,1016.3028 c -16.29932,-23.27066 -2.70743,-49.12523 25.82548,-49.12523 27.28965,0 42.10222,37.21293 20.76223,52.16003 -15.14939,10.6111 -38.07584,9.1176 -46.58771,-3.0348 z M 672.678,927.54927 c -17.76107,-6.34765 -24.01711,-31.42415 -11.06975,-44.37153 10.63171,-10.63169 32.01275,-9.06259 40.43913,2.96771 9.73476,13.89834 8.94479,20.34166 -4.09251,33.37892 -11.52131,11.52135 -13.62493,12.18921 -25.27687,8.0249 z M 291.56416,912.26084 c -10.95621,-4.07395 -29.11784,-25.42529 -29.11784,-34.23176 0,-3.23004 5.31023,-12.18367 11.80056,-19.89688 22.27401,-26.47129 61.12956,-14.16098 61.12956,19.36731 0,23.05155 -24.02986,42.1172 -43.81228,34.76133 z M 478.8728,883.33728 c -19.27443,-8.39834 -41.91402,-35.69329 -47.83059,-57.66575 -10.52302,-39.07955 20.9691,-94.68685 58.0561,-102.51275 6.95747,-1.46812 16.38528,-3.41746 20.95074,-4.33186 25.40591,-5.08847 69.50983,21.50685 84.67239,51.05876 6.89272,13.43394 7.23885,50.34394 0.63189,67.38518 -6.41648,16.54989 -25.35975,37.2428 -42.09989,45.98826 -15.33335,8.0105 -56.07767,8.05329 -74.38064,0.078 z m 214.23204,-86.60445 c -19.31776,-8.41727 -42.20477,-36.03293 -45.81591,-55.28186 -6.39901,-34.10972 21.94928,-76.36673 59.55739,-88.77851 21.922,-7.23494 50.89289,3.23691 70.39038,25.44334 16.58083,18.88452 20.40501,32.07784 17.29518,59.6682 -5.56174,49.34326 -56.08354,78.70626 -101.42704,58.94883 z m -431.12398,-72.3665 c -53.7155,-35.8843 -29.66942,-117.2469 34.65139,-117.2469 49.62483,0 80.71221,57.17681 54.0026,99.32282 -17.70228,27.93276 -60.66838,36.61965 -88.65399,17.92408 z m 612.73978,-46.55875 c -14.55027,-10.19139 -19.87604,-29.7537 -12.72835,-46.753 16.59651,-39.47154 75.05721,-27.96368 75.05721,14.77485 0,31.51258 -36.36016,50.16736 -62.32886,31.97815 z M 59.402316,664.26912 C 53.248963,658.11564 48.21422,651.07014 48.21422,648.61239 c 0,-13.34674 10.738082,-28.97466 23.63461,-34.39724 18.206756,-7.65538 33.43794,-1.78245 42.91715,16.54825 5.79649,11.20922 5.77523,14.40606 -0.17316,25.909 -11.43253,22.10802 -37.140534,25.64663 -55.190504,7.59672 z M 478.31113,620.78926 c -32.63031,-7.37009 -59.86962,-33.7525 -67.26976,-65.15367 -4.53823,-19.25706 5.03244,-47.30979 22.88081,-67.06568 50.22261,-55.59045 143.21086,-21.08856 142.96011,53.04313 -0.17276,51.09029 -49.06074,90.35899 -98.57116,79.17622 z m 214.11473,-35.7609 c -33.43643,-11.63262 -53.65598,-28.78486 -67.64998,-57.38758 -16.62742,-33.98524 -18.75338,-55.50634 -8.66095,-87.67458 11.04435,-35.20225 39.99486,-64.75764 74.17945,-75.72944 30.28668,-9.7207 39.18223,-9.77611 68.13821,-0.42437 59.26754,19.1413 93.57822,82.67446 76.20472,141.10863 -19.17026,64.47761 -83.30104,100.6023 -142.21145,80.10735 z m -460.0875,-37.8369 c -34.0039,-7.62411 -74.77744,-54.8173 -74.70356,-86.46552 0.1499,-63.98032 60.18824,-113.765 119.91743,-99.43619 33.10158,7.94092 63.92632,39.26381 70.97251,72.11949 14.85062,69.24569 -46.56636,129.3918 -116.18638,113.78222 z M 465.28305,402.37458 c -50.26192,-8.82932 -90.6139,-44.76098 -106.7887,-95.09087 -12.56568,-39.09929 -11.05227,-61.36237 6.88818,-101.33933 18.79015,-41.87007 51.12187,-66.94491 100.59527,-78.01656 49.39173,-11.0534 113.57387,19.72059 139.31085,66.7967 19.47483,35.62179 24.19318,66.14404 15.60498,100.9458 -18.06742,73.21437 -84.99676,119.10868 -155.61058,106.70426 z m 217.87203,-91.11236 c -50.94303,-32.00706 -28.94252,-114.40855 30.54608,-114.40855 40.76254,0 74.22012,45.91897 59.44603,81.5868 -14.94342,36.07658 -59.15007,52.19955 -89.99211,32.82175 z M 139.02621,197.20429 c -8.03219,-8.03218 -13.32376,-18.12793 -13.32376,-25.42033 0,-17.25065 22.72954,-38.7441 40.97225,-38.7441 19.18021,0 30.4402,6.63409 38.84454,22.88644 20.72619,40.08012 -33.8257,73.94528 -66.49303,41.27799 z m 602.81825,-38.24896 c -21.63301,-23.02731 -5.26942,-57.82238 27.19302,-57.82238 31.70919,0 47.82645,37.27674 25.27671,58.46115 -14.45661,13.58128 -39.39587,13.27768 -52.46973,-0.63877 z M 298.56079,133.39049 c -26.39297,-26.39298 -10.44776,-64.164454 27.08696,-64.164454 14.54256,0 20.31947,2.715411 29.83508,14.024118 34.37254,40.849426 -19.10602,87.956436 -56.92204,50.140336 z"
+       id="path4147"
+       inkscape:connector-curvature="0" />
+  </g>
+</svg>
diff --git a/krita/data/brushes/chalk.gbr b/krita/data/brushes/chalk.gbr
deleted file mode 100644
index afbd0b14fa..0000000000
Binary files a/krita/data/brushes/chalk.gbr and /dev/null differ
diff --git a/krita/data/brushes/chalk.png b/krita/data/brushes/chalk.png
new file mode 100644
index 0000000000..dd288e5200
Binary files /dev/null and b/krita/data/brushes/chalk.png differ
diff --git a/krita/data/brushes/chalk_chisel.gih b/krita/data/brushes/chalk_chisel.gih
new file mode 100644
index 0000000000..c140dcee48
Binary files /dev/null and b/krita/data/brushes/chalk_chisel.gih differ
diff --git a/krita/data/brushes/3_eroded.gih b/krita/data/brushes/chalk_chisel_random.gih
old mode 100755
new mode 100644
similarity index 99%
rename from krita/data/brushes/3_eroded.gih
rename to krita/data/brushes/chalk_chisel_random.gih
index d9bc5b4140..ea1bbdd8b8
Binary files a/krita/data/brushes/3_eroded.gih and b/krita/data/brushes/chalk_chisel_random.gih differ
diff --git a/krita/data/brushes/chalk_round_hard.png b/krita/data/brushes/chalk_round_hard.png
new file mode 100644
index 0000000000..6b769b59a0
Binary files /dev/null and b/krita/data/brushes/chalk_round_hard.png differ
diff --git a/krita/data/brushes/chalk_sparse.gbr b/krita/data/brushes/chalk_sparse.gbr
deleted file mode 100644
index 67e2d71a56..0000000000
Binary files a/krita/data/brushes/chalk_sparse.gbr and /dev/null differ
diff --git a/krita/data/brushes/chalk_sparse.png b/krita/data/brushes/chalk_sparse.png
new file mode 100644
index 0000000000..3331a0d8e7
Binary files /dev/null and b/krita/data/brushes/chalk_sparse.png differ
diff --git a/krita/data/brushes/chisel_bent_rough.gih b/krita/data/brushes/chisel_bent_rough.gih
new file mode 100644
index 0000000000..13376ead83
Binary files /dev/null and b/krita/data/brushes/chisel_bent_rough.gih differ
diff --git a/krita/data/brushes/chisel_dense_smear.png b/krita/data/brushes/chisel_dense_smear.png
new file mode 100644
index 0000000000..e4091f234a
Binary files /dev/null and b/krita/data/brushes/chisel_dense_smear.png differ
diff --git a/krita/data/brushes/chisel_knife.svg b/krita/data/brushes/chisel_knife.svg
new file mode 100644
index 0000000000..40351cbd3f
--- /dev/null
+++ b/krita/data/brushes/chisel_knife.svg
@@ -0,0 +1,63 @@
+<?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:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="1000"
+   height="1000"
+   viewBox="0 0 1000 1000"
+   id="svg2"
+   version="1.1"
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="chisel_knife.svg">
+  <defs
+     id="defs4" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="0.35"
+     inkscape:cx="417.50243"
+     inkscape:cy="561.42857"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     units="px"
+     inkscape:window-width="1600"
+     inkscape:window-height="871"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="1" />
+  <metadata
+     id="metadata7">
+    <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></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,-52.362161)">
+    <path
+       style="fill:#000000"
+       d="m 483.81554,1004.1673 c -5.2839,-2.8275 -10.6658,-6.73276 -11.9599,-8.67837 -4.8175,-7.2434 -2.2449,-17.34646 5.7511,-22.58562 11.1356,-7.29637 8.8732,-14.19773 -7.8634,-23.98606 -19.8364,-11.6013 -21.7211,-15.67623 -16.5613,-35.80873 4.2527,-16.59301 4.2017,-16.88254 -4.1465,-23.53914 -14.2914,-11.39561 -9.0084,-28.19081 10.1855,-32.38059 15.0696,-3.28948 16.5886,-4.2239 16.5886,-10.2047 0,-13.69165 -18.771,-17.83579 -40.2111,-8.87755 -24.7588,10.34491 -26.5025,-1.29901 -5.9006,-39.40203 14.5142,-26.84376 14.6591,-27.40591 9.728,-37.74649 -5.4473,-11.42322 -15.1248,-17.66158 -46.5417,-30.00215 -26.6441,-10.4658 -30.7852,-16.79521 -18.1642,-27.76317 9.5585,-8.30659 17.4925,-8.77014 43.4468,-2.5384 5.4899,1.31813 11.5288,-0.44404 19.2143,-5.60682 15.8747,-10.66381 16.1232,-20.38745 0.9565,-37.42761 -10.7093,-12.03211 -14.2725,-13.92264 -29.778,-15.79894 -14.6463,-1.77236 -17.7754,-3.26829 -18.5767,-8.88072 -1.0387,-7.27578 5.1178,-10.73643 30.7546,-17.28764 15.5885,-3.9835 26.2507,-13.00688 26.2507,-22.21597 0,-6.86933 -11.248,-16.19348 -19.5347,-16.19348 -2.9151,0 -7.1247,-2.1985 -9.3548,-4.88555 -3.3175,-3.99728 -2.9652,-6.9084 1.9373,-16.01191 5.8544,-10.87083 5.8544,-11.38187 0,-22.2527 -4.9025,-9.10351 -5.2548,-12.01463 -1.9373,-16.01191 2.2301,-2.68705 6.4397,-4.88555 9.3548,-4.88555 8.2867,0 19.5347,-9.32415 19.5347,-16.19348 0,-9.20909 -10.6622,-18.23247 -26.2507,-22.21597 -25.6368,-6.55121 -31.7933,-10.01186 -30.7546,-17.28764 0.8013,-5.61243 3.9304,-7.10836 18.5767,-8.88072 15.5055,-1.8763 19.0687,-3.76683 29.778,-15.79894 15.1667,-17.04016 14.9182,-26.7638 -0.9565,-37.42761 -7.6855,-5.16278 -13.7244,-6.92495 -19.2143,-5.60682 -25.9543,6.23174 -33.8883,5.76819 -43.4468,-2.5384 -12.621,-10.96795 -8.4799,-17.29736 18.1642,-27.76317 31.4169,-12.34057 41.0944,-18.57894 46.5417,-30.00215 4.9311,-10.34056 4.7862,-10.90274 -9.728,-37.74648 -20.6019,-38.10304 -18.8582,-49.74694 5.9006,-39.40205 21.4401,8.95825 40.2111,4.8141 40.2111,-8.87755 0,-5.98078 -1.519,-6.9152 -16.5886,-10.20469 -19.1939,-4.18978 -24.4769,-20.985 -10.1855,-32.3806 8.3482,-6.65661 8.3992,-6.9461 4.1465,-23.53913 -5.1598,-20.13251 -3.2751,-24.20744 16.5613,-35.80874 16.7366,-9.78833 18.999,-16.68968 7.8634,-23.98605 -7.9983,-5.24068 -10.5648,-15.32832 -5.7511,-22.604285 3.5174,-5.316404 21.9057,-14.056955 29.573,-14.056955 7.6673,0 26.0557,8.740551 29.573,14.056955 4.8138,7.275965 2.2473,17.363605 -5.751,22.604285 -11.1356,7.29637 -8.8732,14.19772 7.8634,23.98605 19.83644,11.6013 21.72107,15.67623 16.56127,35.80874 -4.25267,16.59303 -4.20169,16.88252 4.14651,23.53913 14.29145,11.3956 9.00842,28.19082 -10.18553,32.3806 -15.06955,3.28949 -16.58855,4.22391 -16.58855,10.20469 0,13.69165 18.77097,17.8358 40.21107,8.87755 24.75883,-10.34489 26.50252,1.29901 5.90058,39.40205 -14.51415,26.84374 -14.65902,27.40592 -9.72797,37.74648 5.44735,11.42321 15.12482,17.66158 46.54174,30.00215 26.6441,10.46581 30.78516,16.79522 18.1642,27.76317 -9.5585,8.30659 -17.49253,8.77014 -43.44687,2.5384 -5.48984,-1.31813 -11.52873,0.44404 -19.21428,5.60682 -15.87472,10.66381 -16.12319,20.38745 -0.95652,37.42761 10.70931,12.03211 14.27253,13.92264 29.77804,15.79894 14.64625,1.77236 17.7754,3.26829 18.57666,8.88072 1.03873,7.27578 -5.11775,10.73643 -30.75451,17.28764 -15.58855,3.9835 -26.25072,13.00688 -26.25072,22.21597 0,6.86933 11.24801,16.19348 19.53472,16.19348 2.91506,0 7.12469,2.1985 9.35473,4.88555 3.31747,3.99728 2.96524,6.9084 -1.93731,16.01191 -5.85434,10.87083 -5.85434,11.38187 0,22.2527 4.90255,9.10351 5.25478,12.01463 1.93731,16.01191 -2.23004,2.68705 -6.43967,4.88555 -9.35473,4.88555 -8.28671,0 -19.53472,9.32415 -19.53472,16.19348 0,9.20909 10.66217,18.23247 26.25072,22.21597 25.63676,6.55121 31.79324,10.01186 30.75451,17.28764 -0.80126,5.61243 -3.93041,7.10836 -18.57666,8.88072 -15.50551,1.8763 -19.06873,3.76683 -29.77804,15.79894 -15.16667,17.04016 -14.9182,26.7638 0.95652,37.42761 7.68555,5.16278 13.72444,6.92495 19.21428,5.60682 25.95434,-6.23174 33.88837,-5.76819 43.44687,2.5384 12.62096,10.96796 8.4799,17.29737 -18.1642,27.76317 -31.41692,12.34057 -41.09439,18.57893 -46.54174,30.00215 -4.93105,10.34058 -4.78618,10.90273 9.72797,37.74649 20.60194,38.10302 18.85825,49.74694 -5.90058,39.40203 -21.4401,-8.95824 -40.21107,-4.8141 -40.21107,8.87755 0,5.9808 1.519,6.91522 16.58855,10.2047 19.19395,4.18978 24.47698,20.98498 10.18553,32.38059 -8.3482,6.6566 -8.39918,6.94613 -4.14651,23.53914 5.1598,20.1325 3.27517,24.20743 -16.56127,35.80873 -16.7366,9.78833 -18.999,16.68969 -7.8634,23.98606 7.9983,5.24066 10.5648,15.32832 5.751,22.60429 -3.6967,5.5875 -22.0972,14.0701 -30.2145,13.9287 -4.0504,-0.07 -11.6876,-2.4416 -16.9716,-5.269 z m -99.4193,-28.0822 c -9.2227,-9.22267 -9.2812,-9.72394 -3.1618,-27.06816 4.3894,-12.44096 4.284,-13.73165 -1.6012,-19.61692 -3.4649,-3.46488 -9.1141,-6.29976 -12.5539,-6.29976 -25.0741,0 -34.3363,-24.09218 -12.2256,-31.80002 22.1693,-7.72828 37.5074,-1.72439 45.7027,17.88975 2.5923,6.20422 8.3356,15.58538 12.763,20.84698 6.244,7.42066 8.0497,13.15045 8.0497,25.54335 0,22.009 -4.0047,28.36518 -17.8713,28.36518 -7.6653,0 -13.7417,-2.50045 -19.1016,-7.8604 z m 200.40701,1.66617 c -1.82328,-3.40683 -3.31504,-13.38375 -3.31504,-22.17095 0,-12.3929 1.80569,-18.12269 8.04976,-25.54335 4.42736,-5.2616 10.1707,-14.64276 12.76299,-20.84698 8.19531,-19.61414 23.53334,-25.61803 45.70262,-17.88975 22.11081,7.70784 12.84853,31.80002 -12.22557,31.80002 -3.43974,0 -9.08896,2.83488 -12.55384,6.29976 -5.88527,5.88527 -5.9906,7.17596 -1.60119,19.61692 6.1194,17.34422 6.06086,17.84549 -3.16184,27.06816 -9.98515,9.98518 -28.7096,10.91208 -33.65789,1.66617 z m -304.12081,-115.19 c -8.8261,-12.3951 -8.5198,-14.2 4.9382,-29.09639 14.0701,-15.57388 13.1107,-24.90514 -3.4793,-33.83943 -14.8943,-8.02113 -14.4435,-15.68798 1.3979,-23.76964 22.2791,-11.36595 38.8482,-7.53414 44.6162,10.31807 4.0575,12.55785 1.4143,25.54918 -10.9376,53.75879 -15.0146,34.29052 -24.1864,39.97119 -36.5354,22.6286 z m 418.75952,3.69673 c -6.15892,-7.29816 -22.14236,-43.88139 -25.49307,-58.34914 -3.16981,-13.68669 1.72557,-30.88386 10.06143,-35.3451 9.20521,-4.92644 21.43303,-3.78636 35.30785,3.29205 15.84132,8.08166 16.29218,15.74851 1.39781,23.76964 -16.58993,8.93429 -17.54937,18.26555 -3.47929,33.83943 13.45801,14.89639 13.76431,16.70129 4.93823,29.09639 -7.51749,10.55732 -15.80583,11.90514 -22.73296,3.69673 z m -346.39022,-6.13791 c -6.0632,-6.06316 3.7043,-40.56728 12.4319,-43.91639 13.4173,-5.14873 19.9006,27.59578 7.8498,39.64656 -6.3354,6.3354 -16.15,8.40164 -20.2817,4.26983 z m 276.6691,-4.07291 c -12.28065,-12.28065 -5.90606,-45.04652 7.74467,-39.80826 5.94752,2.28228 15.3321,27.03322 13.95146,36.79559 -1.42509,10.07667 -13.02184,11.68696 -21.69613,3.01267 z m -258.1722,-63.5794 c -26.5253,-17.14408 -36.4012,-33.19531 -25.825,-41.97281 6.9252,-5.74741 19.417,0.72006 40.8177,21.13283 13.2064,12.59683 18.8078,20.2477 18.1565,24.79998 -1.5251,10.6605 -12.5699,9.34109 -33.1492,-3.96 z m 228.08641,10.00946 c -5.45891,-5.45888 -0.64746,-14.32086 16.82223,-30.9841 21.2682,-20.28644 33.76241,-26.73626 40.67642,-20.99817 10.54781,8.7539 0.70686,24.82448 -25.62212,41.84174 -18.26597,11.80586 -27.32832,14.68877 -31.87653,10.14053 z M 261.31504,728.55066 c -22.1339,-11.12152 -25.2291,-35.58508 -5.6874,-44.95118 7.3088,-3.50299 10.1861,-3.34073 18.6841,1.05374 12.4531,6.43979 21.9454,4.27931 36.2046,-8.2404 16.1811,-14.2072 29.4586,-18.10828 37.3441,-10.97206 8.1588,7.38357 7.9441,16.16722 -0.565,23.11645 -3.7531,3.06503 -13.4735,11.20689 -21.6009,18.09297 -13.6401,11.55669 -42.5145,27.41158 -50.0337,27.47336 -1.7613,0.016 -8.2169,-2.49335 -14.3458,-5.57288 z m 446.65207,-1.83996 c -8.81487,-4.14718 -22.6768,-13.17444 -30.80425,-20.06052 -8.12745,-6.88608 -17.84786,-15.02794 -21.60092,-18.09297 -8.50908,-6.94923 -8.72377,-15.73288 -0.565,-23.11645 7.88545,-7.13622 21.16297,-3.23514 37.34412,10.97206 14.16407,12.43622 23.76157,14.67494 35.93177,8.3815 26.93664,-13.92946 44.66374,22.07161 19.73919,40.08727 -13.23336,9.56519 -22.68432,9.99688 -40.04491,1.82911 z M 282.24714,640.57818 c -2.7418,-3.9145 -4.9851,-8.82615 -4.9851,-10.91477 0,-7.28741 29.8424,-40.36419 40.3954,-44.77352 22.7851,-9.5202 46.0689,-2.05714 46.0689,14.76628 0,7.7431 -2.2256,9.77021 -17.5606,15.99419 -9.6583,3.92001 -23.9299,12.73382 -31.7146,19.58621 -16.0723,14.14739 -24.9991,15.62807 -32.204,5.34161 z m 405.73362,-5.44616 c -7.4782,-6.76545 -21.52864,-15.52015 -31.22321,-19.45488 -15.40054,-6.25064 -17.62648,-8.27384 -17.62648,-16.02097 0,-16.82342 23.28377,-24.28648 46.06887,-14.76628 10.55297,4.40933 40.39541,37.48611 40.39541,44.77352 0,7.41668 -10.07587,18.03011 -16.99407,17.90076 -3.8631,-0.0724 -13.14232,-5.66671 -20.62052,-12.43215 z M 231.44804,572.60258 c -3.9359,-3.93582 -4.2019,-6.99576 -1.4014,-16.12059 2.4739,-8.06068 2.4739,-14.46468 0,-22.52536 -4.2153,-13.73479 1.8633,-22.41199 13.1272,-18.73902 3.7774,1.23173 18.0049,1.93373 31.6168,1.55995 34.9831,-0.96059 37.6976,1.08743 37.6976,28.44175 0,27.35432 -2.7145,29.40234 -37.6976,28.44175 -13.6119,-0.37378 -27.8394,0.32822 -31.6168,1.55995 -4.4034,1.43588 -8.6111,0.4963 -11.7258,-2.61843 z m 528.29898,2.49856 c -1.1781,-1.17809 -14.40278,-1.85587 -29.38819,-1.5062 -37.61357,0.8777 -39.98967,-0.80832 -39.98967,-28.37563 0,-27.35432 2.7145,-29.40234 37.69763,-28.44175 13.61185,0.37378 27.83935,-0.32822 31.61672,-1.55995 11.2639,-3.67297 17.34253,5.00423 13.1272,18.73902 -2.4739,8.06068 -2.4739,14.46468 0,22.52536 2.78204,9.06475 2.52979,12.18944 -1.29264,16.0119 -5.1842,5.18418 -8.46697,5.91131 -11.77105,2.60725 z M 316.95034,505.41186 c -10.0934,-4.39364 -39.6883,-37.67842 -39.6883,-44.63665 0,-7.1447 9.964,-18.03209 16.5027,-18.03209 3.5928,0 12.9017,5.6065 20.6864,12.45893 7.7847,6.85239 22.0563,15.6662 31.7146,19.58621 15.335,6.22398 17.5606,8.25109 17.5606,15.99419 0,16.80065 -24.3168,24.4058 -46.776,14.62941 z m 329.38608,-0.78087 c -4.51974,-3.15284 -7.20535,-8.3228 -7.20535,-13.87083 0,-7.7161 2.24057,-9.754 17.56054,-15.9719 9.65829,-3.92001 23.92986,-12.73382 31.71462,-19.58621 16.07227,-14.14739 24.99907,-15.62807 32.20398,-5.34161 7.25675,10.36047 6.51431,12.83499 -9.89408,32.97806 -20.95171,25.7204 -46.39987,34.33458 -64.37971,21.79249 z M 328.85084,426.46503 c -4.2103,-1.68445 -12.5229,-7.33656 -18.4724,-12.56028 -14.1227,-12.39991 -23.6441,-14.54336 -36.0667,-8.11935 -8.498,4.39447 -11.3753,4.55673 -18.6841,1.05374 -19.9779,-9.57515 -16.382,-34.01498 6.6674,-45.3151 11.6251,-5.6993 12.8006,-5.71968 26.5715,-0.46054 7.9246,3.02642 20.4443,10.37417 27.8215,16.32831 7.3773,5.95416 18.1258,14.08731 23.8855,18.07363 13.0563,9.03635 16.3168,19.69343 8.6253,28.19242 -6.2735,6.93216 -9.0722,7.31827 -20.348,2.80717 z m 324.80773,-2.80717 c -7.69151,-8.49899 -4.43107,-19.15607 8.62526,-28.19242 5.75971,-3.98632 16.50818,-12.11947 23.88547,-18.07363 7.37726,-5.95414 19.89697,-13.30189 27.82152,-16.32831 13.77088,-5.25914 14.94644,-5.23876 26.57156,0.46054 23.04933,11.30012 26.64526,35.73995 6.66739,45.3151 -7.30879,3.50299 -10.18613,3.34073 -18.6841,-1.05374 -12.40986,-6.41738 -21.94341,-4.2811 -36.00939,8.06901 -9.7068,8.52265 -24.13481,16.07919 -30.70068,16.07919 -1.37367,0 -5.05333,-2.82409 -8.17703,-6.27574 z M 345.22254,339.69644 c -2.1521,-2.15206 -3.9129,-6.50677 -3.9129,-9.67713 0,-13.34436 46.8291,-47.79887 58.7491,-43.22471 10.1002,3.8758 5.2784,14.32821 -15.6341,33.89087 -11.513,10.7698 -22.2031,19.58146 -23.756,19.58146 -1.5528,0 -4.783,0.75203 -7.1783,1.67118 -2.3953,0.91914 -6.1158,-0.0896 -8.2678,-2.24167 z m 295.50972,-1.22776 c -15.70451,-8.10606 -43.5879,-37.35865 -42.547,-44.63628 1.56219,-10.92229 13.15093,-9.08796 34.43047,5.44984 22.97215,15.69415 32.34693,28.45024 27.06399,36.82544 -4.79489,7.6015 -8.01681,8.00297 -18.94746,2.361 z M 282.86614,314.42984 c -15.1305,-7.98766 -15.3681,-15.73072 -0.7248,-23.61669 16.59,-8.93427 17.5494,-18.26553 3.4793,-33.83942 -13.458,-14.89638 -13.7643,-16.70126 -4.9382,-29.09638 12.349,-17.34259 21.5208,-11.66192 36.5354,22.6286 12.3519,28.20963 14.9951,41.20093 10.9376,53.75878 -5.7512,17.80008 -23.3462,21.74926 -45.2893,10.16511 z m 400.53788,3.29834 c -7.86259,-4.58757 -12.52487,-21.94379 -9.45513,-35.19842 3.35071,-14.46774 19.33415,-51.05099 25.49307,-58.34914 6.92713,-8.20842 15.21547,-6.8606 22.73296,3.69673 8.82608,12.39512 8.51978,14.2 -4.93823,29.09638 -14.07008,15.57389 -13.11064,24.90515 3.47929,33.83942 14.89437,8.02116 14.44351,15.688 -1.39781,23.76965 -13.64999,6.9637 -27.31832,8.16078 -35.91415,3.14538 z M 362.61184,271.44501 c -6.2843,-6.28435 -12.4215,-25.26167 -11.1245,-34.3993 1.3801,-9.72292 13.1389,-11.1646 21.6492,-2.65428 8.079,8.07899 8.9874,29.37754 1.5694,36.79556 -6.1568,6.1567 -6.1946,6.15751 -12.0941,0.25802 z m 265.40357,-0.39408 c -12.64185,-12.64183 -1.06268,-44.5948 15.31555,-42.26366 9.21946,1.31221 10.66156,12.31376 3.92602,29.95054 -5.93001,15.52744 -12.08713,19.46755 -19.24157,12.31312 z M 353.46514,198.89135 c -9.1671,-3.35308 -13.5207,-11.45962 -10.4507,-19.45976 2.1539,-5.61309 15.0491,-12.09323 24.0649,-12.09323 3.4398,0 9.089,-2.8349 12.5539,-6.29976 5.8852,-5.88526 5.9906,-7.17596 1.6012,-19.61691 -6.1194,-17.34423 -6.0609,-17.84551 3.1618,-27.06818 5.3599,-5.35993 11.4363,-7.86039 19.1016,-7.86039 13.8666,0 17.8713,6.35618 17.8713,28.36519 0,12.3929 -1.8057,18.12267 -8.0497,25.54332 -4.4274,5.26162 -10.1707,14.64278 -12.763,20.84702 -8.16,19.52944 -24.844,25.78011 -47.0913,17.6427 z m 260.71291,-1.34454 c -3.94008,-2.75975 -9.28479,-10.09392 -11.87709,-16.29816 -2.59229,-6.20424 -8.33563,-15.5854 -12.76299,-20.84702 -6.24407,-7.42065 -8.04976,-13.15042 -8.04976,-25.54332 0,-22.00901 4.00467,-28.36519 17.87133,-28.36519 7.66529,0 13.74168,2.50046 19.1016,7.86039 9.2227,9.22267 9.28124,9.72395 3.16184,27.06818 -4.38941,12.44095 -4.28408,13.73165 1.60119,19.61691 3.46488,3.46486 9.1141,6.29976 12.55384,6.29976 25.0741,0 34.33638,24.09217 12.22557,31.80004 -13.80488,4.81241 -25.46587,4.26373 -33.82553,-1.59159 z"
+       id="path4179"
+       inkscape:connector-curvature="0" />
+  </g>
+</svg>
diff --git a/krita/data/brushes/chisel_smear.gbr b/krita/data/brushes/chisel_smear.gbr
deleted file mode 100644
index fffc3e7120..0000000000
Binary files a/krita/data/brushes/chisel_smear.gbr and /dev/null differ
diff --git a/krita/data/brushes/circle_hard_eroded.gih b/krita/data/brushes/circle_hard_eroded.gih
new file mode 100644
index 0000000000..7137bd068d
Binary files /dev/null and b/krita/data/brushes/circle_hard_eroded.gih differ
diff --git a/krita/data/brushes/export.txt b/krita/data/brushes/export.txt
new file mode 100644
index 0000000000..9b0a9c42df
--- /dev/null
+++ b/krita/data/brushes/export.txt
@@ -0,0 +1,45 @@
+abominable_snowman.png
+bamboo_leaves_random.gih
+brick.gih
+bristles_chisel_dense.png
+bristles_circle_dense.png
+bristles_circle_medium.png
+bristles_circle_random.gih
+bristles_circle_sparse.png
+bristles_circle_variable.svg
+chalk_chisel.gih
+chalk_chisel_random.gih
+chalk.png
+chalk_round_hard.png
+chalk_sparse.png
+chisel_bent_rough.gih
+chisel_dense_smear.png
+chisel_knife.svg
+circle_hard_eroded.gih
+freckles.png
+graphite_grain.gih
+grass.gih
+grass_patch.gih
+hearts.gih
+leaves.png
+leaves-scattered.svg
+mountains_distant.gih
+oil_bristle.png
+oil_knife.png
+paint_splats.gih
+rake_dense.png
+rake_sparse.png
+rock_light.gih
+rock_pitted.gih
+rock_scraped.gih
+scales.png
+scratches_rough.gih
+scribbles.png
+smear_paint.png
+smoke.png
+snow.gih
+spines.png
+square_rough.png
+starfield.png
+watercolor.gih
+water_still.gih
diff --git a/krita/data/brushes/freckles.gbr b/krita/data/brushes/freckles.gbr
deleted file mode 100644
index da25daa942..0000000000
Binary files a/krita/data/brushes/freckles.gbr and /dev/null differ
diff --git a/krita/data/brushes/freckles.png b/krita/data/brushes/freckles.png
new file mode 100644
index 0000000000..63fbd770ce
Binary files /dev/null and b/krita/data/brushes/freckles.png differ
diff --git a/krita/data/brushes/graphite_grain.gih b/krita/data/brushes/graphite_grain.gih
new file mode 100644
index 0000000000..b29a108a3e
Binary files /dev/null and b/krita/data/brushes/graphite_grain.gih differ
diff --git a/krita/data/brushes/grass.gih b/krita/data/brushes/grass.gih
new file mode 100644
index 0000000000..635b751cc9
Binary files /dev/null and b/krita/data/brushes/grass.gih differ
diff --git a/krita/data/brushes/grass_patch.gih b/krita/data/brushes/grass_patch.gih
new file mode 100644
index 0000000000..1b9eb265a4
Binary files /dev/null and b/krita/data/brushes/grass_patch.gih differ
diff --git a/krita/data/brushes/hearts.gih b/krita/data/brushes/hearts.gih
new file mode 100644
index 0000000000..da73a4734b
Binary files /dev/null and b/krita/data/brushes/hearts.gih differ
diff --git a/krita/data/brushes/knife3.gbr b/krita/data/brushes/knife3.gbr
deleted file mode 100644
index b94ba45e53..0000000000
Binary files a/krita/data/brushes/knife3.gbr and /dev/null differ
diff --git a/krita/data/brushes/leaves.png b/krita/data/brushes/leaves.png
new file mode 100644
index 0000000000..8c32fb00ce
Binary files /dev/null and b/krita/data/brushes/leaves.png differ
diff --git a/krita/data/brushes/mountains_distant.gih b/krita/data/brushes/mountains_distant.gih
new file mode 100644
index 0000000000..2548d07c3f
Binary files /dev/null and b/krita/data/brushes/mountains_distant.gih differ
diff --git a/krita/data/brushes/oil_bristle.gbr b/krita/data/brushes/oil_bristle.gbr
deleted file mode 100644
index 0c738d1b99..0000000000
Binary files a/krita/data/brushes/oil_bristle.gbr and /dev/null differ
diff --git a/krita/data/brushes/oil_bristle.png b/krita/data/brushes/oil_bristle.png
new file mode 100644
index 0000000000..38661fdabc
Binary files /dev/null and b/krita/data/brushes/oil_bristle.png differ
diff --git a/krita/data/brushes/oil_knife.gbr b/krita/data/brushes/oil_knife.gbr
deleted file mode 100644
index a2cb048afa..0000000000
Binary files a/krita/data/brushes/oil_knife.gbr and /dev/null differ
diff --git a/krita/data/brushes/oil_knife.png b/krita/data/brushes/oil_knife.png
new file mode 100644
index 0000000000..b184737236
Binary files /dev/null and b/krita/data/brushes/oil_knife.png differ
diff --git a/krita/data/brushes/paint_splats.gih b/krita/data/brushes/paint_splats.gih
new file mode 100644
index 0000000000..31155282a5
Binary files /dev/null and b/krita/data/brushes/paint_splats.gih differ
diff --git a/krita/data/brushes/rake_dense.png b/krita/data/brushes/rake_dense.png
new file mode 100644
index 0000000000..0092a51c64
Binary files /dev/null and b/krita/data/brushes/rake_dense.png differ
diff --git a/krita/data/brushes/rake_sparse.png b/krita/data/brushes/rake_sparse.png
new file mode 100644
index 0000000000..8fea9805e2
Binary files /dev/null and b/krita/data/brushes/rake_sparse.png differ
diff --git a/krita/data/brushes/reptile.gbr b/krita/data/brushes/reptile.gbr
deleted file mode 100644
index e483d18678..0000000000
Binary files a/krita/data/brushes/reptile.gbr and /dev/null differ
diff --git a/krita/data/brushes/round_textured1.gbr b/krita/data/brushes/round_textured1.gbr
deleted file mode 100644
index fcba8a189e..0000000000
Binary files a/krita/data/brushes/round_textured1.gbr and /dev/null differ
diff --git a/krita/data/brushes/scales.png b/krita/data/brushes/scales.png
new file mode 100644
index 0000000000..190b55cd9f
Binary files /dev/null and b/krita/data/brushes/scales.png differ
diff --git a/krita/data/brushes/scratches_rough.gih b/krita/data/brushes/scratches_rough.gih
index 7fe587bf5f..7ec54a322f 100644
Binary files a/krita/data/brushes/scratches_rough.gih and b/krita/data/brushes/scratches_rough.gih differ
diff --git a/krita/data/brushes/scribbles.gbr b/krita/data/brushes/scribbles.gbr
deleted file mode 100644
index 39c57480bb..0000000000
Binary files a/krita/data/brushes/scribbles.gbr and /dev/null differ
diff --git a/krita/data/brushes/scribbles.png b/krita/data/brushes/scribbles.png
new file mode 100644
index 0000000000..5b9720fac2
Binary files /dev/null and b/krita/data/brushes/scribbles.png differ
diff --git a/krita/data/brushes/smear_paint.gbr b/krita/data/brushes/smear_paint.gbr
deleted file mode 100644
index b321dccbfb..0000000000
Binary files a/krita/data/brushes/smear_paint.gbr and /dev/null differ
diff --git a/krita/data/brushes/smear_paint.png b/krita/data/brushes/smear_paint.png
new file mode 100644
index 0000000000..11ac102f37
Binary files /dev/null and b/krita/data/brushes/smear_paint.png differ
diff --git a/krita/data/brushes/smoke.png b/krita/data/brushes/smoke.png
new file mode 100644
index 0000000000..c5642850a9
Binary files /dev/null and b/krita/data/brushes/smoke.png differ
diff --git a/krita/data/brushes/snow.gih b/krita/data/brushes/snow.gih
new file mode 100644
index 0000000000..8ac31951c9
Binary files /dev/null and b/krita/data/brushes/snow.gih differ
diff --git a/krita/data/brushes/spines.gbr b/krita/data/brushes/spines.gbr
deleted file mode 100644
index d573727587..0000000000
Binary files a/krita/data/brushes/spines.gbr and /dev/null differ
diff --git a/krita/data/brushes/spines.png b/krita/data/brushes/spines.png
new file mode 100644
index 0000000000..6586eb63c7
Binary files /dev/null and b/krita/data/brushes/spines.png differ
diff --git a/krita/data/brushes/3_texture.png b/krita/data/brushes/square_rough.png
similarity index 100%
rename from krita/data/brushes/3_texture.png
rename to krita/data/brushes/square_rough.png
diff --git a/krita/data/brushes/starfield.png b/krita/data/brushes/starfield.png
new file mode 100644
index 0000000000..cf372c6ca0
Binary files /dev/null and b/krita/data/brushes/starfield.png differ
diff --git a/krita/data/brushes/w_hearts.gih b/krita/data/brushes/w_hearts.gih
deleted file mode 100644
index 6b45830c52..0000000000
Binary files a/krita/data/brushes/w_hearts.gih and /dev/null differ
diff --git a/krita/data/brushes/z_study_pencil_2H.gih b/krita/data/brushes/z_study_pencil_2H.gih
deleted file mode 100644
index a4ed724f69..0000000000
Binary files a/krita/data/brushes/z_study_pencil_2H.gih and /dev/null differ
diff --git a/krita/data/paintoppresets/Basic_Chisel_Smooth.kpp b/krita/data/paintoppresets/Basic_Chisel_Smooth.kpp
index e2c79035b5..4a57980c0e 100644
Binary files a/krita/data/paintoppresets/Basic_Chisel_Smooth.kpp and b/krita/data/paintoppresets/Basic_Chisel_Smooth.kpp differ
diff --git a/krita/data/paintoppresets/Blender_Rake.kpp b/krita/data/paintoppresets/Blender_Rake.kpp
index bc63cdeb06..ed8322bdcb 100644
Binary files a/krita/data/paintoppresets/Blender_Rake.kpp and b/krita/data/paintoppresets/Blender_Rake.kpp differ
diff --git a/krita/data/paintoppresets/Blender_Textured.kpp b/krita/data/paintoppresets/Blender_Textured.kpp
index 3b4d3d05cd..9122ea5201 100644
Binary files a/krita/data/paintoppresets/Blender_Textured.kpp and b/krita/data/paintoppresets/Blender_Textured.kpp differ
diff --git a/krita/data/paintoppresets/Clone_Tool_Textured.kpp b/krita/data/paintoppresets/Clone_Tool_Textured.kpp
index ff8331e31e..2661e44f1d 100644
Binary files a/krita/data/paintoppresets/Clone_Tool_Textured.kpp and b/krita/data/paintoppresets/Clone_Tool_Textured.kpp differ
diff --git a/krita/data/paintoppresets/Dry_Bristles_Eroded.kpp b/krita/data/paintoppresets/Dry_Bristles_Eroded.kpp
index 5d488b9e40..79fc7b6499 100644
Binary files a/krita/data/paintoppresets/Dry_Bristles_Eroded.kpp and b/krita/data/paintoppresets/Dry_Bristles_Eroded.kpp differ
diff --git a/krita/data/paintoppresets/Dry_Bristles_Smooth.kpp b/krita/data/paintoppresets/Dry_Bristles_Smooth.kpp
index 047b6c157a..49838f3d2a 100644
Binary files a/krita/data/paintoppresets/Dry_Bristles_Smooth.kpp and b/krita/data/paintoppresets/Dry_Bristles_Smooth.kpp differ
diff --git a/krita/data/paintoppresets/Dry_Textured_Creases.kpp b/krita/data/paintoppresets/Dry_Textured_Creases.kpp
index 4ee1ab9b46..604ed56fd9 100644
Binary files a/krita/data/paintoppresets/Dry_Textured_Creases.kpp and b/krita/data/paintoppresets/Dry_Textured_Creases.kpp differ
diff --git a/krita/data/paintoppresets/Dry_Textured_Rough.kpp b/krita/data/paintoppresets/Dry_Textured_Rough.kpp
index f10fa73d19..0ebff6100c 100644
Binary files a/krita/data/paintoppresets/Dry_Textured_Rough.kpp and b/krita/data/paintoppresets/Dry_Textured_Rough.kpp differ
diff --git a/krita/data/paintoppresets/Dry_Textured_Scribbles.kpp b/krita/data/paintoppresets/Dry_Textured_Scribbles.kpp
index afd1cbf0d9..547aac7ab4 100644
Binary files a/krita/data/paintoppresets/Dry_Textured_Scribbles.kpp and b/krita/data/paintoppresets/Dry_Textured_Scribbles.kpp differ
diff --git a/krita/data/paintoppresets/Dry_Textured_Soft.kpp b/krita/data/paintoppresets/Dry_Textured_Soft.kpp
index 0676493620..f60a4c297d 100644
Binary files a/krita/data/paintoppresets/Dry_Textured_Soft.kpp and b/krita/data/paintoppresets/Dry_Textured_Soft.kpp differ
diff --git a/krita/data/paintoppresets/Ink_Bristle.kpp b/krita/data/paintoppresets/Ink_Bristle.kpp
index ebcd2ed121..10d88990e8 100644
Binary files a/krita/data/paintoppresets/Ink_Bristle.kpp and b/krita/data/paintoppresets/Ink_Bristle.kpp differ
diff --git a/krita/data/paintoppresets/Sketch_6B.kpp b/krita/data/paintoppresets/Sketch_6B.kpp
index 646e82fb9b..a385c5e576 100644
Binary files a/krita/data/paintoppresets/Sketch_6B.kpp and b/krita/data/paintoppresets/Sketch_6B.kpp differ
diff --git a/krita/data/paintoppresets/Stamp_Clouds.kpp b/krita/data/paintoppresets/Stamp_Clouds.kpp
index e39b0baabf..9a2db3f710 100644
Binary files a/krita/data/paintoppresets/Stamp_Clouds.kpp and b/krita/data/paintoppresets/Stamp_Clouds.kpp differ
diff --git a/krita/data/paintoppresets/Stamp_Freckles.kpp b/krita/data/paintoppresets/Stamp_Freckles.kpp
index ba12c040be..293c5d4f93 100644
Binary files a/krita/data/paintoppresets/Stamp_Freckles.kpp and b/krita/data/paintoppresets/Stamp_Freckles.kpp differ
diff --git a/krita/data/paintoppresets/Stamp_Grass.kpp b/krita/data/paintoppresets/Stamp_Grass.kpp
index 9d54fbdeeb..daab7324d8 100644
Binary files a/krita/data/paintoppresets/Stamp_Grass.kpp and b/krita/data/paintoppresets/Stamp_Grass.kpp differ
diff --git a/krita/data/paintoppresets/Stamp_Grass_Patch.kpp b/krita/data/paintoppresets/Stamp_Grass_Patch.kpp
index b7be94542c..78bc8ae1ed 100644
Binary files a/krita/data/paintoppresets/Stamp_Grass_Patch.kpp and b/krita/data/paintoppresets/Stamp_Grass_Patch.kpp differ
diff --git a/krita/data/paintoppresets/Stamp_Mountains_Distant.kpp b/krita/data/paintoppresets/Stamp_Mountains_Distant.kpp
index a76d711b81..28d752e5a4 100644
Binary files a/krita/data/paintoppresets/Stamp_Mountains_Distant.kpp and b/krita/data/paintoppresets/Stamp_Mountains_Distant.kpp differ
diff --git a/krita/data/paintoppresets/Stamp_Scales.kpp b/krita/data/paintoppresets/Stamp_Scales.kpp
index e8d5d5ba48..35514e0f2d 100644
Binary files a/krita/data/paintoppresets/Stamp_Scales.kpp and b/krita/data/paintoppresets/Stamp_Scales.kpp differ
diff --git a/krita/data/paintoppresets/Stamp_Spines.kpp b/krita/data/paintoppresets/Stamp_Spines.kpp
index 251122c5c3..c870fe4605 100644
Binary files a/krita/data/paintoppresets/Stamp_Spines.kpp and b/krita/data/paintoppresets/Stamp_Spines.kpp differ
diff --git a/krita/data/paintoppresets/Stamp_Water.kpp b/krita/data/paintoppresets/Stamp_Water.kpp
index ed0da58b1e..6dae2a9ba7 100644
Binary files a/krita/data/paintoppresets/Stamp_Water.kpp and b/krita/data/paintoppresets/Stamp_Water.kpp differ
diff --git a/krita/data/paintoppresets/Stamp_Watercolor.kpp b/krita/data/paintoppresets/Stamp_Watercolor.kpp
index 1156dc599a..d7c9d325b8 100644
Binary files a/krita/data/paintoppresets/Stamp_Watercolor.kpp and b/krita/data/paintoppresets/Stamp_Watercolor.kpp differ
diff --git a/krita/data/paintoppresets/Waterpaint_Hard_Edges.kpp b/krita/data/paintoppresets/Waterpaint_Hard_Edges.kpp
index 379b5f5ecf..18e7d25667 100644
Binary files a/krita/data/paintoppresets/Waterpaint_Hard_Edges.kpp and b/krita/data/paintoppresets/Waterpaint_Hard_Edges.kpp differ
diff --git a/krita/data/paintoppresets/Waterpaint_Soft.kpp b/krita/data/paintoppresets/Waterpaint_Soft.kpp
index ecc8dd5afe..fa767387e9 100644
Binary files a/krita/data/paintoppresets/Waterpaint_Soft.kpp and b/krita/data/paintoppresets/Waterpaint_Soft.kpp differ
diff --git a/krita/data/paintoppresets/Waterpaint_Soft_Edges.kpp b/krita/data/paintoppresets/Waterpaint_Soft_Edges.kpp
index 6b01f2e9d3..18b8da02a3 100644
Binary files a/krita/data/paintoppresets/Waterpaint_Soft_Edges.kpp and b/krita/data/paintoppresets/Waterpaint_Soft_Edges.kpp differ
diff --git a/krita/data/paintoppresets/Wet_Bristles.kpp b/krita/data/paintoppresets/Wet_Bristles.kpp
index d3cb8b0ada..fb3fbc253d 100644
Binary files a/krita/data/paintoppresets/Wet_Bristles.kpp and b/krita/data/paintoppresets/Wet_Bristles.kpp differ
diff --git a/krita/data/paintoppresets/Wet_Bristles_Rough.kpp b/krita/data/paintoppresets/Wet_Bristles_Rough.kpp
index c3de6f8cd7..6e986cea85 100644
Binary files a/krita/data/paintoppresets/Wet_Bristles_Rough.kpp and b/krita/data/paintoppresets/Wet_Bristles_Rough.kpp differ
diff --git a/krita/data/paintoppresets/Wet_Bristles_Square.kpp b/krita/data/paintoppresets/Wet_Bristles_Square.kpp
index f1b0b5463a..170b56d5e5 100644
Binary files a/krita/data/paintoppresets/Wet_Bristles_Square.kpp and b/krita/data/paintoppresets/Wet_Bristles_Square.kpp differ
diff --git a/krita/data/paintoppresets/Wet_Circle.kpp b/krita/data/paintoppresets/Wet_Circle.kpp
index dba34ae3a5..28f43f3fd4 100644
Binary files a/krita/data/paintoppresets/Wet_Circle.kpp and b/krita/data/paintoppresets/Wet_Circle.kpp differ
diff --git a/krita/data/paintoppresets/Wet_Smear.kpp b/krita/data/paintoppresets/Wet_Smear.kpp
index 5708462ce1..61a7ca5432 100644
Binary files a/krita/data/paintoppresets/Wet_Smear.kpp and b/krita/data/paintoppresets/Wet_Smear.kpp differ
diff --git a/krita/data/paintoppresets/Wet_Soft_Tilted.kpp b/krita/data/paintoppresets/Wet_Soft_Tilted.kpp
index c19deda7ce..a6701980fc 100644
Binary files a/krita/data/paintoppresets/Wet_Soft_Tilted.kpp and b/krita/data/paintoppresets/Wet_Soft_Tilted.kpp differ