diff --git a/package.json b/package.json
index 5f4dd91a59..c5a3a91d56 100644
--- a/package.json
+++ b/package.json
@@ -13,7 +13,6 @@
   "dependencies": {
     "@coreui/coreui": "^2.1.12",
     "@coreui/icons": "^0.3.0",
-    "@danielfarrell/bootstrap-combobox": "^1.1.8",
     "bootstrap": "^4.3.1",
     "bootstrap-sweetalert": "^1.0.1",
     "cross-env": "^5.2.0",
diff --git a/public/mix-manifest.json b/public/mix-manifest.json
index 971ce383e5..8d93e3798d 100644
--- a/public/mix-manifest.json
+++ b/public/mix-manifest.json
@@ -9,8 +9,7 @@
     "/vendors/js/perfect-scrollbar.min.js": "/vendors/js/perfect-scrollbar.min.js?id=4a10bcfa0a9c9fa9d503",
     "/vendors/css/select2.min.css": "/vendors/css/select2.min.css?id=8e44c39add2364bdb469",
     "/vendors/js/select2.min.js": "/vendors/js/select2.min.js?id=0a96cf2d3a193019a91b",
-    "/vendors/css/bootstrap-combobox.css": "/vendors/css/bootstrap-combobox.css?id=f6a6add416aca5e75f21",
-    "/vendors/js/bootstrap-combobox.js": "/vendors/js/bootstrap-combobox.js?id=36f9331a05f0b943b74c",
+    "/vendors/css/select2-bootstrap4.css": "/vendors/css/select2-bootstrap4.css?id=85167d868d2bf2dc5603",
     "/vendors/css/dropzone.min.css": "/vendors/css/dropzone.min.css?id=2f735dbf472afcd77604",
     "/vendors/css/dropzone-basic.min.css": "/vendors/css/dropzone-basic.min.css?id=960bcd6d5cb8351ac0d0",
     "/vendors/js/dropzone.min.js": "/vendors/js/dropzone.min.js?id=33148c7d5e055ea74714",
diff --git a/resources/views/portal/default/invoices/index.blade.php b/resources/views/portal/default/invoices/index.blade.php
index 7b1da3ae39..6aecf4d90b 100644
--- a/resources/views/portal/default/invoices/index.blade.php
+++ b/resources/views/portal/default/invoices/index.blade.php
@@ -20,7 +20,7 @@
                         <select class="form-control" style="width: 220px;" id="statuses" name="client_status[]" multiple="multiple">
                               <option value="paid">{{ ctrans('texts.status_paid') }}</option>
                               <option value="unpaid">{{ ctrans('texts.status_unpaid') }}</option>
-                            </select>
+                        </select>
 
                     </div>
 
diff --git a/resources/views/portal/default/layouts/master.blade.php b/resources/views/portal/default/layouts/master.blade.php
index ce973b8645..b00c4f96fb 100644
--- a/resources/views/portal/default/layouts/master.blade.php
+++ b/resources/views/portal/default/layouts/master.blade.php
@@ -42,6 +42,8 @@
   <!-- Main styles for this application-->
   <link href="/vendors/css/bootstrap.min.css" rel="stylesheet">
   <link href="/vendors/css/coreui.min.css" rel="stylesheet">
+  @stack('css')
+
     @yield('head')
 </head>
 @include('portal.default.header')
diff --git a/resources/views/portal/default/profile/index.blade.php b/resources/views/portal/default/profile/index.blade.php
index 78afdef433..ab5e975ae2 100644
--- a/resources/views/portal/default/profile/index.blade.php
+++ b/resources/views/portal/default/profile/index.blade.php
@@ -1,8 +1,16 @@
 @extends('portal.default.layouts.master')
-@section('header')
-    @parent
-    <link href="/vendors/css/bootstrap-combobox.css" rel="stylesheet">
-@stop
+@push('css')
+    <link href="/vendors/css/select2.min.css" rel="stylesheet">
+    <link href="/vendors/css/select2-bootstrap4.css" rel="stylesheet">
+    <style>    
+      select {border: 1px solid  !important;}
+      .select2-container--bootstrap4 .select2-selection--single 
+      {
+        border: 1px solid #e4e7ea !important;
+      }
+
+    </style>
+@endpush
 @section('body')
     <main class="main">
         <div class="container-fluid">
@@ -57,12 +65,15 @@
                         {!! Former::text('state')->placeholder( ctrans('texts.state'))->label('') !!}
                         {!! Former::text('postal_code')->placeholder( ctrans('texts.postal_code'))->label('') !!}
 
+
                         {!! Former::select('country_id')
                             ->addOption('','')
                             ->autocomplete('off')
                             ->label('')
                             ->fromQuery($countries, 'name', 'id') !!}
 
+                
+
                         {!! Former::text('shipping_address1')->placeholder( ctrans('texts.shipping_address1'))->label('') !!}
                         {!! Former::text('shipping_address2')->placeholder( ctrans('texts.shipping_address2'))->label('') !!}
                         {!! Former::text('shipping_city')->placeholder( ctrans('texts.shipping_city'))->label('') !!}
@@ -115,22 +126,35 @@
 </body>
 @endsection
 @push('scripts')
-    <script src="/vendors/js/bootstrap-combobox.js"></script>
+    <script src="/vendors/js/select2.min.js"></script>
 @endpush
 
 @section('footer')
 
 <script>
 
-$(function() {
-    $('#country_id, #shipping_country_id').combobox();
-
-    });
 
 $(document).ready(function() {
 
-});  
+  $('#shipping_country_id').select2({
+    placeholder: "{{ ctrans('texts.country') }}",
+    //allowClear: true,
+    theme: "bootstrap4",
+}).on('change', function() {
+    
+});
 
+
+  $('#country_id').each(function () {
+    $(this).select2({
+      placeholder: "{{ ctrans('texts.country') }}",
+      theme: 'bootstrap4',
+      width: 'style',
+      allowClear: Boolean($(this).data('allow-clear')),
+    });
+  });
+
+});
 </script>
 
 @endsection
\ No newline at end of file
diff --git a/webpack.mix.js b/webpack.mix.js
index 2384170b5f..ffc5dd2ed3 100644
--- a/webpack.mix.js
+++ b/webpack.mix.js
@@ -25,8 +25,7 @@ mix.copyDirectory('node_modules/perfect-scrollbar/dist/perfect-scrollbar.min.js'
 mix.copyDirectory('node_modules/select2/dist/css/select2.min.css', 'public/vendors/css/select2.min.css');
 mix.copyDirectory('node_modules/select2/dist/js/select2.full.min.js', 'public/vendors/js/select2.min.js');
 
-mix.copyDirectory('node_modules/@danielfarrell/bootstrap-combobox/css/bootstrap-combobox.css', 'public/vendors/css/bootstrap-combobox.css');
-mix.copyDirectory('node_modules/@danielfarrell/bootstrap-combobox/js/bootstrap-combobox.js', 'public/vendors/js/bootstrap-combobox.js');
+mix.copyDirectory('node_modules/@ttskch/select2-bootstrap4-theme/dist/select2-bootstrap4.min.css', 'public/vendors/css/select2-bootstrap4.css');
 
 mix.copyDirectory('node_modules/dropzone/dist/min/dropzone.min.css', 'public/vendors/css/dropzone.min.css');
 mix.copyDirectory('node_modules/dropzone/dist/min/basic.min.css', 'public/vendors/css/dropzone-basic.min.css');