diff --git a/app/controllers/bids_controller.rb b/app/controllers/bids_controller.rb
index 1ae04fa08..2273de4e4 100644
--- a/app/controllers/bids_controller.rb
+++ b/app/controllers/bids_controller.rb
@@ -732,9 +732,9 @@ class BidsController < ApplicationController
   def update
     @bid = Bid.find(params[:id])
     @project = @bid.courses.first#Project.find(params[:course_id])
-    if @bid.update_attributes(params[:bid])
+    @bid.save_attachments(params[:attachments] || (params[:bid] && params[:bid][:uploads]))
+    if @bid.update_attributes(params[:bid]) && @bid.save
       flash[:notice] = l(:label_update_homework_succeed)
-      #@project = Project.find(params[:course_id])
       redirect_to project_homework_path(@project)
     else
       @bid.safe_attributes = params[:bid]
diff --git a/public/images/edit.png b/public/images/edit.png
new file mode 100644
index 000000000..8335716fd
Binary files /dev/null and b/public/images/edit.png differ