diff --git a/generate_desktop_files.py b/generate_desktop_files.py
index e4d3b2c..563ebff 100755
--- a/generate_desktop_files.py
+++ b/generate_desktop_files.py
@@ -15,7 +15,7 @@
 prefix = "[Desktop Entry]\n"
 
 suffix = """Exec=mintbackup
-Icon=/usr/share/pixmaps/mintbackup/icon.svg
+Icon=mintbackup
 Terminal=false
 Type=Application
 Encoding=UTF-8
@@ -29,22 +29,7 @@
 prefix = "[Desktop Entry]\n"
 
 suffix = """Exec=mintBackup
-Icon=/usr/share/pixmaps/mintbackup/icon.png
-Terminal=false
-Type=Application
-Encoding=UTF-8
-Categories=Application;System;Settings
-NoDisplay=true
-MimeType=application/x-backup;
-"""
-
-additionalfiles.generate(DOMAIN, PATH, "usr/share/applications/mintbackup_mime.desktop", prefix, _("Backup Tool"), _("Make a backup of your home directory"), suffix)
-
-
-prefix = "[Desktop Entry]\n"
-
-suffix = """Exec=mintBackup
-Icon=/usr/share/pixmaps/mintbackup/icon.png
+Icon=mintbackup
 Terminal=false
 Type=Application
 Encoding=UTF-8
diff --git a/usr/lib/linuxmint/mintbackup/mintbackup.py b/usr/lib/linuxmint/mintbackup/mintbackup.py
index c27d84e..e6e3a14 100755
--- a/usr/lib/linuxmint/mintbackup/mintbackup.py
+++ b/usr/lib/linuxmint/mintbackup/mintbackup.py
@@ -122,7 +122,6 @@ class MintBackup:
     def __init__(self):
         self.builder = Gtk.Builder()
         self.builder.add_from_file(UI_FILE)
-        self.builder.get_object("main_window").set_icon_from_file("/usr/share/pixmaps/mintbackup/icon.png")
 
         # handle command line filenames
         if len(sys.argv) > 1:
@@ -300,11 +299,6 @@ def __init__(self):
         self.builder.get_object("label_detail3").set_markup("<small>" + _("Restore a previous backup") + "</small>")
         self.builder.get_object("label_detail4").set_markup("<small>" + _("Restore previously installed applications") + "</small>")
 
-        self.builder.get_object("image_backup_data").set_from_file("/usr/share/pixmaps/mintbackup/backup-data.svg")
-        self.builder.get_object("image_restore_data").set_from_file("/usr/share/pixmaps/mintbackup/restore-data.svg")
-        self.builder.get_object("image_backup_software").set_from_file("/usr/share/pixmaps/mintbackup/backup-software.svg")
-        self.builder.get_object("image_restore_software").set_from_file("/usr/share/pixmaps/mintbackup/restore-software.svg")
-
         # i18n - Page 1 (choose backup directories)
         self.builder.get_object("label_title_destination").set_markup("<big><b>" + _("Backup files") + "</b></big>")
         self.builder.get_object("label_caption_destination").set_markup("<i>" + _("Please select a source and a destination for your backup") + "</i>")
diff --git a/usr/share/applications/mintbackup_mime.desktop b/usr/share/applications/mintbackup_mime.desktop
deleted file mode 100644
index d228fb5..0000000
--- a/usr/share/applications/mintbackup_mime.desktop
+++ /dev/null
@@ -1,177 +0,0 @@
-[Desktop Entry]
-Name=Backup Tool
-Name[af]=Rusteun gereedskap
-Name[am]=የተተኪ መሳሪያዎች
-Name[ar]=اداة النسخ الإحتياطي
-Name[ast]=Ferramienta de respaldu
-Name[be]=Сродак рэзервовага капіявання
-Name[bg]=Инструмент за създаване на резервни копия
-Name[bn]=ব্যাকআপ টুল
-Name[bs]=Alat za sigurnosnu kopiju
-Name[ca]=Eina de Còpia de Seguretat
-Name[ca@valencia]=Eina de Còpia de Seguretat
-Name[cs]=Zálohovací nástroj
-Name[csb]=Nôrzãdze zazychrowaniô pòdôwków
-Name[cy]=Teclyn Cadw wrth Gefn
-Name[da]=Værktøj til sikkerhedskopiering
-Name[de]=Datensicherungswerkzeug
-Name[el]=Εργαλείο Αντιγράφων Ασφαλείας
-Name[eo]=Sekurkopiilo
-Name[es]=Herramienta de copia de seguridad
-Name[et]=Varundustööriist
-Name[eu]=Babeskopietarako tresna
-Name[fa]=ابزار پشتیبان گیری
-Name[fi]=Varmuuskopiointityökalu
-Name[fil]=Backup na Gamit
-Name[fo]=Trygdarritingar amboð
-Name[fr]=Outil de sauvegarde
-Name[fr_CA]=Outil de sauvegarde
-Name[ga]=Uirlís Cúltaca
-Name[gd]=Inneal lethbhreacan-glèidhidh
-Name[gl]=Ferramenta de copia de seguranza
-Name[gv]=Greie jannoo coadanyn sauçhey
-Name[he]=כלי גיבוי
-Name[hi]=बैकअप उपकरण
-Name[hr]=Alat sigurnosnog kopiranja
-Name[hu]=Mentéskezelő
-Name[ia]=Applicatio pro salvaguardar
-Name[id]=Perangkat pembuat cadangan
-Name[is]=Öryggisafritun
-Name[it]=Strumento di backup
-Name[ja]=バックアップツール
-Name[jv]=Piranti cadangan
-Name[kk]=Резервті көшіру құралы
-Name[kn]=ಬ್ಯಾಕ್‌ಅಪ್ ಉಪಕರಣ
-Name[ko]=백업 도구
-Name[ku]=Navînga Cîgirtinê
-Name[ky]=Резервдик көчүрүү
-Name[lb]=Backup Instrumenter
-Name[lo]=ເຄື່ອງມືການກູ້ຄືນ
-Name[lt]=Atsarginių kopijų įrankis
-Name[lv]=Dublēšanas rīks
-Name[mk]=Алатка за креирање резервни копии
-Name[ml]=വിവര സൂക്ഷിപ്പ് ഉപാധി
-Name[mr]=बैकअप करण्याचे साधन
-Name[ms]=Alat Sandaran
-Name[nb]=Verktøy for sikkerhetskopiering
-Name[nds]=Programm zur Datensicherung
-Name[ne]=बाकअप औजार
-Name[nl]=Reservekopie maken
-Name[nn]=Tryggleikskopiverktøy
-Name[oc]=Aisina de còpia de seguretat
-Name[pl]=Narzędzie do tworzenia kopii zapasowych
-Name[pt]=Ferramenta para cópias de segurança
-Name[pt_BR]=Ferramenta para cópia de segurança
-Name[pt_PT]=Ferramenta para cópias de segurança
-Name[ro]=Copiere de rezervă
-Name[ru]=Резервное копирование
-Name[si]=උපස්ථ මෙවලම
-Name[sk]=Zálohovací nástroj
-Name[sl]=Orodje za varnostno arhiviranje
-Name[so]=Aaladda Keydinta Joogtadda ah
-Name[sq]=Mjeti për Backup
-Name[sr]=Алатка за резерве
-Name[sr@latin]=Alatka za pravljenje rezerve
-Name[sv]=Verktyg för säkerhetskopiering
-Name[ta]=காப்பு நகலெடுக்கும் மென்கருவி
-Name[te]=బాక్‌అప్ ఉపకరణం
-Name[tg]=Абзори нусхаи эҳтиётӣ
-Name[th]=เครื่องมือสำรองข้อมูล
-Name[tl]=Backup na Gamit
-Name[tr]=Yedekleme Aracı
-Name[uk]=Знаряддя резервного копіювання
-Name[vi]=Công cụ Sao lưu
-Name[zh_CN]=备份工具
-Name[zh_HK]=備份工具
-Name[zh_TW]=備份工具
-Comment=Make a backup of your home directory
-Comment[af]=Maak 'n rugsteun van jou tuisgids
-Comment[am]=የሆም ዳይሬክቶሪ ተተኪ ይስሩ
-Comment[ar]=قم بعمل نسخة احتياطية من مجلد المنزل الخاص بك
-Comment[ast]=Facer una copia de seguridá de la to carpeta personal
-Comment[be]=Зрабіць рэзервовую копію вашага хатняга каталогу
-Comment[bg]=Създаване на резервно копие на домашната Ви папка
-Comment[bn]=আপনার হোম ডিরেক্টরীর ব্যাকআপ তৈরী করুন
-Comment[bs]=Napravi sigurnosnu kopiju home direktorija
-Comment[ca]=Feu una còpia de seguretat del vostre directori d'inici
-Comment[ca@valencia]=Feu una còpia de seguretat del vostre directori d'inici
-Comment[cs]=Zálohovat domovský adresář
-Comment[csb]=Zazychrëjë pòdôwczi twòjegò domôcegò kataloga
-Comment[cy]=Gwneud copi wrth gefn o'ch cyfeiriadur cartref
-Comment[da]=Lav en sikkerhedskopi af filer og programmer
-Comment[de]=Eine Sicherung Ihres persönlichen Ordners erstellen
-Comment[el]=Φτιάξτε ένα αντίγραφο ασφαλείας του φακέλου home
-Comment[eo]=Krei sekurkopion de via hejma dosierujo
-Comment[es]=Hacer una copia de seguridad de su carpeta personal
-Comment[et]=Kodukataloogist varukoopia tegemine
-Comment[eu]=Egin karpeta nagusiaren babeskopia
-Comment[fa]=ساختن یک پشتیبان از پوشه‌ خانگی شما
-Comment[fi]=Varmuuskopioi kotihakemistosi
-Comment[fil]=I-backup ng inyong home directory
-Comment[fo]=Trygdarrita heima fíluskránna
-Comment[fr]=Faire une sauvegarde de votre dossier personnel
-Comment[fr_CA]=Faire une sauvegarde de votre dossier personnel
-Comment[ga]=Déan cóíp cúltaca de d' chomhadlann bhaile
-Comment[gd]=Dèan lethbhreac-glèidhidh dhen phasgan dachaigh agad
-Comment[gl]=Faga unha copia de seguranza do seu directorio persoal
-Comment[gv]=Jannoo yn ynnyd thie ayd sauçhey
-Comment[he]=יצירת גיבוי לתקיית הבית שלך
-Comment[hi]=अपनी 'गृह निर्देशिका' की अतरिक्त प्रति संजो कर रखें
-Comment[hr]=Napravite sigurnosnu kopiju vaše osobne mape
-Comment[hu]=Mentés készítése a saját mappáról
-Comment[ia]=Face un salvamento de tu directorio domo
-Comment[id]=Buat cadangan direktori rumah anda
-Comment[is]=Taktu öryggisafrit af einkamöppunni þinni
-Comment[it]=Esegui un backup della tua cartella home
-Comment[ja]=ホームディレクトリーのバックアップを作成します
-Comment[jv]=gawe backup seko direktori omahmu
-Comment[kk]=Сіздің үй бумасының резервті көшірмесін жасау
-Comment[kn]=ನಿಮ್ಮ ನೆಲೆ ಕೋಶವನ್ನು ಬ್ಯಾಕ್‌ಅಪ್ ಮಾಡಿ
-Comment[ko]=사용자의 홈 디렉토리를 백업합니다
-Comment[lb]=Maacht een Backup vum Home Verzeechnis
-Comment[lo]=ເຮັດການກູ້ຄືນສຳລັບຕຳແໜ່ງຫລັກຂອງເຈົ້າ
-Comment[lt]=Kurti namų aplanko atsarginę kopiją
-Comment[lv]=Veikt savas mājas mapes dublēšanu
-Comment[mk]=Направете резервна копија на домашниот именик
-Comment[ml]=നിങ്ങളുടെ ആസ്ഥാന ഡയറക്ടറി ബാക്കപ് ചെയ്യുക
-Comment[mr]=गृह निर्देशिका बैकअप करा
-Comment[ms]=Buat sandaran kepada direktori rumah anda
-Comment[nb]=Lag en sikkerhetskopi av hjemmeområdet ditt
-Comment[nds]=Erstellen Sie eine Datensicherung Ihres Home-Verzeichnisses
-Comment[ne]=तपाइको गृह डायरेक्टरीको बाकअप गर्नुहोस |
-Comment[nl]=Reservekopie maken van uw persoonlijke map
-Comment[nn]=Lag tryggleikskopi av heimekatalogen din
-Comment[oc]=Far una còpia de seguretat de vòstre dorsièr personal
-Comment[pl]=Stwórz kopię zapasową swojego katalogu domowego
-Comment[pt]=Fazer uma cópia da sua pasta pessoal
-Comment[pt_BR]=Faça uma cópia de segurança da sua pasta pessoal
-Comment[pt_PT]=Fazer uma cópia da sua pasta pessoal
-Comment[ro]=Creează o copie de rezervă a dosarului personal
-Comment[ru]=Создание резервной копии вашей домашней директории
-Comment[si]=පිුධාන ලිපි ගොනුව සුරක්ශිත කරන්න
-Comment[sk]=Vytvorte zálohu Vášho domovského adresára
-Comment[sl]=Naredite varnostno kopijo svoje domače mape (home)
-Comment[so]=Ka sameyn keydin joogto ah majaladda gurigaaga
-Comment[sq]=Bëni një backup të direktorisë suaj shtëpi
-Comment[sr]=Направите резервни примерак личне фасцикле
-Comment[sr@latin]=Napravite rezervu vaše početne fascikle
-Comment[sv]=Gör en säkerhetskopia av din hemkatalog
-Comment[ta]=துவக்க இல்லத்தை காப்பு நகலெடுக்கவும்
-Comment[te]=మీ నివాస డైరెక్టరీకి బాక్‌అప్ రూపొందించండి
-Comment[tg]=Таҳия кардани нусхаи эҳтиётии феҳристи асосии худ
-Comment[th]=สำรองข้อมูลในตำแหน่งของคุณ
-Comment[tl]=I-backup ng inyong home directory
-Comment[tr]=Ev dizininin bir yedeğini alın
-Comment[uk]=Зробити резервну копію домашнього каталогу
-Comment[vi]=Sao lưu thư mục Nhà của bạn
-Comment[zh_CN]=备份您的主目录
-Comment[zh_HK]=備份你的家目錄
-Comment[zh_TW]=備份您的家目錄
-Exec=mintBackup
-Icon=/usr/share/pixmaps/mintbackup/icon.png
-Terminal=false
-Type=Application
-Encoding=UTF-8
-Categories=Application;System;Settings
-NoDisplay=true
-MimeType=application/x-backup;
diff --git a/usr/share/icons/hicolor/48x48/mimetypes/application-x-backup.png b/usr/share/icons/hicolor/48x48/mimetypes/application-x-backup.png
deleted file mode 100644
index 5c60b41..0000000
Binary files a/usr/share/icons/hicolor/48x48/mimetypes/application-x-backup.png and /dev/null differ
diff --git a/usr/share/pixmaps/mintbackup/backup-data.svg b/usr/share/icons/hicolor/scalable/actions/mintbackup-data.svg
similarity index 100%
rename from usr/share/pixmaps/mintbackup/backup-data.svg
rename to usr/share/icons/hicolor/scalable/actions/mintbackup-data.svg
diff --git a/usr/share/pixmaps/mintbackup/restore-data.svg b/usr/share/icons/hicolor/scalable/actions/mintbackup-restore-data.svg
similarity index 100%
rename from usr/share/pixmaps/mintbackup/restore-data.svg
rename to usr/share/icons/hicolor/scalable/actions/mintbackup-restore-data.svg
diff --git a/usr/share/pixmaps/mintbackup/restore-software.svg b/usr/share/icons/hicolor/scalable/actions/mintbackup-restore-software.svg
similarity index 100%
rename from usr/share/pixmaps/mintbackup/restore-software.svg
rename to usr/share/icons/hicolor/scalable/actions/mintbackup-restore-software.svg
diff --git a/usr/share/pixmaps/mintbackup/backup-software.svg b/usr/share/icons/hicolor/scalable/actions/mintbackup-software.svg
similarity index 100%
rename from usr/share/pixmaps/mintbackup/backup-software.svg
rename to usr/share/icons/hicolor/scalable/actions/mintbackup-software.svg
diff --git a/usr/share/pixmaps/mintbackup/icon.svg b/usr/share/icons/hicolor/scalable/apps/mintbackup.svg
similarity index 100%
rename from usr/share/pixmaps/mintbackup/icon.svg
rename to usr/share/icons/hicolor/scalable/apps/mintbackup.svg
diff --git a/usr/share/linuxmint/mintbackup/mintbackup.ui b/usr/share/linuxmint/mintbackup/mintbackup.ui
index 0c40123..da79faf 100644
--- a/usr/share/linuxmint/mintbackup/mintbackup.ui
+++ b/usr/share/linuxmint/mintbackup/mintbackup.ui
@@ -47,6 +47,7 @@
     <property name="window_position">center</property>
     <property name="default_width">400</property>
     <property name="default_height">300</property>
+    <property name="icon_name">mintbackup</property>
     <property name="type_hint">normal</property>
     <child internal-child="vbox">
       <object class="GtkBox" id="dialog-vbox1">
@@ -136,15 +137,15 @@
               <object class="GtkBox" id="vbox2">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="spacing">3</property>
                 <property name="orientation">vertical</property>
+                <property name="spacing">3</property>
                 <child>
                   <object class="GtkBox" id="vbox24">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="border_width">6</property>
-                    <property name="spacing">6</property>
                     <property name="orientation">vertical</property>
+                    <property name="spacing">6</property>
                     <child>
                       <object class="GtkLabel" id="label_wizard1">
                         <property name="visible">True</property>
@@ -195,13 +196,12 @@
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
                             <property name="spacing">6</property>
-                            <property name="orientation">horizontal</property>
                             <child>
                               <object class="GtkImage" id="image_backup_data">
                                 <property name="visible">True</property>
                                 <property name="can_focus">False</property>
-                                <property name="stock">gtk-save</property>
                                 <property name="pixel_size">36</property>
+                                <property name="icon_name">mintbackup-data</property>
                                 <property name="icon_size">5</property>
                               </object>
                               <packing>
@@ -270,12 +270,13 @@ of your files</property>
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
                             <property name="spacing">6</property>
-                            <property name="orientation">horizontal</property>
                             <child>
                               <object class="GtkImage" id="image_backup_software">
                                 <property name="visible">True</property>
                                 <property name="can_focus">False</property>
                                 <property name="pixel_size">36</property>
+                                <property name="icon_name">mintbackup-software</property>
+                                <property name="icon_size">5</property>
                               </object>
                               <packing>
                                 <property name="expand">False</property>
@@ -344,13 +345,12 @@ of your package list</property>
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
                             <property name="spacing">6</property>
-                            <property name="orientation">horizontal</property>
                             <child>
                               <object class="GtkImage" id="image_restore_data">
                                 <property name="visible">True</property>
                                 <property name="can_focus">False</property>
-                                <property name="stock">gtk-undo</property>
                                 <property name="pixel_size">36</property>
+                                <property name="icon_name">mintbackup-restore-data</property>
                                 <property name="icon_size">5</property>
                               </object>
                               <packing>
@@ -420,13 +420,13 @@ you have created</property>
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
                             <property name="spacing">6</property>
-                            <property name="orientation">horizontal</property>
                             <child>
                               <object class="GtkImage" id="image_restore_software">
                                 <property name="visible">True</property>
                                 <property name="can_focus">False</property>
                                 <property name="pixel_size">36</property>
-                                <property name="icon_name">system-software-update</property>
+                                <property name="icon_name">mintbackup-restore-software</property>
+                                <property name="icon_size">5</property>
                               </object>
                               <packing>
                                 <property name="expand">False</property>
@@ -510,20 +510,19 @@ up packages</property>
               <object class="GtkBox" id="vbox3">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="spacing">6</property>
                 <property name="orientation">vertical</property>
+                <property name="spacing">6</property>
                 <child>
                   <object class="GtkBox" id="hbox4">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="orientation">horizontal</property>
                     <child>
                       <object class="GtkBox" id="vbox25">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="border_width">6</property>
-                        <property name="spacing">6</property>
                         <property name="orientation">vertical</property>
+                        <property name="spacing">6</property>
                         <child>
                           <object class="GtkLabel" id="label_title_destination">
                             <property name="visible">True</property>
@@ -561,8 +560,8 @@ up packages</property>
                       <object class="GtkImage" id="image_backup_dirs">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="pixbuf">/usr/share/pixmaps/mintbackup/backup-data.svg</property>
                         <property name="pixel_size">48</property>
+                        <property name="icon_name">mintbackup-software</property>
                         <property name="icon_size">6</property>
                       </object>
                       <packing>
@@ -605,8 +604,8 @@ up packages</property>
                           <object class="GtkBox" id="vbox13">
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
-                            <property name="spacing">6</property>
                             <property name="orientation">vertical</property>
+                            <property name="spacing">6</property>
                             <child>
                               <object class="GtkTable" id="table13">
                                 <property name="visible">True</property>
@@ -722,7 +721,6 @@ up packages</property>
                                 <property name="visible">True</property>
                                 <property name="can_focus">False</property>
                                 <property name="spacing">6</property>
-                                <property name="orientation">horizontal</property>
                                 <child>
                                   <object class="GtkBox" id="vbox14">
                                     <property name="visible">True</property>
@@ -919,20 +917,19 @@ up packages</property>
               <object class="GtkBox" id="vbox5">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="spacing">6</property>
                 <property name="orientation">vertical</property>
+                <property name="spacing">6</property>
                 <child>
                   <object class="GtkBox" id="hbox5">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="orientation">horizontal</property>
                     <child>
                       <object class="GtkBox" id="vbox26">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="border_width">6</property>
-                        <property name="spacing">6</property>
                         <property name="orientation">vertical</property>
+                        <property name="spacing">6</property>
                         <child>
                           <object class="GtkLabel" id="label_title_exclude">
                             <property name="visible">True</property>
@@ -970,8 +967,8 @@ up packages</property>
                       <object class="GtkImage" id="image1">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="pixbuf">/usr/share/pixmaps/mintbackup/backup-data.svg</property>
                         <property name="pixel_size">48</property>
+                        <property name="icon_name">mintbackup-data</property>
                       </object>
                       <packing>
                         <property name="expand">False</property>
@@ -992,7 +989,6 @@ up packages</property>
                   <object class="GtkBox" id="hbox9">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="orientation">horizontal</property>
                     <child>
                       <object class="GtkScrolledWindow" id="scrolledwindow_excludes">
                         <property name="visible">True</property>
@@ -1038,7 +1034,6 @@ up packages</property>
                               <object class="GtkBox" id="hbox6">
                                 <property name="visible">True</property>
                                 <property name="can_focus">False</property>
-                                <property name="orientation">horizontal</property>
                                 <child>
                                   <object class="GtkImage" id="image2">
                                     <property name="visible">True</property>
@@ -1081,7 +1076,6 @@ up packages</property>
                               <object class="GtkBox" id="hbox7">
                                 <property name="visible">True</property>
                                 <property name="can_focus">False</property>
-                                <property name="orientation">horizontal</property>
                                 <child>
                                   <object class="GtkImage" id="image3">
                                     <property name="visible">True</property>
@@ -1124,7 +1118,6 @@ up packages</property>
                               <object class="GtkBox" id="hbox8">
                                 <property name="visible">True</property>
                                 <property name="can_focus">False</property>
-                                <property name="orientation">horizontal</property>
                                 <child>
                                   <object class="GtkImage" id="image4">
                                     <property name="visible">True</property>
@@ -1199,14 +1192,13 @@ up packages</property>
                   <object class="GtkBox" id="hbox17">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="orientation">horizontal</property>
                     <child>
                       <object class="GtkBox" id="vbox27">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="border_width">6</property>
-                        <property name="spacing">6</property>
                         <property name="orientation">vertical</property>
+                        <property name="spacing">6</property>
                         <child>
                           <object class="GtkLabel" id="label_title_review">
                             <property name="visible">True</property>
@@ -1244,8 +1236,8 @@ up packages</property>
                       <object class="GtkImage" id="image5">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="pixbuf">/usr/share/pixmaps/mintbackup/backup-data.svg</property>
                         <property name="pixel_size">48</property>
+                        <property name="icon_name">mintbackup-data</property>
                       </object>
                       <packing>
                         <property name="expand">False</property>
@@ -1317,14 +1309,13 @@ up packages</property>
                   <object class="GtkBox" id="hbox11">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="orientation">horizontal</property>
                     <child>
                       <object class="GtkBox" id="vbox28">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="border_width">6</property>
-                        <property name="spacing">6</property>
                         <property name="orientation">vertical</property>
+                        <property name="spacing">6</property>
                         <child>
                           <object class="GtkLabel" id="label_title_copying">
                             <property name="visible">True</property>
@@ -1362,8 +1353,8 @@ up packages</property>
                       <object class="GtkImage" id="image6">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="pixbuf">/usr/share/pixmaps/mintbackup/backup-data.svg</property>
                         <property name="pixel_size">48</property>
+                        <property name="icon_name">mintbackup-data</property>
                       </object>
                       <packing>
                         <property name="expand">False</property>
@@ -1385,8 +1376,8 @@ up packages</property>
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="border_width">6</property>
-                    <property name="spacing">6</property>
                     <property name="orientation">vertical</property>
+                    <property name="spacing">6</property>
                     <child>
                       <object class="GtkLabel" id="label_file_count">
                         <property name="visible">True</property>
@@ -1418,7 +1409,6 @@ up packages</property>
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="spacing">6</property>
-                        <property name="orientation">horizontal</property>
                         <child>
                           <object class="GtkLabel" id="label_current_file">
                             <property name="visible">True</property>
@@ -1485,19 +1475,17 @@ up packages</property>
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
                 <property name="orientation">vertical</property>
-                <property name="orientation">vertical</property>
                 <child>
                   <object class="GtkBox" id="hbox12">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="orientation">horizontal</property>
                     <child>
                       <object class="GtkBox" id="vbox29">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="border_width">6</property>
-                        <property name="spacing">6</property>
                         <property name="orientation">vertical</property>
+                        <property name="spacing">6</property>
                         <child>
                           <object class="GtkLabel" id="label_title_finished">
                             <property name="visible">True</property>
@@ -1535,7 +1523,6 @@ up packages</property>
                       <object class="GtkImage" id="image_finished">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="pixbuf">/usr/share/pixmaps/mintbackup/backup-data.svg</property>
                         <property name="pixel_size">48</property>
                       </object>
                       <packing>
@@ -1621,14 +1608,13 @@ up packages</property>
                   <object class="GtkBox" id="hbox13">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="orientation">horizontal</property>
                     <child>
                       <object class="GtkBox" id="vbox37">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="border_width">6</property>
-                        <property name="spacing">6</property>
                         <property name="orientation">vertical</property>
+                        <property name="spacing">6</property>
                         <child>
                           <object class="GtkLabel" id="label_title_restore1">
                             <property name="visible">True</property>
@@ -1666,8 +1652,8 @@ up packages</property>
                       <object class="GtkImage" id="image7">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="pixbuf">/usr/share/pixmaps/mintbackup/restore-data.svg</property>
                         <property name="pixel_size">48</property>
+                        <property name="icon_name">mintbackup-restore-data</property>
                       </object>
                       <packing>
                         <property name="expand">False</property>
@@ -1866,6 +1852,12 @@ up packages</property>
                     <child>
                       <placeholder/>
                     </child>
+                    <child>
+                      <placeholder/>
+                    </child>
+                    <child>
+                      <placeholder/>
+                    </child>
                   </object>
                   <packing>
                     <property name="expand">True</property>
@@ -1899,14 +1891,13 @@ up packages</property>
                   <object class="GtkBox" id="hbox14">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="orientation">horizontal</property>
                     <child>
                       <object class="GtkBox" id="vbox38">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="border_width">6</property>
-                        <property name="spacing">6</property>
                         <property name="orientation">vertical</property>
+                        <property name="spacing">6</property>
                         <child>
                           <object class="GtkLabel" id="label_title_restore2">
                             <property name="visible">True</property>
@@ -1944,8 +1935,8 @@ up packages</property>
                       <object class="GtkImage" id="image8">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="pixbuf">/usr/share/pixmaps/mintbackup/restore-data.svg</property>
                         <property name="pixel_size">48</property>
+                        <property name="icon_name">mintbackup-restore-data</property>
                       </object>
                       <packing>
                         <property name="expand">False</property>
@@ -2109,14 +2100,13 @@ up packages</property>
                   <object class="GtkBox" id="hbox15">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="orientation">horizontal</property>
                     <child>
                       <object class="GtkBox" id="vbox39">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="border_width">6</property>
-                        <property name="spacing">6</property>
                         <property name="orientation">vertical</property>
+                        <property name="spacing">6</property>
                         <child>
                           <object class="GtkLabel" id="label_title_restore3">
                             <property name="visible">True</property>
@@ -2154,8 +2144,8 @@ up packages</property>
                       <object class="GtkImage" id="image10">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="pixbuf">/usr/share/pixmaps/mintbackup/restore-data.svg</property>
                         <property name="pixel_size">48</property>
+                        <property name="icon_name">mintbackup-restore-data</property>
                       </object>
                       <packing>
                         <property name="expand">False</property>
@@ -2209,7 +2199,6 @@ up packages</property>
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="spacing">6</property>
-                        <property name="orientation">horizontal</property>
                         <child>
                           <object class="GtkLabel" id="label_restore_status">
                             <property name="visible">True</property>
@@ -2283,14 +2272,13 @@ up packages</property>
                   <object class="GtkBox" id="hbox16">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="orientation">horizontal</property>
                     <child>
                       <object class="GtkBox" id="vbox40">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="border_width">6</property>
-                        <property name="spacing">6</property>
                         <property name="orientation">vertical</property>
+                        <property name="spacing">6</property>
                         <child>
                           <object class="GtkLabel" id="label_title_restore4">
                             <property name="visible">True</property>
@@ -2328,8 +2316,8 @@ up packages</property>
                       <object class="GtkImage" id="image_restore_finished">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="pixbuf">/usr/share/pixmaps/mintbackup/restore-data.svg</property>
                         <property name="pixel_size">48</property>
+                        <property name="icon_name">mintbackup-restore-data</property>
                       </object>
                       <packing>
                         <property name="expand">False</property>
@@ -2414,14 +2402,13 @@ up packages</property>
                   <object class="GtkBox" id="hbox23">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="orientation">horizontal</property>
                     <child>
                       <object class="GtkBox" id="vbox30">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="border_width">6</property>
-                        <property name="spacing">6</property>
                         <property name="orientation">vertical</property>
+                        <property name="spacing">6</property>
                         <child>
                           <object class="GtkLabel" id="label_title_software_backup1">
                             <property name="visible">True</property>
@@ -2459,8 +2446,8 @@ up packages</property>
                       <object class="GtkImage" id="image15">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="pixbuf">/usr/share/pixmaps/mintbackup/backup-software.svg</property>
                         <property name="pixel_size">48</property>
+                        <property name="icon_name">mintbackup-software</property>
                       </object>
                       <packing>
                         <property name="expand">False</property>
@@ -2534,20 +2521,19 @@ up packages</property>
               <object class="GtkBox" id="vbox20">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="spacing">10</property>
                 <property name="orientation">vertical</property>
+                <property name="spacing">10</property>
                 <child>
                   <object class="GtkBox" id="hbox24">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="orientation">horizontal</property>
                     <child>
                       <object class="GtkBox" id="vbox31">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="border_width">6</property>
-                        <property name="spacing">6</property>
                         <property name="orientation">vertical</property>
+                        <property name="spacing">6</property>
                         <child>
                           <object class="GtkLabel" id="label_title_software_backup2">
                             <property name="visible">True</property>
@@ -2586,8 +2572,8 @@ up packages</property>
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="xpad">6</property>
-                        <property name="pixbuf">/usr/share/pixmaps/mintbackup/backup-software.svg</property>
                         <property name="pixel_size">48</property>
+                        <property name="icon_name">mintbackup-software</property>
                       </object>
                       <packing>
                         <property name="expand">False</property>
@@ -2607,7 +2593,6 @@ up packages</property>
                   <object class="GtkBox" id="hbox25">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="orientation">horizontal</property>
                     <child>
                       <object class="GtkScrolledWindow" id="scrolledwindow2">
                         <property name="visible">True</property>
@@ -2656,7 +2641,6 @@ up packages</property>
                               <object class="GtkBox" id="hbox29">
                                 <property name="visible">True</property>
                                 <property name="can_focus">False</property>
-                                <property name="orientation">horizontal</property>
                                 <child>
                                   <object class="GtkImage" id="image18">
                                     <property name="visible">True</property>
@@ -2699,7 +2683,6 @@ up packages</property>
                               <object class="GtkBox" id="hbox30">
                                 <property name="visible">True</property>
                                 <property name="can_focus">False</property>
-                                <property name="orientation">horizontal</property>
                                 <child>
                                   <object class="GtkImage" id="image19">
                                     <property name="visible">True</property>
@@ -2775,14 +2758,13 @@ up packages</property>
                   <object class="GtkBox" id="hbox26">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="orientation">horizontal</property>
                     <child>
                       <object class="GtkBox" id="vbox32">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="border_width">6</property>
-                        <property name="spacing">6</property>
                         <property name="orientation">vertical</property>
+                        <property name="spacing">6</property>
                         <child>
                           <object class="GtkLabel" id="label_title_software_backup3">
                             <property name="visible">True</property>
@@ -2821,8 +2803,8 @@ up packages</property>
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="xpad">6</property>
-                        <property name="pixbuf">/usr/share/pixmaps/mintbackup/backup-software.svg</property>
                         <property name="pixel_size">48</property>
+                        <property name="icon_name">mintbackup-software</property>
                       </object>
                       <packing>
                         <property name="expand">False</property>
@@ -2865,7 +2847,6 @@ up packages</property>
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="spacing">6</property>
-                        <property name="orientation">horizontal</property>
                         <child>
                           <object class="GtkLabel" id="label_current_package">
                             <property name="visible">True</property>
@@ -2932,14 +2913,13 @@ up packages</property>
                   <object class="GtkBox" id="hbox28">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="orientation">horizontal</property>
                     <child>
                       <object class="GtkBox" id="vbox33">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="border_width">6</property>
-                        <property name="spacing">6</property>
                         <property name="orientation">vertical</property>
+                        <property name="spacing">6</property>
                         <child>
                           <object class="GtkLabel" id="label_title_software_backup4">
                             <property name="visible">True</property>
@@ -3037,14 +3017,13 @@ up packages</property>
                   <object class="GtkBox" id="hbox31">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="orientation">horizontal</property>
                     <child>
                       <object class="GtkBox" id="vbox34">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="border_width">6</property>
-                        <property name="spacing">6</property>
                         <property name="orientation">vertical</property>
+                        <property name="spacing">6</property>
                         <child>
                           <object class="GtkLabel" id="label_title_software_restore1">
                             <property name="visible">True</property>
@@ -3083,8 +3062,8 @@ up packages</property>
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="xpad">6</property>
-                        <property name="pixbuf">/usr/share/pixmaps/mintbackup/restore-software.svg</property>
                         <property name="pixel_size">48</property>
+                        <property name="icon_name">mintbackup-restore-software</property>
                       </object>
                       <packing>
                         <property name="expand">False</property>
@@ -3163,14 +3142,13 @@ up packages</property>
                   <object class="GtkBox" id="hbox32">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="orientation">horizontal</property>
                     <child>
                       <object class="GtkBox" id="vbox35">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="border_width">6</property>
-                        <property name="spacing">6</property>
                         <property name="orientation">vertical</property>
+                        <property name="spacing">6</property>
                         <child>
                           <object class="GtkLabel" id="label_title_software_restore2">
                             <property name="visible">True</property>
@@ -3209,8 +3187,8 @@ up packages</property>
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="xpad">6</property>
-                        <property name="pixbuf">/usr/share/pixmaps/mintbackup/restore-software.svg</property>
                         <property name="pixel_size">48</property>
+                        <property name="icon_name">mintbackup-restore-software</property>
                       </object>
                       <packing>
                         <property name="expand">False</property>
@@ -3230,7 +3208,6 @@ up packages</property>
                   <object class="GtkBox" id="hbox33">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="orientation">horizontal</property>
                     <child>
                       <object class="GtkScrolledWindow" id="scrolledwindow3">
                         <property name="visible">True</property>
@@ -3277,7 +3254,6 @@ up packages</property>
                               <object class="GtkBox" id="hbox34">
                                 <property name="visible">True</property>
                                 <property name="can_focus">False</property>
-                                <property name="orientation">horizontal</property>
                                 <child>
                                   <object class="GtkImage" id="image22">
                                     <property name="visible">True</property>
@@ -3320,7 +3296,6 @@ up packages</property>
                               <object class="GtkBox" id="hbox35">
                                 <property name="visible">True</property>
                                 <property name="can_focus">False</property>
-                                <property name="orientation">horizontal</property>
                                 <child>
                                   <object class="GtkImage" id="image23">
                                     <property name="visible">True</property>
@@ -3363,7 +3338,6 @@ up packages</property>
                               <object class="GtkBox" id="hbox36">
                                 <property name="visible">True</property>
                                 <property name="can_focus">False</property>
-                                <property name="orientation">horizontal</property>
                                 <child>
                                   <object class="GtkImage" id="image24">
                                     <property name="visible">True</property>
@@ -3439,14 +3413,13 @@ up packages</property>
                   <object class="GtkBox" id="hbox37">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="orientation">horizontal</property>
                     <child>
                       <object class="GtkBox" id="vbox36">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="border_width">6</property>
-                        <property name="spacing">6</property>
                         <property name="orientation">vertical</property>
+                        <property name="spacing">6</property>
                         <child>
                           <object class="GtkLabel" id="label_title_software_restore3">
                             <property name="visible">True</property>
@@ -3485,8 +3458,8 @@ up packages</property>
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="xpad">6</property>
-                        <property name="pixbuf">/usr/share/pixmaps/mintbackup/restore-software.svg</property>
                         <property name="pixel_size">48</property>
+                        <property name="icon_name">mintbackup-restore-software</property>
                       </object>
                       <packing>
                         <property name="expand">False</property>
diff --git a/usr/share/mime/packages/mintbackup.xml b/usr/share/mime/packages/mintbackup.xml
deleted file mode 100644
index 1a7e2ad..0000000
--- a/usr/share/mime/packages/mintbackup.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" ?>
-<mime-info xmlns="http://www.freedesktop.org/standards/shared-mime-info">
-<mime-type type="application/x-backup">
-   <comment>mintBackup Archive</comment>
-   <glob pattern="*.backup"/>
-</mime-type>
-</mime-info>
-
diff --git a/usr/share/pixmaps/mintbackup/icon.png b/usr/share/pixmaps/mintbackup/icon.png
deleted file mode 100644
index 3f6fe98..0000000
Binary files a/usr/share/pixmaps/mintbackup/icon.png and /dev/null differ