--- a/ui/administratorwindow.cpp	Wed Apr 16 17:11:18 2014 +0000
+++ b/ui/administratorwindow.cpp	Thu Apr 17 08:55:16 2014 +0000
@@ -29,6 +29,7 @@
 #include "createcertlistdialog.h"
 
 AdministratorWindow::AdministratorWindow() {
+    setWindowTitle(tr("TrustBridge Administration"));
     QString path = QStandardPaths::locate(
         QStandardPaths::DataLocation, QString("certlist_last.txt"));
     certList.readList(path.toLocal8Bit());
@@ -48,16 +49,11 @@
     menuBar = new QMenuBar(this);
     QMenu *menu = new QMenu(tr("Menu"), menuBar);
     menuBar->addMenu(menu);
-    QAction *createInstaller = menu->addAction(tr("Create Installer"));
-    QAction *settings = menu->addAction(tr("Settings"));
-    menu->addSeparator();
-    QAction *help = menu->addAction(tr("Help"));
-    QAction *about = menu->addAction(tr("About"));
+    QAction *createInstaller = menu->addAction(tr("Create installer ..."));
+    QAction *about = menu->addAction(tr("About TrustBridge"));
     menu->addSeparator();
     QAction *quit = menu->addAction(tr("Quit"));
     connect(createInstaller, SIGNAL(triggered()), this, SLOT(createInstaller()));
-    connect(settings, SIGNAL(triggered()), this, SLOT(showSettings()));
-    connect(help, SIGNAL(triggered()), this, SLOT(showHelp()));
     connect(about, SIGNAL(triggered()), this, SLOT(showAbout()));
     connect(quit, SIGNAL(triggered()), qApp, SLOT(quit()));
     setMenuBar(menuBar);
@@ -76,7 +72,8 @@
     QHBoxLayout *bottomLayout = new QHBoxLayout;
 
     // The certificate list
-    QGroupBox *certBox = new QGroupBox(tr("Managed Certificates"));
+    QGroupBox *certBox = new QGroupBox(
+        tr("All managed root certificates of the certificate list:"));
     certificateView = new QTableView;
     certificateModel = new CertificateTabelModel();
     QSortFilterProxyModel *filterModel = new QSortFilterProxyModel(this);
@@ -99,8 +96,9 @@
     QLabel *logo = new QLabel;
     logo->setBackgroundRole(QPalette::Base);
     logo->setPixmap(QPixmap::fromImage(*logoImage));
-    QLabel *title = new QLabel("<h2>" + tr("Administrator Application") + "</h2>");
-    QLabel *subTitle = new QLabel("This Software creates a signed file containing certificates");
+    QLabel *title = new QLabel("<h2>" + tr("TrustBridge Adminstration") + "</h2>");
+    QLabel *subTitle = new QLabel(
+        tr("Management application of the BSI certificate installer"));
     headerTextLayout->addWidget(title);
     headerTextLayout->addWidget(subTitle);
     headerLayout->addWidget(logo);
@@ -110,13 +108,13 @@
 
     // The buttons.
     bottomLayout->setAlignment(Qt::AlignBottom);
-    saveButton = new QPushButton(tr("Save"));
+    saveButton = new QPushButton(QIcon(":/img/document-save.png"), tr("Save list"));
     connect(saveButton, SIGNAL(clicked()), this, SLOT(saveCertificateFile()));
-    loadButton = new QPushButton(tr("Load"));
+    loadButton = new QPushButton(QIcon(":/img/document-open.png"), tr("Load list"));
     connect(loadButton, SIGNAL(clicked()), this, SLOT(loadCertificateFile()));
-    addButton = new QPushButton(tr("Add"));
+    addButton = new QPushButton(QIcon(":/img/document-new.png"), tr("Add certificate"));
     connect(addButton, SIGNAL(clicked()), this, SLOT(addCertificates()));
-    removeButton = new QPushButton(tr("Remove"));
+    removeButton = new QPushButton(QIcon(":/img/document-close.png"), tr("Remove certificate"));
     removeButton->setEnabled(false);
     connect(removeButton, SIGNAL(clicked()), this, SLOT(removeCertificates()));
     bottomLayout->addWidget(saveButton);