Am now merging the outstanding commits from master branch to v3.12.x, for then building the release candidate 1 binaries from.

So far, these ones are merged and seem ok (some needed minor editing to merge cleanly):

• Drop close buttons on every Execute SQL tab(x). #1968 - [Feature Request] Drop close buttons on every Execute SQL tab(x).
• Show a useful icon in SQL tabs #2153 - Show a useful icon in SQL tabs
• Open SQL tabs for modifying views and triggers #2174 - Open SQL tabs for modifying views and triggers
• Crash when -t option specifies missing table #2180 - Crash when -t option specifies missing table
• Open a set of SQL-Files #2207 - Open a set of SQL-Files
• Minor: Change "Filter in all columns" => "Filter in any column" #2233 - Minor: Change "Filter in all columns" => "Filter in any column"
• Avoid unchanged translation of keyboard shortcuts to work around problems #2235 - Avoid unchanged translation of keyboard shortcuts to work around problems
• Rearrange preferences database #2240 - Rearrange preferences database
• Application icon cleanup #2270 - Application icon cleanup
• Update to Windows Icon Generation script #2275 - Update to Windows Icon Generation script

I'm not sure what needs to be done for this one. Is there a commit in master I can merge, or set of them? 😄

• shortcut Strg + Enter doesn't work in 64-bit version #2178 - shortcut Strg + Enter doesn't work in 64-bit version

It seems related to #2235, which is already merged.