diff --git a/Step/wwwroot/assets/icons/png/logo.png b/Step/wwwroot/assets/icons/png/logo.png
new file mode 100644
index 00000000..861d3465
Binary files /dev/null and b/Step/wwwroot/assets/icons/png/logo.png differ
diff --git a/Step/wwwroot/assets/icons/png/logo_bw.png b/Step/wwwroot/assets/icons/png/logo_bw.png
new file mode 100644
index 00000000..910e5e1f
Binary files /dev/null and b/Step/wwwroot/assets/icons/png/logo_bw.png differ
diff --git a/Step/wwwroot/assets/icons/png/logo_bw_inverted.png b/Step/wwwroot/assets/icons/png/logo_bw_inverted.png
new file mode 100644
index 00000000..1b170184
Binary files /dev/null and b/Step/wwwroot/assets/icons/png/logo_bw_inverted.png differ
diff --git a/Step/wwwroot/assets/styles/base/maintenance.less b/Step/wwwroot/assets/styles/base/maintenance.less
index 77a72b80..8c482172 100644
--- a/Step/wwwroot/assets/styles/base/maintenance.less
+++ b/Step/wwwroot/assets/styles/base/maintenance.less
@@ -82,7 +82,7 @@
                         }
                     }
                     .multiselect{
-                        width: 250px;
+                        width: 280px;
                     }
                     .selectBox{
                         position: relative;
@@ -90,6 +90,8 @@
                     .selectBox select{
                         width: 100%;
                         padding: 8px;
+                        font-size: 12px;
+                        cursor: pointer;
                         option{
                             display: none;
                         }
diff --git a/Step/wwwroot/assets/styles/style.css b/Step/wwwroot/assets/styles/style.css
index 26d66a78..5cd86601 100644
--- a/Step/wwwroot/assets/styles/style.css
+++ b/Step/wwwroot/assets/styles/style.css
@@ -9493,7 +9493,7 @@ footer .container button.big:before {
   color: #bbbcbc;
 }
 .maintenance-container .maintenance-box .maintenance-body .maintenance-box-left .maintenance-box-left-head .multiselect {
-  width: 250px;
+  width: 280px;
 }
 .maintenance-container .maintenance-box .maintenance-body .maintenance-box-left .maintenance-box-left-head .selectBox {
   position: relative;
@@ -9501,6 +9501,8 @@ footer .container button.big:before {
 .maintenance-container .maintenance-box .maintenance-body .maintenance-box-left .maintenance-box-left-head .selectBox select {
   width: 100%;
   padding: 8px;
+  font-size: 12px;
+  cursor: pointer;
 }
 .maintenance-container .maintenance-box .maintenance-body .maintenance-box-left .maintenance-box-left-head .selectBox select option {
   display: none;
diff --git a/Step/wwwroot/src/components/maintenance.ts b/Step/wwwroot/src/components/maintenance.ts
index 84423e3a..05d6ae71 100644
--- a/Step/wwwroot/src/components/maintenance.ts
+++ b/Step/wwwroot/src/components/maintenance.ts
@@ -56,11 +56,11 @@ export default class Maintenance extends Vue {
     }
 
     async mounted(){
-        await new MaintenanceService().GetMaintenances();
         Factory.Get(MessageService).subscribeToChannel("update-maintenance", args => {
             new MaintenanceService().GetMaintenances();
         });
         ModalHelper.HideModal("modal2");
+        await new MaintenanceService().GetMaintenances();
         if(this.$route.params.id){
             this.selectedMaintenanceId = this.$route.params.id;
             this.enableMaintenance = false;
diff --git a/Step/wwwroot/src/components/maintenance.vue b/Step/wwwroot/src/components/maintenance.vue
index ae8826b2..2bec9038 100644
--- a/Step/wwwroot/src/components/maintenance.vue
+++ b/Step/wwwroot/src/components/maintenance.vue
@@ -21,7 +21,7 @@
                   <label>{{'maintenance_header_label_state' | localize("Stato")}}</label>
                   <div class="selectBox" @click="openSelectState()">
                     <select id="selectListCheckboxes">
-                      <option>{{'maintenance_header_option_state_choose' | localize("Seleziona uno stato...")}}</option>
+                      <option><span v-for="(item, index) in arrayState" :key="item" >{{'maintenance_state_'+item | localize(item)}}{{(index==arrayState.length-1)?'':', '}}</span></option>
                       <div class="overSelect"></div>
                     </select>
                   </div>
@@ -92,6 +92,7 @@
                         <i v-if="m.type == 'TIME_INTERVAL'" class="fa fa-clock-o"></i>
                         <img v-if="m.type == 'MACHINE_INTERVAL'" src="assets/icons/png/machine-info.png" width="15px" class="machine-img">
                         <i v-if="!m.createdByCms" class="fa fa-user"></i>
+                        <img v-if="m.createdByCms" src="assets/icons/png/logo.png" width="14px" >
                       </td>
                     </tr>
                   </tbody>