diff --git a/resources/views/partials/forms/edit/address.blade.php b/resources/views/partials/forms/edit/address.blade.php
index 12214b956b..556f44cdcf 100644
--- a/resources/views/partials/forms/edit/address.blade.php
+++ b/resources/views/partials/forms/edit/address.blade.php
@@ -1,35 +1,31 @@
-<div class="form-group {{ $errors->has('address') ? ' has-error' : '' }}">
-    <label for="address" class="col-md-3 control-label">{{ trans('general.address') }}</label>
-    <div class="col-md-7">
-        <input class="form-control" aria-label="address" maxlength="191" name="address" type="text" id="address" value="{{ old('address', $item->address) }}">
-        {!! $errors->first('address', '<span class="alert-msg" aria-hidden="true"><i class="fas fa-times" aria-hidden="true"></i> :message</span>') !!}
-    </div>
-</div>
+<x-form-row
+        :label="trans('general.address')"
+        :$item
+        :$errors
+        name="address"
+/>
 
-<div class="form-group {{ $errors->has('address2') ? ' has-error' : '' }}">
-    <label class="sr-only " for="address2">{{  trans('general.address')  }}</label>
-    <div class="col-md-7 col-md-offset-3">
-        <input class="form-control" aria-label="address2" maxlength="191" name="address2" type="text" value="{{ old('address2', $item->address2) }}">
-        {!! $errors->first('address2', '<span class="alert-msg" aria-hidden="true"><i class="fas fa-times" aria-hidden="true"></i> :message</span>') !!}
-    </div>
-</div>
+<x-form-row
+        :label="trans('general.address')"
+        :$item
+        :$errors
+        name="address2"
+/>
 
-<div class="form-group {{ $errors->has('city') ? ' has-error' : '' }}">
-    <label for="city" class="col-md-3 control-label">{{ trans('general.city') }}</label>
-    <div class="col-md-7">
-        <input class="form-control" aria-label="city" maxlength="191" name="city" type="text" id="city" value="{{ old('city', $item->city) }}">
-        {!! $errors->first('city', '<span class="alert-msg" aria-hidden="true"><i class="fas fa-times" aria-hidden="true"></i> :message</span>') !!}
-    </div>
-</div>
+<x-form-row
+        :label="trans('general.city')"
+        :$item
+        :$errors
+        name="city"
+/>
 
-<div class="form-group {{ $errors->has('state') ? ' has-error' : '' }}">
-    <label for="state" class="col-md-3 control-label">{{ trans('general.state') }}</label>
-    <div class="col-md-7">
-        <input class="form-control" aria-label="state" maxlength="191" name="state" type="text" id="state" value="{{ old('state', $item->state) }}">
-        {!! $errors->first('state', '<span class="alert-msg" aria-hidden="true"><i class="fas fa-times" aria-hidden="true"></i> :message</span>') !!}
-
-    </div>
-</div>
+<x-form-row
+        :label="trans('general.state')"
+        :$item
+        :$errors
+        name="state"
+        
+/>
 
 <div class="form-group {{ $errors->has('country') ? ' has-error' : '' }}">
     <label for="country" class="col-md-3 control-label">{{ trans('general.country') }}</label>
@@ -40,10 +36,11 @@
     </div>
 </div>
 
-<div class="form-group {{ $errors->has('zip') ? ' has-error' : '' }}">
-    <label for="zip" class="col-md-3 control-label" maxlength="10">{{ trans('general.zip') }}</label>
-    <div class="col-md-7">
-        <input class="form-control" name="zip" type="text" id="zip" value="{{ old('zip', $item->zip) }}">
-        {!! $errors->first('zip', '<span class="alert-msg" aria-hidden="true"><i class="fas fa-times" aria-hidden="true"></i> :message</span>') !!}
-    </div>
-</div>
+<x-form-row
+        :label="trans('general.zip')"
+        :$item
+        :$errors
+        name="zip"
+        maxlength="10"
+        input_div_class="col-md-3"
+/>