diff --git a/README.md b/README.md
index b7a2246..cf6f0c3 100644
--- a/README.md
+++ b/README.md
@@ -1,35 +1,87 @@
-KDE Partition Manager
-=====================
+# KDE Partition Manager
 
-### WARNING
+<img src="https://invent.kde.org/kde/partitionmanager/raw/master/icons/sc-apps-partitionmanager.svg" align="right"
+     title="KDE Partition Manager logo" width="96" height="96">
 
-KDE Partition Manager is a potentially dangerous program for your data. It has
-been tested carefully and there are currently no known bugs that could lead to
-data loss, but nevertheless there is always a chance for an error to ocurr and
-you might lose your data.
+KDE Partition Manager is an application to help you manage the disk devices,
+partitions and file systems on your computer. It allows you to easily create,
+copy, move, delete, resize without losing data, backup and restore partitions.
 
-### BACK UP YOUR DATA BEFORE USING THIS SOFTWARE!
+A large number of file systems are also supported:
+- ext2/3/4, Btrfs, Linux swap
+- Reiserfs
+- F2FS
+- NTFS
+- FAT
+- exFAT
+- LUKS encryption support
+- and more....
 
-This software allows you to manage your disks, partitions and file systems:
-Create, resize, delete, copy, backup and restore partitions with a large number
-of supported file systems:
- * ext2/3/4
- * Btrfs
- * Linux swap
- * Reiserfs
- * F2FS
- * NTFS
- * FAT
- * exFAT
- * LUKS encryption support
- * and more....
+:zap: **Back up your data before using this software**. KDE Partition Manager is
+a potentially dangerous program for your data. It has been tested carefully and
+there are currently no known bugs that could lead to data loss, but nevertheless
+there is always a chance for an error to occur and you might lose your data.
 
-It is a KF5 application, so you will need KDE frameworks libraries to run it on
-your computer. It also makes use of external programs to get its job done, so
+<img src="https://docs.kde.org/trunk5/en/extragear-sysadmin/partitionmanager/resize_howto_4.png" align="center"
+     title="KDE Partition Manager" width="800">
+
+## Installation
+
+KDE Partition Manager is a KF5 application, so you will need the
+[KDE frameworks](https://www.kde.org/products/frameworks/) libraries to run it
+on your computer. Most modern OSs will install them as dependencies
+for you when you use their default package manager as the installation method.
+
+It also makes use of external programs to get its job done, so
 you might have to install additional software (preferably packages from your
 distribution) to make use of all features and get full support for all file
 systems.
 
-For quick install instructions see INSTALL.
+The methods listed below for each major OS are based on executing the
+installation commands on a terminal window. Alternatively, you can use
+your OS' package management app. 
 
-For a list of changes since the previous release see CHANGES.
+### Ubuntu
+
+```
+sudo apt install partitionmanager
+```
+
+### Debian
+
+As the `root` user:
+
+```
+apt install partitionmanager
+```
+
+### CentOS, Fedora, RHEL
+
+```
+sudo yum install kde-partitionmanager
+```
+
+### OpenSUSE
+```
+sudo zypper install partitionmanager
+```
+
+### ArchLinux
+
+1. Enable the community repository on `/etc/pacman.conf`:
+    ```
+    [community]
+    Include = /etc/pacman.d/mirrorlist
+    ```
+1. Install the `partitionmanager` xz package:
+    ```
+    # pacman -Sy partitionmanager
+    ```
+
+### From source
+
+See [INSTALL](INSTALL).
+
+## Changelog
+
+For a list of changes since the previous release see [CHANGES](CHANGES).
diff --git a/src/gui/applyprogressdialog.h b/src/gui/applyprogressdialog.h
index 0277faa..b838bb0 100644
--- a/src/gui/applyprogressdialog.h
+++ b/src/gui/applyprogressdialog.h
@@ -16,8 +16,7 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.*
  *************************************************************************/
 
-#if !defined(APPLYPROGRESSDIALOG_H)
-
+#ifndef APPLYPROGRESSDIALOG_H
 #define APPLYPROGRESSDIALOG_H
 
 #include <QDialog>
diff --git a/src/gui/mainwindow.cpp b/src/gui/mainwindow.cpp
index d84c95e..04767d2 100644
--- a/src/gui/mainwindow.cpp
+++ b/src/gui/mainwindow.cpp
@@ -169,6 +169,7 @@ void MainWindow::closeEvent(QCloseEvent* event)
 
     KXmlGuiWindow::closeEvent(event);
     ExternalCommand::stopHelper();
+    delete m_ApplyProgressDialog;
 }
 
 void MainWindow::changeEvent(QEvent* event)
diff --git a/src/gui/resizedialog.cpp b/src/gui/resizedialog.cpp
index 6e45b6e..3921e11 100644
--- a/src/gui/resizedialog.cpp
+++ b/src/gui/resizedialog.cpp
@@ -96,10 +96,10 @@ void ResizeDialog::accept()
                 QString errorMessage;
                 QString passphrase;
 
-                while(!validPassphrase) {
+                while  (!validPassphrase) {
                     KPasswordDialog dlg( this );
                     dlg.setPrompt(i18nc("%2 is either empty or says Invalid passphrase.", "%2Enter passphrase for %1:", partition().deviceNode(), errorMessage));
-                    if( !dlg.exec() ) {
+                    if (!dlg.exec()) {
                         reject();
                         return;
                     }
diff --git a/src/gui/smartdialogwidgetbase.ui b/src/gui/smartdialogwidgetbase.ui
index 64a1ca5..2f09795 100644
--- a/src/gui/smartdialogwidgetbase.ui
+++ b/src/gui/smartdialogwidgetbase.ui
@@ -6,8 +6,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>649</width>
-    <height>483</height>
+    <width>750</width>
+    <height>550</height>
    </rect>
   </property>
   <layout class="QGridLayout" name="gridLayout">
@@ -51,7 +51,7 @@
      </item>
     </layout>
    </item>
-   <item row="2" column="0">
+   <item row="3" column="0">
     <widget class="QLabel" name="m_LabelTextSmartModelName">
      <property name="sizePolicy">
       <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
@@ -67,7 +67,7 @@
      </property>
     </widget>
    </item>
-   <item row="2" column="1" colspan="2">
+   <item row="3" column="1" colspan="2">
     <widget class="QLabel" name="m_LabelSmartModelName">
      <property name="sizePolicy">
       <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
@@ -80,7 +80,7 @@
      </property>
     </widget>
    </item>
-   <item row="3" column="0">
+   <item row="4" column="0">
     <widget class="QLabel" name="m_LabelTextSmartSerialNumber">
      <property name="sizePolicy">
       <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
@@ -96,7 +96,7 @@
      </property>
     </widget>
    </item>
-   <item row="3" column="1" colspan="2">
+   <item row="4" column="1" colspan="2">
     <widget class="QLabel" name="m_LabelSmartSerialNumber">
      <property name="sizePolicy">
       <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
@@ -109,7 +109,7 @@
      </property>
     </widget>
    </item>
-   <item row="4" column="0">
+   <item row="5" column="0">
     <widget class="QLabel" name="m_LabelTextSmartFirmware">
      <property name="sizePolicy">
       <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
@@ -125,7 +125,7 @@
      </property>
     </widget>
    </item>
-   <item row="4" column="1" colspan="2">
+   <item row="5" column="1" colspan="2">
     <widget class="QLabel" name="m_LabelSmartFirmware">
      <property name="sizePolicy">
       <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
@@ -138,7 +138,7 @@
      </property>
     </widget>
    </item>
-   <item row="6" column="0">
+   <item row="3" column="3">
     <widget class="QLabel" name="m_LabelTextSmartTemperature">
      <property name="sizePolicy">
       <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
@@ -154,7 +154,7 @@
      </property>
     </widget>
    </item>
-   <item row="6" column="1" colspan="2">
+   <item row="3" column="4" colspan="2">
     <widget class="QLabel" name="m_LabelSmartTemperature">
      <property name="sizePolicy">
       <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
@@ -167,7 +167,7 @@
      </property>
     </widget>
    </item>
-   <item row="7" column="0">
+   <item row="4" column="3">
     <widget class="QLabel" name="m_LabelTextSmartBadSectors">
      <property name="sizePolicy">
       <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
@@ -183,7 +183,7 @@
      </property>
     </widget>
    </item>
-   <item row="7" column="1" colspan="2">
+   <item row="4" column="4" colspan="2">
     <widget class="QLabel" name="m_LabelSmartBadSectors">
      <property name="sizePolicy">
       <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
@@ -196,7 +196,7 @@
      </property>
     </widget>
    </item>
-   <item row="8" column="0">
+   <item row="5" column="3">
     <widget class="QLabel" name="m_LabelTextSmartPoweredOn">
      <property name="sizePolicy">
       <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
@@ -212,7 +212,7 @@
      </property>
     </widget>
    </item>
-   <item row="8" column="1" colspan="2">
+   <item row="5" column="4" colspan="2">
     <widget class="QLabel" name="m_LabelSmartPoweredOn">
      <property name="sizePolicy">
       <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
@@ -225,7 +225,7 @@
      </property>
     </widget>
    </item>
-   <item row="9" column="0">
+   <item row="1" column="0">
     <widget class="QLabel" name="m_LabelTextSmartPowerCycles">
      <property name="sizePolicy">
       <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
@@ -241,7 +241,7 @@
      </property>
     </widget>
    </item>
-   <item row="9" column="1" colspan="2">
+   <item row="1" column="1" colspan="2">
     <widget class="QLabel" name="m_LabelSmartPowerCycles">
      <property name="sizePolicy">
       <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
@@ -270,7 +270,7 @@
      </property>
     </spacer>
    </item>
-   <item row="16" column="0" colspan="3">
+   <item row="16" column="0" colspan="6">
     <widget class="QTreeWidget" name="m_TreeSmartAttributes">
      <property name="alternatingRowColors">
       <bool>true</bool>
@@ -352,28 +352,21 @@
      </property>
     </spacer>
    </item>
-   <item row="1" column="0" colspan="3">
+   <item row="2" column="0" colspan="6">
     <widget class="Line" name="line">
      <property name="orientation">
       <enum>Qt::Horizontal</enum>
      </property>
     </widget>
    </item>
-   <item row="5" column="0" colspan="3">
+   <item row="10" column="0" colspan="6">
     <widget class="Line" name="line_2">
      <property name="orientation">
       <enum>Qt::Horizontal</enum>
      </property>
     </widget>
    </item>
-   <item row="10" column="0" colspan="3">
-    <widget class="Line" name="line_3">
-     <property name="orientation">
-      <enum>Qt::Horizontal</enum>
-     </property>
-    </widget>
-   </item>
-   <item row="13" column="0">
+   <item row="0" column="3">
     <widget class="QLabel" name="m_LabelTextSmartOverallAssessment">
      <property name="sizePolicy">
       <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
@@ -389,7 +382,7 @@
      </property>
     </widget>
    </item>
-   <item row="13" column="1" colspan="2">
+   <item row="0" column="4" colspan="2">
     <widget class="QLabel" name="m_LabelSmartOverallAssessment">
      <property name="sizePolicy">
       <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
@@ -402,7 +395,7 @@
      </property>
     </widget>
    </item>
-   <item row="12" column="0">
+   <item row="1" column="3">
     <widget class="QLabel" name="m_LabelTextSmartSelfTests">
      <property name="sizePolicy">
       <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
@@ -418,7 +411,7 @@
      </property>
     </widget>
    </item>
-   <item row="12" column="1" colspan="2">
+   <item row="1" column="4" colspan="2">
     <widget class="QLabel" name="m_LabelSmartSelfTests">
      <property name="sizePolicy">
       <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
diff --git a/src/gui/volumegroupdialog.cpp b/src/gui/volumegroupdialog.cpp
index 50b61ed..9232823 100644
--- a/src/gui/volumegroupdialog.cpp
+++ b/src/gui/volumegroupdialog.cpp
@@ -126,7 +126,7 @@ void VolumeGroupDialog::updateSectorInfos()
     qint32 totalSectors = 0;
 
     if (dialogWidget().volumeType().currentText() == QStringLiteral("LVM")) {
-        // we can't use LvmDevice mothod here because pv that is not in any VG will return 0
+        // we can't use LvmDevice method here because pv that is not in any VG will return 0
         m_ExtentSize = dialogWidget().spinPESize().value() * Capacity::unitFactor(Capacity::Unit::Byte, Capacity::Unit::MiB);
 
         if (m_ExtentSize > 0)
diff --git a/src/main.cpp b/src/main.cpp
index fe9c847..57d0441 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -38,6 +38,7 @@
 int Q_DECL_IMPORT main(int argc, char* argv[])
 {
     QApplication app(argc, argv);
+    app.setWindowIcon(QIcon::fromTheme(QStringLiteral("partitionmanager")));
 
     KLocalizedString::setApplicationDomain("partitionmanager");
     KAboutData aboutData (
diff --git a/src/org.kde.partitionmanager.appdata.xml b/src/org.kde.partitionmanager.appdata.xml
index d7c041e..5d621cb 100644
--- a/src/org.kde.partitionmanager.appdata.xml
+++ b/src/org.kde.partitionmanager.appdata.xml
@@ -5,7 +5,7 @@
   <project_license>GPL-3.0+</project_license>
   <name>KDE Partition Manager</name>
   <name xml:lang="ar">مدير كدي للأقسام</name>
-  <name xml:lang="ast">Xestor KDE de particiones</name>
+  <name xml:lang="ast">Xestor de particiones de KDE</name>
   <name xml:lang="bs">KDE‑ov menadžer particija</name>
   <name xml:lang="ca">Gestor de particions del KDE</name>
   <name xml:lang="ca-valencia">Gestor de particions del KDE</name>
@@ -84,7 +84,7 @@
   <description>
     <p>KDE Partition Manager is a utility program to help you manage the disk devices, partitions and file systems on your computer. It allows you to easily create, copy, move, delete, resize without losing data, backup and restore partitions.</p>
     <p xml:lang="ar">«مدير كدي للأقسام» هو أداة تساعدك على إدارة أجهزة الأقراص، والأقسام وأنظمة الملفّات في حاسوبك. ويتيح لك الإنشاء، والنّسخ، والنّقل، والحذف، والتّحجيم دون فقدات البيانات، والنّسخ الاحتياطيّ واسترجاع الأقسام بسهولة.</p>
-    <p xml:lang="ast">El xestor KDE de particiones ye una utilidá p'ayudate a xestionar los discos, particiones y sistemes de ficheros nel to ordenador. Permítete crear, copiar, mover, desaniciar, redimensionar ensin perder nada, respaldar y restaurar particiones de mou cenciellu.</p>
+    <p xml:lang="ast">El xestor de particiones de KDE ye una utilidá p'ayudate a xestionar los preseos d'almacenamientu, particiones y sistemes de ficheros del ordenador. Permítete crear, copiar, mover, desaniciar, redimensionar ensin perder datos, facer copies de seguranza y restaurar particiones fácilmente</p>
     <p xml:lang="ca">El gestor de particions del KDE és un programa d'utilitats que us ajuda a gestionar els dispositius de disc, les particions i els sistemes de fitxers de l'ordinador. Us permet crear, moure, eliminar, redimensionar sense perdre dades, fer còpies de seguretat i restaurar particions fàcilment.</p>
     <p xml:lang="ca-valencia">El gestor de particions del KDE és un programa d'utilitats que vos ajuda a gestionar els dispositius de disc, les particions i els sistemes de fitxers de l'ordinador. Vos permet crear, moure, eliminar, redimensionar sense perdre dades, fer còpies de seguretat i restaurar particions fàcilment.</p>
     <p xml:lang="da">KDE Partition Manager er et værktøj til at hjælpe dig med at håndtere dine diskenheder og filsystemerne på din computer. Den lader dig nemt oprette, kopiere, flytte, slette, ændre størrelse uden at miste data, tage backup og gendanne partitioner.</p>
@@ -119,7 +119,7 @@
     <p xml:lang="zh-TW">KDE 磁碟分割區管理員是一個可以協助您管理您電腦上的磁碟裝置、分割區以及檔案系統的工具。它讓您可以很容易地建立、複製、移動、刪除、不遺失資料的調整大小、備份與恢復分割區。</p>
     <p>Features:</p>
     <p xml:lang="ar">الميزات:</p>
-    <p xml:lang="ast">Carauterístiques</p>
+    <p xml:lang="ast">Carauterístiques:</p>
     <p xml:lang="bs">Svojstva:</p>
     <p xml:lang="ca">Característiques:</p>
     <p xml:lang="ca-valencia">Característiques:</p>
@@ -159,7 +159,7 @@
     <ul>
       <li>Supports a large number of file systems, including ext2/3/4, btrfs, reiserfs, NTFS, FAT16/32, JFS, XFS and more</li>
       <li xml:lang="ar">يدعم عددًا كبيرًا من أنظمة الملفّات، منها ext2/3/4، وbtrfs، وreiserfs، وNTFS، وFAT16/32، وJFS، وXFS وغيرها</li>
-      <li xml:lang="ast">Sofita un númberu grande de sistemes de ficheros incluyendo ext2/3/4, btrfs, reiserfs, NTFS, FAT16/32, JFS, XFS y más</li>
+      <li xml:lang="ast">Sofita un númberu grande de sistemes de ficheros, incluyendo ext2/3/4, btrfs, reiserfs, NTFS, FAT16/32, JFS, XFS y más</li>
       <li xml:lang="ca">Accepta un gran nombre de sistemes de fitxers, incloent-hi ext2/3/4, btrfs, reiserfs, NTFS, FAT16/32, JFS, XFS i més</li>
       <li xml:lang="ca-valencia">Accepta un gran nombre de sistemes de fitxers, incloent-hi ext2/3/4, btrfs, reiserfs, NTFS, FAT16/32, JFS, XFS i més</li>
       <li xml:lang="da">Understøtter et større antal filsystemer, derunder ext2/3/4, btrfs, reiserfs, NTFS, FAT16/32, JFS, XFS og andre</li>
@@ -194,7 +194,7 @@
       <li xml:lang="zh-TW">支援大量的檔案系統，包含了 ext2/3/4、btrfs、reiserfs、NTFS、FAT16/32、JFS、XFS 以及更多</li>
       <li>Makes use of already available external programs to get its job done</li>
       <li xml:lang="ar">يستخدم البرامج الخارجيّة المتوفّرة لإنهاء عمله</li>
-      <li xml:lang="ast">Fai usu de programes esternos yá disponibles pa facer el so trabayu</li>
+      <li xml:lang="ast">Fai usu de programes esternos que yá tean disponibles pa facer el trabayu</li>
       <li xml:lang="ca">Fa ús de programes externs ja disponibles per fer la seva feina</li>
       <li xml:lang="ca-valencia">Fa ús de programes externs ja disponibles per fer la seua faena</li>
       <li xml:lang="da">Gør brug af allerede tilgængelige eksterne programmer til at udføre arbejdet</li>
diff --git a/src/org.kde.partitionmanager.desktop b/src/org.kde.partitionmanager.desktop
index 15b97a7..40a22ca 100644
--- a/src/org.kde.partitionmanager.desktop
+++ b/src/org.kde.partitionmanager.desktop
@@ -2,7 +2,7 @@
 Type=Application
 Name=KDE Partition Manager
 Name[ar]=مدير أقسام كدي
-Name[ast]=Xestor KDE de particiones
+Name[ast]=Xestor de particiones de KDE
 Name[bg]=Управление на дялове за KDE
 Name[bs]=KDE‑ov menadžer particija
 Name[ca]=Gestor de particions del KDE
@@ -31,7 +31,7 @@ Name[ms]=Pengurus Partisyen KDE
 Name[nb]=KDE partisjonshåndtering
 Name[nds]=KDE-Partitschonenpleger
 Name[nl]=KDE Partitiebeheerder
-Name[nn]=KDE-partisjonshandtering
+Name[nn]=Partisjonshandsaming for KDE
 Name[pa]=ਕੇਡੀਈ ਪਾਰਟੀਸ਼ਨ ਮੈਨੇਜਰ
 Name[pl]=Zarządzanie partycjami
 Name[pt]=Gestor de Partições do KDE
@@ -160,6 +160,7 @@ Icon=partitionmanager
 Categories=System;Filesystem;KDE;Qt;
 X-KDE-StartupNotify=true
 Keywords=partition;disk;
+Keywords[ast]=partición;discu;
 Keywords[ca]=partició;disc;
 Keywords[ca@valencia]=partició;disc;
 Keywords[cs]=oddíl;disk;
@@ -176,8 +177,10 @@ Keywords[it]=partizione;disco;
 Keywords[ko]=partition;disk;파티션;디스크;
 Keywords[lt]=skaidinys;diskas;
 Keywords[nl]=partitie;schijf
+Keywords[nn]=partisjon;disk;
 Keywords[pl]=partycja;dysk;
 Keywords[pt]=partição;disco;
+Keywords[pt_BR]=partição;disco;
 Keywords[sl]=razdelek;particija;disk;
 Keywords[sr]=partition;disk;партиција;диск;
 Keywords[sr@ijekavian]=partition;disk;партиција;диск;
@@ -188,3 +191,4 @@ Keywords[tr]=bölümleme;disk;
 Keywords[uk]=розділ;диск;
 Keywords[x-test]=xxpartitionxx;xxdiskxx;
 Keywords[zh_CN]=partition;disk;分区;磁盘;
+Keywords[zh_TW]=partition;disk;分割區;磁碟;硬碟