diff --git a/workflow/engine/templates/bpmn/Annotation.js b/workflow/engine/templates/bpmn/Annotation.js
index 3ffd4748f..6034f2067 100755
--- a/workflow/engine/templates/bpmn/Annotation.js
+++ b/workflow/engine/templates/bpmn/Annotation.js
@@ -10,6 +10,14 @@ bpmnAnnotation = function (_30ab ) {
    if(typeof workflow.zoomAnnotationWidth != 'undefined' || typeof workflow.zoomAnnotationHeight != 'undefined')
         this.setDimension(workflow.zoomAnnotationWidth, workflow.zoomAnnotationHeight);
 
+   //Setting width and height values as per the zoom ratio
+   if(typeof workflow.zoomType != 'undefined')
+   {
+       var zoomWidth = 110 * workflow.zoomType;
+       var zoomHeight = 60 * workflow.zoomType;
+       this.setDimension(zoomWidth, zoomHeight);
+   }
+
    this.setAnnotationName(_30ab.annotationName); //It will set the Default Task Name with appropriate count While dragging a task on the canvas
 };
 
diff --git a/workflow/engine/templates/bpmn/EventEmptyEnd.js b/workflow/engine/templates/bpmn/EventEmptyEnd.js
index 28a72e22c..cf9990e63 100755
--- a/workflow/engine/templates/bpmn/EventEmptyEnd.js
+++ b/workflow/engine/templates/bpmn/EventEmptyEnd.js
@@ -5,6 +5,14 @@ if(typeof workflow.zoomWidth != 'undefined' || typeof workflow.zoomHeight != 'un
       this.setDimension(workflow.zoomWidth, workflow.zoomHeight);
 else
     this.setDimension(30,30);
+
+//Setting width and height values as per the zoom ratio
+if(typeof workflow.zoomType != 'undefined')
+{
+   var zoomWidth = 30 * workflow.zoomType;
+   var zoomHeight = 30 * workflow.zoomType;
+   this.setDimension(zoomWidth, zoomHeight);
+}
 this.stroke=3;
 };
 bpmnEventEmptyEnd.prototype=new VectorFigure;
diff --git a/workflow/engine/templates/bpmn/EventEmptyStart.js b/workflow/engine/templates/bpmn/EventEmptyStart.js
index 09e946d86..da7acaf8d 100755
--- a/workflow/engine/templates/bpmn/EventEmptyStart.js
+++ b/workflow/engine/templates/bpmn/EventEmptyStart.js
@@ -5,6 +5,14 @@ if(typeof workflow.zoomWidth != 'undefined' || typeof workflow.zoomHeight != 'un
       this.setDimension(workflow.zoomWidth, workflow.zoomHeight);
 else
     this.setDimension(30,30);
+
+//Setting width and height values as per the zoom ratio
+if(typeof workflow.zoomType != 'undefined')
+{
+   var zoomWidth = 30 * workflow.zoomType;
+   var zoomHeight = 30 * workflow.zoomType;
+   this.setDimension(zoomWidth, zoomHeight);
+}
 this.stroke=2;
 };
 bpmnEventEmptyStart.prototype=new VectorFigure;
diff --git a/workflow/engine/templates/bpmn/GatewayComplex.js b/workflow/engine/templates/bpmn/GatewayComplex.js
index 3f1f2bccc..16a647414 100755
--- a/workflow/engine/templates/bpmn/GatewayComplex.js
+++ b/workflow/engine/templates/bpmn/GatewayComplex.js
@@ -5,6 +5,14 @@ if(typeof workflow.zoomWidth != 'undefined' || typeof workflow.zoomHeight != 'un
       this.setDimension(workflow.zoomWidth+10, workflow.zoomHeight+10);
 else
     this.setDimension(40,40);
+
+//Setting width and height values as per the zoom ratio
+if(typeof workflow.zoomType != 'undefined')
+{
+   var zoomWidth = 40 * workflow.zoomType;
+   var zoomHeight = 40 * workflow.zoomType;
+   this.setDimension(zoomWidth, zoomHeight);
+}
 this.stroke=2;
 };
 bpmnGatewayComplex.prototype=new VectorFigure;
diff --git a/workflow/engine/templates/bpmn/MyWorkflow.js b/workflow/engine/templates/bpmn/MyWorkflow.js
index bb27d3892..5af00e4ff 100755
--- a/workflow/engine/templates/bpmn/MyWorkflow.js
+++ b/workflow/engine/templates/bpmn/MyWorkflow.js
@@ -1770,6 +1770,7 @@ MyWorkflow.prototype.zoom = function(sType)
    
 
    sType =sType/100;
+   workflow.zoomType = sType;
    var figSize = figures.getSize();
    for(f = 0;f<figures.getSize();f++){
    var fig = figures.get(f);
diff --git a/workflow/engine/templates/bpmn/bpmnShapes.js b/workflow/engine/templates/bpmn/bpmnShapes.js
index 8c49be88c..a3f28bba8 100755
--- a/workflow/engine/templates/bpmn/bpmnShapes.js
+++ b/workflow/engine/templates/bpmn/bpmnShapes.js
@@ -11,10 +11,15 @@ bpmnTask = function (_30ab) {
    else
         this.setDimension(165, 40);
 
-   //Setting width and height values as per the zoom ratio
-   if(typeof workflow.zoomTaskWidth != 'undefined' || typeof workflow.zoomTaskHeight != 'undefined')
-        this.setDimension(workflow.zoomTaskWidth, workflow.zoomTaskHeight);
-    this.taskName = ''; //It will set the Default Task Name with appropriate count While dragging a task on the canvas
+      //Setting width and height values as per the zoom ratio
+   if(typeof workflow.zoomType != 'undefined')
+   {
+       var zoomWidth = 165 * workflow.zoomType;
+       var zoomHeight = 40 * workflow.zoomType;
+       this.setDimension(zoomWidth, zoomHeight);
+   }
+
+   this.taskName = ''; //It will set the Default Task Name with appropriate count While dragging a task on the canvas
 };
 
 bpmnTask.prototype = new VectorFigure;
@@ -44,12 +49,13 @@ bpmnTask.prototype.paint = function () {
     VectorFigure.prototype.paint.call(this);
 
     //Set the Task Limitation
-    if ((this.getWidth() > 200 || this.getHeight() > 100 ) && this.limitFlag != true) {
-        this.setDimension(200, 100);
-    }
-    else if ((this.getWidth() < 165 || this.getHeight() < 40) && this.limitFlag != true) {
-        this.setDimension(165, 40);
-    }
+//    if ((this.getWidth() > 200 || this.getHeight() > 100 ) && this.limitFlag != true) {
+//        this.setDimension(200, 100);
+//    }
+//    else if ((this.getWidth() < 165 || this.getHeight() < 40) && this.limitFlag != true) {
+//        this.setDimension(165, 40);
+//    }
+
 
     var x = new Array(6, this.getWidth() - 3, this.getWidth(), this.getWidth(), this.getWidth() - 3, 6, 3, 3, 6);
     var y = new Array(3, 3, 6, this.getHeight() - 3, this.getHeight(), this.getHeight(), this.getHeight() - 3, 6, 3);