diff --git a/addons/auction/wizard/auction_lots_auction_move_view.xml b/addons/auction/wizard/auction_lots_auction_move_view.xml
index 52c82cf8483..cd81bfbb633 100644
--- a/addons/auction/wizard/auction_lots_auction_move_view.xml
+++ b/addons/auction/wizard/auction_lots_auction_move_view.xml
@@ -14,7 +14,7 @@
                     <separator string="" colspan="4" />
                     <group colspan="4" col="4">
                         <label string=" " colspan="2"/>
-                    	<button  icon="gtk-cancel" special="cancel" string="Cancel"/>
+                    	<button  icon="gtk-close" special="cancel" string="Close"/>
                     	<button  icon="gtk-redo" string="Move to Auction date" name="auction_move_set" type="object"/>
                    </group>
                </form>
diff --git a/addons/auction/wizard/auction_lots_buyer_map.py b/addons/auction/wizard/auction_lots_buyer_map.py
index f624de85a56..c54dfc55002 100644
--- a/addons/auction/wizard/auction_lots_buyer_map.py
+++ b/addons/auction/wizard/auction_lots_buyer_map.py
@@ -53,7 +53,7 @@ class wiz_auc_lots_buyer_map(osv.osv_memory):
         res.update(self._start(cr, uid, context.get('active_ids', []), context))
         return res
     
-    def _start(self, cr, uid, ids, context):
+    def _start(self, cr, uid, ids, context=None):
         """ 
          Returns login if already there in the selected record.
          @param self: The object pointer.
@@ -63,6 +63,8 @@ class wiz_auc_lots_buyer_map(osv.osv_memory):
          @param context: A standard dictionary 
          @return: login field from current record. 
         """
+        if not context:
+            context={}
         lots_obj = self.pool.get('auction.lots')
         for rec in lots_obj.browse(cr, uid, ids, context):
             if (len(ids)==1) and (not rec.ach_uid and not rec.ach_login):
@@ -71,7 +73,7 @@ class wiz_auc_lots_buyer_map(osv.osv_memory):
                 return {'ach_login': rec.ach_login}
         return {}
     
-    def buyer_map_set(self, cr, uid, ids, context):
+    def buyer_map_set(self, cr, uid, ids, context=None):
         """ 
          To map the buyer and login name.
          @param self: The object pointer.
@@ -80,6 +82,8 @@ class wiz_auc_lots_buyer_map(osv.osv_memory):
          @param ids: List of ids 
          @param context: A standard dictionary 
         """
+        if not context:
+            context={}
         rec_ids = context and context.get('active_ids',[]) or []
         assert rec_ids, _('Active IDs not Found')
         lots_obj = self.pool.get('auction.lots')
diff --git a/addons/auction/wizard/auction_lots_buyer_map_view.xml b/addons/auction/wizard/auction_lots_buyer_map_view.xml
index 68225c50391..289713f0c0d 100644
--- a/addons/auction/wizard/auction_lots_buyer_map_view.xml
+++ b/addons/auction/wizard/auction_lots_buyer_map_view.xml
@@ -16,8 +16,9 @@
 				    <field name="ach_uid" colspan="4"/>
 				    <separator colspan="4"/>
 				    <group col="4" colspan="4">
-				    	<button icon='gtk-cancel' special="cancel"
-                			string="Exit" />
+				        <label string="" colspan="2"/> 
+				    	<button icon='gtk-close' special="cancel"
+                			string="Close" />
                 		<button name="buyer_map_set" string="Update"
                 			colspan="2" type="object" icon="gtk-go-forward" />
 				    </group>
diff --git a/addons/auction/wizard/auction_lots_cancel.py b/addons/auction/wizard/auction_lots_cancel.py
index 35207ff3bfc..195323e32d5 100644
--- a/addons/auction/wizard/auction_lots_cancel.py
+++ b/addons/auction/wizard/auction_lots_cancel.py
@@ -29,7 +29,7 @@ class auction_lots_cancel(osv.osv):
         _name = 'auction.lots.cancel'
         _description = 'To cancel auction lots.'
         
-        def cancel(self, cr, uid, ids, context):
+        def cancel(self, cr, uid, ids, context=None):
             """ 
             To cancel the auction lot
     
@@ -40,10 +40,11 @@ class auction_lots_cancel(osv.osv):
             @param context: A standard dictionary 
             @return: 
             """
-
+            if not context:
+                context={}
             lots_obj = self.pool.get('auction.lots')
             invoice_obj = self.pool.get('account.invoice')
-            lot = lots_obj.browse(cr, uid, context['active_id'], context)
+            lot = lots_obj.browse(cr, uid, context.get('active_id', False), context)
             if lot.ach_inv_id:
                     supplier_refund_inv_id = invoice_obj.refund(cr, uid, [lot.ach_inv_id.id])
             if lot.sel_inv_id:
diff --git a/addons/auction/wizard/auction_lots_cancel_view.xml b/addons/auction/wizard/auction_lots_cancel_view.xml
index 77ff6a373b7..8160beb269d 100644
--- a/addons/auction/wizard/auction_lots_cancel_view.xml
+++ b/addons/auction/wizard/auction_lots_cancel_view.xml
@@ -8,8 +8,8 @@
                                 <field name="arch" type="xml">
                                       <form string="Cancel Payment">
                                                             <label string="Are you sure you want to refund this invoice ?"/>
-                                                            <button icon='gtk-cancel' special="cancel"
-                                                string="Cancel" />
+                                                            <button icon='gtk-close' special="cancel"
+                                                string="Close" />
                                                 <button name="cancel" string="Cancel Payment"
                                                 colspan="1" type="object" icon="gtk-ok" />
                                          </form>
diff --git a/addons/auction/wizard/auction_pay_buy_view.xml b/addons/auction/wizard/auction_pay_buy_view.xml
index 0a9a3a6dcee..c5fb4c24f53 100644
--- a/addons/auction/wizard/auction_pay_buy_view.xml
+++ b/addons/auction/wizard/auction_pay_buy_view.xml
@@ -20,7 +20,7 @@
                     </group>
                        	<separator string="" colspan="4" />
                     <group colspan="4" col="6">
-                    	<button icon="gtk-cancel" special="cancel" string="Cancel"/>
+                    	<button icon="gtk-close" special="cancel" string="Close"/>
                     	<button icon="gtk-yes"  string="Pay" name="pay_and_reconcile" type="object"/>
                    </group>
                </form>