diff --git a/.vscode/settings.json b/.vscode/settings.json
index a19f986e31..4d57e0b78c 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -1,3 +1,4 @@
 {
-	"cSpell.enabled": true
+	"cSpell.enabled": true,
+	"java.compile.nullAnalysis.mode": "disabled"
 }
\ No newline at end of file
diff --git a/packages/app-desktop/gui/ConfigScreen/FontSearch.tsx b/packages/app-desktop/gui/ConfigScreen/FontSearch.tsx
index d80a0d192b..f5c0ffd0c2 100644
--- a/packages/app-desktop/gui/ConfigScreen/FontSearch.tsx
+++ b/packages/app-desktop/gui/ConfigScreen/FontSearch.tsx
@@ -4,6 +4,7 @@ import { _ } from '@joplin/lib/locale';
 import { SettingItemSubType } from '@joplin/lib/models/Setting';
 import { focus } from '@joplin/lib/utils/focusHandler';
 
+
 interface Props {
 	type: string;
 	style: CSSProperties;
@@ -13,6 +14,8 @@ interface Props {
 	subtype: string;
 }
 
+
+
 const FontSearch = (props: Props) => {
 	const { type, style, value, availableFonts, onChange, subtype } = props;
 	const [filteredAvailableFonts, setFilteredAvailableFonts] = useState(availableFonts);
diff --git a/packages/app-desktop/gui/ConfigScreen/style.scss b/packages/app-desktop/gui/ConfigScreen/style.scss
index a6b5f367ae..2b001d8e93 100644
--- a/packages/app-desktop/gui/ConfigScreen/style.scss
+++ b/packages/app-desktop/gui/ConfigScreen/style.scss
@@ -10,7 +10,7 @@
 }
 
 .config-screen-content > .section:last-child {
-	border-bottom: 0;
+	border-bottom: 2;
 }
 
 .font-search-list {
@@ -26,11 +26,11 @@
 }
 
 .font-search-list > div {
-	padding: 5px;
+	padding: 7px;
 }
 
 .font-search-item {
-	border-bottom: 1px solid var(--joplin-border-color4);
+	border-bottom: 2px solid var(--joplin-border-color4);
 	cursor: pointer;
 }
 
@@ -43,4 +43,15 @@
 	background-color: var(--joplin-background-color3);
 	display: flex;
 	align-items: center;
-}
\ No newline at end of file
+}
+
+// BUILD ISSUE for rendering fonts correctly:
+
+
+// To render fonts correctly, use the command:
+// Close the desktop/terminal app
+// Reppen the root file of Joplin Repo
+// Build using: yarn install
+// Locate to the file: cd packages/app-desktop
+// Start using: yarn start
+// Restarting the app gets the job done correctly, as asked in the issue
\ No newline at end of file
diff --git a/packages/app-desktop/gui/NoteList/style.scss b/packages/app-desktop/gui/NoteList/style.scss
index 6b3e03502a..caf1f24b60 100644
--- a/packages/app-desktop/gui/NoteList/style.scss
+++ b/packages/app-desktop/gui/NoteList/style.scss
@@ -13,7 +13,7 @@
 
 	> .emptylist {
 		padding: 10px;
-		font-size: var(--joplin-font-size);
+		font-size: x-large;	
 		color: var(--joplin-color);
 		background-color: var(--joplin-background-color);
 		font-family: var(--joplin-font-family);
diff --git a/packages/app-desktop/gui/NoteListControls/NoteListControls.tsx b/packages/app-desktop/gui/NoteListControls/NoteListControls.tsx
index b3f9ffbc41..42f29b77c0 100644
--- a/packages/app-desktop/gui/NoteListControls/NoteListControls.tsx
+++ b/packages/app-desktop/gui/NoteListControls/NoteListControls.tsx
@@ -125,7 +125,7 @@ function NoteListControls(props: Props) {
 		if (breakpoint === dynamicBreakpoints.Sm) {
 			return 'icon-note';
 		} else {
-			return 'fas fa-plus';
+			return 'fas fa-pencil-alt';
 		}
 	}, [breakpoint, dynamicBreakpoints]);
 
@@ -133,7 +133,7 @@ function NoteListControls(props: Props) {
 		if (breakpoint === dynamicBreakpoints.Sm) {
 			return 'far fa-check-square';
 		} else {
-			return 'fas fa-plus';
+			return 'fas fa-pencil-alt';
 		}
 	}, [breakpoint, dynamicBreakpoints]);
 
@@ -222,7 +222,7 @@ function NoteListControls(props: Props) {
 						props.setNewNoteButtonElement(el);
 					}}
 					className="new-note-button"
-					tooltip={ showTooltip ? CommandService.instance().label('newNote') : '' }
+					tooltip={showTooltip ? CommandService.instance().label('newNote') : ''}
 					iconName={noteIcon}
 					title={_('%s', noteButtonText)}
 					level={ButtonLevel.Primary}
@@ -232,7 +232,7 @@ function NoteListControls(props: Props) {
 				/>
 				<StyledButton ref={newTodoButtonRef}
 					className="new-todo-button"
-					tooltip={ showTooltip ? CommandService.instance().label('newTodo') : '' }
+					tooltip={showTooltip ? CommandService.instance().label('newTodo') : ''}
 					iconName={todoIcon}
 					title={_('%s', todoButtonText)}
 					level={ButtonLevel.Secondary}
@@ -248,7 +248,7 @@ function NoteListControls(props: Props) {
 		<StyledRoot ref={noteControlsRef} padding={props.padding} buttonVerticalGap={props.buttonVerticalGap}>
 			{renderNewNoteButtons()}
 			<BottomRow ref={searchAndSortRef} className="search-and-sort">
-				<SearchBar inputRef={searchBarRef}/>
+				<SearchBar inputRef={searchBarRef} />
 				{showsSortOrderButtons() &&
 					<SortOrderButtonsContainer>
 						<StyledPairButtonL
diff --git a/packages/react-native-alarm-notification/android/.settings/org.eclipse.buildship.core.prefs b/packages/react-native-alarm-notification/android/.settings/org.eclipse.buildship.core.prefs
new file mode 100644
index 0000000000..9269c84775
--- /dev/null
+++ b/packages/react-native-alarm-notification/android/.settings/org.eclipse.buildship.core.prefs
@@ -0,0 +1,13 @@
+arguments=--init-script /var/folders/5s/msqhxw9x46gfs6_9m2x8qxch0000gn/T/db3b08fc4a9ef609cb16b96b200fa13e563f396e9bb1ed0905fdab7bc3bc513b.gradle --init-script /var/folders/5s/msqhxw9x46gfs6_9m2x8qxch0000gn/T/52cde0cfcf3e28b8b7510e992210d9614505e0911af0c190bd590d7158574963.gradle
+auto.sync=false
+build.scans.enabled=false
+connection.gradle.distribution=GRADLE_DISTRIBUTION(VERSION(8.9))
+connection.project.dir=
+eclipse.preferences.version=1
+gradle.user.home=
+java.home=/Users/harshit/Library/Java/JavaVirtualMachines/openjdk-21.0.2/Contents/Home
+jvm.arguments=
+offline.mode=false
+override.workspace.settings=true
+show.console.view=true
+show.executions.view=true