diff --git a/apps/routerconsole/jsp/welcome.jsp b/apps/routerconsole/jsp/welcome.jsp
index b07ad0b65..add261b7b 100644
--- a/apps/routerconsole/jsp/welcome.jsp
+++ b/apps/routerconsole/jsp/welcome.jsp
@@ -109,7 +109,7 @@
 <%-- needed for lang setting in css.jsi: --%><input type="hidden" name="consoleNonce" value="<%=net.i2p.router.web.CSSHelper.getNonce()%>" >
 <img class="wizard progress" src="/themes/console/images/wizard/logogrey1.png">
 <h3 id="wizardheading" class="wizard"><%=uihelper._t("Router Console Language")%></h3>
-<img class="wizardimg" src="/themes/console/images/wizard/undraw_globe.png">
+<img class="wizardimg" src="/themes/console/images/wizard/step-0.png">
 <div id="wizlangsettings" class="wizard">
 <jsp:getProperty name="uihelper" property="langSettings" />
 </div>
@@ -122,7 +122,7 @@
 %>
 <img class="wizard progress" src="/themes/console/images/wizard/logogrey2.png">
 <h3 id="wizardheading" class="wizard"><%=intl._t("Why I2P?")%></h3>
-<img class="wizardimg" src="/themes/console/images/wizard/undraw_connected_world.png">
+<img class="wizardimg" src="/themes/console/images/wizard/step-1.png">
 <div class="wizardtext">
 <p>
 <%=intl._t("I2P is a communication tool for people who value privacy and wish to remain anonymous online.")%>
@@ -136,7 +136,7 @@
 %>
 <img class="wizard progress" src="/themes/console/images/wizard/logogrey3.png">
 <h3 id="wizardheading" class="wizard"><%=intl._t("Bandwidth Test")%></h3>
-<img class="wizardimg" src="/themes/console/images/wizard/undraw_speed_test.png">
+<img class="wizardimg" src="/themes/console/images/wizard/step-2.png">
 <div class="wizardtext">
 <p>
 <%=intl._t("I2P will now test your internet connection to identify the optimal speed settings.")%>
@@ -157,7 +157,7 @@
 %>
 <img class="wizard progress" src="/themes/console/images/wizard/logogrey4.png">
 <h3 id="wizardheading" class="wizard"><%=intl._t("Bandwidth Test in Progress")%></h3>
-<img class="wizardimg" src="themes/console/images/wizard/undraw_in_progress.png">
+<img class="wizardimg" src="themes/console/images/wizard/step-3.png">
 <div id="xhr" class="notifcation">
 <!-- for non-script -->
 <%=intl._t("Javascript is disabled - wait 60 seconds for the bandwidth test to complete and then click Next")%>
@@ -179,17 +179,15 @@
 <img class="wizard progress bwtest" src="/themes/console/images/wizard/logogrey5.png">
 <h3 id="wizardheading" class="wizard bwtest"><%=intl._t("Bandwidth Test Results")%></h3>
 <table class="mlabtable">
-<tr><td><%=intl._t("Test running?")%></td><td><%=wizhelper.isNDTRunning()%></td></tr>
-<tr><td><%=intl._t("Test complete?")%></td><td><%=wizhelper.isNDTComplete()%></td></tr>
-<tr><td><%=intl._t("Test server location")%></td><td><%=wizhelper.getServerLocation()%></td></tr>
-<tr><td><%=intl._t("Completion status")%></td><td><%=wizhelper.getCompletionStatus()%></td></tr>
-<tr><td><%=intl._t("Details")%></td><td><%=wizhelper.getDetailStatus()%></td></tr>
+<tr><td><%=intl._t("Test server location")%></td><td colspan="3"><%=wizhelper.getServerLocation()%></td></tr>
+<tr><td><%=intl._t("Completion status")%></td><td colspan="3"><%=wizhelper.getCompletionStatus()%></td></tr>
 <%
             if (wizhelper.isNDTSuccessful()) {
                 // don't display this if test failed
 %>
-<tr><td><%=intl._t("Downstream Bandwidth")%></td><td><%=net.i2p.data.DataHelper.formatSize2Decimal(wizhelper.getDownBandwidth())%>Bps</td></tr>
-<tr><td><%=intl._t("Upstream Bandwidth")%></td><td><%=net.i2p.data.DataHelper.formatSize2Decimal(wizhelper.getUpBandwidth())%>Bps</td></tr>
+<tr><td><%=intl._t("Details")%></td><td colspan="3"><%=wizhelper.getDetailStatus()%></td></tr>
+<tr><td><%=intl._t("Downstream Bandwidth")%></td><td><%=net.i2p.data.DataHelper.formatSize2Decimal(wizhelper.getDownBandwidth())%>Bps</td>
+<td><%=intl._t("Upstream Bandwidth")%></td><td><%=net.i2p.data.DataHelper.formatSize2Decimal(wizhelper.getUpBandwidth())%>Bps</td></tr>
 <tr><td><%=intl._t("Share of Bandwidth for I2P")%></td><td><%=Math.round(net.i2p.router.web.helpers.WizardHelper.BW_SCALE * 100)%>%</td></tr>
 <%
             } // sucessful
@@ -251,7 +249,7 @@
 %>
 <img class="wizard progress" src="/themes/console/images/wizard/logogrey7.png">
 <h3 id="wizardheading" class="wizard"><%=intl._t("Browser Setup")%></h3>
-<img class="wizardimg" src="/themes/console/images/wizard/undraw_startup_life.png">
+<img class="wizardimg" src="/themes/console/images/wizard/step-4.png">
 <div class="wizardtext"><p>
 <%=intl._t("Your browser needs to be configured to work with I2P.")%>
 <%=intl._t("We have instructions for configuring both Firefox and Chromium based browsers with I2P.")%>
@@ -274,7 +272,7 @@
         // Done
 %>
 <h3 id="wizardheading" class="wizard"><%=intl._t("Welcome to I2P!")%></h3>
-<img class="wizardimg" src="/themes/console/images/wizard/undraw_High_five.png">
+<img class="wizardimg" src="/themes/console/images/wizard/step-5.png">
 <div class="wizardtext">
 <p>
 <%=intl._t("When you start I2P, it may take a few minutes to bootstrap (integrate) your router into the network and find additional peers, so please be patient.")%>
diff --git a/installer/resources/themes/console/dark/console.css b/installer/resources/themes/console/dark/console.css
index 4e11196de..bd3c3fb79 100644
--- a/installer/resources/themes/console/dark/console.css
+++ b/installer/resources/themes/console/dark/console.css
@@ -3466,7 +3466,6 @@ img.wizard.progress {
     left: 32%;
     position: absolute;
     background: none;
-    font-size: larger;
 }
 
 .wizardtext {
@@ -3514,13 +3513,13 @@ table#bandwidthconfig td:first-child {
 #bandwidthconfig td:last-child {
      white-space: normal;
      background: none;
-     font-size: larger;
+/*     font-size: larger;*/
 }
 
 #bandwidthconfig.configtable td {
      white-space: normal;
      background: none;
-     font-size: larger;
+/*     font-size: larger;*/
 }
 
 #bandwidthconfig.configtable.wizard td {
diff --git a/installer/resources/themes/console/images/wizard/step-0.png b/installer/resources/themes/console/images/wizard/step-0.png
new file mode 100644
index 000000000..60b754457
Binary files /dev/null and b/installer/resources/themes/console/images/wizard/step-0.png differ
diff --git a/installer/resources/themes/console/images/wizard/step-1.png b/installer/resources/themes/console/images/wizard/step-1.png
new file mode 100644
index 000000000..a52a6d431
Binary files /dev/null and b/installer/resources/themes/console/images/wizard/step-1.png differ
diff --git a/installer/resources/themes/console/images/wizard/step-2.png b/installer/resources/themes/console/images/wizard/step-2.png
new file mode 100644
index 000000000..b8fe10d8d
Binary files /dev/null and b/installer/resources/themes/console/images/wizard/step-2.png differ
diff --git a/installer/resources/themes/console/images/wizard/step-3.png b/installer/resources/themes/console/images/wizard/step-3.png
new file mode 100644
index 000000000..cf1c620be
Binary files /dev/null and b/installer/resources/themes/console/images/wizard/step-3.png differ
diff --git a/installer/resources/themes/console/images/wizard/step-4.png b/installer/resources/themes/console/images/wizard/step-4.png
new file mode 100644
index 000000000..167040de7
Binary files /dev/null and b/installer/resources/themes/console/images/wizard/step-4.png differ
diff --git a/installer/resources/themes/console/images/wizard/step-5.png b/installer/resources/themes/console/images/wizard/step-5.png
new file mode 100644
index 000000000..462c67047
Binary files /dev/null and b/installer/resources/themes/console/images/wizard/step-5.png differ
diff --git a/installer/resources/themes/console/images/wizard/step-6.png b/installer/resources/themes/console/images/wizard/step-6.png
new file mode 100644
index 000000000..2d14e1549
Binary files /dev/null and b/installer/resources/themes/console/images/wizard/step-6.png differ
diff --git a/installer/resources/themes/console/images/wizard/undraw_High_five.png b/installer/resources/themes/console/images/wizard/undraw_High_five.png
deleted file mode 100644
index 7d64be517..000000000
Binary files a/installer/resources/themes/console/images/wizard/undraw_High_five.png and /dev/null differ
diff --git a/installer/resources/themes/console/images/wizard/undraw_connected_world.png b/installer/resources/themes/console/images/wizard/undraw_connected_world.png
deleted file mode 100644
index 878669048..000000000
Binary files a/installer/resources/themes/console/images/wizard/undraw_connected_world.png and /dev/null differ
diff --git a/installer/resources/themes/console/images/wizard/undraw_globe.png b/installer/resources/themes/console/images/wizard/undraw_globe.png
deleted file mode 100644
index 894a6715a..000000000
Binary files a/installer/resources/themes/console/images/wizard/undraw_globe.png and /dev/null differ
diff --git a/installer/resources/themes/console/images/wizard/undraw_in_progress.png b/installer/resources/themes/console/images/wizard/undraw_in_progress.png
deleted file mode 100644
index c6bbc258e..000000000
Binary files a/installer/resources/themes/console/images/wizard/undraw_in_progress.png and /dev/null differ
diff --git a/installer/resources/themes/console/images/wizard/undraw_speed_test.png b/installer/resources/themes/console/images/wizard/undraw_speed_test.png
deleted file mode 100644
index 7fb5da127..000000000
Binary files a/installer/resources/themes/console/images/wizard/undraw_speed_test.png and /dev/null differ
diff --git a/installer/resources/themes/console/images/wizard/undraw_startup_life.png b/installer/resources/themes/console/images/wizard/undraw_startup_life.png
deleted file mode 100644
index cd7199454..000000000
Binary files a/installer/resources/themes/console/images/wizard/undraw_startup_life.png and /dev/null differ
diff --git a/installer/resources/themes/console/light/console.css b/installer/resources/themes/console/light/console.css
index 2d7737460..29f545cdf 100644
--- a/installer/resources/themes/console/light/console.css
+++ b/installer/resources/themes/console/light/console.css
@@ -1833,7 +1833,7 @@ h3#passwordheading {
     width: 30%;
     position: absolute;
     top: 17%;
-    font-size: larger;
+    font-size: 10pt !important;
 }
 
 h3#themeheading, h3#pluginmanage, h3#pconfig, h3#webappconfig, h3#advancedclientconfig, h3#i2pclientconfig, #config_stats h3 {
@@ -2564,7 +2564,7 @@ td {
     left: 32%;
     position: absolute;
     background: none;
-    font-size: larger;
+    font-size: 10pt !important;
 }
 
 .configtable.wizard {