diff --git a/android/mkp4a.debug b/android/mkp4a.debug
index e0097794..04ba2130 100755
--- a/android/mkp4a.debug
+++ b/android/mkp4a.debug
@@ -27,6 +27,6 @@ python3 -m pythonforandroid.toolchain apk \
   --version ${version} \
   --orientation sensor \
   --color=always \
-  --icon ${tmpdir}/data/images/misc/pysol01.png \
-  --presplash ${tmpdir}/data/images/misc/pysol06.png \
+  --icon ${tmpdir}/data/images/icons/48x48/pysol.png \
+  --presplash ${tmpdir}/data/images/icons/1024x1024/pysol.png \
   --copy-libs
diff --git a/android/mkp4a.release b/android/mkp4a.release
index cce0eb27..4769bda1 100755
--- a/android/mkp4a.release
+++ b/android/mkp4a.release
@@ -52,8 +52,8 @@ python3 -m pythonforandroid.toolchain apk \
   --version ${version} \
   --orientation sensor \
   --color=always \
-  --icon ${tmpdir}/data/images/misc/pysol01.png \
-  --presplash ${tmpdir}/data/images/misc/pysol06.png \
+  --icon ${tmpdir}/data/images/icons/48x48/pysol.png \
+  --presplash ${tmpdir}/data/images/icons/1024x1024/pysol.png \
   --copy-libs
 
 # keystore options (instead environment vars):
diff --git a/android/mkp4a.unsigned b/android/mkp4a.unsigned
index d7e0ce47..5c18b256 100755
--- a/android/mkp4a.unsigned
+++ b/android/mkp4a.unsigned
@@ -39,8 +39,8 @@ python3 -m pythonforandroid.toolchain apk \
   --version ${version} \
   --orientation sensor \
   --color=always \
-  --icon ${tmpdir}/data/images/misc/pysol01.png \
-  --presplash ${tmpdir}/data/images/misc/pysol06.png \
+  --icon ${tmpdir}/data/images/icons/48x48/pysol.png \
+  --presplash ${tmpdir}/data/images/icons/1024x1024/pysol.png \
   --copy-libs
 
 # python3 -m pythonforandroid.toolchain apk
diff --git a/data/images/misc/pysol06.png b/data/images/icons/1024x1024/pysol.png
similarity index 100%
rename from data/images/misc/pysol06.png
rename to data/images/icons/1024x1024/pysol.png
diff --git a/data/images/misc/pysol02.png b/data/images/icons/128x128/pysol.png
similarity index 100%
rename from data/images/misc/pysol02.png
rename to data/images/icons/128x128/pysol.png
diff --git a/data/images/misc/pysol01.png b/data/images/icons/48x48/pysol.png
similarity index 100%
rename from data/images/misc/pysol01.png
rename to data/images/icons/48x48/pysol.png
diff --git a/data/images/misc/pysol03.png b/data/images/icons/512x512/pysol.png
similarity index 100%
rename from data/images/misc/pysol03.png
rename to data/images/icons/512x512/pysol.png
diff --git a/data/pysol.desktop b/data/pysol.desktop
index a38efc55..cc45a191 100644
--- a/data/pysol.desktop
+++ b/data/pysol.desktop
@@ -7,4 +7,4 @@ Terminal=false
 Type=Application
 Categories=Game;CardGame;
 Keywords=solitaire;patience;cards;pysolfc;klondike;
-Icon=/usr/share/icons/pysol01.png
+Icon=pysol
diff --git a/pysollib/kivy/LApp.py b/pysollib/kivy/LApp.py
index 79836008..2355f321 100644
--- a/pysollib/kivy/LApp.py
+++ b/pysollib/kivy/LApp.py
@@ -1168,7 +1168,7 @@ class LMenu(ActionView, LBase):
         class MyActionPrev(ActionPrevious, LBase):
             pass
 
-        kw['app_icon'] = 'data/images/misc/pysol01.png'
+        kw['app_icon'] = 'data/images/icons/48x48/pysol.png'
         kw['with_previous'] = prev
         kw['size_hint'] = (.01, 1)
         self.ap = MyActionPrev(**kw)
diff --git a/setup.py b/setup.py
index a858d40b..5a2c666e 100644
--- a/setup.py
+++ b/setup.py
@@ -45,9 +45,9 @@ for d in ddirs:
 
 if os.name == 'posix':
     data_files.append(('share/pixmaps', ['data/pysol.xbm', 'data/pysol.xpm']))
-    data_files.append(('share/icons',
-                       ['data/images/misc/pysol01.png',
-                        'data/images/misc/pysol02.png', ]))
+    for size in os.listdir('data/images/icons'):
+        data_files.append(('share/icons/hicolor/%s/apps' % size,
+                           ['data/images/icons/%s/pysol.png' % size]))
     for mofile in glob('locale/*/*/*.mo'):
         data_files.append(('share/' + os.path.dirname(mofile), [mofile]))
     data_files.append((data_dir, ['data/pysolfc.glade']))