diff --git a/src/Dev/Install/Installer.php b/src/Dev/Install/Installer.php
index 3ee2154bb..80df8afb0 100644
--- a/src/Dev/Install/Installer.php
+++ b/src/Dev/Install/Installer.php
@@ -3,7 +3,9 @@
 namespace SilverStripe\Dev\Install;
 
 use Exception;
+use SilverStripe\Control\Cookie;
 use SilverStripe\Control\HTTPRequest;
+use SilverStripe\Control\HTTPRequestBuilder;
 use SilverStripe\Control\Session;
 use SilverStripe\Core\CoreKernel;
 use SilverStripe\Control\HTTPApplication;
@@ -199,10 +201,8 @@ PHP
             }
         }
 
-        // Mock request
-        $session = new Session(isset($_SESSION) ? $_SESSION : array());
-        $request = new HTTPRequest('GET', '/');
-        $request->setSession($session);
+        // Build request
+        $request = HTTPRequestBuilder::createFromEnvironment();
 
         // Install kernel (fix to dev)
         $kernel = new CoreKernel(BASE_PATH);
@@ -211,6 +211,9 @@ PHP
 
         // Build db within HTTPApplication
         $app->execute($request, function (HTTPRequest $request) use ($config) {
+            // Suppress cookie errors on install
+            Cookie::config()->set('report_errors', false);
+
             // Start session and execute
             $request->getSession()->init($request);
 
diff --git a/src/Dev/Install/client/images/arrows.png b/src/Dev/Install/client/images/arrows.png
new file mode 100644
index 000000000..a24f44db6
Binary files /dev/null and b/src/Dev/Install/client/images/arrows.png differ
diff --git a/src/Dev/Install/client/images/network-save.gif b/src/Dev/Install/client/images/network-save.gif
new file mode 100644
index 000000000..1560b646c
Binary files /dev/null and b/src/Dev/Install/client/images/network-save.gif differ
diff --git a/src/Dev/Install/client/images/question.png b/src/Dev/Install/client/images/question.png
new file mode 100644
index 000000000..f51f15ba3
Binary files /dev/null and b/src/Dev/Install/client/images/question.png differ
diff --git a/src/Dev/Install/config-form.html b/src/Dev/Install/config-form.html
index df1dc48ea..a9685e3a3 100644
--- a/src/Dev/Install/config-form.html
+++ b/src/Dev/Install/config-form.html
@@ -273,7 +273,7 @@
 
 									<span id="saving_top" style="display: none">
 										&nbsp;
-										<img src="<?=FRAMEWORK_NAME; ?>/images/network-save.gif" alt="Saving">
+										<img src="<?=FRAMEWORK_NAME; ?>/src/Dev/Install/client/images/network-save.gif" alt="Saving">
 										(this will take a minute or so)
 									</span>
 								</p>