diff --git a/mod/data/field/picture/mod.html b/mod/data/field/picture/mod.html
index f570b62b99c..18ccad60654 100755
--- a/mod/data/field/picture/mod.html
+++ b/mod/data/field/picture/mod.html
@@ -3,10 +3,10 @@
 <?php echo ($this->name()); ?></td></tr>
 <tr><td><?php echo get_string('fieldname', 'data');?>:</td><td><input style="width:300px;" type="text" name="name" id="name" value = "<?php echo($field->name); ?>" /></td></tr>
 <tr><td><?php echo get_string('fielddescription', 'data');?>:</td><td><input style="width:300px;" type="text" name="description" id="description" value = "<? echo ($field->description);?>" /></td></tr>
-<tr><td><?php echo get_string('fieldwidthsingleview', 'data');?>:</td><td><input style="width:70px;" type="text" name="param1" id="param1" value = "<? echo ($field->param1);?>" />
-<tr><td><?php echo get_string('fieldheightsingleview', 'data');?>:</td><td><input style="width:70px;" type="text" name="param2" id="param2" value = "<? echo ($field->param2);?>" />
-<tr><td><?php echo get_string('fieldwidthlistview', 'data');?>:</td><td><input style="width:70px;" type="text" name="param4" id="param4" value = "<? echo ($field->param4);?>" />
-<tr><td><?php echo get_string('fieldheightlistview', 'data');?>:</td><td><input style="width:70px;" type="text" name="param5" id="param5" value = "<? echo ($field->param5);?>" />
+<tr><td><?php echo get_string('fieldwidthsingleview', 'data');?>:</td><td><input style="width:70px;" type="text" name="param1" id="param1" value = "<? if (!empty($field->param1)) echo $field->param1; ?>" />
+<tr><td><?php echo get_string('fieldheightsingleview', 'data');?>:</td><td><input style="width:70px;" type="text" name="param2" id="param2" value = "<? if (!empty($field->param2)) echo $field->param2; ?>" />
+<tr><td><?php echo get_string('fieldwidthlistview', 'data');?>:</td><td><input style="width:70px;" type="text" name="param4" id="param4" value = "<? if (!empty($field->param4)) echo $field->param4; ?>" />
+<tr><td><?php echo get_string('fieldheightlistview', 'data');?>:</td><td><input style="width:70px;" type="text" name="param5" id="param5" value = "<? if (!empty($field->param5)) echo $field->param5; ?>" />
 <tr><td><?php echo get_string('maxsize', 'data'); ?>:</td><td>
     <?php
         $choices = get_max_upload_sizes($CFG->maxbytes, $course->maxbytes);
diff --git a/mod/data/fields.php b/mod/data/fields.php
index 092a0457abc..42d06b34c72 100755
--- a/mod/data/fields.php
+++ b/mod/data/fields.php
@@ -267,7 +267,7 @@
 
                     echo '<td align="center">';
                     $g = data_get_field($field);
-                    echo $g->image();    //print type icon
+                    echo $g->image($data->id);    //print type icon
                     echo '</td></tr>';
                 }
             }
diff --git a/mod/data/lib.php b/mod/data/lib.php
index 73cf1f216b4..f3932c03fd1 100755
--- a/mod/data/lib.php
+++ b/mod/data/lib.php
@@ -45,10 +45,12 @@ class data_field_base {    //base class (text field)
     }
     
     //prints the respective type icon
-    function image(){
+    function image($dataid) {
         global $CFG;
-        return '<img src="'.$CFG->modpixpath.'/data/field/'.$this->type.'/icon.gif" height="16" width="16" border="0"
-                     alt="'.$this->type.'" title="'.$this->type.'">';
+        $str = '<a href="fields.php?d='.$dataid.'&amp;fid='.$this->id.'&amp;mode=display&amp;sesskey='.sesskey().'">';
+        $str .= '<img src="'.$CFG->modpixpath.'/data/field/'.$this->type.'/icon.gif" ';
+        $str .= 'height="16" width="16" border="0" alt="'.$this->type.'" title="'.$this->type.'" /></a>';
+        return $str;
     }
     
     function insert_field($dataid, $type='text', $name, $des='', $autolink=0){