1 files changed, 10 insertions, 26 deletions
diff --git a/lib/ManaTools/Module/Clock.pm b/lib/ManaTools/Module/Clock.pm
index 3b4d2605..ba8f2e11 100644
--- a/lib/ManaTools/Module/Clock.pm
+++ b/lib/ManaTools/Module/Clock.pm
@@ -67,10 +67,18 @@ use Time::Piece;
 use yui;
 
 
-has '+icon' => (
-    default => File::ShareDir::dist_file(ManaTools::Shared::distName(), 'images/manaclock.png'),
+has '+name' => (
+    default => 'manaclock',
+    required => 0,
+    init_arg => undef,
 );
 
+override('_titleInitializer', sub {
+    my $self = shift;
+
+    return ($self->loc->N("%s - Date, Clock & Time Zone Settings", $self->name()));
+});
+
 has 'sh_gui' => (
         is => 'rw',
         lazy => 1,
@@ -106,30 +114,6 @@ has 'NTPServers' => (
 
 #=============================================================
 
-=head2 BUILD
-
-=head3 INPUT
-
-    $self: this object
-
-=head3 DESCRIPTION
-
-    The BUILD method is called after a Moose object is created,
-    in this methods Services loads all the service information.
-
-=cut
-
-#=============================================================
-sub BUILD {
-    my $self = shift;
-
-    if (! $self->name) {
-        $self->name ($self->loc->N("Date, Clock & Time Zone Settings"));
-    }
-}
-
-#=============================================================
-
 =head2 start
 
 =head3 INPUT