--- a/ui/mainwindow.cpp	Wed Jul 02 11:56:56 2014 +0200
+++ b/ui/mainwindow.cpp	Wed Jul 02 11:57:32 2014 +0200
@@ -548,11 +548,11 @@
     updatesHeaderTextLayout->addSpacing(10);
     updatesHeaderTextLayout->addWidget(updatesTip);
 
-    QPushButton *searchUpdates = new QPushButton(tr("Check for updates"));
+    QPushButton *searchUpdates = new QPushButton(" " + tr("Check for updates"));
     searchUpdates->setIcon(QIcon(":/img/edit-find.png"));
-    mQuitButton = new QPushButton(tr("Quit without saving"));
+    mQuitButton = new QPushButton(" " + tr("Quit without saving"));
     mQuitButton->setIcon(QIcon(":/img/application-exit.png"));
-    QPushButton *installButton = new QPushButton(tr("Apply changes"));
+    QPushButton *installButton = new QPushButton(" " + tr("Apply changes"));
 #ifdef Q_OS_WIN
     if (is_admin()) {
         QIcon uacShield = QApplication::style()->standardIcon(QStyle::SP_VistaShield);
@@ -625,6 +625,8 @@
         SIGNAL(clicked()),
         this,
         SLOT(toggleUpdatesManual()));
+    mUpdatesDetailsManual->hide();
+    mUpdatesManualCertificates->hide();
     updatesManualLayout->addWidget(mUpdatesManualCertificates);
     updatesManualLayout->addWidget(mUpdatesDetailsManual);
     updatesManualLayout->insertStretch(2, 10);
@@ -815,13 +817,21 @@
     int totalCount = mUpdatesRemove->selectedCertCount() +
         mUpdatesNew->selectedCertCount() + mUpdatesManual->certificates().size();
 
+    if (mUpdatesManual->certificates().size()) {
+        mUpdatesDetailsManual->show();
+        mUpdatesManualCertificates->show();
+    } else {
+        mUpdatesDetailsManual->hide();
+        mUpdatesManualCertificates->hide();
+    }
+
     if (!totalCount) {
         /* No changes */
-        mQuitButton->setText(tr("Quit"));
+        mQuitButton->setText(" " + tr("Quit"));
         mUpdatesHeader->setText("<h2>" + tr("Certificates unchanged") +
                 "</h2>");
     } else {
-        mQuitButton->setText(tr("Quit without saving"));
+        mQuitButton->setText(" " + tr("Quit without saving"));
         mUpdatesHeader->setText("<h2>" + tr("Changes (%1)")
                 .arg(totalCount) +
                 "</h2>");