diff --git a/loleaflet/css/toolbar.css b/loleaflet/css/toolbar.css
index 7560efa69..1da4990c4 100644
--- a/loleaflet/css/toolbar.css
+++ b/loleaflet/css/toolbar.css
@@ -329,6 +329,20 @@ button.leaflet-control-search-next
 .w2ui-icon.arrowshapes_split-round-arrow { background: url('images/lc_arrowshapes.split-round-arrow.svg') no-repeat center !important; }
 .w2ui-icon.arrowshapes_s-sharped-arrow { background: url('images/lc_arrowshapes.s-sharped-arrow.svg') no-repeat center !important; }
 
+.w2ui-icon.starshapes_bang { background: url('images/lc_starshapes.bang.svg') no-repeat center !important; }
+.w2ui-icon.starshapes_star4 { background: url('images/lc_starshapes.star4.svg') no-repeat center !important; }
+.w2ui-icon.starshapes_star5 { background: url('images/lc_starshapes.star5.svg') no-repeat center !important; }
+.w2ui-icon.starshapes_star6 { background: url('images/lc_starshapes.star6.svg') no-repeat center !important; }
+.w2ui-icon.starshapes_star8 { background: url('images/lc_starshapes.star8.svg') no-repeat center !important; }
+.w2ui-icon.starshapes_star12 { background: url('images/lc_starshapes.star12.svg') no-repeat center !important; }
+
+.w2ui-icon.starshapes_star24 { background: url('images/lc_starshapes.star24.svg') no-repeat center !important; }
+.w2ui-icon.starshapes_concave-star6 { background: url('images/lc_starshapes.concave-star6.svg') no-repeat center !important; }
+.w2ui-icon.starshapes_vertical-scroll { background: url('images/lc_starshapes.vertical-scroll.svg') no-repeat center !important; }
+.w2ui-icon.starshapes_horizontal-scroll { background: url('images/lc_starshapes.horizontal-scroll.svg') no-repeat center !important; }
+.w2ui-icon.starshapes_signet { background: url('images/lc_starshapes.signet.svg') no-repeat center !important; }
+.w2ui-icon.starshapes_doorplate { background: url('images/lc_starshapes.doorplate.svg') no-repeat center !important; }
+
 .w2ui-icon.accepttrackedchanges{ background: url('images/lc_accepttrackedchanges.svg') no-repeat center !important; }
 .w2ui-icon.alignblock{ background: url('images/lc_alignblock.svg') no-repeat center !important; }
 .w2ui-icon.alignhorizontal{ background: url('images/lc_alignhorizontalcenter.svg') no-repeat center !important; }
diff --git a/loleaflet/images/lc_starshapes.bang.svg b/loleaflet/images/lc_starshapes.bang.svg
new file mode 100644
index 000000000..bab825b3f
--- /dev/null
+++ b/loleaflet/images/lc_starshapes.bang.svg
@@ -0,0 +1,6 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24">
+ <path 
+     style="fill:#4d4d4d" 
+     d="M 14.019531 4 L 12.302734 7.9746094 L 11.146484 4.7382812 L 10.150391 8.0761719 L 7.90625 5.3632812 L 10.367188 9.7636719 L 6.2226562 6.96875 L 9.4140625 10.740234 L 5.3769531 9.2226562 L 7.7832031 11.074219 L 4.0527344 12.253906 L 8.3554688 12.875 L 4 14.830078 L 8.8203125 14.105469 L 7.0078125 17.716797 L 10.410156 14.871094 L 7.9433594 18.917969 L 11.322266 16.103516 L 10.464844 19.25 L 12.183594 15.404297 L 13.337891 20 L 14.335938 15.300781 L 16.578125 17.886719 L 15.744141 15.103516 L 19.15625 17.09375 L 15.072266 14.126953 L 20 15.042969 L 16.703125 12.46875 L 19.701172 11.808594 L 16.128906 11.992188 L 19.753906 9.2324219 L 15.666016 10.761719 L 18.369141 7.7050781 L 14.076172 8.5078125 L 16.542969 5.9472656 L 13.162109 8.9628906 L 14.019531 4 z "
+     />
+ </svg>
diff --git a/loleaflet/images/lc_starshapes.concave-star6.svg b/loleaflet/images/lc_starshapes.concave-star6.svg
new file mode 100644
index 000000000..99b724655
--- /dev/null
+++ b/loleaflet/images/lc_starshapes.concave-star6.svg
@@ -0,0 +1,6 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24">
+ <path 
+     style="fill:#4d4d4d" 
+     d="M 8 4 C 8 4 8.7454 7.5092906 8 9 C 7.2546 10.490712 4 12 4 12 C 4 12 7.2546 13.509288 8 15 C 8.7454 16.490715 8 20 8 20 C 8 20 10.3333 17.000002 12 17 C 13.6667 16.999998 16 20 16 20 C 16 20 15.2546 16.490709 16 15 C 16.7454 13.509288 20 12 20 12 C 20 12 16.7454 10.490712 16 9 C 15.2546 7.5092855 16 4 16 4 C 16 4 13.6667 6.9999977 12 7 C 10.3333 7.0000023 8 4 8 4 z "
+     />
+ </svg>
diff --git a/loleaflet/images/lc_starshapes.doorplate.svg b/loleaflet/images/lc_starshapes.doorplate.svg
new file mode 100644
index 000000000..b99e7e700
--- /dev/null
+++ b/loleaflet/images/lc_starshapes.doorplate.svg
@@ -0,0 +1,6 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24">
+ <path 
+     style="fill:#4d4d4d" 
+     d="M 8 4 C 8 6.2091389 6.2091389 8 4 8 L 4 16 C 6.2091389 16 8 17.790861 8 20 L 15 20 C 15 17.790861 16.790861 16 19 16 C 19.345951 16 19.679835 16.073685 20 16.15625 L 20 8 C 17.790861 8 16 6.2091389 16 4 L 8 4 z "
+     />
+ </svg>
diff --git a/loleaflet/images/lc_starshapes.horizontal-scroll.svg b/loleaflet/images/lc_starshapes.horizontal-scroll.svg
new file mode 100644
index 000000000..6e180c26a
--- /dev/null
+++ b/loleaflet/images/lc_starshapes.horizontal-scroll.svg
@@ -0,0 +1,6 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24">
+ <path 
+     style="fill:#4d4d4d" 
+     d="M 18 4 C 16.8954 4 16 4.8954 16 6 L 8 6 L 6 6 C 4.89199 6 4 6.892 4 8 L 4 9 L 4 16 L 4 17 L 4 18 C 4 19.1046 4.8954 20 6 20 C 7.1046 20 8 19.1046 8 18 L 17 18 L 18 18 C 19.10801 18 20 17.108 20 16 L 20 13 L 20 10 L 20 8 L 20 7 L 20 6 C 20 4.8954 19.1046 4 18 4 z "
+     />
+ </svg>
diff --git a/loleaflet/images/lc_starshapes.signet.svg b/loleaflet/images/lc_starshapes.signet.svg
new file mode 100644
index 000000000..62ac86153
--- /dev/null
+++ b/loleaflet/images/lc_starshapes.signet.svg
@@ -0,0 +1,6 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24">
+ <path 
+     style="fill:#4d4d4d" 
+     d="M 11.5 4 C 10.464199 4 10.259689 5.8008656 9.3027344 6.1972656 C 8.3463747 6.5933656 6.9292318 5.4652656 6.1972656 6.1972656 C 5.4652993 6.9292656 6.5934025 8.3463344 6.1972656 9.3027344 C 5.8008811 10.259534 4 10.4641 4 11.5 C 4 12.5359 5.8008811 12.740266 6.1972656 13.697266 C 6.5934025 14.653466 5.4652993 16.070734 6.1972656 16.802734 C 6.9292318 17.534634 8.3463747 16.406534 9.3027344 16.802734 C 10.259689 17.199034 10.464199 19 11.5 19 C 12.5358 19 12.740311 17.199034 13.697266 16.802734 C 13.715596 16.784404 13.760839 16.756399 13.787109 16.787109 L 17 20 L 18 18 L 20 17 C 20.01282 16.97235 18.094131 15.577238 16.775391 14.580078 C 16.719831 14.26777 16.692854 13.962662 16.802734 13.697266 C 17.1992 12.740266 19 12.5359 19 11.5 C 19 10.4641 17.199117 10.259534 16.802734 9.3027344 C 16.406598 8.3463344 17.5347 6.9292656 16.802734 6.1972656 C 16.070768 5.4652656 14.653626 6.5933656 13.697266 6.1972656 C 12.740311 5.8008656 12.5358 4 11.5 4 z M 11.5 8 C 13.432997 8 15 9.5670034 15 11.5 C 15 13.432997 13.432997 15 11.5 15 C 9.5670034 15 8 13.432997 8 11.5 C 8 9.5670034 9.5670034 8 11.5 8 z "
+     />
+ </svg>
diff --git a/loleaflet/images/lc_starshapes.star12.svg b/loleaflet/images/lc_starshapes.star12.svg
new file mode 100644
index 000000000..d563d4977
--- /dev/null
+++ b/loleaflet/images/lc_starshapes.star12.svg
@@ -0,0 +1,6 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24">
+ <path 
+     style="fill:#4d4d4d" 
+     d="M 12 4 L 10.96875 8.125 L 8 5.0625 L 9.15625 9.15625 L 5.0625 8 L 8.125 10.96875 L 4 12 L 8.125 13.03125 L 5.0625 16 L 9.15625 14.84375 L 8 18.9375 L 10.96875 15.875 L 11 16 L 11 14 L 11 13.5625 L 11 13 L 12 12 L 13.962891 12 L 14.595703 12 L 15 12 L 20 12 L 15.875 10.96875 L 18.9375 8 L 14.84375 9.15625 L 16 5.0625 L 13.03125 8.125 L 12 4 z M 13.294922 13 L 11.699219 13.490234 L 11.699219 14.201172 L 11.707031 14.685547 L 13.013672 14.292969 C 13.013672 14.516069 13.017578 20 13.017578 20 L 14.195312 20 C 14.195312 20 14.154459 15.2927 14.199219 13 L 13.294922 13 z M 17.822266 13 C 17.574727 13 17.302077 13.038234 17.003906 13.115234 C 16.705734 13.191934 16.372475 13.31835 16.029297 13.46875 L 16.029297 14.521484 C 16.36685 14.315784 16.733938 14.200909 17.029297 14.099609 C 17.327468 13.998609 17.558943 13.986328 17.826172 13.986328 C 18.203106 13.986328 18.432542 14.025559 18.666016 14.255859 C 18.902303 14.486159 19.007812 14.644466 19.007812 15.009766 C 19.007812 15.233866 18.928064 15.42295 18.818359 15.65625 C 18.711468 15.88655 18.610746 16.018816 18.337891 16.353516 C 18.118415 16.594916 17.803916 16.992275 17.244141 17.609375 C 16.68718 18.223475 16.335207 18.648372 16.011719 19.013672 L 16 20 L 20 20 L 20 18.962891 L 17.240234 19.001953 C 17.926591 18.237553 18.244159 17.859247 18.621094 17.435547 C 18.998028 17.008847 19.220696 16.751109 19.291016 16.662109 C 19.546993 16.318209 19.722719 16.019278 19.818359 15.767578 C 19.916807 15.512778 19.966797 15.243438 19.966797 14.960938 C 19.966797 14.365238 19.772951 13.891256 19.384766 13.535156 C 18.996581 13.179056 18.474867 13 17.822266 13 z "
+     />
+ </svg>
diff --git a/loleaflet/images/lc_starshapes.star24.svg b/loleaflet/images/lc_starshapes.star24.svg
new file mode 100644
index 000000000..1b9082e1b
--- /dev/null
+++ b/loleaflet/images/lc_starshapes.star24.svg
@@ -0,0 +1,6 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24">
+ <path 
+     style="fill:#4d4d4d" 
+     d="M 12 4 L 11.46875 8.03125 L 9.9375 4.28125 L 10.46875 8.3125 L 8 5.0625 L 9.5625 8.8125 L 6.34375 6.34375 L 8.8125 9.5625 L 5.0625 8 L 8.3125 10.46875 L 4.28125 9.9375 L 8.03125 11.46875 L 4 12 L 8.03125 12.53125 L 4.28125 14.0625 L 8.3125 13.53125 L 5.0625 16 L 8.8125 14.4375 L 6.34375 17.65625 L 9 15.619141 L 9 13 L 10 12 L 12 12 L 15 12 L 20 12 L 15.96875 11.46875 L 19.71875 9.9375 L 15.6875 10.46875 L 18.9375 8 L 15.1875 9.5625 L 17.65625 6.34375 L 14.4375 8.8125 L 16 5.0625 L 13.53125 8.3125 L 14.0625 4.28125 L 12.53125 8.03125 L 12 4 z M 11.822266 13 C 11.574727 13 11.302077 13.038234 11.003906 13.115234 C 10.705734 13.191934 10.372475 13.31835 10.029297 13.46875 L 10.029297 14.521484 C 10.36685 14.315784 10.733938 14.200909 11.029297 14.099609 C 11.327468 13.998609 11.558943 13.986328 11.826172 13.986328 C 12.203106 13.986328 12.432542 14.025559 12.666016 14.255859 C 12.902303 14.486159 13.007812 14.644466 13.007812 15.009766 C 13.007813 15.233866 12.928064 15.42295 12.818359 15.65625 C 12.711468 15.88655 12.610746 16.018816 12.337891 16.353516 C 12.118415 16.594916 11.803916 16.992275 11.244141 17.609375 C 10.68718 18.223475 10.335207 18.648372 10.011719 19.013672 L 10 20 L 14 20 L 14 18.962891 L 11.240234 19.001953 C 11.926591 18.237553 12.244159 17.859247 12.621094 17.435547 C 12.998028 17.008847 13.220696 16.751109 13.291016 16.662109 C 13.546993 16.318209 13.722719 16.019278 13.818359 15.767578 C 13.916807 15.512778 13.966797 15.243438 13.966797 14.960938 C 13.966797 14.365238 13.772951 13.891256 13.384766 13.535156 C 12.996581 13.179056 12.474867 13 11.822266 13 z M 18 13 L 15 17.238281 L 15 18 L 18 18 L 18 20 L 19 20 L 19 18 L 20 18 L 20 17 L 19 17 L 19 13 L 18 13 z M 18 14.476562 L 18 17 L 16.296875 17 L 18 14.476562 z "
+     />
+ </svg>
diff --git a/loleaflet/images/lc_starshapes.star4.svg b/loleaflet/images/lc_starshapes.star4.svg
new file mode 100644
index 000000000..d71c3454a
--- /dev/null
+++ b/loleaflet/images/lc_starshapes.star4.svg
@@ -0,0 +1,6 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24">
+ <path 
+     style="fill:#4d4d4d" 
+     d="M 12 4 L 9.171875 9.171875 L 4 12 L 9.171875 14.828125 L 12 20 L 14.828125 14.828125 L 20 12 L 14.828125 9.171875 L 12 4 z "
+     />
+ </svg>
diff --git a/loleaflet/images/lc_starshapes.star5.svg b/loleaflet/images/lc_starshapes.star5.svg
new file mode 100644
index 000000000..04b148848
--- /dev/null
+++ b/loleaflet/images/lc_starshapes.star5.svg
@@ -0,0 +1,6 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24">
+ <path 
+     style="fill:#4d4d4d" 
+     d="M 12 4 L 9 10 L 4 10 L 8 14 L 7 20 L 12 17 L 17 20 L 16 14 L 20 10 L 15 10 L 12 4 z "
+     />
+ </svg>
diff --git a/loleaflet/images/lc_starshapes.star6.svg b/loleaflet/images/lc_starshapes.star6.svg
new file mode 100644
index 000000000..f176d132f
--- /dev/null
+++ b/loleaflet/images/lc_starshapes.star6.svg
@@ -0,0 +1,6 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24">
+ <path 
+     style="fill:#4d4d4d" 
+     d="M 12 4 L 9 8 L 4 8 L 7 12 L 4 16 L 9 16 L 12 20 L 15 16 L 20 16 L 17 12 L 20 8 L 15 8 L 12 4 z "
+     />
+ </svg>
diff --git a/loleaflet/images/lc_starshapes.star8.svg b/loleaflet/images/lc_starshapes.star8.svg
new file mode 100644
index 000000000..51c941eb7
--- /dev/null
+++ b/loleaflet/images/lc_starshapes.star8.svg
@@ -0,0 +1,6 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24">
+ <path 
+     style="fill:#4d4d4d" 
+     d="M 12 4 L 9.65625 6.34375 L 6.34375 6.34375 L 6.34375 9.65625 L 4 12 L 6.34375 14.34375 L 6.34375 17.65625 L 9.65625 17.65625 L 12 20 L 14.34375 17.65625 L 17.65625 17.65625 L 17.65625 14.34375 L 20 12 L 17.65625 9.65625 L 17.65625 6.34375 L 14.34375 6.34375 L 12 4 z "
+     />
+ </svg>
diff --git a/loleaflet/images/lc_starshapes.svg b/loleaflet/images/lc_starshapes.svg
new file mode 100644
index 000000000..04b148848
--- /dev/null
+++ b/loleaflet/images/lc_starshapes.svg
@@ -0,0 +1,6 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24">
+ <path 
+     style="fill:#4d4d4d" 
+     d="M 12 4 L 9 10 L 4 10 L 8 14 L 7 20 L 12 17 L 17 20 L 16 14 L 20 10 L 15 10 L 12 4 z "
+     />
+ </svg>
diff --git a/loleaflet/images/lc_starshapes.vertical-scroll.svg b/loleaflet/images/lc_starshapes.vertical-scroll.svg
new file mode 100644
index 000000000..12c66e182
--- /dev/null
+++ b/loleaflet/images/lc_starshapes.vertical-scroll.svg
@@ -0,0 +1,6 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24">
+ <path 
+     style="fill:#4d4d4d" 
+     d="M 8 4 C 6.8919904 4 6 4.8919904 6 6 L 6 8 L 6 16 C 4.895431 16 4 16.8954 4 18 C 4 19.1046 4.895431 20 6 20 L 7 20 L 8 20 L 10 20 L 13 20 L 16 20 C 17.10801 20 18 19.10801 18 18 L 18 17 L 18 8 C 19.104569 8 20 7.1046 20 6 C 20 4.8954 19.104569 4 18 4 L 17 4 L 16 4 L 9 4 L 8 4 z "
+     />
+ </svg>
diff --git a/loleaflet/js/toolbar.js b/loleaflet/js/toolbar.js
index dc3598b60..a5f751807 100644
--- a/loleaflet/js/toolbar.js
+++ b/loleaflet/js/toolbar.js
@@ -379,6 +379,22 @@ var shapes = {
 
 		{img: 'arrowshapes_split-round-arrow', uno: 'ArrowShapes.split-round-arrow'},
 		{img: 'arrowshapes_s-sharped-arrow', uno: 'ArrowShapes.s-sharped-arrow'}
+	],
+
+	'Star': [
+		{img: 'starshapes_bang', uno: 'StarShapes.bang'},
+		{img: 'starshapes_star4', uno: 'StarShapes.star4'},
+		{img: 'starshapes_star5', uno: 'StarShapes.star5'},
+		{img: 'starshapes_star6', uno: 'StarShapes.star6'},
+		{img: 'starshapes_star8', uno: 'StarShapes.star8'},
+		{img: 'starshapes_star12', uno: 'StarShapes.star12'},
+
+		{img: 'starshapes_star24', uno: 'StarShapes.star24'},
+		{img: 'starshapes_concave-star6', uno: 'StarShapes.concave-star6'},
+		{img: 'starshapes_vertical-scroll', uno: 'StarShapes.vertical-scroll'},
+		{img: 'starshapes_horizontal-scroll', uno: 'StarShapes.horizontal-scroll'},
+		{img: 'starshapes_signet', uno: 'StarShapes.signet'},
+		{img: 'starshapes_doorplate', uno: 'StarShapes.doorplate'}
 	]
 };