diff --git a/bin/assets/ui/breeze.css b/bin/assets/ui/breeze.css
index a7b856678..dc302051a 100644
--- a/bin/assets/ui/breeze.css
+++ b/bin/assets/ui/breeze.css
@@ -5,6 +5,7 @@
 	--font: #eff0f1;
 	--font-highlight: #8bdcfd;
 	--font-hint: #898b8d;
+	--font-selected-pressed: #eff0f1;
 	--button-back: #30353a;
 	--button-border: #6b6f73;
 	--button-radius: 2dp;
@@ -14,7 +15,6 @@
 	--list-back: #232629;
 	--separator: #31363b;
 	--item-hover: #284150;
-	--list-row-active: #eff0f1;
 	--slider-back: #676a6e;
 	--slider-button: #31363b;
 	--slider-border: #787b80;
@@ -65,10 +65,6 @@ listview::header::column:hover {
 	tint: var(--font);
 }
 
-PushButton:pressed > PushButton,
-SelectButton:pressed > SelectButton,
-SelectButton:selected > SelectButton,
-SelectButton:selected:pressed > SelectButton,
 tableview::row:selected tableview::cell,
 treeview::row:selected treeview::cell,
 listview::row:selected listview::cell,
@@ -78,8 +74,8 @@ listview::row:selected listview::cell,
 tableview::row:selected tableview::cell::expander,
 treeview::row:selected treeview::cell::expander,
 listview::row:selected listview::cell::expander {
-	color: var(--list-row-active);
-	tint: var(--list-row-active);
+	color: var(--font-selected-pressed);
+	tint: var(--font-selected-pressed);
 }
 
 CheckBox,
@@ -118,7 +114,7 @@ TextInput,
 TextInputPassword,
 ComboBox::DropDownList,
 SpinBox::input, {
-	selection-color: var(--list-row-active);
+	selection-color: var(--font-selected-pressed);
 	selection-back-color: var(--primary);
 }
 
@@ -168,8 +164,8 @@ SelectButton:pressed,
 SelectButton:selected,
 SelectButton:selected:pressed {
 	background-color: var(--primary);
-	color: var(--list-row-active);
-	tint: var(--list-row-active);
+	color: var(--font-selected-pressed);
+	tint: var(--font-selected-pressed);
 }
 
 pushbutton:disabled,
@@ -319,8 +315,8 @@ DropDownList::ListBox::item:selected,
 ComboBox::DropDownList::ListBox::item:hover,
 ComboBox::DropDownList::ListBox::item:selected {
 	background-color: var(--primary);
-	color: var(--list-row-active);
-	tint: var(--list-row-active);
+	color: var(--font-selected-pressed);
+	tint: var(--font-selected-pressed);
 }
 
 TextInput,
@@ -1118,6 +1114,7 @@ TextInput.table_cell_edit {
 	--font: #232627;
 	--font-highlight: #3daee9;
 	--font-hint: #232627;
+	--font-selected-pressed: #eff0f1;
 	--button-back: #fcfcfc;
 	--button-border: #b3b4b5;
 	--button-radius: 2dp;
@@ -1127,7 +1124,6 @@ TextInput.table_cell_edit {
 	--list-back: #ffffff;
 	--separator: #cbcdcd;
 	--item-hover: #93cee9;
-	--list-row-active: #eff0f1;
 	--slider-back: #e9e9e9;
 	--slider-button: #cbcdcd;
 	--slider-border: #e6e6e6;
diff --git a/src/tools/ecode/applayout.xml.hpp b/src/tools/ecode/applayout.xml.hpp
index 42fa9f631..996f805a9 100644
--- a/src/tools/ecode/applayout.xml.hpp
+++ b/src/tools/ecode/applayout.xml.hpp
@@ -90,7 +90,7 @@ TableView#locate_bar_table > tableview::row > tableview::cell:nth-child(3) {
 }
 TableView#locate_bar_table > tableview::row:selected > tableview::cell:nth-child(2),
 TableView#locate_bar_table > tableview::row:selected > tableview::cell:nth-child(3) {
-	color: var(--list-row-active)
+	color: var(--font-selected-pressed)
 }
 .search_tree treeview::cell {
 	font-family: monospace;
@@ -196,8 +196,8 @@ TableView#locate_bar_table > tableview::row:selected > tableview::cell:nth-child
 }
 #status_bar > .status_but.selected {
 	background-color: var(--primary);
-	color: var(--list-row-active);
-	tint: var(--list-row-active);
+	color: var(--font-selected-pressed);
+	tint: var(--font-selected-pressed);
 }
 #status_bar > .status_but:last-child {
 	border-right-color: transparent;
@@ -327,8 +327,8 @@ TableView#locate_bar_table > tableview::row:selected > tableview::cell:nth-child
 	tint: var(--font);
 }
 .settings_panel .advanced_options .title:hover > * {
-	color: var(--list-row-active);
-	tint: var(--list-row-active);
+	color: var(--font-selected-pressed);
+	tint: var(--font-selected-pressed);
 }
 .settings_panel .advanced_options .title:hover {
 	background-color: var(--primary);
@@ -450,8 +450,8 @@ Anchor.error:hover {
 	color: var(--theme-error);
 }
 #build_output_issues TableView::row:selected TableView::cell.theme-error {
-	color: var(--list-row-active);
-	tint: var(--list-row-active);
+	color: var(--font-selected-pressed);
+	tint: var(--font-selected-pressed);
 }
 .texture-preview {
 	border: 1dp solid var(--list-back);
diff --git a/src/tools/ecode/colorschemetranslator.cpp b/src/tools/ecode/colorschemetranslator.cpp
index 1bfb44ee8..2d165cd24 100644
--- a/src/tools/ecode/colorschemetranslator.cpp
+++ b/src/tools/ecode/colorschemetranslator.cpp
@@ -15,6 +15,7 @@ static const auto BASE_UI_THEME = R"css(
 	--font: text;
 	--font-highlight: type;
 	--font-hint: line_number2;
+	--font-selected-pressed: line_highlight;
 
 	/* Button styling */
 	--button-back: line_highlight;
@@ -24,7 +25,6 @@ static const auto BASE_UI_THEME = R"css(
 	--list-back: widget_background;
 	--separator: line_highlight;
 	--item-hover: selection;
-	--list-row-active: widget_background;
 
 	/* Sliders */
 	--slider-back: line_number;
diff --git a/src/tools/ecode/plugins/aiassistant/chatui.cpp b/src/tools/ecode/plugins/aiassistant/chatui.cpp
index 1a6f1c86f..08da78cc4 100644
--- a/src/tools/ecode/plugins/aiassistant/chatui.cpp
+++ b/src/tools/ecode/plugins/aiassistant/chatui.cpp
@@ -969,7 +969,7 @@ void LLMChatUI::resizeToFit( UICodeEditor* editor ) {
 }
 
 void LLMChatUI::replaceFileLinksToContents( std::string& text ) {
-	LuaPattern ptrn( "\n```file://([^`]*)```\n" );
+	LuaPattern ptrn( "\n```file://([^`]*)```\n?" );
 	PatternMatcher::Range matches[2];
 	while ( ptrn.matches( text, matches ) ) {
 		std::string path( text.substr( matches[1].start, matches[1].length() ) );
diff --git a/src/tools/ecode/plugins/git/gitplugin.cpp b/src/tools/ecode/plugins/git/gitplugin.cpp
index 09b4881c0..578534496 100644
--- a/src/tools/ecode/plugins/git/gitplugin.cpp
+++ b/src/tools/ecode/plugins/git/gitplugin.cpp
@@ -1449,8 +1449,8 @@ void GitPlugin::buildSidePanelTab() {
 	}
 	treeview::row:selected treeview::cell.git_highlight_style,
 	treeview::row:selected treeview::cell.git_highlight_style {
-		color: var(--list-row-active);
-		tint: var(--list-row-active);
+		color: var(--font-selected-pressed);
+		tint: var(--font-selected-pressed);
 	}
 	treeview::cell.git_highlight_style > treeview::cell::icon {
 		foreground-image: icon(circle, 8dpru), icon(circle-filled, 8dpru);
diff --git a/src/tools/ecode/uiwelcomescreen.cpp b/src/tools/ecode/uiwelcomescreen.cpp
index 5a50f3d94..1d85ccc2c 100644
--- a/src/tools/ecode/uiwelcomescreen.cpp
+++ b/src/tools/ecode/uiwelcomescreen.cpp
@@ -56,6 +56,10 @@ static const auto LAYOUT = R"xml(
 #welcome_ecode PushButton:hover {
 	border-color: var(--primary);
 }
+#welcome_ecode PushButton:pressed {
+	background-color: var(--primary);
+	color: var(--font-selected-pressed);
+}
 #welcome_ecode .separator {
 	focusable: false;
 	background-image: rectangle(solid, var(--tab-line));