diff --git a/config.xml b/config.xml
index 7b18d7926..97d2fb38d 100644
--- a/config.xml
+++ b/config.xml
@@ -3,7 +3,7 @@
     <name>gabinete digital</name>
     <description>An awesome Ionic/Cordova app.</description>
     <author email="hi@ionicframework.com" href="http://ionicframework.com/">Ionic Framework Team</author>
-    <content original-src="index.html" src="http://localhost:8100" />
+    <content src="index.html" />
     <access origin="*" />
     <allow-navigation href="http://*/*" />
     <allow-navigation href="https://*/*" />
diff --git a/src/app/modals/chat-options-features/chat-options-features.page.scss b/src/app/modals/chat-options-features/chat-options-features.page.scss
index 3389864c6..86ac0ae4b 100644
--- a/src/app/modals/chat-options-features/chat-options-features.page.scss
+++ b/src/app/modals/chat-options-features/chat-options-features.page.scss
@@ -30,7 +30,7 @@
   margin: 0 auto !important;
   margin-bottom: 10px;
 }
-@media only screen and (min-width: 1024px) {
+@media only screen and (min-width: 701px) {
   .arrow-right{
       display: flex;
       justify-content: flex-end;
diff --git a/src/app/modals/chat-options-features/chat-options-features.page.ts b/src/app/modals/chat-options-features/chat-options-features.page.ts
index 9e419dc03..66fbb4545 100644
--- a/src/app/modals/chat-options-features/chat-options-features.page.ts
+++ b/src/app/modals/chat-options-features/chat-options-features.page.ts
@@ -46,7 +46,7 @@ export class ChatOptionsFeaturesPage implements OnInit {
   }
 
   close(){
-    if( window.innerWidth <= 1024){
+    if( window.innerWidth < 701){
       this.popoverController.dismiss();
     }
     else{
diff --git a/src/app/pages/chat/messages/messages.page.html b/src/app/pages/chat/messages/messages.page.html
index 1972dea42..dfbf5e17a 100644
--- a/src/app/pages/chat/messages/messages.page.html
+++ b/src/app/pages/chat/messages/messages.page.html
@@ -11,7 +11,7 @@
           <ion-label class="title">{{users.name}}</ion-label>
           <span><ion-icon class="{{users.status}}" name="ellipse"></ion-icon></span>
         </div>
-        <div class="right">
+        <div hidden class="right">
           <button class="btn-no-color" (click)="openMessagesOptions()">
             <ion-icon src="assets/images/icons-menu.svg"></ion-icon>
           </button>
diff --git a/src/app/services/storage.service.ts b/src/app/services/storage.service.ts
index 95ba38c25..884c6407c 100644
--- a/src/app/services/storage.service.ts
+++ b/src/app/services/storage.service.ts
@@ -16,15 +16,19 @@ const { Storage } = Plugins; */
   // Get the value
   async get(key: string) {
     const ret = await this.storage.get(key).then((val) => { return val; });
-    return JSON.parse(unescape(atob(ret)));
+    try {
+      return JSON.parse(unescape(atob(ret)));
+    } catch (error) {
+      return unescape(atob(ret))
+    }
   }
 
   async remove(key: string){
     await this.storage.remove(key);
   }
 
-  
-/* 
+
+/*
   // Get the value
   async get(storageKey: string) {
   const ret = await Storage.get({ key: storageKey });
diff --git a/src/app/shared/chat/messages/messages.page.html b/src/app/shared/chat/messages/messages.page.html
index 18fe275d1..49ccb9cdd 100644
--- a/src/app/shared/chat/messages/messages.page.html
+++ b/src/app/shared/chat/messages/messages.page.html
@@ -6,7 +6,7 @@
           <ion-label class="title">{{users.name}}</ion-label>
           <span><ion-icon class="{{users.status}}" name="ellipse"></ion-icon></span>
         </div>
-        <div class="right">
+        <div hidden class="right">
           <button class="btn-no-color" (click)="_openMessagesOptions()">
             <ion-icon src="assets/images/icons-menu.svg"></ion-icon>
           </button>
diff --git a/src/app/shared/popover/chat-options-popover/chat-options-popover.page.ts b/src/app/shared/popover/chat-options-popover/chat-options-popover.page.ts
index baf6f1d5a..bd38ed2c1 100644
--- a/src/app/shared/popover/chat-options-popover/chat-options-popover.page.ts
+++ b/src/app/shared/popover/chat-options-popover/chat-options-popover.page.ts
@@ -46,7 +46,7 @@ export class ChatOptionsPopoverPage implements OnInit {
   }
 
   close(){
-    if( window.innerWidth <= 1024){
+    if( window.innerWidth < 701){
       this.popoverController.dismiss();
     }
     else{
diff --git a/src/app/shared/popover/chat-popover/chat-popover.page.html b/src/app/shared/popover/chat-popover/chat-popover.page.html
index 806cedd83..10bab132a 100644
--- a/src/app/shared/popover/chat-popover/chat-popover.page.html
+++ b/src/app/shared/popover/chat-popover/chat-popover.page.html
@@ -6,9 +6,8 @@
   </div>
   <div class="buttons">
     <button (click)="leaveGroup()" class="btn-cancel" shape="round" >Sair do Grupo</button>
-    <button (click)="openChangeGroupName()" class="btn-ok" shape="round" >Alterar nome do grupo</button>
+    <button (click)="openChangeGroupName()" class="btn-cancel" shape="round" >Alterar nome do grupo</button>
     <div class="solid"></div>
-    <button (click)="bookMeeting()" class="btn-cancel" shape="round">Marcar Reunião</button>
     <button (click)="close()" full class="btn-cancel mobile-only" shape="round" >Cancelar</button>
     <button (click)="deleteGroup()" class="btn-delete" shape="round">Apagar grupo</button>
   </div>
diff --git a/src/app/shared/popover/chat-popover/chat-popover.page.scss b/src/app/shared/popover/chat-popover/chat-popover.page.scss
index 5605876c3..ceeee4fcf 100644
--- a/src/app/shared/popover/chat-popover/chat-popover.page.scss
+++ b/src/app/shared/popover/chat-popover/chat-popover.page.scss
@@ -25,7 +25,8 @@
   border-top: 1px solid #bbb;
   margin: 10px auto !important;
 }
-@media only screen and (min-width: 1024px) {
+
+@media only screen and (min-width: 701px) {
   .arrow-right{
       display: flex;
       justify-content: flex-end;
@@ -35,6 +36,10 @@
       width: 100% !important;
       margin-bottom: 10px !important;
   }
+  .btn-cancel:hover, .btn-delete:hover{
+    background-color: #42b9fe;
+    color: #fff !important;
+  }
   .btn-ok{
     width: 100% !important;
   }
@@ -48,4 +53,5 @@
   .mobile-only{
     display: none !important;
   }
+
 }
diff --git a/src/app/shared/popover/chat-popover/chat-popover.page.ts b/src/app/shared/popover/chat-popover/chat-popover.page.ts
index 58ead2ef5..990d70100 100644
--- a/src/app/shared/popover/chat-popover/chat-popover.page.ts
+++ b/src/app/shared/popover/chat-popover/chat-popover.page.ts
@@ -25,7 +25,7 @@ export class ChatPopoverPage implements OnInit {
   }
 
   close(){
-    if( window.innerWidth <= 1024){
+    if( window.innerWidth <= 701){
       this.popoverController.dismiss('cancel');
       this.modalController.dismiss('cancel');
     }
@@ -86,8 +86,4 @@ export class ChatPopoverPage implements OnInit {
     this.modalController.dismiss('edit');
   }
 
-  bookMeeting(){
-
-  }
-
 }
diff --git a/src/app/shared/popover/messages-options/messages-options.page.scss b/src/app/shared/popover/messages-options/messages-options.page.scss
index 03fcefe0d..dd61665a1 100644
--- a/src/app/shared/popover/messages-options/messages-options.page.scss
+++ b/src/app/shared/popover/messages-options/messages-options.page.scss
@@ -25,7 +25,7 @@
     border-top: 1px solid #bbb;
     margin: 0 auto !important;
   }
-@media only screen and (min-width: 1024px) {
+@media only screen and (min-width: 701px) {
     .arrow-right{
         display: flex;
         justify-content: flex-end;
@@ -43,4 +43,4 @@
    /*  .solid{
         display: block;
     } */
-}
\ No newline at end of file
+}
diff --git a/src/app/shared/popover/messages-options/messages-options.page.ts b/src/app/shared/popover/messages-options/messages-options.page.ts
index 44262ee86..c6d3340b0 100644
--- a/src/app/shared/popover/messages-options/messages-options.page.ts
+++ b/src/app/shared/popover/messages-options/messages-options.page.ts
@@ -16,8 +16,8 @@ export class MessagesOptionsPage implements OnInit {
     private modalController: ModalController,
     private chatService: ChatService,
     private navParams: NavParams,
-  ) 
-  { 
+  )
+  {
     this.roomId = this.navParams.get('roomId');
   }
 
@@ -25,11 +25,13 @@ export class MessagesOptionsPage implements OnInit {
   }
 
   close(){
-    if( window.innerWidth <= 1024){
+    if( window.innerWidth <= 701){
+      this.modalController.dismiss();
       this.popoverController.dismiss();
     }
     else{
       this.modalController.dismiss();
+      this.popoverController.dismiss();
     }
   }
 
diff --git a/src/global.scss b/src/global.scss
index 275a011df..841dad997 100644
--- a/src/global.scss
+++ b/src/global.scss
@@ -370,7 +370,7 @@ td.monthview-secondary-with-event, td.monthview-secondary-with-event[_ngcontent-
         border-radius: 0 0 25px 25px;
     }
 
-    @media only screen and (min-width: 1140px) {
+    @media only screen and (min-width: 701px) {
       .modal-wrapper{
         max-width: 400px;
       }
diff --git a/src/theme/variables.scss b/src/theme/variables.scss
index eb0d3b881..b79a3d724 100644
--- a/src/theme/variables.scss
+++ b/src/theme/variables.scss
@@ -318,27 +318,21 @@ $app-theme: mat-light-theme((
   left: 0 !important;
   bottom: 0 !important;
   right: 0 !important;
-  top: calc(100% - 160px) !important;
-  max-height: 160px;
-  min-height: 160px;
+  top: unset !important;
 }
 .messages-options .popover-content{
   width: 100% !important;
   left: 0 !important;
   bottom: 0 !important;
   right: 0 !important;
-  top: calc(100% - 90px) !important;
-  max-height: 90px;
-  min-height: 90px;
+  top: unset !important;
 }
 .events-options .popover-content{
   width: 100% !important;
   left: 0 !important;
   bottom: 0 !important;
   right: 0 !important;
-  top: calc(100% - 190px) !important;
-  max-height: 190px;
-  min-height: 190px;
+  top: unset !important;
 }
 .exp-options .popover-content{
   width: 100% !important;
@@ -361,18 +355,14 @@ $app-theme: mat-light-theme((
   left: 0 !important;
   bottom: 0 !important;
   right: 0 !important;
-  top: calc(100% - 210px) !important;
-  max-height: 210px;
-  min-height: 210px;
+  top: unset !important;
 }
 .group-duration .popover-content{
   width: 100% !important;
   left: 0 !important;
   bottom: 0 !important;
   right: 0 !important;
-  top: calc(100% - 500px) !important;
-  max-height: 500px;
-  min-height: 500px;
+  top: unset !important;
 }
 
 /* .event-actions-popover ion-list{