diff --git a/installer/linux/jstock.sh b/installer/linux/jstock.sh
index 7d830da5d..29c9e61ad 100644
--- a/installer/linux/jstock.sh
+++ b/installer/linux/jstock.sh
@@ -7,23 +7,21 @@
 # line and change the path accordingly.
 #JAVA_HOME=/usr/lib/java
 
-_JAVA_EXEC="java"
 if [ -n $JAVA_HOME ] ; then
-    _TMP="$JAVA_HOME/bin/java"
-    if [ -f "$_TMP" ] ; then
-        if [ -x "$_TMP" ] ; then
-            _JAVA_EXEC="$_TMP"
-        else
-            echo "Warning: $_TMP is not executable"
-        fi
-    else
-        echo "Warning: $_TMP does not exist"
-    fi
+_JAVA_EXEC=`type -p java`
+else
+_JAVA_EXEC="$JAVA_HOME/java"
 fi
-if ! which "$_JAVA_EXEC" >/dev/null ; then
-    echo "Error: No Java Runtime Environment found"
-    echo "Please set the environment variable JAVA_HOME to the root directory of your SUN Java installation, e.g. by editing the 7th line in this launcher script."
-    exit 1
+
+if [ ! -e "$_JAVA_EXEC" ] ; then
+echo "Error: No Java Runtime Environment found"
+echo "Please set the environment variable JAVA_HOME to the root directory of your SUN Java installation, e.g. by editing the 7th line in this launcher script."
+exit 1
+fi
+
+if [ ! -x "$_JAVA_EXEC" ] ; then
+echo "Warning: $_JAVA_EXEC is not executable"
+exit 1
 fi
 
 #
diff --git a/libs/icons/Jstock [ 128x128 ].png b/libs/icons/Jstock [ 128x128 ].png
new file mode 100644
index 000000000..759588849
Binary files /dev/null and b/libs/icons/Jstock [ 128x128 ].png differ
diff --git a/libs/icons/Jstock [ 16x16 ].png b/libs/icons/Jstock [ 16x16 ].png
new file mode 100755
index 000000000..04a426d80
Binary files /dev/null and b/libs/icons/Jstock [ 16x16 ].png differ
diff --git a/libs/icons/Jstock [ 32x32 ].png b/libs/icons/Jstock [ 32x32 ].png
new file mode 100644
index 000000000..eff549444
Binary files /dev/null and b/libs/icons/Jstock [ 32x32 ].png differ
diff --git a/libs/icons/Jstock [ 65x65 ].png b/libs/icons/Jstock [ 65x65 ].png
new file mode 100644
index 000000000..bfac3f999
Binary files /dev/null and b/libs/icons/Jstock [ 65x65 ].png differ
diff --git a/libs/icons/Jstock-splashscreen2.png b/libs/icons/Jstock-splashscreen2.png
new file mode 100755
index 000000000..b3d0e6127
Binary files /dev/null and b/libs/icons/Jstock-splashscreen2.png differ
diff --git a/libs/icons/jstock-splashscreen.png b/libs/icons/jstock-splashscreen.png
new file mode 100755
index 000000000..8be33bbce
Binary files /dev/null and b/libs/icons/jstock-splashscreen.png differ