diff -Nru yaru-theme-19.10.4/debian/changelog yaru-theme-19.10.5/debian/changelog
--- yaru-theme-19.10.4/debian/changelog	2019-09-30 13:21:36.000000000 +0000
+++ yaru-theme-19.10.5/debian/changelog	2020-01-08 13:54:22.000000000 +0000
@@ -1,3 +1,10 @@
+yaru-theme (19.10.5) eoan; urgency=medium
+
+  * gnome-shell: Sync with 3.34.2 changes (LP: #1857037)
+  * debian/gbp.conf: Target ubuntu/eoan branch
+
+ -- Marco Trevisan (Treviño) <marco@ubuntu.com>  Wed, 08 Jan 2020 13:54:22 +0000
+
 yaru-theme (19.10.4) eoan; urgency=medium
 
   [ Carlo Lobrano ]
diff -Nru yaru-theme-19.10.4/debian/gbp.conf yaru-theme-19.10.5/debian/gbp.conf
--- yaru-theme-19.10.4/debian/gbp.conf	2019-09-30 13:21:36.000000000 +0000
+++ yaru-theme-19.10.5/debian/gbp.conf	2020-01-08 13:42:27.000000000 +0000
@@ -1,5 +1,5 @@
 [DEFAULT]
-debian-branch=master
+debian-branch=ubuntu/eoan
 debian-tag=%(version)s
 
 [dch]
diff -Nru yaru-theme-19.10.4/gnome-shell/src/gnome-shell-sass/_common.scss yaru-theme-19.10.5/gnome-shell/src/gnome-shell-sass/_common.scss
--- yaru-theme-19.10.4/gnome-shell/src/gnome-shell-sass/_common.scss	2019-09-30 13:21:36.000000000 +0000
+++ yaru-theme-19.10.5/gnome-shell/src/gnome-shell-sass/_common.scss	2020-01-08 13:42:27.000000000 +0000
@@ -615,6 +615,13 @@
     border-bottom-style: solid;
   }
 
+// Rename popup
+.rename-folder-popup {
+  .rename-folder-popup-item {
+    spacing: 6px;
+    &:ltr, &:rtl { padding: 0, 12px; }
+  }
+}
 
 // Background menu
 .background-menu { -boxpointer-gap: 4px; -arrow-rise: 0px; }
@@ -747,7 +754,7 @@
 
   .ws-switcher-active-up, .ws-switcher-active-down,
   .ws-switcher-active-left, .ws-switcher-active-right {
-    height: 50px;
+    height: 52px;
     background-color: $selected_bg_color;
     color: $selected_fg_color;
     background-size: 32px;
@@ -1060,9 +1067,9 @@
       }
       .calendar-today {
         font-weight: bold;
-        //color: lighten($fg_color,10%);
-        //background-color: darken($bg_color,5%);
-        border: 1px solid $_bubble_borders_color;
+        color: lighten($fg_color,5%);
+        background-color: darken($bg_color,5%);
+        // border: 1px solid lighten($_bubble_borders_color,20%);
       }
       .calendar-day-with-events {
         color: lighten($fg_color,10%);
@@ -1152,14 +1159,21 @@
             padding: 10px;
           }
 
+          .message-close-button {
+            color: lighten($fg_color, 15%);
+            &:hover { color: if($variant=='light', lighten($fg_color, 30%), darken($fg_color, 10%)); }
+            &:active { color: if($variant=='light', lighten($fg_color, 40%), darken($fg_color, 20%)); }
+          }
+
           .message-media-control {
             padding: 12px;
             color: lighten($fg_color, 15%);
 
             &:last-child:ltr { padding-right: 18px; }
             &:last-child:rtl { padding-left: 18px; }
-            &:hover { color: $fg_color; }
-            &:insensitive { color: darken($fg_color,40%); }
+            &:hover { color: if($variant=='light', lighten($fg_color, 30%), darken($fg_color, 10%)); }
+            &:active { color: if($variant=='light', lighten($fg_color, 40%), darken($fg_color, 20%)); }
+            &:insensitive { color: if($variant=='light', lighten($fg_color, 50%), darken($fg_color, 40%)); }
           }
 
           .media-message-cover-icon {
@@ -1208,12 +1222,11 @@
     &:hover, &:focus {
       background-color: $_hover_bg_color;
       color: $fg_color;
-      border: none;
-      padding: 14px;
     }
     &:active { 
       background-color: $_active_bg_color;
       color: $fg_color;
+      //border-color: $selected_borders_color;
     }
 
     & > StIcon { icon-size: 16px; }
diff -Nru yaru-theme-19.10.4/gnome-shell/upstream/gnome-shell-sass/_common.scss yaru-theme-19.10.5/gnome-shell/upstream/gnome-shell-sass/_common.scss
--- yaru-theme-19.10.4/gnome-shell/upstream/gnome-shell-sass/_common.scss	2019-09-30 13:21:36.000000000 +0000
+++ yaru-theme-19.10.5/gnome-shell/upstream/gnome-shell-sass/_common.scss	2020-01-08 13:42:27.000000000 +0000
@@ -610,6 +610,13 @@
     border-bottom-style: solid;
   }
 
+// Rename popup
+.rename-folder-popup {
+  .rename-folder-popup-item {
+    spacing: 6px;
+    &:ltr, &:rtl { padding: 0, 12px; }
+  }
+}
 
 // Background menu
 .background-menu { -boxpointer-gap: 4px; -arrow-rise: 0px; }
@@ -742,7 +749,7 @@
 
   .ws-switcher-active-up, .ws-switcher-active-down,
   .ws-switcher-active-left, .ws-switcher-active-right {
-    height: 50px;
+    height: 52px;
     background-color: $selected_bg_color;
     color: $selected_fg_color;
     background-size: 32px;
@@ -1054,9 +1061,9 @@
       }
       .calendar-today {
         font-weight: bold;
-        //color: lighten($fg_color,10%);
-        //background-color: darken($bg_color,5%);
-        border: 1px solid $_bubble_borders_color;
+        color: lighten($fg_color,5%);
+        background-color: darken($bg_color,5%);
+        // border: 1px solid lighten($_bubble_borders_color,20%);
       }
       .calendar-day-with-events {
         color: lighten($fg_color,10%);
@@ -1146,14 +1153,21 @@
             padding: 10px;
           }
 
+          .message-close-button {
+            color: lighten($fg_color, 15%);
+            &:hover { color: if($variant=='light', lighten($fg_color, 30%), darken($fg_color, 10%)); }
+            &:active { color: if($variant=='light', lighten($fg_color, 40%), darken($fg_color, 20%)); }
+          }
+
           .message-media-control {
             padding: 12px;
             color: lighten($fg_color, 15%);
 
             &:last-child:ltr { padding-right: 18px; }
             &:last-child:rtl { padding-left: 18px; }
-            &:hover { color: $fg_color; }
-            &:insensitive { color: darken($fg_color,40%); }
+            &:hover { color: if($variant=='light', lighten($fg_color, 30%), darken($fg_color, 10%)); }
+            &:active { color: if($variant=='light', lighten($fg_color, 40%), darken($fg_color, 20%)); }
+            &:insensitive { color: if($variant=='light', lighten($fg_color, 50%), darken($fg_color, 40%)); }
           }
 
           .media-message-cover-icon {
@@ -1202,12 +1216,11 @@
     &:hover, &:focus {
       background-color: $_hover_bg_color;
       color: $fg_color;
-      border: none;
-      padding: 14px;
     }
     &:active { 
       background-color: $selected_bg_color;
       color: $selected_fg_color;
+      border-color: $selected_borders_color;
     }
 
     & > StIcon { icon-size: 16px; }