diff --git a/layouts/v7/modules/Vtiger/resources/Field.js b/layouts/v7/modules/Vtiger/resources/Field.js
index 5bbed20b1ddbf429bb41cfa295fe2f08c5620dee..43587a9a0f694f04e985a8c75be82cf13c80ff15 100644
--- a/layouts/v7/modules/Vtiger/resources/Field.js
+++ b/layouts/v7/modules/Vtiger/resources/Field.js
@@ -475,7 +475,7 @@ Vtiger_Field_Js('Vtiger_Date_Field_Js',{},{
 	 */
 	getUi : function() {
 		//wrappig with another div for consistency
-		var html = '<div class="referencefield-wrapper"><div class="input-group date">'+
+		var html = '<div class=""><div class="input-group date">'+
 						'<input class="inputElement dateField form-control" type="text" data-rule-date="true" data-format="'+ this.getDateFormat() +'" name="'+ this.getName() +'" value="'+ this.getValue() + '" />'+
 						'<span class="input-group-addon"><i class="fa fa-calendar"></i></span>'+
 					'</div></div>';
@@ -495,9 +495,9 @@ Vtiger_Field_Js('Vtiger_Currency_Field_Js',{},{
 
 	getUi : function() {
 		//wrappig with another div for consistency
-		var html = '<div class="referencefield-wrapper"><div class="input-group">'+
+		var html = '<div class=""><div class="input-group">'+
 						'<span class="input-group-addon" id="basic-addon1">'+this.getCurrencySymbol()+'</span>'+
-						'<input class="inputElement" type="text" name="'+ this.getName() +'" data-rule-currency="true" value="'+ this.getValue() + '" />'+
+						'<input class="inputElement width100per" type="text" name="'+ this.getName() +'" data-rule-currency="true" value="'+ this.getValue() + '" />'+
 					'</div></div>';
 		var element = jQuery(html);
 		return this.addValidationToElement(element);
@@ -560,7 +560,7 @@ Vtiger_Field_Js('Vtiger_Time_Field_Js',{},{
 	 * @return - input text field
 	 */
 	getUi : function() {
-		var html = '<div class="referencefield-wrapper">'+'<div class="input-group time">'+
+		var html = '<div class="">'+'<div class="input-group time">'+
 						'<input class="timepicker-default form-control inputElement" type="text" data-format="'+ this.getTimeFormat() +'" name="'+ this.getName() +'" value="'+ this.getValue() + '" />'+
 						'<span class="input-group-addon"><i class="fa fa-clock-o"></i></span>'+
 					'</div>'+'</div>';
diff --git a/layouts/v7/modules/Vtiger/uitypes/Currency.tpl b/layouts/v7/modules/Vtiger/uitypes/Currency.tpl
index 2b7ca02d7f9381b786ee7ebd92a3154c407bceca..fb79b42457c8abdb1984c19b56ed3ed1bb1914d5 100644
--- a/layouts/v7/modules/Vtiger/uitypes/Currency.tpl
+++ b/layouts/v7/modules/Vtiger/uitypes/Currency.tpl
@@ -16,8 +16,8 @@
     {assign var="FIELD_NAME" value=$FIELD_MODEL->getFieldName()}
 {/if}
 {if $FIELD_MODEL->get('uitype') eq '71'}
-<div class="input-group">
-	<span class="input-group-addon">{$USER_MODEL->get('currency_symbol')}</span>
+<div class="input-group inputElement">
+	<span class="input-group-addon input-group-addon-right">{$USER_MODEL->get('currency_symbol')}</span>
 	<input id="{$MODULE}_editView_fieldName_{$FIELD_NAME}" type="text" class="inputElement currencyField" name="{$FIELD_NAME}"
 	value="{$FIELD_MODEL->getEditViewDisplayValue($FIELD_MODEL->get('fieldvalue'))}" {if !empty($SPECIAL_VALIDATOR)}data-validator='{Zend_Json::encode($SPECIAL_VALIDATOR)}'{/if}
     {if $FIELD_INFO["mandatory"] eq true} data-rule-required = "true" {/if} data-rule-currency='true'
diff --git a/layouts/v7/skins/vtiger/style.less b/layouts/v7/skins/vtiger/style.less
index bb8ce42475d8eba3a3c6cd0d553c90c206a74500..6a6beb2e4010d2fc5dae84186f916caf83d98cc9 100644
--- a/layouts/v7/skins/vtiger/style.less
+++ b/layouts/v7/skins/vtiger/style.less
@@ -2679,6 +2679,12 @@ strong, b, th{
     border-left:1px solid #ddd;  
 }
 
+.input-group.inputElement .input-group-addon-right{
+    border:none;
+    border-left:0px;
+    border-right:1px solid #ddd;
+}
+
 .fieldBlockContainer textarea.inputElement{
     height : auto;
 }
@@ -6292,6 +6298,9 @@ hr{
 .width75per{
     width: 75%;
 }
+.width100per{
+    width: 100% !important;
+}
 #_mbox_pwd{
     padding: 3px 8px;
 }
@@ -6896,7 +6905,7 @@ div.tooltip-inner{
     width:80% !important;
 }
 .input-group-addon{
-    line-height: 1.5;
+    line-height: inherit;
     border-width: thin;
 }
 .input-group{