diff --git a/mod/data/lib.php b/mod/data/lib.php
index efd8adf33e9..41c1e03fcc9 100755
--- a/mod/data/lib.php
+++ b/mod/data/lib.php
@@ -429,8 +429,10 @@ class data_field_base {     // Base class for Database Field Types (see field/*/
     function image() {
         global $OUTPUT;
 
-        $str = '<a href="field.php?d='.$this->data->id.'&amp;fid='.$this->field->id.'&amp;mode=display&amp;sesskey='.sesskey().'">';
-        $str .= '<img src="'.$OUTPUT->pix_url('/field/' . $this->type . '/icon', 'data') . '" ';
+        $params = array('d'=>$this->data->id, 'fid'=>$this->field->id, 'mode'=>'display', 'sesskey'=>sesskey());
+        $link = new moodle_url('/mod/data/field.php', $params);
+        $str = '<a href="'.$link->out().'">';
+        $str .= '<img src="'.$OUTPUT->pix_url('field/'.$this->type, 'data') . '" ';
         $str .= 'height="'.$this->iconheight.'" width="'.$this->iconwidth.'" alt="'.$this->type.'" title="'.$this->type.'" /></a>';
         return $str;
     }
diff --git a/mod/data/field/checkbox/icon.gif b/mod/data/pix/field/checkbox.gif
similarity index 100%
rename from mod/data/field/checkbox/icon.gif
rename to mod/data/pix/field/checkbox.gif
diff --git a/mod/data/field/date/icon.gif b/mod/data/pix/field/date.gif
similarity index 100%
rename from mod/data/field/date/icon.gif
rename to mod/data/pix/field/date.gif
diff --git a/mod/data/field/file/icon.gif b/mod/data/pix/field/file.gif
similarity index 100%
rename from mod/data/field/file/icon.gif
rename to mod/data/pix/field/file.gif
diff --git a/mod/data/field/latlong/icon.gif b/mod/data/pix/field/latlong.gif
old mode 100644
new mode 100755
similarity index 100%
rename from mod/data/field/latlong/icon.gif
rename to mod/data/pix/field/latlong.gif
diff --git a/mod/data/field/menu/icon.gif b/mod/data/pix/field/menu.gif
similarity index 100%
rename from mod/data/field/menu/icon.gif
rename to mod/data/pix/field/menu.gif
diff --git a/mod/data/field/multimenu/icon.gif b/mod/data/pix/field/multimenu.gif
similarity index 100%
rename from mod/data/field/multimenu/icon.gif
rename to mod/data/pix/field/multimenu.gif
diff --git a/mod/data/field/number/icon.gif b/mod/data/pix/field/number.gif
similarity index 100%
rename from mod/data/field/number/icon.gif
rename to mod/data/pix/field/number.gif
diff --git a/mod/data/field/picture/icon.gif b/mod/data/pix/field/picture.gif
similarity index 100%
rename from mod/data/field/picture/icon.gif
rename to mod/data/pix/field/picture.gif
diff --git a/mod/data/field/radiobutton/icon.gif b/mod/data/pix/field/radiobutton.gif
similarity index 100%
rename from mod/data/field/radiobutton/icon.gif
rename to mod/data/pix/field/radiobutton.gif
diff --git a/mod/data/field/text/icon.gif b/mod/data/pix/field/text.gif
similarity index 100%
rename from mod/data/field/text/icon.gif
rename to mod/data/pix/field/text.gif
diff --git a/mod/data/field/textarea/icon.gif b/mod/data/pix/field/textarea.gif
similarity index 100%
rename from mod/data/field/textarea/icon.gif
rename to mod/data/pix/field/textarea.gif
diff --git a/mod/data/field/url/icon.gif b/mod/data/pix/field/url.gif
similarity index 100%
rename from mod/data/field/url/icon.gif
rename to mod/data/pix/field/url.gif