diff --git a/conf/icons.src b/conf/icons.src
new file mode 100644
index 0000000..6ffad8e
--- /dev/null
+++ b/conf/icons.src
@@ -0,0 +1,6 @@
+SOURCE_URL=https://github.com/matomo-org/matomo-icons/archive/e96ef33bf490794829831cbb795fd4ea67259699.tar.gz
+SOURCE_SUM=9a6457d8f138216f911621db7a5af5fbce7214e62d6f184730f216986e498b53
+SOURCE_SUM_PRG=sha256sum
+SOURCE_FORMAT=tar.gz
+SOURCE_IN_SUBDIR=true
+SOURCE_FILENAME=
diff --git a/scripts/install b/scripts/install
index 8391d17..abe70bf 100755
--- a/scripts/install
+++ b/scripts/install
@@ -101,7 +101,8 @@ ynh_script_progression --message="Installing Composer and dependencies..."
 ynh_install_composer --phpversion="$phpversion" --workdir="$final_path"
 
 # Install missing icons
-git clone https://github.com/matomo-org/matomo-icons.git "$final_path/plugins/Morpheus/icons" --quiet
+#git clone https://github.com/matomo-org/matomo-icons.git "$final_path/plugins/Morpheus/icons" --quiet
+ynh_setup_source --dest_dir="$final_path/plugins/Morpheus/icons" --source_id="icons"
 chmod -R 755 "$final_path/plugins/Morpheus"
 
 #=================================================
diff --git a/scripts/upgrade b/scripts/upgrade
index 4672ff4..3b9c37f 100755
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -82,6 +82,11 @@ then
 	ynh_script_progression --message="Upgrading source files..."
 
 	if [[ ! -f "$final_path/config/config.ini.php" ]]; then
+		# config.ini.php is only created during the post-install process...
+		# it is therefore not present when the IC tests are carried out...
+		# This condition is only for CI test to go through the upgrade process
+		ynh_secure_remove --file="$final_path"
+		# Download, check integrity, uncompress and patch the source from app.src
 		ynh_setup_source --dest_dir="$final_path"
 	else
 		# Create a temporary directory
@@ -90,6 +95,9 @@ then
 		# Backup the config file in the temp dir
 		cp -a "$final_path/config/config.ini.php" "$tmpdir/config.ini.php"
 
+		# Remove the app directory securely
+		ynh_secure_remove --file="$final_path"
+
 		# Download, check integrity, uncompress and patch the source from app.src
 		ynh_setup_source --dest_dir="$final_path"
 
@@ -146,7 +154,8 @@ fi
 
 if [ ! "$(ls -A "$final_path/plugins/Morpheus/icons")" ]
 then
-    git clone https://github.com/matomo-org/matomo-icons.git "$final_path/plugins/Morpheus/icons" --quiet
+    #git clone https://github.com/matomo-org/matomo-icons.git "$final_path/plugins/Morpheus/icons" --quiet
+    ynh_setup_source --dest_dir="$final_path/plugins/Morpheus/icons" --source_id="icons"
     chmod -R 755 "$final_path/plugins/Morpheus"
 fi