diff --git a/openssl-act-engine/configure.in b/openssl-act-engine/configure.in
index a325d28..1501130 100644
--- a/openssl-act-engine/configure.in
+++ b/openssl-act-engine/configure.in
@@ -62,15 +62,15 @@ AC_CHECK_PROG(have_dot, dot, yes, no)
 
 case ${host} in
   (*linux*) case "${host}" in
-    (*i386*) LDFLAGS+="-L../../actlibrary/Ubuntu-9-i686/Release"
+    (*i386*) LDFLAGS+=" -L../../actlibrary/Ubuntu-9-i686/Release"
     ;;
-    (*i686|x86_64*) LDFLAGS+="-L../../actlibrary/OpenSUSE-11-x86_64/Release"
+    (*i686|x86_64*) LDFLAGS+=" -L../../actlibrary/OpenSUSE-11-x86_64/Release"
     ;;
     (*) AC_MSG_ERROR([Unknown Linux Host: $host])
     ;;
   esac
   ;;
-  (*mingw*) LDFLAGS+="-L../../actlibrary/mingw32-i586/Release"
+  (*mingw*) LDFLAGS+=" -L../../actlibrary/mingw32-i586/Release"
   ;;
   (*) AC_MSG_ERROR([Unknown Host: $host])
   ;;
diff --git a/swisssurfer/src/browser.hxx b/swisssurfer/src/browser.hxx
index 28b8a89..a2835b2 100644
--- a/swisssurfer/src/browser.hxx
+++ b/swisssurfer/src/browser.hxx
@@ -429,8 +429,17 @@ class Browser: public QMainWindow, protected Ui::Browser {
     void iconChanged() {
       LOG;
       QWebView* view(qobject_cast<QWebView*>(sender()));
-      for (int i(0); i<_tabs->count(); ++i)
-        if (_tabs->widget(i)==view) _tabs->setTabIcon(i, view->icon());
+      int index = _tabs->indexOf(view);
+      if (index<0) return;
+      QIcon icon(QWebSettings::iconForUrl(view->url()));
+      if (icon.isNull()) {
+        LOG<<"Icon for URL is Null"<<view->url();
+        QPixmap pixmap(QWebSettings::webGraphic
+                       (QWebSettings::DefaultFrameIconGraphic));
+        if (!pixmap.isNull()) icon = pixmap;
+      } else icon = icon.pixmap(16, 16);
+      if (icon.isNull()) LOG<<"Icon is still null";
+      _tabs->setTabIcon(index, icon);
     }
     
     void titleChanged(const QString& text) {
diff --git a/swisssurfer/src/swisssurfer_de.ts b/swisssurfer/src/swisssurfer_de.ts
index b38c4f0..d912b25 100644
--- a/swisssurfer/src/swisssurfer_de.ts
+++ b/swisssurfer/src/swisssurfer_de.ts
@@ -344,17 +344,17 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="browser.hxx" line="444"/>
+        <location filename="browser.hxx" line="453"/>
         <source>Info: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="browser.hxx" line="457"/>
+        <location filename="browser.hxx" line="466"/>
         <source>done.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="browser.hxx" line="710"/>
+        <location filename="browser.hxx" line="719"/>
         <source>%1</source>
         <comment>statusbar for hovered link %1=url</comment>
         <translation type="unfinished"></translation>
@@ -381,22 +381,22 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="browser.hxx" line="439"/>
+        <location filename="browser.hxx" line="448"/>
         <source>%1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="browser.hxx" line="811"/>
+        <location filename="browser.hxx" line="820"/>
         <source>Save File As ...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="browser.hxx" line="866"/>
+        <location filename="browser.hxx" line="875"/>
         <source>authentication required</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="browser.hxx" line="881"/>
+        <location filename="browser.hxx" line="890"/>
         <source>ssl error</source>
         <translation type="unfinished"></translation>
     </message>
diff --git a/swisssurfer/src/swisssurfer_en.ts b/swisssurfer/src/swisssurfer_en.ts
index b38c4f0..d912b25 100644
--- a/swisssurfer/src/swisssurfer_en.ts
+++ b/swisssurfer/src/swisssurfer_en.ts
@@ -344,17 +344,17 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="browser.hxx" line="444"/>
+        <location filename="browser.hxx" line="453"/>
         <source>Info: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="browser.hxx" line="457"/>
+        <location filename="browser.hxx" line="466"/>
         <source>done.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="browser.hxx" line="710"/>
+        <location filename="browser.hxx" line="719"/>
         <source>%1</source>
         <comment>statusbar for hovered link %1=url</comment>
         <translation type="unfinished"></translation>
@@ -381,22 +381,22 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="browser.hxx" line="439"/>
+        <location filename="browser.hxx" line="448"/>
         <source>%1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="browser.hxx" line="811"/>
+        <location filename="browser.hxx" line="820"/>
         <source>Save File As ...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="browser.hxx" line="866"/>
+        <location filename="browser.hxx" line="875"/>
         <source>authentication required</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="browser.hxx" line="881"/>
+        <location filename="browser.hxx" line="890"/>
         <source>ssl error</source>
         <translation type="unfinished"></translation>
     </message>
diff --git a/swisssurfer/src/swisssurfer_fr.ts b/swisssurfer/src/swisssurfer_fr.ts
index b38c4f0..d912b25 100644
--- a/swisssurfer/src/swisssurfer_fr.ts
+++ b/swisssurfer/src/swisssurfer_fr.ts
@@ -344,17 +344,17 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="browser.hxx" line="444"/>
+        <location filename="browser.hxx" line="453"/>
         <source>Info: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="browser.hxx" line="457"/>
+        <location filename="browser.hxx" line="466"/>
         <source>done.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="browser.hxx" line="710"/>
+        <location filename="browser.hxx" line="719"/>
         <source>%1</source>
         <comment>statusbar for hovered link %1=url</comment>
         <translation type="unfinished"></translation>
@@ -381,22 +381,22 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="browser.hxx" line="439"/>
+        <location filename="browser.hxx" line="448"/>
         <source>%1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="browser.hxx" line="811"/>
+        <location filename="browser.hxx" line="820"/>
         <source>Save File As ...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="browser.hxx" line="866"/>
+        <location filename="browser.hxx" line="875"/>
         <source>authentication required</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="browser.hxx" line="881"/>
+        <location filename="browser.hxx" line="890"/>
         <source>ssl error</source>
         <translation type="unfinished"></translation>
     </message>
diff --git a/swisssurfer/src/swisssurfer_it.ts b/swisssurfer/src/swisssurfer_it.ts
index b38c4f0..d912b25 100644
--- a/swisssurfer/src/swisssurfer_it.ts
+++ b/swisssurfer/src/swisssurfer_it.ts
@@ -344,17 +344,17 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="browser.hxx" line="444"/>
+        <location filename="browser.hxx" line="453"/>
         <source>Info: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="browser.hxx" line="457"/>
+        <location filename="browser.hxx" line="466"/>
         <source>done.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="browser.hxx" line="710"/>
+        <location filename="browser.hxx" line="719"/>
         <source>%1</source>
         <comment>statusbar for hovered link %1=url</comment>
         <translation type="unfinished"></translation>
@@ -381,22 +381,22 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="browser.hxx" line="439"/>
+        <location filename="browser.hxx" line="448"/>
         <source>%1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="browser.hxx" line="811"/>
+        <location filename="browser.hxx" line="820"/>
         <source>Save File As ...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="browser.hxx" line="866"/>
+        <location filename="browser.hxx" line="875"/>
         <source>authentication required</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="browser.hxx" line="881"/>
+        <location filename="browser.hxx" line="890"/>
         <source>ssl error</source>
         <translation type="unfinished"></translation>
     </message>