diff --git a/autotests/qmltests/tst_GridBrowserDelegate.qml b/autotests/qmltests/tst_GridBrowserDelegate.qml
index ec94554b..94961c0d 100644
--- a/autotests/qmltests/tst_GridBrowserDelegate.qml
+++ b/autotests/qmltests/tst_GridBrowserDelegate.qml
@@ -1,315 +1,314 @@
 /*
  * Copyright 2018 Matthieu Gallien <matthieu_gallien@yahoo.fr>
  *
  * This program is free software: you can redistribute it and/or
  * modify it under the terms of the GNU Lesser 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
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
 import QtQuick 2.3
 import QtTest 1.0
 import "../../src/qml"
 
 FocusScope {
     GridBrowserDelegate {
         id: delegateItem
 
         height: 160
         width: 100
 
-        shadowForImage: true
         mainText: "hello"
         secondaryText: "hello secondary"
         databaseId: 1
 
         function i18nc(string1,string2) {
             return string2
         }
 
         Item {
             id: myPalette
 
             property color text
             property color shadow
             property color highlight
         }
 
         Item {
             id: elisaTheme
 
             property int delegateToolButtonSize: 34
             property int layoutVerticalMargin: 6
         }
     }
 
     Item {
         id: otherItem
 
         focus: true
 
         width: 50
         height: 50
         anchors.top: delegateItem.bottom
     }
 
     TestCase {
         name: "TestGridBrowserDelegate"
 
         SignalSpy {
             id: enqueueSpy
             target: delegateItem
             signalName: "enqueue"
         }
 
         SignalSpy {
             id: replaceAndPlaySpy
             target: delegateItem
             signalName: "replaceAndPlay"
         }
 
         SignalSpy {
             id: openSpy
             target: delegateItem
             signalName: "open"
         }
 
         SignalSpy {
             id: selectedSpy
             target: delegateItem
             signalName: "selected"
         }
 
         when: windowShown
 
         function init() {
             otherItem.focus = true
             enqueueSpy.clear();
             replaceAndPlaySpy.clear();
             openSpy.clear();
             selectedSpy.clear();
         }
 
         function test_focus() {
             compare(enqueueSpy.count, 0);
             compare(replaceAndPlaySpy.count, 0);
             compare(openSpy.count, 0);
             compare(selectedSpy.count, 0);
             compare(delegateItem.focus, false, "delegateItem.focus");
 
             delegateItem.forceActiveFocus();
             compare(enqueueSpy.count, 0);
             compare(replaceAndPlaySpy.count, 0);
             compare(openSpy.count, 0);
             compare(selectedSpy.count, 0);
             compare(delegateItem.focus, true, "delegateItem.focus");
 
             var replaceAndPlayButtonItem = findChild(delegateItem, "replaceAndPlayButton");
             var enqueueButtonItem = findChild(delegateItem, "enqueueButton");
             verify(replaceAndPlayButtonItem !== null, "valid replaceAndPlayButton")
             verify(enqueueButtonItem !== null, "valid enqueueButton")
 
             compare(replaceAndPlayButtonItem.focus, false, "enqueueButton.focus");
             compare(enqueueButtonItem.focus, false, "enqueueButton.focus");
 
             keyClick(Qt.Key_Tab)
             compare(enqueueSpy.count, 0)
             compare(replaceAndPlaySpy.count, 0)
             compare(openSpy.count, 0)
             compare(selectedSpy.count, 0)
             compare(delegateItem.focus, true, "delegateItem.focus");
             compare(replaceAndPlayButtonItem.focus, true, "enqueueButton.focus");
             compare(enqueueButtonItem.focus, false, "enqueueButton.focus");
 
             keyClick(Qt.Key_Tab)
             compare(enqueueSpy.count, 0)
             compare(replaceAndPlaySpy.count, 0)
             compare(openSpy.count, 0)
             compare(selectedSpy.count, 0)
             compare(delegateItem.focus, true, "delegateItem.focus");
             compare(replaceAndPlayButtonItem.focus, false, "enqueueButton.focus");
             compare(enqueueButtonItem.focus, true, "enqueueButton.focus");
 
             enqueueButtonItem.focus = false;
             replaceAndPlayButtonItem.focus = false;
             otherItem.focus = true;
             compare(enqueueSpy.count, 0)
             compare(replaceAndPlaySpy.count, 0)
             compare(openSpy.count, 0)
             compare(selectedSpy.count, 0)
             compare(delegateItem.focus, false, "delegateItem.focus");
         }
 
         function test_mouse_clicks() {
             compare(delegateItem.focus, false, "delegateItem.focus");
             compare(enqueueSpy.count, 0);
             compare(replaceAndPlaySpy.count, 0);
             compare(openSpy.count, 0);
             compare(selectedSpy.count, 0);
 
             mouseMove(delegateItem, 0, 0);
             compare(delegateItem.focus, false, "delegateItem.focus");
             compare(enqueueSpy.count, 0);
             compare(replaceAndPlaySpy.count, 0);
             compare(openSpy.count, 0);
             compare(selectedSpy.count, 0);
 
             var replaceAndPlayButtonItem = findChild(delegateItem, "replaceAndPlayButton");
             var enqueueButtonItem = findChild(delegateItem, "enqueueButton");
             verify(replaceAndPlayButtonItem !== null, "valid replaceAndPlayButton")
             verify(enqueueButtonItem !== null, "valid enqueueButton")
             compare(replaceAndPlayButtonItem.focus, false, "enqueueButton.focus");
             compare(enqueueButtonItem.focus, false, "enqueueButton.focus");
 
             mouseClick(delegateItem, 0, 0);
             compare(delegateItem.focus, false, "delegateItem.focus");
             compare(replaceAndPlayButtonItem.focus, false, "enqueueButton.focus");
             compare(enqueueButtonItem.focus, false, "enqueueButton.focus");
             compare(enqueueSpy.count, 0);
             compare(replaceAndPlaySpy.count, 0);
             compare(openSpy.count, 1);
             compare(selectedSpy.count, 0);
 
             mouseMove(enqueueButtonItem);
             mouseClick(enqueueButtonItem);
             compare(delegateItem.focus, true, "delegateItem.focus");
             compare(replaceAndPlayButtonItem.focus, false, "enqueueButton.focus");
             compare(enqueueButtonItem.focus, true, "enqueueButton.focus");
             compare(enqueueSpy.count, 1);
             compare(replaceAndPlaySpy.count, 0);
             compare(openSpy.count, 1);
             compare(selectedSpy.count, 0);
 
             mouseMove(replaceAndPlayButtonItem);
             mouseClick(replaceAndPlayButtonItem);
             compare(delegateItem.focus, true, "delegateItem.focus");
             compare(replaceAndPlayButtonItem.focus, true, "enqueueButton.focus");
             compare(enqueueButtonItem.focus, false, "enqueueButton.focus");
             compare(enqueueSpy.count, 1);
             compare(replaceAndPlaySpy.count, 1);
             compare(openSpy.count, 1);
             compare(selectedSpy.count, 0);
 
             mouseMove(otherItem, 0, 0);
             compare(delegateItem.focus, true, "delegateItem.focus");
             compare(replaceAndPlayButtonItem.focus, true, "enqueueButton.focus");
             compare(enqueueButtonItem.focus, false, "enqueueButton.focus");
             compare(enqueueSpy.count, 1);
             compare(replaceAndPlaySpy.count, 1);
             compare(openSpy.count, 1);
             compare(selectedSpy.count, 0);
 
             mouseClick(delegateItem, 0, 0);
             openSpy.wait(150);
             compare(delegateItem.focus, true, "delegateItem.focus");
             compare(replaceAndPlayButtonItem.focus, true, "enqueueButton.focus");
             compare(enqueueButtonItem.focus, false, "enqueueButton.focus");
             compare(enqueueSpy.count, 1);
             compare(replaceAndPlaySpy.count, 1);
             compare(openSpy.count, 2);
             compare(selectedSpy.count, 0);
 
             enqueueButtonItem.focus = false;
             replaceAndPlayButtonItem.focus = false;
             otherItem.focus = true;
         }
 
         function test_keyboard() {
             compare(enqueueSpy.count, 0);
             compare(replaceAndPlaySpy.count, 0);
             compare(openSpy.count, 0);
             compare(selectedSpy.count, 0);
             compare(delegateItem.focus, false, "delegateItem.focus");
 
             delegateItem.forceActiveFocus();
             compare(enqueueSpy.count, 0);
             compare(replaceAndPlaySpy.count, 0);
             compare(openSpy.count, 0);
             compare(selectedSpy.count, 0);
             compare(delegateItem.focus, true, "delegateItem.focus");
 
             var replaceAndPlayButtonItem = findChild(delegateItem, "replaceAndPlayButton");
             var enqueueButtonItem = findChild(delegateItem, "enqueueButton");
             verify(replaceAndPlayButtonItem !== null, "valid replaceAndPlayButton")
             verify(enqueueButtonItem !== null, "valid enqueueButton")
 
             compare(replaceAndPlayButtonItem.focus, false, "enqueueButton.focus");
             compare(enqueueButtonItem.focus, false, "enqueueButton.focus");
 
             keyClick(Qt.Key_Tab);
             compare(replaceAndPlaySpy.count, 0);
             compare(enqueueSpy.count, 0);
             compare(openSpy.count, 0);
             compare(selectedSpy.count, 0);
             compare(delegateItem.focus, true, "delegateItem.focus");
             compare(replaceAndPlayButtonItem.focus, true, "enqueueButton.focus");
             compare(enqueueButtonItem.focus, false, "enqueueButton.focus");
 
             keyClick(Qt.Key_Enter);
             compare(replaceAndPlaySpy.count, 1);
             compare(enqueueSpy.count, 0);
             compare(openSpy.count, 0);
             compare(selectedSpy.count, 0);
             compare(delegateItem.focus, true, "delegateItem.focus");
             compare(replaceAndPlayButtonItem.focus, true, "enqueueButton.focus");
             compare(enqueueButtonItem.focus, false, "enqueueButton.focus");
 
             keyClick(Qt.Key_Return);
             compare(replaceAndPlaySpy.count, 2);
             compare(enqueueSpy.count, 0);
             compare(openSpy.count, 0);
             compare(selectedSpy.count, 0);
             compare(delegateItem.focus, true, "delegateItem.focus");
             compare(replaceAndPlayButtonItem.focus, true, "enqueueButton.focus");
             compare(enqueueButtonItem.focus, false, "enqueueButton.focus");
 
             keyClick(Qt.Key_Tab);
             compare(replaceAndPlaySpy.count, 2);
             compare(enqueueSpy.count, 0);
             compare(openSpy.count, 0);
             compare(selectedSpy.count, 0);
             compare(delegateItem.focus, true, "delegateItem.focus");
             compare(replaceAndPlayButtonItem.focus, false, "enqueueButton.focus");
             compare(enqueueButtonItem.focus, true, "enqueueButton.focus");
 
             keyClick(Qt.Key_Enter);
             compare(replaceAndPlaySpy.count, 2);
             compare(enqueueSpy.count, 1);
             compare(openSpy.count, 0);
             compare(selectedSpy.count, 0);
             compare(delegateItem.focus, true, "delegateItem.focus");
             compare(replaceAndPlayButtonItem.focus, false, "enqueueButton.focus");
             compare(enqueueButtonItem.focus, true, "enqueueButton.focus");
 
             keyClick(Qt.Key_Return);
             compare(replaceAndPlaySpy.count, 2);
             compare(enqueueSpy.count, 2);
             compare(openSpy.count, 0);
             compare(selectedSpy.count, 0);
             compare(delegateItem.focus, true, "delegateItem.focus");
             compare(replaceAndPlayButtonItem.focus, false, "enqueueButton.focus");
             compare(enqueueButtonItem.focus, true, "enqueueButton.focus");
 
             keyClick(Qt.Key_Tab);
             compare(replaceAndPlaySpy.count, 2);
             compare(enqueueSpy.count, 2);
             compare(openSpy.count, 0);
             compare(selectedSpy.count, 0);
             compare(delegateItem.focus, true, "delegateItem.focus");
             compare(replaceAndPlayButtonItem.focus, true, "enqueueButton.focus");
             compare(enqueueButtonItem.focus, false, "enqueueButton.focus");
 
             enqueueButtonItem.focus = false;
             replaceAndPlayButtonItem.focus = false;
             otherItem.focus = true;
         }
     }
 }