diff --git a/app/Http/Controllers/Shop/CustomerController.php b/app/Http/Controllers/Shop/CustomerController.php
index 29c0ea33..4649fdd2 100644
--- a/app/Http/Controllers/Shop/CustomerController.php
+++ b/app/Http/Controllers/Shop/CustomerController.php
@@ -6,6 +6,7 @@ use Illuminate\Http\Request;
 use App\Http\Controllers\Controller;
 
 use App\Repositories\Shop\Customers;
+use Illuminate\Support\Facades\Auth;
 
 class CustomerController extends Controller
 {
@@ -17,10 +18,17 @@ class CustomerController extends Controller
 
     public function modalProfile($id = false)
     {
-        $data['old'] = Customers::get($id);
+        $data['customer'] = Customers::get($id);
         return view('Shop.Customers.partials.registration', $data);
     }
 
+    public function edit()
+    {
+        $id = Auth::id();
+        $data['customer'] = Customers::get($id);
+        return view('Shop.Customers.edit', $data);
+    }
+
     public function storeProfileAjax(Request $request)
     {
         $data = $request->all();
diff --git a/build/css/site.css b/build/css/site.css
index 7c931492..b1ba35c5 100644
--- a/build/css/site.css
+++ b/build/css/site.css
@@ -9,7 +9,10 @@ body {
 	background: linear-gradient(180deg, rgba(52,91,71,1) 0%, rgba(45,81,63,1) 10%, rgba(24,48,39,1) 90%, rgba(28,54,45,1) 100%);
 	background-size: cover;
   	background-attachment: fixed;
+}
 
+label {
+	margin-top: 0.5rem;
 }
 
 .gradient-green1 {
diff --git a/resources/views/Shop/Customers/edit.blade.php b/resources/views/Shop/Customers/edit.blade.php
new file mode 100644
index 00000000..42872289
--- /dev/null
+++ b/resources/views/Shop/Customers/edit.blade.php
@@ -0,0 +1,25 @@
+@extends('Shop.layout.layout', [
+	'title' => __('Editer son profil'),
+])
+
+@section('content')
+	<div class="row">
+		<div class="col-6">
+			<x-card title="Mes coordonnées" class="gradient-green1">
+				@include('Shop.Customers.partials.registration')
+			</x-card>
+		</div>
+		<div class="col-6">
+			<x-card title="Mes adresses de livraison" class="gradient-green1 mb-3">
+				@include('Shop.Customers.partials.addresses')
+			</x-card>
+
+			<x-card title="Mon mot de passe" class="gradient-green1">
+				@include('Shop.auth.passwords.password_confirmation')
+			</x-card>
+		</div>
+
+	</div>
+@endsection
+
+@include('load.layout.modal')
diff --git a/resources/views/Shop/Customers/partials/addresses.blade.php b/resources/views/Shop/Customers/partials/addresses.blade.php
new file mode 100644
index 00000000..ba8d223d
--- /dev/null
+++ b/resources/views/Shop/Customers/partials/addresses.blade.php
@@ -0,0 +1,21 @@
+@foreach ($addresses ?? [] as $address)
+    <div class="row">
+        <div class="col-1">
+            <x-form.radios.icheck name="address_id" val="{{ $address['id'] }}" id="address_{{ $address['id'] }}"/>
+        </div>
+        <div class="col-11">
+            {{ $address['address'] }}<br/>
+            @if ($address['address2']) 
+                {{ $address['address2'] }}<br/>
+            @endif
+            {{ $address['zipcode'] }} {{ $address['city'] }}            
+        </div>
+    </div>
+@endforeach
+
+<div class="row">
+    <div class="col-12 text-right">
+        <x-form.button id="add_address" icon="fa-plus" txt="Ajouter une adresse" class="btn-warning btn-sm" />
+    </div>
+</div>
+
diff --git a/resources/views/Shop/Customers/partials/user.blade.php b/resources/views/Shop/Customers/partials/user.blade.php
index 1af04e43..c68bc066 100644
--- a/resources/views/Shop/Customers/partials/user.blade.php
+++ b/resources/views/Shop/Customers/partials/user.blade.php
@@ -27,11 +27,14 @@
 @push('js')
     <script>
         $('#profile_edit').click(function() {
+            window.location.assign("{{ route('Shop.Customers.edit') }}");
+            /*
             openModal('Modification de vos coordonnées',
                 'profile-form',
                 "{{ route('Shop.Customers.modalProfile') }}/",
                 "{{ route('Shop.Customers.storeProfile') }}",
             );
+            */
         });
     </script>
 @endpush
\ No newline at end of file
diff --git a/resources/views/Shop/auth/passwords/change_password.blade.php b/resources/views/Shop/auth/passwords/change_password.blade.php
index 9acd1569..6853ee6e 100644
--- a/resources/views/Shop/auth/passwords/change_password.blade.php
+++ b/resources/views/Shop/auth/passwords/change_password.blade.php
@@ -13,28 +13,7 @@
 					<div class="row" style="padding: 10px 20px;">
 						<div class="col-xs-12 text-center" id="changePasswordMessage"></div>
 					</div>
-					<div class="row" style="padding: 10px 20px;">
-						<label for="new-password" class="col-md-6 control-label text-right">{{ __('current_password') }}</label>
-						<div class="col-md-6">
-							<input id="current-password" type="password" class="form-control" name="current-password" required>
-						</div>
-					</div>
-
-					<div class="row" style="padding: 10px 20px;">
-						<label for="new-password" class="col-md-6 control-label text-right">{{ __('new_password') }}</label>
-
-						<div class="col-md-6">
-							<input id="new-password" type="password" class="form-control" name="new-password" required>
-						</div>
-					</div>
-
-					<div class="row" style="padding: 10px 20px;">
-						<label for="new-password-confirm" class="col-md-6 control-label text-right">{{ __('confirm_new_password') }}</label>
-
-						<div class="col-md-6">
-							<input id="new-password-confirm" type="password" class="form-control" name="new-password_confirmation" required>
-						</div>
-					</div>
+					@include('Shop.auth.passwords.password_confirmation')
 				</div>
 				<div class="modal-footer">
 					<button type="button" class="btn btn-primary" id="changePassword-submit">
diff --git a/resources/views/Shop/auth/passwords/password_confirmation.blade.php b/resources/views/Shop/auth/passwords/password_confirmation.blade.php
new file mode 100644
index 00000000..85483d3d
--- /dev/null
+++ b/resources/views/Shop/auth/passwords/password_confirmation.blade.php
@@ -0,0 +1,22 @@
+<div class="row mb-3">
+    <label for="new-password" class="col-md-6 control-label text-right">Mot de passe actuel</label>
+    <div class="col-md-6">
+        <input id="current-password" type="password" class="form-control" name="current-password" required>
+    </div>
+</div>
+
+<div class="row mb-3">
+    <label for="new-password" class="col-md-6 control-label text-right">Nouveau mot de passe</label>
+
+    <div class="col-md-6">
+        <input id="new-password" type="password" class="form-control" name="new-password" required>
+    </div>
+</div>
+
+<div class="row mb-3">
+    <label for="new-password-confirm" class="col-md-6 control-label text-right">Confirmez votre mot de passe</label>
+
+    <div class="col-md-6">
+        <input id="new-password-confirm" type="password" class="form-control" name="new-password_confirmation" required>
+    </div>
+</div>
diff --git a/resources/views/components/form/input.blade.php b/resources/views/components/form/input.blade.php
index 5bb888db..7c53d4e3 100644
--- a/resources/views/components/form/input.blade.php
+++ b/resources/views/components/form/input.blade.php
@@ -1,7 +1,21 @@
-<input type="{{ $type ?? 'text'}}" name="{{ $name }}" id="{{ $id_name ?? str_slug($name,'-') }}" class="form-control {{ $class ?? ''}}" value="{{ $value ?? ''}}"
-@if (isset($required) && $required)required="required"@endif
-@if (isset($disabled) && $disabled)disabled="disabled"@endif
-@if (isset($mask))data-inputmask="'mask': '{{ $mask }}'"@endif
-@if (isset($placeholder))placeholder="{{ $placeholder }}"@endif
-{{ $meta ?? ''}}
->
+@include('components.form.label')
+
+@if (($disabled ?? false) || ($readonly ?? false))
+    @include('components.form.input', ['type' => 'hidden', 'label' => false, 'disabled' => false, 'readonly' => false])
+@endif
+
+<input type="{{ $type ?? 'text'}}" name="{{ $name }}" id="{{ $id_name ?? str_slug($name,'-') }}" class="form-control {{ $class ?? ''}}" value="{{ $value ?? null}}"
+@if ($required ?? false) required @endif
+@if ($disabled ?? false) disabled @endif
+@if ($readonly ?? false) readonly @endif
+@if ($autofocus ?? false) autofocus @endif
+@if ($size ?? false) size="{{ $size }}" @endif
+@if ($autocomplete ?? false) autocomplete="{{ $autocomplete }}" @endif
+@if ($minlength ?? false) minlength={{ $minlength }} @endif
+@if ($maxlength ?? false) maxlength={{ $maxlength }} @endif
+@if ($formid ?? false) form="{{ $formid }}" @endif
+@if ($mask ?? false) data-inputmask="'mask': '{{ $mask }}'" @endif
+@if ($pattern ?? false) pattern="{{ $pattern }}" @endif
+@if ($placeholder ?? false) placeholder="{{ $placeholder }}" @endif
+@if ($step ?? false) step="{{ $step }}" @endif
+{!! $meta ?? '' !!} >
diff --git a/resources/views/components/form/label.blade.php b/resources/views/components/form/label.blade.php
new file mode 100644
index 00000000..79393df4
--- /dev/null
+++ b/resources/views/components/form/label.blade.php
@@ -0,0 +1,6 @@
+@if ($label ?? false)
+    {{ Form::label($name ?? '', ucfirst($label) . (($required ?? false) ? ' *' : ''), [
+        'class' => ($classlabel ?? '')
+    ]) }}
+    @if (!($horizontal ?? false))<br/>@endif
+@endif