diff --git a/public/mix-manifest.json b/public/mix-manifest.json
index 93a6427..b97d5ea 100644
--- a/public/mix-manifest.json
+++ b/public/mix-manifest.json
@@ -1,9 +1,9 @@
 {
-    "/js/vue/Authentication/app.js": "/js/vue/Authentication/app.js?id=a38b92c7aeda7ce87a7d",
-    "/js/vue/Home/app.js": "/js/vue/Home/app.js?id=9816a92059a1fb9b82a9",
-    "/js/vue/Modules/CRM/app.js": "/js/vue/Modules/CRM/app.js?id=95897d209a7213e0377f",
-    "/js/vue/Product/app.js": "/js/vue/Product/app.js?id=9b9d54a1d30595a5e8f5",
-    "/js/vue/SMS/app.js": "/js/vue/SMS/app.js?id=9305aa488e19f0ae5dbc",
-    "/js/vue/Service/app.js": "/js/vue/Service/app.js?id=d76eec13aed9a8ae6ade",
-    "/js/vue/User/app.js": "/js/vue/User/app.js?id=2efa3e95b7ef4b205db3"
+    "/js/vue/Authentication/app.js": "/js/vue/Authentication/app.js?id=5e4a6c5d0ae398c7ee59",
+    "/js/vue/Home/app.js": "/js/vue/Home/app.js?id=7d2de4f2c69a8160396c",
+    "/js/vue/Modules/CRM/app.js": "/js/vue/Modules/CRM/app.js?id=e592a7ab2ecc42a35ac2",
+    "/js/vue/Product/app.js": "/js/vue/Product/app.js?id=1940f3ac8bcadb54cf0d",
+    "/js/vue/SMS/app.js": "/js/vue/SMS/app.js?id=05c7408a0a7800b8565b",
+    "/js/vue/Service/app.js": "/js/vue/Service/app.js?id=d22095ca59cae53ffcd6",
+    "/js/vue/User/app.js": "/js/vue/User/app.js?id=20f1e4d6a21d09a5f295"
 }
diff --git a/resources/js/Global/components/Drawer/Notifications.vue b/resources/js/Global/components/Drawer/Notifications.vue
index b86b130..a4f4845 100644
--- a/resources/js/Global/components/Drawer/Notifications.vue
+++ b/resources/js/Global/components/Drawer/Notifications.vue
@@ -2,7 +2,7 @@
     <div class="text-xs-center">
         <v-menu v-model="menu" :close-on-content-click="false" :nudge-width="200" offset-x>
             <template v-slot:activator="{ on }">
-                <v-icon dark v-on="on"> fas fa-bell </v-icon>
+                <v-icon dark v-on="on"> WMi-bell </v-icon>
             </template>
             <v-card>
                 <v-list>
@@ -18,7 +18,7 @@
 
                         <v-list-tile-action>
                         <v-btn :class="fav ? 'red--text' : ''" icon @click="fav = !fav">
-                            <v-icon>fas fa-favorite</v-icon>
+                            <v-icon>WMi-heart</v-icon>
                         </v-btn>
                         </v-list-tile-action>
                     </v-list-tile>
@@ -44,8 +44,8 @@
 
                 <v-card-actions>
                     <v-spacer></v-spacer>
-                    <v-btn @click="menu = false" slot="activator" fab color="red" dark><v-icon dark>fas fa-times</v-icon></v-btn>
-                    <v-btn @click="menu = false" slot="activator" fab color="cyan" dark><v-icon dark>fas fa-check</v-icon></v-btn>
+                    <v-btn @click="menu = false" slot="activator" fab color="red" dark><v-icon dark>WMi-cancel</v-icon></v-btn>
+                    <v-btn @click="menu = false" slot="activator" fab color="cyan" dark><v-icon dark>WMi-ok</v-icon></v-btn>
 
                 </v-card-actions>
             </v-card>
diff --git a/resources/js/Global/components/Misc/Alert.vue b/resources/js/Global/components/Misc/Alert.vue
index 41e8e5d..358e5cb 100644
--- a/resources/js/Global/components/Misc/Alert.vue
+++ b/resources/js/Global/components/Misc/Alert.vue
@@ -13,7 +13,7 @@ export default {
         timeout: { default: 30000 },
         color: { default: "red" },
         message: { default: "فعالیت شما با موفقیت انجام شد" },
-        icon: "fas fa-times"
+        icon: "WMi-cancel"
     }
 };
 </script>
\ No newline at end of file
diff --git a/resources/js/Global/components/Misc/Snackbar.vue b/resources/js/Global/components/Misc/Snackbar.vue
index 067a5f1..654868b 100644
--- a/resources/js/Global/components/Misc/Snackbar.vue
+++ b/resources/js/Global/components/Misc/Snackbar.vue
@@ -13,7 +13,7 @@
 		>
 			{{message.content || ''}}
 			<v-btn :color="message.color_icon || 'white'" text @click="message.snackbar = false" fab>
-				<v-icon :color="message.color_icon || 'white'">{{ message.icon || "fas fa-times" }}</v-icon>
+				<v-icon :color="message.color_icon || 'white'">{{ message.icon || "WMi-cancel" }}</v-icon>
 			</v-btn>
 		</v-snackbar>
 	</div>
@@ -30,7 +30,7 @@ var default_message = {
 	content: "",
 	timeout: 3000,
 	color: "red",
-	icon: "fas fa-times",
+	icon: "WMi-cancel",
     color_icon: "white",
     y: "",
     x: ""
@@ -42,14 +42,14 @@ export default {
 	content: "dsada",
 	timeout: 3000,
 	color: "red",
-	icon: "fas fa-times",
+	icon: "WMi-cancel",
 	color_icon: "white"
 },{
 	snackbar: true,
 	content: "wersdcasd",
 	timeout: 3000,
 	color: "red",
-	icon: "fas fa-times",
+	icon: "WMi-cancel",
 	color_icon: "white"
 }]
     }),
diff --git a/resources/js/Global/components/Misc/Timeline.vue b/resources/js/Global/components/Misc/Timeline.vue
index bda6d06..73681db 100644
--- a/resources/js/Global/components/Misc/Timeline.vue
+++ b/resources/js/Global/components/Misc/Timeline.vue
@@ -4,7 +4,7 @@
                          :class="(event.user_id==12) ? 'Red Right' : 'Cyan Left'" small fill-dot>
         <template v-slot:opposite>
             <span> {{ event.user_name }} </span>
-            <div class="Time"><v-icon>fas fa-clock-alt</v-icon> {{ event.date }} </div>
+            <div class="Time"><v-icon>WMi-clock</v-icon> {{ event.date }} </div>
         </template>
         <v-card class="elevation-3 RTL" >
             <v-card-title> {{ event.title }} </v-card-title>
diff --git a/resources/js/Global/components/Modals/Dialog.vue b/resources/js/Global/components/Modals/Dialog.vue
index a42a05a..6195b2b 100644
--- a/resources/js/Global/components/Modals/Dialog.vue
+++ b/resources/js/Global/components/Modals/Dialog.vue
@@ -24,7 +24,7 @@
                     depressed
                     dark
                 >
-                    <v-icon dark right>fas fa-times</v-icon>
+                    <v-icon dark right>WMi-cancel</v-icon>
                     {{getDialogProperties.cancelButtonText || defaultMessage[type].cancelButtonText}}
                 </v-btn>
                 <v-btn
@@ -33,7 +33,7 @@
                     dark
                     @click="confirm"
                 >
-                    <v-icon dark right>fas fa-trash-alt</v-icon>
+                    <v-icon dark right>WMi-trash</v-icon>
                     {{getDialogProperties.confirmButtonText || defaultMessage[type].confirmButtonText}}
                 </v-btn>
             </v-card-actions>
diff --git a/resources/js/Global/components/Modals/Helper.vue b/resources/js/Global/components/Modals/Helper.vue
index c1e238f..2098741 100644
--- a/resources/js/Global/components/Modals/Helper.vue
+++ b/resources/js/Global/components/Modals/Helper.vue
@@ -24,7 +24,7 @@
                     dark
                     @click="$_closeModalStack()"
                 >
-                    <v-icon dark right>fas fa-trash-alt</v-icon>
+                    <v-icon dark right>WMi-trash</v-icon>
                     متوجه شدم!
                 </v-btn>
             </v-card-actions>
diff --git a/resources/js/Global/components/Orders/Filters.vue b/resources/js/Global/components/Orders/Filters.vue
index a525091..a9c6f48 100644
--- a/resources/js/Global/components/Orders/Filters.vue
+++ b/resources/js/Global/components/Orders/Filters.vue
@@ -2,22 +2,22 @@
     <v-layout row wrap class="WM-Margin-T-20 WM-Margin-0 WM-Padding-10 WM-Border WM-Border-LightGray" style="border-right:2px solid #ee3552;">
         <v-flex xs12 sm4 md3>
             <v-menu :close-on-content-click="false" v-model="DateFilterBefore" :nudge-right="40" lazy transition="slide-y-transition" offset-y full-width min-width="290px">
-                <v-text-field slot="activator" v-model="date" label=" سفارشات قبل از تاریخ " prepend-icon="fas fa-calendar-alt" color="orange darken-3" readonly></v-text-field>
+                <v-text-field slot="activator" v-model="date" label=" سفارشات قبل از تاریخ " prepend-icon="WMi-calendar-alt" color="orange darken-3" readonly></v-text-field>
                 <v-date-picker v-model="date" @input="DateFilterBefore = false" color="orange darken-3" locale="fa-ir"></v-date-picker>
             </v-menu>
         </v-flex>
         <v-flex xs12 sm4 md3>
             <v-menu :close-on-content-click="false" v-model="DateFilterAfter" :nudge-right="40" lazy transition="slide-y-transition" offset-y full-width min-width="290px">
-                <v-text-field slot="activator" v-model="date" label=" سفارشات بعد از تاریخ " prepend-icon="fas fa-calendar-alt" color="orange darken-3" readonly></v-text-field>
+                <v-text-field slot="activator" v-model="date" label=" سفارشات بعد از تاریخ " prepend-icon="WMi-calendar-alt" color="orange darken-3" readonly></v-text-field>
                 <v-date-picker v-model="date" @input="DateFilterAfter = false" color="orange darken-3" locale="fa-ir"></v-date-picker>
             </v-menu>
         </v-flex>
         <v-flex xs12 sm4 md3>
-            <v-text-field label=" نام سفارش دهنده " color="orange darken-3" prepend-icon="fas fa-user"></v-text-field>
+            <v-text-field label=" نام سفارش دهنده " color="orange darken-3" prepend-icon="WMi-user"></v-text-field>
         </v-flex>
         <v-flex xs12 sm4 md3>
             <v-tooltip top color="black">
-                <v-btn slot="activator" fab color="orange" dark><v-icon dark>fas fa-filter</v-icon></v-btn>
+                <v-btn slot="activator" fab color="orange" dark><v-icon dark>WMi-filter</v-icon></v-btn>
                 <span> فیلتر سفارشات </span>
             </v-tooltip>
         </v-flex>
diff --git a/resources/js/Global/components/Orders/Items.vue b/resources/js/Global/components/Orders/Items.vue
index fca5220..a1ad903 100644
--- a/resources/js/Global/components/Orders/Items.vue
+++ b/resources/js/Global/components/Orders/Items.vue
@@ -11,27 +11,27 @@
             <td style="width:10%" class="" v-html="props.item.UpdatedAt"></td>
             <td style="width:50%" class="">
                 <v-tooltip top color="black">
-                    <v-btn @click.native="$store.state.OrderDetails = true" slot="activator" fab color="cyan" dark><v-icon dark>fas fa-align-right</v-icon></v-btn>
+                    <v-btn @click.native="$store.state.OrderDetails = true" slot="activator" fab color="cyan" dark><v-icon dark>WMi-align-right</v-icon></v-btn>
                     <span> جزئیات سفارش </span>
                 </v-tooltip>
                 <v-tooltip top color="black">
-                    <v-btn @click.native="$store.state.OrderStatus = true" slot="activator" fab color="black" dark><v-icon dark>fas fa-exchange-alt</v-icon></v-btn>
+                    <v-btn @click.native="$store.state.OrderStatus = true" slot="activator" fab color="black" dark><v-icon dark>WMi-exchange-alt</v-icon></v-btn>
                     <span> تغییر وضعیت سفارش </span>
                 </v-tooltip>
                 <v-tooltip top color="black">
-                    <v-btn slot="activator" fab color="black" dark><v-icon dark>fas fa-angle-left</v-icon></v-btn>
+                    <v-btn slot="activator" fab color="black" dark><v-icon dark>WMi-angle-left</v-icon></v-btn>
                     <span> تغییر وضعیت سفارش به وضعیت بعدی </span>
                 </v-tooltip>
                 <v-tooltip top color="black">
-                    <v-btn @click.native="$store.state.SendEmail = true" slot="activator" fab color="purple" dark><v-icon dark>fas fa-envelope</v-icon></v-btn>
+                    <v-btn @click.native="$store.state.SendEmail = true" slot="activator" fab color="purple" dark><v-icon dark>WMi-mail</v-icon></v-btn>
                     <span> ارسال ایمیل </span>
                 </v-tooltip>
                 <v-tooltip top color="black">
-                    <v-btn @click.native="$store.state.SendSMS = true" slot="activator" fab color="orange" dark><v-icon dark>fas fa-comment-alt</v-icon></v-btn>
+                    <v-btn @click.native="$store.state.SendSMS = true" slot="activator" fab color="orange" dark><v-icon dark>WMi-comment-alt</v-icon></v-btn>
                     <span> ارسال پیام کوتاه </span>
                 </v-tooltip>
                 <v-tooltip top color="black">
-                    <v-btn slot="activator" fab color="red" dark><v-icon dark>fas fa-trash-alt</v-icon></v-btn>
+                    <v-btn slot="activator" fab color="red" dark><v-icon dark>WMi-trash</v-icon></v-btn>
                     <span> حذف سفارش </span>
                 </v-tooltip>
 
diff --git a/resources/js/Global/components/Orders/Modal-Details.vue b/resources/js/Global/components/Orders/Modal-Details.vue
index 697bc19..07485ff 100644
--- a/resources/js/Global/components/Orders/Modal-Details.vue
+++ b/resources/js/Global/components/Orders/Modal-Details.vue
@@ -21,7 +21,7 @@
             <v-card-actions>
                 <v-spacer></v-spacer>
                 <v-btn color="cyan" depressed dark @click="$store.state.OrderDetails = false">
-                    <v-icon dark right>fas fa-check</v-icon> بسیار خب، ممنونم
+                    <v-icon dark right>WMi-ok</v-icon> بسیار خب، ممنونم
                 </v-btn>
             </v-card-actions>
         </v-card>
diff --git a/resources/js/Global/components/Texts/Hint.vue b/resources/js/Global/components/Texts/Hint.vue
index 2ae6491..a61b05d 100644
--- a/resources/js/Global/components/Texts/Hint.vue
+++ b/resources/js/Global/components/Texts/Hint.vue
@@ -1,6 +1,6 @@
 <template>
     <div class="InfoBox" :class="color">
-        <div :class="'Icon '+textColor+'--text'"> <v-icon> fas fa-{{icon}} </v-icon></div>
+        <div :class="'Icon '+textColor+'--text'"> <v-icon> WMi-{{icon}} </v-icon></div>
         <div :class="'Text '+textColor+'--text'"><div class="Title"> {{ title }} </div> {{ text }}</div>
     </div>
 </template>
diff --git a/resources/js/Global/components/Texts/InfoBlock.vue b/resources/js/Global/components/Texts/InfoBlock.vue
index 8f2e692..d0ab458 100644
--- a/resources/js/Global/components/Texts/InfoBlock.vue
+++ b/resources/js/Global/components/Texts/InfoBlock.vue
@@ -1,6 +1,6 @@
 <template>
     <v-flex :class="Size" class="WM-Info">
-        <div class="WM-Font-14 WM-Color-Gray"><v-icon>fas fa-{{ Icon }}</v-icon> {{ Title }}  </div>
+        <div class="WM-Font-14 WM-Color-Gray"><v-icon>WMi-{{ Icon }}</v-icon> {{ Title }}  </div>
         <div class="WM-Font-20 WM-Margin-R-10"> {{ Value }} </div>
     </v-flex>
 </template>
diff --git a/resources/js/Home/components/Modules/PaymentConfirmation.vue b/resources/js/Home/components/Modules/PaymentConfirmation.vue
index 63006f1..52d6800 100644
--- a/resources/js/Home/components/Modules/PaymentConfirmation.vue
+++ b/resources/js/Home/components/Modules/PaymentConfirmation.vue
@@ -39,7 +39,7 @@
             <v-card-actions>
                 <v-spacer></v-spacer>
                 <v-btn color="red" depressed dark>
-                    <v-icon dark right>fas fa-times</v-icon>انصراف
+                    <v-icon dark right>WMi-cancel</v-icon>انصراف
                 </v-btn>
                 <v-btn
                     color="cyan"
@@ -47,7 +47,7 @@
                     dark
                     @click="$store.state.PaymentConfirmation = false"
                 >
-                    <v-icon dark right>fas fa-credit-card</v-icon>پرداخت
+                    <v-icon dark right>WMi-credit-card</v-icon>پرداخت
                 </v-btn>
             </v-card-actions>
         </v-card>
diff --git a/resources/js/Home/components/Modules/TrialConfirmation.vue b/resources/js/Home/components/Modules/TrialConfirmation.vue
index 7988dc7..7fd176e 100644
--- a/resources/js/Home/components/Modules/TrialConfirmation.vue
+++ b/resources/js/Home/components/Modules/TrialConfirmation.vue
@@ -35,10 +35,10 @@
             <v-card-actions>
                 <v-spacer></v-spacer>
                 <v-btn color="red" depressed dark @click="$_closeModalStack();">
-                    <v-icon dark right>fas fa-times</v-icon>انصراف
+                    <v-icon dark right>WMi-cancel</v-icon>انصراف
                 </v-btn>
                 <v-btn color="black" depressed dark @click="register">
-                    <v-icon dark right>fas fa-check</v-icon>فعالسازی
+                    <v-icon dark right>WMi-ok</v-icon>فعالسازی
                 </v-btn>
             </v-card-actions>
         </v-card>