diff --git a/admin/settings/badges.php b/admin/settings/badges.php
index cda847d1900..7e6f41e1096 100644
--- a/admin/settings/badges.php
+++ b/admin/settings/badges.php
@@ -26,7 +26,6 @@
 */
 
 global $SITE;
-require_once($CFG->libdir . '/badgeslib.php');
 
 if (!empty($CFG->enablebadges) && ($hassiteconfig || has_any_capability(array(
             'moodle/badges:viewawarded',
@@ -37,6 +36,8 @@ if (!empty($CFG->enablebadges) && ($hassiteconfig || has_any_capability(array(
             'moodle/badges:configuredetails',
             'moodle/badges:deletebadge'), $systemcontext))) {
 
+    require_once($CFG->libdir . '/badgeslib.php');
+
     $globalsettings = new admin_settingpage('badgesettings', new lang_string('badgesettings', 'badges'),
             array('moodle/badges:manageglobalsettings'));
 
diff --git a/badges/action.php b/badges/action.php
index f32e05b94f9..33181a57d1e 100644
--- a/badges/action.php
+++ b/badges/action.php
@@ -91,6 +91,7 @@ if ($delete) {
 }
 
 if ($copy) {
+    require_sesskey();
     require_capability('moodle/badges:createbadge', $context);
 
     $cloneid = $badge->make_clone();
diff --git a/badges/index.php b/badges/index.php
index d7f40b4727f..64d6fe88fc8 100644
--- a/badges/index.php
+++ b/badges/index.php
@@ -124,6 +124,7 @@ if ($activate && has_capability('moodle/badges:configuredetails', $PAGE->context
             $badge->set_status(BADGE_STATUS_ACTIVE_LOCKED);
             $msg = get_string('activatesuccess', 'badges');
         } else {
+            require_sesskey();
             $badge->set_status(BADGE_STATUS_ACTIVE);
             $msg = get_string('activatesuccess', 'badges');
         }
@@ -136,6 +137,7 @@ if ($activate && has_capability('moodle/badges:configuredetails', $PAGE->context
         $badge->set_status(BADGE_STATUS_INACTIVE_LOCKED);
         $msg = get_string('deactivatesuccess', 'badges');
     } else {
+        require_sesskey();
         $badge->set_status(BADGE_STATUS_INACTIVE);
         $msg = get_string('deactivatesuccess', 'badges');
     }
diff --git a/lang/en/badges.php b/lang/en/badges.php
index 82be8671c94..d8ea4214622 100644
--- a/lang/en/badges.php
+++ b/lang/en/badges.php
@@ -49,7 +49,7 @@ $string['allowcoursebadges_desc'] = 'Allow badges to be created and awarded in c
 $string['allowexternalbackpack'] = 'Enable connection to external backpacks';
 $string['allowexternalbackpack_desc'] = 'Allow users to set up connections and display badges from their external backpack providers.
 
-Note: It is recommended to leave this option disabled if the web site cannot be accesed from the internet (e.g. because of the firewall).';
+Note: It is recommended to leave this option disabled if the web site cannot be accessed from the internet (e.g. because of the firewall).';
 $string['any'] = 'Any';
 $string['anymethod'] = 'Any of the selected conditions is met';
 $string['anymethodactivity'] = 'Any of the selected activities is complete';
diff --git a/lib/navigationlib.php b/lib/navigationlib.php
index ad9943ffbc5..61331f0816f 100644
--- a/lib/navigationlib.php
+++ b/lib/navigationlib.php
@@ -2182,7 +2182,7 @@ class global_navigation extends navigation_node {
             $usernode->add(get_string('myfiles'), $url, self::TYPE_SETTING);
         }
 
-        if ($CFG->enablebadges && $iscurrentuser &&
+        if (!empty($CFG->enablebadges) && $iscurrentuser &&
                 has_capability('moodle/badges:manageownbadges', context_user::instance($USER->id))) {
             $url = new moodle_url('/badges/mybadges.php');
             $usernode->add(get_string('mybadges', 'badges'), $url, self::TYPE_SETTING);
@@ -2511,7 +2511,7 @@ class global_navigation extends navigation_node {
         }
 
         //Badges
-        if ($CFG->enablebadges && has_capability('moodle/badges:viewbadges', $this->page->context)) {
+        if (!empty($CFG->enablebadges) && has_capability('moodle/badges:viewbadges', $this->page->context)) {
             $url = new moodle_url($CFG->wwwroot . '/badges/view.php', array('type' => 1));
             $coursenode->add(get_string('sitebadges', 'badges'), $url, navigation_node::TYPE_CUSTOM);
         }
diff --git a/lib/pluginlib.php b/lib/pluginlib.php
index f5fba435048..f3d408762d3 100644
--- a/lib/pluginlib.php
+++ b/lib/pluginlib.php
@@ -408,7 +408,7 @@ class plugin_manager {
             ),
 
             'block' => array(
-                'activity_modules', 'admin_bookmarks', 'blog_menu',
+                'activity_modules', 'admin_bookmarks', 'badges', 'blog_menu',
                 'blog_recent', 'blog_tags', 'calendar_month',
                 'calendar_upcoming', 'comments', 'community',
                 'completionstatus', 'course_list', 'course_overview',
diff --git a/pix/i/expired.svg b/pix/i/expired.svg
index 81de1061121..b4e103b6c3e 100644
--- a/pix/i/expired.svg
+++ b/pix/i/expired.svg
@@ -1,4 +1,4 @@
-<svg width="150" height="150" xmlns="http://www.w3.org/2000/svg">
+<svg width="150" height="150" xmlns="http://www.w3.org/2000/svg" preserveAspectRatio="xMinYMid meet">
  <!-- Created with SVG-edit - http://svg-edit.googlecode.com/ -->
  <g>
   <title>Layer 1</title>
diff --git a/pix/t/backpack.svg b/pix/t/backpack.svg
index e5b37e6808c..8ef038bfcfe 100644
--- a/pix/t/backpack.svg
+++ b/pix/t/backpack.svg
@@ -14,7 +14,7 @@
    id="svg3063"
    version="1.1"
    inkscape:version="0.48.3.1 r9886"
-   sodipodi:docname="backpack.svg">
+   sodipodi:docname="backpack.svg" preserveAspectRatio="xMinYMid meet">
   <defs
      id="defs3065" />
   <sodipodi:namedview