diff --git a/grade/grading/form/guide/pix/icon.png b/grade/grading/form/guide/pix/icon.png
index f1af82f2512..df0483db96b 100644
Binary files a/grade/grading/form/guide/pix/icon.png and b/grade/grading/form/guide/pix/icon.png differ
diff --git a/grade/grading/form/guide/pix/icon.svg b/grade/grading/form/guide/pix/icon.svg
new file mode 100644
index 00000000000..9e367fa5e68
--- /dev/null
+++ b/grade/grading/form/guide/pix/icon.svg
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 15.1.0, SVG Export Plug-In  -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
+	<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
+]>
+<svg version="1.1"
+	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
+	 x="0px" y="0px" width="16px" height="16px" viewBox="0 0 16 16" style="overflow:visible;enable-background:new 0 0 16 16;"
+	 xml:space="preserve" preserveAspectRatio="xMinYMid meet">
+<defs>
+</defs>
+<path style="fill:#999999;" d="M15,0H1C0.5,0,0,0.5,0,1v14c0,0.5,0.5,1,1,1h14c0.5,0,1-0.5,1-1V1C16,0.5,15.5,0,15,0z M8,14H2v-2h6
+	V14z M8,11H2V9h6V11z M8,8H2V6h6V8z M11,14H9v-2h2V14z M11,11H9V9h2V11z M11,8H9V6h2V8z M14,14h-2v-2h2V14z M14,11h-2V9h2V11z M14,8
+	h-2V6h2V8z"/>
+</svg>
diff --git a/grade/grading/form/guide/styles.css b/grade/grading/form/guide/styles.css
index 9a18aea84a7..8ea947c67ff 100644
--- a/grade/grading/form/guide/styles.css
+++ b/grade/grading/form/guide/styles.css
@@ -35,12 +35,12 @@
 .gradingform_guide.editor .delete input,
 .gradingform_guide.editor .moveup input,
 .gradingform_guide.editor .movedown input{text-indent: -1000em;cursor:pointer;border:none;}
-.gradingform_guide.editor .criterion .controls .delete input {width:20px;height:16px;background: transparent url([[pix:i/cross_red_big]]) no-repeat center top;}
+.gradingform_guide.editor .criterion .controls .delete input {width:20px;height:16px;background: transparent url([[pix:t/delete]]) no-repeat center top;margin-top:4px;}
 .gradingform_guide.editor .moveup input {width:20px;height:15px;background: transparent url([[pix:t/up]]) no-repeat center top;margin-top:4px;}
 .gradingform_guide.editor .movedown input {width:20px;height:15px;background: transparent url([[pix:t/down]]) no-repeat center top;margin-top:4px;}
 
 .gradingform_guide.editor .addcriterion input,
-.gradingform_guide.editor .addcomment input {background: transparent url([[pix:t/addgreen]]) no-repeat;display:block;color:#555555;font-weight:bold;text-decoration:none;}
+.gradingform_guide.editor .addcomment input {background: transparent url([[pix:t/add]]) no-repeat;display:block;color:#555555;font-weight:bold;text-decoration:none;}
 .gradingform_guide.editor .addcriterion input,
 .gradingform_guide.editor .addcomment input {background-position: 5px 8px;height:30px;line-height:29px;margin-bottom:14px;padding-left:20px;padding-right:10px;}
 
diff --git a/grade/grading/form/rubric/pix/icon.png b/grade/grading/form/rubric/pix/icon.png
index f1af82f2512..df0483db96b 100644
Binary files a/grade/grading/form/rubric/pix/icon.png and b/grade/grading/form/rubric/pix/icon.png differ
diff --git a/grade/grading/form/rubric/pix/icon.svg b/grade/grading/form/rubric/pix/icon.svg
new file mode 100644
index 00000000000..9e367fa5e68
--- /dev/null
+++ b/grade/grading/form/rubric/pix/icon.svg
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 15.1.0, SVG Export Plug-In  -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
+	<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
+]>
+<svg version="1.1"
+	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
+	 x="0px" y="0px" width="16px" height="16px" viewBox="0 0 16 16" style="overflow:visible;enable-background:new 0 0 16 16;"
+	 xml:space="preserve" preserveAspectRatio="xMinYMid meet">
+<defs>
+</defs>
+<path style="fill:#999999;" d="M15,0H1C0.5,0,0,0.5,0,1v14c0,0.5,0.5,1,1,1h14c0.5,0,1-0.5,1-1V1C16,0.5,15.5,0,15,0z M8,14H2v-2h6
+	V14z M8,11H2V9h6V11z M8,8H2V6h6V8z M11,14H9v-2h2V14z M11,11H9V9h2V11z M11,8H9V6h2V8z M14,14h-2v-2h2V14z M14,11h-2V9h2V11z M14,8
+	h-2V6h2V8z"/>
+</svg>
diff --git a/grade/grading/form/rubric/styles.css b/grade/grading/form/rubric/styles.css
index 4d8e705424c..50a6b37df51 100644
--- a/grade/grading/form/rubric/styles.css
+++ b/grade/grading/form/rubric/styles.css
@@ -97,15 +97,16 @@
 .gradingform_rubric.editor .delete input,
 .gradingform_rubric.editor .moveup input,
 .gradingform_rubric.editor .movedown input{text-indent: -1000em;cursor:pointer;border:none;}
-.gradingform_rubric.editor .criterion .controls .delete input {width:20px;height:16px;background: transparent url([[pix:i/cross_red_big]]) no-repeat center top;}
-.gradingform_rubric.editor .levels .level .delete input {width:20px;height:16px;background: transparent url([[pix:i/cross_red_small]]) no-repeat center top;}
-.gradingform_rubric.editor .moveup input {width:20px;height:15px;background: transparent url([[pix:t/up]]) no-repeat center top;margin-top:4px;}
-.gradingform_rubric.editor .movedown input {width:20px;height:15px;background: transparent url([[pix:t/down]]) no-repeat center top;margin-top:4px;}
+.gradingform_rubric.editor .criterion .controls .delete input {width:12px;height:12px;background: transparent url([[pix:t/delete]]) no-repeat center top; margin: .3em .3em 0 .3em;}
+.gradingform_rubric.editor .levels .level .delete input {width:12px;height:16px;background: transparent url([[pix:t/delete]]) no-repeat center center; }
+.dir-rtl .gradingform_rubric.editor .levels .level .delete input { margin-right: .45em; margin-left: 0; }
+.gradingform_rubric.editor .moveup input {width:12px;height:12px;background: transparent url([[pix:t/up]]) no-repeat center top; margin: .3em .3em 0 .3em; }
+.gradingform_rubric.editor .movedown input {width:12px;height:12px;background: transparent url([[pix:t/down]]) no-repeat center top; margin: .3em .3em 0 .3em; }
 
 .gradingform_rubric.editor .addcriterion input,
-.gradingform_rubric.editor .addlevel input {background: transparent url([[pix:t/addgreen]]) no-repeat;display:block;color:#555555;font-weight:bold;text-decoration:none;}
+.gradingform_rubric.editor .addlevel input {background: transparent url([[pix:t/add]]) no-repeat top left ;display:block;color:#555555;font-weight:bold;text-decoration:none;}
 .gradingform_rubric.editor .addcriterion input {background-position: 5px 8px;height:30px;line-height:29px;margin-bottom:14px;padding-left:20px;padding-right:10px;}
-.gradingform_rubric.editor .addlevel input {background-position: 5px 6px;height:25px;line-height:24px;margin-bottom:10px;padding-left:18px;padding-right:8px;}
+.gradingform_rubric.editor .addlevel input {background-position: 5px 5px;height:25px;line-height:24px;margin-bottom:10px;padding-left:18px;padding-right:8px;}
 
 .gradingform_rubric .options .optionsheading {font-weight:bold;font-size:1.1em;padding-bottom:5px;}
 .gradingform_rubric .options .option {padding-bottom:2px;}
diff --git a/theme/upgrade.txt b/theme/upgrade.txt
index 0c3cc5fbb2e..0c57b65f2ec 100644
--- a/theme/upgrade.txt
+++ b/theme/upgrade.txt
@@ -21,6 +21,7 @@ deprecation:
 * i/tick_green_big: Use i/valid or i/grade_correct
 * i/tick_amber_big: Use i/caution or i/grade_partiallycorrect
 * No more small versions of i/cross_red_small, i/tick_green_small and i/tick_amber_small, use their big equivalent.
+* t/addgreen: Use t/add instead.
 
 optional changes:
 * new optional boolean parameter $withlinks for public function login_info() in lib/outputrenderers.php (MDL-31365)