diff --git a/package.json b/package.json
index 306b81d5d..a02dedd41 100644
--- a/package.json
+++ b/package.json
@@ -84,4 +84,4 @@
       "ios"
     ]
   }
-}
\ No newline at end of file
+}
diff --git a/src/app/pages/cal-modal/cal-modal.page.html b/src/app/pages/cal-modal/cal-modal.page.html
index 95a17bca5..a46ea7318 100644
--- a/src/app/pages/cal-modal/cal-modal.page.html
+++ b/src/app/pages/cal-modal/cal-modal.page.html
@@ -40,7 +40,7 @@
   
       <ion-item class="radio-button" lines="none">
         <ion-label>Pessoal</ion-label>
-        <ion-radio [(ngModel)]="event.type" slot="start" value="griff"></ion-radio>
+        <ion-radio slot="start" value="griff"></ion-radio>
       </ion-item>
     </ion-radio-group>
   </ion-list>
diff --git a/src/app/pages/feed/feed.page.html b/src/app/pages/feed/feed.page.html
index 1ab1e78d9..976ea6341 100644
--- a/src/app/pages/feed/feed.page.html
+++ b/src/app/pages/feed/feed.page.html
@@ -6,11 +6,9 @@
   <ion-toolbar>
     <ion-title>
       <ion-item class="ion-text-header-top" lines="none">
-        <ion-thumbnail slot="start">
-          <div class="div-logo">
-            <img src='assets/images/logo.png' alt='logo'>
-          </div>
-        </ion-thumbnail>
+        <div class="div-logo">
+          <img src='assets/images/logo.png' alt='logo'>
+        </div>
         <ion-label>
           <h6 class="header-xsmall">Presidente da República</h6>
           <h2 class="header-large">GABINETE DIGITAL</h2>
@@ -18,7 +16,10 @@
       </ion-item>
       <ion-item class="ion-text-right" lines="none">
         <ion-label class="ion-text-wrap">
-            <h3 class="header-medium">Bom dia Excelência <br />Presidente da República</h3>
+            <h3 class="header-medium"> {{greetting}} Sua Excelência <br />
+              Minístro Director do Gabinete do<br />
+              Presidente da República
+            </h3>
           <p class="p-small">{{customDate}}</p>
           <!-- <p>{{timeDate}}</p> -->
         </ion-label>
@@ -57,17 +58,17 @@
   <div [ngSwitch]="segment">
     <ion-list *ngSwitchCase="'combinada'">
       <ion-item-group>
-        <ion-item-divider>
+        <!-- <ion-item-divider>
           <ion-label>8:00 am</ion-label>
-        </ion-item-divider>
+        </ion-item-divider> -->
         <ion-item-sliding>
           <ion-item lines="none">
             <div class="div-item">
               <div class="div-up">
                 <div class="div-icon">
-                  <ion-icon slot="start" name="chatbox"></ion-icon>
+                  <ion-icon slot="start" name="reader"></ion-icon>
                 </div>
-                <div class="div-content">
+                <div class="div-content-oficial">
                   <h3>Reunião de Conselho de Ministros</h3>
                   <p>08:30 - 10:30</p>
                 </div>
@@ -85,16 +86,40 @@
               </div>
             </div>
           </ion-item>
-        <ion-item-divider>
+        <!-- <ion-item-divider>
           <ion-label>9:00 am</ion-label>
-        </ion-item-divider>
+        </ion-item-divider> -->
         <ion-item lines="none">
           <div class="div-item">
             <div class="div-up">
               <div class="div-icon">
-                <ion-icon slot="start" name="chatbox"></ion-icon>
+                <ion-icon slot="start" name="reader"></ion-icon>
               </div>
-              <div class="div-content">
+              <div class="div-content-pessoal">
+                <h3>Conference call Particular</h3>
+                <p>11:00 - 12:30</p>
+              </div>
+            </div>
+            <div class="div-botton">
+              <div class="div-botton-left">
+                <ion-icon class="ion-icon-location" slot="start" name="location"></ion-icon>
+              </div>
+              <div class="div-botton-middle">
+                <p class="item-list-small">Luanda, Palácio presidencial</p>
+              </div>
+              <div class="div-botton-right">
+                <ion-icon class="ion-icon-attach" slot="end" name="attach"></ion-icon>
+              </div>
+            </div>
+          </div>
+        </ion-item>
+        <ion-item lines="none">
+          <div class="div-item">
+            <div class="div-up">
+              <div class="div-icon">
+                <ion-icon slot="start" name="reader"></ion-icon>
+              </div>
+              <div class="div-content-pessoal">
                 <h3>Conference call Particular</h3>
                 <p>11:00 - 12:30</p>
               </div>
@@ -128,7 +153,7 @@
                 <div class="div-icon">
                   <ion-icon slot="start" name="chatbox"></ion-icon>
                 </div>
-                <div class="div-content">
+                <div class="div-content-oficial">
                   <h3>Reunião de Conselho de Ministros</h3>
                   <p>08:30 - 10:30</p>
                 </div>
@@ -141,7 +166,7 @@
                   <p class="item-list-small">Luanda, Palácio presidencial</p>
                 </div>
                 <div class="div-botton-right">
-                  <ion-icon class="ion-icon-attach" slot="end" name="document-attach"></ion-icon>
+                  <ion-icon class="ion-icon-attach" slot="end" name="attach"></ion-icon>
                 </div>
               </div>
             </div>
@@ -177,7 +202,7 @@
                   <div class="div-icon">
                     <ion-icon slot="start" name="chatbox"></ion-icon>
                   </div>
-                  <div class="div-content">
+                  <div class="div-content-pessoal">
                     <h3>Conference call Particular</h3>
                     <p>11:00 - 12:30</p>
                   </div>
@@ -190,7 +215,7 @@
                     <p class="item-list-small">Luanda, Palácio presidencial</p>
                   </div>
                   <div class="div-botton-right">
-                    <ion-icon class="ion-icon-attach" slot="end" name="document-attach"></ion-icon>
+                    <ion-icon class="ion-icon-attach" slot="end" name="attach"></ion-icon>
                   </div>
                 </div>
               </div>
diff --git a/src/app/pages/feed/feed.page.scss b/src/app/pages/feed/feed.page.scss
index 20b7f3736..3b4abbeba 100644
--- a/src/app/pages/feed/feed.page.scss
+++ b/src/app/pages/feed/feed.page.scss
@@ -1,47 +1,48 @@
 /* .div-logo{
   width: 100px;
+  border: 1px solid blue;
 } */
-img{
+/* img{
   width: 100px;
-}
+  border: 1px solid red;
+} */
 /* HEADER */
-.header-medium{
-  font-size: 12pt;
-  font-family: roboto;
-}
-.p-small{
-  font-size: 9pt;
-  margin-top: 10px;
-  color:#000;
-}
 .ion-text-header-top{
   text-align: center;
   padding-top: 20px;
 }
-.div-img{
+.div-logo{
+  width: 98px;
+}
+.div-logo img{
   width: 100%;
 }
-.div-im img{
-  width: 100%;
-  height: 100%;
+.header-large{
+  font-family: Arial, Helvetica, sans-serif;
+  font-size: 16pt;
+  font-weight: bold;
+}
+.header-medium{
+  font-size: 16pt;
+  font-family: roboto;
 }
 .header-xsmall{
   font-family: Arial, Helvetica, sans-serif;
-  font-size: 8.5pt;
+  font-size: 12.7pt;
   font-weight: bold;
   padding-bottom: 3.5px;
   margin-bottom: 3.5px;
   border-bottom: 1px solid #ccc;
 }
-.header-large{
-  font-family: Arial, Helvetica, sans-serif;
-  font-size: 10.5pt;
-  font-weight: bold;
+.p-small{
+  font-size: 12pt;
+  margin-top: 25px;
+  color:#000;
 }
 
 /* CONTENT */
 .item-list-small{
-    font-size: 11px;
+    font-size: 14px;
     overflow: auto;
   }
   .ion-item-class{
@@ -68,12 +69,12 @@ img{
   .div-up h3{
     margin: 0;
     padding: 0;
-    font-size: 15px;
+    font-size: 17px;
     width: 100%;
   }
   .div-icon{
     width: 10%;
-    font-size: 20px;
+    font-size: 22px;
     float: left;
     color: #808080;
   }
@@ -82,22 +83,32 @@ img{
     margin: 0 auto;
   
   }
-  .div-content{
+  .div-content-oficial{
     width: 85%;
     float: left;
-    border-left: 2px solid orange;
-    padding: 0 0 0 5px;
+    border-left: 3px solid #cab0dc;
+    padding: 0 0 0 12px;
   }
-  .div-content p{
-    font-size: 10.5pt;
+  .div-content-pessoal{
+    width: 85%;
+    float: left;
+    border-left: 3px solid #cbeecb;
+    padding: 0 0 0 12px;
+  }
+  .div-content-oficial h3, .div-content-pessoal h3{
+    font-size: 16pt;
+    /* border: 1px solid red; */
+  }
+  .div-content-oficial p, .div-content-pessoal p{
+    font-size: 14pt;
     color: rgb(94, 92, 92);
-    padding: 0;
-    margin: 0;
+    padding: 0 !important;
+    margin: 0 !important;
   }
   .div-botton{
     width: 100%;
     overflow: auto;
-    margin: 5px 0 5px 0;
+    margin: 10px 0 5px 0;
   }
   .div-botton-left{
     width: 10%;
@@ -107,7 +118,7 @@ img{
     text-align: center;
     display: block;
     color: #000;
-    font-size: 14px;
+    font-size: 16px;
     margin: 0 auto;
   }
   .div-botton-middle{
@@ -127,6 +138,6 @@ img{
   }
   .ion-icon-attach{
     color: #666666;
-    font-size: 18px;
+    font-size: 20px;
   }
   
\ No newline at end of file
diff --git a/src/app/pages/feed/feed.page.ts b/src/app/pages/feed/feed.page.ts
index 7fd90a2df..818b140e9 100644
--- a/src/app/pages/feed/feed.page.ts
+++ b/src/app/pages/feed/feed.page.ts
@@ -16,6 +16,7 @@ export class FeedPage implements OnInit {
   + ( this.months[this.today.getMonth()]);
   /* Setting appropriate greeting according to the time */
   grettings = ["Bom dia", "Boa tarde", "Boa noite"];
+  greetting='';
   /* hora 
   Dia 06 - 12:00
   Tarde 12:01 - 18:00
@@ -23,7 +24,19 @@ export class FeedPage implements OnInit {
   */
  timeDate = this.today.getHours() + ":" + this.today.getMinutes();
  showGreeting(){
-   if(this.today.getHours() >= 11 && this.today.getMinutes() >=)
+   if(this.today.getHours() >= 6 && this.today.getHours() < 12){
+     console.log(this.grettings[0]+this.today.getHours());
+     this.greetting = this.grettings[0];
+   }
+   else if(this.today.getHours() >= 12 && this.today.getHours() < 18){
+    console.log(this.grettings[1]+this.today.getHours());
+    this.greetting = this.grettings[1];
+   }
+   else /* if(this.today.getHours() < 6 && this.today.getHours() >= 18) */{
+    console.log(this.grettings[2]+this.today.getHours());
+    this.greetting = this.grettings[2];
+
+   }
  }
 
   segment:string;
@@ -33,6 +46,7 @@ export class FeedPage implements OnInit {
   ngOnInit() {
     //Inicializar segment
     this.segment = "combinada";
+    this.showGreeting();
   }
 
 }
diff --git a/src/app/pages/login/login.page.html b/src/app/pages/login/login.page.html
index bf9dcc622..70333da08 100644
--- a/src/app/pages/login/login.page.html
+++ b/src/app/pages/login/login.page.html
@@ -1,17 +1,17 @@
 <ion-content>
   <div class="wrapper">
     <div class="div-logo">
-    <img src='assets/images/logo.png' alt='logo'>
+    <img src='assets/images/fullLogo.png' alt='logo'>
   </div>
     <h2 class="center">Iniciar a sessão</h2>
   <form>
     <ion-list>
       <ion-item>
-        <ion-label position="stacked">Username</ion-label>
+        <ion-label position="stacked">Username ou email</ion-label>
         <ion-input type="text" name="username" [(ngModel)]="postData.username"></ion-input>
       </ion-item>
       <ion-item>
-          <ion-label position="stacked">Password</ion-label>
+          <ion-label position="stacked">Palavra-passe</ion-label>
           <ion-input type="password" name="password" [(ngModel)]="postData.password"></ion-input>
         </ion-item>
         <ion-item>
diff --git a/src/app/pages/login/login.page.scss b/src/app/pages/login/login.page.scss
index 1f2ba7098..c99827774 100644
--- a/src/app/pages/login/login.page.scss
+++ b/src/app/pages/login/login.page.scss
@@ -2,9 +2,24 @@
     margin: 0 auto;
 }
 .div-logo{
-    width: 100px;
+    width: 270px;
     margin:  0 auto;
+    padding-bottom: 15px;
 }
 .div-logo img{
-    width: 100px;
+    width: 100%;
+}
+form{
+    /* border: 1px solid red; */
+    padding: 10px;
+}
+.wrapper ion-label{
+    font-size: 20px; 
+}
+.wrapper ion-input{
+    font-size: 22px;
+}
+.wrapper ion-button{
+    font-size: medium;
+    margin-top: 25px;
 }
diff --git a/src/assets/images/fullLogo.png b/src/assets/images/fullLogo.png
new file mode 100644
index 000000000..86ef8522f
Binary files /dev/null and b/src/assets/images/fullLogo.png differ
diff --git a/src/index.html b/src/index.html
index 3b0aae1d9..00db3737a 100644
--- a/src/index.html
+++ b/src/index.html
@@ -12,7 +12,7 @@
   <meta name="format-detection" content="telephone=no" />
   <meta name="msapplication-tap-highlight" content="no" />
 
-  <link rel="icon" type="image/png" href="assets/icon/favicon.png" />
+  <link rel="icon" type="image/x-icon" href="assets/icon/favicon.png" />
 
   <!-- add to homescreen for ios -->
   <meta name="apple-mobile-web-app-capable" content="yes" />