diff --git a/pom.xml b/pom.xml
index e757fd8..f78dfbd 100644
--- a/pom.xml
+++ b/pom.xml
@@ -3,7 +3,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>de.selfomat</groupId>
     <artifactId>selfomat-single-user</artifactId>
-    <version>0.4.0.13-SNAPSHOT</version>
+    <version>0.4.0.14-SNAPSHOT</version>
 
     <scm>
         <url>scm:svn:svn://simongehrig:L4ut5pr3ch3r!@svn.picture.tools/selfomat/trunk/selfomat-java-single-user</url>
diff --git a/src/main/java/workers/FilesWorker.java b/src/main/java/workers/FilesWorker.java
index c171f9a..321c7a0 100644
--- a/src/main/java/workers/FilesWorker.java
+++ b/src/main/java/workers/FilesWorker.java
@@ -235,12 +235,16 @@ public class FilesWorker {
 
                 // Archive the Backup
                 archiveBackup();
-
-                // Update the State fot previews and thumbs
-                SOMEvent.getInstance().getImages();
-
-                SOMGUI.changetopicture();
             }
+
+            // Update the State fot previews and thumbs
+            ScaleWorker.scale(SOMEvent.getInstance().getImages(), ScaleWorker.PREVIEW);
+            ScaleWorker.scale(SOMEvent.getInstance().getImages(), ScaleWorker.THUMBNAIL);
+
+
+            // In any case, internet or not, change to the pic scene
+            SOMGUI.changetopicture();
+
         } catch (IOException e) {
             e.printStackTrace();
         } catch (InterruptedException e) {
diff --git a/src/main/java/workers/ScaleWorker.java b/src/main/java/workers/ScaleWorker.java
index e05bea0..13b395c 100644
--- a/src/main/java/workers/ScaleWorker.java
+++ b/src/main/java/workers/ScaleWorker.java
@@ -14,6 +14,9 @@ import java.awt.image.CropImageFilter;
 import java.awt.image.FilteredImageSource;
 import java.io.File;
 import java.io.IOException;
+import java.util.List;
+
+//import java.awt.*;
 
 public class ScaleWorker extends Thread {
 
@@ -48,11 +51,11 @@ public class ScaleWorker extends Thread {
     }
 
     // Overload of scale() that lets you enter Arrays of Pictures
-    public static SOMImage[] scale(SOMImage[] somImages, int type) {
+    public static List<SOMImage> scale(List<SOMImage> somImages, int type) {
         // loop through Array of SOMImages
-        for (SOMImage image : somImages) {
+        for (int i = 0; i < somImages.size(); i++) {
             //update the image
-            image = scale(image, type);
+            scale(somImages.get(i), type);
         }
         // return the imagearray
         return somImages;