diff --git a/assets/.DS_Store b/assets/.DS_Store
index 2a5e01d6..9958ec9a 100755
Binary files a/assets/.DS_Store and b/assets/.DS_Store differ
diff --git a/assets/3rd/.DS_Store b/assets/3rd/.DS_Store
new file mode 100644
index 00000000..b733a968
Binary files /dev/null and b/assets/3rd/.DS_Store differ
diff --git a/assets/3rd/fontawesome/.DS_Store b/assets/3rd/fontawesome/.DS_Store
new file mode 100644
index 00000000..27b683b8
Binary files /dev/null and b/assets/3rd/fontawesome/.DS_Store differ
diff --git a/assets/3rd/fontawesome/css/.DS_Store b/assets/3rd/fontawesome/css/.DS_Store
new file mode 100644
index 00000000..5008ddfc
Binary files /dev/null and b/assets/3rd/fontawesome/css/.DS_Store differ
diff --git a/assets/cmb2-front.css b/assets/cmb2-front.css
index ec6e9758..0bfef373 100755
--- a/assets/cmb2-front.css
+++ b/assets/cmb2-front.css
@@ -38,7 +38,7 @@
       color: red; }
     .uploader-item-preview .btn-close::before {
       content: '\f00d';
-      font-family: Fontawesome;
+      font-family: "Font Awesome 5 Free";
       transition: all .3s ease-in-out; }
   .uploader-item-preview .preview-icon {
     padding-top: 4px; }
@@ -494,7 +494,7 @@ span.cmb2-metabox-description {
         margin-top: 15px; } }
     .opalestate-submission-form .btn-submit-cmb::before {
       content: "\f138";
-      font-family: Fontawesome;
+      font-family: "Font Awesome 5 Free";
       margin-right: 18px;
       padding-right: 20px; }
     .opalestate-submission-form .btn-submit-cmb::after {
diff --git a/assets/opalestate.css b/assets/opalestate.css
index 55f9bc54..ab71e132 100755
--- a/assets/opalestate.css
+++ b/assets/opalestate.css
@@ -2350,7 +2350,7 @@ ul.property-meta-list {
     font-style: unset; }
 
 i[class*="icon-property-"] {
-  font-family: FontAwesome; }
+  font-family: "Font Awesome 5 Free"; }
 
 .icon-property-areasize:before {
   content: "\f047"; }
@@ -2899,7 +2899,7 @@ ul.property-status {
   width: calc(15px*5 - 5px);
   line-height: 1; }
   .opalestate-rating__stars::before {
-    font-family: 'FontAwesome';
+    font-family: "Font Awesome 5 Free";
     font-size: inherit;
     text-rendering: auto;
     content: "\f005\f005\f005\f005\f005";
@@ -2915,7 +2915,7 @@ ul.property-status {
     color: transparent;
     padding-top: 20px; }
     .opalestate-rating__stars span::before {
-      font-family: 'FontAwesome';
+      font-family: "Font Awesome 5 Free";
       font-size: inherit;
       text-rendering: auto;
       content: "\f005\f005\f005\f005\f005";
@@ -2940,7 +2940,7 @@ p.stars a {
     width: 1em;
     height: 1em;
     line-height: 1;
-    font-family: "FontAwesome";
+    font-family: "Font Awesome 5 Free";
     content: "\f006";
     text-indent: 0; }
   p.stars a:hover ~ a::before {
@@ -3925,9 +3925,10 @@ header#masthead {
   .opalestate-user-management .account-links {
     list-style: none;
     padding: 0;
-    margin: 0;
+    margin: 0 15px;
     max-height: 530px;
-    overflow-y: scroll; }
+    overflow-y: scroll;
+    font-size: 14px; }
     @media (max-width: 991px) {
       .opalestate-user-management .account-links {
         max-height: 400px; } }
@@ -3961,13 +3962,29 @@ header#masthead {
         -o-border-radius: 50%;
         margin-left: 5px; }
       .opalestate-user-management .account-links a:hover, .opalestate-user-management .account-links a:focus {
+        background-color: #2f73e9;
+        border-radius: 5px;
+        -webkit-border-radius: 5px;
+        -moz-border-radius: 5px;
+        -ms-border-radius: 5px;
+        -o-border-radius: 5px;
         color: #FFF; }
         .opalestate-user-management .account-links a:hover i, .opalestate-user-management .account-links a:focus i {
           color: #FFF; }
+        .opalestate-user-management .account-links a:hover .count, .opalestate-user-management .account-links a:focus .count {
+          background-color: #02ce76; }
     .opalestate-user-management .account-links li.active a {
+      background-color: #2f73e9;
+      border-radius: 5px;
+      -webkit-border-radius: 5px;
+      -moz-border-radius: 5px;
+      -ms-border-radius: 5px;
+      -o-border-radius: 5px;
       color: #FFF; }
       .opalestate-user-management .account-links li.active a i {
         color: #FFF; }
+      .opalestate-user-management .account-links li.active a .count {
+        background-color: #02ce76; }
   .opalestate-user-management .site-main {
     padding-top: 60px;
     padding-bottom: 60px; }
diff --git a/assets/scss/cmb2/cmb2-front.scss b/assets/scss/cmb2/cmb2-front.scss
index bb3318a2..00f63657 100755
--- a/assets/scss/cmb2/cmb2-front.scss
+++ b/assets/scss/cmb2/cmb2-front.scss
@@ -52,7 +52,7 @@
 		}
 		&::before{
 			content: '\f00d';
-			font-family: Fontawesome;
+			font-family: $font-family-icon;
 			transition: all .3s ease-in-out;
 		}
 	}
diff --git a/assets/scss/cmb2/partials/_main_wrap.scss b/assets/scss/cmb2/partials/_main_wrap.scss
index eac7c8f6..0b4f32b2 100755
--- a/assets/scss/cmb2/partials/_main_wrap.scss
+++ b/assets/scss/cmb2/partials/_main_wrap.scss
@@ -616,7 +616,7 @@ span.cmb2-metabox-description {
 		}
 		&::before{
 			content: "\f138";
-			font-family: Fontawesome;
+			font-family: $font-family-icon;
 			margin-right: 18px;
 			padding-right: 20px;
 		}
diff --git a/assets/scss/components/_variables.scss b/assets/scss/components/_variables.scss
index 1c63eaa7..86811479 100755
--- a/assets/scss/components/_variables.scss
+++ b/assets/scss/components/_variables.scss
@@ -28,5 +28,6 @@ $footer-color :  #000000;
 // -------------------------
 $theme-margin    : 30px !default;
 $theme-padding   : 30px !default;
+
 // fonts
-$font-family-second :  $font-family-base !default; 
\ No newline at end of file
+$font-family-second :  $font-family-base !default;
\ No newline at end of file
diff --git a/assets/scss/opalestate/_dashboard.scss b/assets/scss/opalestate/_dashboard.scss
index febbd45b..a22899b2 100755
--- a/assets/scss/opalestate/_dashboard.scss
+++ b/assets/scss/opalestate/_dashboard.scss
@@ -122,7 +122,6 @@
 			}
 		}
 	}
-
 	.count {
 		color:$primary;
 		padding:3px 8px;
@@ -360,12 +359,14 @@
 	.account-links {
 		list-style:none;
 		padding:0;
-		margin : 0;
+		margin : 0 $padding-base;
 		max-height: 530px;
 		overflow-y: scroll;
+		font-size: 14px;
 		@media(max-width: 991px) {
 			max-height: 400px;
 		}
+
 		&::-webkit-scrollbar {
 			width: 8px;
 			background-color: #1d2329;
@@ -376,7 +377,6 @@
 			-webkit-box-shadow: inset 0 0 3px rgba(0,0,0,.3);
 			background-color: #555;
 		}
-
 		a {
 			padding:8px 20px;
 			width:100%;
@@ -399,20 +399,28 @@
 			}
 			&:hover,
 			&:focus {
-				//background-color:#0073aa;
+				background-color:$primary;
+				@include border-radius(5px);
 				color:$white;
 				i {
 					color:$white;
 				}
+				.count {
+					background-color: $secondary;
+				}
 			}
 		}
 		li.active {
 			a {
-				//background-color:#0073aa;
+				background-color:$primary;
+				@include border-radius(5px);
 				color:$white;
 				i {
 					color:$white;
 				}
+				.count {
+					background-color: $secondary;
+				}
 			}
 		}
 	}
diff --git a/assets/scss/opalestate/_elements.scss b/assets/scss/opalestate/_elements.scss
index c1bf2d75..b5217374 100755
--- a/assets/scss/opalestate/_elements.scss
+++ b/assets/scss/opalestate/_elements.scss
@@ -101,7 +101,7 @@ ul.property-status{
 	line-height: 1;
 	
 	&::before{
-		font-family:'FontAwesome';
+		font-family:$font-family-icon;
 		font-size: inherit;
 		text-rendering: auto;
 		content: "\f005\f005\f005\f005\f005";
@@ -118,7 +118,7 @@ ul.property-status{
 		color: transparent;
 		padding-top: 20px;
 		&::before{
-			font-family:'FontAwesome';
+			font-family:$font-family-icon;
 			font-size: inherit;
 			text-rendering: auto;
 			content: "\f005\f005\f005\f005\f005";
@@ -147,7 +147,7 @@ p.stars {
 			width: 1em;
 			height: 1em;
 			line-height: 1;
-			font-family: "FontAwesome";
+			font-family: $font-family-icon;
 			content: "\f006";
 			text-indent: 0;
 		}
diff --git a/assets/scss/opalestate/_properties-loop.scss b/assets/scss/opalestate/_properties-loop.scss
index cbcb6e4a..3c2077ee 100755
--- a/assets/scss/opalestate/_properties-loop.scss
+++ b/assets/scss/opalestate/_properties-loop.scss
@@ -238,7 +238,7 @@ ul.property-meta-list{
 	}	
 }
 i[class*="icon-property-"]{
-    font-family: FontAwesome;
+    font-family: $font-family-icon;
 }
 .icon-property-areasize:before{
     content: "\f047";
diff --git a/assets/scss/opalestate/_vars.scss b/assets/scss/opalestate/_vars.scss
index 805e1721..84c7c94c 100755
--- a/assets/scss/opalestate/_vars.scss
+++ b/assets/scss/opalestate/_vars.scss
@@ -20,4 +20,6 @@ $price-color:red;
 $link-hover-color: $primary;
 $input-border-color: #ebebeb;
 $body-color: #7e7e7e;
-$body-color-light: #bbb;
\ No newline at end of file
+$body-color-light: #bbb;
+
+$font-family-icon: "Font Awesome 5 Free" !default;
\ No newline at end of file
diff --git a/assets/scss/submission.scss b/assets/scss/submission.scss
index 10e307ab..28390a2d 100755
--- a/assets/scss/submission.scss
+++ b/assets/scss/submission.scss
@@ -263,7 +263,7 @@
 		padding: 19px 25px 17px 20px;
 		&::before{
 			content: "\f138";
-			font-family: Fontawesome;
+			font-family: $font-family-icon;
 			margin-right: 18px;
 			padding-right: 20px;
 		}
@@ -285,7 +285,7 @@
 		padding-right: 20px;
 		&::after{
 			content: "\f137";
-			font-family: Fontawesome;
+			font-family: $font-family-icon;
 			margin-left: 18px;
 			padding-left: 20px;
 		}
diff --git a/assets/submission.css b/assets/submission.css
index 1490ed8a..63b921d4 100755
--- a/assets/submission.css
+++ b/assets/submission.css
@@ -299,7 +299,7 @@
   padding: 19px 25px 17px 20px; }
   .opalestate-submission-tab button.btn.submission-next-btn::before {
     content: "\f138";
-    font-family: Fontawesome;
+    font-family: "Font Awesome 5 Free";
     margin-right: 18px;
     padding-right: 20px; }
   .opalestate-submission-tab button.btn.submission-next-btn::after {
@@ -319,7 +319,7 @@
   padding-right: 20px; }
   .opalestate-submission-tab .submission-back-btn::after {
     content: "\f137";
-    font-family: Fontawesome;
+    font-family: "Font Awesome 5 Free";
     margin-left: 18px;
     padding-left: 20px; }
   .opalestate-submission-tab .submission-back-btn::before {