diff --git a/resources/js/Global/components/Inputs/RadioGroup.vue b/resources/js/Global/components/Inputs/RadioGroup.vue
index 3ba8fb3..11fbea3 100644
--- a/resources/js/Global/components/Inputs/RadioGroup.vue
+++ b/resources/js/Global/components/Inputs/RadioGroup.vue
@@ -1,6 +1,6 @@
 <template>
     <v-row :class="`radio-group ${theme}`">
-        <v-col v-for="(item, index) in items" :key="index"  :xl="item[itemSize]" class="pt-0"  @click="changeSelected($event, item || {})">
+        <v-col v-for="(item, index) in items" :key="index"  :xl="item[itemSize]" :lg="item[itemSize]" class="pt-0"  @click="changeSelected($event, item || {})">
             <div :class="{'active': isActive(item), [item[itemTheme]]: true, ['theme-' + item[itemColor] ]: true, ['bubble']: true}">
                 <div class="body">
                     <div v-if="item[itemIcon]" :class="`icon ${(item[itemIconClass]) ? item[itemIconClass] : ''}`">
@@ -95,11 +95,14 @@
         border-radius: 20px;
         text-align: center;
         padding: 12px;
-        opacity: 0.3;
+        opacity: 0.4;
         transition: ease all 0.3s;
         cursor: pointer;
         margin: 0px;
     }
+    .fill-on-active .bubble {
+        opacity: 0.6;
+    }
     .bubble .body {
         display: flex;
         justify-content: center;
@@ -109,9 +112,7 @@
     .bubble.text-left .body {
         padding-left: 30px;
     }
-    .bubble:hover, .bubble.active {
-        opacity: 1;
-    }
+
     .bubble .v-icon {
         font-size: 45px !important;
         line-height: 45px;
@@ -149,6 +150,13 @@
         .bubble.theme-#{$Color} .v-icon {
             color: $Value;
         }
+        .fill-on-active .bubble.theme-#{$Color}:hover, .fill-on-active .bubble.theme-#{$Color}.active {
+            background-color: $Value;
+            color: #fff;
+        }
+        .fill-on-active .bubble.theme-#{$Color}:hover .v-icon, .fill-on-active .bubble.theme-#{$Color}.active .v-icon {
+            color: #fff;
+        }
     }
     @each $Color,
     $Value in $backgrounds {
@@ -157,6 +165,10 @@
         }
     }
 
+    .bubble:hover, .bubble.active {
+        opacity: 1;
+    }
+
     .bubble .En {
         letter-spacing: 5px;
         font-size: 10px;
@@ -189,6 +201,10 @@
         line-height: 20px;
         margin-left: 5px;
     }
+    .bubble.fa-only.icon-large .v-icon {
+        font-size: 25px !important;
+        line-height: 20px;
+    }
     .bubble.fa-only .Fa {
         font-size: 14px !important;
     }
diff --git a/resources/js/Global/scss/Modify.scss b/resources/js/Global/scss/Modify.scss
index 6e737b0..d14ed1e 100644
--- a/resources/js/Global/scss/Modify.scss
+++ b/resources/js/Global/scss/Modify.scss
@@ -6,6 +6,10 @@
     font-family: "iranyekan-regular", "Montserrat-Regular" !important;
     font-weight: 100;
 }
+.v-application .body-1, .v-application .caption {
+    font-weight: 100;
+    font-family: "iranyekan-regular", "Montserrat-Regular" !important;
+}
 .v-application--is-rtl .v-list-item__action:first-child, .v-application--is-rtl .v-list-item__icon:first-child {
     margin-left: 2px;
 }
@@ -84,6 +88,10 @@ hr {
 .v-chip {
     margin-bottom: 2px;
 }
+.v-chip.v-chip--label.sm-padd {
+    padding-right: 0px;
+    padding-left: 0px;
+}
 
 .nav-tabs .nav-link:not(.active) .v-chip {
     background-color: #000 !important;
@@ -633,3 +641,14 @@ $Value in $Shadows {
     font-size: 14px;
     color: rgba(0,0,0,.6);
 }
+
+//------------------------------------------------------
+//                    Calendar
+//------------------------------------------------------
+.v-event.v-event-start div {
+    padding-right: 4px;
+}
+
+.v-badge__badge span {
+    line-height: 20px;
+}
diff --git a/resources/js/Global/utils/module-color/moduleColor.js b/resources/js/Global/utils/module-color/moduleColor.js
index 36f060e..97bf96b 100644
--- a/resources/js/Global/utils/module-color/moduleColor.js
+++ b/resources/js/Global/utils/module-color/moduleColor.js
@@ -93,6 +93,8 @@ export default {
     refund : 'orange',
     income : 'cyan',
     account : 'black',
+    salary : 'orange',
+