These settings are necessary for the functionality and inclusion of the GUI in the project, so it should be merged.
It includes one functionality change: Fixed icons so that they are loaded correctly when you are not in the correct folder and running the GUI.