diff --git a/data/theme/mutter-moblin.css b/data/theme/mutter-moblin.css
index 9895402..bc3ce33 100644
--- a/data/theme/mutter-moblin.css
+++ b/data/theme/mutter-moblin.css
@@ -38,12 +38,12 @@ NbtkTable {
   background-color: #f000;
 }
 
-MnbToolbar > *#time-label {
-  color: #c0c0c0;
+MnbToolbar *#time-label {
+  color: #eee;
   font-size: 19px;
 }
 
-MnbToolbar > *#date-label {
+MnbToolbar *#date-label {
   color: #c0c0c0;
   font-size: 12px;
 }
@@ -70,6 +70,10 @@ MnbToolbarButton:hover, MnbToolbarButton:active {
   border-image: url("file://panel/toolbar-button-hover.png") 0 stretch;
 }
 
+*#date-button:hover, *#date-button:active, *#date-button:hover {
+  border-image: none !important;
+}
+
 /* Toolbar usage hint */
 
 NbtkBin.toolbar-instruction-box {
diff --git a/src/mnb-toolbar.c b/src/mnb-toolbar.c
index 76fa3d1..c576da5 100644
--- a/src/mnb-toolbar.c
+++ b/src/mnb-toolbar.c
@@ -2315,6 +2315,7 @@ mnb_toolbar_constructed (GObject *self)
   ClutterColor       clr = {0x0, 0x0, 0x0, 0xce};
   ClutterColor       low_clr = { 0, 0, 0, 0x7f };
   DBusGConnection   *conn;
+  gchar             *time_tooltip_str, **time_tooltip_split;
 
   /*
    * Make sure our parent gets chance to do what it needs to.
@@ -2332,11 +2333,15 @@ mnb_toolbar_constructed (GObject *self)
       g_warning (G_STRLOC " DBus connection not available !!!");
     }
 
+  time_tooltip_split = g_strsplit (_("Ad_just Date & Time"), "_", -1);
+  time_tooltip_str = g_strjoinv ("", time_tooltip_split);
   hbox = priv->hbox = clutter_group_new ();
   button = (ClutterActor *)mnb_toolbar_button_new ();
-  nbtk_widget_set_tooltip_text (NBTK_WIDGET (button), _("Ad_just Date & Time"));
+  nbtk_widget_set_tooltip_text (NBTK_WIDGET (button), time_tooltip_str);
   clutter_actor_set_name (CLUTTER_ACTOR (button), "date-button");
   nbtk_button_set_toggle_mode (NBTK_BUTTON (button), FALSE);
+  g_strfreev (time_tooltip_split);
+  g_free (time_tooltip_str);
 
   anotherbox = clutter_group_new ();
   g_signal_connect (button, "clicked", G_CALLBACK(date_clicked_cb), self);