diff --git a/src/app/pages/agenda/agenda.page.html b/src/app/pages/agenda/agenda.page.html
index 5d7289ebb..5e85c4975 100644
--- a/src/app/pages/agenda/agenda.page.html
+++ b/src/app/pages/agenda/agenda.page.html
@@ -106,21 +106,20 @@
                   <!-- <div *ngIf="loggeduser.Profile != 'PR' && loggeduser.Profile != 'MDGPR'" class="calendar-letters"> -->
                   <div class="calendar-letters cal-reverse" *ngIf="loggeduser.Profile != 'PR' && loggeduser.Profile != 'MDGPR' && eventService.calendarIds.length >= 2" class="calendar-letters" [class.cal-reverse]="loggeduser.Profile != 'PR' && loggeduser.Profile != 'MDGPR' && profile == 'mdgpr' " (click)="changeProfile()">
                     <div class="text" *ngIf="profile == 'mdgpr'">
-                      {{ sessionStore.getInitials }}
+                      MC
                     </div>
 
-                
                     <div class="text" *ngIf="profile == 'pr'">
-                      {{ sessionStore.getManagerInitials }}
+                      CP  
                     </div>
 
                   </div>
                   
-                  <button *ngIf="profile == 'mdgpr' && eventService.calendarIds.length >= 2 && ( loggeduser.Profile == 'PR' || loggeduser.Profile == 'MDGPR')  " (click)="changeProfile()" class="d-md-none btn-no-color resize">
+                  <button *ngIf="profile == 'mdgpr'  && ( loggeduser.Profile == 'PR' || loggeduser.Profile == 'MDGPR')  " (click)="changeProfile()" class="d-md-none btn-no-color resize">
                     <ion-icon class="right-icons" src="assets/images/icons-profile-calendar-md.svg"></ion-icon>
                   </button>
 
-                  <button title="Mudar de Agenda" *ngIf="profile == 'pr'&&  eventService.calendarIds.length >= 2 && ( loggeduser.Profile == 'PR' || loggeduser.Profile == 'MDGPR')" (click)="changeProfile()" class="btn-no-color resize">
+                  <button title="Mudar de Agenda" *ngIf="profile == 'pr'&&  ( loggeduser.Profile == 'PR' || loggeduser.Profile == 'MDGPR')" (click)="changeProfile()" class="btn-no-color resize">
                     <ion-icon class="right-icons d-md-none" src="assets/images/icons-profile-calendar-pr.svg"></ion-icon>
                   </button>
 
@@ -205,7 +204,6 @@
                 <ion-icon *ngIf="ThemeService.currentTheme == 'tribunal' " class="collaps btn-no-color" src="assets/images/theme/tribunal/icons-collaps-down.svg" ></ion-icon>
               </button >
 
-
             </ion-row>
             <ion-row class="timeline-date align-center">
               <span *ngIf="timelineIsCurrentDate()">Hoje,&nbsp;</span> {{ timelineDate }}
@@ -284,8 +282,9 @@
                         {{ event.event.CalendarName }}
                         <div class="location">{{event.event.Location}}</div>
                         <div class="description">
-                          <p>{{event.event.Subject}}</p>
+                          <p class="m-0">{{event.event.Subject}}</p>
                         </div>
+                        <div class="font-12"> {{ eventService.getCalendarOwnNameByCalendarId(event.event.CalendarId) }}</div>
                       </div>
                     </div>
 
@@ -324,8 +323,9 @@
                       <div class="schedule-details">
                         <div class="location">{{event.event.Location}}</div>
                         <div class="description">
-                          <p>{{event.event.Subject}}</p>
+                          <p class="m-0">{{event.event.Subject}}</p>
                         </div>
+                        <div class="font-12"> {{ eventService.getCalendarOwnNameByCalendarId(event.event.CalendarId) }}</div>
                       </div>
                     </div>
                   </div>
@@ -365,8 +365,9 @@
                       <div class="schedule-details">
                         <div class="location">{{event.event.Location}}</div>
                         <div class="description">
-                          <p>{{event.event.Subject}}</p>
+                          <p class="m-0">{{event.event.Subject}}</p>
                         </div>
+                        <div class="font-12"> {{ eventService.getCalendarOwnNameByCalendarId(event.event.CalendarId) }}</div>
                       </div>
                     </div>
 
diff --git a/src/app/pages/agenda/agenda.page.scss b/src/app/pages/agenda/agenda.page.scss
index fc57c4e31..0abdea4dd 100644
--- a/src/app/pages/agenda/agenda.page.scss
+++ b/src/app/pages/agenda/agenda.page.scss
@@ -524,7 +524,7 @@ td.monthview-primary-with-event {
       color: var(--title-text-color);
     }
 
-    .description p{
+    .description p {
       white-space: nowrap;
       overflow: hidden !important;
       text-overflow: ellipsis !important;
@@ -864,17 +864,23 @@ $font-size: 11pt;
   border-radius: 44px;
   text-align: center;
   align-items: center;
-  display: flex;
   justify-content: center;
   margin-top: -3px;
   border: 1.5px solid black;
   color: white;
+  display:  none;
   .text{
 
   }
 }
 
 
+@media only screen and (max-width: 800px) {
+  .calendar-letters {
+    display: flex !important;
+  }
+}
+
 .cal-reverse {
   background: white !important;
   color: black !important;
diff --git a/src/app/pages/agenda/agenda.page.ts b/src/app/pages/agenda/agenda.page.ts
index 3249f2caa..994ae6cc2 100644
--- a/src/app/pages/agenda/agenda.page.ts
+++ b/src/app/pages/agenda/agenda.page.ts
@@ -796,7 +796,7 @@ export class AgendaPage implements OnInit {
 
       } else {
 
-        if(this.loggeduser.OwnerCalendars.length != 0) {
+        if(this.loggeduser.OwnerCalendars.length != 0 ) {
 
           this.eventService.getAllOwnEvents(momentG(new Date(startTime), 'yyyy-MM-dd HH:mm:ss'), momentG(new Date(endTime), 'yyyy-MM-dd 23:59:59')).then((response: any) => {
 
@@ -840,7 +840,7 @@ export class AgendaPage implements OnInit {
 
         
 
-        if(this.loggeduser.SharedCalendars.length != 0) {
+        if(this.loggeduser.SharedCalendars.length != 0 ) {
 
 
           this.eventService.genericGetAllSharedEvents(momentG(new Date(startTime), 'yyyy-MM-dd HH:mm:ss'), momentG(new Date(endTime), 'yyyy-MM-dd 23:59:59')).then((response: any) => {
@@ -1100,8 +1100,8 @@ export class AgendaPage implements OnInit {
       }
     } else {
 
-      this.TimelinePRList = this.listBoxService.list(this.listToPresent, 'pr', this.rangeStartDate, this.rangeEndDate, { segment: this.segment, selectedDate: this.eventSelectedDate })
-      this.TimelineMDList = this.listBoxService.list(this.listToPresent, 'md', this.rangeStartDate, this.rangeEndDate, { segment: this.segment, selectedDate: this.eventSelectedDate })
+      this.TimelinePRList = this.listBoxService.list(this.CalendarStore.eventSource, 'pr', this.rangeStartDate, this.rangeEndDate, { segment: this.segment, selectedDate: this.eventSelectedDate })
+      this.TimelineMDList = this.listBoxService.list(this.CalendarStore.eventSource, 'md', this.rangeStartDate, this.rangeEndDate, { segment: this.segment, selectedDate: this.eventSelectedDate })
 
     }
 
diff --git a/src/app/services/events.service.ts b/src/app/services/events.service.ts
index 4c3b7148a..3d355a5a9 100644
--- a/src/app/services/events.service.ts
+++ b/src/app/services/events.service.ts
@@ -54,7 +54,7 @@ export class EventsService {
   userCalendarNameOwnOficial = '';
   userCalendarNameOwnPessoal = '';
 
-
+  calendarNames = {}
 
   constructor(
     private http: HttpClient,
@@ -246,17 +246,24 @@ export class EventsService {
           this.headerSharedPessoal = this.headerSharedPessoal.set('CalendarName', sharedCalendar.CalendarName);
         }
 
+        for (let  sharedCalendar of this.loggeduser.SharedCalendars) {
+          this.GetCalendarName(sharedCalendar.OwnerUserId).subscribe((e)=> {
+            this.calendarNames[sharedCalendar.CalendarId] = e.FullName
+          })
+        }
 
-        this.GetCalendarName(sharedCalendar.OwnerUserId).subscribe((e)=> {
-          console.log(e)
-        })
-
+        for (let  sharedCalendar of this.loggeduser.OwnerCalendars) {
+          this.GetCalendarName(sharedCalendar.OwnerUserId).subscribe((e)=> {
+            this.calendarNames[sharedCalendar.CalendarId] = e.FullName
+          })
+        }
       }
-
-  
     }
   }
 
+  getCalendarOwnNameByCalendarId(CalendarId) {
+    return this.calendarNames[CalendarId] || ""
+  }
 
 
   isMyEvent(event: any) {
@@ -435,20 +442,36 @@ export class EventsService {
 
   async genericGetAllSharedEvents(startdate: string, enddate: string) {
 
-    let prO = [], prP = [];
-    
-    if(this.hasSharedOficial) {
-      prO = await this.genericGetAllSharedOficialEvents(startdate, enddate).toPromise();
-    }
+    let result = []
 
-    if(this.hasSharedPessoal) {
-      prP = await this.genericGetAllSharedPessoalEvents(startdate, enddate).toPromise();
-    }
+    for (let  sharedCalendar of this.loggeduser.SharedCalendars) {
+
+      var header = new HttpHeaders();
+      header = header.set('Authorization', 'Basic '+ sharedCalendar.CalendarToken);
+      header = header.set('CalendarId', sharedCalendar.CalendarId);
+      header = header.set('CalendarRoleId', sharedCalendar.CalendarRoleId);
+      header = header.set('CalendarName', sharedCalendar.CalendarName);
+
+      let geturl = environment.apiURL + 'calendar/GetEvents';
   
-    const resFinal = prO.concat(prP);
+      let params = new HttpParams();
+  
+      params = params.set("StartDate", startdate);
+      params = params.set("EndDate", enddate);
+  
+      let options = {
+        headers: header,
+        params: params
+      };
+
+      const calendar = await this.http.get<Event[]>(`${geturl}`, options).toPromise()
+
+      result = result.concat(calendar)
+
+    }
 
     return new Promise(resolve => {
-      return resolve(resFinal)
+      return resolve(result)
     });
   }