diff --git a/.circleci/config.yml b/.circleci/config.yml
index d21c1c05c59..e9e4452ea17 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -5,13 +5,13 @@ jobs:
     docker:
       - image: circleci/openjdk:8-jdk
     steps:
+      - checkout
       - restore_cache:
           keys:
-            - install4j
-      - checkout
+            - install4j-{{ checksum "scripts/extract-install4j.sh" }}
       - run: scripts/download-install4j-and-jres.sh
       - save_cache:
-          key: install4j
+          key: install4j-{{ checksum "scripts/extract-install4j.sh" }}
           paths:
             - "~/downloads"
             - "~/.install4j7"
@@ -25,9 +25,9 @@ jobs:
     steps:
       - restore_cache:
           key: dependency-cache
-      - restore_cache:
-          key: install4j
       - checkout
+      - restore_cache:
+          key: install4j-{{ checksum "scripts/extract-install4j.sh" }}
       - run: scripts/extract-install4j.sh
       - run: install4j7/bin/install4jc --verbose --license=$INSTALL4J_KEY
       - run: ./gradlew -Pdev=true -Pinstall4jDir="install4j7" release --stacktrace
@@ -46,9 +46,9 @@ jobs:
     steps:
       - restore_cache:
           key: dependency-cache
-      - restore_cache:
-          key: install4j
       - checkout
+      - restore_cache:
+          key: install4j-{{ checksum "scripts/extract-install4j.sh" }}
       - run: scripts/extract-install4j.sh
       - run: install4j7/bin/install4jc --verbose --license=$INSTALL4J_KEY
       - run: ./gradlew -Pinstall4jDir="install4j7" release --stacktrace
diff --git a/jabref.install4j b/jabref.install4j
index a79be056141..08da26fd0a2 100644
--- a/jabref.install4j
+++ b/jabref.install4j
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<install4j version="7.0.4" transformSequenceNumber="7">
+<install4j version="7.0.8" transformSequenceNumber="7">
   <directoryPresets config="./buildres/jabref.json" />
   <application name="JabRef" distributionSourceDir="" applicationId="0034-7691-1464-4754" mediaDir="build/install4j" mediaFilePattern="${compiler:sys.shortName}_${compiler:sys.platform}_${compiler:sys.version}" compression="6" lzmaCompression="false" pack200Compression="false" excludeSignedFromPacking="true" commonExternalFiles="false" createMd5Sums="true" shrinkRuntime="true" shortName="JabRef" publisher="JabRef Community" publisherWeb="https://www.jabref.org/" version="DEV" allPathsRelative="true" backupOnSave="false" autoSave="true" convertDotsToUnderscores="true" macSignature="????" macVolumeId="780dfea2d33a0244" javaMinVersion="1.8" javaMaxVersion="1.8" allowBetaVM="false" jdkMode="runtimeJre" jdkName="">
     <languages skipLanguageSelection="true" languageSelectionInPrincipalLanguage="false">
@@ -42,7 +42,10 @@
       <variable name="version" value="3.1dev" description="" category="" />
     </variables>
     <mergedProjects />
-    <codeSigning macEnabled="false" macPkcs12File="" windowsEnabled="false" windowsKeySource="pkcs12" windowsPvkFile="" windowsSpcFile="" windowsPkcs12File="" />
+    <codeSigning macEnabled="false" macPkcs12File="" windowsEnabled="false" windowsKeySource="pkcs12" windowsPvkFile="" windowsSpcFile="" windowsPkcs12File="" windowsPkcs11Library="" windowsPkcs11Slot="">
+      <windowsKeystoreIdentifier issuer="" serial="" subject="" />
+      <windowsPkcs11Identifier issuer="" serial="" subject="" />
+    </codeSigning>
   </application>
   <files keepModificationTimes="false" missingFilesStrategy="warn" globalExcludeSuffixes="" defaultOverwriteMode="4" defaultUninstallMode="0" launcherOverwriteMode="3" defaultFileMode="644" defaultDirMode="755">
     <filesets />
@@ -105,7 +108,7 @@
       <customAttributes />
     </autoUpdate>
     <applications>
-      <application name="" id="installer" customizedId="" beanClass="com.install4j.runtime.beans.applications.InstallerApplication" enabled="true" commentSet="false" comment="" actionElevationType="none" styleId="" fileset="" customIcnsFile="./src/main/resources/icons/jabref.icns" customIcoFile="./src/main/resources/icons/jabref.ico" macEntitlementsFile="" automaticLauncherIntegration="false" launchMode="startupFirstWindow" launchInNewProcess="false" launchSchedule="updateSchedule" allLaunchers="true">
+      <application name="" id="installer" customizedId="" beanClass="com.install4j.runtime.beans.applications.InstallerApplication" enabled="true" commentSet="false" comment="" actionElevationType="none" styleId="326" fileset="" customIcnsFile="./src/main/resources/icons/jabref.icns" customIcoFile="./src/main/resources/icons/jabref.ico" macEntitlementsFile="" automaticLauncherIntegration="false" launchMode="startupFirstWindow" launchInNewProcess="false" launchSchedule="updateSchedule" allLaunchers="true">
         <serializedBean>
           <java class="java.beans.XMLDecoder">
             <object class="com.install4j.runtime.beans.applications.InstallerApplication">
@@ -116,6 +119,9 @@
           </java>
         </serializedBean>
         <styleOverrides />
+        <customScript mode="1" file="">
+          <content />
+        </customScript>
         <launcherIds />
         <variables />
         <startup>
@@ -144,7 +150,7 @@
           </screen>
         </startup>
         <screens>
-          <screen name="" id="2" customizedId="" beanClass="com.install4j.runtime.beans.screens.WelcomeScreen" enabled="true" commentSet="false" comment="" actionElevationType="inherit" styleId="332" rollbackBarrier="false" rollbackBarrierExitCode="1" backButton="2" finishScreen="false" wizardIndexChangeType="unchanged" wizardIndexKey="">
+          <screen name="" id="2" customizedId="" beanClass="com.install4j.runtime.beans.screens.WelcomeScreen" enabled="true" commentSet="false" comment="" actionElevationType="inherit" styleId="" rollbackBarrier="false" rollbackBarrierExitCode="1" backButton="2" finishScreen="false" wizardIndexChangeType="unchanged" wizardIndexKey="">
             <serializedBean>
               <java class="java.beans.XMLDecoder">
                 <object class="com.install4j.runtime.beans.screens.WelcomeScreen" />
@@ -766,6 +772,9 @@ return console.askOkCancel(message, true);
           </java>
         </serializedBean>
         <styleOverrides />
+        <customScript mode="1" file="">
+          <content />
+        </customScript>
         <launcherIds />
         <variables />
         <startup>
@@ -1054,7 +1063,7 @@ return console.askYesNo(message, true);
                         <boolean>false</boolean>
                       </void>
                       <void property="labelText">
-                        <string>install4j</string>
+                        <string>JabRef</string>
                       </void>
                     </object>
                   </java>
@@ -1262,7 +1271,7 @@ return console.askYesNo(message, true);
                       </void>
                       <void property="imageFile">
                         <object class="com.install4j.api.beans.ExternalFile">
-                          <string>icon:${installer:sys.installerApplicationMode}_header.png</string>
+                          <string>./src/main/resources/icons/JabRef-icon-64.png</string>
                         </object>
                       </void>
                       <void property="imageInsets">
diff --git a/scripts/download-install4j-and-jres.sh b/scripts/download-install4j-and-jres.sh
index 0e99d438c6e..cdd5aee3b20 100755
--- a/scripts/download-install4j-and-jres.sh
+++ b/scripts/download-install4j-and-jres.sh
@@ -5,7 +5,7 @@ if [ ! -d ~/downloads ]; then
   mkdir ~/downloads
 fi
 cd ~/downloads
-wget --quiet -nc http://download-keycdn.ej-technologies.com/install4j/install4j_unix_7_0_4.tar.gz
+wget --quiet -nc --show-progress http://download-keycdn.ej-technologies.com/install4j/install4j_unix_7_0_8.tar.gz
 
 # fetch JREs
 if [ ! -d ~/.install4j7/jres ]; then
diff --git a/scripts/extract-install4j.sh b/scripts/extract-install4j.sh
index 4e8cfcc7dd3..9e960280b81 100755
--- a/scripts/extract-install4j.sh
+++ b/scripts/extract-install4j.sh
@@ -1,4 +1,4 @@
 #!/bin/bash
-tar -xf ~/downloads/install4j_unix_7_0_4.tar.gz
+tar -xf ~/downloads/install4j_unix_7_0_8.tar.gz
 # fix directory name (until install4j 6.1.5 it was install4j6
-mv install4j7.0.4 install4j7
+mv install4j7.0.8 install4j7
diff --git a/src/main/java/org/jabref/preferences/PreferencesService.java.orig b/src/main/java/org/jabref/preferences/PreferencesService.java.orig
new file mode 100644
index 00000000000..28974c413fe
--- /dev/null
+++ b/src/main/java/org/jabref/preferences/PreferencesService.java.orig
@@ -0,0 +1,48 @@
+package org.jabref.preferences;
+
+import java.nio.file.Path;
+import java.util.List;
+import java.util.Map;
+
+import org.jabref.gui.keyboard.KeyBindingRepository;
+import org.jabref.logic.journals.JournalAbbreviationPreferences;
+import org.jabref.logic.openoffice.OpenOfficePreferences;
+import org.jabref.model.metadata.FilePreferences;
+
+public interface PreferencesService {
+
+    JournalAbbreviationPreferences getJournalAbbreviationPreferences();
+
+    void storeKeyBindingRepository(KeyBindingRepository keyBindingRepository);
+
+    KeyBindingRepository getKeyBindingRepository();
+
+    void storeJournalAbbreviationPreferences(JournalAbbreviationPreferences abbreviationsPreferences);
+
+    FilePreferences getFilePreferences();
+
+    Path getWorkingDir();
+
+    void setWorkingDir(Path dir);
+
+<<<<<<< HEAD
+    OpenOfficePreferences getOpenOfficePreferences();
+
+    void setOpenOfficePreferences(OpenOfficePreferences openOfficePreferences);
+
+    PreviewPreferences getPreviewPreferences();
+=======
+    Map<String, List<String>> getEntryEditorTabList();
+
+    Boolean getEnforceLegalKeys();
+
+    Map<String, String> getCustomTabsNamesAndFields();
+
+    void setCustomTabsNameAndFields(String name, String fields, int defNumber);
+
+    public void purgeSeries(String prefix, int number);
+
+    public void updateEntryEditorTabList();
+>>>>>>> upstream/master
+
+}
diff --git a/src/main/resources/icons/JabRef-icon-64.png b/src/main/resources/icons/JabRef-icon-64.png
new file mode 100644
index 00000000000..e807e0448d3
Binary files /dev/null and b/src/main/resources/icons/JabRef-icon-64.png differ