diff --git a/src/app/pages/agenda/agenda.page.html b/src/app/pages/agenda/agenda.page.html
index a6459874e..f86cdd72d 100644
--- a/src/app/pages/agenda/agenda.page.html
+++ b/src/app/pages/agenda/agenda.page.html
@@ -2,8 +2,9 @@
   <ion-toolbar>
     <!-- customized TOGGLE button -->
     <label class="switch"><input type="checkbox" id="togBtn">
-      <div class="slider round" (click)="showAlert()">
-      <!--ADDED HTML --><span class="mdgpr">MDGPR</span><span class="pr">PR</span><!--END-->
+      <div (click)="showAlert()">
+        <div class="slider round">
+        <!--ADDED HTML --><span class="mdgpr">MDGPR</span></div><span class="pr">PR</span><!--END-->
     </div>
   </label>
   </ion-toolbar>
diff --git a/src/app/pages/agenda/agenda.page.scss b/src/app/pages/agenda/agenda.page.scss
index 6bd30e04c..13ba8b1a4 100644
--- a/src/app/pages/agenda/agenda.page.scss
+++ b/src/app/pages/agenda/agenda.page.scss
@@ -32,14 +32,14 @@
 
 
 
-
+/* TOGGLE button */
 .switch {
   position: relative;
   display: inline-block;
   width: 90px;
   height: 34px;
   float: right;
-  margin-right: 37px;
+  margin:20px 20px 0 0;
 }
 
 .switch input {display:none;}
@@ -51,7 +51,9 @@
   left: 0;
   right: 0;
   bottom: 0;
-  background-color: #e16817;
+  background-color: #ffffff;
+  border: 1px solid #e16817;
+  color: #e16817;
   -webkit-transition: .4s;
   transition: .4s;
 }
@@ -59,8 +61,8 @@
 .slider:before {
   position: absolute;
   content: "";
-  height: 26px;
-  width: 26px;
+  height: 23.5px; /* 26px;  */
+  width: 24px;
   left: 4px;
   bottom: 4px;
   background-color: #ffffff;
@@ -70,7 +72,6 @@
 
 input:checked + .slider {
   background-color: #e16817;
-  /* border: 1px solid #ffffff; */
 }
 
 input:focus + .slider {
@@ -89,26 +90,28 @@ input:checked + .slider:before {
   display: none;
   text-align: left !important;
   left: 25px !important; 
+  color: white;
 }
 .mdgpr
 {
 
-  left: 60px !important; 
+  left: 58px !important;
+  color: #e16817;
 }
 
 .pr, .mdgpr
 {
-  color: white;
   position: absolute;
   transform: translate(-50%,-50%);
   top: 50%;
   left: 50%;
-  font-size: 10px;
+  font-size: 12px;
   font-family: Verdana, sans-serif;
 }
 
 input:checked+ .slider .pr
 {display: block;
+  background:#e16817;
 }
 
 input:checked + .slider .mdgpr
@@ -125,4 +128,5 @@ input:checked + .slider .mdgpr
 
 .slider.round:before {
   border-radius: 50%;
-}
\ No newline at end of file
+  border: 1px solid #e16817;
+}
diff --git a/src/app/pages/events/events.page.html b/src/app/pages/events/events.page.html
index e38471dbd..509a2ef92 100644
--- a/src/app/pages/events/events.page.html
+++ b/src/app/pages/events/events.page.html
@@ -5,9 +5,11 @@
         <ion-label>Sair</ion-label>
       </ion-buttons> 
   <!-- customized TOGGLE button -->
-  <label class="switch"><input type="checkbox" id="togBtn">
+  <label class="switch">
+    <input type="checkbox" id="togBtn">
+    <div (click)="showAlert()">
     <div class="slider round">
-    <!--ADDED HTML --><span (click)="showAlert()" class="mdgpr">MDGPR</span><span class="pr">PR</span><!--END-->
+    <!--ADDED HTML --><span class="mdgpr">MDGPR</span></div><span class="pr">PR</span><!--END-->
   </div>
 </label>
 </ion-toolbar>
@@ -80,7 +82,7 @@
                 <div class="div-botton-middle">
                   <p class="item-list-small">{{event.Location}}</p>
                 </div>
-                <div class="div-botton-right">
+                <div *ngIf="event.HasAttachments" class="div-botton-right">
                   <ion-icon class="ion-icon-attach" slot="end" name="attach-outline"></ion-icon>
                 </div>
               </div>
diff --git a/src/app/pages/events/events.page.scss b/src/app/pages/events/events.page.scss
index 27127415f..d255fdd89 100644
--- a/src/app/pages/events/events.page.scss
+++ b/src/app/pages/events/events.page.scss
@@ -152,7 +152,7 @@ ion-toolbar{
       color: #666666;
       font-size: 20px;
     }
-
+/* TOGGLE BUTTON */
     .switch {
       position: relative;
       display: inline-block;
diff --git a/src/app/pages/events/events.page.ts b/src/app/pages/events/events.page.ts
index c4293ffbf..6e4c71c64 100644
--- a/src/app/pages/events/events.page.ts
+++ b/src/app/pages/events/events.page.ts
@@ -77,6 +77,7 @@ export class EventsPage implements OnInit {
         .subscribe(response => {
             this.eventsList = response;
             this.showLoader = false;
+            console.log(response[0].HasAttachments)
           }
         );
         break;
diff --git a/src/environments/environment.ts b/src/environments/environment.ts
index 1140059c1..05a0eecbd 100644
--- a/src/environments/environment.ts
+++ b/src/environments/environment.ts
@@ -7,7 +7,7 @@ export const environment = {
   apiURL: 'http://gpr-dev-01.gabinetedigital.local/GabineteDigital.Services/v2/api/',
   domain: 'gabinetedigital.local',
   defaultuser: '',
-  defaultuserpwd: ''
+  defaultuserpwd: 'tabteste@006'
 };
 
 /*