diff --git a/mod/assign/feedback/editpdf/db/install.php b/mod/assign/feedback/editpdf/db/install.php
new file mode 100644
index 00000000000..1214a6ad1f0
--- /dev/null
+++ b/mod/assign/feedback/editpdf/db/install.php
@@ -0,0 +1,53 @@
+<?php
+// This file is part of Moodle - http://moodle.org/
+//
+// Moodle is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// Moodle is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
+
+/**
+ * Install code for the feedback_editpdf module.
+ *
+ * @package   assignfeedback_editpdf
+ * @copyright 2013 Jerome Mouneyrac
+ * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ */
+
+defined('MOODLE_INTERNAL') || die();
+
+/**
+ * EditPDF install code
+ */
+function xmldb_assignfeedback_editpdf_install() {
+    global $CFG;
+
+    // List of default stamps.
+    $defaultstamps = array('smile.png', 'sad.png', 'tick.png', 'cross.png');
+
+    // Stamp file object.
+    $filerecord = new stdClass;
+    $filerecord->component = 'assignfeedback_editpdf';
+    $filerecord->contextid = context_system::instance()->id;
+    $filerecord->userid    = get_admin()->id;
+    $filerecord->filearea  = 'stamps';
+    $filerecord->filepath  = '/';
+    $filerecord->itemid    = 0;
+
+    $fs = get_file_storage();
+
+    // Load all default stamps.
+    foreach ($defaultstamps as $stamp) {
+        $filerecord->filename = $stamp;
+        $fs->create_file_from_pathname($filerecord,
+            $CFG->dirroot . '/mod/assign/feedback/editpdf/pix/' . $filerecord->filename);
+    }
+}
diff --git a/mod/assign/feedback/editpdf/db/upgrade.php b/mod/assign/feedback/editpdf/db/upgrade.php
new file mode 100644
index 00000000000..46ff47af8b8
--- /dev/null
+++ b/mod/assign/feedback/editpdf/db/upgrade.php
@@ -0,0 +1,68 @@
+<?php
+// This file is part of Moodle - http://moodle.org/
+//
+// Moodle is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// Moodle is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
+
+/**
+ * Upgrade code for the feedback_editpdf module.
+ *
+ * @package   assignfeedback_editpdf
+ * @copyright 2013 Jerome Mouneyrac
+ * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ */
+
+defined('MOODLE_INTERNAL') || die();
+
+/**
+ * EditPDF upgrade code
+ * @param int $oldversion
+ * @return bool
+ */
+function xmldb_assignfeedback_editpdf_upgrade($oldversion) {
+    global $CFG;
+
+    if ($oldversion < 2013110800) {
+
+        // Check that no stamps where uploaded.
+        $fs = get_file_storage();
+        $stamps = $fs->get_area_files(context_system::instance()->id, 'assignfeedback_editpdf',
+            'stamps', 0, "filename", false);
+
+        // Add default stamps.
+        if (empty($stamps)) {
+            // List of default stamps.
+            $defaultstamps = array('smile.png', 'sad.png', 'tick.png', 'cross.png');
+
+            // Stamp file object.
+            $filerecord = new stdClass;
+            $filerecord->component = 'assignfeedback_editpdf';
+            $filerecord->contextid = context_system::instance()->id;
+            $filerecord->userid    = get_admin()->id;
+            $filerecord->filearea  = 'stamps';
+            $filerecord->filepath  = '/';
+            $filerecord->itemid    = 0;
+
+            // Add all default stamps.
+            foreach ($defaultstamps as $stamp) {
+                $filerecord->filename = $stamp;
+                $fs->create_file_from_pathname($filerecord,
+                    $CFG->dirroot . '/mod/assign/feedback/editpdf/pix/' . $filerecord->filename);
+            }
+        }
+
+        upgrade_plugin_savepoint(true, 2013110800, 'assignfeedback', 'editpdf');
+    }
+
+    return true;
+}
diff --git a/mod/assign/feedback/editpdf/lang/en/assignfeedback_editpdf.php b/mod/assign/feedback/editpdf/lang/en/assignfeedback_editpdf.php
index a5046043d0c..cc1aed9202d 100644
--- a/mod/assign/feedback/editpdf/lang/en/assignfeedback_editpdf.php
+++ b/mod/assign/feedback/editpdf/lang/en/assignfeedback_editpdf.php
@@ -73,7 +73,7 @@ $string['result'] = 'Result:';
 $string['searchcomments'] = 'Search comments';
 $string['select'] = 'Select';
 $string['stamppicker'] = 'Stamp picker';
-$string['stampsdesc'] = 'Stamps must be image files. These images can be used with the stamp tool to annotate the PDF.';
+$string['stampsdesc'] = 'Stamps must be image files (recommended size: 40x40). These images can be used with the stamp tool to annotate the PDF.';
 $string['stamps'] = 'Stamps';
 $string['stamp'] = 'Stamp';
 $string['test_doesnotexist'] = 'The ghostscript path points to a non-existent file';
diff --git a/mod/assign/feedback/editpdf/pix/cross.png b/mod/assign/feedback/editpdf/pix/cross.png
new file mode 100644
index 00000000000..daf333d07db
Binary files /dev/null and b/mod/assign/feedback/editpdf/pix/cross.png differ
diff --git a/mod/assign/feedback/editpdf/pix/sad.png b/mod/assign/feedback/editpdf/pix/sad.png
new file mode 100644
index 00000000000..e87bf42ff68
Binary files /dev/null and b/mod/assign/feedback/editpdf/pix/sad.png differ
diff --git a/mod/assign/feedback/editpdf/pix/smile.png b/mod/assign/feedback/editpdf/pix/smile.png
new file mode 100644
index 00000000000..ec6d945f3cb
Binary files /dev/null and b/mod/assign/feedback/editpdf/pix/smile.png differ
diff --git a/mod/assign/feedback/editpdf/pix/tick.png b/mod/assign/feedback/editpdf/pix/tick.png
new file mode 100644
index 00000000000..a74ec2d298d
Binary files /dev/null and b/mod/assign/feedback/editpdf/pix/tick.png differ
diff --git a/mod/assign/feedback/editpdf/version.php b/mod/assign/feedback/editpdf/version.php
index 5772ee42dfc..bb75d3db615 100644
--- a/mod/assign/feedback/editpdf/version.php
+++ b/mod/assign/feedback/editpdf/version.php
@@ -24,7 +24,7 @@
 
 defined('MOODLE_INTERNAL') || die();
 
-$plugin->version   = 2013110500;
+$plugin->version   = 2013110800;
 $plugin->requires  = 2013110500;
 $plugin->component = 'assignfeedback_editpdf';