diff --git a/UI/ControlMappingScreen.cpp b/UI/ControlMappingScreen.cpp
index b0f0651735..1461220625 100644
--- a/UI/ControlMappingScreen.cpp
+++ b/UI/ControlMappingScreen.cpp
@@ -142,14 +142,14 @@ void SingleControlMapper::Refresh() {
 		std::string keyName = KeyMap::GetKeyOrAxisName(mappings[i].keyCode);
 
 		LinearLayout *row = rightColumn->Add(new LinearLayout(ORIENT_HORIZONTAL, new LinearLayoutParams(FILL_PARENT, WRAP_CONTENT)));
-		row->SetSpacing(1.0f);
+		row->SetSpacing(2.0f);
 		rows_.push_back(row);
 
 		Choice *c = row->Add(new Choice(deviceName + "." + keyName, new LinearLayoutParams(FILL_PARENT, itemH, 1.0f)));
 		c->SetTag(StringFromFormat("%d_Change%d", (int)i, pspKey_));
 		c->OnClick.Handle(this, &SingleControlMapper::OnReplace);
 
-		Choice *d = row->Add(new Choice(" X ", new LayoutParams(WRAP_CONTENT, itemH)));
+		Choice *d = row->Add(new Choice(ImageID("I_TRASHCAN"), new LayoutParams(WRAP_CONTENT, itemH)));
 		d->SetTag(StringFromFormat("%d_Del%d", (int)i, pspKey_));
 		d->OnClick.Handle(this, &SingleControlMapper::OnDelete);
 	}
diff --git a/UI/GameSettingsScreen.cpp b/UI/GameSettingsScreen.cpp
index f22627e100..f985110613 100644
--- a/UI/GameSettingsScreen.cpp
+++ b/UI/GameSettingsScreen.cpp
@@ -1863,11 +1863,11 @@ void DeveloperToolsScreen::CreateViews() {
 
 	list->Add(new CheckBox(&g_Config.bShowOnScreenMessages, dev->T("Show on-screen messages")));
 	list->Add(new CheckBox(&g_Config.bEnableLogging, dev->T("Enable Logging")))->OnClick.Handle(this, &DeveloperToolsScreen::OnLoggingChanged);
+	list->Add(new Choice(dev->T("Logging Channels")))->OnClick.Handle(this, &DeveloperToolsScreen::OnLogConfig);
+	list->Add(new CheckBox(&g_Config.bLogFrameDrops, dev->T("Log Dropped Frame Statistics")));
 	if (GetGPUBackend() == GPUBackend::VULKAN) {
 		list->Add(new CheckBox(&g_Config.bGpuLogProfiler, gr->T("GPU log profiler")));
 	}
-	list->Add(new CheckBox(&g_Config.bLogFrameDrops, dev->T("Log Dropped Frame Statistics")));
-	list->Add(new Choice(dev->T("Logging Channels")))->OnClick.Handle(this, &DeveloperToolsScreen::OnLogConfig);
 	list->Add(new ItemHeader(dev->T("Language")));
 	list->Add(new Choice(dev->T("Load language ini")))->OnClick.Handle(this, &DeveloperToolsScreen::OnLoadLanguageIni);
 	list->Add(new Choice(dev->T("Save language ini")))->OnClick.Handle(this, &DeveloperToolsScreen::OnSaveLanguageIni);
diff --git a/assets/ui_atlas.meta b/assets/ui_atlas.meta
index 32d31ed132..a1d7df260c 100644
Binary files a/assets/ui_atlas.meta and b/assets/ui_atlas.meta differ
diff --git a/assets/ui_atlas.zim b/assets/ui_atlas.zim
index 85517eb137..5b8b17995c 100644
Binary files a/assets/ui_atlas.zim and b/assets/ui_atlas.zim differ
diff --git a/source_assets/image/trashcan.png b/source_assets/image/trashcan.png
new file mode 100644
index 0000000000..d761236539
Binary files /dev/null and b/source_assets/image/trashcan.png differ
diff --git a/ui_atlasscript.txt b/ui_atlasscript.txt
index cbb3a2b22a..14d0cd2ac9 100644
--- a/ui_atlasscript.txt
+++ b/ui_atlasscript.txt
@@ -60,3 +60,4 @@ image I_SQUARE_SHAPE source_assets/image/square_shape.png copy
 image I_SQUARE_SHAPE_LINE source_assets/image/square_shape_line.png copy
 image I_FOLDER_OPEN source_assets/image/folder_open_line.png copy
 image I_WARNING source_assets/image/warning.png copy
+image I_TRASHCAN source_assets/image/trashcan.png copy
\ No newline at end of file