diff --git a/public/modules/forms/admin/directives/edit-form.client.directive.js b/public/modules/forms/admin/directives/edit-form.client.directive.js
index e9254f81..a330dcf1 100644
--- a/public/modules/forms/admin/directives/edit-form.client.directive.js
+++ b/public/modules/forms/admin/directives/edit-form.client.directive.js
@@ -25,7 +25,8 @@ angular.module('forms').directive('editFormDirective', ['$rootScope', 'FormField
 				    items: '.sortable-fields',
 					forceHelperSize: true,
 					forcePlaceholderSize: true,
-					update: function(e, ui) {
+					stop: function(e, ui) {
+						debugger;
                         $scope.update(false, $scope.myform, true, false, function(err){
                         	if(err){
                         		console.error(err);
diff --git a/public/modules/forms/admin/directives/field-icon.client.directive.js b/public/modules/forms/admin/directives/field-icon.client.directive.js
index 967e9ce9..1d219de7 100644
--- a/public/modules/forms/admin/directives/field-icon.client.directive.js
+++ b/public/modules/forms/admin/directives/field-icon.client.directive.js
@@ -3,10 +3,10 @@
 angular.module('forms').directive('fieldIconDirective', function() {
 
     return {
-        template: '<i ng-class="iconTypeMap[typeName]"></i>',
+        template: '<i class="{{iconTypeMap[typeName]}}"></i>',
         restrict: 'E',
         scope: {
-            typeName: '@'
+            typeName: '='
         },
         controller: function($scope){
         	$scope.iconTypeMap = {
diff --git a/public/modules/forms/admin/views/directiveViews/form/edit-form.client.view.html b/public/modules/forms/admin/views/directiveViews/form/edit-form.client.view.html
index e57afef7..119dbf62 100644
--- a/public/modules/forms/admin/views/directiveViews/form/edit-form.client.view.html
+++ b/public/modules/forms/admin/views/directiveViews/form/edit-form.client.view.html
@@ -492,7 +492,7 @@
                 <div class="panel panel-default" style="background-color: #f5f5f5;">
                     <div class="panel-heading" ng-click="addNewField(type.name)" style="cursor: pointer; font-size:12px; padding-left: 10px; padding-right: 10px;">
                         <span>
-                            <field-icon-directive type-name="{{type.name}}">
+                            <field-icon-directive type-name="type.name">
                             </field-icon-directive>
                         </span>
 
@@ -533,7 +533,7 @@
 			                <div class="panel-heading">
 								<div class="row">
 									<span class="col-xs-1" ng-switch="field.fieldType">
-										<field-icon-directive type-name="{{field.fieldType}}">
+										<field-icon-directive type-name="field.fieldType">
 										</field-icon-directive>
 									</span>
 									<span class="col-xs-11">