--- a/imageeditor/group/bld.inf	Thu Jun 03 18:57:10 2010 +0800
+++ b/imageeditor/group/bld.inf	Thu Jun 03 19:58:47 2010 +0800
@@ -38,7 +38,6 @@
 #include "../ImageEditorApp/group/bld.inf"
 
 /// Plugins
-//#ifdef RD_IE_DRAW_PLUGIN
 #include "../plugins/BlackWhitePlugin/group/bld.inf"
 #include "../plugins/NegativePlugin/group/bld.inf"
 #include "../plugins/SepiaPlugin/group/bld.inf"
@@ -55,10 +54,9 @@
 #include "../plugins/RotateRPlugin/group/bld.inf"
 #include "../plugins/ResizePlugin/group/bld.inf"
 #include "../plugins/TextPlugin/group/bld.inf"
+//#ifdef RD_IE_DRAW_PLUGIN
+#include "../plugins/DrawPlugin/group/bld.inf"
 //#endif // RD_IE_DRAW_PLUGIN
-//
-#include "../plugins/DrawPlugin/group/bld.inf"
-//
 // Editor AIW Provider
 #include "../EditorProvider/group/bld.inf"
 

--- a/imageeditor/plugins/DrawPlugin/src/imageeditordrawcontrol.cpp	Thu Jun 03 18:57:10 2010 +0800
+++ b/imageeditor/plugins/DrawPlugin/src/imageeditordrawcontrol.cpp	Thu Jun 03 19:58:47 2010 +0800
@@ -260,14 +260,14 @@
 	iLabels[2]->SetImage(svgFile, EMbmIcons_doodleUndo);
 	iLabels[2]->SetTooltip(_L("Undo"));
 
-	iLabels[3]->SetImage(svgFile, EMbmIcons_doodleSave);
-	iLabels[3]->SetTooltip(_L("Save"));
+	iLabels[3]->SetImage(svgFile, EMbmIcons_doodlePalette);
+	iLabels[3]->SetTooltip(_L("Redo"));
 
-	iLabels[4]->SetImage(svgFile, EMbmIcons_doodleMenu);
-	iLabels[4]->SetTooltip(_L("About"));
+	iLabels[4]->SetImage(svgFile, EMbmIcons_doodleSave);
+	iLabels[4]->SetTooltip(_L("Save"));
 
-	iLabels[5]->SetImage(svgFile, EMbmIcons_doodlePalette);
-	iLabels[5]->SetTooltip(_L("Redo"));
+	iLabels[5]->SetImage(svgFile, EMbmIcons_doodleMenu);
+	iLabels[5]->SetTooltip(_L("About"));
 
 	iLabels[6]->SetImage(svgFile, EMbmIcons_doodlePensize);
 	iLabels[6]->SetTooltip(_L("Null"));
@@ -1331,25 +1331,26 @@
 		iEditorView->HandleCommandL(EImageEditorCmdRender);
 		iUndo = EFalse;
 		}
-	//save and quit
+	//redo
 	else if (iLabels[3] == dynamic_cast<CImageLabel*> (aComponent))
 		{
-		iPopupController->HideInfoPopupNote();
-		StoreParameters(EFalse, ETrue);
-		iEditorView->HandleCommandL(EImageEditorApplyPlugin);
-		}
-	else if (iLabels[4] == dynamic_cast<CImageLabel*> (aComponent))
-		{
-		
-		}
-	else if (iLabels[5] == dynamic_cast<CImageLabel*> (aComponent))
-		{
 		iRedo = ETrue;
 		RedoDrawPath();
 		StoreParameters(EFalse, EFalse);
 		iEditorView->HandleCommandL(EImageEditorCmdRender);
 		iRedo = EFalse;
 		}
+	//save and exit
+	else if (iLabels[4] == dynamic_cast<CImageLabel*> (aComponent))
+		{
+		iPopupController->HideInfoPopupNote();
+		StoreParameters(EFalse, ETrue);
+		iEditorView->HandleCommandL(EImageEditorApplyPlugin);
+		}
+	else if (iLabels[5] == dynamic_cast<CImageLabel*> (aComponent))
+		{
+
+		}
 	else if (iLabels[6] == dynamic_cast<CImageLabel*> (aComponent))
 		{