icons 2.0

git-svn-id: https://joinup.ec.europa.eu/svn/mocca/trunk@465 8a26b1a7-26f0-462f-b9ef-d0e30c41f5a4

29 files changed, 66 insertions, 311 deletions

diff --git a/BKUWebStart/src/main/java/at/gv/egiz/bku/webstart/Launcher.java b/BKUWebStart/src/main/java/at/gv/egiz/bku/webstart/Launcher.java
index d216fdc4..0cfc14e5 100644
--- a/BKUWebStart/src/main/java/at/gv/egiz/bku/webstart/Launcher.java
+++ b/BKUWebStart/src/main/java/at/gv/egiz/bku/webstart/Launcher.java
@@ -42,8 +42,9 @@ public class Launcher implements BKUControllerInterface, ActionListener {
   public static final String WEBAPP_RESOURCE = "BKULocal.war";

   public static final String CERTIFICATES_RESOURCE = "BKUCertificates.jar";

   public static final String WEBAPP_FILE = "BKULocal.war";

+  /** no leading slash for messages, but for image */

   public static final String MESSAGES_RESOURCE = "at/gv/egiz/bku/webstart/messages";

-  public static final String TRAYICON_RESOURCE = "at/gv/egiz/bku/webstart/logo_";

+  public static final String TRAYICON_RESOURCE = "/at/gv/egiz/bku/webstart/chip";

   /** resource bundle messages */

   public static final String CAPTION_DEFAULT = "tray.caption.default";

   public static final String CAPTION_ERROR = "tray.caption.error";

@@ -177,10 +178,12 @@ public class Launcher implements BKUControllerInterface, ActionListener {
           iconResource = TRAYICON_RESOURCE + "16.png";

         } else if (tray.getTrayIconSize().height < 25) {

           iconResource = TRAYICON_RESOURCE + "24.png";

-        } else {

+        } else if (tray.getTrayIconSize().height < 33) {

           iconResource = TRAYICON_RESOURCE + "32.png";

+        } else {

+          iconResource = TRAYICON_RESOURCE + "48.png";

         }

-        Image image = ImageIO.read(Launcher.class.getClassLoader().getResourceAsStream(iconResource));

+        Image image = ImageIO.read(getClass().getResourceAsStream(iconResource));

 

         PopupMenu popup = new PopupMenu();

         

@@ -347,6 +350,7 @@ public class Launcher implements BKUControllerInterface, ActionListener {
       Launcher launcher = new Launcher();

       launcher.launch();

     } catch (Exception ex) {

+      log.debug(ex);

       log.info("waiting to shutdown...");

       Thread.sleep(5000);

       log.info("exit");

diff --git a/BKUWebStart/src/main/java/at/gv/egiz/bku/webstart/gui/AboutDialog.form b/BKUWebStart/src/main/java/at/gv/egiz/bku/webstart/gui/AboutDialog.form
index c1cfdab7..548893a7 100644
--- a/BKUWebStart/src/main/java/at/gv/egiz/bku/webstart/gui/AboutDialog.form
+++ b/BKUWebStart/src/main/java/at/gv/egiz/bku/webstart/gui/AboutDialog.form
@@ -40,7 +40,7 @@
           <Group type="102" alignment="0" attributes="0">
               <EmptySpace max="-2" attributes="0"/>
               <Component id="jPanel1" min="-2" max="-2" attributes="0"/>
-              <EmptySpace pref="12" max="32767" attributes="0"/>
+              <EmptySpace max="32767" attributes="0"/>
               <Component id="jPanel3" min="-2" max="-2" attributes="0"/>
               <EmptySpace max="-2" attributes="0"/>
           </Group>
@@ -80,7 +80,7 @@
         <Component class="javax.swing.JLabel" name="jLabel1">
           <Properties>
             <Property name="icon" type="javax.swing.Icon" editor="org.netbeans.modules.form.editors2.IconEditor">
-              <Image iconType="3" name="/at/gv/egiz/bku/webstart/logo_notext.png"/>
+              <Image iconType="3" name="/at/gv/egiz/bku/webstart/chiperling96.png"/>
             </Property>
           </Properties>
         </Component>
@@ -106,7 +106,7 @@
         <DimensionLayout dim="0">
           <Group type="103" groupAlignment="0" attributes="0">
               <Group type="102" alignment="1" attributes="0">
-                  <EmptySpace pref="157" max="32767" attributes="0"/>
+                  <EmptySpace pref="163" max="32767" attributes="0"/>
                   <Component id="jButton1" min="-2" max="-2" attributes="0"/>
                   <EmptySpace max="-2" attributes="0"/>
               </Group>
diff --git a/BKUWebStart/src/main/java/at/gv/egiz/bku/webstart/gui/AboutDialog.java b/BKUWebStart/src/main/java/at/gv/egiz/bku/webstart/gui/AboutDialog.java
index efa80bd6..1e35af58 100644
--- a/BKUWebStart/src/main/java/at/gv/egiz/bku/webstart/gui/AboutDialog.java
+++ b/BKUWebStart/src/main/java/at/gv/egiz/bku/webstart/gui/AboutDialog.java
@@ -48,7 +48,7 @@ public class AboutDialog extends javax.swing.JDialog {
     java.util.ResourceBundle bundle = java.util.ResourceBundle.getBundle("at/gv/egiz/bku/webstart/messages"); // NOI18N
     setTitle(bundle.getString("about.frame.title")); // NOI18N
 
-    jLabel1.setIcon(new javax.swing.ImageIcon(getClass().getResource("/at/gv/egiz/bku/webstart/logo_notext.png"))); // NOI18N
+    jLabel1.setIcon(new javax.swing.ImageIcon(getClass().getResource("/at/gv/egiz/bku/webstart/chiperling96.png"))); // NOI18N
 
     jLabel2.setText(getVersionText(bundle));
 
@@ -88,7 +88,7 @@ public class AboutDialog extends javax.swing.JDialog {
     jPanel3Layout.setHorizontalGroup(
       jPanel3Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
       .addGroup(javax.swing.GroupLayout.Alignment.TRAILING, jPanel3Layout.createSequentialGroup()
-        .addContainerGap(157, Short.MAX_VALUE)
+        .addContainerGap(163, Short.MAX_VALUE)
         .addComponent(jButton1)
         .addContainerGap())
     );
@@ -116,7 +116,7 @@ public class AboutDialog extends javax.swing.JDialog {
       .addGroup(layout.createSequentialGroup()
         .addContainerGap()
         .addComponent(jPanel1, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
-        .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED, 12, Short.MAX_VALUE)
+        .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
         .addComponent(jPanel3, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
         .addContainerGap())
     );
diff --git a/BKUWebStart/src/main/jnlp/resources/img/chip128.png b/BKUWebStart/src/main/jnlp/resources/img/chip128.png
new file mode 100644
index 00000000..c36d8079
--- /dev/null
+++ b/BKUWebStart/src/main/jnlp/resources/img/chip128.png
diff --git a/BKUWebStart/src/main/jnlp/resources/img/chip16.png b/BKUWebStart/src/main/jnlp/resources/img/chip16.png
new file mode 100644
index 00000000..96b580e9
--- /dev/null
+++ b/BKUWebStart/src/main/jnlp/resources/img/chip16.png
diff --git a/BKUWebStart/src/main/jnlp/resources/img/chip24.png b/BKUWebStart/src/main/jnlp/resources/img/chip24.png
new file mode 100644
index 00000000..efd6dbeb
--- /dev/null
+++ b/BKUWebStart/src/main/jnlp/resources/img/chip24.png
diff --git a/BKUWebStart/src/main/jnlp/resources/img/chip32.png b/BKUWebStart/src/main/jnlp/resources/img/chip32.png
new file mode 100644
index 00000000..e7efb020
--- /dev/null
+++ b/BKUWebStart/src/main/jnlp/resources/img/chip32.png
diff --git a/BKUWebStart/src/main/jnlp/resources/img/chip48.png b/BKUWebStart/src/main/jnlp/resources/img/chip48.png
new file mode 100644
index 00000000..491fbcac
--- /dev/null
+++ b/BKUWebStart/src/main/jnlp/resources/img/chip48.png
diff --git a/BKUWebStart/src/main/jnlp/resources/img/logo_16.ico b/BKUWebStart/src/main/jnlp/resources/img/logo_16.ico
deleted file mode 100644
index eaedb0ad..00000000
--- a/BKUWebStart/src/main/jnlp/resources/img/logo_16.ico
+++ /dev/null
diff --git a/BKUWebStart/src/main/jnlp/resources/img/logo_16.png b/BKUWebStart/src/main/jnlp/resources/img/logo_16.png
deleted file mode 100644
index f84f108d..00000000
--- a/BKUWebStart/src/main/jnlp/resources/img/logo_16.png
+++ /dev/null
diff --git a/BKUWebStart/src/main/jnlp/resources/img/logo_16.xpm b/BKUWebStart/src/main/jnlp/resources/img/logo_16.xpm
deleted file mode 100644
index de557170..00000000
--- a/BKUWebStart/src/main/jnlp/resources/img/logo_16.xpm
+++ /dev/null
@@ -1,274 +0,0 @@
-/* XPM */
-static char * logo_16x16_xpm[] = {
-"16 16 255 2",
-"  	c #EDF2FA",
-". 	c #555249",
-"+ 	c #F3F6FC",
-"@ 	c #ED1C24",
-"# 	c #939698",
-"$ 	c #FFE699",
-"% 	c #BBAA76",
-"& 	c #464749",
-"* 	c #CCCCCC",
-"= 	c #EE262D",
-"- 	c #FCDADC",
-"; 	c #6B6E72",
-"> 	c #FDE4E5",
-", 	c #D0D6DE",
-"' 	c #968C78",
-") 	c #848182",
-"! 	c #535458",
-"~ 	c #76797E",
-"{ 	c #EE2C33",
-"] 	c #444444",
-"^ 	c #80848A",
-"/ 	c #5A636E",
-"( 	c #738974",
-"_ 	c #ACAEB1",
-": 	c #929F98",
-"< 	c #47443F",
-"[ 	c #363436",
-"} 	c #E4ECF7",
-"| 	c #5D5E61",
-"1 	c #F14C53",
-"2 	c #A2A3A5",
-"3 	c #EF333A",
-"4 	c #515052",
-"5 	c #5C685E",
-"6 	c #FDEAEB",
-"7 	c #7A7B7D",
-"8 	c #9FA1A4",
-"9 	c #FBFCFE",
-"0 	c #4B514D",
-"a 	c #888A8C",
-"b 	c #777777",
-"c 	c #525355",
-"d 	c #E7EEF8",
-"e 	c #A4A9AF",
-"f 	c #F04148",
-"g 	c #FFF4D7",
-"h 	c #616365",
-"i 	c #231F20",
-"j 	c #D4DDE9",
-"k 	c #918F8F",
-"l 	c #8A8E95",
-"m 	c #F1CA3F",
-"n 	c #B5BBC5",
-"o 	c #F1F1F1",
-"p 	c #9FA5AD",
-"q 	c #363432",
-"r 	c #888888",
-"s 	c #FFFFFF",
-"t 	c #7D745A",
-"u 	c #94875D",
-"v 	c #999999",
-"w 	c #5F6165",
-"x 	c #635E51",
-"y 	c #C8C7C7",
-"z 	c #CAD1DD",
-"A 	c #5A5758",
-"B 	c #C0C7D1",
-"C 	c #9399A1",
-"D 	c #E4C14B",
-"E 	c #AE9B5E",
-"F 	c #BAB9B9",
-"G 	c #C9AE59",
-"H 	c #767374",
-"I 	c #D6D5D5",
-"J 	c #DDDDDD",
-"K 	c #666666",
-"L 	c #E3E3E3",
-"M 	c #ACABAB",
-"N 	c #222222",
-"O 	c #9E9D9D",
-"P 	c #333333",
-"Q 	c #EEEEEE",
-"R 	c #BBA55C",
-"S 	c #BBBBBB",
-"T 	c #706A56",
-"U 	c #3F3B3C",
-"V 	c #A1915E",
-"W 	c #686566",
-"X 	c #AAB0B9",
-"Y 	c #111111",
-"Z 	c #444344",
-"` 	c #897E5C",
-" .	c #4C494A",
-"..	c #669DCD",
-"+.	c #C6C8CA",
-"@.	c #555556",
-"#.	c #312D2E",
-"$.	c #5F6A78",
-"%.	c #6C95BC",
-"&.	c #D6B853",
-"*.	c #525962",
-"=.	c #636467",
-"-.	c #6C8AAA",
-";.	c #E1E2E3",
-">.	c #DE9E56",
-",.	c #70B76A",
-"'.	c #6C90B3",
-").	c #AB875E",
-"!.	c #F2575D",
-"~.	c #B9BBBD",
-"{.	c #FFF1CC",
-"].	c #424347",
-"^.	c #4A4E55",
-"/.	c #637183",
-"(.	c #ED2028",
-"_.	c #65778C",
-":.	c #688268",
-"<.	c #7C7F81",
-"[.	c #706355",
-"}.	c #B88E5F",
-"|.	c #C5945D",
-"1.	c #565E58",
-"2.	c #D9ECD4",
-"3.	c #72A26F",
-"4.	c #72AA6E",
-"5.	c #FBB161",
-"6.	c #AAAAAA",
-"7.	c #937A5D",
-"8.	c #6B84A0",
-"9.	c #FFEDB5",
-"0.	c #F1CE5D",
-"a.	c #FFDBB4",
-"b.	c #697E96",
-"c.	c #EAA151",
-"d.	c #92CD8B",
-"e.	c #77C371",
-"f.	c #7C6C59",
-"g.	c #719B6E",
-"h.	c #FCBB75",
-"i.	c #FFD742",
-"j.	c #606162",
-"k.	c #6C6C6E",
-"l.	c #E2E3E4",
-"m.	c #6999C5",
-"n.	c #D4D5D7",
-"o.	c #F7F9FD",
-"p.	c #635950",
-"q.	c #F0F0F1",
-"r.	c #FDE3E4",
-"s.	c #706F6D",
-"t.	c #FFDD6F",
-"u.	c #787E88",
-"v.	c #D6BC69",
-"w.	c #EEEFF0",
-"x.	c #63615A",
-"y.	c #89C982",
-"z.	c #AEA58E",
-"A.	c #F3F9F1",
-"B.	c #4D5056",
-"C.	c #6E926C",
-"D.	c #6C8A6A",
-"E.	c #E4C564",
-"F.	c #77A0C8",
-"G.	c #898169",
-"H.	c #FFF7EE",
-"I.	c #333336",
-"J.	c #727878",
-"K.	c #AE9D66",
-"L.	c #607160",
-"M.	c #6B756F",
-"N.	c #71B16C",
-"O.	c #948A6C",
-"P.	c #7DC479",
-"Q.	c #D6BA5E",
-"R.	c #E1F0DE",
-"S.	c #ADD8A4",
-"T.	c #6E737C",
-"U.	c #9E8262",
-"V.	c #535D54",
-"W.	c #7D7766",
-"X.	c #A1A6AD",
-"Y.	c #D3D4D7",
-"Z.	c #ADAAA6",
-"`.	c #B7B9BC",
-" +	c #C39765",
-".+	c #F25E64",
-"++	c #F36268",
-"@+	c #769C74",
-"#+	c #B69166",
-"$+	c #F9FBFD",
-"%+	c #FFFBFB",
-"&+	c #FFE07C",
-"*+	c #646B68",
-"=+	c #6D6965",
-"-+	c #738498",
-";+	c #C8BEA3",
-">+	c #C1C4C9",
-",+	c #A19984",
-"'+	c #E4C979",
-")+	c #F1D375",
-"!+	c #80C679",
-"~+	c #B3B6BC",
-"{+	c #8D9096",
-"]+	c #9FA8A1",
-"^+	c #CFD9CE",
-"/+	c #FED5A9",
-"(+	c #D5D9E0",
-"_+	c #8D877F",
-":+	c #697B6A",
-"<+	c #FFFBF0",
-"[+	c #E3D4AC",
-"}+	c #F1CC4F",
-"|+	c #FFD954",
-"1+	c #C8E4C0",
-"2+	c #BEE0B7",
-"3+	c #D6BE73",
-"4+	c #857869",
-"5+	c #E5E1DC",
-"6+	c #85A7CB",
-"7+	c #C9B26C",
-"8+	c #D4C6B5",
-"9+	c #C9B67E",
-"0+	c #FFE5CA",
-"a+	c #FCB66B",
-"b+	c #E4E4E5",
-"c+	c #E3E4E5",
-"d+	c #E8EBEF",
-"e+	c #EBEDF0",
-"f+	c #87898C",
-"g+	c #B19E7E",
-"h+	c #B5C2BF",
-"i+	c #FDC180",
-"j+	c #EE2930",
-"k+	c #E4E8EE",
-"l+	c #565552",
-"m+	c #E4CE8D",
-"n+	c #636C79",
-"o+	c #A3D49B",
-"p+	c #858B94",
-"q+	c #84868C",
-"r+	c #F1D069",
-"s+	c #D2995A",
-"t+	c #B8BEC6",
-"u+	c #EF3B42",
-"v+	c #474444",
-"w+	c #E1E5EC",
-"x+	c #FDFEFE",
-"y+	c #FFF7E3",
-"z+	c #62A1D7",
-"A+	c #6DC067",
-"B+	c #FAA74A",
-"C+	c #FFD531",
-"D+	c #E0EAF7",
-"E+	c #000000",
-"F+	c #FFFFFF",
-"  9 _ & < K.i.u i T R C+G x C+C+",
-"+.& < E C+R . q q u C+C+T G C+C+",
-"i t m m T q u m m x . m . C+C+C+",
-"t D t q ` m C+C+C+C+t . < G E t ",
-"x . E m C+C+C+C+C+C+C+. T u E m ",
-"i m C+C+C+C+C+C+C+C+m T t C+C+C+",
-"< V C+C+C+C+C+m D ` q x &.C+C+C+",
-"G < C+C+C+E < . i x G C+C+C+C+C+",
-"C+x V E < x E &.i G C+C+C+C+C+C+",
-"}+` i ` D C+C+C+x x C+C+C+C+C+C+",
-". R t E C+C+C+C+G i G C+C+C+C+C+",
-"l+i.m x C+C+C+C+C+< x C+C+C+C+C+",
-"i 7+C+u G C+C+E < q i G C+C+C+C+",
-"i x.C+C+t E < x R C+< t C+C+C+C+",
-"& i '+G x x D C+C+C+E i D C+C+C+",
-"_ i [ V m u C+C+C+C+D i T m u < "};
diff --git a/BKUWebStart/src/main/jnlp/resources/img/logo_24.png b/BKUWebStart/src/main/jnlp/resources/img/logo_24.png
deleted file mode 100644
index a9074f01..00000000
--- a/BKUWebStart/src/main/jnlp/resources/img/logo_24.png
+++ /dev/null
diff --git a/BKUWebStart/src/main/jnlp/resources/img/logo_32.png b/BKUWebStart/src/main/jnlp/resources/img/logo_32.png
deleted file mode 100644
index 337b144b..00000000
--- a/BKUWebStart/src/main/jnlp/resources/img/logo_32.png
+++ /dev/null
diff --git a/BKUWebStart/src/main/jnlp/resources/img/logo_64.gif b/BKUWebStart/src/main/jnlp/resources/img/logo_64.gif
deleted file mode 100644
index 6081d1a1..00000000
--- a/BKUWebStart/src/main/jnlp/resources/img/logo_64.gif
+++ /dev/null
diff --git a/BKUWebStart/src/main/jnlp/resources/img/logo_64.jpeg b/BKUWebStart/src/main/jnlp/resources/img/logo_64.jpeg
deleted file mode 100644
index 720157a5..00000000
--- a/BKUWebStart/src/main/jnlp/resources/img/logo_64.jpeg
+++ /dev/null
diff --git a/BKUWebStart/src/main/jnlp/resources/img/logo_64.png b/BKUWebStart/src/main/jnlp/resources/img/logo_64.png
deleted file mode 100644
index 9e9b377c..00000000
--- a/BKUWebStart/src/main/jnlp/resources/img/logo_64.png
+++ /dev/null
diff --git a/BKUWebStart/src/main/jnlp/resources/img/version.xml b/BKUWebStart/src/main/jnlp/resources/img/version.xml
index 1ba3ecda..826b58f6 100644
--- a/BKUWebStart/src/main/jnlp/resources/img/version.xml
+++ b/BKUWebStart/src/main/jnlp/resources/img/version.xml
@@ -2,28 +2,49 @@
 <jnlp-versions>
   <resource>
     <pattern>
-      <name>logo_24</name>
-      <version-id>1.0</version-id>
+      <name>logo16.png</name>
+      <version-id>2.0</version-id>
+    </pattern>
+    <file>logo16.png</file>
+  </resource>
+  <resource>
+    <pattern>
+      <name>logo24.png</name>
+      <version-id>2.0</version-id>
+    </pattern>
+    <file>logo24.png</file>
+  </resource>
+  <resource>
+    <pattern>
+      <name>logo32.png</name>
+      <version-id>2.0</version-id>
     </pattern>
-    <file>logo_24.png</file>
+    <file>logo32.png</file>
   </resource>
   <resource>
     <pattern>
-      <name>logo_32</name>
-      <version-id>1.0</version-id>
+      <name>logo48.png</name>
+      <version-id>2.0</version-id>
     </pattern>
-    <file>logo_32.png</file>
+    <file>logo48.png</file>
   </resource>
   <resource>
     <pattern>
-      <name>logo_64</name>
-      <version-id>1.0</version-id>
+      <name>logo64.png</name>
+      <version-id>2.0</version-id>
+    </pattern>
+    <file>logo64.png</file>
+  </resource>
+  <resource>
+    <pattern>
+      <name>logo128.png</name>
+      <version-id>2.0</version-id>
     </pattern>
-    <file>logo_64.png</file>
+    <file>logo128.png</file>
   </resource>
   <resource>
     <pattern>
-      <name>splash</name>
+      <name>splash.png</name>
       <version-id>2.0</version-id>
     </pattern>
     <file>splash.png</file>
diff --git a/BKUWebStart/src/main/jnlp/resources/version.xml b/BKUWebStart/src/main/jnlp/resources/version.xml
index c1546b44..e5f1d71c 100644
--- a/BKUWebStart/src/main/jnlp/resources/version.xml
+++ b/BKUWebStart/src/main/jnlp/resources/version.xml
@@ -2,17 +2,17 @@
 <jnlp-versions>
   <resource>
     <pattern>
-      <name>BKUWebStart-1.2.2.jar</name>
-      <version-id>1.2.2</version-id>
+      <name>BKUWebStart-1.2.3-SNAPSHOT.jar</name>
+      <version-id>1.2.3-SNAPSHOT</version-id>
     </pattern>
-    <file>BKUWebStart-1.2.2</file>
+    <file>BKUWebStart-1.2.3-SNAPSHOT.jar</file>
   </resource>
   <resource>
     <pattern>
-      <name>utils-1.2.2.jar</name>
-      <version-id>1.2.2</version-id>
+      <name>utils-1.2.3-SNAPSHOT.jar</name>
+      <version-id>1.2.3-SNAPSHOT</version-id>
     </pattern>
-    <file>utils-1.2.2.jar</file>
+    <file>utils-1.2.3-SNAPSHOT.jar</file>
   </resource>
   <resource>
     <pattern>
diff --git a/BKUWebStart/src/main/jnlp/template-local.xml b/BKUWebStart/src/main/jnlp/template-local.xml
index 80447c89..ab987cae 100644
--- a/BKUWebStart/src/main/jnlp/template-local.xml
+++ b/BKUWebStart/src/main/jnlp/template-local.xml
@@ -9,12 +9,14 @@
     <homepage href="$project.Url"/>
     <description>$project.Description (BKU) MOCCA Web Start</description>
     <description kind="short">$project.Description</description>
-    <!--icon kind="shortcut" href="img/logo_16.ico" width="16" height="16" version="1.0-SNAPSHOT"/-->
-    <icon kind="shortcut" href="img/logo_24.png" width="24" height="24"/>
-    <icon kind="shortcut" href="img/logo_32.png" width="32" height="32"/>
-    <icon kind="default" href="img/logo_24.png" width="24" height="24"/>
-    <icon kind="default" href="img/logo_32.png" width="32" height="32"/>
-    <icon kind="default" href="img/logo_64.png" width="64" height="64"/>
+    <icon kind="shortcut" href="img/logo16.png" width="16" height="16"/>
+    <icon kind="shortcut" href="img/logo24.png" width="24" height="24"/>
+    <icon kind="shortcut" href="img/logo32.png" width="32" height="32"/>
+    <icon kind="shortcut" href="img/logo48.png" width="48" height="48"/>
+    <icon kind="default" href="img/logo16.png" width="16" height="16"/>
+    <icon kind="default" href="img/logo24.png" width="24" height="24"/>
+    <icon kind="default" href="img/logo32.png" width="32" height="32"/>
+    <icon kind="default" href="img/logo48.png" width="48" height="48"/>
     <icon kind="splash" href="img/splash.png"/>
     <shortcut online="false">
       <desktop/>
diff --git a/BKUWebStart/src/main/jnlp/template.xml b/BKUWebStart/src/main/jnlp/template.xml
index 5d9db869..23d9379a 100644
--- a/BKUWebStart/src/main/jnlp/template.xml
+++ b/BKUWebStart/src/main/jnlp/template.xml
@@ -9,12 +9,14 @@
     <homepage href="$project.Url"/>
     <description>$project.Description (BKU) MOCCA Web Start</description>
     <description kind="short">$project.Description</description>
-    <!--icon kind="shortcut" href="img/logo_16.ico" width="16" height="16" version="1.0-SNAPSHOT"/-->
-    <icon kind="shortcut" href="img/logo_24.png" width="24" height="24" version="1.0"/>
-    <icon kind="shortcut" href="img/logo_32.png" width="32" height="32" version="1.0"/>
-    <icon kind="default" href="img/logo_24.png" width="24" height="24" version="1.0"/>
-    <icon kind="default" href="img/logo_32.png" width="32" height="32" version="1.0"/>
-    <icon kind="default" href="img/logo_64.png" width="64" height="64" version="1.0"/>
+    <icon kind="shortcut" href="img/logo16.png" width="16" height="16" version="2.0"/>
+    <icon kind="shortcut" href="img/logo24.png" width="24" height="24" version="2.0"/>
+    <icon kind="shortcut" href="img/logo32.png" width="32" height="32" version="2.0"/>
+    <icon kind="shortcut" href="img/logo48.png" width="48" height="48" version="2.0"/>
+    <icon kind="default" href="img/logo16.png" width="16" height="16" version="2.0"/>
+    <icon kind="default" href="img/logo24.png" width="24" height="24" version="2.0"/>
+    <icon kind="default" href="img/logo32.png" width="32" height="32" version="2.0"/>
+    <icon kind="default" href="img/logo48.png" width="48" height="48" version="2.0"/>
     <icon kind="splash" href="img/splash.png" version="2.0"/>
     <shortcut online="false">
       <desktop/>
diff --git a/BKUWebStart/src/main/resources/at/gv/egiz/bku/webstart/chip16.png b/BKUWebStart/src/main/resources/at/gv/egiz/bku/webstart/chip16.png
new file mode 100644
index 00000000..96b580e9
--- /dev/null
+++ b/BKUWebStart/src/main/resources/at/gv/egiz/bku/webstart/chip16.png
diff --git a/BKUWebStart/src/main/resources/at/gv/egiz/bku/webstart/chip24.png b/BKUWebStart/src/main/resources/at/gv/egiz/bku/webstart/chip24.png
new file mode 100644
index 00000000..efd6dbeb
--- /dev/null
+++ b/BKUWebStart/src/main/resources/at/gv/egiz/bku/webstart/chip24.png
diff --git a/BKUWebStart/src/main/resources/at/gv/egiz/bku/webstart/chip32.png b/BKUWebStart/src/main/resources/at/gv/egiz/bku/webstart/chip32.png
new file mode 100644
index 00000000..e7efb020
--- /dev/null
+++ b/BKUWebStart/src/main/resources/at/gv/egiz/bku/webstart/chip32.png
diff --git a/BKUWebStart/src/main/resources/at/gv/egiz/bku/webstart/chip48.png b/BKUWebStart/src/main/resources/at/gv/egiz/bku/webstart/chip48.png
new file mode 100644
index 00000000..491fbcac
--- /dev/null
+++ b/BKUWebStart/src/main/resources/at/gv/egiz/bku/webstart/chip48.png
diff --git a/BKUWebStart/src/main/resources/at/gv/egiz/bku/webstart/chiperling96.png b/BKUWebStart/src/main/resources/at/gv/egiz/bku/webstart/chiperling96.png
new file mode 100644
index 00000000..477d4fb5
--- /dev/null
+++ b/BKUWebStart/src/main/resources/at/gv/egiz/bku/webstart/chiperling96.png
diff --git a/BKUWebStart/src/main/resources/at/gv/egiz/bku/webstart/logo_16.png b/BKUWebStart/src/main/resources/at/gv/egiz/bku/webstart/logo_16.png
deleted file mode 100644
index f84f108d..00000000
--- a/BKUWebStart/src/main/resources/at/gv/egiz/bku/webstart/logo_16.png
+++ /dev/null
diff --git a/BKUWebStart/src/main/resources/at/gv/egiz/bku/webstart/logo_24.png b/BKUWebStart/src/main/resources/at/gv/egiz/bku/webstart/logo_24.png
deleted file mode 100644
index a9074f01..00000000
--- a/BKUWebStart/src/main/resources/at/gv/egiz/bku/webstart/logo_24.png
+++ /dev/null
diff --git a/BKUWebStart/src/main/resources/at/gv/egiz/bku/webstart/logo_32.png b/BKUWebStart/src/main/resources/at/gv/egiz/bku/webstart/logo_32.png
deleted file mode 100644
index 3c77d179..00000000
--- a/BKUWebStart/src/main/resources/at/gv/egiz/bku/webstart/logo_32.png
+++ /dev/null
diff --git a/BKUWebStart/src/main/resources/at/gv/egiz/bku/webstart/logo_notext.png b/BKUWebStart/src/main/resources/at/gv/egiz/bku/webstart/logo_notext.png
deleted file mode 100644
index 407f3b3e..00000000
--- a/BKUWebStart/src/main/resources/at/gv/egiz/bku/webstart/logo_notext.png
+++ /dev/null