diff --git a/src/activities/menu/Menu.qml b/src/activities/menu/Menu.qml
index bc0e63cf0..2195311bb 100644
--- a/src/activities/menu/Menu.qml
+++ b/src/activities/menu/Menu.qml
@@ -1,516 +1,516 @@
 /* GCompris - Menu.qml
  *
  * Copyright (C) 2014 Bruno Coudoin <bruno.coudoin@gcompris.net>
  *
  * Authors:
  *   Bruno Coudoin <bruno.coudoin@gcompris.net> (Qt Quick port)
  *
  *   This program is free software; you can redistribute it and/or modify
  *   it under the terms of the GNU General Public License as published by
  *   the Free Software Foundation; either version 3 of the License, or
  *   (at your option) any later version.
  *
  *   This program is distributed in the hope that it will be useful,
  *   but WITHOUT ANY WARRANTY; without even the implied warranty of
  *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *   GNU General Public License for more details.
  *
  *   You should have received a copy of the GNU General Public License
  *   along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 import QtQuick 2.2
 import "../../core"
 import GCompris 1.0
 import "qrc:/gcompris/src/core/core.js" as Core
 import QtGraphicalEffects 1.0
 
 /**
  * GCompris' top level menu screen.
  *
  * Displays a grid of available activities divided subdivided in activity
  * categories/sections.
  *
  * The visibility of the section row is toggled by the setting
  * ApplicationSettings.sectionVisible.
  *
  * The list of available activities depends on the following settings:
  *
  * * ApplicationSettings.showLockedActivities
  * * ApplicationSettings.filterLevelMin
  * * ApplicationSettings.filterLevelMax
  *
  * @inherit QtQuick.Item
  */
 ActivityBase {
     id: menuActivity
     focus: true
     activityInfo: ActivityInfoTree.rootMenu
 
     onBack: {
         pageView.pop(to);
         // Restore focus that has been taken by the loaded activity
         if(pageView.currentItem == menuActivity)
             focus = true;
     }
 
     onHome: {
         if(pageView.depth === 1) {
             Core.quit(main);
         }
         else {
             pageView.pop();
             // Restore focus that has been taken by the loaded activity
             if(pageView.currentItem == menuActivity)
                 focus = true;
         }
     }
 
     onDisplayDialog: pageView.push(dialog)
 
     onDisplayDialogs: {
         var toPush = new Array();
         for (var i = 0; i < dialogs.length; i++) {
             toPush.push({item: dialogs[i]});
         }
         pageView.push(toPush);
     }
 
     // @cond INTERNAL_DOCS
     property string url: "qrc:/gcompris/src/activities/menu/resource/"
     property variant sections: [
         {
             icon: menuActivity.url + "all.svg",
             tag: "favorite"
         },
         {
             icon: menuActivity.url + "computer.svg",
             tag: "computer"
         },
         {
             icon: menuActivity.url + "discovery.svg",
             tag: "discovery"
         },
         {
             icon: menuActivity.url + "experience.svg",
             tag: "experiment"
         },
         {
             icon: menuActivity.url + "fun.svg",
             tag: "fun"
         },
         {
             icon: menuActivity.url + "math.svg",
             tag: "math"
         },
         {
             icon: menuActivity.url + "puzzle.svg",
             tag: "puzzle"
         },
         {
             icon: menuActivity.url + "reading.svg",
             tag: "reading"
         },
         {
             icon: menuActivity.url + "strategy.svg",
             tag: "strategy"
         },
     ]
     property string currentTag: sections[0].tag
     /// @endcond
 
     pageComponent: Image {
         id: background
         source: menuActivity.url + "background.svg"
         sourceSize.width: Math.max(parent.width, parent.height)
         fillMode: Image.PreserveAspectCrop
 
         function loadActivity() {
             pageView.push(activityLoader.item)
         }
 
         Loader {
             id: activityLoader
             asynchronous: true
             onStatusChanged: {
                 if (status == Loader.Loading) {
                     loading.start();
                 } else if (status == Loader.Ready) {
                     loading.stop();
                     loadActivity();
                 } else if (status == Loader.Error)
                     loading.stop();
             }
         }
 
         // Filters
         property bool horizontal: main.width > main.height
         property int sectionIconWidth:
             horizontal ?
                 Math.min(100 * ApplicationInfo.ratio, main.width / (sections.length + 1)) :
                 Math.min(100 * ApplicationInfo.ratio, (main.height - bar.height) / (sections.length + 1))
         property int sectionIconHeight: sectionIconWidth
         property int sectionCellWidth: sectionIconWidth * 1.1
         property int sectionCellHeight: sectionIconHeight * 1.1
 
         property var currentActiveGrid: activitiesGrid
         property bool keyboardMode: false
         Keys.onPressed: {
             if (event.modifiers === Qt.ControlModifier &&
                     event.key === Qt.Key_S) {
                 // Ctrl+S toggle show / hide section
                 ApplicationSettings.sectionVisible = !ApplicationSettings.sectionVisible
             } else if(event.key === Qt.Key_Space && currentActiveGrid.currentItem) {
                 currentActiveGrid.currentItem.selectCurrentItem()
             }
         }
         Keys.onReleased: {
             keyboardMode = true
             event.accepted = false
         }
         Keys.onTabPressed: currentActiveGrid = ((currentActiveGrid == activitiesGrid) ?
                                                     section : activitiesGrid);
         Keys.onEnterPressed: if(currentActiveGrid.currentItem) currentActiveGrid.currentItem.selectCurrentItem();
         Keys.onReturnPressed: if(currentActiveGrid.currentItem)  currentActiveGrid.currentItem.selectCurrentItem();
         Keys.onRightPressed: if(currentActiveGrid.currentItem) currentActiveGrid.moveCurrentIndexRight();
         Keys.onLeftPressed: if(currentActiveGrid.currentItem) currentActiveGrid.moveCurrentIndexLeft();
         Keys.onDownPressed: if(currentActiveGrid.currentItem && !currentActiveGrid.atYEnd) currentActiveGrid.moveCurrentIndexDown();
         Keys.onUpPressed: if(currentActiveGrid.currentItem && !currentActiveGrid.atYBeginning) currentActiveGrid.moveCurrentIndexUp();
 
         GridView {
             id: section
             model: sections
             width: horizontal ? main.width : sectionCellWidth
             height: horizontal ? sectionCellHeight : main.height - bar.height
             x: ApplicationSettings.sectionVisible ? section.initialX : -sectionCellWidth
             y: ApplicationSettings.sectionVisible ? section.initialY : -sectionCellHeight
             cellWidth: sectionCellWidth
             cellHeight: sectionCellHeight
             interactive: false
             keyNavigationWraps: true
 
             property int initialX: 4
             property int initialY: 4
 
             Component {
                 id: sectionDelegate
                 Item {
                     id: backgroundSection
                     width: sectionCellWidth
                     height: sectionCellHeight
 
                     Image {
                         source: modelData.icon
                         sourceSize.height: sectionIconHeight
                         anchors.margins: 5
                         anchors.horizontalCenter: parent.horizontalCenter
                     }
 
                     ParticleSystemStarLoader {
                         id: particles
                         anchors.fill: backgroundSection
                         clip: false
                     }
                     MouseArea {
                         anchors.fill: backgroundSection
                         onClicked: {
                             selectCurrentItem()
                         }
                     }
 
                     function selectCurrentItem() {
                         particles.burst(10)
                         ActivityInfoTree.filterByTag(modelData.tag)
                         ActivityInfoTree.filterLockedActivities()
                         ActivityInfoTree.filterEnabledActivities()
                         menuActivity.currentTag = modelData.tag
                         section.currentIndex = index
                     }
                 }
             }
             delegate: sectionDelegate
             highlight: Item {
                 width: sectionCellWidth
                 height: sectionCellHeight
 
                 Rectangle {
                     anchors.fill: parent
                     color:  "#99FFFFFF"
                 }
                 Image {
                     source: "qrc:/gcompris/src/core/resource/button.svg"
                     anchors.fill: parent
                 }
                 Behavior on x { SpringAnimation { spring: 2; damping: 0.2 } }
                 Behavior on y { SpringAnimation { spring: 2; damping: 0.2 } }
             }
         }
 
         // Activities
         property int iconWidth: 120 * ApplicationInfo.ratio
         property int iconHeight: 120 * ApplicationInfo.ratio
         property int activityCellWidth:
             horizontal ? background.width / Math.floor(background.width / iconWidth) :
                          (background.width - section.width) / Math.floor((background.width - section.width) / iconWidth)
-        property int activityCellHeight: iconHeight * 1.5
+        property int activityCellHeight: iconHeight * 1.7
 
         Loader {
             id: warningOverlay
             anchors {
                 top: horizontal ? section.bottom : parent.top
                 bottom: parent.bottom
                 left: horizontal ? parent.left : section.right
                 right: parent.right
                 margins: 4
             }
             active: (ActivityInfoTree.menuTree.length === 0) && (currentTag === "favorite")
             sourceComponent: Item {
                 anchors.fill: parent
                 GCText {
                     id: instructionTxt
                     fontSize: smallSize
                     y: height * 0.2
                     x: (parent.width - width) / 2
                     z: 2
                     width: parent.width * 0.6
                     horizontalAlignment: Text.AlignHCenter
                     wrapMode: Text.WordWrap
                     font.weight: Font.DemiBold
                     color: 'white'
                     text: qsTr("Put your favorite activities here by selecting the " +
                                "sun on each activity top right.")
                 }
                 Rectangle {
                     anchors.fill: instructionTxt
                     anchors.margins: -6
                     z: 1
                     opacity: 0.5
                     radius: 10
                     border.width: 2
                     border.color: "black"
                     gradient: Gradient {
                         GradientStop { position: 0.0; color: "#000" }
                         GradientStop { position: 0.9; color: "#666" }
                         GradientStop { position: 1.0; color: "#AAA" }
                     }
                 }
             }
         }
 
         GridView {
             id: activitiesGrid
             layer.enabled: true
             anchors {
                 top: horizontal ? section.bottom : parent.top
                 bottom: bar.top
                 left: horizontal ? parent.left : section.right
                 margins: 4
             }
             width: background.width
             cellWidth: activityCellWidth
             cellHeight: activityCellHeight
             clip: true
             model: ActivityInfoTree.menuTree
             keyNavigationWraps: true
             property int spacing: 10
 
             delegate: Item {
                 id: delegateItem
                 width: activityCellWidth - activitiesGrid.spacing
                 height: activityCellHeight - activitiesGrid.spacing
                 Rectangle {
                     id: activityBackground
                     width: activityCellWidth - activitiesGrid.spacing
                     height: activityCellHeight - activitiesGrid.spacing
                     anchors.horizontalCenter: parent.horizontalCenter
                     color: "white"
                     opacity: 0.5
                 }
                 Image {
                     source: "qrc:/gcompris/src/activities/" + icon;
                     anchors.top: activityBackground.top
                     anchors.horizontalCenter: parent.horizontalCenter
                     sourceSize.height: iconHeight
                     anchors.margins: 5
                     Image {
                         source: "qrc:/gcompris/src/core/resource/difficulty" +
                                 ActivityInfoTree.menuTree[index].difficulty + ".svg";
                         anchors.top: parent.top
                         sourceSize.width: iconWidth * 0.15
                         x: 5
                     }
                     Image {
                         anchors {
                             horizontalCenter: parent.horizontalCenter
                             top: parent.top
                             rightMargin: 4
                         }
                         source: demo || !ApplicationSettings.isDemoMode
                                 ? "" :
                                   menuActivity.url + "lock.svg"
                         sourceSize.width: 30 * ApplicationInfo.ratio
                     }
                     Image {
                         anchors {
                             left: parent.left
                             bottom: parent.bottom
                         }
                         source: ActivityInfoTree.menuTree[index].createdInVersion == ApplicationInfo.GCVersionCode
                                 ? menuActivity.url + "new.svg" : ""
                         sourceSize.width: 30 * ApplicationInfo.ratio
                     }
                     GCText {
                         id: title
                         anchors.top: parent.bottom
                         anchors.horizontalCenter: parent.horizontalCenter
                         horizontalAlignment: Text.AlignHCenter
                         width: activityBackground.width
                         fontSizeMode: Text.Fit
                         minimumPointSize: 7
                         fontSize: regularSize
                         elide: Text.ElideRight
                         maximumLineCount: 2
                         wrapMode: Text.WordWrap
                         text: ActivityInfoTree.menuTree[index].title
                     }
                     // If we have enough room at the bottom display the description
                     GCText {
                         id: description
                         visible: delegateItem.height - (title.y + title.height) > description.height ? 1 : 0
                         anchors.top: title.bottom
                         anchors.horizontalCenter: parent.horizontalCenter
                         horizontalAlignment: Text.AlignHCenter
                         width: activityBackground.width
                         fontSizeMode: Text.Fit
                         minimumPointSize: 7
                         fontSize: regularSize
                         elide: Text.ElideRight
                         maximumLineCount: 3
                         wrapMode: Text.WordWrap
                         text: ActivityInfoTree.menuTree[index].description
                     }
                 }
                 ParticleSystemStarLoader {
                     id: particles
                     anchors.fill: activityBackground
                 }
                 MouseArea {
                     anchors.fill: activityBackground
                     onClicked: selectCurrentItem()
                 }
                 Image {
                     source: menuActivity.url + (favorite ? "all.svg" : "all_disabled.svg");
                     anchors {
                         top: parent.top
                         right: parent.right
                         rightMargin: 4 * ApplicationInfo.ratio
                     }
                     sourceSize.width: iconWidth * 0.25
                     visible: ApplicationSettings.sectionVisible
                     MouseArea {
                         anchors.fill: parent
                         onClicked: favorite = !favorite
                     }
                 }
 
                 function selectCurrentItem() {
                     if(pageView.busy)
                         return
                     particles.burst(50)
                     ActivityInfoTree.currentActivity = ActivityInfoTree.menuTree[index]
                     activityLoader.setSource("qrc:/gcompris/src/activities/" + ActivityInfoTree.menuTree[index].name,
                                              {
                                                  'audioVoices': audioVoices,
                                                  'audioEffects': audioEffects,
                                                  'loading': loading,
                                                  'menu': menuActivity,
                                                  'activityInfo': ActivityInfoTree.currentActivity
                                              })
                     if (activityLoader.status == Loader.Ready) loadActivity()
                 }
             }
             highlight: Rectangle {
                 width: activityCellWidth - activitiesGrid.spacing
                 height: activityCellHeight - activitiesGrid.spacing
                 color:  "#AAFFFFFF"
                 border.width: 3
                 border.color: "black"
                 visible: background.keyboardMode
                 Behavior on x { SpringAnimation { spring: 2; damping: 0.2 } }
                 Behavior on y { SpringAnimation { spring: 2; damping: 0.2 } }
             }
        
             Rectangle{
                 id: activitiesMask
                 visible: false
                 anchors.fill: activitiesGrid
                 gradient: Gradient {
                   GradientStop { position: 0.0; color: "#FFFFFFFF" }
                   GradientStop { position: 0.92; color: "#FFFFFFFF" }
                   GradientStop { position: 0.96; color: "#00FFFFFF"}
                 }
             }
        
             layer.effect: OpacityMask {
                 id: activitiesOpacity
                 source: activitiesGrid
                 maskSource: activitiesMask
                 anchors.fill: activitiesGrid
             }
 
         }
 
         Bar {
             id: bar
             // No exit button on mobile, UI Guidelines prohibits it
             content: BarEnumContent {
                 value: help | config | about | (ApplicationInfo.isMobile ? 0 : exit)
             }
             onAboutClicked: {
                 displayDialog(dialogAbout)
             }
 
             onHelpClicked: {
                 displayDialog(dialogHelp)
             }
 
             onConfigClicked: {
                 dialogActivityConfig.active = true
                 dialogActivityConfig.loader.item.loadFromConfig()
                 displayDialog(dialogActivityConfig)
             }
         }
 
     }
 
     DialogAbout {
         id: dialogAbout
         onClose: home()
     }
     DialogHelp {
         id: dialogHelp
         onClose: home()
         activityInfo: ActivityInfoTree.rootMenu
     }
 
     DialogActivityConfig {
         id: dialogActivityConfig
         currentActivity: menuActivity
 
         content: Component {
             ConfigurationItem {
                 id: configItem
                 width: dialogActivityConfig.width - 50 * ApplicationInfo.ratio
             }
         }
 
         onSaveData: {
             dialogActivityConfig.configItem.save();
         }
         onClose: {
             ActivityInfoTree.filterByTag(menuActivity.currentTag)
             ActivityInfoTree.filterLockedActivities()
             ActivityInfoTree.filterEnabledActivities()
             home()
         }
     }
 }