diff --git a/childsplay-fix-sqlalchemy-exceptions-import.patch b/childsplay-fix-sqlalchemy-exceptions-import.patch
index 6dd10a7..e5ae897 100644
--- a/childsplay-fix-sqlalchemy-exceptions-import.patch
+++ b/childsplay-fix-sqlalchemy-exceptions-import.patch
@@ -11,6 +11,15 @@
      module_logger.exception("No sqlalchemy package found")
 --- childsplay-1.6/SPMainCore.py~	2011-06-03 13:24:28.000000000 +0200
 +++ childsplay-1.6/SPMainCore.py	2011-12-15 11:50:56.590947343 +0100
+@@ -61,7 +61,7 @@ import Version
+ from SPocwWidgets import ExitDialog, InfoDialog, GraphDialog, Graph, Label, \
+     ExeCounter
+ from SPVirtualkeyboard import VirtualKeyboard
+-from sqlalchemy import exceptions as sqla_exceptions
++from sqlalchemy import exc as sqla_exceptions
+ 
+ # Used to cleanup stuff when the Python vm ends
+ def cleanup():
 @@ -197,7 +197,7 @@ class MainCoreGui:
          # get a datamanager which will also handle the login screen
          try:
diff --git a/childsplay.desktop b/childsplay.desktop
index b1710f7..f71c85b 100644
--- a/childsplay.desktop
+++ b/childsplay.desktop
@@ -1,9 +1,8 @@
 [Desktop Entry]
-Encoding=UTF-8
 Name=Childsplay
 Comment=Educational and at the same time be fun to play
 Exec=childsplay
-Icon=childsplay.png
+Icon=childsplay
 Terminal=false
 StartupNotify=false
 Type=Application
diff --git a/childsplay.spec b/childsplay.spec
index 6dbc2a2..2f4fcb0 100644
--- a/childsplay.spec
+++ b/childsplay.spec
@@ -3,7 +3,7 @@
 
 Name:           childsplay
 Version:        1.6
-Release:        10%{?dist}
+Release:        11%{?dist}
 Summary:        Suite of educational games for young children
 Group:          Amusements/Games
 License:        GPLv3
@@ -30,8 +30,7 @@ Source26:       http://downloads.sourceforge.net/schoolsplay/alphabet_sounds_sv-
 Patch0:         childsplay-fix-sqlalchemy-exceptions-import.patch
 Patch1:         childsplay-1.6-flashcards-lang-fallback.patch
 BuildArch:      noarch
-BuildRequires:  desktop-file-utils
-BuildRequires:  python
+BuildRequires:  python desktop-file-utils ImageMagick
 Requires:       pygame
 Requires:       python-sqlalchemy
 Requires:       hicolor-icon-theme
@@ -292,11 +291,23 @@ cp -a ocempgui $RPM_BUILD_ROOT%{python_sitedir}/%{realname}
 
 # below is the desktop file and icon stuff.
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications
-desktop-file-install --dir $RPM_BUILD_ROOT%{_datadir}/applications %{SOURCE1}
-
-mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/64x64/apps
-install -p -m 644 lib/SPData/menu/default/logo_cp_64x64.png \
-  $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/64x64/apps/%{name}.png
+desktop-file-install \
+%if 0%{?fedora} && 0%{?fedora} < 19
+  --vendor fedora            \
+%endif
+  --dir $RPM_BUILD_ROOT%{_datadir}/applications \
+  %{SOURCE1}
+
+for i in 32x32 64x64 128x128 192x192 256x256; do
+  mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/$i/apps
+  if [ -f lib/SPData/menu/default/logo_cp_$i.png ]; then
+    install -p -m 644 lib/SPData/menu/default/logo_cp_$i.png \
+      $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/$i/apps/%{name}.png
+  else
+    convert lib/SPData/menu/default/logo_cp_180x180.png -resize $i \
+      $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/$i/apps/%{name}.png
+  fi
+done
 
 #Remove provided font and symlink system one
 rm $RPM_BUILD_ROOT%{_datadir}/%{realname}/SPData/DejaVuSansCondensed-Bold.ttf
@@ -351,7 +362,7 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 %{_datadir}/%{realname}/CPData/SoundmemoryData
 %{_datadir}/%{realname}/alphabetsounds/en
 %{python_sitedir}/%{realname}
-%{_datadir}/applications/%{name}.desktop
+%{_datadir}/applications/*%{name}.desktop
 %{_datadir}/icons/hicolor/*/apps/%{name}.png
 
 %files alphabet_sounds_bg
@@ -434,6 +445,10 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 
 
 %changelog
+* Fri May 10 2013 Hans de Goede <hdegoede@redhat.com> - 1.6-11
+- Fix crash (import error) with latest sqlalchemy
+- Add more icon sizes
+
 * Thu Feb 14 2013 Rahul Sundaram <sundaram@fedoraproject.org> - 1.6-10
 - remove vendor tag from desktop file. https://fedorahosted.org/fpc/ticket/247
 
@@ -481,7 +496,7 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 * Thu May 20 2010 Johan Cwiklinski <johan AT x-tnd DOT be> 1.5.1-1
 - 1.5.1
 
-* Mon Apr 13 2010 Johan Cwiklinski <johan AT x-tnd DOT be> 1.5-1
+* Tue Apr 13 2010 Johan Cwiklinski <johan AT x-tnd DOT be> 1.5-1
 - 1.5
 - Update Sources URL making rpmlint happy