diff --git a/Aaru.Gui/Assets/aaru.png b/Aaru.Gui/Assets/aaru.png
new file mode 100644
index 000000000..12641e206
Binary files /dev/null and b/Aaru.Gui/Assets/aaru.png differ
diff --git a/Aaru.Gui/Views/Dialogs/About.xaml b/Aaru.Gui/Views/Dialogs/About.xaml
index 5937affc8..118d4b00c 100644
--- a/Aaru.Gui/Views/Dialogs/About.xaml
+++ b/Aaru.Gui/Views/Dialogs/About.xaml
@@ -44,7 +44,7 @@
         Width="480"
         Height="320"
         x:Class="Aaru.Gui.Views.Dialogs.About"
-        Icon="/Assets/aaru-logo.png"
+        Icon="/Assets/aaru.png"
         CanResize="False"
         x:DataType="dialogs:AboutViewModel"
         Title="{x:Static localization:UI.Title_About_Aaru}">
diff --git a/Aaru.Gui/Views/Dialogs/Console.xaml b/Aaru.Gui/Views/Dialogs/Console.xaml
index c5539c018..3b9ed0552 100644
--- a/Aaru.Gui/Views/Dialogs/Console.xaml
+++ b/Aaru.Gui/Views/Dialogs/Console.xaml
@@ -44,7 +44,7 @@
         Width="600"
         Height="450"
         x:Class="Aaru.Gui.Views.Dialogs.Console"
-        Icon="/Assets/aaru-logo.png"
+        Icon="/Assets/aaru.png"
         x:DataType="dialogs:ConsoleViewModel"
         Title="{x:Static localization:UI.Title_Console}">
     <Design.DataContext>
diff --git a/Aaru.Gui/Views/Dialogs/Encodings.xaml b/Aaru.Gui/Views/Dialogs/Encodings.xaml
index da49f9cb0..8db5e8792 100644
--- a/Aaru.Gui/Views/Dialogs/Encodings.xaml
+++ b/Aaru.Gui/Views/Dialogs/Encodings.xaml
@@ -44,7 +44,7 @@
         Width="480"
         Height="320"
         x:Class="Aaru.Gui.Views.Dialogs.Encodings"
-        Icon="/Assets/aaru-logo.png"
+        Icon="/Assets/aaru.png"
         CanResize="False"
         x:DataType="dialogs:EncodingsViewModel"
         Title="{x:Static localization:UI.Encodings}">
diff --git a/Aaru.Gui/Views/Dialogs/LicenseDialog.xaml b/Aaru.Gui/Views/Dialogs/LicenseDialog.xaml
index 369e72959..69afa3adc 100644
--- a/Aaru.Gui/Views/Dialogs/LicenseDialog.xaml
+++ b/Aaru.Gui/Views/Dialogs/LicenseDialog.xaml
@@ -44,7 +44,7 @@
         Width="480"
         Height="320"
         x:Class="Aaru.Gui.Views.Dialogs.LicenseDialog"
-        Icon="/Assets/aaru-logo.png"
+        Icon="/Assets/aaru.png"
         CanResize="False"
         x:DataType="dialogs:LicenseViewModel"
         Title="{x:Static localization:UI.Title_Aaru_license}">
diff --git a/Aaru.Gui/Views/Dialogs/PluginsDialog.xaml b/Aaru.Gui/Views/Dialogs/PluginsDialog.xaml
index 4419ec444..81f40daca 100644
--- a/Aaru.Gui/Views/Dialogs/PluginsDialog.xaml
+++ b/Aaru.Gui/Views/Dialogs/PluginsDialog.xaml
@@ -44,7 +44,7 @@
         Width="720"
         Height="600"
         x:Class="Aaru.Gui.Views.Dialogs.PluginsDialog"
-        Icon="/Assets/aaru-logo.png"
+        Icon="/Assets/aaru.png"
         x:DataType="dialogs:PluginsViewModel"
         Title="{x:Static localization:UI.Title_Plugins}">
     <Design.DataContext>
diff --git a/Aaru.Gui/Views/Dialogs/SettingsDialog.xaml b/Aaru.Gui/Views/Dialogs/SettingsDialog.xaml
index 19362591a..29c0d2fc2 100644
--- a/Aaru.Gui/Views/Dialogs/SettingsDialog.xaml
+++ b/Aaru.Gui/Views/Dialogs/SettingsDialog.xaml
@@ -43,7 +43,7 @@
         Width="675"
         Height="640"
         x:Class="Aaru.Gui.Views.Dialogs.SettingsDialog"
-        Icon="/Assets/aaru-logo.png"
+        Icon="/Assets/aaru.png"
         CanResize="False"
         x:DataType="dialogs:SettingsViewModel"
         Title="{x:Static localization:UI.Title_Settings}">
diff --git a/Aaru.Gui/Views/Dialogs/StatisticsDialog.xaml b/Aaru.Gui/Views/Dialogs/StatisticsDialog.xaml
index cf68f4d06..307afb8ee 100644
--- a/Aaru.Gui/Views/Dialogs/StatisticsDialog.xaml
+++ b/Aaru.Gui/Views/Dialogs/StatisticsDialog.xaml
@@ -44,7 +44,7 @@
         Width="550"
         Height="320"
         x:Class="Aaru.Gui.Views.Dialogs.StatisticsDialog"
-        Icon="/Assets/aaru-logo.png"
+        Icon="/Assets/aaru.png"
         CanResize="False"
         x:DataType="dialogs:StatisticsViewModel"
         Title="{x:Static localization:UI.Title_Statistics}">
diff --git a/Aaru.Gui/Views/Windows/DecodeMediaTags.xaml b/Aaru.Gui/Views/Windows/DecodeMediaTags.xaml
index da39682e1..6463d1dba 100644
--- a/Aaru.Gui/Views/Windows/DecodeMediaTags.xaml
+++ b/Aaru.Gui/Views/Windows/DecodeMediaTags.xaml
@@ -44,7 +44,7 @@
         Width="640"
         Height="480"
         x:Class="Aaru.Gui.Views.Windows.DecodeMediaTags"
-        Icon="/Assets/aaru-logo.png"
+        Icon="/Assets/aaru.png"
         x:DataType="windows:DecodeMediaTagsViewModel"
         Title="{x:Static localization:UI.Title_Decode_media_tags}">
     <Design.DataContext>
diff --git a/Aaru.Gui/Views/Windows/ImageChecksum.xaml b/Aaru.Gui/Views/Windows/ImageChecksum.xaml
index 9d279be7e..acd049f84 100644
--- a/Aaru.Gui/Views/Windows/ImageChecksum.xaml
+++ b/Aaru.Gui/Views/Windows/ImageChecksum.xaml
@@ -44,7 +44,7 @@
         Width="800"
         Height="600"
         x:Class="Aaru.Gui.Views.Windows.ImageChecksum"
-        Icon="/Assets/aaru-logo.png"
+        Icon="/Assets/aaru.png"
         x:DataType="windows:ImageChecksumViewModel"
         Title="{x:Static localization:UI.Title_Checksum_image_contents}">
     <Design.DataContext>
diff --git a/Aaru.Gui/Views/Windows/ImageConvert.xaml b/Aaru.Gui/Views/Windows/ImageConvert.xaml
index 20d020097..ce5a7500d 100644
--- a/Aaru.Gui/Views/Windows/ImageConvert.xaml
+++ b/Aaru.Gui/Views/Windows/ImageConvert.xaml
@@ -44,7 +44,7 @@
         Width="1000"
         Height="832"
         x:Class="Aaru.Gui.Views.Windows.ImageConvert"
-        Icon="/Assets/aaru-logo.png"
+        Icon="/Assets/aaru.png"
         x:DataType="windows:ImageConvertViewModel"
         Title="{x:Static localization:UI.Title_Convert_image}">
     <Design.DataContext>
diff --git a/Aaru.Gui/Views/Windows/ImageEntropy.xaml b/Aaru.Gui/Views/Windows/ImageEntropy.xaml
index 07b584185..e8c0d4bc3 100644
--- a/Aaru.Gui/Views/Windows/ImageEntropy.xaml
+++ b/Aaru.Gui/Views/Windows/ImageEntropy.xaml
@@ -44,7 +44,7 @@
         Width="640"
         Height="320"
         x:Class="Aaru.Gui.Views.Windows.ImageEntropy"
-        Icon="/Assets/aaru-logo.png"
+        Icon="/Assets/aaru.png"
         x:DataType="windows:ImageEntropyViewModel"
         Title="{x:Static localization:UI.Title_Calculating_entropy}">
     <Design.DataContext>
diff --git a/Aaru.Gui/Views/Windows/ImageSidecar.xaml b/Aaru.Gui/Views/Windows/ImageSidecar.xaml
index dcacd780a..ba2f0efda 100644
--- a/Aaru.Gui/Views/Windows/ImageSidecar.xaml
+++ b/Aaru.Gui/Views/Windows/ImageSidecar.xaml
@@ -44,7 +44,7 @@
         Width="640"
         Height="320"
         x:Class="Aaru.Gui.Views.Windows.ImageSidecar"
-        Icon="/Assets/aaru-logo.png"
+        Icon="/Assets/aaru.png"
         CanResize="False"
         x:DataType="windows:ImageSidecarViewModel"
         Title="{x:Static localization:UI.Title_Image_sidecar_creation}">
diff --git a/Aaru.Gui/Views/Windows/ImageVerify.xaml b/Aaru.Gui/Views/Windows/ImageVerify.xaml
index 6719b505d..6de2c6a82 100644
--- a/Aaru.Gui/Views/Windows/ImageVerify.xaml
+++ b/Aaru.Gui/Views/Windows/ImageVerify.xaml
@@ -44,7 +44,7 @@
         Width="640"
         Height="400"
         x:Class="Aaru.Gui.Views.Windows.ImageVerify"
-        Icon="/Assets/aaru-logo.png"
+        Icon="/Assets/aaru.png"
         x:DataType="windows:ImageVerifyViewModel"
         Title="{x:Static localization:UI.Title_Verify_image}">
     <Design.DataContext>
diff --git a/Aaru.Gui/Views/Windows/MainWindow.axaml b/Aaru.Gui/Views/Windows/MainWindow.axaml
index 6bb74096a..0dca7816d 100644
--- a/Aaru.Gui/Views/Windows/MainWindow.axaml
+++ b/Aaru.Gui/Views/Windows/MainWindow.axaml
@@ -12,7 +12,7 @@
         Width="1280"
         Height="720"
         x:Class="Aaru.Gui.Views.Windows.MainWindow"
-        Icon="/Assets/aaru-logo.png"
+        Icon="/Assets/aaru.png"
         x:DataType="windows:MainWindowViewModel"
         Title="{Binding Title, Mode=OneWay}">
     <Design.DataContext>
diff --git a/Aaru.Gui/Views/Windows/MediaDump.xaml b/Aaru.Gui/Views/Windows/MediaDump.xaml
index f6648849e..9de4a6eee 100644
--- a/Aaru.Gui/Views/Windows/MediaDump.xaml
+++ b/Aaru.Gui/Views/Windows/MediaDump.xaml
@@ -44,7 +44,7 @@
         Width="900"
         Height="650"
         x:Class="Aaru.Gui.Views.Windows.MediaDump"
-        Icon="/Assets/aaru-logo.png"
+        Icon="/Assets/aaru.png"
         x:DataType="windows:MediaDumpViewModel"
         Title="{Binding Title, Mode=OneWay}">
     <Design.DataContext>
diff --git a/Aaru.Gui/Views/Windows/MediaScan.xaml b/Aaru.Gui/Views/Windows/MediaScan.xaml
index 64f446459..4b07dbfdb 100644
--- a/Aaru.Gui/Views/Windows/MediaScan.xaml
+++ b/Aaru.Gui/Views/Windows/MediaScan.xaml
@@ -42,7 +42,7 @@
         d:DesignWidth="800"
         d:DesignHeight="450"
         x:Class="Aaru.Gui.Views.Windows.MediaScan"
-        Icon="/Assets/aaru-logo.png"
+        Icon="/Assets/aaru.png"
         x:DataType="windows:MediaScanViewModel"
         Width="900"
         Height="580"
diff --git a/Aaru.Gui/Views/Windows/MetadataEditor.axaml b/Aaru.Gui/Views/Windows/MetadataEditor.axaml
index 4044516d9..0cbe8021b 100644
--- a/Aaru.Gui/Views/Windows/MetadataEditor.axaml
+++ b/Aaru.Gui/Views/Windows/MetadataEditor.axaml
@@ -12,7 +12,7 @@
         x:Class="Aaru.Gui.Views.Windows.MetadataEditor"
         x:DataType="windows:MetadataEditorViewModel"
         Title="{Binding Title, Mode=OneWay}"
-        Icon="/Assets/aaru-logo.png">
+        Icon="/Assets/aaru.png">
     <Design.DataContext>
         <windows:MetadataEditorViewModel />
     </Design.DataContext>
diff --git a/Aaru.Gui/Views/Windows/SplashWindow.xaml b/Aaru.Gui/Views/Windows/SplashWindow.xaml
index 58fa6df51..e4f723a15 100644
--- a/Aaru.Gui/Views/Windows/SplashWindow.xaml
+++ b/Aaru.Gui/Views/Windows/SplashWindow.xaml
@@ -40,7 +40,7 @@
         d:DesignWidth="800"
         d:DesignHeight="450"
         x:Class="Aaru.Gui.Views.Windows.SplashWindow"
-        Icon="/Assets/aaru-logo.png"
+        Icon="/Assets/aaru.png"
         Title="Aaru"
         x:DataType="windows:SplashWindowViewModel"
         SystemDecorations="BorderOnly">
diff --git a/Aaru.Gui/Views/Windows/ViewSector.xaml b/Aaru.Gui/Views/Windows/ViewSector.xaml
index 36bcdbefd..a1f5e8ea2 100644
--- a/Aaru.Gui/Views/Windows/ViewSector.xaml
+++ b/Aaru.Gui/Views/Windows/ViewSector.xaml
@@ -44,7 +44,7 @@
         Width="640"
         Height="480"
         x:Class="Aaru.Gui.Views.Windows.ViewSector"
-        Icon="/Assets/aaru-logo.png"
+        Icon="/Assets/aaru.png"
         x:DataType="windows:ViewSectorViewModel"
         Title="{x:Static localization:UI.Title_Sector_viewer}">
     <Design.DataContext>
diff --git a/Aaru/Aaru.csproj b/Aaru/Aaru.csproj
index 9d08f3bd4..935ec9f19 100644
--- a/Aaru/Aaru.csproj
+++ b/Aaru/Aaru.csproj
@@ -14,6 +14,7 @@
     <SelfContained>true</SelfContained>
     <IncludeNativeLibrariesForSelfExtract>true</IncludeNativeLibrariesForSelfExtract>
     <EnableCompressionInSingleFile>true</EnableCompressionInSingleFile>
+    <ApplicationIcon>aaru.ico</ApplicationIcon>
   </PropertyGroup>
   <ItemGroup>
     <Content Update="$(NuGetPackageRoot)\microsoft.codeanalysis.workspaces.msbuild\**\**" Visible="false"/>
diff --git a/Aaru/Aaru.icns b/Aaru/Aaru.icns
index 8f385bb4a..eaed967ec 100644
Binary files a/Aaru/Aaru.icns and b/Aaru/Aaru.icns differ
diff --git a/Aaru/Info.plist b/Aaru/Info.plist
index 10e6687a4..82dd660ef 100644
--- a/Aaru/Info.plist
+++ b/Aaru/Info.plist
@@ -1,28 +1,28 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
-  <dict>
-    <key>LSMinimumSystemVersion</key>
-    <string>10.13</string>
-    <key>CFBundleDevelopmentRegion</key>
-    <string>en</string>
-    <key>NSHumanReadableCopyright</key>
-    <string>© Natalia Portillo</string>
-    <key>CFBundleIconFile</key>
-    <string>MacIcon.icns</string>
-    <key>CFBundleName</key>
-    <string>Aaru</string>
-    <key>CFBundleIdentifier</key>
-    <string>app.aaru</string>
-    <key>CFBundleShortVersionString</key>
-    <string>6.0.0-alpha.12</string>
-    <key>CFBundleExecutable</key>
-    <string>aaru</string>
-    <key>LSExecutableArchitectures</key>
-    <array>
-      <string>x86_64</string>
-    </array>
-    <key>NSHighResolutionCapable</key>
-    <true/>
-  </dict>
+<dict>
+	<key>LSMinimumSystemVersion</key>
+	<string>10.13</string>
+	<key>CFBundleDevelopmentRegion</key>
+	<string>en</string>
+	<key>NSHumanReadableCopyright</key>
+	<string>© Natalia Portillo</string>
+	<key>CFBundleIconFile</key>
+	<string>Aaru.icns</string>
+	<key>CFBundleName</key>
+	<string>Aaru</string>
+	<key>CFBundleIdentifier</key>
+	<string>app.aaru</string>
+	<key>CFBundleShortVersionString</key>
+	<string>6.0.0-alpha.12</string>
+	<key>CFBundleExecutable</key>
+	<string>aaru</string>
+	<key>LSExecutableArchitectures</key>
+	<array>
+		<string>x86_64</string>
+	</array>
+	<key>NSHighResolutionCapable</key>
+	<true/>
+</dict>
 </plist>
-
diff --git a/Aaru/aaru.ico b/Aaru/aaru.ico
new file mode 100644
index 000000000..584d557a6
Binary files /dev/null and b/Aaru/aaru.ico differ
diff --git a/Aaru/aaru.png b/Aaru/aaru.png
new file mode 100644
index 000000000..12641e206
Binary files /dev/null and b/Aaru/aaru.png differ
diff --git a/icons/128x128/aaru.png b/icons/128x128/aaru.png
new file mode 100644
index 000000000..c89dcc7f5
Binary files /dev/null and b/icons/128x128/aaru.png differ
diff --git a/icons/256x256/aaru.png b/icons/256x256/aaru.png
new file mode 100644
index 000000000..adf4960b1
Binary files /dev/null and b/icons/256x256/aaru.png differ
diff --git a/icons/32x32/aaru.png b/icons/32x32/aaru.png
new file mode 100644
index 000000000..1a7bd23e6
Binary files /dev/null and b/icons/32x32/aaru.png differ
diff --git a/icons/512x512/aaru.png b/icons/512x512/aaru.png
new file mode 100644
index 000000000..1739b16cf
Binary files /dev/null and b/icons/512x512/aaru.png differ
diff --git a/icons/64x64/aaru.png b/icons/64x64/aaru.png
new file mode 100644
index 000000000..8da8ae51c
Binary files /dev/null and b/icons/64x64/aaru.png differ
diff --git a/icons/aaru.png b/icons/aaru.png
new file mode 100644
index 000000000..12641e206
Binary files /dev/null and b/icons/aaru.png differ
diff --git a/pkg/pacman/stable/PKGBUILD b/pkg/pacman/stable/PKGBUILD
index 15bc31ac6..e3361ffae 100644
--- a/pkg/pacman/stable/PKGBUILD
+++ b/pkg/pacman/stable/PKGBUILD
@@ -42,6 +42,22 @@ package() {
     install -d -m0755 -g 0 "${pkgdir}"/usr/share/applications
     install -m0644 -g 0 -t "${pkgdir}"/usr/share/applications aaru.desktop
 
+    # Install icons
+    install -d -m0755 -g 0 "${pkgdir}"/usr/share/icons/hicolor/32x32/apps
+    install -m0644 -g 0 -t "${pkgdir}"/usr/share/icons/hicolor/32x32/apps icons/32x32/aaru.png
+
+    install -d -m0755 -g 0 "${pkgdir}"/usr/share/icons/hicolor/64x64/apps
+    install -m0644 -g 0 -t "${pkgdir}"/usr/share/icons/hicolor/64x64/apps icons/64x64/aaru.png
+
+    install -d -m0755 -g 0 "${pkgdir}"/usr/share/icons/hicolor/128x128/apps
+    install -m0644 -g 0 -t "${pkgdir}"/usr/share/icons/hicolor/128x128/apps icons/128x128/aaru.png
+
+    install -d -m0755 -g 0 "${pkgdir}"/usr/share/icons/hicolor/256x256/apps
+    install -m0644 -g 0 -t "${pkgdir}"/usr/share/icons/hicolor/256x256/apps icons/256x256/aaru.png
+
+    install -d -m0755 -g 0 "${pkgdir}"/usr/share/icons/hicolor/512x512/apps
+    install -m0644 -g 0 -t "${pkgdir}"/usr/share/icons/hicolor/512x512/apps icons/512x512/aaru.png
+
     cd "${srcdir}"/"${_aarubase}"/bin/Release/${_netcoretarget}/${dotnet_rid}/publish
 
     # Create destination directory