diff --git a/app/boards/arm/zswatch_nrf5340/zswatch_nrf5340_cpuapp_5.conf b/app/boards/arm/zswatch_nrf5340/zswatch_nrf5340_cpuapp_5.conf
index 60518d3b..02870baf 100644
--- a/app/boards/arm/zswatch_nrf5340/zswatch_nrf5340_cpuapp_5.conf
+++ b/app/boards/arm/zswatch_nrf5340/zswatch_nrf5340_cpuapp_5.conf
@@ -9,7 +9,7 @@ CONFIG_FLASH_PAGE_LAYOUT=y
 CONFIG_STREAM_FLASH=y
 CONFIG_FLASH_MAP=y
 CONFIG_NORDIC_QSPI_NOR=y
-CONFIG_NORDIC_QSPI_NOR_FLASH_LAYOUT_PAGE_SIZE=65536
+CONFIG_NORDIC_QSPI_NOR_FLASH_LAYOUT_PAGE_SIZE=4096
 
 CONFIG_SPI_FLASH_LOADER=y
 
@@ -41,11 +41,7 @@ CONFIG_NRF_FUEL_GAUGE=y
 CONFIG_APPLICATIONS_USE_BATTERY=n
 
 # Temporary due to current flash having larger pages than NVS can handle.
-CONFIG_FCB=y
-CONFIG_SETTINGS_FCB=y
-CONFIG_SETTINGS_NVS=n
-CONFIG_NVS=n
-
-CONFIG_ERASE_PROGRESSIVELY=n
+CONFIG_SETTINGS_NVS=y
+CONFIG_NVS=y
 
 CONFIG_DEBUG_COREDUMP_BACKEND_OTHER=y
diff --git a/app/boards/arm/zswatch_nrf5340/zswatch_nrf5340_cpuapp_5.overlay b/app/boards/arm/zswatch_nrf5340/zswatch_nrf5340_cpuapp_5.overlay
index fcb47bb2..11039eb7 100644
--- a/app/boards/arm/zswatch_nrf5340/zswatch_nrf5340_cpuapp_5.overlay
+++ b/app/boards/arm/zswatch_nrf5340/zswatch_nrf5340_cpuapp_5.overlay
@@ -84,12 +84,12 @@
 };
 / {
 	chosen {
-		nordic,pm-ext-flash = &s25fs256s;
+		nordic,pm-ext-flash = &gd25lq128d;
 		zephyr,console = &cdc_acm_uart0;
 	};
 
 	aliases {
-		spi-flash0 = &s25fs256s;
+		spi-flash0 = &gd25lq128d;
 	};
 
     longpress: longpress {
@@ -245,24 +245,23 @@
 	pinctrl-0 = <&qspi_default>;
 	pinctrl-1 = <&qspi_sleep>;
 	pinctrl-names = "default", "sleep";
-	s25fs256s: s25fs256s@0 {
+	gd25lq128d: gd25lq128d@0 {
 		compatible = "nordic,qspi-nor";
 		reg = <0>;
 		sck-frequency = <96000000>;
-		jedec-id = [01 02 19];
-		size = <DT_SIZE_M(32*8)>;
+		jedec-id = [c8 60 18];
+		size = <DT_SIZE_M(16*8)>;
 		has-dpd;
         // CS High to Power-Down Mode (tDP) - 3 us
         // Rev. S Table 26. AC Electrical Characteristic
-		t-enter-dpd = <3000>;
+		t-enter-dpd = <30000>;
         // CS High to Standby Mode without Electronic Signature Read (tRES1) 3 us
         // Rev. S Table 26. AC Electrical Characteristic
-		t-exit-dpd = <3000>;
+		t-exit-dpd = <30000>;
 		// Configure to actully use Quad SPI data.
-		// TODO
-		//writeoc = "pp4o";
-		//readoc = "read4io";
-		//quad-enable-requirements = "S2B1v6";
+		writeoc = "pp4o";
+		readoc = "read4io";
+		quad-enable-requirements = "S2B1v1";
 	};
 };
 
@@ -285,7 +284,7 @@
 
 /delete-node/ &storage_partition;
 
-&s25fs256s {
+&gd25lq128d {
 	partitions {
 		compatible = "fixed-partitions";
 		#address-cells = <1>;
diff --git a/app/src/images/binaries/S/ui_img_debugging_png.bin b/app/src/images/binaries/S/ui_img_debugging_png.bin
new file mode 100644
index 00000000..4281bd8f
Binary files /dev/null and b/app/src/images/binaries/S/ui_img_debugging_png.bin differ