diff --git a/mod/assignment/lib.php b/mod/assignment/lib.php
index 9b94a356be7..e599f510995 100644
--- a/mod/assignment/lib.php
+++ b/mod/assignment/lib.php
@@ -520,7 +520,6 @@ class assignment_base {
             case 'fastgrade':
                 ///do the fast grading stuff  - this process should work for all 3 subclasses
 
-                $mailinfo   = get_user_preferences('assignment_mailinfoqg', 1);
                 $grading    = false;
                 $commenting = false;
                 $col        = false;
@@ -1011,7 +1010,6 @@ class assignment_base {
             $perpage = ($perpage <= 0) ? 10 : $perpage ;
             set_user_preference('assignment_perpage', $perpage);
             set_user_preference('assignment_quickgrade', optional_param('quickgrade', 0, PARAM_BOOL));
-            set_user_preference('assignment_mailinfoqg', optional_param('mailinfoqg', 0, PARAM_BOOL));
         }
 
         /* next we get perpage and quickgrade (allow quick grade) params
@@ -1314,7 +1312,16 @@ class assignment_base {
         $table->print_html();  /// Print the whole table
 
         if ($quickgrade){
-            echo '<div style="text-align:center"><input type="submit" name="fastg" value="'.get_string('saveallfeedback', 'assignment').'" /></div>';
+            $lastmailinfo = get_user_preferences('assignment_mailinfo', 1) ? '' : 'checked="checked"';
+            echo '<div class="fgcontrols">';
+            echo '<div class="emailnotification">';
+            echo '<label for="mailinfo">'.get_string('disableemailnotification','assignment').'</label>';
+            echo '<input type="hidden" name="mailinfo" value="1" />';
+            echo '<input type="checkbox" id="mailinfo" name="mailinfo" value="0" '.$lastmailinfo.' />';
+            helpbutton('disableemailnotification', get_string('disableemailnotification', 'assignment'), 'assignment').'</p></div>';
+            echo '</div>';
+            echo '<div class="fastgbutton"><input type="submit" name="fastg" value="'.get_string('saveallfeedback', 'assignment').'" /></div>';
+            echo '</div>';
             echo '</form>';
         }
         /// End of fast grading form
@@ -1332,23 +1339,13 @@ class assignment_base {
         helpbutton('pagesize', get_string('pagesize','assignment'), 'assignment');
         echo '</td></tr>';
         echo '<tr><td>';
-        print_string('quickgrade','assignment');
+        echo '<label for="quickgrade">'.get_string('quickgrade','assignment').'</label>';
         echo '</td>';
         echo '<td>';
-        if ($quickgrade){
-            echo '<input type="checkbox" name="quickgrade" value="1" checked="checked" />';
-        } else {
-            echo '<input type="checkbox" name="quickgrade" value="1" />';
-        }
+        $checked = $quickgrade ? 'checked="checked"' : '';
+        echo '<input type="checkbox" id="quickgrade" name="quickgrade" value="1" '.$checked.' />';
         helpbutton('quickgrade', get_string('quickgrade', 'assignment'), 'assignment').'</p></div>';
         echo '</td></tr>';
-        echo '<tr><td>';
-        $lastmailinfoqg = get_user_preferences('assignment_mailinfoqg', 1) ? '' : 'checked="checked"';
-        echo '<label for="mailinfoqg">'.get_string('disableemailnotification','assignment').'</label></td><td>';
-        echo '<input type="hidden" name="mailinfoqg" value="1" />';
-        echo '<input type="checkbox" id="mailinfoqg" name="mailinfoqg" value="0" '.$lastmailinfoqg.' />';
-        helpbutton('disableemailnotification', get_string('disableemailnotification', 'assignment'), 'assignment').'</p></div>';
-        echo '</td></tr>';
         echo '<tr><td colspan="2">';
         echo '<input type="submit" value="'.get_string('savepreferences').'" />';
         echo '</td></tr></table>';
@@ -1679,7 +1676,7 @@ class assignment_base {
                         $ffurl = "$CFG->wwwroot/file.php?file=/$filearea/$file";
                     }
 
-                    $output .= '<img align="middle" src="'.$CFG->pixpath.'/f/'.$icon.'" class="icon" alt="'.$icon.'" />'.
+                    $output .= '<img src="'.$CFG->pixpath.'/f/'.$icon.'" class="icon" alt="'.$icon.'" />'.
                             '<a href="'.$ffurl.'" >'.$file.'</a><br />';
                 }
             }
diff --git a/mod/assignment/styles.php b/mod/assignment/styles.php
index 17b9ad761a6..54f310994e2 100644
--- a/mod/assignment/styles.php
+++ b/mod/assignment/styles.php
@@ -164,3 +164,13 @@
     text-align:right;
     margin-left:auto;
 }
+
+#mod-assignment-submissions .fgcontrols {
+    margin-top: 1em;
+    text-align:center;
+}
+
+#mod-assignment-submissions .fgcontrols .fastgbutton{
+    margin-top: 0.5em;
+}
+
diff --git a/mod/assignment/type/online/assignment.class.php b/mod/assignment/type/online/assignment.class.php
index e6a3dd66a4c..16cdbb351ef 100644
--- a/mod/assignment/type/online/assignment.class.php
+++ b/mod/assignment/type/online/assignment.class.php
@@ -177,7 +177,7 @@ class assignment_online extends assignment_base {
             return '';
         }
         $output = '<div class="files">'.
-                  '<img align="middle" src="'.$CFG->pixpath.'/f/html.gif" class="icon" alt="html" />'.
+                  '<img src="'.$CFG->pixpath.'/f/html.gif" class="icon" alt="html" />'.
                   link_to_popup_window ('/mod/assignment/type/online/file.php?id='.$this->cm->id.'&amp;userid='.
                   $submission->userid, 'file'.$userid, shorten_text(trim(strip_tags(format_text($submission->data1,$submission->data2))), 15), 450, 580,
                   get_string('submission', 'assignment'), 'none', true).
diff --git a/mod/assignment/type/upload/assignment.class.php b/mod/assignment/type/upload/assignment.class.php
index b2ad65f9496..7e81d71285c 100644
--- a/mod/assignment/type/upload/assignment.class.php
+++ b/mod/assignment/type/upload/assignment.class.php
@@ -397,7 +397,7 @@ class assignment_upload extends assignment_base {
 
                     $ffurl   = "$CFG->wwwroot/file.php?file=/$filearea/$file";
 
-                    $output .= '<a href="'.$ffurl.'" ><img class="align" src="'.$CFG->pixpath.'/f/'.$icon.'" alt="'.$icon.'" />'.$file.'</a>';
+                    $output .= '<a href="'.$ffurl.'" ><img src="'.$CFG->pixpath.'/f/'.$icon.'" alt="'.$icon.'" />'.$file.'</a>';
 
                     if ($candelete) {
                         $delurl  = "$CFG->wwwroot/mod/assignment/delete.php?id={$this->cm->id}&amp;file=$file&amp;userid=$userid&amp;mode=$mode&amp;offset=$offset&amp;action=response";
diff --git a/mod/assignment/type/uploadsingle/assignment.class.php b/mod/assignment/type/uploadsingle/assignment.class.php
index ba487639877..491538e9189 100644
--- a/mod/assignment/type/uploadsingle/assignment.class.php
+++ b/mod/assignment/type/uploadsingle/assignment.class.php
@@ -29,7 +29,7 @@ class assignment_uploadsingle extends assignment_base {
                     }
                     //died right here
                     //require_once($ffurl);                
-                    $output = '<img align="middle" src="'.$CFG->pixpath.'/f/'.$icon.'" class="icon" alt="'.$icon.'" />'.
+                    $output = '<img src="'.$CFG->pixpath.'/f/'.$icon.'" class="icon" alt="'.$icon.'" />'.
                             '<a href="'.$ffurl.'" >'.$file.'</a><br />';
                 }
             }