From 1ae3987fabb555b9c91fe85e3b9d219fd6b60453 Mon Sep 17 00:00:00 2001
From: shufeng2012 <277665039@qq.com>
Date: Sat, 15 Aug 2026 19:40:17 +0800
Subject: [PATCH] =?UTF-8?q?=F0=9F=9A=9A=20=E7=A7=BB=E5=8A=A8=E6=BA=90?=
 =?UTF-8?q?=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 entry/src/main/cpp/src/CMakeLists.txt         |  174 +
 entry/src/main/cpp/src/config-debug.h.in      |   69 +
 entry/src/main/cpp/src/config-dev.h.in        |   50 +
 entry/src/main/cpp/src/config-features.h.in   |   30 +
 entry/src/main/cpp/src/config-git.h.in        |   40 +
 entry/src/main/cpp/src/config-paths.h.in      |   22 +
 entry/src/main/cpp/src/config.h.in            |   57 +
 entry/src/main/cpp/src/core/CMakeLists.txt    |   20 +
 .../main/cpp/src/core/audio/AudioPlayer.cpp   |   85 +
 .../src/main/cpp/src/core/audio/AudioPlayer.h |   56 +
 .../src/main/cpp/src/core/audio/AudioQueue.h  |  147 +
 .../main/cpp/src/core/audio/AudioRecorder.cpp |   32 +
 .../main/cpp/src/core/audio/AudioRecorder.h   |   44 +
 .../main/cpp/src/core/audio/DeviceInfo.cpp    |   15 +
 .../src/main/cpp/src/core/audio/DeviceInfo.h  |   37 +
 .../cpp/src/core/audio/PortAudioConsumer.cpp  |  162 +
 .../cpp/src/core/audio/PortAudioConsumer.h    |   46 +
 .../cpp/src/core/audio/PortAudioProducer.cpp  |  127 +
 .../cpp/src/core/audio/PortAudioProducer.h    |   52 +
 .../src/main/cpp/src/core/audio/SNDFileCpp.h  |   61 +
 .../cpp/src/core/audio/VorbisConsumer.cpp     |   80 +
 .../main/cpp/src/core/audio/VorbisConsumer.h  |   39 +
 .../cpp/src/core/audio/VorbisProducer.cpp     |   84 +
 .../main/cpp/src/core/audio/VorbisProducer.h  |   37 +
 .../cpp/src/core/control/AudioController.cpp  |  132 +
 .../cpp/src/core/control/AudioController.h    |   72 +
 .../cpp/src/core/control/ClipboardHandler.cpp |  323 ++
 .../cpp/src/core/control/ClipboardHandler.h   |   73 +
 .../src/core/control/CompassController.cpp    |  125 +
 .../cpp/src/core/control/CompassController.h  |  136 +
 .../src/main/cpp/src/core/control/Control.cpp | 2612 +++++++++++
 entry/src/main/cpp/src/core/control/Control.h |  569 +++
 .../cpp/src/core/control/CrashHandler.cpp     |   83 +
 .../main/cpp/src/core/control/CrashHandler.h  |   17 +
 .../cpp/src/core/control/DeviceListHelper.cpp |  124 +
 .../cpp/src/core/control/DeviceListHelper.h   |   46 +
 .../cpp/src/core/control/ExportHelper.cpp     |  110 +
 .../main/cpp/src/core/control/ExportHelper.h  |   62 +
 .../core/control/GeometryToolController.cpp   |  127 +
 .../src/core/control/GeometryToolController.h |  103 +
 .../cpp/src/core/control/LatexController.cpp  |  366 ++
 .../cpp/src/core/control/LatexController.h    |  230 +
 .../PageBackgroundChangeController.cpp        |  380 ++
 .../control/PageBackgroundChangeController.h  |  103 +
 .../main/cpp/src/core/control/PdfCache.cpp    |  164 +
 .../src/main/cpp/src/core/control/PdfCache.h  |   93 +
 .../cpp/src/core/control/PrintHandler.cpp     |  128 +
 .../main/cpp/src/core/control/PrintHandler.h  |   22 +
 .../cpp/src/core/control/RecentManager.cpp    |  150 +
 .../main/cpp/src/core/control/RecentManager.h |   70 +
 .../cpp/src/core/control/ScrollHandler.cpp    |  125 +
 .../main/cpp/src/core/control/ScrollHandler.h |   58 +
 .../cpp/src/core/control/SearchControl.cpp    |   73 +
 .../main/cpp/src/core/control/SearchControl.h |   52 +
 .../src/core/control/SetsquareController.cpp  |  120 +
 .../src/core/control/SetsquareController.h    |  130 +
 entry/src/main/cpp/src/core/control/Tool.cpp  |   38 +
 entry/src/main/cpp/src/core/control/Tool.h    |   77 +
 .../main/cpp/src/core/control/ToolBase.cpp    |   77 +
 .../src/main/cpp/src/core/control/ToolBase.h  |  140 +
 .../main/cpp/src/core/control/ToolEnums.cpp   |  142 +
 .../src/main/cpp/src/core/control/ToolEnums.h |  200 +
 .../main/cpp/src/core/control/ToolHandler.cpp |  699 +++
 .../main/cpp/src/core/control/ToolHandler.h   |  417 ++
 .../src/core/control/UndoRedoController.cpp   |   89 +
 .../cpp/src/core/control/UndoRedoController.h |   48 +
 .../main/cpp/src/core/control/XournalMain.cpp |  705 +++
 .../main/cpp/src/core/control/XournalMain.h   |   20 +
 .../core/control/actions/ActionDatabase.cpp   |  209 +
 .../src/core/control/actions/ActionDatabase.h |  120 +
 .../core/control/actions/ActionProperties.h   | 1100 +++++
 .../cpp/src/core/control/actions/ActionRef.h  |   15 +
 .../cpp/src/core/control/jobs/AutosaveJob.cpp |   79 +
 .../cpp/src/core/control/jobs/AutosaveJob.h   |   36 +
 .../src/core/control/jobs/BaseExportJob.cpp   |  104 +
 .../cpp/src/core/control/jobs/BaseExportJob.h |   74 +
 .../cpp/src/core/control/jobs/BlockingJob.cpp |   25 +
 .../cpp/src/core/control/jobs/BlockingJob.h   |   34 +
 .../src/core/control/jobs/CustomExportJob.cpp |  158 +
 .../src/core/control/jobs/CustomExportJob.h   |   91 +
 .../cpp/src/core/control/jobs/ImageExport.cpp |  260 ++
 .../cpp/src/core/control/jobs/ImageExport.h   |  196 +
 .../main/cpp/src/core/control/jobs/Job.cpp    |   55 +
 .../src/main/cpp/src/core/control/jobs/Job.h  |   99 +
 .../src/core/control/jobs/PdfExportJob.cpp    |   42 +
 .../cpp/src/core/control/jobs/PdfExportJob.h  |   32 +
 .../cpp/src/core/control/jobs/PreviewJob.cpp  |  132 +
 .../cpp/src/core/control/jobs/PreviewJob.h    |   61 +
 .../src/core/control/jobs/ProgressListener.h  |   28 +
 .../cpp/src/core/control/jobs/RenderJob.cpp   |  120 +
 .../cpp/src/core/control/jobs/RenderJob.h     |   50 +
 .../cpp/src/core/control/jobs/SaveJob.cpp     |  156 +
 .../main/cpp/src/core/control/jobs/SaveJob.h  |   43 +
 .../cpp/src/core/control/jobs/Scheduler.cpp   |  212 +
 .../cpp/src/core/control/jobs/Scheduler.h     |  147 +
 .../core/control/jobs/XournalScheduler.cpp    |  119 +
 .../src/core/control/jobs/XournalScheduler.h  |   58 +
 .../src/core/control/latex/LatexGenerator.cpp |   95 +
 .../src/core/control/latex/LatexGenerator.h   |   55 +
 .../core/control/layer/LayerController.cpp    |  453 ++
 .../src/core/control/layer/LayerController.h  |  121 +
 .../core/control/layer/LayerCtrlListener.cpp  |   19 +
 .../core/control/layer/LayerCtrlListener.h    |   31 +
 .../core/control/pagetype/PageTypeHandler.cpp |  166 +
 .../core/control/pagetype/PageTypeHandler.h   |   51 +
 .../core/control/settings/ButtonConfig.cpp    |  103 +
 .../src/core/control/settings/ButtonConfig.h  |   81 +
 .../core/control/settings/LatexSettings.cpp   |    1 +
 .../src/core/control/settings/LatexSettings.h |   51 +
 .../core/control/settings/MetadataManager.cpp |  239 ++
 .../core/control/settings/MetadataManager.h   |   86 +
 .../control/settings/PageTemplateSettings.cpp |  119 +
 .../control/settings/PageTemplateSettings.h   |   81 +
 .../core/control/settings/RecolorParameters.h |   16 +
 .../src/core/control/settings/Settings.cpp    | 2697 ++++++++++++
 .../cpp/src/core/control/settings/Settings.h  | 1186 +++++
 .../core/control/settings/SettingsEnums.cpp   |   77 +
 .../src/core/control/settings/SettingsEnums.h |  205 +
 .../src/core/control/settings/ViewModes.cpp   |   35 +
 .../cpp/src/core/control/settings/ViewModes.h |   48 +
 .../shaperecognizer/CircleRecognizer.cpp      |   77 +
 .../shaperecognizer/CircleRecognizer.h        |   29 +
 .../core/control/shaperecognizer/Inertia.cpp  |   87 +
 .../core/control/shaperecognizer/Inertia.h    |   48 +
 .../control/shaperecognizer/RecoSegment.cpp   |   48 +
 .../control/shaperecognizer/RecoSegment.h     |   41 +
 .../shaperecognizer/ShapeRecognizer.cpp       |  449 ++
 .../control/shaperecognizer/ShapeRecognizer.h |   50 +
 .../shaperecognizer/ShapeRecognizerConfig.h   |   34 +
 .../src/core/control/tools/ArrowHandler.cpp   |   87 +
 .../cpp/src/core/control/tools/ArrowHandler.h |   32 +
 .../core/control/tools/BaseShapeHandler.cpp   |  180 +
 .../src/core/control/tools/BaseShapeHandler.h |  116 +
 .../control/tools/CoordinateSystemHandler.cpp |   65 +
 .../control/tools/CoordinateSystemHandler.h   |   30 +
 .../core/control/tools/CursorSelectionType.h  |   32 +
 .../src/core/control/tools/EditSelection.cpp  | 1262 ++++++
 .../src/core/control/tools/EditSelection.h    |  470 ++
 .../control/tools/EditSelectionContents.cpp   |  582 +++
 .../control/tools/EditSelectionContents.h     |  232 +
 .../src/core/control/tools/EllipseHandler.cpp |  106 +
 .../src/core/control/tools/EllipseHandler.h   |   31 +
 .../src/core/control/tools/EraseHandler.cpp   |  145 +
 .../cpp/src/core/control/tools/EraseHandler.h |   58 +
 .../src/core/control/tools/ImageHandler.cpp   |  153 +
 .../cpp/src/core/control/tools/ImageHandler.h |   52 +
 .../core/control/tools/ImageSizeSelection.cpp |   36 +
 .../core/control/tools/ImageSizeSelection.h   |   42 +
 .../src/core/control/tools/InputHandler.cpp   |   62 +
 .../cpp/src/core/control/tools/InputHandler.h |  108 +
 .../control/tools/LaserPointerHandler.cpp     |   99 +
 .../core/control/tools/LaserPointerHandler.h  |   71 +
 .../core/control/tools/PdfElemSelection.cpp   |  139 +
 .../src/core/control/tools/PdfElemSelection.h |  109 +
 .../core/control/tools/RectangleHandler.cpp   |   59 +
 .../src/core/control/tools/RectangleHandler.h |   31 +
 .../src/core/control/tools/RulerHandler.cpp   |   19 +
 .../cpp/src/core/control/tools/RulerHandler.h |   31 +
 .../cpp/src/core/control/tools/Selector.cpp   |  199 +
 .../cpp/src/core/control/tools/Selector.h     |   98 +
 .../control/tools/SnapToGridInputHandler.cpp  |  154 +
 .../control/tools/SnapToGridInputHandler.h    |  115 +
 .../src/core/control/tools/SplineHandler.cpp  |  406 ++
 .../src/core/control/tools/SplineHandler.h    |  129 +
 .../src/core/control/tools/StrokeHandler.cpp  |  301 ++
 .../src/core/control/tools/StrokeHandler.h    |  108 +
 .../core/control/tools/StrokeStabilizer.cpp   |  405 ++
 .../src/core/control/tools/StrokeStabilizer.h |  586 +++
 .../core/control/tools/StrokeStabilizerEnum.h |   27 +
 .../cpp/src/core/control/tools/TextEditor.cpp | 1112 +++++
 .../cpp/src/core/control/tools/TextEditor.h   |  214 +
 .../control/tools/TextEditorKeyBindings.h     |  150 +
 .../control/tools/VerticalToolHandler.cpp     |  143 +
 .../core/control/tools/VerticalToolHandler.h  |  135 +
 .../cpp/src/core/control/xml/Attribute.cpp    |    9 +
 .../main/cpp/src/core/control/xml/Attribute.h |   30 +
 .../core/control/xml/DoubleArrayAttribute.cpp |   32 +
 .../core/control/xml/DoubleArrayAttribute.h   |   31 +
 .../src/core/control/xml/DoubleAttribute.cpp  |   20 +
 .../src/core/control/xml/DoubleAttribute.h    |   29 +
 .../cpp/src/core/control/xml/IntAttribute.cpp |   18 +
 .../cpp/src/core/control/xml/IntAttribute.h   |   28 +
 .../src/core/control/xml/SizeTAttribute.cpp   |   18 +
 .../cpp/src/core/control/xml/SizeTAttribute.h |   30 +
 .../src/core/control/xml/TextAttribute.cpp    |   25 +
 .../cpp/src/core/control/xml/TextAttribute.h  |   30 +
 .../cpp/src/core/control/xml/XmlAudioNode.cpp |   13 +
 .../cpp/src/core/control/xml/XmlAudioNode.h   |   32 +
 .../cpp/src/core/control/xml/XmlImageNode.cpp |   65 +
 .../cpp/src/core/control/xml/XmlImageNode.h   |   38 +
 .../main/cpp/src/core/control/xml/XmlNode.cpp |   95 +
 .../main/cpp/src/core/control/xml/XmlNode.h   |   52 +
 .../cpp/src/core/control/xml/XmlPointNode.cpp |   34 +
 .../cpp/src/core/control/xml/XmlPointNode.h   |   32 +
 .../cpp/src/core/control/xml/XmlTexNode.cpp   |   27 +
 .../cpp/src/core/control/xml/XmlTexNode.h     |   33 +
 .../cpp/src/core/control/xml/XmlTextNode.cpp  |   30 +
 .../cpp/src/core/control/xml/XmlTextNode.h    |   33 +
 .../src/core/control/xojfile/LoadHandler.cpp  | 1188 +++++
 .../src/core/control/xojfile/LoadHandler.h    |  176 +
 .../control/xojfile/LoadHandlerHelper.cpp     |  211 +
 .../core/control/xojfile/LoadHandlerHelper.h  |   30 +
 .../src/core/control/xojfile/SaveHandler.cpp  |  379 ++
 .../src/core/control/xojfile/SaveHandler.h    |   85 +
 .../core/control/xojfile/XojExportHandler.cpp |   61 +
 .../core/control/xojfile/XojExportHandler.h   |   42 +
 .../cpp/src/core/control/zoom/ZoomControl.cpp |  422 ++
 .../cpp/src/core/control/zoom/ZoomControl.h   |  265 ++
 .../src/core/control/zoom/ZoomListener.cpp    |    5 +
 .../cpp/src/core/control/zoom/ZoomListener.h  |   20 +
 .../src/main/cpp/src/core/enums/Action.enum.h |  195 +
 .../cpp/src/core/enums/generateConvert.php    |  104 +
 .../generated/Action.NameMap.generated.h      |  121 +
 entry/src/main/cpp/src/core/gui/Builder.cpp   |   10 +
 entry/src/main/cpp/src/core/gui/Builder.h     |   42 +
 .../cpp/src/core/gui/CreatePreviewImage.cpp   |   39 +
 .../cpp/src/core/gui/CreatePreviewImage.h     |   26 +
 .../main/cpp/src/core/gui/FloatingToolbox.cpp |  217 +
 .../main/cpp/src/core/gui/FloatingToolbox.h   |   94 +
 entry/src/main/cpp/src/core/gui/GladeGui.cpp  |   57 +
 entry/src/main/cpp/src/core/gui/GladeGui.h    |   55 +
 .../main/cpp/src/core/gui/GladeSearchpath.cpp |   52 +
 .../main/cpp/src/core/gui/GladeSearchpath.h   |   41 +
 .../main/cpp/src/core/gui/IconNameHelper.cpp  |   15 +
 .../main/cpp/src/core/gui/IconNameHelper.h    |   27 +
 entry/src/main/cpp/src/core/gui/Layout.cpp    |  432 ++
 entry/src/main/cpp/src/core/gui/Layout.h      |  175 +
 .../main/cpp/src/core/gui/LayoutMapper.cpp    |  177 +
 .../src/main/cpp/src/core/gui/LayoutMapper.h  |  114 +
 .../cpp/src/core/gui/LegacyRedrawable.cpp     |   18 +
 .../main/cpp/src/core/gui/LegacyRedrawable.h  |   87 +
 .../src/main/cpp/src/core/gui/MainWindow.cpp  |  742 ++++
 entry/src/main/cpp/src/core/gui/MainWindow.h  |  196 +
 .../src/core/gui/PagePreviewDecoration.cpp    |  129 +
 .../cpp/src/core/gui/PagePreviewDecoration.h  |   70 +
 entry/src/main/cpp/src/core/gui/PageView.cpp  | 1205 ++++++
 entry/src/main/cpp/src/core/gui/PageView.h    |  323 ++
 .../src/core/gui/PageViewFindObjectHelper.h   |  204 +
 .../cpp/src/core/gui/PaperFormatUtils.cpp     |   57 +
 .../main/cpp/src/core/gui/PaperFormatUtils.h  |   42 +
 .../cpp/src/core/gui/PdfFloatingToolbox.cpp   |  239 ++
 .../cpp/src/core/gui/PdfFloatingToolbox.h     |   97 +
 .../main/cpp/src/core/gui/PopoverFactory.h    |   23 +
 .../main/cpp/src/core/gui/RepaintHandler.cpp  |   29 +
 .../main/cpp/src/core/gui/RepaintHandler.h    |   40 +
 entry/src/main/cpp/src/core/gui/SearchBar.cpp |  198 +
 entry/src/main/cpp/src/core/gui/SearchBar.h   |   65 +
 entry/src/main/cpp/src/core/gui/Shadow.cpp    |  217 +
 entry/src/main/cpp/src/core/gui/Shadow.h      |   52 +
 entry/src/main/cpp/src/core/gui/ShadowCode.c  |   99 +
 .../cpp/src/core/gui/ToolbarDefinitions.h     |   44 +
 .../cpp/src/core/gui/ToolitemDragDrop.cpp     |   88 +
 .../main/cpp/src/core/gui/ToolitemDragDrop.h  |   57 +
 .../src/main/cpp/src/core/gui/XournalView.cpp |  861 ++++
 entry/src/main/cpp/src/core/gui/XournalView.h |  195 +
 .../main/cpp/src/core/gui/XournalppCursor.cpp |  648 +++
 .../main/cpp/src/core/gui/XournalppCursor.h   |   76 +
 .../cpp/src/core/gui/dialog/AboutDialog.cpp   |   76 +
 .../cpp/src/core/gui/dialog/AboutDialog.h     |   29 +
 .../core/gui/dialog/AbstractLatexDialog.cpp   |  106 +
 .../src/core/gui/dialog/AbstractLatexDialog.h |   93 +
 .../src/core/gui/dialog/ButtonConfigGui.cpp   |  284 ++
 .../cpp/src/core/gui/dialog/ButtonConfigGui.h |   62 +
 .../core/gui/dialog/DeviceClassConfigGui.cpp  |   61 +
 .../core/gui/dialog/DeviceClassConfigGui.h    |   42 +
 .../src/core/gui/dialog/DeviceListDialog.cpp  |   39 +
 .../src/core/gui/dialog/DeviceListDialog.h    |   37 +
 .../src/core/gui/dialog/DeviceTestingArea.cpp |  425 ++
 .../src/core/gui/dialog/DeviceTestingArea.h   |   82 +
 .../cpp/src/core/gui/dialog/ExportDialog.cpp  |  192 +
 .../cpp/src/core/gui/dialog/ExportDialog.h    |   76 +
 .../src/core/gui/dialog/ExtEdLatexDialog.cpp  |  192 +
 .../src/core/gui/dialog/ExtEdLatexDialog.h    |   48 +
 .../gui/dialog/FileChooserFiltersHelper.cpp   |   44 +
 .../gui/dialog/FileChooserFiltersHelper.h     |   26 +
 .../cpp/src/core/gui/dialog/FormatDialog.cpp  |  216 +
 .../cpp/src/core/gui/dialog/FormatDialog.h    |   72 +
 .../cpp/src/core/gui/dialog/GotoDialog.cpp    |   34 +
 .../main/cpp/src/core/gui/dialog/GotoDialog.h |   38 +
 .../src/core/gui/dialog/IntEdLatexDialog.cpp  |  184 +
 .../src/core/gui/dialog/IntEdLatexDialog.h    |   55 +
 .../src/core/gui/dialog/LanguageConfigGui.cpp |   88 +
 .../src/core/gui/dialog/LanguageConfigGui.h   |   37 +
 .../core/gui/dialog/LatexSettingsPanel.cpp    |  205 +
 .../src/core/gui/dialog/LatexSettingsPanel.h  |   50 +
 .../core/gui/dialog/PageTemplateDialog.cpp    |  224 +
 .../src/core/gui/dialog/PageTemplateDialog.h  |   80 +
 .../cpp/src/core/gui/dialog/PluginDialog.cpp  |   48 +
 .../cpp/src/core/gui/dialog/PluginDialog.h    |   48 +
 .../src/core/gui/dialog/PluginDialogEntry.cpp |   52 +
 .../src/core/gui/dialog/PluginDialogEntry.h   |   40 +
 .../src/core/gui/dialog/RenameLayerDialog.cpp |   40 +
 .../src/core/gui/dialog/RenameLayerDialog.h   |   36 +
 .../dialog/SelectBackgroundColorDialog.cpp    |  119 +
 .../gui/dialog/SelectBackgroundColorDialog.h  |   50 +
 .../core/gui/dialog/SelectOpacityDialog.cpp   |  121 +
 .../src/core/gui/dialog/SelectOpacityDialog.h |   41 +
 .../src/core/gui/dialog/SettingsDialog.cpp    | 1104 +++++
 .../cpp/src/core/gui/dialog/SettingsDialog.h  |  105 +
 .../gui/dialog/SettingsDialogPaletteTab.cpp   |  213 +
 .../gui/dialog/SettingsDialogPaletteTab.h     |   36 +
 .../core/gui/dialog/ToolbarManageDialog.cpp   |  187 +
 .../src/core/gui/dialog/ToolbarManageDialog.h |   60 +
 .../cpp/src/core/gui/dialog/XojOpenDlg.cpp    |  211 +
 .../main/cpp/src/core/gui/dialog/XojOpenDlg.h |   32 +
 .../cpp/src/core/gui/dialog/XojSaveDlg.cpp    |   91 +
 .../main/cpp/src/core/gui/dialog/XojSaveDlg.h |   56 +
 .../BackgroundSelectDialogBase.cpp            |  111 +
 .../BackgroundSelectDialogBase.h              |   64 +
 .../backgroundSelect/BaseElementView.cpp      |  145 +
 .../dialog/backgroundSelect/BaseElementView.h |   87 +
 .../backgroundSelect/ImageElementView.cpp     |   46 +
 .../backgroundSelect/ImageElementView.h       |   58 +
 .../dialog/backgroundSelect/ImagesDialog.cpp  |  120 +
 .../dialog/backgroundSelect/ImagesDialog.h    |   47 +
 .../backgroundSelect/PdfElementView.cpp       |   34 +
 .../dialog/backgroundSelect/PdfElementView.h  |   55 +
 .../backgroundSelect/PdfPagesDialog.cpp       |   98 +
 .../dialog/backgroundSelect/PdfPagesDialog.h  |   41 +
 .../ToolItemDragCurrentData.cpp               |   47 +
 .../ToolItemDragCurrentData.h                 |   38 +
 .../toolbarCustomize/ToolbarAdapter.cpp       |  345 ++
 .../dialog/toolbarCustomize/ToolbarAdapter.h  |   83 +
 .../ToolbarCustomizeDialog.cpp                |  325 ++
 .../toolbarCustomize/ToolbarCustomizeDialog.h |   93 +
 .../ToolbarDragDropHandler.cpp                |   57 +
 .../toolbarCustomize/ToolbarDragDropHandler.h |   42 +
 .../ToolbarDragDropHelper.cpp                 |  105 +
 .../toolbarCustomize/ToolbarDragDropHelper.h  |   25 +
 .../gui/inputdevices/AbstractInputHandler.cpp |   97 +
 .../gui/inputdevices/AbstractInputHandler.h   |   45 +
 .../gui/inputdevices/CompassInputHandler.cpp  |   90 +
 .../gui/inputdevices/CompassInputHandler.h    |   42 +
 .../src/core/gui/inputdevices/DeviceId.cpp    |   17 +
 .../cpp/src/core/gui/inputdevices/DeviceId.h  |   26 +
 .../inputdevices/GeometryToolInputHandler.cpp |  309 ++
 .../inputdevices/GeometryToolInputHandler.h   |  164 +
 .../core/gui/inputdevices/HandRecognition.cpp |  183 +
 .../core/gui/inputdevices/HandRecognition.h   |  112 +
 .../core/gui/inputdevices/InputContext.cpp    |  327 ++
 .../src/core/gui/inputdevices/InputContext.h  |  113 +
 .../src/core/gui/inputdevices/InputEvents.cpp |  111 +
 .../src/core/gui/inputdevices/InputEvents.h   |   83 +
 .../src/core/gui/inputdevices/InputUtils.cpp  |   42 +
 .../src/core/gui/inputdevices/InputUtils.h    |   50 +
 .../gui/inputdevices/KeyboardInputHandler.cpp |   17 +
 .../gui/inputdevices/KeyboardInputHandler.h   |   27 +
 .../gui/inputdevices/MouseInputHandler.cpp    |  157 +
 .../core/gui/inputdevices/MouseInputHandler.h |   51 +
 .../core/gui/inputdevices/PenInputHandler.cpp |  585 +++
 .../core/gui/inputdevices/PenInputHandler.h   |  158 +
 .../gui/inputdevices/PositionInputData.cpp    |    7 +
 .../core/gui/inputdevices/PositionInputData.h |   37 +
 .../src/core/gui/inputdevices/PrintEvent.cpp  |  172 +
 .../src/core/gui/inputdevices/PrintEvent.h    |   23 +
 .../inputdevices/SetsquareInputHandler.cpp    |   90 +
 .../gui/inputdevices/SetsquareInputHandler.h  |   40 +
 .../gui/inputdevices/StylusInputHandler.cpp   |  209 +
 .../gui/inputdevices/StylusInputHandler.h     |   49 +
 .../inputdevices/TouchDrawingInputHandler.cpp |  158 +
 .../inputdevices/TouchDrawingInputHandler.h   |   44 +
 .../gui/inputdevices/TouchInputHandler.cpp    |  221 +
 .../core/gui/inputdevices/TouchInputHandler.h |   61 +
 .../touchdisable/TouchDisableCustom.cpp       |   15 +
 .../touchdisable/TouchDisableCustom.h         |   31 +
 .../touchdisable/TouchDisableInterface.cpp    |    7 +
 .../touchdisable/TouchDisableInterface.h      |   26 +
 .../touchdisable/TouchDisableX11.cpp          |   86 +
 .../touchdisable/TouchDisableX11.h            |   57 +
 .../gui/menus/PageTypeSelectionMenuBase.cpp   |   86 +
 .../gui/menus/PageTypeSelectionMenuBase.h     |   60 +
 .../gui/menus/StaticAssertActionNamespace.h   |   52 +
 .../core/gui/menus/menubar/AbstractSubmenu.h  |   26 +
 .../src/core/gui/menus/menubar/Menubar.cpp    |  102 +
 .../cpp/src/core/gui/menus/menubar/Menubar.h  |   80 +
 .../gui/menus/menubar/PageTypeSubmenu.cpp     |   93 +
 .../core/gui/menus/menubar/PageTypeSubmenu.h  |   43 +
 .../core/gui/menus/menubar/PluginsSubmenu.cpp |   33 +
 .../core/gui/menus/menubar/PluginsSubmenu.h   |   34 +
 .../menus/menubar/RecentDocumentsSubmenu.cpp  |  231 +
 .../menus/menubar/RecentDocumentsSubmenu.h    |   74 +
 .../menus/menubar/ToolbarSelectionSubmenu.cpp |   88 +
 .../menus/menubar/ToolbarSelectionSubmenu.h   |   38 +
 .../popoverMenus/PageTypeSelectionPopover.cpp |  458 ++
 .../popoverMenus/PageTypeSelectionPopover.h   |   79 +
 .../PageTypeSelectionPopoverGridOnly.cpp      |   83 +
 .../PageTypeSelectionPopoverGridOnly.h        |   45 +
 .../src/core/gui/scroll/ScrollHandling.cpp    |   41 +
 .../cpp/src/core/gui/scroll/ScrollHandling.h  |   39 +
 .../core/gui/sidebar/AbstractSidebarPage.cpp  |   30 +
 .../core/gui/sidebar/AbstractSidebarPage.h    |   81 +
 .../main/cpp/src/core/gui/sidebar/Sidebar.cpp |  171 +
 .../main/cpp/src/core/gui/sidebar/Sidebar.h   |  139 +
 .../sidebar/indextree/SidebarIndexPage.cpp    |  305 ++
 .../gui/sidebar/indextree/SidebarIndexPage.h  |  126 +
 .../sidebar/previews/base/SidebarLayout.cpp   |  107 +
 .../gui/sidebar/previews/base/SidebarLayout.h |   28 +
 .../previews/base/SidebarPreviewBase.cpp      |  152 +
 .../previews/base/SidebarPreviewBase.h        |  138 +
 .../previews/base/SidebarPreviewBaseEntry.cpp |  165 +
 .../previews/base/SidebarPreviewBaseEntry.h   |  103 +
 .../layer/SidebarPreviewLayerEntry.cpp        |   72 +
 .../previews/layer/SidebarPreviewLayerEntry.h |   79 +
 .../previews/layer/SidebarPreviewLayers.cpp   |  143 +
 .../previews/layer/SidebarPreviewLayers.h     |   86 +
 .../previews/page/SidebarPreviewPageEntry.cpp |   56 +
 .../previews/page/SidebarPreviewPageEntry.h   |   45 +
 .../previews/page/SidebarPreviewPages.cpp     |  139 +
 .../previews/page/SidebarPreviewPages.h       |   76 +
 .../gui/toolbarMenubar/AbstractSliderItem.cpp |    6 +
 .../gui/toolbarMenubar/AbstractSliderItem.h   |   50 +
 .../gui/toolbarMenubar/AbstractToolItem.cpp   |   25 +
 .../gui/toolbarMenubar/AbstractToolItem.h     |   64 +
 .../toolbarMenubar/ColorSelectorToolItem.cpp  |   61 +
 .../toolbarMenubar/ColorSelectorToolItem.h    |   41 +
 .../core/gui/toolbarMenubar/ColorToolItem.cpp |   77 +
 .../core/gui/toolbarMenubar/ColorToolItem.h   |   63 +
 .../gui/toolbarMenubar/ComboToolButton.cpp    |  126 +
 .../core/gui/toolbarMenubar/ComboToolButton.h |   63 +
 .../DrawingTypeComboToolButton.cpp            |  172 +
 .../DrawingTypeComboToolButton.h              |   72 +
 .../core/gui/toolbarMenubar/FontButton.cpp    |   78 +
 .../src/core/gui/toolbarMenubar/FontButton.h  |   37 +
 .../toolbarMenubar/PluginPlaceholderLabel.cpp |   80 +
 .../toolbarMenubar/PluginPlaceholderLabel.h   |   52 +
 .../gui/toolbarMenubar/PluginToolButton.cpp   |   44 +
 .../gui/toolbarMenubar/PluginToolButton.h     |   35 +
 .../toolbarMenubar/SliderItemCreationHelper.h |   88 +
 .../toolbarMenubar/StylePopoverFactory.cpp    |   57 +
 .../gui/toolbarMenubar/StylePopoverFactory.h  |   46 +
 .../core/gui/toolbarMenubar/ToolButton.cpp    |  111 +
 .../src/core/gui/toolbarMenubar/ToolButton.h  |   52 +
 .../gui/toolbarMenubar/ToolMenuHandler.cpp    |  550 +++
 .../core/gui/toolbarMenubar/ToolMenuHandler.h |  142 +
 .../core/gui/toolbarMenubar/ToolPageLayer.cpp |  315 ++
 .../core/gui/toolbarMenubar/ToolPageLayer.h   |   42 +
 .../gui/toolbarMenubar/ToolPageSpinner.cpp    |  138 +
 .../core/gui/toolbarMenubar/ToolPageSpinner.h |   50 +
 .../toolbarMenubar/ToolPdfCombocontrol.cpp    |   17 +
 .../gui/toolbarMenubar/ToolPdfCombocontrol.h  |   14 +
 .../toolbarMenubar/ToolSelectCombocontrol.cpp |   29 +
 .../toolbarMenubar/ToolSelectCombocontrol.h   |   24 +
 .../gui/toolbarMenubar/ToolZoomSlider.cpp     |   78 +
 .../core/gui/toolbarMenubar/ToolZoomSlider.h  |   61 +
 .../gui/toolbarMenubar/TooltipToolButton.cpp  |   33 +
 .../gui/toolbarMenubar/TooltipToolButton.h    |   36 +
 .../gui/toolbarMenubar/icon/ColorIcon.cpp     |   62 +
 .../core/gui/toolbarMenubar/icon/ColorIcon.h  |   35 +
 .../icon/ToolbarSeparatorImage.cpp            |   48 +
 .../icon/ToolbarSeparatorImage.h              |   40 +
 .../gui/toolbarMenubar/model/ColorPalette.cpp |  182 +
 .../gui/toolbarMenubar/model/ColorPalette.h   |  217 +
 .../gui/toolbarMenubar/model/ToolbarData.cpp  |  163 +
 .../gui/toolbarMenubar/model/ToolbarData.h    |   53 +
 .../gui/toolbarMenubar/model/ToolbarEntry.cpp |   55 +
 .../gui/toolbarMenubar/model/ToolbarEntry.h   |   51 +
 .../gui/toolbarMenubar/model/ToolbarItem.cpp  |   22 +
 .../gui/toolbarMenubar/model/ToolbarItem.h    |   40 +
 .../gui/toolbarMenubar/model/ToolbarModel.cpp |  162 +
 .../gui/toolbarMenubar/model/ToolbarModel.h   |   48 +
 .../src/core/gui/widgets/SpinPageAdapter.cpp  |   70 +
 .../src/core/gui/widgets/SpinPageAdapter.h    |   65 +
 .../src/core/gui/widgets/XournalWidget.cpp    |  327 ++
 .../cpp/src/core/gui/widgets/XournalWidget.h  |   88 +
 .../cpp/src/core/gui/widgets/ZoomCallib.cpp   |  155 +
 .../cpp/src/core/gui/widgets/ZoomCallib.h     |   43 +
 .../main/cpp/src/core/model/AudioElement.cpp  |   48 +
 .../main/cpp/src/core/model/AudioElement.h    |   46 +
 .../cpp/src/core/model/BackgroundConfig.cpp   |   67 +
 .../cpp/src/core/model/BackgroundConfig.h     |   47 +
 .../cpp/src/core/model/BackgroundImage.cpp    |   87 +
 .../main/cpp/src/core/model/BackgroundImage.h |   49 +
 entry/src/main/cpp/src/core/model/Compass.cpp |   44 +
 entry/src/main/cpp/src/core/model/Compass.h   |   49 +
 .../src/main/cpp/src/core/model/Document.cpp  |  472 ++
 entry/src/main/cpp/src/core/model/Document.h  |  184 +
 .../cpp/src/core/model/DocumentChangeType.h   |   14 +
 .../cpp/src/core/model/DocumentHandler.cpp    |   33 +
 .../main/cpp/src/core/model/DocumentHandler.h |   44 +
 .../cpp/src/core/model/DocumentListener.cpp   |   32 +
 .../cpp/src/core/model/DocumentListener.h     |   38 +
 entry/src/main/cpp/src/core/model/Element.cpp |  162 +
 entry/src/main/cpp/src/core/model/Element.h   |  123 +
 .../cpp/src/core/model/ElementContainer.h     |   25 +
 .../src/core/model/ElementInsertionPosition.h |   58 +
 entry/src/main/cpp/src/core/model/Font.cpp    |   71 +
 entry/src/main/cpp/src/core/model/Font.h      |   68 +
 .../cpp/src/core/model/FormatDefinitions.cpp  |    7 +
 .../cpp/src/core/model/FormatDefinitions.h    |   20 +
 .../main/cpp/src/core/model/GeometryTool.cpp  |   49 +
 .../main/cpp/src/core/model/GeometryTool.h    |  112 +
 entry/src/main/cpp/src/core/model/Image.cpp   |  268 ++
 entry/src/main/cpp/src/core/model/Image.h     |   99 +
 entry/src/main/cpp/src/core/model/Layer.cpp   |  145 +
 entry/src/main/cpp/src/core/model/Layer.h     |  126 +
 .../src/main/cpp/src/core/model/LineStyle.cpp |   38 +
 entry/src/main/cpp/src/core/model/LineStyle.h |   55 +
 .../cpp/src/core/model/LinkDestination.cpp    |   99 +
 .../main/cpp/src/core/model/LinkDestination.h |  108 +
 .../src/main/cpp/src/core/model/MathVect.cpp  |   17 +
 entry/src/main/cpp/src/core/model/MathVect.h  |   42 +
 .../src/main/cpp/src/core/model/OverlayBase.h |   23 +
 .../main/cpp/src/core/model/PageHandler.cpp   |   40 +
 .../src/main/cpp/src/core/model/PageHandler.h |   52 +
 .../main/cpp/src/core/model/PageListener.cpp  |   19 +
 .../main/cpp/src/core/model/PageListener.h    |   42 +
 entry/src/main/cpp/src/core/model/PageRef.h   |   18 +
 .../src/main/cpp/src/core/model/PageType.cpp  |   37 +
 entry/src/main/cpp/src/core/model/PageType.h  |   59 +
 .../src/main/cpp/src/core/model/PaperSize.cpp |   30 +
 entry/src/main/cpp/src/core/model/PaperSize.h |   62 +
 .../main/cpp/src/core/model/PathParameter.h   |   30 +
 entry/src/main/cpp/src/core/model/Point.cpp   |   23 +
 entry/src/main/cpp/src/core/model/Point.h     |  102 +
 .../src/main/cpp/src/core/model/Setsquare.cpp |   49 +
 entry/src/main/cpp/src/core/model/Setsquare.h |   57 +
 .../src/main/cpp/src/core/model/Snapping.cpp  |   71 +
 entry/src/main/cpp/src/core/model/Snapping.h  |   83 +
 .../main/cpp/src/core/model/SplineSegment.cpp |   70 +
 .../main/cpp/src/core/model/SplineSegment.h   |  109 +
 entry/src/main/cpp/src/core/model/Stroke.cpp  |  875 ++++
 entry/src/main/cpp/src/core/model/Stroke.h    |  228 +
 .../main/cpp/src/core/model/StrokeContour.cpp |  354 ++
 .../main/cpp/src/core/model/StrokeContour.h   |   44 +
 .../main/cpp/src/core/model/StrokeStyle.cpp   |   79 +
 .../src/main/cpp/src/core/model/StrokeStyle.h |   30 +
 .../src/main/cpp/src/core/model/TexImage.cpp  |  170 +
 entry/src/main/cpp/src/core/model/TexImage.h  |  114 +
 entry/src/main/cpp/src/core/model/Text.cpp    |  199 +
 entry/src/main/cpp/src/core/model/Text.h      |   80 +
 entry/src/main/cpp/src/core/model/XojPage.cpp |  177 +
 entry/src/main/cpp/src/core/model/XojPage.h   |  141 +
 .../src/core/model/eraser/ErasableStroke.cpp  |  375 ++
 .../src/core/model/eraser/ErasableStroke.h    |  152 +
 .../eraser/ErasableStrokeOverlapTree.cpp      |  233 +
 .../model/eraser/ErasableStrokeOverlapTree.h  |  163 +
 .../cpp/src/core/model/eraser/PaddedBox.h     |   34 +
 .../main/cpp/src/core/model/eraser/readme.txt |    4 +
 .../cpp/src/core/pdf/base/HybridPdfExport.cpp |  127 +
 .../cpp/src/core/pdf/base/HybridPdfExport.h   |   52 +
 .../src/core/pdf/base/PdfExportBackend.cpp    |   45 +
 .../cpp/src/core/pdf/base/PdfExportBackend.h  |   43 +
 .../main/cpp/src/core/pdf/base/QPdfExport.cpp |  179 +
 .../main/cpp/src/core/pdf/base/QPdfExport.h   |   36 +
 .../src/core/pdf/base/XojCairoPdfExport.cpp   |  283 ++
 .../cpp/src/core/pdf/base/XojCairoPdfExport.h |   83 +
 .../cpp/src/core/pdf/base/XojPdfAction.cpp    |    5 +
 .../main/cpp/src/core/pdf/base/XojPdfAction.h |   31 +
 .../core/pdf/base/XojPdfBookmarkIterator.cpp  |    5 +
 .../core/pdf/base/XojPdfBookmarkIterator.h    |   29 +
 .../cpp/src/core/pdf/base/XojPdfDocument.cpp  |   51 +
 .../cpp/src/core/pdf/base/XojPdfDocument.h    |   54 +
 .../core/pdf/base/XojPdfDocumentInterface.cpp |    5 +
 .../core/pdf/base/XojPdfDocumentInterface.h   |   45 +
 .../cpp/src/core/pdf/base/XojPdfExport.cpp    |   12 +
 .../main/cpp/src/core/pdf/base/XojPdfExport.h |   43 +
 .../src/core/pdf/base/XojPdfExportFactory.cpp |   29 +
 .../src/core/pdf/base/XojPdfExportFactory.h   |   30 +
 .../main/cpp/src/core/pdf/base/XojPdfPage.cpp |    3 +
 .../main/cpp/src/core/pdf/base/XojPdfPage.h   |  113 +
 .../core/pdf/popplerapi/PopplerGlibAction.cpp |  100 +
 .../core/pdf/popplerapi/PopplerGlibAction.h   |   42 +
 .../pdf/popplerapi/PopplerGlibDocument.cpp    |  136 +
 .../core/pdf/popplerapi/PopplerGlibDocument.h |   53 +
 .../core/pdf/popplerapi/PopplerGlibPage.cpp   |  331 ++
 .../src/core/pdf/popplerapi/PopplerGlibPage.h |   57 +
 .../PopplerGlibPageBookmarkIterator.cpp       |   49 +
 .../PopplerGlibPageBookmarkIterator.h         |   35 +
 .../ActionBackwardCompatibilityLayer.cpp      |  208 +
 .../plugin/ActionBackwardCompatibilityLayer.h |   29 +
 entry/src/main/cpp/src/core/plugin/Plugin.cpp |  367 ++
 entry/src/main/cpp/src/core/plugin/Plugin.h   |  218 +
 .../cpp/src/core/plugin/PluginController.cpp  |  189 +
 .../cpp/src/core/plugin/PluginController.h    |   63 +
 .../cpp/src/core/plugin/luapi_application.h   | 3805 +++++++++++++++++
 .../main/cpp/src/core/undo/AddUndoAction.cpp  |  103 +
 .../main/cpp/src/core/undo/AddUndoAction.h    |   41 +
 .../cpp/src/core/undo/ArrangeUndoAction.cpp   |   59 +
 .../cpp/src/core/undo/ArrangeUndoAction.h     |   51 +
 .../cpp/src/core/undo/ColorUndoAction.cpp     |   97 +
 .../main/cpp/src/core/undo/ColorUndoAction.h  |   42 +
 .../cpp/src/core/undo/DeleteUndoAction.cpp    |  105 +
 .../main/cpp/src/core/undo/DeleteUndoAction.h |   42 +
 .../src/core/undo/EmergencySaveRestore.cpp    |   22 +
 .../cpp/src/core/undo/EmergencySaveRestore.h  |   34 +
 .../cpp/src/core/undo/EraseUndoAction.cpp     |  106 +
 .../main/cpp/src/core/undo/EraseUndoAction.h  |   45 +
 .../main/cpp/src/core/undo/FillUndoAction.cpp |   88 +
 .../main/cpp/src/core/undo/FillUndoAction.h   |   42 +
 .../main/cpp/src/core/undo/FontUndoAction.cpp |  118 +
 .../main/cpp/src/core/undo/FontUndoAction.h   |   43 +
 .../cpp/src/core/undo/GroupUndoAction.cpp     |   52 +
 .../main/cpp/src/core/undo/GroupUndoAction.h  |   44 +
 .../core/undo/InsertDeletePageUndoAction.cpp  |   88 +
 .../core/undo/InsertDeletePageUndoAction.h    |   41 +
 .../src/core/undo/InsertLayerUndoAction.cpp   |   39 +
 .../cpp/src/core/undo/InsertLayerUndoAction.h |   40 +
 .../cpp/src/core/undo/InsertUndoAction.cpp    |  106 +
 .../main/cpp/src/core/undo/InsertUndoAction.h |   60 +
 .../src/core/undo/LayerRenameUndoAction.cpp   |   38 +
 .../cpp/src/core/undo/LayerRenameUndoAction.h |   38 +
 .../cpp/src/core/undo/LineStyleUndoAction.cpp |   86 +
 .../cpp/src/core/undo/LineStyleUndoAction.h   |   53 +
 .../core/undo/MergeLayerDownUndoAction.cpp    |   54 +
 .../src/core/undo/MergeLayerDownUndoAction.h  |   48 +
 .../src/core/undo/MissingPdfUndoAction.cpp    |   66 +
 .../cpp/src/core/undo/MissingPdfUndoAction.h  |   33 +
 .../cpp/src/core/undo/MoveLayerUndoAction.cpp |   38 +
 .../cpp/src/core/undo/MoveLayerUndoAction.h   |   41 +
 .../undo/MoveSelectionToLayerUndoAction.cpp   |   68 +
 .../undo/MoveSelectionToLayerUndoAction.h     |   45 +
 .../main/cpp/src/core/undo/MoveUndoAction.cpp |   96 +
 .../main/cpp/src/core/undo/MoveUndoAction.h   |   53 +
 .../undo/PageBackgroundChangedUndoAction.cpp  |   97 +
 .../undo/PageBackgroundChangedUndoAction.h    |   50 +
 .../cpp/src/core/undo/PageLayerPosEntry.h     |   43 +
 .../core/undo/PageSizeChangeUndoAction.cpp    |   42 +
 .../src/core/undo/PageSizeChangeUndoAction.h  |   38 +
 .../src/core/undo/RecognizerUndoAction.cpp    |   61 +
 .../cpp/src/core/undo/RecognizerUndoAction.h  |   44 +
 .../src/core/undo/RemoveLayerUndoAction.cpp   |   37 +
 .../cpp/src/core/undo/RemoveLayerUndoAction.h |   39 +
 .../cpp/src/core/undo/RotateUndoAction.cpp    |   58 +
 .../main/cpp/src/core/undo/RotateUndoAction.h |   44 +
 .../cpp/src/core/undo/ScaleUndoAction.cpp     |   62 +
 .../main/cpp/src/core/undo/ScaleUndoAction.h  |   48 +
 .../main/cpp/src/core/undo/SizeUndoAction.cpp |  118 +
 .../main/cpp/src/core/undo/SizeUndoAction.h   |   46 +
 .../main/cpp/src/core/undo/SwapUndoAction.cpp |   67 +
 .../main/cpp/src/core/undo/SwapUndoAction.h   |   44 +
 .../cpp/src/core/undo/TextBoxUndoAction.cpp   |   48 +
 .../cpp/src/core/undo/TextBoxUndoAction.h     |   41 +
 .../src/main/cpp/src/core/undo/UndoAction.cpp |   13 +
 entry/src/main/cpp/src/core/undo/UndoAction.h |   47 +
 .../cpp/src/core/undo/UndoRedoHandler.cpp     |  229 +
 .../main/cpp/src/core/undo/UndoRedoHandler.h  |   72 +
 .../main/cpp/src/core/view/CompassView.cpp    |  156 +
 .../src/main/cpp/src/core/view/CompassView.h  |  105 +
 .../src/core/view/DebugShowRepaintBounds.h    |    9 +
 .../main/cpp/src/core/view/DocumentView.cpp   |  115 +
 .../src/main/cpp/src/core/view/DocumentView.h |   93 +
 .../src/core/view/ElementContainerView.cpp    |   20 +
 .../cpp/src/core/view/ElementContainerView.h  |   31 +
 .../main/cpp/src/core/view/ElementView.cpp    |   32 +
 .../cpp/src/core/view/ErasableStrokeView.cpp  |  309 ++
 .../cpp/src/core/view/ErasableStrokeView.h    |   62 +
 .../cpp/src/core/view/GeometryToolView.cpp    |   71 +
 .../main/cpp/src/core/view/GeometryToolView.h |  132 +
 .../src/main/cpp/src/core/view/ImageView.cpp  |   39 +
 entry/src/main/cpp/src/core/view/ImageView.h  |   30 +
 .../src/main/cpp/src/core/view/LayerView.cpp  |   48 +
 entry/src/main/cpp/src/core/view/LayerView.h  |   32 +
 entry/src/main/cpp/src/core/view/Mask.cpp     |  211 +
 entry/src/main/cpp/src/core/view/Mask.h       |   91 +
 .../src/main/cpp/src/core/view/Repaintable.h  |   68 +
 .../main/cpp/src/core/view/SetsquareView.cpp  |  293 ++
 .../main/cpp/src/core/view/SetsquareView.h    |  113 +
 .../src/main/cpp/src/core/view/StrokeView.cpp |  169 +
 entry/src/main/cpp/src/core/view/StrokeView.h |   45 +
 .../cpp/src/core/view/StrokeViewHelper.cpp    |   73 +
 .../main/cpp/src/core/view/StrokeViewHelper.h |   40 +
 .../main/cpp/src/core/view/TexImageView.cpp   |   92 +
 .../src/main/cpp/src/core/view/TexImageView.h |   30 +
 entry/src/main/cpp/src/core/view/TextView.cpp |   53 +
 entry/src/main/cpp/src/core/view/TextView.h   |   42 +
 entry/src/main/cpp/src/core/view/View.h       |   52 +
 .../core/view/background/BackgroundFlags.h    |   37 +
 .../core/view/background/BackgroundView.cpp   |   95 +
 .../src/core/view/background/BackgroundView.h |   52 +
 .../BaseIsometricBackgroundView.cpp           |   86 +
 .../background/BaseIsometricBackgroundView.h  |   41 +
 .../view/background/DottedBackgroundView.cpp  |   57 +
 .../view/background/DottedBackgroundView.h    |   37 +
 .../view/background/GraphBackgroundView.cpp   |  136 +
 .../view/background/GraphBackgroundView.h     |   42 +
 .../view/background/ImageBackgroundView.cpp   |   33 +
 .../view/background/ImageBackgroundView.h     |   33 +
 .../background/IsoDottedBackgroundView.cpp    |   34 +
 .../view/background/IsoDottedBackgroundView.h |   35 +
 .../background/IsoGraphBackgroundView.cpp     |   89 +
 .../view/background/IsoGraphBackgroundView.h  |   35 +
 .../view/background/LinedBackgroundView.cpp   |   42 +
 .../view/background/LinedBackgroundView.h     |   36 +
 .../background/OneColorBackgroundView.cpp     |   34 +
 .../view/background/OneColorBackgroundView.h  |   42 +
 .../view/background/PdfBackgroundView.cpp     |   30 +
 .../core/view/background/PdfBackgroundView.h  |   41 +
 .../view/background/PlainBackgroundView.cpp   |   21 +
 .../view/background/PlainBackgroundView.h     |   35 +
 .../view/background/RuledBackgroundView.cpp   |   48 +
 .../view/background/RuledBackgroundView.h     |   40 +
 .../view/background/StavesBackgroundView.cpp  |   55 +
 .../view/background/StavesBackgroundView.h    |   41 +
 .../TransparentCheckerboardBackgroundView.cpp |   43 +
 .../TransparentCheckerboardBackgroundView.h   |   37 +
 .../overlays/BaseShapeOrSplineToolView.cpp    |   85 +
 .../view/overlays/BaseShapeOrSplineToolView.h |   45 +
 .../core/view/overlays/BaseStrokeToolView.cpp |   58 +
 .../core/view/overlays/BaseStrokeToolView.h   |   51 +
 .../view/overlays/ImageSizeSelectionView.cpp  |   57 +
 .../view/overlays/ImageSizeSelectionView.h    |   56 +
 .../core/view/overlays/LaserPointerView.cpp   |   85 +
 .../src/core/view/overlays/LaserPointerView.h |   83 +
 .../cpp/src/core/view/overlays/OverlayView.h  |   45 +
 .../view/overlays/PdfElementSelectionView.cpp |   37 +
 .../view/overlays/PdfElementSelectionView.h   |   57 +
 .../core/view/overlays/SearchResultView.cpp   |   47 +
 .../src/core/view/overlays/SearchResultView.h |   57 +
 .../src/core/view/overlays/SelectorView.cpp   |   56 +
 .../cpp/src/core/view/overlays/SelectorView.h |   51 +
 .../src/core/view/overlays/ShapeToolView.cpp  |   45 +
 .../src/core/view/overlays/ShapeToolView.h    |   58 +
 .../src/core/view/overlays/SplineToolView.cpp |  135 +
 .../src/core/view/overlays/SplineToolView.h   |   79 +
 .../StrokeToolFilledHighlighterView.cpp       |   73 +
 .../StrokeToolFilledHighlighterView.h         |   25 +
 .../view/overlays/StrokeToolFilledView.cpp    |   62 +
 .../core/view/overlays/StrokeToolFilledView.h |   59 +
 .../src/core/view/overlays/StrokeToolView.cpp |  147 +
 .../src/core/view/overlays/StrokeToolView.h   |  108 +
 .../core/view/overlays/TextEditionView.cpp    |   90 +
 .../src/core/view/overlays/TextEditionView.h  |   68 +
 .../core/view/overlays/VerticalToolView.cpp   |  127 +
 .../src/core/view/overlays/VerticalToolView.h |   82 +
 .../main/cpp/src/exe/Xournalpp-wrapper.cpp    |  244 ++
 entry/src/main/cpp/src/exe/Xournalpp.cpp      |   60 +
 entry/src/main/cpp/src/exe/osx/setup-env.cpp  |  130 +
 entry/src/main/cpp/src/exe/osx/setup-env.h    |    6 +
 entry/src/main/cpp/src/exe/win32/console.cpp  |   73 +
 entry/src/main/cpp/src/exe/win32/console.h    |    6 +
 entry/src/main/cpp/src/exe/win32/gui_main.cpp |   16 +
 entry/src/main/cpp/src/exe/win32/xpp.rc.in    |   31 +
 .../src/exe/xournalpp-wrapper.gresource.xml   |    6 +
 entry/src/main/cpp/src/util/Assert.cpp        |   15 +
 entry/src/main/cpp/src/util/CMakeLists.txt    |   13 +
 entry/src/main/cpp/src/util/Color.cpp         |   31 +
 entry/src/main/cpp/src/util/ElementRange.cpp  |  110 +
 entry/src/main/cpp/src/util/GtkUtil.cpp       |  177 +
 entry/src/main/cpp/src/util/GzUtil.cpp        |   11 +
 entry/src/main/cpp/src/util/NamedColor.cpp    |   65 +
 entry/src/main/cpp/src/util/OutputStream.cpp  |   76 +
 entry/src/main/cpp/src/util/PathUtil.cpp      |  535 +++
 .../main/cpp/src/util/PlaceholderString.cpp   |  107 +
 entry/src/main/cpp/src/util/Range.cpp         |   60 +
 entry/src/main/cpp/src/util/Recolor.cpp       |   57 +
 entry/src/main/cpp/src/util/SaveNameUtils.cpp |   48 +
 entry/src/main/cpp/src/util/Stacktrace.cpp    |   21 +
 entry/src/main/cpp/src/util/StringUtils.cpp   |   85 +
 entry/src/main/cpp/src/util/Util.cpp          |   81 +
 entry/src/main/cpp/src/util/VersionInfo.cpp   |  120 +
 entry/src/main/cpp/src/util/XojMsgBox.cpp     |  222 +
 .../main/cpp/src/util/XojPreviewExtractor.cpp |  174 +
 entry/src/main/cpp/src/util/gdk4_helper.cpp   |   32 +
 entry/src/main/cpp/src/util/gtk4_helper.cpp   |  196 +
 .../main/cpp/src/util/include/filesystem.h    |   17 +
 .../main/cpp/src/util/include/util/Assert.h   |   28 +
 .../util/include/util/BasePointerIterator.h   |   81 +
 .../src/util/include/util/CircularBuffer.h    |   49 +
 .../main/cpp/src/util/include/util/Color.h    |  247 ++
 .../cpp/src/util/include/util/DispatchPool.h  |  142 +
 .../cpp/src/util/include/util/ElementRange.h  |   37 +
 .../src/util/include/util/EnumIndexedArray.h  |   39 +
 .../cpp/src/util/include/util/GListView.h     |   88 +
 .../src/util/include/util/GVariantTemplate.h  |  129 +
 .../main/cpp/src/util/include/util/GtkUtil.h  |   54 +
 .../main/cpp/src/util/include/util/GzUtil.h   |   27 +
 .../main/cpp/src/util/include/util/Interval.h |  108 +
 .../main/cpp/src/util/include/util/LoopUtil.h |   31 +
 .../cpp/src/util/include/util/NamedColor.h    |  113 +
 .../cpp/src/util/include/util/OutputStream.h  |   50 +
 .../main/cpp/src/util/include/util/PairView.h |  133 +
 .../main/cpp/src/util/include/util/PathUtil.h |  173 +
 .../src/util/include/util/PlaceholderString.h |  140 +
 .../main/cpp/src/util/include/util/Point.h    |   53 +
 .../util/include/util/PointerContainerView.h  |   92 +
 .../util/include/util/PopupWindowWrapper.h    |   79 +
 .../main/cpp/src/util/include/util/Range.h    |   50 +
 .../main/cpp/src/util/include/util/Recolor.h  |   55 +
 .../cpp/src/util/include/util/Rectangle.h     |   92 +
 .../cpp/src/util/include/util/SaveNameUtils.h |   36 +
 .../cpp/src/util/include/util/SmallVector.h   |  227 +
 .../cpp/src/util/include/util/Stacktrace.h    |   26 +
 .../cpp/src/util/include/util/StringUtils.h   |   38 +
 .../cpp/src/util/include/util/TinyVector.h    |  134 +
 .../src/util/include/util/TypeIfThenElse.h    |   35 +
 .../src/util/include/util/UnionOfIntervals.h  |  223 +
 .../src/main/cpp/src/util/include/util/Util.h |   90 +
 .../cpp/src/util/include/util/VersionInfo.h   |   27 +
 .../src/util/include/util/ViewIteratorBase.h  |   77 +
 .../cpp/src/util/include/util/XojMsgBox.h     |   95 +
 .../util/include/util/XojPreviewExtractor.h   |   80 +
 .../cpp/src/util/include/util/gdk4_helper.h   |   22 +
 .../cpp/src/util/include/util/glib_casts.h    |  153 +
 .../cpp/src/util/include/util/gtk4_helper.h   |  103 +
 .../src/main/cpp/src/util/include/util/i18n.h |   46 +
 .../cpp/src/util/include/util/logger/Logger.h |   26 +
 .../util/include/util/move_only_function.h    |   70 +
 .../util/include/util/raii/CLibrariesSPtr.h   |  115 +
 .../util/include/util/raii/CStringWrapper.h   |   58 +
 .../util/include/util/raii/CairoWrappers.h    |   70 +
 .../src/util/include/util/raii/GLibGuards.h   |   62 +
 .../src/util/include/util/raii/GObjectSPtr.h  |   48 +
 .../src/util/include/util/raii/GSourceURef.h  |   45 +
 .../src/util/include/util/raii/GVariantSPtr.h |   44 +
 .../util/include/util/raii/GtkPaperSizeUPtr.h |   34 +
 .../util/include/util/raii/GtkWindowUPtr.h    |   36 +
 .../util/include/util/raii/IdentityFunction.h |   22 +
 .../src/util/include/util/raii/PangoSPtr.h    |   33 +
 .../cpp/src/util/include/util/safe_casts.h    |  150 +
 .../cpp/src/util/include/util/serdesstream.h  |   15 +
 .../util/serializing/BinObjectEncoding.h      |   25 +
 .../util/serializing/HexObjectEncoding.h      |   25 +
 .../util/serializing/InputStreamException.h   |   28 +
 .../include/util/serializing/ObjectEncoding.h |   31 +
 .../util/serializing/ObjectInputStream.h      |   90 +
 .../util/serializing/ObjectOutputStream.h     |   58 +
 .../include/util/serializing/Serializable.h   |   27 +
 .../cpp/src/util/include/util/utf8_view.h     |  168 +
 entry/src/main/cpp/src/util/logger/Logger.cpp |   68 +
 .../main/cpp/src/util/raii/CStringWrapper.cpp |   35 +
 .../util/serializing/BinObjectEncoding.cpp    |   13 +
 .../util/serializing/HexObjectEncoding.cpp    |   26 +
 .../util/serializing/InputStreamException.cpp |    9 +
 .../src/util/serializing/ObjectEncoding.cpp   |   13 +
 .../util/serializing/ObjectInputStream.cpp    |  201 +
 .../util/serializing/ObjectOutputStream.cpp   |   78 +
 .../src/xoj-preview-extractor/CMakeLists.txt  |   65 +
 .../xoj-preview-extractor/desktop-install.sh  |    4 +
 .../xournalpp-thumbnailer-xoj.schemas         |   29 +
 .../xournalpp-thumbnailer.cpp                 |  214 +
 830 files changed, 95931 insertions(+)
 create mode 100644 entry/src/main/cpp/src/CMakeLists.txt
 create mode 100644 entry/src/main/cpp/src/config-debug.h.in
 create mode 100644 entry/src/main/cpp/src/config-dev.h.in
 create mode 100644 entry/src/main/cpp/src/config-features.h.in
 create mode 100644 entry/src/main/cpp/src/config-git.h.in
 create mode 100644 entry/src/main/cpp/src/config-paths.h.in
 create mode 100644 entry/src/main/cpp/src/config.h.in
 create mode 100644 entry/src/main/cpp/src/core/CMakeLists.txt
 create mode 100644 entry/src/main/cpp/src/core/audio/AudioPlayer.cpp
 create mode 100644 entry/src/main/cpp/src/core/audio/AudioPlayer.h
 create mode 100644 entry/src/main/cpp/src/core/audio/AudioQueue.h
 create mode 100644 entry/src/main/cpp/src/core/audio/AudioRecorder.cpp
 create mode 100644 entry/src/main/cpp/src/core/audio/AudioRecorder.h
 create mode 100644 entry/src/main/cpp/src/core/audio/DeviceInfo.cpp
 create mode 100644 entry/src/main/cpp/src/core/audio/DeviceInfo.h
 create mode 100644 entry/src/main/cpp/src/core/audio/PortAudioConsumer.cpp
 create mode 100644 entry/src/main/cpp/src/core/audio/PortAudioConsumer.h
 create mode 100644 entry/src/main/cpp/src/core/audio/PortAudioProducer.cpp
 create mode 100644 entry/src/main/cpp/src/core/audio/PortAudioProducer.h
 create mode 100644 entry/src/main/cpp/src/core/audio/SNDFileCpp.h
 create mode 100644 entry/src/main/cpp/src/core/audio/VorbisConsumer.cpp
 create mode 100644 entry/src/main/cpp/src/core/audio/VorbisConsumer.h
 create mode 100644 entry/src/main/cpp/src/core/audio/VorbisProducer.cpp
 create mode 100644 entry/src/main/cpp/src/core/audio/VorbisProducer.h
 create mode 100644 entry/src/main/cpp/src/core/control/AudioController.cpp
 create mode 100644 entry/src/main/cpp/src/core/control/AudioController.h
 create mode 100644 entry/src/main/cpp/src/core/control/ClipboardHandler.cpp
 create mode 100644 entry/src/main/cpp/src/core/control/ClipboardHandler.h
 create mode 100644 entry/src/main/cpp/src/core/control/CompassController.cpp
 create mode 100644 entry/src/main/cpp/src/core/control/CompassController.h
 create mode 100644 entry/src/main/cpp/src/core/control/Control.cpp
 create mode 100644 entry/src/main/cpp/src/core/control/Control.h
 create mode 100644 entry/src/main/cpp/src/core/control/CrashHandler.cpp
 create mode 100644 entry/src/main/cpp/src/core/control/CrashHandler.h
 create mode 100644 entry/src/main/cpp/src/core/control/DeviceListHelper.cpp
 create mode 100644 entry/src/main/cpp/src/core/control/DeviceListHelper.h
 create mode 100644 entry/src/main/cpp/src/core/control/ExportHelper.cpp
 create mode 100644 entry/src/main/cpp/src/core/control/ExportHelper.h
 create mode 100644 entry/src/main/cpp/src/core/control/GeometryToolController.cpp
 create mode 100644 entry/src/main/cpp/src/core/control/GeometryToolController.h
 create mode 100644 entry/src/main/cpp/src/core/control/LatexController.cpp
 create mode 100644 entry/src/main/cpp/src/core/control/LatexController.h
 create mode 100644 entry/src/main/cpp/src/core/control/PageBackgroundChangeController.cpp
 create mode 100644 entry/src/main/cpp/src/core/control/PageBackgroundChangeController.h
 create mode 100644 entry/src/main/cpp/src/core/control/PdfCache.cpp
 create mode 100644 entry/src/main/cpp/src/core/control/PdfCache.h
 create mode 100644 entry/src/main/cpp/src/core/control/PrintHandler.cpp
 create mode 100644 entry/src/main/cpp/src/core/control/PrintHandler.h
 create mode 100644 entry/src/main/cpp/src/core/control/RecentManager.cpp
 create mode 100644 entry/src/main/cpp/src/core/control/RecentManager.h
 create mode 100644 entry/src/main/cpp/src/core/control/ScrollHandler.cpp
 create mode 100644 entry/src/main/cpp/src/core/control/ScrollHandler.h
 create mode 100644 entry/src/main/cpp/src/core/control/SearchControl.cpp
 create mode 100644 entry/src/main/cpp/src/core/control/SearchControl.h
 create mode 100644 entry/src/main/cpp/src/core/control/SetsquareController.cpp
 create mode 100644 entry/src/main/cpp/src/core/control/SetsquareController.h
 create mode 100644 entry/src/main/cpp/src/core/control/Tool.cpp
 create mode 100644 entry/src/main/cpp/src/core/control/Tool.h
 create mode 100644 entry/src/main/cpp/src/core/control/ToolBase.cpp
 create mode 100644 entry/src/main/cpp/src/core/control/ToolBase.h
 create mode 100644 entry/src/main/cpp/src/core/control/ToolEnums.cpp
 create mode 100644 entry/src/main/cpp/src/core/control/ToolEnums.h
 create mode 100644 entry/src/main/cpp/src/core/control/ToolHandler.cpp
 create mode 100644 entry/src/main/cpp/src/core/control/ToolHandler.h
 create mode 100644 entry/src/main/cpp/src/core/control/UndoRedoController.cpp
 create mode 100644 entry/src/main/cpp/src/core/control/UndoRedoController.h
 create mode 100644 entry/src/main/cpp/src/core/control/XournalMain.cpp
 create mode 100644 entry/src/main/cpp/src/core/control/XournalMain.h
 create mode 100644 entry/src/main/cpp/src/core/control/actions/ActionDatabase.cpp
 create mode 100644 entry/src/main/cpp/src/core/control/actions/ActionDatabase.h
 create mode 100644 entry/src/main/cpp/src/core/control/actions/ActionProperties.h
 create mode 100644 entry/src/main/cpp/src/core/control/actions/ActionRef.h
 create mode 100644 entry/src/main/cpp/src/core/control/jobs/AutosaveJob.cpp
 create mode 100644 entry/src/main/cpp/src/core/control/jobs/AutosaveJob.h
 create mode 100644 entry/src/main/cpp/src/core/control/jobs/BaseExportJob.cpp
 create mode 100644 entry/src/main/cpp/src/core/control/jobs/BaseExportJob.h
 create mode 100644 entry/src/main/cpp/src/core/control/jobs/BlockingJob.cpp
 create mode 100644 entry/src/main/cpp/src/core/control/jobs/BlockingJob.h
 create mode 100644 entry/src/main/cpp/src/core/control/jobs/CustomExportJob.cpp
 create mode 100644 entry/src/main/cpp/src/core/control/jobs/CustomExportJob.h
 create mode 100644 entry/src/main/cpp/src/core/control/jobs/ImageExport.cpp
 create mode 100644 entry/src/main/cpp/src/core/control/jobs/ImageExport.h
 create mode 100644 entry/src/main/cpp/src/core/control/jobs/Job.cpp
 create mode 100644 entry/src/main/cpp/src/core/control/jobs/Job.h
 create mode 100644 entry/src/main/cpp/src/core/control/jobs/PdfExportJob.cpp
 create mode 100644 entry/src/main/cpp/src/core/control/jobs/PdfExportJob.h
 create mode 100644 entry/src/main/cpp/src/core/control/jobs/PreviewJob.cpp
 create mode 100644 entry/src/main/cpp/src/core/control/jobs/PreviewJob.h
 create mode 100644 entry/src/main/cpp/src/core/control/jobs/ProgressListener.h
 create mode 100644 entry/src/main/cpp/src/core/control/jobs/RenderJob.cpp
 create mode 100644 entry/src/main/cpp/src/core/control/jobs/RenderJob.h
 create mode 100644 entry/src/main/cpp/src/core/control/jobs/SaveJob.cpp
 create mode 100644 entry/src/main/cpp/src/core/control/jobs/SaveJob.h
 create mode 100644 entry/src/main/cpp/src/core/control/jobs/Scheduler.cpp
 create mode 100644 entry/src/main/cpp/src/core/control/jobs/Scheduler.h
 create mode 100644 entry/src/main/cpp/src/core/control/jobs/XournalScheduler.cpp
 create mode 100644 entry/src/main/cpp/src/core/control/jobs/XournalScheduler.h
 create mode 100644 entry/src/main/cpp/src/core/control/latex/LatexGenerator.cpp
 create mode 100644 entry/src/main/cpp/src/core/control/latex/LatexGenerator.h
 create mode 100644 entry/src/main/cpp/src/core/control/layer/LayerController.cpp
 create mode 100644 entry/src/main/cpp/src/core/control/layer/LayerController.h
 create mode 100644 entry/src/main/cpp/src/core/control/layer/LayerCtrlListener.cpp
 create mode 100644 entry/src/main/cpp/src/core/control/layer/LayerCtrlListener.h
 create mode 100644 entry/src/main/cpp/src/core/control/pagetype/PageTypeHandler.cpp
 create mode 100644 entry/src/main/cpp/src/core/control/pagetype/PageTypeHandler.h
 create mode 100644 entry/src/main/cpp/src/core/control/settings/ButtonConfig.cpp
 create mode 100644 entry/src/main/cpp/src/core/control/settings/ButtonConfig.h
 create mode 100644 entry/src/main/cpp/src/core/control/settings/LatexSettings.cpp
 create mode 100644 entry/src/main/cpp/src/core/control/settings/LatexSettings.h
 create mode 100644 entry/src/main/cpp/src/core/control/settings/MetadataManager.cpp
 create mode 100644 entry/src/main/cpp/src/core/control/settings/MetadataManager.h
 create mode 100644 entry/src/main/cpp/src/core/control/settings/PageTemplateSettings.cpp
 create mode 100644 entry/src/main/cpp/src/core/control/settings/PageTemplateSettings.h
 create mode 100644 entry/src/main/cpp/src/core/control/settings/RecolorParameters.h
 create mode 100644 entry/src/main/cpp/src/core/control/settings/Settings.cpp
 create mode 100644 entry/src/main/cpp/src/core/control/settings/Settings.h
 create mode 100644 entry/src/main/cpp/src/core/control/settings/SettingsEnums.cpp
 create mode 100644 entry/src/main/cpp/src/core/control/settings/SettingsEnums.h
 create mode 100644 entry/src/main/cpp/src/core/control/settings/ViewModes.cpp
 create mode 100644 entry/src/main/cpp/src/core/control/settings/ViewModes.h
 create mode 100644 entry/src/main/cpp/src/core/control/shaperecognizer/CircleRecognizer.cpp
 create mode 100644 entry/src/main/cpp/src/core/control/shaperecognizer/CircleRecognizer.h
 create mode 100644 entry/src/main/cpp/src/core/control/shaperecognizer/Inertia.cpp
 create mode 100644 entry/src/main/cpp/src/core/control/shaperecognizer/Inertia.h
 create mode 100644 entry/src/main/cpp/src/core/control/shaperecognizer/RecoSegment.cpp
 create mode 100644 entry/src/main/cpp/src/core/control/shaperecognizer/RecoSegment.h
 create mode 100644 entry/src/main/cpp/src/core/control/shaperecognizer/ShapeRecognizer.cpp
 create mode 100644 entry/src/main/cpp/src/core/control/shaperecognizer/ShapeRecognizer.h
 create mode 100644 entry/src/main/cpp/src/core/control/shaperecognizer/ShapeRecognizerConfig.h
 create mode 100644 entry/src/main/cpp/src/core/control/tools/ArrowHandler.cpp
 create mode 100644 entry/src/main/cpp/src/core/control/tools/ArrowHandler.h
 create mode 100644 entry/src/main/cpp/src/core/control/tools/BaseShapeHandler.cpp
 create mode 100644 entry/src/main/cpp/src/core/control/tools/BaseShapeHandler.h
 create mode 100644 entry/src/main/cpp/src/core/control/tools/CoordinateSystemHandler.cpp
 create mode 100644 entry/src/main/cpp/src/core/control/tools/CoordinateSystemHandler.h
 create mode 100644 entry/src/main/cpp/src/core/control/tools/CursorSelectionType.h
 create mode 100644 entry/src/main/cpp/src/core/control/tools/EditSelection.cpp
 create mode 100644 entry/src/main/cpp/src/core/control/tools/EditSelection.h
 create mode 100644 entry/src/main/cpp/src/core/control/tools/EditSelectionContents.cpp
 create mode 100644 entry/src/main/cpp/src/core/control/tools/EditSelectionContents.h
 create mode 100644 entry/src/main/cpp/src/core/control/tools/EllipseHandler.cpp
 create mode 100644 entry/src/main/cpp/src/core/control/tools/EllipseHandler.h
 create mode 100644 entry/src/main/cpp/src/core/control/tools/EraseHandler.cpp
 create mode 100644 entry/src/main/cpp/src/core/control/tools/EraseHandler.h
 create mode 100644 entry/src/main/cpp/src/core/control/tools/ImageHandler.cpp
 create mode 100644 entry/src/main/cpp/src/core/control/tools/ImageHandler.h
 create mode 100644 entry/src/main/cpp/src/core/control/tools/ImageSizeSelection.cpp
 create mode 100644 entry/src/main/cpp/src/core/control/tools/ImageSizeSelection.h
 create mode 100644 entry/src/main/cpp/src/core/control/tools/InputHandler.cpp
 create mode 100644 entry/src/main/cpp/src/core/control/tools/InputHandler.h
 create mode 100644 entry/src/main/cpp/src/core/control/tools/LaserPointerHandler.cpp
 create mode 100644 entry/src/main/cpp/src/core/control/tools/LaserPointerHandler.h
 create mode 100644 entry/src/main/cpp/src/core/control/tools/PdfElemSelection.cpp
 create mode 100644 entry/src/main/cpp/src/core/control/tools/PdfElemSelection.h
 create mode 100644 entry/src/main/cpp/src/core/control/tools/RectangleHandler.cpp
 create mode 100644 entry/src/main/cpp/src/core/control/tools/RectangleHandler.h
 create mode 100644 entry/src/main/cpp/src/core/control/tools/RulerHandler.cpp
 create mode 100644 entry/src/main/cpp/src/core/control/tools/RulerHandler.h
 create mode 100644 entry/src/main/cpp/src/core/control/tools/Selector.cpp
 create mode 100644 entry/src/main/cpp/src/core/control/tools/Selector.h
 create mode 100644 entry/src/main/cpp/src/core/control/tools/SnapToGridInputHandler.cpp
 create mode 100644 entry/src/main/cpp/src/core/control/tools/SnapToGridInputHandler.h
 create mode 100644 entry/src/main/cpp/src/core/control/tools/SplineHandler.cpp
 create mode 100644 entry/src/main/cpp/src/core/control/tools/SplineHandler.h
 create mode 100644 entry/src/main/cpp/src/core/control/tools/StrokeHandler.cpp
 create mode 100644 entry/src/main/cpp/src/core/control/tools/StrokeHandler.h
 create mode 100644 entry/src/main/cpp/src/core/control/tools/StrokeStabilizer.cpp
 create mode 100644 entry/src/main/cpp/src/core/control/tools/StrokeStabilizer.h
 create mode 100644 entry/src/main/cpp/src/core/control/tools/StrokeStabilizerEnum.h
 create mode 100644 entry/src/main/cpp/src/core/control/tools/TextEditor.cpp
 create mode 100644 entry/src/main/cpp/src/core/control/tools/TextEditor.h
 create mode 100644 entry/src/main/cpp/src/core/control/tools/TextEditorKeyBindings.h
 create mode 100644 entry/src/main/cpp/src/core/control/tools/VerticalToolHandler.cpp
 create mode 100644 entry/src/main/cpp/src/core/control/tools/VerticalToolHandler.h
 create mode 100644 entry/src/main/cpp/src/core/control/xml/Attribute.cpp
 create mode 100644 entry/src/main/cpp/src/core/control/xml/Attribute.h
 create mode 100644 entry/src/main/cpp/src/core/control/xml/DoubleArrayAttribute.cpp
 create mode 100644 entry/src/main/cpp/src/core/control/xml/DoubleArrayAttribute.h
 create mode 100644 entry/src/main/cpp/src/core/control/xml/DoubleAttribute.cpp
 create mode 100644 entry/src/main/cpp/src/core/control/xml/DoubleAttribute.h
 create mode 100644 entry/src/main/cpp/src/core/control/xml/IntAttribute.cpp
 create mode 100644 entry/src/main/cpp/src/core/control/xml/IntAttribute.h
 create mode 100644 entry/src/main/cpp/src/core/control/xml/SizeTAttribute.cpp
 create mode 100644 entry/src/main/cpp/src/core/control/xml/SizeTAttribute.h
 create mode 100644 entry/src/main/cpp/src/core/control/xml/TextAttribute.cpp
 create mode 100644 entry/src/main/cpp/src/core/control/xml/TextAttribute.h
 create mode 100644 entry/src/main/cpp/src/core/control/xml/XmlAudioNode.cpp
 create mode 100644 entry/src/main/cpp/src/core/control/xml/XmlAudioNode.h
 create mode 100644 entry/src/main/cpp/src/core/control/xml/XmlImageNode.cpp
 create mode 100644 entry/src/main/cpp/src/core/control/xml/XmlImageNode.h
 create mode 100644 entry/src/main/cpp/src/core/control/xml/XmlNode.cpp
 create mode 100644 entry/src/main/cpp/src/core/control/xml/XmlNode.h
 create mode 100644 entry/src/main/cpp/src/core/control/xml/XmlPointNode.cpp
 create mode 100644 entry/src/main/cpp/src/core/control/xml/XmlPointNode.h
 create mode 100644 entry/src/main/cpp/src/core/control/xml/XmlTexNode.cpp
 create mode 100644 entry/src/main/cpp/src/core/control/xml/XmlTexNode.h
 create mode 100644 entry/src/main/cpp/src/core/control/xml/XmlTextNode.cpp
 create mode 100644 entry/src/main/cpp/src/core/control/xml/XmlTextNode.h
 create mode 100644 entry/src/main/cpp/src/core/control/xojfile/LoadHandler.cpp
 create mode 100644 entry/src/main/cpp/src/core/control/xojfile/LoadHandler.h
 create mode 100644 entry/src/main/cpp/src/core/control/xojfile/LoadHandlerHelper.cpp
 create mode 100644 entry/src/main/cpp/src/core/control/xojfile/LoadHandlerHelper.h
 create mode 100644 entry/src/main/cpp/src/core/control/xojfile/SaveHandler.cpp
 create mode 100644 entry/src/main/cpp/src/core/control/xojfile/SaveHandler.h
 create mode 100644 entry/src/main/cpp/src/core/control/xojfile/XojExportHandler.cpp
 create mode 100644 entry/src/main/cpp/src/core/control/xojfile/XojExportHandler.h
 create mode 100644 entry/src/main/cpp/src/core/control/zoom/ZoomControl.cpp
 create mode 100644 entry/src/main/cpp/src/core/control/zoom/ZoomControl.h
 create mode 100644 entry/src/main/cpp/src/core/control/zoom/ZoomListener.cpp
 create mode 100644 entry/src/main/cpp/src/core/control/zoom/ZoomListener.h
 create mode 100644 entry/src/main/cpp/src/core/enums/Action.enum.h
 create mode 100644 entry/src/main/cpp/src/core/enums/generateConvert.php
 create mode 100644 entry/src/main/cpp/src/core/enums/generated/Action.NameMap.generated.h
 create mode 100644 entry/src/main/cpp/src/core/gui/Builder.cpp
 create mode 100644 entry/src/main/cpp/src/core/gui/Builder.h
 create mode 100644 entry/src/main/cpp/src/core/gui/CreatePreviewImage.cpp
 create mode 100644 entry/src/main/cpp/src/core/gui/CreatePreviewImage.h
 create mode 100644 entry/src/main/cpp/src/core/gui/FloatingToolbox.cpp
 create mode 100644 entry/src/main/cpp/src/core/gui/FloatingToolbox.h
 create mode 100644 entry/src/main/cpp/src/core/gui/GladeGui.cpp
 create mode 100644 entry/src/main/cpp/src/core/gui/GladeGui.h
 create mode 100644 entry/src/main/cpp/src/core/gui/GladeSearchpath.cpp
 create mode 100644 entry/src/main/cpp/src/core/gui/GladeSearchpath.h
 create mode 100644 entry/src/main/cpp/src/core/gui/IconNameHelper.cpp
 create mode 100644 entry/src/main/cpp/src/core/gui/IconNameHelper.h
 create mode 100644 entry/src/main/cpp/src/core/gui/Layout.cpp
 create mode 100644 entry/src/main/cpp/src/core/gui/Layout.h
 create mode 100644 entry/src/main/cpp/src/core/gui/LayoutMapper.cpp
 create mode 100644 entry/src/main/cpp/src/core/gui/LayoutMapper.h
 create mode 100644 entry/src/main/cpp/src/core/gui/LegacyRedrawable.cpp
 create mode 100644 entry/src/main/cpp/src/core/gui/LegacyRedrawable.h
 create mode 100644 entry/src/main/cpp/src/core/gui/MainWindow.cpp
 create mode 100644 entry/src/main/cpp/src/core/gui/MainWindow.h
 create mode 100644 entry/src/main/cpp/src/core/gui/PagePreviewDecoration.cpp
 create mode 100644 entry/src/main/cpp/src/core/gui/PagePreviewDecoration.h
 create mode 100644 entry/src/main/cpp/src/core/gui/PageView.cpp
 create mode 100644 entry/src/main/cpp/src/core/gui/PageView.h
 create mode 100644 entry/src/main/cpp/src/core/gui/PageViewFindObjectHelper.h
 create mode 100644 entry/src/main/cpp/src/core/gui/PaperFormatUtils.cpp
 create mode 100644 entry/src/main/cpp/src/core/gui/PaperFormatUtils.h
 create mode 100644 entry/src/main/cpp/src/core/gui/PdfFloatingToolbox.cpp
 create mode 100644 entry/src/main/cpp/src/core/gui/PdfFloatingToolbox.h
 create mode 100644 entry/src/main/cpp/src/core/gui/PopoverFactory.h
 create mode 100644 entry/src/main/cpp/src/core/gui/RepaintHandler.cpp
 create mode 100644 entry/src/main/cpp/src/core/gui/RepaintHandler.h
 create mode 100644 entry/src/main/cpp/src/core/gui/SearchBar.cpp
 create mode 100644 entry/src/main/cpp/src/core/gui/SearchBar.h
 create mode 100644 entry/src/main/cpp/src/core/gui/Shadow.cpp
 create mode 100644 entry/src/main/cpp/src/core/gui/Shadow.h
 create mode 100644 entry/src/main/cpp/src/core/gui/ShadowCode.c
 create mode 100644 entry/src/main/cpp/src/core/gui/ToolbarDefinitions.h
 create mode 100644 entry/src/main/cpp/src/core/gui/ToolitemDragDrop.cpp
 create mode 100644 entry/src/main/cpp/src/core/gui/ToolitemDragDrop.h
 create mode 100644 entry/src/main/cpp/src/core/gui/XournalView.cpp
 create mode 100644 entry/src/main/cpp/src/core/gui/XournalView.h
 create mode 100644 entry/src/main/cpp/src/core/gui/XournalppCursor.cpp
 create mode 100644 entry/src/main/cpp/src/core/gui/XournalppCursor.h
 create mode 100644 entry/src/main/cpp/src/core/gui/dialog/AboutDialog.cpp
 create mode 100644 entry/src/main/cpp/src/core/gui/dialog/AboutDialog.h
 create mode 100644 entry/src/main/cpp/src/core/gui/dialog/AbstractLatexDialog.cpp
 create mode 100644 entry/src/main/cpp/src/core/gui/dialog/AbstractLatexDialog.h
 create mode 100644 entry/src/main/cpp/src/core/gui/dialog/ButtonConfigGui.cpp
 create mode 100644 entry/src/main/cpp/src/core/gui/dialog/ButtonConfigGui.h
 create mode 100644 entry/src/main/cpp/src/core/gui/dialog/DeviceClassConfigGui.cpp
 create mode 100644 entry/src/main/cpp/src/core/gui/dialog/DeviceClassConfigGui.h
 create mode 100644 entry/src/main/cpp/src/core/gui/dialog/DeviceListDialog.cpp
 create mode 100644 entry/src/main/cpp/src/core/gui/dialog/DeviceListDialog.h
 create mode 100644 entry/src/main/cpp/src/core/gui/dialog/DeviceTestingArea.cpp
 create mode 100644 entry/src/main/cpp/src/core/gui/dialog/DeviceTestingArea.h
 create mode 100644 entry/src/main/cpp/src/core/gui/dialog/ExportDialog.cpp
 create mode 100644 entry/src/main/cpp/src/core/gui/dialog/ExportDialog.h
 create mode 100644 entry/src/main/cpp/src/core/gui/dialog/ExtEdLatexDialog.cpp
 create mode 100644 entry/src/main/cpp/src/core/gui/dialog/ExtEdLatexDialog.h
 create mode 100644 entry/src/main/cpp/src/core/gui/dialog/FileChooserFiltersHelper.cpp
 create mode 100644 entry/src/main/cpp/src/core/gui/dialog/FileChooserFiltersHelper.h
 create mode 100644 entry/src/main/cpp/src/core/gui/dialog/FormatDialog.cpp
 create mode 100644 entry/src/main/cpp/src/core/gui/dialog/FormatDialog.h
 create mode 100644 entry/src/main/cpp/src/core/gui/dialog/GotoDialog.cpp
 create mode 100644 entry/src/main/cpp/src/core/gui/dialog/GotoDialog.h
 create mode 100644 entry/src/main/cpp/src/core/gui/dialog/IntEdLatexDialog.cpp
 create mode 100644 entry/src/main/cpp/src/core/gui/dialog/IntEdLatexDialog.h
 create mode 100644 entry/src/main/cpp/src/core/gui/dialog/LanguageConfigGui.cpp
 create mode 100644 entry/src/main/cpp/src/core/gui/dialog/LanguageConfigGui.h
 create mode 100644 entry/src/main/cpp/src/core/gui/dialog/LatexSettingsPanel.cpp
 create mode 100644 entry/src/main/cpp/src/core/gui/dialog/LatexSettingsPanel.h
 create mode 100644 entry/src/main/cpp/src/core/gui/dialog/PageTemplateDialog.cpp
 create mode 100644 entry/src/main/cpp/src/core/gui/dialog/PageTemplateDialog.h
 create mode 100644 entry/src/main/cpp/src/core/gui/dialog/PluginDialog.cpp
 create mode 100644 entry/src/main/cpp/src/core/gui/dialog/PluginDialog.h
 create mode 100644 entry/src/main/cpp/src/core/gui/dialog/PluginDialogEntry.cpp
 create mode 100644 entry/src/main/cpp/src/core/gui/dialog/PluginDialogEntry.h
 create mode 100644 entry/src/main/cpp/src/core/gui/dialog/RenameLayerDialog.cpp
 create mode 100644 entry/src/main/cpp/src/core/gui/dialog/RenameLayerDialog.h
 create mode 100644 entry/src/main/cpp/src/core/gui/dialog/SelectBackgroundColorDialog.cpp
 create mode 100644 entry/src/main/cpp/src/core/gui/dialog/SelectBackgroundColorDialog.h
 create mode 100644 entry/src/main/cpp/src/core/gui/dialog/SelectOpacityDialog.cpp
 create mode 100644 entry/src/main/cpp/src/core/gui/dialog/SelectOpacityDialog.h
 create mode 100644 entry/src/main/cpp/src/core/gui/dialog/SettingsDialog.cpp
 create mode 100644 entry/src/main/cpp/src/core/gui/dialog/SettingsDialog.h
 create mode 100644 entry/src/main/cpp/src/core/gui/dialog/SettingsDialogPaletteTab.cpp
 create mode 100644 entry/src/main/cpp/src/core/gui/dialog/SettingsDialogPaletteTab.h
 create mode 100644 entry/src/main/cpp/src/core/gui/dialog/ToolbarManageDialog.cpp
 create mode 100644 entry/src/main/cpp/src/core/gui/dialog/ToolbarManageDialog.h
 create mode 100644 entry/src/main/cpp/src/core/gui/dialog/XojOpenDlg.cpp
 create mode 100644 entry/src/main/cpp/src/core/gui/dialog/XojOpenDlg.h
 create mode 100644 entry/src/main/cpp/src/core/gui/dialog/XojSaveDlg.cpp
 create mode 100644 entry/src/main/cpp/src/core/gui/dialog/XojSaveDlg.h
 create mode 100644 entry/src/main/cpp/src/core/gui/dialog/backgroundSelect/BackgroundSelectDialogBase.cpp
 create mode 100644 entry/src/main/cpp/src/core/gui/dialog/backgroundSelect/BackgroundSelectDialogBase.h
 create mode 100644 entry/src/main/cpp/src/core/gui/dialog/backgroundSelect/BaseElementView.cpp
 create mode 100644 entry/src/main/cpp/src/core/gui/dialog/backgroundSelect/BaseElementView.h
 create mode 100644 entry/src/main/cpp/src/core/gui/dialog/backgroundSelect/ImageElementView.cpp
 create mode 100644 entry/src/main/cpp/src/core/gui/dialog/backgroundSelect/ImageElementView.h
 create mode 100644 entry/src/main/cpp/src/core/gui/dialog/backgroundSelect/ImagesDialog.cpp
 create mode 100644 entry/src/main/cpp/src/core/gui/dialog/backgroundSelect/ImagesDialog.h
 create mode 100644 entry/src/main/cpp/src/core/gui/dialog/backgroundSelect/PdfElementView.cpp
 create mode 100644 entry/src/main/cpp/src/core/gui/dialog/backgroundSelect/PdfElementView.h
 create mode 100644 entry/src/main/cpp/src/core/gui/dialog/backgroundSelect/PdfPagesDialog.cpp
 create mode 100644 entry/src/main/cpp/src/core/gui/dialog/backgroundSelect/PdfPagesDialog.h
 create mode 100644 entry/src/main/cpp/src/core/gui/dialog/toolbarCustomize/ToolItemDragCurrentData.cpp
 create mode 100644 entry/src/main/cpp/src/core/gui/dialog/toolbarCustomize/ToolItemDragCurrentData.h
 create mode 100644 entry/src/main/cpp/src/core/gui/dialog/toolbarCustomize/ToolbarAdapter.cpp
 create mode 100644 entry/src/main/cpp/src/core/gui/dialog/toolbarCustomize/ToolbarAdapter.h
 create mode 100644 entry/src/main/cpp/src/core/gui/dialog/toolbarCustomize/ToolbarCustomizeDialog.cpp
 create mode 100644 entry/src/main/cpp/src/core/gui/dialog/toolbarCustomize/ToolbarCustomizeDialog.h
 create mode 100644 entry/src/main/cpp/src/core/gui/dialog/toolbarCustomize/ToolbarDragDropHandler.cpp
 create mode 100644 entry/src/main/cpp/src/core/gui/dialog/toolbarCustomize/ToolbarDragDropHandler.h
 create mode 100644 entry/src/main/cpp/src/core/gui/dialog/toolbarCustomize/ToolbarDragDropHelper.cpp
 create mode 100644 entry/src/main/cpp/src/core/gui/dialog/toolbarCustomize/ToolbarDragDropHelper.h
 create mode 100644 entry/src/main/cpp/src/core/gui/inputdevices/AbstractInputHandler.cpp
 create mode 100644 entry/src/main/cpp/src/core/gui/inputdevices/AbstractInputHandler.h
 create mode 100644 entry/src/main/cpp/src/core/gui/inputdevices/CompassInputHandler.cpp
 create mode 100644 entry/src/main/cpp/src/core/gui/inputdevices/CompassInputHandler.h
 create mode 100644 entry/src/main/cpp/src/core/gui/inputdevices/DeviceId.cpp
 create mode 100644 entry/src/main/cpp/src/core/gui/inputdevices/DeviceId.h
 create mode 100644 entry/src/main/cpp/src/core/gui/inputdevices/GeometryToolInputHandler.cpp
 create mode 100644 entry/src/main/cpp/src/core/gui/inputdevices/GeometryToolInputHandler.h
 create mode 100644 entry/src/main/cpp/src/core/gui/inputdevices/HandRecognition.cpp
 create mode 100644 entry/src/main/cpp/src/core/gui/inputdevices/HandRecognition.h
 create mode 100644 entry/src/main/cpp/src/core/gui/inputdevices/InputContext.cpp
 create mode 100644 entry/src/main/cpp/src/core/gui/inputdevices/InputContext.h
 create mode 100644 entry/src/main/cpp/src/core/gui/inputdevices/InputEvents.cpp
 create mode 100644 entry/src/main/cpp/src/core/gui/inputdevices/InputEvents.h
 create mode 100644 entry/src/main/cpp/src/core/gui/inputdevices/InputUtils.cpp
 create mode 100644 entry/src/main/cpp/src/core/gui/inputdevices/InputUtils.h
 create mode 100644 entry/src/main/cpp/src/core/gui/inputdevices/KeyboardInputHandler.cpp
 create mode 100644 entry/src/main/cpp/src/core/gui/inputdevices/KeyboardInputHandler.h
 create mode 100644 entry/src/main/cpp/src/core/gui/inputdevices/MouseInputHandler.cpp
 create mode 100644 entry/src/main/cpp/src/core/gui/inputdevices/MouseInputHandler.h
 create mode 100644 entry/src/main/cpp/src/core/gui/inputdevices/PenInputHandler.cpp
 create mode 100644 entry/src/main/cpp/src/core/gui/inputdevices/PenInputHandler.h
 create mode 100644 entry/src/main/cpp/src/core/gui/inputdevices/PositionInputData.cpp
 create mode 100644 entry/src/main/cpp/src/core/gui/inputdevices/PositionInputData.h
 create mode 100644 entry/src/main/cpp/src/core/gui/inputdevices/PrintEvent.cpp
 create mode 100644 entry/src/main/cpp/src/core/gui/inputdevices/PrintEvent.h
 create mode 100644 entry/src/main/cpp/src/core/gui/inputdevices/SetsquareInputHandler.cpp
 create mode 100644 entry/src/main/cpp/src/core/gui/inputdevices/SetsquareInputHandler.h
 create mode 100644 entry/src/main/cpp/src/core/gui/inputdevices/StylusInputHandler.cpp
 create mode 100644 entry/src/main/cpp/src/core/gui/inputdevices/StylusInputHandler.h
 create mode 100644 entry/src/main/cpp/src/core/gui/inputdevices/TouchDrawingInputHandler.cpp
 create mode 100644 entry/src/main/cpp/src/core/gui/inputdevices/TouchDrawingInputHandler.h
 create mode 100644 entry/src/main/cpp/src/core/gui/inputdevices/TouchInputHandler.cpp
 create mode 100644 entry/src/main/cpp/src/core/gui/inputdevices/TouchInputHandler.h
 create mode 100644 entry/src/main/cpp/src/core/gui/inputdevices/touchdisable/TouchDisableCustom.cpp
 create mode 100644 entry/src/main/cpp/src/core/gui/inputdevices/touchdisable/TouchDisableCustom.h
 create mode 100644 entry/src/main/cpp/src/core/gui/inputdevices/touchdisable/TouchDisableInterface.cpp
 create mode 100644 entry/src/main/cpp/src/core/gui/inputdevices/touchdisable/TouchDisableInterface.h
 create mode 100644 entry/src/main/cpp/src/core/gui/inputdevices/touchdisable/TouchDisableX11.cpp
 create mode 100644 entry/src/main/cpp/src/core/gui/inputdevices/touchdisable/TouchDisableX11.h
 create mode 100644 entry/src/main/cpp/src/core/gui/menus/PageTypeSelectionMenuBase.cpp
 create mode 100644 entry/src/main/cpp/src/core/gui/menus/PageTypeSelectionMenuBase.h
 create mode 100644 entry/src/main/cpp/src/core/gui/menus/StaticAssertActionNamespace.h
 create mode 100644 entry/src/main/cpp/src/core/gui/menus/menubar/AbstractSubmenu.h
 create mode 100644 entry/src/main/cpp/src/core/gui/menus/menubar/Menubar.cpp
 create mode 100644 entry/src/main/cpp/src/core/gui/menus/menubar/Menubar.h
 create mode 100644 entry/src/main/cpp/src/core/gui/menus/menubar/PageTypeSubmenu.cpp
 create mode 100644 entry/src/main/cpp/src/core/gui/menus/menubar/PageTypeSubmenu.h
 create mode 100644 entry/src/main/cpp/src/core/gui/menus/menubar/PluginsSubmenu.cpp
 create mode 100644 entry/src/main/cpp/src/core/gui/menus/menubar/PluginsSubmenu.h
 create mode 100644 entry/src/main/cpp/src/core/gui/menus/menubar/RecentDocumentsSubmenu.cpp
 create mode 100644 entry/src/main/cpp/src/core/gui/menus/menubar/RecentDocumentsSubmenu.h
 create mode 100644 entry/src/main/cpp/src/core/gui/menus/menubar/ToolbarSelectionSubmenu.cpp
 create mode 100644 entry/src/main/cpp/src/core/gui/menus/menubar/ToolbarSelectionSubmenu.h
 create mode 100644 entry/src/main/cpp/src/core/gui/menus/popoverMenus/PageTypeSelectionPopover.cpp
 create mode 100644 entry/src/main/cpp/src/core/gui/menus/popoverMenus/PageTypeSelectionPopover.h
 create mode 100644 entry/src/main/cpp/src/core/gui/menus/popoverMenus/PageTypeSelectionPopoverGridOnly.cpp
 create mode 100644 entry/src/main/cpp/src/core/gui/menus/popoverMenus/PageTypeSelectionPopoverGridOnly.h
 create mode 100644 entry/src/main/cpp/src/core/gui/scroll/ScrollHandling.cpp
 create mode 100644 entry/src/main/cpp/src/core/gui/scroll/ScrollHandling.h
 create mode 100644 entry/src/main/cpp/src/core/gui/sidebar/AbstractSidebarPage.cpp
 create mode 100644 entry/src/main/cpp/src/core/gui/sidebar/AbstractSidebarPage.h
 create mode 100644 entry/src/main/cpp/src/core/gui/sidebar/Sidebar.cpp
 create mode 100644 entry/src/main/cpp/src/core/gui/sidebar/Sidebar.h
 create mode 100644 entry/src/main/cpp/src/core/gui/sidebar/indextree/SidebarIndexPage.cpp
 create mode 100644 entry/src/main/cpp/src/core/gui/sidebar/indextree/SidebarIndexPage.h
 create mode 100644 entry/src/main/cpp/src/core/gui/sidebar/previews/base/SidebarLayout.cpp
 create mode 100644 entry/src/main/cpp/src/core/gui/sidebar/previews/base/SidebarLayout.h
 create mode 100644 entry/src/main/cpp/src/core/gui/sidebar/previews/base/SidebarPreviewBase.cpp
 create mode 100644 entry/src/main/cpp/src/core/gui/sidebar/previews/base/SidebarPreviewBase.h
 create mode 100644 entry/src/main/cpp/src/core/gui/sidebar/previews/base/SidebarPreviewBaseEntry.cpp
 create mode 100644 entry/src/main/cpp/src/core/gui/sidebar/previews/base/SidebarPreviewBaseEntry.h
 create mode 100644 entry/src/main/cpp/src/core/gui/sidebar/previews/layer/SidebarPreviewLayerEntry.cpp
 create mode 100644 entry/src/main/cpp/src/core/gui/sidebar/previews/layer/SidebarPreviewLayerEntry.h
 create mode 100644 entry/src/main/cpp/src/core/gui/sidebar/previews/layer/SidebarPreviewLayers.cpp
 create mode 100644 entry/src/main/cpp/src/core/gui/sidebar/previews/layer/SidebarPreviewLayers.h
 create mode 100644 entry/src/main/cpp/src/core/gui/sidebar/previews/page/SidebarPreviewPageEntry.cpp
 create mode 100644 entry/src/main/cpp/src/core/gui/sidebar/previews/page/SidebarPreviewPageEntry.h
 create mode 100644 entry/src/main/cpp/src/core/gui/sidebar/previews/page/SidebarPreviewPages.cpp
 create mode 100644 entry/src/main/cpp/src/core/gui/sidebar/previews/page/SidebarPreviewPages.h
 create mode 100644 entry/src/main/cpp/src/core/gui/toolbarMenubar/AbstractSliderItem.cpp
 create mode 100644 entry/src/main/cpp/src/core/gui/toolbarMenubar/AbstractSliderItem.h
 create mode 100644 entry/src/main/cpp/src/core/gui/toolbarMenubar/AbstractToolItem.cpp
 create mode 100644 entry/src/main/cpp/src/core/gui/toolbarMenubar/AbstractToolItem.h
 create mode 100644 entry/src/main/cpp/src/core/gui/toolbarMenubar/ColorSelectorToolItem.cpp
 create mode 100644 entry/src/main/cpp/src/core/gui/toolbarMenubar/ColorSelectorToolItem.h
 create mode 100644 entry/src/main/cpp/src/core/gui/toolbarMenubar/ColorToolItem.cpp
 create mode 100644 entry/src/main/cpp/src/core/gui/toolbarMenubar/ColorToolItem.h
 create mode 100644 entry/src/main/cpp/src/core/gui/toolbarMenubar/ComboToolButton.cpp
 create mode 100644 entry/src/main/cpp/src/core/gui/toolbarMenubar/ComboToolButton.h
 create mode 100644 entry/src/main/cpp/src/core/gui/toolbarMenubar/DrawingTypeComboToolButton.cpp
 create mode 100644 entry/src/main/cpp/src/core/gui/toolbarMenubar/DrawingTypeComboToolButton.h
 create mode 100644 entry/src/main/cpp/src/core/gui/toolbarMenubar/FontButton.cpp
 create mode 100644 entry/src/main/cpp/src/core/gui/toolbarMenubar/FontButton.h
 create mode 100644 entry/src/main/cpp/src/core/gui/toolbarMenubar/PluginPlaceholderLabel.cpp
 create mode 100644 entry/src/main/cpp/src/core/gui/toolbarMenubar/PluginPlaceholderLabel.h
 create mode 100644 entry/src/main/cpp/src/core/gui/toolbarMenubar/PluginToolButton.cpp
 create mode 100644 entry/src/main/cpp/src/core/gui/toolbarMenubar/PluginToolButton.h
 create mode 100644 entry/src/main/cpp/src/core/gui/toolbarMenubar/SliderItemCreationHelper.h
 create mode 100644 entry/src/main/cpp/src/core/gui/toolbarMenubar/StylePopoverFactory.cpp
 create mode 100644 entry/src/main/cpp/src/core/gui/toolbarMenubar/StylePopoverFactory.h
 create mode 100644 entry/src/main/cpp/src/core/gui/toolbarMenubar/ToolButton.cpp
 create mode 100644 entry/src/main/cpp/src/core/gui/toolbarMenubar/ToolButton.h
 create mode 100644 entry/src/main/cpp/src/core/gui/toolbarMenubar/ToolMenuHandler.cpp
 create mode 100644 entry/src/main/cpp/src/core/gui/toolbarMenubar/ToolMenuHandler.h
 create mode 100644 entry/src/main/cpp/src/core/gui/toolbarMenubar/ToolPageLayer.cpp
 create mode 100644 entry/src/main/cpp/src/core/gui/toolbarMenubar/ToolPageLayer.h
 create mode 100644 entry/src/main/cpp/src/core/gui/toolbarMenubar/ToolPageSpinner.cpp
 create mode 100644 entry/src/main/cpp/src/core/gui/toolbarMenubar/ToolPageSpinner.h
 create mode 100644 entry/src/main/cpp/src/core/gui/toolbarMenubar/ToolPdfCombocontrol.cpp
 create mode 100644 entry/src/main/cpp/src/core/gui/toolbarMenubar/ToolPdfCombocontrol.h
 create mode 100644 entry/src/main/cpp/src/core/gui/toolbarMenubar/ToolSelectCombocontrol.cpp
 create mode 100644 entry/src/main/cpp/src/core/gui/toolbarMenubar/ToolSelectCombocontrol.h
 create mode 100644 entry/src/main/cpp/src/core/gui/toolbarMenubar/ToolZoomSlider.cpp
 create mode 100644 entry/src/main/cpp/src/core/gui/toolbarMenubar/ToolZoomSlider.h
 create mode 100644 entry/src/main/cpp/src/core/gui/toolbarMenubar/TooltipToolButton.cpp
 create mode 100644 entry/src/main/cpp/src/core/gui/toolbarMenubar/TooltipToolButton.h
 create mode 100644 entry/src/main/cpp/src/core/gui/toolbarMenubar/icon/ColorIcon.cpp
 create mode 100644 entry/src/main/cpp/src/core/gui/toolbarMenubar/icon/ColorIcon.h
 create mode 100644 entry/src/main/cpp/src/core/gui/toolbarMenubar/icon/ToolbarSeparatorImage.cpp
 create mode 100644 entry/src/main/cpp/src/core/gui/toolbarMenubar/icon/ToolbarSeparatorImage.h
 create mode 100644 entry/src/main/cpp/src/core/gui/toolbarMenubar/model/ColorPalette.cpp
 create mode 100644 entry/src/main/cpp/src/core/gui/toolbarMenubar/model/ColorPalette.h
 create mode 100644 entry/src/main/cpp/src/core/gui/toolbarMenubar/model/ToolbarData.cpp
 create mode 100644 entry/src/main/cpp/src/core/gui/toolbarMenubar/model/ToolbarData.h
 create mode 100644 entry/src/main/cpp/src/core/gui/toolbarMenubar/model/ToolbarEntry.cpp
 create mode 100644 entry/src/main/cpp/src/core/gui/toolbarMenubar/model/ToolbarEntry.h
 create mode 100644 entry/src/main/cpp/src/core/gui/toolbarMenubar/model/ToolbarItem.cpp
 create mode 100644 entry/src/main/cpp/src/core/gui/toolbarMenubar/model/ToolbarItem.h
 create mode 100644 entry/src/main/cpp/src/core/gui/toolbarMenubar/model/ToolbarModel.cpp
 create mode 100644 entry/src/main/cpp/src/core/gui/toolbarMenubar/model/ToolbarModel.h
 create mode 100644 entry/src/main/cpp/src/core/gui/widgets/SpinPageAdapter.cpp
 create mode 100644 entry/src/main/cpp/src/core/gui/widgets/SpinPageAdapter.h
 create mode 100644 entry/src/main/cpp/src/core/gui/widgets/XournalWidget.cpp
 create mode 100644 entry/src/main/cpp/src/core/gui/widgets/XournalWidget.h
 create mode 100644 entry/src/main/cpp/src/core/gui/widgets/ZoomCallib.cpp
 create mode 100644 entry/src/main/cpp/src/core/gui/widgets/ZoomCallib.h
 create mode 100644 entry/src/main/cpp/src/core/model/AudioElement.cpp
 create mode 100644 entry/src/main/cpp/src/core/model/AudioElement.h
 create mode 100644 entry/src/main/cpp/src/core/model/BackgroundConfig.cpp
 create mode 100644 entry/src/main/cpp/src/core/model/BackgroundConfig.h
 create mode 100644 entry/src/main/cpp/src/core/model/BackgroundImage.cpp
 create mode 100644 entry/src/main/cpp/src/core/model/BackgroundImage.h
 create mode 100644 entry/src/main/cpp/src/core/model/Compass.cpp
 create mode 100644 entry/src/main/cpp/src/core/model/Compass.h
 create mode 100644 entry/src/main/cpp/src/core/model/Document.cpp
 create mode 100644 entry/src/main/cpp/src/core/model/Document.h
 create mode 100644 entry/src/main/cpp/src/core/model/DocumentChangeType.h
 create mode 100644 entry/src/main/cpp/src/core/model/DocumentHandler.cpp
 create mode 100644 entry/src/main/cpp/src/core/model/DocumentHandler.h
 create mode 100644 entry/src/main/cpp/src/core/model/DocumentListener.cpp
 create mode 100644 entry/src/main/cpp/src/core/model/DocumentListener.h
 create mode 100644 entry/src/main/cpp/src/core/model/Element.cpp
 create mode 100644 entry/src/main/cpp/src/core/model/Element.h
 create mode 100644 entry/src/main/cpp/src/core/model/ElementContainer.h
 create mode 100644 entry/src/main/cpp/src/core/model/ElementInsertionPosition.h
 create mode 100644 entry/src/main/cpp/src/core/model/Font.cpp
 create mode 100644 entry/src/main/cpp/src/core/model/Font.h
 create mode 100644 entry/src/main/cpp/src/core/model/FormatDefinitions.cpp
 create mode 100644 entry/src/main/cpp/src/core/model/FormatDefinitions.h
 create mode 100644 entry/src/main/cpp/src/core/model/GeometryTool.cpp
 create mode 100644 entry/src/main/cpp/src/core/model/GeometryTool.h
 create mode 100644 entry/src/main/cpp/src/core/model/Image.cpp
 create mode 100644 entry/src/main/cpp/src/core/model/Image.h
 create mode 100644 entry/src/main/cpp/src/core/model/Layer.cpp
 create mode 100644 entry/src/main/cpp/src/core/model/Layer.h
 create mode 100644 entry/src/main/cpp/src/core/model/LineStyle.cpp
 create mode 100644 entry/src/main/cpp/src/core/model/LineStyle.h
 create mode 100644 entry/src/main/cpp/src/core/model/LinkDestination.cpp
 create mode 100644 entry/src/main/cpp/src/core/model/LinkDestination.h
 create mode 100644 entry/src/main/cpp/src/core/model/MathVect.cpp
 create mode 100644 entry/src/main/cpp/src/core/model/MathVect.h
 create mode 100644 entry/src/main/cpp/src/core/model/OverlayBase.h
 create mode 100644 entry/src/main/cpp/src/core/model/PageHandler.cpp
 create mode 100644 entry/src/main/cpp/src/core/model/PageHandler.h
 create mode 100644 entry/src/main/cpp/src/core/model/PageListener.cpp
 create mode 100644 entry/src/main/cpp/src/core/model/PageListener.h
 create mode 100644 entry/src/main/cpp/src/core/model/PageRef.h
 create mode 100644 entry/src/main/cpp/src/core/model/PageType.cpp
 create mode 100644 entry/src/main/cpp/src/core/model/PageType.h
 create mode 100644 entry/src/main/cpp/src/core/model/PaperSize.cpp
 create mode 100644 entry/src/main/cpp/src/core/model/PaperSize.h
 create mode 100644 entry/src/main/cpp/src/core/model/PathParameter.h
 create mode 100644 entry/src/main/cpp/src/core/model/Point.cpp
 create mode 100644 entry/src/main/cpp/src/core/model/Point.h
 create mode 100644 entry/src/main/cpp/src/core/model/Setsquare.cpp
 create mode 100644 entry/src/main/cpp/src/core/model/Setsquare.h
 create mode 100644 entry/src/main/cpp/src/core/model/Snapping.cpp
 create mode 100644 entry/src/main/cpp/src/core/model/Snapping.h
 create mode 100644 entry/src/main/cpp/src/core/model/SplineSegment.cpp
 create mode 100644 entry/src/main/cpp/src/core/model/SplineSegment.h
 create mode 100644 entry/src/main/cpp/src/core/model/Stroke.cpp
 create mode 100644 entry/src/main/cpp/src/core/model/Stroke.h
 create mode 100644 entry/src/main/cpp/src/core/model/StrokeContour.cpp
 create mode 100644 entry/src/main/cpp/src/core/model/StrokeContour.h
 create mode 100644 entry/src/main/cpp/src/core/model/StrokeStyle.cpp
 create mode 100644 entry/src/main/cpp/src/core/model/StrokeStyle.h
 create mode 100644 entry/src/main/cpp/src/core/model/TexImage.cpp
 create mode 100644 entry/src/main/cpp/src/core/model/TexImage.h
 create mode 100644 entry/src/main/cpp/src/core/model/Text.cpp
 create mode 100644 entry/src/main/cpp/src/core/model/Text.h
 create mode 100644 entry/src/main/cpp/src/core/model/XojPage.cpp
 create mode 100644 entry/src/main/cpp/src/core/model/XojPage.h
 create mode 100644 entry/src/main/cpp/src/core/model/eraser/ErasableStroke.cpp
 create mode 100644 entry/src/main/cpp/src/core/model/eraser/ErasableStroke.h
 create mode 100644 entry/src/main/cpp/src/core/model/eraser/ErasableStrokeOverlapTree.cpp
 create mode 100644 entry/src/main/cpp/src/core/model/eraser/ErasableStrokeOverlapTree.h
 create mode 100644 entry/src/main/cpp/src/core/model/eraser/PaddedBox.h
 create mode 100644 entry/src/main/cpp/src/core/model/eraser/readme.txt
 create mode 100644 entry/src/main/cpp/src/core/pdf/base/HybridPdfExport.cpp
 create mode 100644 entry/src/main/cpp/src/core/pdf/base/HybridPdfExport.h
 create mode 100644 entry/src/main/cpp/src/core/pdf/base/PdfExportBackend.cpp
 create mode 100644 entry/src/main/cpp/src/core/pdf/base/PdfExportBackend.h
 create mode 100644 entry/src/main/cpp/src/core/pdf/base/QPdfExport.cpp
 create mode 100644 entry/src/main/cpp/src/core/pdf/base/QPdfExport.h
 create mode 100644 entry/src/main/cpp/src/core/pdf/base/XojCairoPdfExport.cpp
 create mode 100644 entry/src/main/cpp/src/core/pdf/base/XojCairoPdfExport.h
 create mode 100644 entry/src/main/cpp/src/core/pdf/base/XojPdfAction.cpp
 create mode 100644 entry/src/main/cpp/src/core/pdf/base/XojPdfAction.h
 create mode 100644 entry/src/main/cpp/src/core/pdf/base/XojPdfBookmarkIterator.cpp
 create mode 100644 entry/src/main/cpp/src/core/pdf/base/XojPdfBookmarkIterator.h
 create mode 100644 entry/src/main/cpp/src/core/pdf/base/XojPdfDocument.cpp
 create mode 100644 entry/src/main/cpp/src/core/pdf/base/XojPdfDocument.h
 create mode 100644 entry/src/main/cpp/src/core/pdf/base/XojPdfDocumentInterface.cpp
 create mode 100644 entry/src/main/cpp/src/core/pdf/base/XojPdfDocumentInterface.h
 create mode 100644 entry/src/main/cpp/src/core/pdf/base/XojPdfExport.cpp
 create mode 100644 entry/src/main/cpp/src/core/pdf/base/XojPdfExport.h
 create mode 100644 entry/src/main/cpp/src/core/pdf/base/XojPdfExportFactory.cpp
 create mode 100644 entry/src/main/cpp/src/core/pdf/base/XojPdfExportFactory.h
 create mode 100644 entry/src/main/cpp/src/core/pdf/base/XojPdfPage.cpp
 create mode 100644 entry/src/main/cpp/src/core/pdf/base/XojPdfPage.h
 create mode 100644 entry/src/main/cpp/src/core/pdf/popplerapi/PopplerGlibAction.cpp
 create mode 100644 entry/src/main/cpp/src/core/pdf/popplerapi/PopplerGlibAction.h
 create mode 100644 entry/src/main/cpp/src/core/pdf/popplerapi/PopplerGlibDocument.cpp
 create mode 100644 entry/src/main/cpp/src/core/pdf/popplerapi/PopplerGlibDocument.h
 create mode 100644 entry/src/main/cpp/src/core/pdf/popplerapi/PopplerGlibPage.cpp
 create mode 100644 entry/src/main/cpp/src/core/pdf/popplerapi/PopplerGlibPage.h
 create mode 100644 entry/src/main/cpp/src/core/pdf/popplerapi/PopplerGlibPageBookmarkIterator.cpp
 create mode 100644 entry/src/main/cpp/src/core/pdf/popplerapi/PopplerGlibPageBookmarkIterator.h
 create mode 100644 entry/src/main/cpp/src/core/plugin/ActionBackwardCompatibilityLayer.cpp
 create mode 100644 entry/src/main/cpp/src/core/plugin/ActionBackwardCompatibilityLayer.h
 create mode 100644 entry/src/main/cpp/src/core/plugin/Plugin.cpp
 create mode 100644 entry/src/main/cpp/src/core/plugin/Plugin.h
 create mode 100644 entry/src/main/cpp/src/core/plugin/PluginController.cpp
 create mode 100644 entry/src/main/cpp/src/core/plugin/PluginController.h
 create mode 100644 entry/src/main/cpp/src/core/plugin/luapi_application.h
 create mode 100644 entry/src/main/cpp/src/core/undo/AddUndoAction.cpp
 create mode 100644 entry/src/main/cpp/src/core/undo/AddUndoAction.h
 create mode 100644 entry/src/main/cpp/src/core/undo/ArrangeUndoAction.cpp
 create mode 100644 entry/src/main/cpp/src/core/undo/ArrangeUndoAction.h
 create mode 100644 entry/src/main/cpp/src/core/undo/ColorUndoAction.cpp
 create mode 100644 entry/src/main/cpp/src/core/undo/ColorUndoAction.h
 create mode 100644 entry/src/main/cpp/src/core/undo/DeleteUndoAction.cpp
 create mode 100644 entry/src/main/cpp/src/core/undo/DeleteUndoAction.h
 create mode 100644 entry/src/main/cpp/src/core/undo/EmergencySaveRestore.cpp
 create mode 100644 entry/src/main/cpp/src/core/undo/EmergencySaveRestore.h
 create mode 100644 entry/src/main/cpp/src/core/undo/EraseUndoAction.cpp
 create mode 100644 entry/src/main/cpp/src/core/undo/EraseUndoAction.h
 create mode 100644 entry/src/main/cpp/src/core/undo/FillUndoAction.cpp
 create mode 100644 entry/src/main/cpp/src/core/undo/FillUndoAction.h
 create mode 100644 entry/src/main/cpp/src/core/undo/FontUndoAction.cpp
 create mode 100644 entry/src/main/cpp/src/core/undo/FontUndoAction.h
 create mode 100644 entry/src/main/cpp/src/core/undo/GroupUndoAction.cpp
 create mode 100644 entry/src/main/cpp/src/core/undo/GroupUndoAction.h
 create mode 100644 entry/src/main/cpp/src/core/undo/InsertDeletePageUndoAction.cpp
 create mode 100644 entry/src/main/cpp/src/core/undo/InsertDeletePageUndoAction.h
 create mode 100644 entry/src/main/cpp/src/core/undo/InsertLayerUndoAction.cpp
 create mode 100644 entry/src/main/cpp/src/core/undo/InsertLayerUndoAction.h
 create mode 100644 entry/src/main/cpp/src/core/undo/InsertUndoAction.cpp
 create mode 100644 entry/src/main/cpp/src/core/undo/InsertUndoAction.h
 create mode 100644 entry/src/main/cpp/src/core/undo/LayerRenameUndoAction.cpp
 create mode 100644 entry/src/main/cpp/src/core/undo/LayerRenameUndoAction.h
 create mode 100644 entry/src/main/cpp/src/core/undo/LineStyleUndoAction.cpp
 create mode 100644 entry/src/main/cpp/src/core/undo/LineStyleUndoAction.h
 create mode 100644 entry/src/main/cpp/src/core/undo/MergeLayerDownUndoAction.cpp
 create mode 100644 entry/src/main/cpp/src/core/undo/MergeLayerDownUndoAction.h
 create mode 100644 entry/src/main/cpp/src/core/undo/MissingPdfUndoAction.cpp
 create mode 100644 entry/src/main/cpp/src/core/undo/MissingPdfUndoAction.h
 create mode 100644 entry/src/main/cpp/src/core/undo/MoveLayerUndoAction.cpp
 create mode 100644 entry/src/main/cpp/src/core/undo/MoveLayerUndoAction.h
 create mode 100644 entry/src/main/cpp/src/core/undo/MoveSelectionToLayerUndoAction.cpp
 create mode 100644 entry/src/main/cpp/src/core/undo/MoveSelectionToLayerUndoAction.h
 create mode 100644 entry/src/main/cpp/src/core/undo/MoveUndoAction.cpp
 create mode 100644 entry/src/main/cpp/src/core/undo/MoveUndoAction.h
 create mode 100644 entry/src/main/cpp/src/core/undo/PageBackgroundChangedUndoAction.cpp
 create mode 100644 entry/src/main/cpp/src/core/undo/PageBackgroundChangedUndoAction.h
 create mode 100644 entry/src/main/cpp/src/core/undo/PageLayerPosEntry.h
 create mode 100644 entry/src/main/cpp/src/core/undo/PageSizeChangeUndoAction.cpp
 create mode 100644 entry/src/main/cpp/src/core/undo/PageSizeChangeUndoAction.h
 create mode 100644 entry/src/main/cpp/src/core/undo/RecognizerUndoAction.cpp
 create mode 100644 entry/src/main/cpp/src/core/undo/RecognizerUndoAction.h
 create mode 100644 entry/src/main/cpp/src/core/undo/RemoveLayerUndoAction.cpp
 create mode 100644 entry/src/main/cpp/src/core/undo/RemoveLayerUndoAction.h
 create mode 100644 entry/src/main/cpp/src/core/undo/RotateUndoAction.cpp
 create mode 100644 entry/src/main/cpp/src/core/undo/RotateUndoAction.h
 create mode 100644 entry/src/main/cpp/src/core/undo/ScaleUndoAction.cpp
 create mode 100644 entry/src/main/cpp/src/core/undo/ScaleUndoAction.h
 create mode 100644 entry/src/main/cpp/src/core/undo/SizeUndoAction.cpp
 create mode 100644 entry/src/main/cpp/src/core/undo/SizeUndoAction.h
 create mode 100644 entry/src/main/cpp/src/core/undo/SwapUndoAction.cpp
 create mode 100644 entry/src/main/cpp/src/core/undo/SwapUndoAction.h
 create mode 100644 entry/src/main/cpp/src/core/undo/TextBoxUndoAction.cpp
 create mode 100644 entry/src/main/cpp/src/core/undo/TextBoxUndoAction.h
 create mode 100644 entry/src/main/cpp/src/core/undo/UndoAction.cpp
 create mode 100644 entry/src/main/cpp/src/core/undo/UndoAction.h
 create mode 100644 entry/src/main/cpp/src/core/undo/UndoRedoHandler.cpp
 create mode 100644 entry/src/main/cpp/src/core/undo/UndoRedoHandler.h
 create mode 100644 entry/src/main/cpp/src/core/view/CompassView.cpp
 create mode 100644 entry/src/main/cpp/src/core/view/CompassView.h
 create mode 100644 entry/src/main/cpp/src/core/view/DebugShowRepaintBounds.h
 create mode 100644 entry/src/main/cpp/src/core/view/DocumentView.cpp
 create mode 100644 entry/src/main/cpp/src/core/view/DocumentView.h
 create mode 100644 entry/src/main/cpp/src/core/view/ElementContainerView.cpp
 create mode 100644 entry/src/main/cpp/src/core/view/ElementContainerView.h
 create mode 100644 entry/src/main/cpp/src/core/view/ElementView.cpp
 create mode 100644 entry/src/main/cpp/src/core/view/ErasableStrokeView.cpp
 create mode 100644 entry/src/main/cpp/src/core/view/ErasableStrokeView.h
 create mode 100644 entry/src/main/cpp/src/core/view/GeometryToolView.cpp
 create mode 100644 entry/src/main/cpp/src/core/view/GeometryToolView.h
 create mode 100644 entry/src/main/cpp/src/core/view/ImageView.cpp
 create mode 100644 entry/src/main/cpp/src/core/view/ImageView.h
 create mode 100644 entry/src/main/cpp/src/core/view/LayerView.cpp
 create mode 100644 entry/src/main/cpp/src/core/view/LayerView.h
 create mode 100644 entry/src/main/cpp/src/core/view/Mask.cpp
 create mode 100644 entry/src/main/cpp/src/core/view/Mask.h
 create mode 100644 entry/src/main/cpp/src/core/view/Repaintable.h
 create mode 100644 entry/src/main/cpp/src/core/view/SetsquareView.cpp
 create mode 100644 entry/src/main/cpp/src/core/view/SetsquareView.h
 create mode 100644 entry/src/main/cpp/src/core/view/StrokeView.cpp
 create mode 100644 entry/src/main/cpp/src/core/view/StrokeView.h
 create mode 100644 entry/src/main/cpp/src/core/view/StrokeViewHelper.cpp
 create mode 100644 entry/src/main/cpp/src/core/view/StrokeViewHelper.h
 create mode 100644 entry/src/main/cpp/src/core/view/TexImageView.cpp
 create mode 100644 entry/src/main/cpp/src/core/view/TexImageView.h
 create mode 100644 entry/src/main/cpp/src/core/view/TextView.cpp
 create mode 100644 entry/src/main/cpp/src/core/view/TextView.h
 create mode 100644 entry/src/main/cpp/src/core/view/View.h
 create mode 100644 entry/src/main/cpp/src/core/view/background/BackgroundFlags.h
 create mode 100644 entry/src/main/cpp/src/core/view/background/BackgroundView.cpp
 create mode 100644 entry/src/main/cpp/src/core/view/background/BackgroundView.h
 create mode 100644 entry/src/main/cpp/src/core/view/background/BaseIsometricBackgroundView.cpp
 create mode 100644 entry/src/main/cpp/src/core/view/background/BaseIsometricBackgroundView.h
 create mode 100644 entry/src/main/cpp/src/core/view/background/DottedBackgroundView.cpp
 create mode 100644 entry/src/main/cpp/src/core/view/background/DottedBackgroundView.h
 create mode 100644 entry/src/main/cpp/src/core/view/background/GraphBackgroundView.cpp
 create mode 100644 entry/src/main/cpp/src/core/view/background/GraphBackgroundView.h
 create mode 100644 entry/src/main/cpp/src/core/view/background/ImageBackgroundView.cpp
 create mode 100644 entry/src/main/cpp/src/core/view/background/ImageBackgroundView.h
 create mode 100644 entry/src/main/cpp/src/core/view/background/IsoDottedBackgroundView.cpp
 create mode 100644 entry/src/main/cpp/src/core/view/background/IsoDottedBackgroundView.h
 create mode 100644 entry/src/main/cpp/src/core/view/background/IsoGraphBackgroundView.cpp
 create mode 100644 entry/src/main/cpp/src/core/view/background/IsoGraphBackgroundView.h
 create mode 100644 entry/src/main/cpp/src/core/view/background/LinedBackgroundView.cpp
 create mode 100644 entry/src/main/cpp/src/core/view/background/LinedBackgroundView.h
 create mode 100644 entry/src/main/cpp/src/core/view/background/OneColorBackgroundView.cpp
 create mode 100644 entry/src/main/cpp/src/core/view/background/OneColorBackgroundView.h
 create mode 100644 entry/src/main/cpp/src/core/view/background/PdfBackgroundView.cpp
 create mode 100644 entry/src/main/cpp/src/core/view/background/PdfBackgroundView.h
 create mode 100644 entry/src/main/cpp/src/core/view/background/PlainBackgroundView.cpp
 create mode 100644 entry/src/main/cpp/src/core/view/background/PlainBackgroundView.h
 create mode 100644 entry/src/main/cpp/src/core/view/background/RuledBackgroundView.cpp
 create mode 100644 entry/src/main/cpp/src/core/view/background/RuledBackgroundView.h
 create mode 100644 entry/src/main/cpp/src/core/view/background/StavesBackgroundView.cpp
 create mode 100644 entry/src/main/cpp/src/core/view/background/StavesBackgroundView.h
 create mode 100644 entry/src/main/cpp/src/core/view/background/TransparentCheckerboardBackgroundView.cpp
 create mode 100644 entry/src/main/cpp/src/core/view/background/TransparentCheckerboardBackgroundView.h
 create mode 100644 entry/src/main/cpp/src/core/view/overlays/BaseShapeOrSplineToolView.cpp
 create mode 100644 entry/src/main/cpp/src/core/view/overlays/BaseShapeOrSplineToolView.h
 create mode 100644 entry/src/main/cpp/src/core/view/overlays/BaseStrokeToolView.cpp
 create mode 100644 entry/src/main/cpp/src/core/view/overlays/BaseStrokeToolView.h
 create mode 100644 entry/src/main/cpp/src/core/view/overlays/ImageSizeSelectionView.cpp
 create mode 100644 entry/src/main/cpp/src/core/view/overlays/ImageSizeSelectionView.h
 create mode 100644 entry/src/main/cpp/src/core/view/overlays/LaserPointerView.cpp
 create mode 100644 entry/src/main/cpp/src/core/view/overlays/LaserPointerView.h
 create mode 100644 entry/src/main/cpp/src/core/view/overlays/OverlayView.h
 create mode 100644 entry/src/main/cpp/src/core/view/overlays/PdfElementSelectionView.cpp
 create mode 100644 entry/src/main/cpp/src/core/view/overlays/PdfElementSelectionView.h
 create mode 100644 entry/src/main/cpp/src/core/view/overlays/SearchResultView.cpp
 create mode 100644 entry/src/main/cpp/src/core/view/overlays/SearchResultView.h
 create mode 100644 entry/src/main/cpp/src/core/view/overlays/SelectorView.cpp
 create mode 100644 entry/src/main/cpp/src/core/view/overlays/SelectorView.h
 create mode 100644 entry/src/main/cpp/src/core/view/overlays/ShapeToolView.cpp
 create mode 100644 entry/src/main/cpp/src/core/view/overlays/ShapeToolView.h
 create mode 100644 entry/src/main/cpp/src/core/view/overlays/SplineToolView.cpp
 create mode 100644 entry/src/main/cpp/src/core/view/overlays/SplineToolView.h
 create mode 100644 entry/src/main/cpp/src/core/view/overlays/StrokeToolFilledHighlighterView.cpp
 create mode 100644 entry/src/main/cpp/src/core/view/overlays/StrokeToolFilledHighlighterView.h
 create mode 100644 entry/src/main/cpp/src/core/view/overlays/StrokeToolFilledView.cpp
 create mode 100644 entry/src/main/cpp/src/core/view/overlays/StrokeToolFilledView.h
 create mode 100644 entry/src/main/cpp/src/core/view/overlays/StrokeToolView.cpp
 create mode 100644 entry/src/main/cpp/src/core/view/overlays/StrokeToolView.h
 create mode 100644 entry/src/main/cpp/src/core/view/overlays/TextEditionView.cpp
 create mode 100644 entry/src/main/cpp/src/core/view/overlays/TextEditionView.h
 create mode 100644 entry/src/main/cpp/src/core/view/overlays/VerticalToolView.cpp
 create mode 100644 entry/src/main/cpp/src/core/view/overlays/VerticalToolView.h
 create mode 100644 entry/src/main/cpp/src/exe/Xournalpp-wrapper.cpp
 create mode 100644 entry/src/main/cpp/src/exe/Xournalpp.cpp
 create mode 100644 entry/src/main/cpp/src/exe/osx/setup-env.cpp
 create mode 100644 entry/src/main/cpp/src/exe/osx/setup-env.h
 create mode 100644 entry/src/main/cpp/src/exe/win32/console.cpp
 create mode 100644 entry/src/main/cpp/src/exe/win32/console.h
 create mode 100644 entry/src/main/cpp/src/exe/win32/gui_main.cpp
 create mode 100644 entry/src/main/cpp/src/exe/win32/xpp.rc.in
 create mode 100644 entry/src/main/cpp/src/exe/xournalpp-wrapper.gresource.xml
 create mode 100644 entry/src/main/cpp/src/util/Assert.cpp
 create mode 100644 entry/src/main/cpp/src/util/CMakeLists.txt
 create mode 100644 entry/src/main/cpp/src/util/Color.cpp
 create mode 100644 entry/src/main/cpp/src/util/ElementRange.cpp
 create mode 100644 entry/src/main/cpp/src/util/GtkUtil.cpp
 create mode 100644 entry/src/main/cpp/src/util/GzUtil.cpp
 create mode 100644 entry/src/main/cpp/src/util/NamedColor.cpp
 create mode 100644 entry/src/main/cpp/src/util/OutputStream.cpp
 create mode 100644 entry/src/main/cpp/src/util/PathUtil.cpp
 create mode 100644 entry/src/main/cpp/src/util/PlaceholderString.cpp
 create mode 100644 entry/src/main/cpp/src/util/Range.cpp
 create mode 100644 entry/src/main/cpp/src/util/Recolor.cpp
 create mode 100644 entry/src/main/cpp/src/util/SaveNameUtils.cpp
 create mode 100644 entry/src/main/cpp/src/util/Stacktrace.cpp
 create mode 100644 entry/src/main/cpp/src/util/StringUtils.cpp
 create mode 100644 entry/src/main/cpp/src/util/Util.cpp
 create mode 100644 entry/src/main/cpp/src/util/VersionInfo.cpp
 create mode 100644 entry/src/main/cpp/src/util/XojMsgBox.cpp
 create mode 100644 entry/src/main/cpp/src/util/XojPreviewExtractor.cpp
 create mode 100644 entry/src/main/cpp/src/util/gdk4_helper.cpp
 create mode 100644 entry/src/main/cpp/src/util/gtk4_helper.cpp
 create mode 100644 entry/src/main/cpp/src/util/include/filesystem.h
 create mode 100644 entry/src/main/cpp/src/util/include/util/Assert.h
 create mode 100644 entry/src/main/cpp/src/util/include/util/BasePointerIterator.h
 create mode 100644 entry/src/main/cpp/src/util/include/util/CircularBuffer.h
 create mode 100644 entry/src/main/cpp/src/util/include/util/Color.h
 create mode 100644 entry/src/main/cpp/src/util/include/util/DispatchPool.h
 create mode 100644 entry/src/main/cpp/src/util/include/util/ElementRange.h
 create mode 100644 entry/src/main/cpp/src/util/include/util/EnumIndexedArray.h
 create mode 100644 entry/src/main/cpp/src/util/include/util/GListView.h
 create mode 100644 entry/src/main/cpp/src/util/include/util/GVariantTemplate.h
 create mode 100644 entry/src/main/cpp/src/util/include/util/GtkUtil.h
 create mode 100644 entry/src/main/cpp/src/util/include/util/GzUtil.h
 create mode 100644 entry/src/main/cpp/src/util/include/util/Interval.h
 create mode 100644 entry/src/main/cpp/src/util/include/util/LoopUtil.h
 create mode 100644 entry/src/main/cpp/src/util/include/util/NamedColor.h
 create mode 100644 entry/src/main/cpp/src/util/include/util/OutputStream.h
 create mode 100644 entry/src/main/cpp/src/util/include/util/PairView.h
 create mode 100644 entry/src/main/cpp/src/util/include/util/PathUtil.h
 create mode 100644 entry/src/main/cpp/src/util/include/util/PlaceholderString.h
 create mode 100644 entry/src/main/cpp/src/util/include/util/Point.h
 create mode 100644 entry/src/main/cpp/src/util/include/util/PointerContainerView.h
 create mode 100644 entry/src/main/cpp/src/util/include/util/PopupWindowWrapper.h
 create mode 100644 entry/src/main/cpp/src/util/include/util/Range.h
 create mode 100644 entry/src/main/cpp/src/util/include/util/Recolor.h
 create mode 100644 entry/src/main/cpp/src/util/include/util/Rectangle.h
 create mode 100644 entry/src/main/cpp/src/util/include/util/SaveNameUtils.h
 create mode 100644 entry/src/main/cpp/src/util/include/util/SmallVector.h
 create mode 100644 entry/src/main/cpp/src/util/include/util/Stacktrace.h
 create mode 100644 entry/src/main/cpp/src/util/include/util/StringUtils.h
 create mode 100644 entry/src/main/cpp/src/util/include/util/TinyVector.h
 create mode 100644 entry/src/main/cpp/src/util/include/util/TypeIfThenElse.h
 create mode 100644 entry/src/main/cpp/src/util/include/util/UnionOfIntervals.h
 create mode 100644 entry/src/main/cpp/src/util/include/util/Util.h
 create mode 100644 entry/src/main/cpp/src/util/include/util/VersionInfo.h
 create mode 100644 entry/src/main/cpp/src/util/include/util/ViewIteratorBase.h
 create mode 100644 entry/src/main/cpp/src/util/include/util/XojMsgBox.h
 create mode 100644 entry/src/main/cpp/src/util/include/util/XojPreviewExtractor.h
 create mode 100644 entry/src/main/cpp/src/util/include/util/gdk4_helper.h
 create mode 100644 entry/src/main/cpp/src/util/include/util/glib_casts.h
 create mode 100644 entry/src/main/cpp/src/util/include/util/gtk4_helper.h
 create mode 100644 entry/src/main/cpp/src/util/include/util/i18n.h
 create mode 100644 entry/src/main/cpp/src/util/include/util/logger/Logger.h
 create mode 100644 entry/src/main/cpp/src/util/include/util/move_only_function.h
 create mode 100644 entry/src/main/cpp/src/util/include/util/raii/CLibrariesSPtr.h
 create mode 100644 entry/src/main/cpp/src/util/include/util/raii/CStringWrapper.h
 create mode 100644 entry/src/main/cpp/src/util/include/util/raii/CairoWrappers.h
 create mode 100644 entry/src/main/cpp/src/util/include/util/raii/GLibGuards.h
 create mode 100644 entry/src/main/cpp/src/util/include/util/raii/GObjectSPtr.h
 create mode 100644 entry/src/main/cpp/src/util/include/util/raii/GSourceURef.h
 create mode 100644 entry/src/main/cpp/src/util/include/util/raii/GVariantSPtr.h
 create mode 100644 entry/src/main/cpp/src/util/include/util/raii/GtkPaperSizeUPtr.h
 create mode 100644 entry/src/main/cpp/src/util/include/util/raii/GtkWindowUPtr.h
 create mode 100644 entry/src/main/cpp/src/util/include/util/raii/IdentityFunction.h
 create mode 100644 entry/src/main/cpp/src/util/include/util/raii/PangoSPtr.h
 create mode 100644 entry/src/main/cpp/src/util/include/util/safe_casts.h
 create mode 100644 entry/src/main/cpp/src/util/include/util/serdesstream.h
 create mode 100644 entry/src/main/cpp/src/util/include/util/serializing/BinObjectEncoding.h
 create mode 100644 entry/src/main/cpp/src/util/include/util/serializing/HexObjectEncoding.h
 create mode 100644 entry/src/main/cpp/src/util/include/util/serializing/InputStreamException.h
 create mode 100644 entry/src/main/cpp/src/util/include/util/serializing/ObjectEncoding.h
 create mode 100644 entry/src/main/cpp/src/util/include/util/serializing/ObjectInputStream.h
 create mode 100644 entry/src/main/cpp/src/util/include/util/serializing/ObjectOutputStream.h
 create mode 100644 entry/src/main/cpp/src/util/include/util/serializing/Serializable.h
 create mode 100644 entry/src/main/cpp/src/util/include/util/utf8_view.h
 create mode 100644 entry/src/main/cpp/src/util/logger/Logger.cpp
 create mode 100644 entry/src/main/cpp/src/util/raii/CStringWrapper.cpp
 create mode 100644 entry/src/main/cpp/src/util/serializing/BinObjectEncoding.cpp
 create mode 100644 entry/src/main/cpp/src/util/serializing/HexObjectEncoding.cpp
 create mode 100644 entry/src/main/cpp/src/util/serializing/InputStreamException.cpp
 create mode 100644 entry/src/main/cpp/src/util/serializing/ObjectEncoding.cpp
 create mode 100644 entry/src/main/cpp/src/util/serializing/ObjectInputStream.cpp
 create mode 100644 entry/src/main/cpp/src/util/serializing/ObjectOutputStream.cpp
 create mode 100644 entry/src/main/cpp/src/xoj-preview-extractor/CMakeLists.txt
 create mode 100755 entry/src/main/cpp/src/xoj-preview-extractor/desktop-install.sh
 create mode 100644 entry/src/main/cpp/src/xoj-preview-extractor/xournalpp-thumbnailer-xoj.schemas
 create mode 100644 entry/src/main/cpp/src/xoj-preview-extractor/xournalpp-thumbnailer.cpp

diff --git a/entry/src/main/cpp/src/CMakeLists.txt b/entry/src/main/cpp/src/CMakeLists.txt
new file mode 100644
index 0000000..6f1fdac
--- /dev/null
+++ b/entry/src/main/cpp/src/CMakeLists.txt
@@ -0,0 +1,174 @@
+cmake_minimum_required(VERSION 3.13)
+cmake_policy(VERSION 3.13)
+
+# Todo: add to target by generator expression
+
+
+##############################
+# xoj default option target
+##############################
+
+add_library(defaults INTERFACE)
+target_include_directories(defaults INTERFACE ${PROJECT_BINARY_DIR}/src)
+add_library(xoj::defaults ALIAS defaults)
+if (MSVC) # clang-cl.exe, cl.exe
+  target_compile_definitions(defaults INTERFACE NOMINMAX WIN32_LEAN_AND_MEAN)
+  target_compile_options(defaults INTERFACE -utf-8)
+else(MSVC) # gnu clang with gnu driver, 
+  target_compile_options(defaults INTERFACE -Wall -Wreturn-type -Wuninitialized -Wunused-value -Wunused-variable -Wconversion)
+endif ()
+# Todo (support-v3.10): guard this variable with cmake_dependent_option for CMake 3.10, and NOT(GCC)
+# then downgrade cmake_minimum_required to CMake 3.10
+if (DEV_ENABLE_GCOV)
+  target_compile_options(defaults INTERFACE --coverage)
+  target_link_options(defaults INTERFACE --coverage) #cmake v3.13
+endif (DEV_ENABLE_GCOV)
+
+##############################
+# util
+##############################
+
+add_subdirectory(util)
+
+##############################
+# xournalpp-core
+##############################
+
+add_subdirectory(core)
+
+##############################
+# xournalpp-wrapper: catches crashes
+##############################
+
+# The crash dialog's ui file is stored as gresource to make sure the wrapper is standalone
+find_program(GLIB_COMPILE_RESOURCES NAMES glib-compile-resources REQUIRED)
+
+set(XOURNAL_WRAPPER_GRESOURCE_C   xournalpp-wrapper.gresource.c)
+set(XOURNAL_WRAPPER_GRESOURCE_XML exe/xournalpp-wrapper.gresource.xml)
+
+add_custom_command(
+    OUTPUT ${XOURNAL_WRAPPER_GRESOURCE_C}
+    WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
+    COMMAND ${GLIB_COMPILE_RESOURCES}
+    ARGS
+        --generate-source
+        --sourcedir=${CMAKE_SOURCE_DIR}
+        --target=${CMAKE_CURRENT_BINARY_DIR}/${XOURNAL_WRAPPER_GRESOURCE_C}
+        ${XOURNAL_WRAPPER_GRESOURCE_XML}
+    VERBATIM
+    MAIN_DEPENDENCY ${XOURNAL_WRAPPER_GRESOURCE_XML}
+    DEPENDS
+        ${CMAKE_SOURCE_DIR}/ui/crashDialog.glade
+)
+
+add_custom_target(
+    xournalpp-wrapper-resource
+    DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/${XOURNAL_WRAPPER_GRESOURCE_C}
+)
+
+add_executable(xournalpp-wrapper exe/Xournalpp-wrapper.cpp ${CMAKE_CURRENT_BINARY_DIR}/${XOURNAL_WRAPPER_GRESOURCE_C})
+set_source_files_properties(
+    ${CMAKE_CURRENT_BINARY_DIR}/${XOURNAL_WRAPPER_GRESOURCE_C}
+    PROPERTIES GENERATED TRUE
+)
+
+add_dependencies(xournalpp-wrapper xournalpp-wrapper-resource)
+target_link_libraries(xournalpp-wrapper
+        PUBLIC xoj::defaults xoj::util xoj::external_modules)
+set_target_properties(xournalpp-wrapper PROPERTIES RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}"
+        MACOSX_BUNDLE $<IF:$<PLATFORM_ID:Darwin>,TRUE,${CMAKE_MACOSX_BUNDLE}>
+        WIN32_EXECUTABLE $<IF:$<PLATFORM_ID:Windows>,TRUE,${CMAKE_WIN32_EXECUTABLE}>
+        )
+target_include_directories(xournalpp-wrapper PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}")
+
+
+##############################
+# xournalpp main program
+##############################
+
+add_executable(xournalpp exe/Xournalpp.cpp)
+target_link_libraries(xournalpp PRIVATE xoj::core xoj::util)
+set_target_properties(xournalpp PROPERTIES RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}"
+        MACOSX_BUNDLE $<IF:$<PLATFORM_ID:Darwin>,TRUE,${CMAKE_MACOSX_BUNDLE}>
+        WIN32_EXECUTABLE $<IF:$<PLATFORM_ID:Windows>,TRUE,${CMAKE_WIN32_EXECUTABLE}>
+        )
+if (WIN32)
+  # Make sure Windows executable has all symbols
+  target_link_options(xournalpp PRIVATE "-Wl,--export-all-symbols")
+endif()
+
+###############################
+# Generate icons
+# Todo(fabian): move this into an own windows specific cmake script
+# e.g. exe/win32/CMakeLists.txt
+###############################
+
+###############################
+# Add MacOS specific files
+# Todo(Roland): consider moving this into an own MacOS specific cmake script
+# e.g. exe/macos/CMakeLists.txt
+##############################
+
+if (APPLE)
+  # MacOS specific source files
+  file (GLOB xournalpp-sources-osx exe/osx/*.cpp exe/osx/*.h)
+  target_sources(xournalpp PRIVATE ${xournalpp-sources-osx})
+  target_include_directories(xournalpp PRIVATE exe)
+endif()
+
+if (WIN32)
+  # generate .ico from .png
+  find_package(ImageMagick REQUIRED COMPONENTS magick)
+  set (ICON_SIZES 16 32 48 256)
+  foreach (SIZE IN LISTS ICON_SIZES)
+    set (RESIZED_ICON ${PROJECT_BINARY_DIR}/xournalpp-icon-${SIZE}.png)
+    add_custom_command (
+                OUTPUT ${RESIZED_ICON}
+                COMMAND rsvg-convert ${PROJECT_SOURCE_DIR}/ui/pixmaps/com.github.xournalpp.xournalpp.svg --width=${SIZE} --height=${SIZE} -o ${RESIZED_ICON}
+	)
+  set (ICON_DEPS ${ICON_DEPS} ${RESIZED_ICON})
+  unset (RESIZED_ICON)
+  endforeach()
+  add_custom_command (
+    OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/win32/xournalpp.ico
+                COMMAND magick convert ${ICON_DEPS} ${CMAKE_CURRENT_BINARY_DIR}/win32/xournalpp.ico
+                DEPENDS ${ICON_DEPS}
+  )
+  unset(ICON_SIZES)
+  unset(ICON_DEPS)
+  add_custom_target(xournalpp_icon DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/win32/xournalpp.ico)
+  add_dependencies(xournalpp xournalpp_icon)
+  add_dependencies(xournalpp-wrapper xournalpp_icon)
+  
+  # windows specific source files
+  target_sources(xournalpp PRIVATE exe/win32/console.cpp)
+  target_sources(xournalpp-wrapper PRIVATE exe/win32/console.cpp)
+  if (MSVC)
+    target_sources(xournalpp PRIVATE exe/win32/gui_main.cpp)
+    target_sources(xournalpp-wrapper PRIVATE exe/win32/gui_main.cpp)
+  endif()
+  
+  # windows specific appinfo
+  if(NOT MSVC)
+    set(CMAKE_RC_COMPILE_OBJECT "<CMAKE_RC_COMPILER> -O coff -i <SOURCE> -o <OBJECT>")
+    set(CMAKE_RC_COMPILER_INIT windres)
+  endif()
+  enable_language(RC)
+
+  configure_file(exe/win32/xpp.rc.in ${CMAKE_CURRENT_BINARY_DIR}/win32/xpp.rc)
+  target_sources(xournalpp PRIVATE ${CMAKE_CURRENT_BINARY_DIR}/win32/xpp.rc)
+  target_sources(xournalpp-wrapper PRIVATE ${CMAKE_CURRENT_BINARY_DIR}/win32/xpp.rc)
+endif ()
+# Until here
+################################
+
+install(TARGETS xournalpp-wrapper
+        RUNTIME DESTINATION bin
+        COMPONENT xournalpp-wrapper
+        )
+install(TARGETS xournalpp
+        RUNTIME DESTINATION bin
+        COMPONENT xournalpp
+        )
+
+add_subdirectory(xoj-preview-extractor)
diff --git a/entry/src/main/cpp/src/config-debug.h.in b/entry/src/main/cpp/src/config-debug.h.in
new file mode 100644
index 0000000..d4cc3db
--- /dev/null
+++ b/entry/src/main/cpp/src/config-debug.h.in
@@ -0,0 +1,69 @@
+/*
+ * Xournal++
+ *
+ * Static debugging definitions for Xournal++
+ *
+ * @author Xournal++ Team
+ * https://github.com/xournalpp/xournalpp
+ *
+ * @license GNU GPLv2 or later
+ */
+
+#pragma once
+
+/**
+ * Input debugging, e.g. eraser events etc.
+ */
+#cmakedefine DEBUG_INPUT
+#cmakedefine DEBUG_INPUT_GDK_PRINT_EVENTS
+#cmakedefine DEBUG_INPUT_PRINT_ALL_MOTION_EVENTS
+
+/**
+ * Shape recognizer debug: output score etc.
+ */
+#cmakedefine DEBUG_RECOGNIZER
+
+/**
+ * Scheduler debug: show jobs etc.
+ */
+#cmakedefine DEBUG_SCHEDULER
+
+/**
+ * Draw a surrounding border to all elements
+ */
+#cmakedefine DEBUG_SHOW_ELEMENT_BOUNDS
+
+/**
+ * Draw a border around all repaint rects
+ */
+#cmakedefine DEBUG_SHOW_REPAINT_BOUNDS
+
+/**
+ * Draw a border around all painted rects
+ */
+#cmakedefine DEBUG_SHOW_PAINT_BOUNDS
+
+/**
+ * Draw the mask in StrokeView
+ */
+#cmakedefine DEBUG_MASKS
+
+/**
+ * Print info on draw requests and calls
+ */
+#cmakedefine DEBUG_DRAW_WIDGET
+
+/**
+ * Show repainted areas when erasing an highlighter stroke
+ */
+#cmakedefine DEBUG_ERASABLE_STROKE_BOXES
+
+/**
+ * Show eraser logging info when we get an inconsistent result
+ */
+#cmakedefine ENABLE_ERASER_DEBUG
+
+/**
+ * Enable some debugging output around the action database
+ */
+#cmakedefine DEBUG_ACTION_DB
diff --git a/entry/src/main/cpp/src/config-dev.h.in b/entry/src/main/cpp/src/config-dev.h.in
new file mode 100644
index 0000000..a715296
--- /dev/null
+++ b/entry/src/main/cpp/src/config-dev.h.in
@@ -0,0 +1,50 @@
+/*
+ * Xournal++
+ *
+ * Static definitions for Xournal++
+ *
+ * @author Xournal++ Team
+ * https://github.com/xournalpp/xournalpp
+ *
+ * @license GNU GPLv2 or later
+ */
+
+#pragma once
+
+/**
+ * Toolbar config file name
+ */
+#define TOOLBAR_CONFIG "@DEV_TOOLBAR_CONFIG@"
+
+/**
+ * Settings file name
+ */
+#define SETTINGS_XML_FILE "@DEV_SETTINGS_XML_FILE@"
+
+/**
+ * Gimp Palette File
+ */
+#define DEFAULT_PALETTE_FILE "@DEV_DEFAULT_PALETTE_FILE@"
+
+/**
+ * Print config file name
+ */
+#define PRINT_CONFIG_FILE "@DEV_PRINT_CONFIG_FILE@"
+
+/**
+ * Metadata file name
+ */
+#define METADATA_FILE "@DEV_METADATA_FILE@"
+
+/**
+ * Directory where errorlogfiles will be placed
+ */
+#define ERRORLOG_DIR "@DEV_ERRORLOG_DIR@"
+
+
+/* --- Logging --- */
+
+/**
+ * Compile with call log
+ */
+#cmakedefine DEV_CALL_LOG
diff --git a/entry/src/main/cpp/src/config-features.h.in b/entry/src/main/cpp/src/config-features.h.in
new file mode 100644
index 0000000..62f124d
--- /dev/null
+++ b/entry/src/main/cpp/src/config-features.h.in
@@ -0,0 +1,30 @@
+/*
+ * Xournal++
+ *
+ * Additional features of Xournal++
+ *
+ * @author Xournal++ Team
+ * https://github.com/xournalpp/xournalpp
+ *
+ * @license GNU GPLv2 or later
+ */
+
+#pragma once
+
+/* --- Stable features --- */
+
+#cmakedefine ENABLE_PLUGINS
+
+#cmakedefine ENABLE_GTK_SOURCEVIEW
+
+#cmakedefine ENABLE_AUDIO
+
+/* --- Testing features --- */
+
+#cmakedefine ENABLE_QPDF
+
+#cmakedefine ENABLE_CPPTRACE
+
+// Example: #cmakedefine NAME_FROM_Cmake_list
+// in CMakeFile.txt:
+// option (NAME_FROM_Cmake_list "Description" OFF)
diff --git a/entry/src/main/cpp/src/config-git.h.in b/entry/src/main/cpp/src/config-git.h.in
new file mode 100644
index 0000000..99a9a52
--- /dev/null
+++ b/entry/src/main/cpp/src/config-git.h.in
@@ -0,0 +1,40 @@
+/*
+ * Xournal++
+ *
+ * Current git repo info
+ *
+ * @author Xournal++ Team
+ * https://github.com/xournalpp/xournalpp
+ *
+ * @license GNU GPLv2 or later
+ */
+
+#pragma once
+
+
+/* --- Current git repo info --- */
+
+/**
+ * Origin URL of current repository
+ */
+constexpr auto GIT_ORIGIN_URL = "@GIT_ORIGIN_URL@";
+
+/**
+ * Git origin repo owner
+ */
+constexpr auto GIT_ORIGIN_OWNER = "@GIT_ORIGIN_OWNER@";
+
+/**
+ * Git origin repo name
+ */
+constexpr auto GIT_ORIGIN_REPO = "@GIT_ORIGIN_REPO@";
+
+/**
+ * Current branch of git repo
+ */
+constexpr auto GIT_BRANCH = "@GIT_BRANCH@";
+
+/**
+ * Current git commit id (with "-dirty" appended if dirty source tree)
+ */
+constexpr auto GIT_COMMIT_ID = "@RELEASE_IDENTIFIER@";
diff --git a/entry/src/main/cpp/src/config-paths.h.in b/entry/src/main/cpp/src/config-paths.h.in
new file mode 100644
index 0000000..b941e7f
--- /dev/null
+++ b/entry/src/main/cpp/src/config-paths.h.in
@@ -0,0 +1,22 @@
+/*
+ * Xournal++
+ *
+ * Paths to resources
+ *
+ * @author Xournal++ Team
+ * https://github.com/xournalpp/xournalpp
+ *
+ * @license GNU GPLv2 or later
+ */
+
+#pragma once
+
+/**
+ * Path to current source directory
+ */
+#define PROJECT_SOURCE_DIR "@PROJECT_SOURCE_DIR@"
+
+/**
+ * Path to install directory (for integration test)
+ */
+#define PROJECT_INSTALL_DIR "@PROJECT_INSTALL_DIR@"
diff --git a/entry/src/main/cpp/src/config.h.in b/entry/src/main/cpp/src/config.h.in
new file mode 100644
index 0000000..31b7bde
--- /dev/null
+++ b/entry/src/main/cpp/src/config.h.in
@@ -0,0 +1,57 @@
+/*
+ * Xournal++
+ *
+ * Static project constants
+ *
+ * @author Xournal++ Team
+ * https://github.com/xournalpp/xournalpp
+ *
+ * @license GNU GPLv2 or later
+ */
+
+#pragma once
+
+/* --- Project info --- */
+
+/**
+ * Full name of this project and package
+ */
+constexpr auto PROJECT_NAME = "@PROJECT_NAME@";
+
+/**
+ * Project version number
+ */
+constexpr auto PROJECT_VERSION = "@PROJECT_VERSION@";
+
+/**
+ * Address where crash reports for this project should be sent
+ */
+constexpr auto PROJECT_CRASHREPORT = "@PROJECT_CRASHREPORT@";
+
+/**
+ * Full name and version of this project
+ */
+constexpr auto PROJECT_STRING = "@PROJECT_NAME@ @PROJECT_VERSION@";
+
+/**
+ * Project URL
+ */
+constexpr auto PROJECT_HOMEPAGE_URL = "@PROJECT_HOMEPAGE_URL@";
+
+/**
+ * File format version
+ */
+constexpr int FILE_FORMAT_VERSION = @DEV_FILE_FORMAT_VERSION@;
+
+
+/* --- I18N --- */
+
+/**
+ * Enable i18n
+ */
+#cmakedefine ENABLE_NLS
+
+/**
+ * Gettext package
+ */
+constexpr auto GETTEXT_PACKAGE = "@GETTEXT_PACKAGE@";
diff --git a/entry/src/main/cpp/src/core/CMakeLists.txt b/entry/src/main/cpp/src/core/CMakeLists.txt
new file mode 100644
index 0000000..ee22df8
--- /dev/null
+++ b/entry/src/main/cpp/src/core/CMakeLists.txt
@@ -0,0 +1,20 @@
+cmake_minimum_required(VERSION 3.12)
+cmake_policy(VERSION 3.12)
+
+file(GLOB_RECURSE xournalpp_sources *.cpp *.h)
+
+if(NOT ENABLE_AUDIO)
+    list(FILTER xournalpp_sources EXCLUDE REGEX "${PROJECT_SOURCE_DIR}/src/core/audio/.*" )
+    list(FILTER xournalpp_sources EXCLUDE REGEX "${PROJECT_SOURCE_DIR}/src/core/control/AudioController.cpp" )
+endif()
+set(xournalpp_include_dirs "${CMAKE_CURRENT_SOURCE_DIR}")
+
+add_library(xournalpp-core STATIC ${xournalpp_sources})
+target_compile_features(xournalpp-core PUBLIC ${PROJECT_CXX_FEATURES})
+target_compile_features(xournalpp-core PUBLIC cxx_std_20)
+target_link_libraries(xournalpp-core
+        PRIVATE xoj::util ${xournalpp_LDFLAGS}
+        PUBLIC xoj::defaults xoj::external_modules
+        )
+target_include_directories(xournalpp-core PUBLIC ${xournalpp_include_dirs})
+add_library(xoj::core ALIAS xournalpp-core)
diff --git a/entry/src/main/cpp/src/core/audio/AudioPlayer.cpp b/entry/src/main/cpp/src/core/audio/AudioPlayer.cpp
new file mode 100644
index 0000000..d730ffa
--- /dev/null
+++ b/entry/src/main/cpp/src/core/audio/AudioPlayer.cpp
@@ -0,0 +1,85 @@
+#include "AudioPlayer.h"
+
+#include "audio/AudioQueue.h"                // for AudioQueue
+#include "audio/DeviceInfo.h"                // for DeviceInfo
+#include "audio/PortAudioConsumer.h"         // for PortAudioConsumer
+#include "audio/VorbisProducer.h"            // for VorbisProducer
+#include "control/Control.h"                 // for Control
+#include "control/actions/ActionDatabase.h"  // for ActionDatabase
+#include "gui/MainWindow.h"                  // for MainWindow
+
+class Settings;
+
+AudioPlayer::AudioPlayer(Control& control, Settings& settings):
+        control(control),
+        settings(settings),
+        audioQueue(std::make_unique<AudioQueue<float>>()),
+        portAudioConsumer(std::make_unique<PortAudioConsumer>(*this, *audioQueue)),
+        vorbisProducer(std::make_unique<VorbisProducer>(*audioQueue)) {}
+
+AudioPlayer::~AudioPlayer() { this->stop(); }
+
+auto AudioPlayer::start(fs::path const& file, unsigned int timestamp) -> bool {
+    // Start the producer for reading the data
+    bool status = this->vorbisProducer->start(file, timestamp);
+
+    // Start playing
+    if (status) {
+        status = status && this->play();
+    }
+
+    return status;
+}
+
+auto AudioPlayer::isPlaying() -> bool { return this->portAudioConsumer->isPlaying(); }
+
+void AudioPlayer::pause() {
+    if (!this->portAudioConsumer->isPlaying()) {
+        return;
+    }
+
+    // Stop playing audio
+    this->portAudioConsumer->stopPlaying();
+}
+
+auto AudioPlayer::play() -> bool {
+    if (this->portAudioConsumer->isPlaying()) {
+        return false;
+    }
+
+    return this->portAudioConsumer->startPlaying();
+}
+
+void AudioPlayer::disableAudioPlaybackButtons() {
+    if (this->audioQueue->hasStreamEnded()) {
+        auto* actionDB = this->control.getActionDatabase();
+        actionDB->enableAction(Action::AUDIO_PAUSE_PLAYBACK, false);
+        actionDB->enableAction(Action::AUDIO_STOP_PLAYBACK, false);
+        actionDB->enableAction(Action::AUDIO_SEEK_FORWARDS, false);
+        actionDB->enableAction(Action::AUDIO_SEEK_BACKWARDS, false);
+        actionDB->setActionState(Action::AUDIO_PAUSE_PLAYBACK, false);
+    }
+}
+
+void AudioPlayer::stop() {
+    disableAudioPlaybackButtons();
+    // Stop playing audio
+    this->portAudioConsumer->stopPlaying();
+
+    this->audioQueue->signalEndOfStream();
+
+    // Abort libsox
+    this->vorbisProducer->abort();
+
+    // Reset the queue for the next playback
+    this->audioQueue->reset();
+}
+
+void AudioPlayer::seek(int seconds) {
+    // set seek flag here in vorbisProducer
+    this->vorbisProducer->seek(seconds);
+}
+
+auto AudioPlayer::getOutputDevices() -> std::vector<DeviceInfo> { return this->portAudioConsumer->getOutputDevices(); }
+
+auto AudioPlayer::getSettings() -> Settings& { return this->settings; }
diff --git a/entry/src/main/cpp/src/core/audio/AudioPlayer.h b/entry/src/main/cpp/src/core/audio/AudioPlayer.h
new file mode 100644
index 0000000..a6ad72a
--- /dev/null
+++ b/entry/src/main/cpp/src/core/audio/AudioPlayer.h
@@ -0,0 +1,56 @@
+/*
+ * Xournal++
+ *
+ * Class to play audio from a MP3-file
+ *
+ * @author Xournal++ Team
+ * https://github.com/xournalpp/xournalpp
+ *
+ * @license GNU GPLv2 or later
+ */
+
+#pragma once
+
+#include <memory>  // for make_unique, unique_ptr
+#include <vector>  // for vector
+
+#include "filesystem.h"  // for path
+
+template <typename T>
+class AudioQueue;
+class Control;
+class DeviceInfo;
+class PortAudioConsumer;
+class Settings;
+class VorbisProducer;
+
+
+class AudioPlayer final {
+public:
+    explicit AudioPlayer(Control& control, Settings& settings);
+    AudioPlayer(AudioPlayer const&) = delete;
+    AudioPlayer(AudioPlayer&&) = delete;
+    auto operator=(AudioPlayer const&) -> AudioPlayer& = delete;
+    auto operator=(AudioPlayer&&) -> AudioPlayer& = delete;
+    ~AudioPlayer();
+
+    bool start(fs::path const& file, unsigned int timestamp = 0);
+    bool isPlaying();
+    void stop();
+    bool play();
+    void pause();
+    void seek(int seconds);
+
+    std::vector<DeviceInfo> getOutputDevices();
+
+    Settings& getSettings();
+    void disableAudioPlaybackButtons();
+
+private:
+    Control& control;
+    Settings& settings;
+
+    std::unique_ptr<AudioQueue<float>> audioQueue;
+    std::unique_ptr<PortAudioConsumer> portAudioConsumer;
+    std::unique_ptr<VorbisProducer> vorbisProducer;
+};
diff --git a/entry/src/main/cpp/src/core/audio/AudioQueue.h b/entry/src/main/cpp/src/core/audio/AudioQueue.h
new file mode 100644
index 0000000..394a16f
--- /dev/null
+++ b/entry/src/main/cpp/src/core/audio/AudioQueue.h
@@ -0,0 +1,147 @@
+/*
+ * Xournal++
+ *
+ * Queue to connect an audio producer and an audio consumer
+ *
+ * @author Xournal++ Team
+ * https://github.com/xournalpp/xournalpp
+ *
+ * @license GNU GPLv2 or later
+ */
+
+#pragma once
+
+#include <algorithm>
+#include <condition_variable>
+#include <deque>
+#include <limits>
+#include <mutex>
+
+#include "util/Assert.h"
+#include "util/safe_casts.h"  // for as_signed
+
+template <typename T>
+class AudioQueue {
+public:
+    void reset() {
+        std::lock_guard<std::mutex> lock(internalLock);
+        this->popNotified = false;
+        this->pushNotified = false;
+        this->streamEnd = false;
+        internalQueue.clear();
+
+        this->sampleRate = -1;
+        this->channels = 0;
+    }
+
+    bool empty() {
+        std::lock_guard<std::mutex> lock(internalLock);
+        return internalQueue.empty();
+    }
+
+    size_t size() {
+        std::lock_guard<std::mutex> lock(internalLock);
+        return internalQueue.size();
+    }
+
+    template <typename Iter>
+    void emplace(Iter begI, Iter endI) {
+        std::lock_guard<std::mutex> lock(internalLock);
+        std::move(begI, endI, std::front_inserter(internalQueue));
+
+        this->pushNotified = true;
+        this->pushLockCondition.notify_one();
+    }
+
+    template <typename InsertIter>
+    InsertIter pop(InsertIter insertIter, size_t nSamples) {
+        std::lock_guard<std::mutex> lock(internalLock);
+
+        if (this->channels == 0) {
+            this->popNotified = true;
+            this->popLockCondition.notify_one();
+            return insertIter;
+        }
+
+
+        auto queueSize = internalQueue.size();
+        auto returnBufferLength = std::min<size_t>(nSamples, queueSize - queueSize % this->channels);
+        auto begI = rbegin(internalQueue);
+        auto endI = std::next(begI, as_signed(returnBufferLength));
+
+        auto ret = std::move(begI, endI, insertIter);
+        internalQueue.erase(endI.base(), begI.base());
+
+        this->popNotified = true;
+        this->popLockCondition.notify_one();
+        return ret;
+    }
+
+    void signalEndOfStream() {
+        std::lock_guard<std::mutex> lock(internalLock);
+        this->streamEnd = true;
+        this->pushNotified = true;
+        this->popNotified = true;
+        this->pushLockCondition.notify_one();
+        this->popLockCondition.notify_one();
+    }
+
+    void waitForProducer(std::unique_lock<std::mutex>& lock) {
+        // static_assert(lock.mutex() == &this->queueLock);
+        xoj_assert(lock.mutex() == &this->queueLock);
+        while (!this->pushNotified && !hasStreamEnded()) { this->pushLockCondition.wait(lock); }
+        this->pushNotified = false;
+    }
+
+    void waitForConsumer(std::unique_lock<std::mutex>& lock) {
+        // static_assert(lock.mutex() == &this->queueLock);
+        xoj_assert(lock.mutex() == &this->queueLock);
+        while (!this->popNotified && !hasStreamEnded()) { this->popLockCondition.wait(lock); }
+        this->popNotified = false;
+    }
+
+    bool hasStreamEnded() {
+        std::lock_guard<std::mutex> lock(internalLock);
+        return this->streamEnd;
+    }
+
+    [[nodiscard]] std::unique_lock<std::mutex> acquire_lock() {
+        std::unique_lock retLock{this->queueLock, std::defer_lock};
+        std::lock(retLock, this->internalLock);
+        std::lock_guard lock{this->internalLock, std::adopt_lock};
+        return retLock;
+    }
+
+    void setAudioAttributes(double lSampleRate, unsigned int lChannels) {
+        std::lock_guard<std::mutex> lock(internalLock);
+        this->sampleRate = lSampleRate;
+        this->channels = lChannels;
+    }
+
+    /**
+     * @return a pair of the sample rate and the channel count,
+     * std::pair<>::first is the sample rate and std::pair<>::second the channel count.
+     * Todo (readability, type-safety): create a struct AudioAttributes; remove this comment
+     */
+
+    [[nodiscard]] std::pair<double, int> getAudioAttributes() {
+        std::lock_guard<std::mutex> lock(internalLock);
+        return {this->sampleRate, this->channels};
+    }
+
+private:
+    std::mutex queueLock;
+    std::mutex internalLock;
+
+    std::deque<T> internalQueue;
+
+    std::condition_variable pushLockCondition;
+    std::condition_variable popLockCondition;
+
+    double sampleRate{std::numeric_limits<double>::quiet_NaN()};
+    uint32_t channels{0};
+
+    bool streamEnd{false};
+    bool pushNotified{false};
+    bool popNotified{false};
+};
diff --git a/entry/src/main/cpp/src/core/audio/AudioRecorder.cpp b/entry/src/main/cpp/src/core/audio/AudioRecorder.cpp
new file mode 100644
index 0000000..a5709ee
--- /dev/null
+++ b/entry/src/main/cpp/src/core/audio/AudioRecorder.cpp
@@ -0,0 +1,32 @@
+#include "AudioRecorder.h"
+
+#include "audio/AudioQueue.h"         // for AudioQueue
+#include "audio/DeviceInfo.h"         // for DeviceInfo
+#include "audio/PortAudioProducer.h"  // for PortAudioProducer
+#include "audio/VorbisConsumer.h"     // for VorbisConsumer
+
+AudioRecorder::AudioRecorder(Settings& settings):
+        audioQueue(std::make_unique<AudioQueue<float>>()),
+        portAudioProducer(std::make_unique<PortAudioProducer>(settings, *audioQueue)),
+        vorbisConsumer(std::make_unique<VorbisConsumer>(settings, *audioQueue)) {}
+
+AudioRecorder::~AudioRecorder() { this->stop(); }
+
+auto AudioRecorder::start(fs::path const& file) -> bool {
+    bool status = this->portAudioProducer->startRecording();
+    // Start the consumer for writing the data
+    status = status && this->vorbisConsumer->start(file);
+    return status;
+}
+
+void AudioRecorder::stop() {
+    this->portAudioProducer->stopRecording();
+    this->vorbisConsumer->join();  // libsox must write all the data before we can continue
+    this->audioQueue->reset();     // next recording requires empty queue
+}
+
+auto AudioRecorder::isRecording() const -> bool { return this->portAudioProducer->isRecording(); }
+
+auto AudioRecorder::getInputDevices() const -> std::vector<DeviceInfo> {
+    return this->portAudioProducer->getInputDevices();
+}
diff --git a/entry/src/main/cpp/src/core/audio/AudioRecorder.h b/entry/src/main/cpp/src/core/audio/AudioRecorder.h
new file mode 100644
index 0000000..98b90fe
--- /dev/null
+++ b/entry/src/main/cpp/src/core/audio/AudioRecorder.h
@@ -0,0 +1,44 @@
+/*
+ * Xournal++
+ *
+ * Class to record audio and store it as MP3-file
+ *
+ * @author Xournal++ Team
+ * https://github.com/xournalpp/xournalpp
+ *
+ * @license GNU GPLv2 or later
+ */
+
+#pragma once
+
+#include <memory>  // for make_unique, unique_ptr
+#include <vector>  // for vector
+
+#include "filesystem.h"  // for path
+
+template <typename T>
+class AudioQueue;
+class DeviceInfo;
+class PortAudioProducer;
+class Settings;
+class VorbisConsumer;
+
+class AudioRecorder final {
+public:
+    explicit AudioRecorder(Settings& settings);
+    AudioRecorder(AudioRecorder const&) = delete;
+    AudioRecorder(AudioRecorder&&) = delete;
+    auto operator=(AudioRecorder const&) -> AudioRecorder& = delete;
+    auto operator=(AudioRecorder&&) -> AudioRecorder& = delete;
+    ~AudioRecorder();
+
+    bool start(fs::path const& file);
+    void stop();
+    [[nodiscard]] bool isRecording() const;
+    std::vector<DeviceInfo> getInputDevices() const;
+
+private:
+    std::unique_ptr<AudioQueue<float>> audioQueue;
+    std::unique_ptr<PortAudioProducer> portAudioProducer;
+    std::unique_ptr<VorbisConsumer> vorbisConsumer;
+};
diff --git a/entry/src/main/cpp/src/core/audio/DeviceInfo.cpp b/entry/src/main/cpp/src/core/audio/DeviceInfo.cpp
new file mode 100644
index 0000000..eb99296
--- /dev/null
+++ b/entry/src/main/cpp/src/core/audio/DeviceInfo.cpp
@@ -0,0 +1,15 @@
+#include "DeviceInfo.h"
+
+DeviceInfo::DeviceInfo(portaudio::Device* device, bool selected):
+        deviceName(device->name()),
+        index(device->index()),
+        selected(selected),
+        inputChannels((device->isFullDuplexDevice() || device->isInputOnlyDevice()) ? device->maxInputChannels() : 0),
+        outputChannels((device->isFullDuplexDevice() || device->isOutputOnlyDevice()) ? device->maxOutputChannels() :
+                                                                                        0) {}
+
+auto DeviceInfo::getDeviceName() const -> const std::string& { return deviceName; }
+
+auto DeviceInfo::getIndex() const -> PaDeviceIndex { return index; }
+
+auto DeviceInfo::getSelected() const -> bool { return selected; }
diff --git a/entry/src/main/cpp/src/core/audio/DeviceInfo.h b/entry/src/main/cpp/src/core/audio/DeviceInfo.h
new file mode 100644
index 0000000..6412150
--- /dev/null
+++ b/entry/src/main/cpp/src/core/audio/DeviceInfo.h
@@ -0,0 +1,37 @@
+/*
+ * Xournal++
+ *
+ * Class storing information about an audio device
+ *
+ * @author Xournal++ Team
+ * https://github.com/xournalpp/xournalpp
+ *
+ * @license GNU GPLv2 or later
+ */
+#pragma once
+
+#include <string>  // for string
+
+#include "config-features.h"
+
+#ifdef ENABLE_AUDIO
+#include <portaudiocpp/PortAudioCpp.hxx>  // for PaDeviceIndex
+
+
+class DeviceInfo {
+public:
+    DeviceInfo(portaudio::Device* device, bool selected);
+
+public:
+    const std::string& getDeviceName() const;
+    PaDeviceIndex getIndex() const;
+    bool getSelected() const;
+
+private:
+    const std::string deviceName;
+    const PaDeviceIndex index{};
+    const bool selected{};
+    const int inputChannels{};
+    const int outputChannels{};
+};
+#endif
diff --git a/entry/src/main/cpp/src/core/audio/PortAudioConsumer.cpp b/entry/src/main/cpp/src/core/audio/PortAudioConsumer.cpp
new file mode 100644
index 0000000..a228bd7
--- /dev/null
+++ b/entry/src/main/cpp/src/core/audio/PortAudioConsumer.cpp
@@ -0,0 +1,162 @@
+#include "PortAudioConsumer.h"
+
+#include <algorithm>  // for for_each, transform, max
+#include <deque>      // for _Deque_iterator
+#include <iterator>   // for next, prev
+#include <string>     // for to_string, string
+
+#include <glib.h>  // for g_warning
+
+#include "audio/AudioQueue.h"           // for AudioQueue
+#include "audio/DeviceInfo.h"           // for DeviceInfo
+#include "control/settings/Settings.h"  // for Settings
+#include "util/safe_casts.h"            // for as_unsigned
+
+#include "AudioPlayer.h"  // for AudioPlayer
+
+constexpr auto FRAMES_PER_BUFFER{64U};
+
+auto PortAudioConsumer::getOutputDevices() const -> std::vector<DeviceInfo> {
+    std::vector<DeviceInfo> deviceList;
+    deviceList.reserve(as_unsigned(this->sys.deviceCount()));
+
+    for (auto i = this->sys.devicesBegin(); i != sys.devicesEnd(); ++i) {
+        if (i->isFullDuplexDevice() || i->isOutputOnlyDevice()) {
+            DeviceInfo deviceInfo(&(*i), this->audioPlayer.getSettings().getAudioOutputDevice() == i->index());
+            deviceList.push_back(deviceInfo);
+        }
+    }
+    return deviceList;
+}
+
+auto PortAudioConsumer::getSelectedOutputDevice() const -> DeviceInfo {
+    PaDeviceIndex idx = this->audioPlayer.getSettings().getAudioOutputDevice();
+    if (idx == -1) {
+        return DeviceInfo(&sys.defaultOutputDevice(), true);
+    }
+    try {
+        return DeviceInfo(&sys.deviceByIndex(idx), true);
+    } catch (const portaudio::PaException& e) {
+        g_warning("PortAudioConsumer: Selected output device was not found - fallback to default output device\nCaused "
+                  "by: %s",
+                  e.what());
+        return DeviceInfo(&sys.defaultOutputDevice(), true);
+    }
+}
+
+auto PortAudioConsumer::isPlaying() const -> bool { return this->outputStream && this->outputStream->isActive(); }
+
+auto PortAudioConsumer::startPlaying() -> bool {
+    // Abort a playback stream if one is currently active
+    if (isPlaying()) {
+        this->outputStream->abort();
+    }
+
+    auto [sampleRate, channels] = this->audioQueue.getAudioAttributes();
+
+    if (sampleRate == -1) {
+        g_warning("PortAudioConsumer: Timing issue - Sample rate requested before known");
+        return false;
+    }
+
+    // Get the device information of our output device
+    portaudio::Device* device = nullptr;
+    try {
+        device = &sys.deviceByIndex(getSelectedOutputDevice().getIndex());
+    } catch (const portaudio::PaException&) {
+        g_warning("PortAudioConsumer: Unable to find selected output device");
+        return false;
+    }
+
+    if (device->maxOutputChannels() < channels) {
+        this->audioQueue.signalEndOfStream();
+        g_warning("Output device has not enough channels to play audio file. (Requires at least 2 channels)");
+        return false;
+    }
+
+    this->outputChannels = channels;
+    portaudio::DirectionSpecificStreamParameters outParams(*device, channels, portaudio::FLOAT32, true,
+                                                           device->defaultLowOutputLatency(), nullptr);
+    portaudio::StreamParameters params(portaudio::DirectionSpecificStreamParameters::null(), outParams, sampleRate,
+                                       FRAMES_PER_BUFFER, paNoFlag);
+
+    try {
+        this->outputStream = std::make_unique<portaudio::MemFunCallbackStream<PortAudioConsumer>>(
+                params, *this, &PortAudioConsumer::playCallback);
+    } catch (const portaudio::PaException& e) {
+        this->audioQueue.signalEndOfStream();
+        g_warning("PortAudioConsumer: Unable to open stream to device\nCaused by: %s", e.what());
+        return false;
+    }
+    // Start the recording
+    try {
+        this->outputStream->start();
+    } catch (const portaudio::PaException& e) {
+        this->audioQueue.signalEndOfStream();
+        g_warning("PortAudioConsumer: Unable to start stream\nCaused by: %s", e.what());
+        this->outputStream.reset();
+        return false;
+    }
+    return true;
+}
+
+auto PortAudioConsumer::playCallback(const void* /*inputBuffer*/, void* outputBuffer, unsigned long framesPerBuffer,
+                                     const PaStreamCallbackTimeInfo*, PaStreamCallbackFlags statusFlags) -> int {
+    if (statusFlags) {
+        g_warning("PortAudioConsumer: PortAudio reported a stream warning: %s", std::to_string(statusFlags).c_str());
+    }
+
+    if (outputBuffer != nullptr) {
+        auto begI = static_cast<float*>(outputBuffer);
+        auto midI = this->audioQueue.pop(begI, framesPerBuffer * as_unsigned(this->outputChannels));
+        auto endI = std::next(begI, as_signed(framesPerBuffer) * this->outputChannels);
+        // Fill buffer to requested length if necessary
+
+        if (midI != endI) {
+            // Show underflow warning if there are not enough samples and the stream is not yet finished
+            if (!this->audioQueue.hasStreamEnded()) {
+                g_warning("PortAudioConsumer: Not enough audio samples available to fill requested frame");
+            }
+
+            if (midI > std::next(begI, this->outputChannels)) {
+                // If there is previous audio data use this data to ramp down the audio samples
+                std::transform(std::prev(midI, this->outputChannels), std::prev(endI, this->outputChannels), midI,
+                               [](auto&& ampl) { return ampl / 2.0; });
+            } else {
+                // If there is no data that could be used to ramp down just output silence
+                std::for_each(midI, endI, [](auto& ampl) { ampl = 0; });
+            }
+        }
+
+        // Continue playback if there is still data available
+        if (this->audioQueue.hasStreamEnded() && this->audioQueue.empty()) {
+            this->audioPlayer.disableAudioPlaybackButtons();
+            return paComplete;
+        }
+
+
+        return paContinue;
+    }
+
+    // The output buffer is no longer available - Abort!
+    this->audioQueue.signalEndOfStream();
+    this->audioPlayer.disableAudioPlaybackButtons();
+    return paAbort;
+}
+
+void PortAudioConsumer::stopPlaying() {
+    // Stop the playback
+    if (this->outputStream) {
+        try {
+            if (this->outputStream->isActive()) {
+                this->outputStream->stop();
+            }
+        } catch (const portaudio::PaException&) {
+            /*
+             * We try closing the stream but this->outputStream might be an invalid object at this time if the stream
+             * was previously closed by the backend. Just ignore this as the stream is closed either way.
+             */
+        }
+    }
+    this->outputStream.reset();
+}
diff --git a/entry/src/main/cpp/src/core/audio/PortAudioConsumer.h b/entry/src/main/cpp/src/core/audio/PortAudioConsumer.h
new file mode 100644
index 0000000..0c6b761
--- /dev/null
+++ b/entry/src/main/cpp/src/core/audio/PortAudioConsumer.h
@@ -0,0 +1,46 @@
+/*
+ * Xournal++
+ *
+ * Class to play audio using libportaudio
+ *
+ * @author Xournal++ Team
+ * https://github.com/xournalpp/xournalpp
+ *
+ * @license GNU GPLv2 or later
+ */
+
+#pragma once
+
+#include <memory>  // for unique_ptr
+#include <vector>  // for vector
+
+#include <portaudiocpp/PortAudioCpp.hxx>  // for MemFunCallbackStream, System
+
+#include "DeviceInfo.h"  // for DeviceInfo
+
+class AudioPlayer;
+template <typename T>
+class AudioQueue;
+
+class PortAudioConsumer final {
+public:
+    explicit PortAudioConsumer(AudioPlayer& audioPlayer, AudioQueue<float>& audioQueue):
+            audioPlayer(audioPlayer), audioQueue(audioQueue) {}
+
+    std::vector<DeviceInfo> getOutputDevices() const;
+    DeviceInfo getSelectedOutputDevice() const;
+    bool isPlaying() const;
+    bool startPlaying();
+    int playCallback(const void* inputBuffer, void* outputBuffer, unsigned long framesPerBuffer,
+                     const PaStreamCallbackTimeInfo* timeInfo, PaStreamCallbackFlags statusFlags);
+    void stopPlaying();
+
+private:
+    portaudio::System& sys{portaudio::System::instance()};
+    AudioPlayer& audioPlayer;
+    AudioQueue<float>& audioQueue;
+
+    std::unique_ptr<portaudio::MemFunCallbackStream<PortAudioConsumer>> outputStream;
+
+    int outputChannels = 0;
+};
diff --git a/entry/src/main/cpp/src/core/audio/PortAudioProducer.cpp b/entry/src/main/cpp/src/core/audio/PortAudioProducer.cpp
new file mode 100644
index 0000000..8521265
--- /dev/null
+++ b/entry/src/main/cpp/src/core/audio/PortAudioProducer.cpp
@@ -0,0 +1,127 @@
+#include "PortAudioProducer.h"
+
+#include <algorithm>  // for min, max
+#include <cstddef>    // for size_t
+#include <iterator>   // for next
+#include <string>     // for to_string, string
+
+#include <glib.h>  // for g_message
+
+#include "audio/AudioQueue.h"           // for AudioQueue
+#include "audio/DeviceInfo.h"           // for DeviceInfo
+#include "control/settings/Settings.h"  // for Settings
+#include "util/safe_casts.h"            // for as_unsigned
+
+
+constexpr auto FRAMES_PER_BUFFER{64U};
+
+auto PortAudioProducer::getInputDevices() const -> std::vector<DeviceInfo> {
+    auto devCount = as_unsigned(this->sys.deviceCount());
+    std::vector<DeviceInfo> deviceList;
+    deviceList.reserve(devCount);
+
+    for (auto i = this->sys.devicesBegin(); i != sys.devicesEnd(); ++i) {
+
+        if (i->isFullDuplexDevice() || i->isInputOnlyDevice()) {
+            DeviceInfo deviceInfo(&(*i), this->settings.getAudioInputDevice() == i->index());
+            deviceList.push_back(deviceInfo);
+        }
+    }
+    return deviceList;
+}
+
+auto PortAudioProducer::getSelectedInputDevice() const -> DeviceInfo {
+    PaDeviceIndex idx = this->settings.getAudioInputDevice();
+    if (idx == -1) {
+        return DeviceInfo(&sys.defaultInputDevice(), true);
+    }
+    try {
+        return DeviceInfo(&sys.deviceByIndex(idx), true);
+    } catch (const portaudio::PaException& e) {
+        g_message(
+                "PortAudioProducer: Selected input device not found - fallback to default input device\nCaused by: %s",
+                e.what());
+        return DeviceInfo(&sys.defaultInputDevice(), true);
+    }
+}
+
+auto PortAudioProducer::isRecording() const -> bool { return this->inputStream && this->inputStream->isActive(); }
+
+auto PortAudioProducer::startRecording() -> bool {
+    // Check if there already is a recording
+    if (this->inputStream) {
+        return false;
+    }
+
+    // Get the device information of our input device
+    portaudio::Device* device = nullptr;
+    try {
+        device = &sys.deviceByIndex(getSelectedInputDevice().getIndex());
+    } catch (const portaudio::PaException&) {
+        g_message("PortAudioProducer: Unable to find selected input device");
+        return false;
+    }
+
+    // Restrict recording channels to 2 as playback devices should have 2 channels at least
+    this->inputChannels = std::min(2, device->maxInputChannels());
+    portaudio::DirectionSpecificStreamParameters inParams(*device, this->inputChannels, portaudio::FLOAT32, true,
+                                                          device->defaultLowInputLatency(), nullptr);
+    portaudio::StreamParameters params(inParams, portaudio::DirectionSpecificStreamParameters::null(),
+                                       this->settings.getAudioSampleRate(), FRAMES_PER_BUFFER, paNoFlag);
+
+    this->audioQueue.setAudioAttributes(this->settings.getAudioSampleRate(),
+                                        static_cast<unsigned int>(this->inputChannels));
+
+    // Specify the callback used for buffering the recorded data
+    try {
+        this->inputStream = std::make_unique<portaudio::MemFunCallbackStream<PortAudioProducer>>(
+                params, *this, &PortAudioProducer::recordCallback);
+    } catch (const portaudio::PaException&) {
+        g_message("PortAudioProducer: Unable to open stream");
+        return false;
+    }
+
+    // Start the recording
+    try {
+        this->inputStream->start();
+    } catch (const portaudio::PaException&) {
+        g_message("PortAudioProducer: Unable to start stream");
+        this->inputStream.reset();
+        return false;
+    }
+
+    return true;
+}
+
+auto PortAudioProducer::recordCallback(const void* inputBuffer, void* /*outputBuffer*/, unsigned long framesPerBuffer,
+                                       const PaStreamCallbackTimeInfo*, PaStreamCallbackFlags statusFlags) -> int {
+    if (statusFlags) {
+        g_message("PortAudioProducer: statusFlag: %s", std::to_string(statusFlags).c_str());
+    }
+
+    if (inputBuffer != nullptr) {
+        size_t providedFrames = framesPerBuffer * as_unsigned(this->inputChannels);
+        auto begI = static_cast<float const*>(inputBuffer);
+        this->audioQueue.emplace(begI, std::next(begI, as_signed(providedFrames)));
+    }
+    return paContinue;
+}
+
+void PortAudioProducer::stopRecording() {
+    // Stop the recording
+    if (this->inputStream) {
+        try {
+            if (this->inputStream->isActive()) {
+                this->inputStream->stop();
+            }
+        } catch (const portaudio::PaException&) {
+            g_message("PortAudioProducer: Closing stream failed");
+        }
+    }
+
+    // Notify the consumer at the other side that there will be no more data
+    this->audioQueue.signalEndOfStream();
+
+    // Allow new recording by removing the old one
+    this->inputStream.reset();
+}
diff --git a/entry/src/main/cpp/src/core/audio/PortAudioProducer.h b/entry/src/main/cpp/src/core/audio/PortAudioProducer.h
new file mode 100644
index 0000000..597b22b
--- /dev/null
+++ b/entry/src/main/cpp/src/core/audio/PortAudioProducer.h
@@ -0,0 +1,52 @@
+/*
+ * Xournal++
+ *
+ * Class to record audio using libportaudio
+ *
+ * @author Xournal++ Team
+ * https://github.com/xournalpp/xournalpp
+ *
+ * @license GNU GPLv2 or later
+ */
+
+#pragma once
+
+#include <memory>  // for unique_ptr
+#include <vector>  // for vector
+
+#include <portaudiocpp/PortAudioCpp.hxx>  // for MemFunCallbackStream, System
+
+#include "DeviceInfo.h"  // for DeviceInfo
+
+class Settings;
+template <typename T>
+class AudioQueue;
+
+
+class PortAudioProducer {
+public:
+    PortAudioProducer(Settings& settings, AudioQueue<float>& audioQueue): settings(settings), audioQueue(audioQueue){};
+
+    std::vector<DeviceInfo> getInputDevices() const;
+
+    DeviceInfo getSelectedInputDevice() const;
+
+    bool isRecording() const;
+
+    bool startRecording();
+
+    int recordCallback(const void* inputBuffer, void* outputBuffer, unsigned long framesPerBuffer,
+                       const PaStreamCallbackTimeInfo* timeInfo, PaStreamCallbackFlags statusFlags);
+
+    void stopRecording();
+
+private:
+    portaudio::System& sys{portaudio::System::instance()};
+    Settings& settings;
+
+    AudioQueue<float>& audioQueue;
+
+    std::unique_ptr<portaudio::MemFunCallbackStream<PortAudioProducer>> inputStream;
+
+    int inputChannels = 0;
+};
diff --git a/entry/src/main/cpp/src/core/audio/SNDFileCpp.h b/entry/src/main/cpp/src/core/audio/SNDFileCpp.h
new file mode 100644
index 0000000..bc89b17
--- /dev/null
+++ b/entry/src/main/cpp/src/core/audio/SNDFileCpp.h
@@ -0,0 +1,61 @@
+/*
+ * Xournal++
+ *
+ * Helper functions for libsndfile
+ * platform dependent code to open std::filesystem::paths
+ *
+ * @author Xournal++ Team
+ * https://github.com/xournalpp/xournalpp
+ *
+ * @license GNU GPLv2 or later
+ */
+
+#pragma once
+
+#ifdef _WIN32
+#include <windows.h>
+#define ENABLE_SNDFILE_WINDOWS_PROTOTYPES 1
+#endif
+
+#include <memory>
+
+#include <sndfile.h>
+
+#include "filesystem.h"
+
+namespace xoj::audio {
+
+struct SNDFILE_Deleter {
+    void operator()(SNDFILE* file) { sf_close(file); }
+};
+
+using SNDFileGuard = std::unique_ptr<SNDFILE, SNDFILE_Deleter>;
+
+
+/**
+ * Open a file with libsndfile
+ *
+ * @param path std::string const& path to ensure system single byte encoding
+ * @return The resource pointer to the sound file
+ */
+inline SNDFILE* sf_open_pp(std::string const& path, int mode, SF_INFO* info) {
+    return sf_open(path.c_str(), mode, info);
+}
+#if (defined(ENABLE_SNDFILE_WINDOWS_PROTOTYPES) && ENABLE_SNDFILE_WINDOWS_PROTOTYPES)
+/**
+ * Open a file with libsndfile
+ *
+ * @param path std::wstring const& path to ensure system double byte encoding
+ * @return The resource pointer to the sound file
+ */
+inline SNDFILE* sf_open_pp(std::wstring const& path, int mode, SF_INFO* info) {
+    return sf_wchar_open(path.c_str(), mode, info);
+}
+#endif
+
+// naming similar to std::make_unique
+inline auto make_snd_file(fs::path const& file, int mode, SF_INFO* info) {
+    return SNDFileGuard{sf_open_pp(file, mode, info)};
+}
+
+}  // namespace xoj::audio
\ No newline at end of file
diff --git a/entry/src/main/cpp/src/core/audio/VorbisConsumer.cpp b/entry/src/main/cpp/src/core/audio/VorbisConsumer.cpp
new file mode 100644
index 0000000..3fb9f82
--- /dev/null
+++ b/entry/src/main/cpp/src/core/audio/VorbisConsumer.cpp
@@ -0,0 +1,80 @@
+#include "VorbisConsumer.h"
+
+#include <algorithm>  // for for_each, min, max
+#include <cstddef>    // for size_t
+#include <deque>      // for _Deque_iterator
+#include <iterator>   // for back_insert_iterator, back_in...
+#include <memory>     // for unique_ptr
+#include <string>     // for string
+#include <utility>    // for move
+#include <vector>     // for vector
+
+#include <glib.h>     // for g_warning
+#include <sndfile.h>  // for SF_INFO, sf_strerror, sf_writ...
+
+#include "audio/AudioQueue.h"           // for AudioQueue
+#include "control/settings/Settings.h"  // for Settings
+#include "util/StringUtils.h"
+
+#include "SNDFileCpp.h"  // for make_snd_file, xoj
+
+using namespace xoj;
+
+auto VorbisConsumer::start(fs::path const& file) -> bool {
+    auto [sampleRate, channels] = this->audioQueue.getAudioAttributes();
+
+    if (sampleRate == -1) {
+        g_warning("VorbisConsumer: Timing issue - Sample rate requested before known");
+        return false;
+    }
+
+    SF_INFO sfInfo;
+    sfInfo.channels = channels;
+    sfInfo.format = SF_FORMAT_OGG | SF_FORMAT_VORBIS;
+    sfInfo.samplerate = static_cast<int>(this->settings.getAudioSampleRate());
+
+    auto sfFile = audio::make_snd_file(file.native(), SFM_WRITE, &sfInfo);
+    if (!sfFile) {
+        g_warning("VorbisConsumer: output file \"%s\" could not be opened\ncaused by:%s",
+                  char_cast(file.u8string().c_str()), sf_strerror(sfFile.get()));
+        return false;
+    }
+
+    this->consumerThread = std::thread([this, sfFile = std::move(sfFile), channels = channels] {
+        auto lock{audioQueue.acquire_lock()};
+        auto buffer_size{size_t(64 * channels)};
+        std::vector<float> buffer;
+        buffer.reserve(buffer_size);  // efficiency
+        float audioGain = static_cast<float>(this->settings.getAudioGain());
+
+        while (!(this->stopConsumer || (audioQueue.hasStreamEnded() && audioQueue.empty()))) {
+            audioQueue.waitForProducer(lock);
+            while (audioQueue.size() > buffer_size || (audioQueue.hasStreamEnded() && !audioQueue.empty())) {
+                buffer.resize(0);
+                this->audioQueue.pop(std::back_inserter(buffer), buffer_size);
+                // apply gain
+                if (audioGain != 1.0f) {
+                    std::for_each(begin(buffer), end(buffer), [audioGain](auto& val) { val *= audioGain; });
+                }
+                sf_writef_float(sfFile.get(), buffer.data(),
+                                std::min<sf_count_t>(sf_count_t(buffer.size()) / channels, 64));
+            }
+        }
+    });
+    return true;
+}
+
+void VorbisConsumer::join() {
+    // Join the consumer thread to wait for completion
+    if (this->consumerThread.joinable()) {
+        this->consumerThread.join();
+    }
+}
+
+void VorbisConsumer::stop() {
+    // Stop consumer
+    this->audioQueue.signalEndOfStream();
+
+    // Wait for consumer to finish
+    join();
+}
diff --git a/entry/src/main/cpp/src/core/audio/VorbisConsumer.h b/entry/src/main/cpp/src/core/audio/VorbisConsumer.h
new file mode 100644
index 0000000..6d78b79
--- /dev/null
+++ b/entry/src/main/cpp/src/core/audio/VorbisConsumer.h
@@ -0,0 +1,39 @@
+/*
+ * Xournal++
+ *
+ * Class to save audio data in an opus file
+ *
+ * @author Xournal++ Team
+ * https://github.com/xournalpp/xournalpp
+ *
+ * @license GNU GPLv2 or later
+ */
+
+#pragma once
+
+#include <atomic>  // for atomic
+#include <thread>  // for thread
+
+#include "filesystem.h"  // for path
+
+class Settings;
+template <typename T>
+class AudioQueue;
+
+class VorbisConsumer final {
+public:
+    explicit VorbisConsumer(Settings& settings, AudioQueue<float>& audioQueue):
+            settings(settings), audioQueue(audioQueue) {}
+
+public:
+    bool start(fs::path const& file);
+    void join();
+    void stop();
+
+private:
+    Settings& settings;
+    AudioQueue<float>& audioQueue;
+
+    std::thread consumerThread{};
+    std::atomic<bool> stopConsumer{false};
+};
diff --git a/entry/src/main/cpp/src/core/audio/VorbisProducer.cpp b/entry/src/main/cpp/src/core/audio/VorbisProducer.cpp
new file mode 100644
index 0000000..da15348
--- /dev/null
+++ b/entry/src/main/cpp/src/core/audio/VorbisProducer.cpp
@@ -0,0 +1,84 @@
+#include "VorbisProducer.h"
+
+#include <algorithm>  // for fill_n, max
+#include <cstdio>     // for size_t, SEEK_CUR, SEEK_SET
+#include <iterator>   // for begin, end
+#include <memory>     // for unique_ptr
+#include <string>     // for string
+#include <utility>    // for move
+#include <vector>     // for vector
+
+#include <glib.h>     // for g_warning
+#include <sndfile.h>  // for SF_INFO, sf_seek, sf_count_t, sf_readf...
+
+#include "audio/AudioQueue.h"  // for AudioQueue
+#include "audio/SNDFileCpp.h"  // for make_snd_file, xoj
+#include "util/StringUtils.h"
+
+using namespace xoj;
+
+constexpr auto sample_buffer_size = size_t{16384U};
+
+auto VorbisProducer::start(fs::path const& file, unsigned int timestamp) -> bool {
+    SF_INFO sfInfo{};
+    auto sfFile = audio::make_snd_file(file, SFM_READ, &sfInfo);
+    if (!sfFile) {
+        g_warning("VorbisProducer: input file \"%s\" could not be opened\ncaused by:%s",
+                  char_cast(file.u8string().c_str()), sf_strerror(sfFile.get()));
+        return false;
+    }
+
+    sf_count_t seekPosition = sfInfo.samplerate / 1000 * sf_count_t(timestamp);
+
+    if (seekPosition < sfInfo.frames) {
+        sf_seek(sfFile.get(), seekPosition, SEEK_SET);
+    } else {
+        g_warning("VorbisProducer: Seeking outside of audio file extent");
+    }
+
+    this->audioQueue.setAudioAttributes(sfInfo.samplerate, static_cast<unsigned int>(sfInfo.channels));
+
+    this->producerThread = std::thread([this, sfInfo, sfFile = std::move(sfFile)] {
+        sf_count_t numFrames{1};
+        size_t const bufferSize{size_t(1024U) * size_t(sfInfo.channels)};
+        std::vector<float> sampleBuffer(bufferSize);
+        auto lock = audioQueue.acquire_lock();
+
+        while (!this->stopProducer && numFrames > 0 && !this->audioQueue.hasStreamEnded()) {
+            sampleBuffer.resize(bufferSize);
+            numFrames = sf_readf_float(sfFile.get(), sampleBuffer.data(), 1024);
+            sampleBuffer.resize(size_t(numFrames * sfInfo.channels));
+
+            while (this->audioQueue.size() >= sample_buffer_size && !this->audioQueue.hasStreamEnded() &&
+                   !this->stopProducer) {
+                audioQueue.waitForConsumer(lock);
+            }
+
+            if (auto tmpSeekSeconds = this->seekSeconds.load(); tmpSeekSeconds != 0) {
+                sf_seek(sfFile.get(), tmpSeekSeconds * sfInfo.samplerate, SEEK_CUR);
+                this->seekSeconds -= tmpSeekSeconds;
+            }
+
+            this->audioQueue.emplace(begin(sampleBuffer), end(sampleBuffer));
+        }
+        this->audioQueue.signalEndOfStream();
+    });
+    return true;
+}
+
+void VorbisProducer::abort() {
+    this->stopProducer = true;
+    // Wait for producer to finish
+    stop();
+    this->stopProducer = false;
+}
+
+void VorbisProducer::stop() {
+    // Wait for producer to finish
+    if (this->producerThread.joinable()) {
+        this->producerThread.join();
+    }
+}
+
+
+void VorbisProducer::seek(int seconds) { this->seekSeconds = seconds; }
diff --git a/entry/src/main/cpp/src/core/audio/VorbisProducer.h b/entry/src/main/cpp/src/core/audio/VorbisProducer.h
new file mode 100644
index 0000000..2018d9a
--- /dev/null
+++ b/entry/src/main/cpp/src/core/audio/VorbisProducer.h
@@ -0,0 +1,37 @@
+/*
+ * Xournal++
+ *
+ * Class to read audio data from an mp3 file
+ *
+ * @author Xournal++ Team
+ * https://github.com/xournalpp/xournalpp
+ *
+ * @license GNU GPLv2 or later
+ */
+
+#pragma once
+
+#include <atomic>  // for atomic
+#include <thread>  // for thread
+
+#include "filesystem.h"  // for path
+
+template <typename T>
+class AudioQueue;
+
+class VorbisProducer final {
+public:
+    explicit VorbisProducer(AudioQueue<float>& audioQueue): audioQueue(audioQueue) {}
+
+    bool start(fs::path const& file, unsigned int timestamp);
+    void abort();
+    void stop();
+    void seek(int seconds);
+
+private:
+    AudioQueue<float>& audioQueue;
+    std::thread producerThread{};
+
+    std::atomic<bool> stopProducer{false};
+    std::atomic<int> seekSeconds{0};
+};
diff --git a/entry/src/main/cpp/src/core/control/AudioController.cpp b/entry/src/main/cpp/src/core/control/AudioController.cpp
new file mode 100644
index 0000000..1154d2c
--- /dev/null
+++ b/entry/src/main/cpp/src/core/control/AudioController.cpp
@@ -0,0 +1,132 @@
+#include "AudioController.h"
+
+#include <array>   // for array
+#include <cstdio>  // for snprintf
+#include <ctime>   // for tm, localtime, time
+#include <string>  // for string, allocator
+
+#include <glib.h>  // for g_get_monotonic_time
+
+#include "audio/AudioPlayer.h"                   // for AudioPlayer
+#include "audio/AudioRecorder.h"                 // for AudioRecorder
+#include "audio/DeviceInfo.h"                    // for DeviceInfo
+#include "control/Control.h"                     // for Control
+#include "control/actions/ActionDatabase.h"      // for ActionDatabase
+#include "control/settings/Settings.h"           // for Settings
+#include "gui/MainWindow.h"                      // for MainWindow
+#include "gui/toolbarMenubar/ToolMenuHandler.h"  // for ToolMenuHandler
+#include "util/XojMsgBox.h"                      // for XojMsgBox
+#include "util/i18n.h"                           // for _
+#include "util/safe_casts.h"                     // for as_signed
+
+using std::string;
+using std::vector;
+
+AudioController::AudioController(Settings* settings, Control* control):
+        settings(*settings),
+        control(*control),
+        audioRecorder(std::make_unique<AudioRecorder>(*settings)),
+        audioPlayer(std::make_unique<AudioPlayer>(*control, *settings)) {}
+
+AudioController::~AudioController() = default;
+
+
+auto AudioController::startRecording() -> bool {
+    if (!this->isRecording()) {
+        if (getAudioFolder().empty()) {
+            return false;
+        }
+
+        this->timestamp = static_cast<size_t>(g_get_monotonic_time() / 1000);
+
+        std::array<char, 50> buffer{};
+        time_t secs = time(nullptr);
+        tm* t = localtime(&secs);
+        // This prints the date and time in ISO format.
+        snprintf(buffer.data(), buffer.size(), "%04d-%02d-%02d_%02d-%02d-%02d", t->tm_year + 1900, t->tm_mon + 1,
+                 t->tm_mday, t->tm_hour, t->tm_min, t->tm_sec);
+        string data(buffer.data());
+        data += ".ogg";
+
+        audioFilename = data;
+
+        g_message("Start recording");
+
+        bool isRecording = this->audioRecorder->start(getAudioFolder() / data);
+
+        if (!isRecording) {
+            audioFilename = "";
+            this->timestamp = 0;
+        }
+
+        return isRecording;
+    }
+    return false;
+}
+
+auto AudioController::stopRecording() -> bool {
+    if (this->audioRecorder->isRecording()) {
+        audioFilename = "";
+        this->timestamp = 0;
+
+        g_message("Stop recording");
+
+        this->audioRecorder->stop();
+    }
+    return true;
+}
+
+auto AudioController::isRecording() -> bool { return this->audioRecorder->isRecording(); }
+
+auto AudioController::isPlaying() -> bool { return this->audioPlayer->isPlaying(); }
+
+auto AudioController::startPlayback(fs::path const& file, unsigned int timestamp) -> bool {
+    this->audioPlayer->stop();
+    bool status = this->audioPlayer->start(file, timestamp);
+    if (status) {
+        auto* actionDB = this->control.getActionDatabase();
+        actionDB->enableAction(Action::AUDIO_PAUSE_PLAYBACK, true);
+        actionDB->enableAction(Action::AUDIO_STOP_PLAYBACK, true);
+        actionDB->enableAction(Action::AUDIO_SEEK_FORWARDS, true);
+        actionDB->enableAction(Action::AUDIO_SEEK_BACKWARDS, true);
+    }
+    return status;
+}
+
+void AudioController::pausePlayback() {
+    this->control.getActionDatabase()->setActionState(Action::AUDIO_PAUSE_PLAYBACK, true);
+
+    this->audioPlayer->pause();
+}
+
+void AudioController::seekForwards() { this->audioPlayer->seek(as_signed(this->settings.getDefaultSeekTime())); }
+
+void AudioController::seekBackwards() { this->audioPlayer->seek(-1 * as_signed(this->settings.getDefaultSeekTime())); }
+
+void AudioController::continuePlayback() {
+    this->control.getActionDatabase()->setActionState(Action::AUDIO_PAUSE_PLAYBACK, false);
+
+    this->audioPlayer->play();
+}
+
+void AudioController::stopPlayback() { this->audioPlayer->stop(); }
+
+auto AudioController::getAudioFilename() const -> fs::path const& { return this->audioFilename; }
+
+auto AudioController::getAudioFolder() const -> fs::path {
+    auto const& af = this->settings.getAudioFolder();
+
+    if (!fs::is_directory(af)) {
+        string msg = _("Audio folder not set or invalid! Recording won't work!\nPlease set the "
+                       "recording folder under \"Preferences > Audio recording\"");
+        XojMsgBox::showErrorToUser(this->control.getGtkWindow(), msg);
+        return fs::path{};
+    }
+    return af;
+}
+
+auto AudioController::getStartTime() const -> size_t { return this->timestamp; }
+
+auto AudioController::getOutputDevices() const -> vector<DeviceInfo> { return this->audioPlayer->getOutputDevices(); }
+
+auto AudioController::getInputDevices() const -> vector<DeviceInfo> { return this->audioRecorder->getInputDevices(); }
diff --git a/entry/src/main/cpp/src/core/control/AudioController.h b/entry/src/main/cpp/src/core/control/AudioController.h
new file mode 100644
index 0000000..450d575
--- /dev/null
+++ b/entry/src/main/cpp/src/core/control/AudioController.h
@@ -0,0 +1,72 @@
+/*
+ * Xournal++
+ *
+ * Audio Recording / Playing controller
+ *
+ * @author Xournal++ Team
+ * https://github.com/xournalpp/xournalpp
+ *
+ * @license GNU GPLv2 or later
+ */
+
+#pragma once
+
+#include "config-features.h"  // for ENABLE_AUDIO
+#ifdef ENABLE_AUDIO
+
+#include <cstddef>  // for size_t
+#include <memory>   // for make_unique, unique_ptr
+#include <vector>   // for vector
+
+#include <portaudiocpp/PortAudioCpp.hxx>  // for AutoSystem
+
+#include "filesystem.h"  // for path
+
+class AudioPlayer;
+class AudioRecorder;
+class Control;
+class DeviceInfo;
+class Settings;
+
+class AudioController final {
+public:
+    // Todo convert Pointers to reference (changes to control.cpp are necessary)
+    AudioController(Settings* settings, Control* control);
+    ~AudioController();
+
+    bool startRecording();
+    bool stopRecording();
+    bool isRecording();
+
+    bool isPlaying();
+    bool startPlayback(fs::path const& file, unsigned int timestamp);
+    void pausePlayback();
+    void continuePlayback();
+    void stopPlayback();
+    void seekForwards();
+    void seekBackwards();
+
+    fs::path const& getAudioFilename() const;
+    fs::path getAudioFolder() const;
+    size_t getStartTime() const;
+    std::vector<DeviceInfo> getOutputDevices() const;
+    std::vector<DeviceInfo> getInputDevices() const;
+
+private:
+    Settings& settings;
+    Control& control;
+
+    /**
+     * RAII initializer don't move below the portaudio::System::instance() calls in
+     * AudioRecorder and AudioPlayer
+     * */
+    portaudio::AutoSystem autoSys;
+    std::unique_ptr<AudioRecorder> audioRecorder;
+    std::unique_ptr<AudioPlayer> audioPlayer;
+
+    fs::path audioFilename;
+    size_t timestamp = 0;
+};
+#else
+class AudioController final {};
+#endif
diff --git a/entry/src/main/cpp/src/core/control/ClipboardHandler.cpp b/entry/src/main/cpp/src/core/control/ClipboardHandler.cpp
new file mode 100644
index 0000000..81a631b
--- /dev/null
+++ b/entry/src/main/cpp/src/core/control/ClipboardHandler.cpp
@@ -0,0 +1,323 @@
+#include "ClipboardHandler.h"
+
+#include <set>      // for multiset, operator!=
+#include <utility>  // for move
+#include <vector>   // for vector
+
+#include <cairo-svg.h>      // for cairo_svg_surface_c...
+#include <cairo.h>          // for cairo_create, cairo...
+#include <gdk/gdkpixbuf.h>  // for gdk_pixbuf_get_from_surface
+#include <glib-object.h>    // for g_object_unref, g_s...
+
+#include "control/tools/EditSelection.h"          // for EditSelection
+#include "model/Element.h"                        // for Element, ELEMENT_TEXT
+#include "model/Text.h"                           // for Text
+#include "util/Util.h"                            // for DPI_NORMALIZATION_F...
+#include "util/gtk4_helper.h"                     // for gtk_widget_get_clipboard
+#include "util/safe_casts.h"                      // for as_unsigned
+#include "util/serializing/BinObjectEncoding.h"   // for BinObjectEncoding
+#include "util/serializing/ObjectInputStream.h"   // for ObjectInputStream
+#include "util/serializing/ObjectOutputStream.h"  // for ObjectOutputStream
+#include "view/ElementContainerView.h"            // for ElementContainerView
+#include "view/View.h"                            // for Context
+
+#include "config.h"  // for PROJECT_STRING
+
+using std::string;
+
+ClipboardListener::~ClipboardListener() = default;
+
+ClipboardHandler::ClipboardHandler(ClipboardListener* listener, GtkWidget* widget) {
+    this->listener = listener;
+    this->clipboard = gtk_widget_get_clipboard(widget);
+
+    this->handlerId = g_signal_connect(this->clipboard, "owner-change", G_CALLBACK(&ownerChangedCallback), this);
+
+    this->listener->clipboardCutCopyEnabled(false);
+
+    gtk_clipboard_request_contents(clipboard, gdk_atom_intern_static_string("TARGETS"),
+                                   reinterpret_cast<GtkClipboardReceivedFunc>(receivedClipboardContents), this);
+}
+
+ClipboardHandler::~ClipboardHandler() { g_signal_handler_disconnect(this->clipboard, this->handlerId); }
+
+static GdkAtom atomXournal = gdk_atom_intern_static_string("application/xournal");
+
+auto ClipboardHandler::paste() -> bool {
+    /* Request targets again, since the owner-change signal is not emitted on MacOS and under X11 with no XFIXES
+     * extension. See https://docs.gtk.org/gdk3/struct.EventOwnerChange.html and
+     * https://gitlab.gnome.org/GNOME/gtk/-/issues/1757 */
+    gtk_clipboard_request_contents(clipboard, gdk_atom_intern_static_string("TARGETS"),
+                                   reinterpret_cast<GtkClipboardReceivedFunc>(receivedClipboardContents), this);
+
+    if (this->containsXournal) {
+        gtk_clipboard_request_contents(this->clipboard, atomXournal,
+                                       reinterpret_cast<GtkClipboardReceivedFunc>(pasteClipboardContents), this);
+        return true;
+    }
+    if (this->containsText) {
+        gtk_clipboard_request_text(this->clipboard, reinterpret_cast<GtkClipboardTextReceivedFunc>(pasteClipboardText),
+                                   this);
+        return true;
+    }
+    if (this->containsImage) {
+        gtk_clipboard_request_image(this->clipboard,
+                                    reinterpret_cast<GtkClipboardImageReceivedFunc>(pasteClipboardImage), this);
+        return true;
+    }
+
+    return false;
+}
+
+auto ClipboardHandler::cut() -> bool {
+    bool result = this->copy();
+    this->listener->deleteSelection();
+
+    return result;
+}
+
+auto ElementCompareFunc(const Element* a, const Element* b) -> bool {
+    if (a->getY() == b->getY()) {
+        return (a->getX() - b->getX()) < 0;
+    }
+    return (a->getY() - b->getY()) < 0;
+}
+
+static GdkAtom atomSvg1 = gdk_atom_intern_static_string("image/svg");
+static GdkAtom atomSvg2 = gdk_atom_intern_static_string("image/svg+xml");
+
+// The contents of the clipboard
+class ClipboardContents {
+public:
+    ClipboardContents(string text, GdkPixbuf* image, string svg, GString* str) {
+        this->text = std::move(text);
+        this->image = image;
+        this->svg = std::move(svg);
+        this->str = str;
+    }
+
+    ~ClipboardContents() {
+        g_object_unref(this->image);
+        g_string_free(this->str, true);
+    }
+
+
+    static void getFunction(GtkClipboard* clipboard, GtkSelectionData* selection, guint info,
+                            ClipboardContents* contents) {
+        GdkAtom target = gtk_selection_data_get_target(selection);
+
+        if (target == gdk_atom_intern_static_string("UTF8_STRING")) {
+            gtk_selection_data_set_text(selection, contents->text.c_str(), -1);
+        } else if (target == gdk_atom_intern_static_string("image/png") ||
+                   target == gdk_atom_intern_static_string("image/jpeg") ||
+                   target == gdk_atom_intern_static_string("image/gif")) {
+            gtk_selection_data_set_pixbuf(selection, contents->image);
+        } else if (atomSvg1 == target || atomSvg2 == target) {
+            gtk_selection_data_set(selection, target, 8, reinterpret_cast<guchar const*>(contents->svg.c_str()),
+                                   static_cast<gint>(contents->svg.length()));
+        } else if (atomXournal == target) {
+            gtk_selection_data_set(selection, target, 8, reinterpret_cast<guchar*>(contents->str->str),
+                                   static_cast<gint>(contents->str->len));
+        }
+    }
+
+    static void clearFunction(GtkClipboard* clipboard, ClipboardContents* contents) { delete contents; }
+
+private:
+    string text;
+    GdkPixbuf* image;
+    string svg;
+    GString* str;
+};
+
+static auto svgWriteFunction(GString* string, const unsigned char* data, unsigned int length) -> cairo_status_t {
+    g_string_append_len(string, reinterpret_cast<const gchar*>(data), length);
+    return CAIRO_STATUS_SUCCESS;
+}
+
+auto ClipboardHandler::copy() -> bool {
+    if (!this->selection) {
+        return false;
+    }
+
+    /////////////////////////////////////////////////////////////////
+    // prepare xournal contents
+    /////////////////////////////////////////////////////////////////
+
+    ObjectOutputStream out(new BinObjectEncoding());
+
+    out.writeString(PROJECT_STRING);
+
+    this->selection->serialize(out);
+
+    /////////////////////////////////////////////////////////////////
+    // prepare text contents
+    /////////////////////////////////////////////////////////////////
+
+    std::multiset<const Text*, decltype(&ElementCompareFunc)> textElements(ElementCompareFunc);
+
+    for (const Element* e: this->selection->getElementsView()) {
+        if (e->getType() == ELEMENT_TEXT) {
+            textElements.insert(dynamic_cast<const Text*>(e));
+        }
+    }
+
+    string text{};
+    for (const Text* t: textElements) {
+        if (!text.empty()) {
+            text += "\n";
+        }
+        text += t->getText();
+    }
+
+    /////////////////////////////////////////////////////////////////
+    // prepare image contents: PNG
+    /////////////////////////////////////////////////////////////////
+
+    double dpiFactor = 1.0 / Util::DPI_NORMALIZATION_FACTOR * 300.0;
+
+    int width = static_cast<int>(selection->getWidth() * dpiFactor);
+    int height = static_cast<int>(selection->getHeight() * dpiFactor);
+    cairo_surface_t* surfacePng = cairo_image_surface_create(CAIRO_FORMAT_ARGB32, width, height);
+    cairo_t* crPng = cairo_create(surfacePng);
+    cairo_scale(crPng, dpiFactor, dpiFactor);
+
+    cairo_translate(crPng, -selection->getOriginalXOnView(), -selection->getOriginalYOnView());
+
+    xoj::view::ElementContainerView view(this->selection);
+    view.draw(xoj::view::Context::createDefault(crPng));
+
+    cairo_destroy(crPng);
+
+    GdkPixbuf* image = gdk_pixbuf_get_from_surface(surfacePng, 0, 0, width, height);
+
+    cairo_surface_destroy(surfacePng);
+
+    /////////////////////////////////////////////////////////////////
+    // prepare image contents: SVG
+    /////////////////////////////////////////////////////////////////
+
+    GString* svgString = g_string_sized_new(1048576);  // 1MB
+
+    cairo_surface_t* surfaceSVG =
+            cairo_svg_surface_create_for_stream(reinterpret_cast<cairo_write_func_t>(svgWriteFunction), svgString,
+                                                selection->getWidth(), selection->getHeight());
+    cairo_t* crSVG = cairo_create(surfaceSVG);
+
+    cairo_translate(crSVG, -selection->getOriginalXOnView(), -selection->getOriginalYOnView());
+    view.draw(xoj::view::Context::createDefault(crSVG));
+
+    cairo_surface_destroy(surfaceSVG);
+    cairo_destroy(crSVG);
+
+    /////////////////////////////////////////////////////////////////
+    // copy to clipboard
+    /////////////////////////////////////////////////////////////////
+
+    GtkTargetList* list = gtk_target_list_new(nullptr, 0);
+    GtkTargetEntry* targets = nullptr;
+    int n_targets = 0;
+
+    // if we have text elements...
+    if (!text.empty()) {
+        gtk_target_list_add_text_targets(list, 0);
+    }
+    // we always copy an image to clipboard
+    gtk_target_list_add_image_targets(list, 0, true);
+    gtk_target_list_add(list, atomSvg1, 0, 0);
+    gtk_target_list_add(list, atomSvg2, 0, 0);
+    gtk_target_list_add(list, atomXournal, 0, 0);
+
+    targets = gtk_target_table_new_from_list(list, &n_targets);
+
+    auto* contents = new ClipboardContents(text, image, svgString->str, out.stealData());
+
+    gtk_clipboard_set_with_data(this->clipboard, targets, static_cast<guint>(n_targets),
+                                reinterpret_cast<GtkClipboardGetFunc>(ClipboardContents::getFunction),
+                                reinterpret_cast<GtkClipboardClearFunc>(ClipboardContents::clearFunction), contents);
+    gtk_clipboard_set_can_store(this->clipboard, nullptr, 0);
+
+    gtk_target_table_free(targets, n_targets);
+    gtk_target_list_unref(list);
+
+    g_string_free(svgString, true);
+
+    return true;
+}
+
+void ClipboardHandler::setSelection(EditSelection* selection) {
+    this->selection = selection;
+
+    this->listener->clipboardCutCopyEnabled(selection != nullptr);
+}
+
+void ClipboardHandler::setCopyCutEnabled(bool enabled) {
+    if (enabled) {
+        listener->clipboardCutCopyEnabled(true);
+    } else if (!selection) {
+        listener->clipboardCutCopyEnabled(false);
+    }
+}
+
+void ClipboardHandler::ownerChangedCallback(GtkClipboard* clip, GdkEvent* event, ClipboardHandler* handler) {
+    if (gdk_event_get_event_type(event) == GDK_OWNER_CHANGE) {
+        handler->clipboardUpdated(event->owner_change.selection);
+    }
+}
+
+void ClipboardHandler::clipboardUpdated(GdkAtom atom) {
+    gtk_clipboard_request_contents(clipboard, gdk_atom_intern_static_string("TARGETS"),
+                                   reinterpret_cast<GtkClipboardReceivedFunc>(receivedClipboardContents), this);
+}
+
+void ClipboardHandler::pasteClipboardImage(GtkClipboard* clipboard, GdkPixbuf* pixbuf, ClipboardHandler* handler) {
+    if (pixbuf) {
+        handler->listener->clipboardPasteImage(pixbuf);
+    } else {
+        g_warning("Trying to paste image, but pixbuf is null");
+    }
+}
+
+void ClipboardHandler::pasteClipboardContents(GtkClipboard* clipboard, GtkSelectionData* selectionData,
+                                              ClipboardHandler* handler) {
+    ObjectInputStream in;
+
+    if (in.read(reinterpret_cast<const char*>(gtk_selection_data_get_data(selectionData)),
+                as_unsigned(gtk_selection_data_get_length(selectionData)))) {
+        handler->listener->clipboardPasteXournal(in);
+    }
+}
+
+void ClipboardHandler::pasteClipboardText(GtkClipboard* clipboard, const gchar* text, ClipboardHandler* handler) {
+    if (text) {
+        handler->listener->clipboardPasteText(text);
+    }
+}
+
+auto gtk_selection_data_targets_include_xournal(GtkSelectionData* selection_data) -> gboolean {
+    GdkAtom* targets = nullptr;
+    gint n_targets = 0;
+    gboolean result = false;
+
+    if (gtk_selection_data_get_targets(selection_data, &targets, &n_targets)) {
+        for (int i = 0; i < n_targets; i++) {
+            if (targets[i] == atomXournal) {
+                result = true;
+                break;
+            }
+        }
+        g_free(targets);
+    }
+
+    return result;
+}
+
+void ClipboardHandler::receivedClipboardContents(GtkClipboard* clipboard, GtkSelectionData* selectionData,
+                                                 ClipboardHandler* handler) {
+    handler->containsText = gtk_selection_data_targets_include_text(selectionData);
+    handler->containsXournal = gtk_selection_data_targets_include_xournal(selectionData);
+    handler->containsImage = gtk_selection_data_targets_include_image(selectionData, false);
+
+    handler->listener->clipboardPasteEnabled(handler->containsText || handler->containsXournal ||
+                                             handler->containsImage);
+}
diff --git a/entry/src/main/cpp/src/core/control/ClipboardHandler.h b/entry/src/main/cpp/src/core/control/ClipboardHandler.h
new file mode 100644
index 0000000..cf88250
--- /dev/null
+++ b/entry/src/main/cpp/src/core/control/ClipboardHandler.h
@@ -0,0 +1,73 @@
+/*
+ * Xournal++
+ *
+ * The main Control
+ *
+ * @author Xournal++ Team
+ * https://github.com/xournalpp/xournalpp
+ *
+ * @license GNU GPLv2 or later
+ */
+
+#pragma once
+
+#include <limits>  // for numeric_limits
+#include <string>  // for string
+
+#include <gdk-pixbuf/gdk-pixbuf.h>  // for GdkPixbuf
+#include <gdk/gdk.h>                // for GdkAtom, GdkEvent
+#include <glib.h>                   // for gchar, gulong
+#include <gtk/gtk.h>                // for GtkClipboard, GtkSelectionData
+
+class ObjectInputStream;
+class EditSelection;
+
+class ClipboardListener {
+public:
+    virtual void clipboardCutCopyEnabled(bool enabled) = 0;
+    virtual void clipboardPasteEnabled(bool enabled) = 0;
+    virtual void clipboardPasteText(std::string text) = 0;
+    virtual void clipboardPasteImage(GdkPixbuf* img) = 0;
+    virtual void clipboardPasteXournal(ObjectInputStream& in) = 0;
+    virtual void deleteSelection() = 0;
+
+    virtual ~ClipboardListener();
+};
+
+class ClipboardHandler {
+public:
+    ClipboardHandler(ClipboardListener* listener, GtkWidget* widget);
+    virtual ~ClipboardHandler();
+
+public:
+    bool paste();
+    bool cut();
+    bool copy();
+
+    void setSelection(EditSelection* selection);
+
+    void setCopyCutEnabled(bool enabled);
+
+private:
+    static void ownerChangedCallback(GtkClipboard* clip, GdkEvent* event, ClipboardHandler* handler);
+    void clipboardUpdated(GdkAtom atom);
+    static void receivedClipboardContents(GtkClipboard* clipboard, GtkSelectionData* selectionData,
+                                          ClipboardHandler* handler);
+
+    static void pasteClipboardContents(GtkClipboard* clipboard, GtkSelectionData* selectionData,
+                                       ClipboardHandler* handler);
+    static void pasteClipboardImage(GtkClipboard* clipboard, GdkPixbuf* pixbuf, ClipboardHandler* handler);
+
+    static void pasteClipboardText(GtkClipboard* clipboard, const gchar* text, ClipboardHandler* handler);
+
+private:
+    ClipboardListener* listener = nullptr;
+    GtkClipboard* clipboard = nullptr;
+    gulong handlerId = std::numeric_limits<gulong>::max();
+
+    EditSelection* selection = nullptr;
+
+    bool containsText = false;
+    bool containsXournal = false;
+    bool containsImage = false;
+};
diff --git a/entry/src/main/cpp/src/core/control/CompassController.cpp b/entry/src/main/cpp/src/core/control/CompassController.cpp
new file mode 100644
index 0000000..c6d7c63
--- /dev/null
+++ b/entry/src/main/cpp/src/core/control/CompassController.cpp
@@ -0,0 +1,125 @@
+#include "CompassController.h"
+
+#include "control/Control.h"
+#include "control/layer/LayerController.h"
+#include "gui/XournalView.h"
+#include "model/Compass.h"
+#include "model/GeometryTool.h"
+#include "model/Stroke.h"
+#include "model/XojPage.h"
+
+CompassController::CompassController(XojPageView* view, Compass* compass): GeometryToolController(view, compass) {}
+
+CompassController::~CompassController() = default;
+
+auto CompassController::getType() const -> GeometryToolType { return GeometryToolType::COMPASS; }
+
+auto CompassController::posRelToSide(double x, double y) const -> xoj::util::Point<double> {
+    cairo_matrix_t inv = geometryTool->getMatrix();
+    cairo_matrix_invert(&inv);
+    cairo_matrix_transform_point(&inv, &x, &y);
+    return xoj::util::Point<double>(x, -y);
+}
+
+auto CompassController::isInsideGeometryTool(double x, double y, double border) const -> bool {
+    const xoj::util::Point<double> p = posRelToSide(x, y);
+    return std::hypot(p.x, p.y) <= geometryTool->getHeight() + border;
+}
+
+auto CompassController::getPointForAngle(double a) const -> xoj::util::Point<double> {
+    cairo_matrix_t matrix = geometryTool->getMatrix();
+    double x = geometryTool->getHeight() * std::cos(a);
+    double y = geometryTool->getHeight() * std::sin(a);
+    cairo_matrix_transform_point(&matrix, &x, &y);
+
+    return xoj::util::Point<double>(x, y);
+}
+
+auto CompassController::getPointForRadius(double r) const -> xoj::util::Point<double> {
+    cairo_matrix_t matrix = geometryTool->getMatrix();
+    double x = r;
+    double y = 0.;
+    cairo_matrix_transform_point(&matrix, &x, &y);
+
+    return xoj::util::Point<double>(x, y);
+}
+
+void CompassController::createOutlineStroke(double a) {
+    if (!std::isnan(a)) {
+        angleMax = a;
+        angleMin = a;
+
+        const xoj::util::Point<double> p = this->getPointForAngle(a);
+        initializeStroke();
+        stroke->addPoint(Point(p.x, p.y));
+        stroke->addPoint(Point(p.x, p.y));  // doubled point
+        geometryTool->notify();
+    } else {
+        g_warning("No valid stroke from compass!");
+    }
+}
+
+void CompassController::createRadialStroke(double x) {
+    if (!std::isnan(x)) {
+        radiusMax = x;
+        radiusMin = x;
+
+        const xoj::util::Point<double> p = posRelToSide(x, 0.);
+        initializeStroke();
+        stroke->addPoint(Point(p.x, p.y));
+        stroke->addPoint(Point(p.x, p.y));  // doubled point
+        geometryTool->notify();
+    } else {
+        g_warning("No valid radius from compass!");
+    }
+}
+
+void CompassController::updateOutlineStroke(double x) {
+    angleMax = std::max(this->angleMax, x);
+    angleMin = std::min(this->angleMin, x);
+    stroke->deletePointsFrom(0);
+    const auto h = view->getXournal()->getControl()->getToolHandler();
+    const bool filled = (h->getFill() != -1);
+    const xoj::util::Point<double>& c = this->getGeometryTool()->getOrigin();
+
+    if (filled && angleMax < angleMin + 2 * M_PI) {
+        stroke->addPoint(Point(c.x, c.y));
+    }
+    for (auto i = 0; i <= 100; i++) {
+        const xoj::util::Point<double> p =
+                getPointForAngle(angleMin + static_cast<double>(i) / 100.0 * std::min(angleMax - angleMin, 2 * M_PI));
+        stroke->addPoint(Point(p.x, p.y));
+    }
+    if (filled && angleMax < angleMin + 2 * M_PI) {
+        stroke->addPoint(Point(c.x, c.y));
+    }
+    geometryTool->notify();
+}
+
+void CompassController::updateRadialStroke(double x) {
+    radiusMax = std::max(this->radiusMax, x);
+    radiusMin = std::min(this->radiusMin, x);
+    stroke->deletePointsFrom(0);
+    const xoj::util::Point<double> p1 = getPointForRadius(radiusMin);
+    const xoj::util::Point<double> p2 = getPointForRadius(radiusMax);
+
+    stroke->addPoint(Point(p1.x, p1.y));
+    stroke->addPoint(Point(p2.x, p2.y));
+    geometryTool->notify();
+}
+
+void CompassController::finalizeOutlineStroke() {
+    angleMax = std::numeric_limits<double>::lowest();
+    angleMin = std::numeric_limits<double>::max();
+    addStrokeToLayer();
+}
+
+void CompassController::finalizeRadialStroke() {
+    radiusMax = std::numeric_limits<double>::lowest();
+    radiusMin = std::numeric_limits<double>::max();
+    addStrokeToLayer();
+}
+
+auto CompassController::existsOutlineStroke() -> bool { return angleMax != std::numeric_limits<double>::lowest(); }
+
+auto CompassController::existsRadialStroke() -> bool { return radiusMax != std::numeric_limits<double>::lowest(); }
diff --git a/entry/src/main/cpp/src/core/control/CompassController.h b/entry/src/main/cpp/src/core/control/CompassController.h
new file mode 100644
index 0000000..9256866
--- /dev/null
+++ b/entry/src/main/cpp/src/core/control/CompassController.h
@@ -0,0 +1,136 @@
+/*
+ * Xournal++
+ *
+ * A compass controller
+ *
+ * @author Xournal++ Team
+ * https://github.com/xournalpp/xournalpp
+ *
+ * @license GNU GPLv2 or later
+ */
+
+#pragma once
+
+#include <gtk/gtk.h>
+
+#include "gui/PageView.h"
+#include "model/GeometryTool.h"
+#include "util/Point.h"
+
+#include "GeometryToolController.h"
+
+class Compass;
+class Stroke;
+
+/**
+ * @brief A class that controls a compass
+
+ * The compass can be moved, rotated and scaled
+ * There are methods for translating coordinates
+ * and methods to deal with the temporary stroke
+ * that is displayed near the the outline of the
+ * compass or the marked radius.
+ */
+
+class CompassController: public GeometryToolController {
+public:
+    CompassController(XojPageView* view, Compass* compass);
+    ~CompassController() override;
+
+public:
+    GeometryToolType getType() const override;
+
+    /**
+     * @brief returns the position of a point relative to a coordinate system, in which the
+     * positive x-axis coincides with the distinguished compass axis and the origin lies
+     * in the center of the compass
+     * @param x the x-coordinate of the point (in document coordinates)
+     * @param y the y-coordinate of the point (in document coordinates)
+     */
+    xoj::util::Point<double> posRelToSide(double x, double y) const;
+
+    /**
+     * @brief checks whether a point with given coordinates lies in the geometry tool with an additional
+     * border enlarging (or shrinked) it
+     * @param x the x-coordinate of the given point (in document coordinates)
+     * @param y the y-coordinate of the given point (in document coordinates)
+     * @param border the size of the border (if negative, the geometry tool is shrinked via the border)
+     */
+    bool isInsideGeometryTool(double x, double y, double border = 0.0) const override;
+
+    /**
+     * @brief the point (in document coordinates) for a given angle on the outline of the compass
+     * @param a the angle with respect to the distinguished compass axis of the point
+     */
+    xoj::util::Point<double> getPointForAngle(double a) const;
+
+    /**
+     * @brief the point (in document coordinates) for a given radius on the marked radius of the compass
+     * @param r the x-coordinate with respect to a coordinate system, in which the positive x-axis
+     * coincides with the marked radius and the origin lies in the center of the compass
+     */
+    xoj::util::Point<double> getPointForRadius(double r) const;
+
+    /**
+     * @brief creates a stroke starting at the given angle of the outline of the compass
+     * @param a the angle of the point on the outline of the compass (when unrotated and untranslated)
+     */
+    void createOutlineStroke(double a);
+
+    /**
+     * @brief updates the stroke near the outline of the compass
+     * @param a the angle of the point on the outline of the compass (when unrotated and untranslated)
+     * updating the stroke
+     */
+    void updateOutlineStroke(double a);
+
+    /**
+     * @brief finishes the stroke near the outline of the compass
+     */
+    void finalizeOutlineStroke();
+
+    /**
+     * @brief finishes the stroke aligned to the marked radius of the compass
+     */
+    void finalizeRadialStroke();
+
+    /**
+     * @brief creates a stroke starting at the given point of the marked radius of the compass
+     * @param x the x-coordinate with respect to the marked radius
+     */
+    void createRadialStroke(double x);
+
+    /**
+     * @brief updates the stroke near the marked radius of the compass
+     * @param x the x-coordinate with respect to the marked radius
+     */
+    void updateRadialStroke(double x);
+
+    /**
+     * checks whether a stroke near the outline already exists
+     */
+    bool existsOutlineStroke();
+
+    /**
+     * checks whether a radius already exists
+     */
+    bool existsRadialStroke();
+
+private:
+    /**
+     * @brief when a stroke near the radius with the measuring marks
+     * is drawn, the minimal and maximal radii are saved in
+     * the variables radiusMax and radiusMin
+     *
+     */
+    double radiusMax = std::numeric_limits<double>::lowest();
+    double radiusMin = std::numeric_limits<double>::max();
+
+    /**
+     * @brief when a stroke near the outline of the compass is drawn, the minimal and maximal
+     * angles of the point to be drawn (with respect to an unrotated, and untranslated coordinate system)
+     * are saved in the variables angleMin and angleMax
+     */
+    double angleMax = std::numeric_limits<double>::lowest();
+    double angleMin = std::numeric_limits<double>::max();
+};
diff --git a/entry/src/main/cpp/src/core/control/Control.cpp b/entry/src/main/cpp/src/core/control/Control.cpp
new file mode 100644
index 0000000..68919cf
--- /dev/null
+++ b/entry/src/main/cpp/src/core/control/Control.cpp
@@ -0,0 +1,2612 @@
+#include "Control.h"
+
+#include <algorithm>  // for max
+#include <cstdlib>    // for size_t
+#include <exception>  // for exce...
+#include <functional>  // for bind
+#include <iterator>    // for end
+#include <memory>      // for make...
+#include <optional>    // for opti...
+#include <regex>       // for regex
+#include <string>      // for string
+#include <utility>     // for move
+
+#include "control/AudioController.h"                             // for Audi...
+#include "control/ClipboardHandler.h"                            // for Clip...
+#include "control/CompassController.h"                           // for Comp...
+#include "control/RecentManager.h"                               // for Rece...
+#include "control/ScrollHandler.h"                               // for Scro...
+#include "control/SetsquareController.h"                         // for Sets...
+#include "control/Tool.h"                                        // for Tool
+#include "control/ToolHandler.h"                                 // for Tool...
+#include "control/actions/ActionDatabase.h"                      // for Acti...
+#include "control/jobs/AutosaveJob.h"                            // for Auto...
+#include "control/jobs/BaseExportJob.h"                          // for Base...
+#include "control/jobs/CustomExportJob.h"                        // for Cust...
+#include "control/jobs/PdfExportJob.h"                           // for PdfE...
+#include "control/jobs/SaveJob.h"                                // for SaveJob
+#include "control/jobs/Scheduler.h"                              // for JOB_...
+#include "control/jobs/XournalScheduler.h"                       // for Xour...
+#include "control/layer/LayerController.h"                       // for Laye...
+#include "control/pagetype/PageTypeHandler.h"                    // for Page...
+#include "control/settings/ButtonConfig.h"                       // for Butt...
+#include "control/settings/MetadataManager.h"                    // for Meta...
+#include "control/settings/PageTemplateSettings.h"               // for Page...
+#include "control/settings/Settings.h"                           // for Sett...
+#include "control/settings/SettingsEnums.h"                      // for Button
+#include "control/settings/ViewModes.h"                          // for ViewM..
+#include "control/tools/TextEditor.h"                            // for Text...
+#include "control/xojfile/LoadHandler.h"                         // for Load...
+#include "control/zoom/ZoomControl.h"                            // for Zoom...
+#include "gui/FloatingToolbox.h"                                 // for Floa...
+#include "gui/MainWindow.h"                                      // for Main...
+#include "gui/PageView.h"                                        // for XojP...
+#include "gui/PdfFloatingToolbox.h"                              // for PdfF...
+#include "gui/SearchBar.h"                                       // for Sear...
+#include "gui/XournalView.h"                                     // for Xour...
+#include "gui/XournalppCursor.h"                                 // for Xour...
+#include "gui/dialog/AboutDialog.h"                              // for Abou...
+#include "gui/dialog/FormatDialog.h"                             // for Form...
+#include "gui/dialog/GotoDialog.h"                               // for Goto...
+#include "gui/dialog/PageTemplateDialog.h"                       // for Page...
+#include "gui/dialog/SelectBackgroundColorDialog.h"              // for Sele...
+#include "gui/dialog/SelectOpacityDialog.h"                      // for Opac...
+#include "gui/dialog/SettingsDialog.h"                           // for Sett...
+#include "gui/dialog/ToolbarManageDialog.h"                      // for Tool...
+#include "gui/dialog/XojOpenDlg.h"                               // for XojO...
+#include "gui/dialog/XojSaveDlg.h"                               // for XojS...
+#include "gui/dialog/toolbarCustomize/ToolbarDragDropHandler.h"  // for Tool...
+#include "gui/inputdevices/CompassInputHandler.h"                // for Comp...
+#include "gui/inputdevices/GeometryToolInputHandler.h"           // for Geom...
+#include "gui/inputdevices/HandRecognition.h"                    // for Hand...
+#include "gui/inputdevices/SetsquareInputHandler.h"              // for Sets...
+#include "gui/menus/menubar/Menubar.h"                           // for Menubar
+#include "gui/sidebar/Sidebar.h"                                 // for Sidebar
+#include "gui/toolbarMenubar/ToolMenuHandler.h"                  // for Tool...
+#include "gui/toolbarMenubar/model/ToolbarData.h"                // for Tool...
+#include "gui/toolbarMenubar/model/ToolbarModel.h"               // for Tool...
+#include "model/BackgroundImage.h"                               // for Back...
+#include "model/Compass.h"                                       // for Comp...
+#include "model/Document.h"                                      // for Docu...
+#include "model/DocumentChangeType.h"                            // for DOCU...
+#include "model/DocumentListener.h"                              // for Docu...
+#include "model/Element.h"                                       // for Element
+#include "model/Font.h"                                          // for XojFont
+#include "model/Image.h"                                         // for Image
+#include "model/Layer.h"                                         // for Layer
+#include "model/LineStyle.h"                                     // for Line...
+#include "model/PageType.h"                                      // for Page...
+#include "model/Setsquare.h"                                     // for Sets...
+#include "model/Stroke.h"                                        // for Stroke
+#include "model/StrokeStyle.h"                                   // for Stro...
+#include "model/TexImage.h"                                      // for TexI...
+#include "model/Text.h"                                          // for Text
+#include "model/XojPage.h"                                       // for XojPage
+#include "pdf/base/XojPdfPage.h"                                 // for XojP...
+#include "plugin/PluginController.h"                             // for Plug...
+#include "settings/RecolorParameters.h"                          // for RecolorParameters
+#include "undo/AddUndoAction.h"                                  // for AddU...
+#include "undo/InsertDeletePageUndoAction.h"                     // for Inse...
+#include "undo/InsertUndoAction.h"                               // for Inse...
+#include "undo/MoveSelectionToLayerUndoAction.h"                 // for Move...
+#include "undo/PageSizeChangeUndoAction.h"                       // for PageSizeChangeUndoAction
+#include "undo/SwapUndoAction.h"                                 // for SwapUndoAction
+#include "undo/UndoAction.h"                                     // for Undo...
+#include "util/Assert.h"                                         // for xoj_assert
+#include "util/Color.h"                                          // for oper...
+#include "util/PathUtil.h"                                       // for clea...
+#include "util/PlaceholderString.h"                              // for Plac...
+#include "util/PopupWindowWrapper.h"                             // for PopupWindowWrapper
+#include "util/Stacktrace.h"                                     // for Stac...
+#include "util/StringUtils.h"                                    // for char_cast
+#include "util/Util.h"                                           // for exec...
+#include "util/XojMsgBox.h"                                      // for XojM...
+#include "util/glib_casts.h"                                     // for wrap_v
+#include "util/i18n.h"                                           // for _, FS
+#include "util/safe_casts.h"                                     // for as_unsigned
+#include "util/serializing/InputStreamException.h"               // for Inpu...
+#include "util/serializing/ObjectInputStream.h"                  // for Obje...
+#include "view/CompassView.h"                                    // for Comp...
+#include "view/SetsquareView.h"                                  // for Sets...
+#include "view/overlays/OverlayView.h"                           // for Over...
+
+#include "CrashHandler.h"                    // for emer...
+#include "LatexController.h"                 // for Late...
+#include "PageBackgroundChangeController.h"  // for Page...
+#include "PrintHandler.h"                    // for print
+#include "UndoRedoController.h"              // for Undo...
+#include "config-dev.h"                      // for SETT...
+#include "config.h"                          // for PROJ...
+
+using std::string;
+
+Control::Control(GApplication* gtkApp, GladeSearchpath* gladeSearchPath, bool disableAudio): gtkApp(gtkApp) {
+    this->undoRedo = new UndoRedoHandler(this);
+    this->undoRedo->addUndoRedoListener(this);
+    this->isBlocking = false;
+
+    this->gladeSearchPath = gladeSearchPath;
+
+    this->metadata = new MetadataManager();
+    this->cursor = new XournalppCursor(this);
+
+    auto name = Util::getConfigFile(SETTINGS_XML_FILE);
+    this->settings = new Settings(std::move(name));
+    this->settings->load();
+    this->loadPaletteFromSettings();
+
+    this->pageTypes = new PageTypeHandler(gladeSearchPath);
+
+#ifdef ENABLE_AUDIO
+    if (!(disableAudio || this->settings->isAudioDisabled())) {
+        this->audioController = std::make_unique<AudioController>(this->settings, this);
+    }
+#endif
+
+    this->scrollHandler = new ScrollHandler(this);
+
+    this->scheduler = new XournalScheduler();
+
+    this->doc = new Document(this);
+
+    // for crashhandling
+    setEmergencyDocument(this->doc);
+
+
+    this->zoom = new ZoomControl();
+    this->zoom->setZoomStep(this->settings->getZoomStep() / 100.0);
+    this->zoom->setZoomStepScroll(this->settings->getZoomStepScroll() / 100.0);
+
+    this->toolHandler = new ToolHandler(this, this->actionDB.get(), this->settings);
+    this->toolHandler->loadSettings();
+    this->initButtonTool();
+
+    /**
+     * This is needed to update the previews
+     */
+    this->changeTimout = g_timeout_add_seconds(5, xoj::util::wrap_v<checkChangedDocument>, this);
+
+    this->pageBackgroundChangeController = std::make_unique<PageBackgroundChangeController>(this);
+
+    this->layerController = new LayerController(this);
+    this->layerController->registerListener(this);
+
+    this->pluginController = new PluginController(this);
+    this->pluginController->registerToolbar();
+}
+
+Control::~Control() {
+    g_source_remove(this->changeTimout);
+    this->enableAutosave(false);
+
+    deleteLastAutosaveFile();
+    this->scheduler->stop();
+    this->changedPages.clear();  // can be removed, will be done by implicit destructor
+
+    delete this->pluginController;
+    this->pluginController = nullptr;
+    delete this->clipboardHandler;
+    this->clipboardHandler = nullptr;
+    delete this->undoRedo;
+    this->undoRedo = nullptr;
+    delete this->settings;
+    this->settings = nullptr;
+    delete this->toolHandler;
+    this->toolHandler = nullptr;
+    delete this->sidebar;
+    this->sidebar = nullptr;
+
+    setEmergencyDocument(nullptr);
+    delete this->doc;
+    this->doc = nullptr;
+    delete this->searchBar;
+    this->searchBar = nullptr;
+    delete this->scrollHandler;
+    this->scrollHandler = nullptr;
+    delete this->pageTypes;
+    this->pageTypes = nullptr;
+    delete this->metadata;
+    this->metadata = nullptr;
+    delete this->cursor;
+    this->cursor = nullptr;
+    delete this->zoom;
+    this->zoom = nullptr;
+    delete this->scheduler;
+    this->scheduler = nullptr;
+    delete this->dragDropHandler;
+    this->dragDropHandler = nullptr;
+    delete this->layerController;
+    this->layerController = nullptr;
+}
+
+struct Control::MissingPdfData {
+    bool wasPdfAttached;
+    std::string missingFileName;
+};
+
+void Control::setLastAutosaveFile(fs::path newAutosaveFile) {
+    try {
+        if (!this->lastAutosaveFilename.empty() && !fs::equivalent(newAutosaveFile, this->lastAutosaveFilename) &&
+            fs::exists(newAutosaveFile)) {
+            deleteLastAutosaveFile();
+        }
+    } catch (const fs::filesystem_error& e) {
+        auto fmtstr = FS(_F("Filesystem error: {1}") % e.what());
+        Util::execInUiThread([fmtstr, win = getGtkWindow()]() { XojMsgBox::showErrorToUser(win, fmtstr); });
+    }
+    this->lastAutosaveFilename = std::move(newAutosaveFile);
+}
+
+void Control::deleteLastAutosaveFile() {
+    try {
+        if (fs::exists(this->lastAutosaveFilename)) {
+            fs::remove(this->lastAutosaveFilename);
+        }
+    } catch (const fs::filesystem_error& e) {
+        auto fmtstr = FS(_F("Could not remove old autosave file \"{1}\": {2}") % this->lastAutosaveFilename.u8string() %
+                         e.what());
+        Util::execInUiThread([fmtstr, win = getGtkWindow()]() { XojMsgBox::showErrorToUser(win, fmtstr); });
+    }
+    this->lastAutosaveFilename.clear();
+}
+
+auto Control::checkChangedDocument(Control* control) -> bool {
+    if (!control->doc->try_lock_shared()) {
+        // call again later
+        return true;
+    }
+    for (auto const& page: control->changedPages) {
+        auto p = control->doc->indexOf(page);
+        if (p != npos) {
+            for (DocumentListener* dl: control->changedDocumentListeners) {
+                dl->pageChanged(p);
+            }
+        }
+    }
+    control->changedPages.clear();
+    control->doc->unlock_shared();
+
+    // Call again
+    return true;
+}
+
+void Control::saveSettings() {
+    this->toolHandler->saveSettings();
+
+    gint width = 0;
+    gint height = 0;
+    gtk_window_get_size(getGtkWindow(), &width, &height);
+
+    if (!this->win->isMaximized()) {
+        this->settings->setMainWndSize(width, height);
+    }
+    this->settings->setMainWndMaximized(this->win->isMaximized());
+
+    this->sidebar->saveSize();
+}
+
+void Control::initWindow(MainWindow* win) {
+    this->win = win;
+
+    this->actionDB = std::make_unique<ActionDatabase>(this);
+
+    selectTool(toolHandler->getToolType());
+    this->sidebar = new Sidebar(win, this);
+
+    XojMsgBox::setDefaultWindow(getGtkWindow());
+
+    updatePageNumbers(0, npos);
+
+    // toolHandler->eraserTypeChanged();
+
+    this->searchBar = new SearchBar(this);
+
+    if (settings->isPresentationMode()) {
+        setViewPresentationMode(true);
+    } else if (settings->isViewFixedRows()) {
+        setViewRows(settings->getViewRows());
+    } else {
+        setViewColumns(settings->getViewColumns());
+    }
+
+    setViewLayoutVert(settings->getViewLayoutVert());
+    setViewLayoutR2L(settings->getViewLayoutR2L());
+    setViewLayoutB2T(settings->getViewLayoutB2T());
+
+    setViewPairedPages(settings->isShowPairedPages());
+
+    toolLineStyleChanged();
+
+    this->clipboardHandler = new ClipboardHandler(this, win->getXournal()->getWidget());
+
+    this->enableAutosave(settings->isAutosaveEnabled());
+}
+
+auto Control::autosaveCallback(Control* control) -> bool {
+    if (!control->undoRedo->isChangedAutosave()) {
+        // do nothing, nothing changed
+        return true;
+    }
+
+    auto* job = new AutosaveJob(control);
+    control->scheduler->addJob(job, JOB_PRIORITY_NONE);
+    job->unref();
+
+    return true;
+}
+
+void Control::enableAutosave(bool enable) {
+    if (this->autosaveTimeout) {
+        g_source_remove(this->autosaveTimeout);
+        this->autosaveTimeout = 0;
+    }
+
+    if (enable) {
+        auto timeout = guint(settings->getAutosaveTimeout()) * 60U;
+        this->autosaveTimeout = g_timeout_add_seconds(timeout, xoj::util::wrap_v<autosaveCallback>, this);
+    }
+}
+
+void Control::updatePageNumbers(size_t page, size_t pdfPage) {
+    if (this->win == nullptr) {
+        return;
+    }
+
+    this->win->updatePageNumbers(page, this->doc->getPageCount(), pdfPage);
+    this->sidebar->selectPageNr(page, pdfPage);
+
+    this->metadata->storeMetadata(this->doc->getEvMetadataFilename(), static_cast<int>(page),
+                                  getZoomControl()->getZoomReal());
+    if (settings->isPageNumberInTitlebarShown()) {
+        this->updateWindowTitle();
+    }
+
+    auto current = getCurrentPageNo();
+    auto count = this->doc->getPageCount();
+
+    this->actionDB->enableAction(Action::GOTO_FIRST, current != 0);
+    this->actionDB->enableAction(Action::GOTO_PREVIOUS, current != 0);
+    this->actionDB->enableAction(Action::GOTO_PREVIOUS_ANNOTATED_PAGE, current != 0);
+    this->actionDB->enableAction(Action::GOTO_PAGE, count > 1);
+    this->actionDB->enableAction(Action::GOTO_NEXT, current < count - 1);
+    this->actionDB->enableAction(Action::GOTO_LAST, current < count - 1);
+    this->actionDB->enableAction(Action::GOTO_NEXT_ANNOTATED_PAGE, current < count - 1);
+}
+
+bool Control::toggleCompass() {
+    return toggleGeometryTool<Compass, xoj::view::CompassView, CompassController, CompassInputHandler,
+                              GeometryToolType::COMPASS>();
+}
+bool Control::toggleSetsquare() {
+    return toggleGeometryTool<Setsquare, xoj::view::SetsquareView, SetsquareController, SetsquareInputHandler,
+                              GeometryToolType::SETSQUARE>();
+}
+
+template <class ToolClass, class ViewClass, class ControllerClass, class InputHandlerClass, GeometryToolType toolType>
+bool Control::toggleGeometryTool() {
+    bool needsNewGeometryTool = !this->geometryToolController || this->geometryToolController->getType() != toolType;
+    this->resetGeometryTool();
+    if (!needsNewGeometryTool) {
+        return false;
+    }
+    const auto view = this->win->getXournal()->getViewFor(getCurrentPageNo());
+    const auto* xournal = GTK_XOURNAL(this->win->getXournal()->getWidget());
+    auto tool = new ToolClass();
+    view->addOverlayView(std::make_unique<ViewClass>(tool, view, zoom));
+    this->geometryTool = std::unique_ptr<GeometryTool>(tool);
+    this->geometryToolController = std::make_unique<ControllerClass>(view, tool);
+    auto geometryToolInputHandler =
+            std::make_unique<InputHandlerClass>(this->win->getXournal(), geometryToolController.get());
+    Range range = view->getVisiblePart();
+    if (range.isValid()) {
+        double originX = (range.minX + range.maxX) * .5;
+        double originY = (range.minY + range.maxY) * .5;
+        geometryToolController->translate({originX, originY});
+    } else {
+        geometryToolController->translate({view->getWidth() * .5, view->getHeight() * .5});
+    }
+    xournal->input->setGeometryToolInputHandler(std::move(geometryToolInputHandler));
+    geometryTool->notify();
+    return true;
+}
+
+void Control::resetGeometryTool() {
+    this->geometryToolController.reset();
+    this->geometryTool.reset();
+    auto* xournal = GTK_XOURNAL(this->win->getXournal()->getWidget());
+    xournal->input->resetGeometryToolInputHandler();
+}
+
+void Control::showFloatingToolbox(int x, int y) {
+    GtkWidget* mainWindow = GTK_WIDGET(this->getGtkWindow());
+    GtkWidget* mainBox = this->getWindow()->get("mainBox");
+
+    gint mainBoxX, mainBoxY;
+    gtk_widget_translate_coordinates(mainWindow, mainBox, x, y, &mainBoxX, &mainBoxY);
+
+    this->getWindow()->getFloatingToolbox()->show(mainBoxX, mainBoxY);
+}
+
+auto Control::copy() -> bool {
+    if (this->win && this->win->getXournal()->copy()) {
+        return true;
+    }
+    return this->clipboardHandler->copy();
+}
+
+auto Control::cut() -> bool {
+    if (this->win && this->win->getXournal()->cut()) {
+        return true;
+    }
+    return this->clipboardHandler->cut();
+}
+
+auto Control::paste() -> bool {
+    if (this->win && this->win->getXournal()->paste()) {
+        return true;
+    }
+    return this->clipboardHandler->paste();
+}
+
+void Control::selectAlpha(OpacityFeature feature) {
+    int alpha = 0;
+
+    switch (feature) {
+        case OPACITY_FILL_PEN:
+            alpha = this->toolHandler->getPenFill();
+            break;
+        case OPACITY_FILL_HIGHLIGHTER:
+            alpha = this->toolHandler->getHighlighterFill();
+            break;
+        case OPACITY_SELECT_PDF_TEXT_MARKER:
+            alpha = this->toolHandler->getSelectPDFTextMarkerOpacity();
+            break;
+        default:
+            g_warning("Unhandled OpacityFeature for selectAlpha event: %s", opacityFeatureToString(feature).data());
+            Stacktrace::printStacktrace();
+            break;
+    }
+    auto dlg = xoj::popup::PopupWindowWrapper<xoj::popup::SelectOpacityDialog>(
+            gladeSearchPath, alpha, feature, [&th = *toolHandler](int alpha, OpacityFeature feature) {
+                switch (feature) {
+                    case OPACITY_FILL_PEN:
+                        th.setPenFill(alpha);
+                        break;
+                    case OPACITY_FILL_HIGHLIGHTER:
+                        th.setHighlighterFill(alpha);
+                        break;
+                    case OPACITY_SELECT_PDF_TEXT_MARKER:
+                        th.setSelectPDFTextMarkerOpacity(alpha);
+                        break;
+                    default:
+                        g_warning("Unhandled OpacityFeature for callback of SelectOpacityDialog: %s",
+                                  opacityFeatureToString(feature).data());
+                        Stacktrace::printStacktrace();
+                        break;
+                }
+            });
+    dlg.show(getGtkWindow());
+}
+
+void Control::clearSelectionEndText() {
+    clearSelection();
+    if (win) {
+        win->getXournal()->endTextAllPages();
+    }
+}
+
+void Control::selectAllOnPage() {
+    auto pageNr = getCurrentPageNo();
+    if (pageNr == npos) {
+        return;
+    }
+
+    win->getXournal()->clearSelection();
+
+    this->doc->lock();
+    XojPageView* view = win->getXournal()->getViewFor(pageNr);
+    if (view == nullptr) {
+        this->doc->unlock();
+        return;
+    }
+
+    PageRef page = this->doc->getPage(pageNr);
+    Layer* layer = page->getSelectedLayer();
+
+    auto elements = layer->clearNoFree();
+    this->doc->unlock();
+
+    if (!elements.empty()) {
+        InsertionOrder insertionOrder;
+        insertionOrder.reserve(elements.size());
+        Element::Index n = 0;
+        for (auto&& e: elements) {
+            insertionOrder.emplace_back(std::move(e), n++);
+        }
+        auto [sel, rg] =
+                SelectionFactory::createFromFloatingElements(this, page, layer, view, std::move(insertionOrder));
+
+        page->fireRangeChanged(rg);
+
+        win->getXournal()->setSelection(sel.release());
+    }
+}
+
+void Control::reorderSelection(EditSelection::OrderChange change) {
+    EditSelection* sel = win->getXournal()->getSelection();
+    if (!sel) {
+        return;
+    }
+
+    auto undoAction = sel->rearrangeInsertionOrder(change);
+    this->undoRedo->addUndoAction(std::move(undoAction));
+}
+
+/**
+ * Fire page selected, but first check if the page Number is valid
+ *
+ * @return the page ID or size_t_npos if the page is not found
+ */
+auto Control::firePageSelected(const PageRef& page) -> size_t {
+    this->doc->lock_shared();
+    size_t pageId = this->doc->indexOf(page);
+    this->doc->unlock_shared();
+    if (pageId == npos) {
+        return npos;
+    }
+
+    firePageSelected(pageId);
+    return pageId;
+}
+
+void Control::firePageSelected(size_t page) {
+    if (page != this->getCurrentPageNo()) {
+        DocumentHandler::firePageSelected(page);
+    }
+}
+
+void Control::manageToolbars() {
+    xoj::popup::PopupWindowWrapper<ToolbarManageDialog> dlg(
+            this->gladeSearchPath, this->win->getToolbarModel(), [win = this->win]() {
+                if (const auto& tbs = win->getToolbarModel()->getToolbars();
+                    std::none_of(tbs.begin(), tbs.end(),
+                                 [tb = win->getSelectedToolbar()](const auto& t) { return t.get() == tb; })) {
+                    // The active toolbar has been deleted!
+                    xoj_assert(!tbs.empty());
+                    win->toolbarSelected(tbs.front().get());
+                    XojMsgBox::showErrorToUser(
+                            GTK_WINDOW(win->getWindow()),
+                            _("You deleted the active toolbar. Falling back to the default toolbar."));
+                }
+
+                win->updateToolbarMenu();
+                auto filepath = Util::getConfigFile(TOOLBAR_CONFIG);
+                win->getToolbarModel()->save(filepath);
+            });
+    dlg.show(GTK_WINDOW(this->win->getWindow()));
+
+    this->win->updateToolbarMenu();
+    auto filepath = Util::getConfigFile(TOOLBAR_CONFIG);
+    this->win->getToolbarModel()->save(filepath);
+}
+
+void Control::customizeToolbars() {
+    xoj_assert(this->win != nullptr);
+
+    if (this->win->getSelectedToolbar()->isPredefined()) {
+        enum { YES = 1, NO };
+        XojMsgBox::askQuestion(getGtkWindow(),
+                               FC(_F("The Toolbarconfiguration \"{1}\" is predefined, "
+                                     "would you create a copy to edit?") %
+                                  this->win->getSelectedToolbar()->getName()),
+                               std::string(), {{_("Yes"), YES}, {_("No"), NO}}, [ctrl = this](int response) {
+                                   if (response == YES) {
+                                       auto data = std::make_unique<ToolbarData>(*ctrl->win->getSelectedToolbar());
+                                       ToolbarModel* model = ctrl->win->getToolbarModel();
+                                       model->initCopyNameId(data.get());
+                                       ctrl->win->toolbarSelected(model->add(std::move(data)));
+                                       ctrl->win->updateToolbarMenu();
+
+                                       xoj_assert(!ctrl->win->getSelectedToolbar()->isPredefined());
+                                       ctrl->customizeToolbars();
+                                   }
+                               });
+    } else {
+        if (!this->dragDropHandler) {
+            this->dragDropHandler = new ToolbarDragDropHandler(this);
+        }
+        this->dragDropHandler->configure();
+    }
+}
+
+void Control::setToolDrawingType(DrawingType type) {
+    if (this->toolHandler->getDrawingType() != type) {
+
+        if (this->toolHandler->getDrawingType() == DRAWING_TYPE_SPLINE) {
+            // Shape changed from spline to something else: finish ongoing splines
+            if (win) {
+                win->getXournal()->endSplineAllPages();
+            }
+        }
+        this->toolHandler->setDrawingType(type);
+    }
+}
+
+void Control::setFullscreen(bool enabled) {
+    win->setFullscreen(enabled);
+    actionDB->setActionState(Action::FULLSCREEN, enabled);
+}
+
+void Control::setShowSidebar(bool enabled) {
+    win->setSidebarVisible(enabled);
+    actionDB->setActionState(Action::SHOW_SIDEBAR, enabled);
+
+    if (settings->isSidebarVisible() != enabled &&
+        settings->getActiveViewMode() == PresetViewModeIds::VIEW_MODE_DEFAULT) {
+        settings->setSidebarVisible(enabled);
+        ViewMode viewMode = settings->getViewModes()[PresetViewModeIds::VIEW_MODE_DEFAULT];
+        viewMode.showSidebar = enabled;
+        settings->setViewMode(PresetViewModeIds::VIEW_MODE_DEFAULT, viewMode);
+    }
+}
+
+void Control::setShowToolbar(bool enabled) {
+    win->setToolbarVisible(enabled);
+    actionDB->setActionState(Action::SHOW_TOOLBAR, enabled);
+
+    if (settings->isToolbarVisible() != enabled &&
+        settings->getActiveViewMode() == PresetViewModeIds::VIEW_MODE_DEFAULT) {
+        settings->setToolbarVisible(enabled);
+        ViewMode viewMode = settings->getViewModes()[PresetViewModeIds::VIEW_MODE_DEFAULT];
+        viewMode.showToolbar = enabled;
+        settings->setViewMode(PresetViewModeIds::VIEW_MODE_DEFAULT, viewMode);
+    }
+}
+
+void Control::setShowMenubar(bool enabled) {
+    win->setMenubarVisible(enabled);
+    actionDB->setActionState(Action::SHOW_MENUBAR, enabled);
+}
+
+void Control::disableSidebarTmp(bool disabled) { this->sidebar->setTmpDisabled(disabled); }
+
+void Control::addDefaultPage(const std::optional<std::string>& pageTemplate, Document* doc) {
+    const std::string& templ = pageTemplate.value_or(settings->getPageTemplate());
+    PageTemplateSettings model;
+    model.parse(templ);
+
+    auto page = std::make_shared<XojPage>(model.getPageWidth(), model.getPageHeight());
+    page->setBackgroundColor(model.getBackgroundColor());
+    page->setBackgroundType(model.getBackgroundType());
+
+    if (doc == nullptr || doc == this->doc) {
+        // Apply to the curent document
+        this->doc->lock();
+        this->doc->addPage(std::move(page));
+        this->doc->unlock();
+    } else {
+        doc->addPage(std::move(page));
+    }
+}
+
+void Control::updatePageActions() {
+    auto currentPage = getCurrentPageNo();
+    auto nbPages = this->doc->getPageCount();
+    this->actionDB->enableAction(Action::DELETE_PAGE, nbPages > 1);
+    this->actionDB->enableAction(Action::MOVE_PAGE_TOWARDS_BEGINNING, currentPage != 0);
+    this->actionDB->enableAction(Action::MOVE_PAGE_TOWARDS_END, currentPage < nbPages - 1);
+}
+
+void Control::deletePage() {
+    clearSelectionEndText();
+
+    // if the current page contains the geometry tool, reset it
+    size_t pNr = getCurrentPageNo();
+    if (geometryToolController) {
+        doc->lock_shared();
+        auto page = doc->indexOf(geometryToolController->getPage());
+        doc->unlock_shared();
+        if (page == pNr) {
+            resetGeometryTool();
+        }
+    }
+    // don't allow delete pages if we have less than 2 pages,
+    // so we can be (more or less) sure there is at least one page.
+    if (this->doc->getPageCount() < 2) {
+        return;
+    }
+
+    if (pNr == npos || pNr > this->doc->getPageCount()) {
+        // something went wrong...
+        return;
+    }
+
+    this->doc->lock_shared();
+    PageRef page = doc->getPage(pNr);
+    this->doc->unlock_shared();
+
+    // first send event, then delete page...
+    firePageDeleted(pNr);
+
+    this->doc->lock();
+    doc->deletePage(pNr);
+    this->doc->unlock();
+
+    this->undoRedo->addUndoAction(std::make_unique<InsertDeletePageUndoAction>(page, pNr, false));
+
+    if (pNr >= this->doc->getPageCount()) {
+        pNr = this->doc->getPageCount() - 1;
+    }
+
+    scrollHandler->scrollToPage(pNr);
+    this->win->getXournal()->forceUpdatePagenumbers();
+}
+
+void Control::duplicatePage() {
+    auto page = getCurrentPage();
+    if (!page) {
+        return;
+    }
+    auto pageCopy = std::make_shared<XojPage>(*page);
+
+    insertPage(pageCopy, getCurrentPageNo() + 1);
+}
+
+void Control::movePageTowardsBeginning() {
+    auto currentPageNo = this->getCurrentPageNo();
+    if (currentPageNo < 1) {
+        g_warning("Control::movePageTowardsBeginning() called on the first page");
+        return;
+    }
+    if (currentPageNo == npos) {
+        g_warning("Control::movePageTowardsBeginning() called with current page selected");
+        return;
+    }
+
+    auto lock = std::unique_lock(*this->doc);
+    PageRef page = this->doc->getPage(currentPageNo);
+    PageRef otherPage = doc->getPage(currentPageNo - 1);
+    if (!page || !otherPage) {
+        g_warning("Control::movePageTowardsBeginning() called but no page %zu or %zu", currentPageNo,
+                  currentPageNo - 1);
+        return;
+    }
+
+    doc->deletePage(currentPageNo);
+    doc->insertPage(page, currentPageNo - 1);
+    lock.unlock();
+
+    UndoRedoHandler* undo = this->getUndoRedoHandler();
+    undo->addUndoAction(std::make_unique<SwapUndoAction>(currentPageNo - 1, true, page, otherPage));
+
+    this->firePageDeleted(currentPageNo);
+    this->firePageInserted(currentPageNo - 1);
+    this->firePageSelected(currentPageNo - 1);
+
+    this->getScrollHandler()->scrollToPage(currentPageNo - 1);
+}
+
+
+void Control::movePageTowardsEnd() {
+    auto currentPageNo = this->getCurrentPageNo();
+    if (currentPageNo == npos) {
+        g_warning("Control::movePageTowardsEnd() called with current page selected");
+        return;
+    }
+
+    auto lock = std::unique_lock(*this->doc);
+    auto nbPage = this->doc->getPageCount();
+    if (currentPageNo >= nbPage - 1) {
+        g_warning("Control::movePageTowardsEnd() called on last page");
+        return;
+    }
+
+    PageRef page = this->doc->getPage(currentPageNo);
+    PageRef otherPage = doc->getPage(currentPageNo + 1);
+    if (!page || !otherPage) {
+        g_warning("Control::movePageTowardsEnd() called but no page %zu or %zu", currentPageNo, currentPageNo + 1);
+        return;
+    }
+
+    doc->deletePage(currentPageNo);
+    doc->insertPage(page, currentPageNo + 1);
+    lock.unlock();
+
+    this->undoRedo->addUndoAction(std::make_unique<SwapUndoAction>(currentPageNo, false, page, otherPage));
+
+    this->firePageDeleted(currentPageNo);
+    this->firePageInserted(currentPageNo + 1);
+    this->firePageSelected(currentPageNo + 1);
+
+    this->getScrollHandler()->scrollToPage(currentPageNo + 1);
+}
+
+/// Remove mnemonic indicators in menu labels
+static std::string removeMnemonics(std::string orig) {
+    std::regex reg("_(.)");
+    return std::regex_replace(orig, reg, "$1");
+}
+
+void Control::askInsertPdfPage(size_t pdfPage) {
+    using Responses = enum { CANCEL = 1, AFTER = 2, END = 3 };
+    std::vector<XojMsgBox::Button> buttons = {{_("Cancel"), Responses::CANCEL},
+                                              {_("Insert after current page"), Responses::AFTER},
+                                              {_("Insert at end"), Responses::END}};
+
+    // Must match the labels in main.glade and PageTypeHandler.cpp
+    std::string pathToMenuEntry = removeMnemonics(_("_Journal") + std::string(" → ") + _("Paper B_ackground") +
+                                                  std::string(" → ") + _("With PDF background"));
+
+    XojMsgBox::askQuestion(this->getGtkWindow(),
+                           FC(_F("Your current document does not contain PDF Page no {1}\n"
+                                 "Would you like to insert this page?\n\n"
+                                 "Tip: You can select {2} to insert a PDF page.") %
+                              static_cast<int64_t>(pdfPage + 1) % pathToMenuEntry),
+                           "", buttons, [ctrl = this, pdfPage](int response) {
+                               if (response == Responses::AFTER || response == Responses::END) {
+                                   Document* doc = ctrl->getDocument();
+
+                                   doc->lock_shared();
+                                   size_t position = response == Responses::AFTER ? ctrl->getCurrentPageNo() + 1 :
+                                                                                    doc->getPageCount();
+                                   XojPdfPageSPtr pdf = doc->getPdfPage(pdfPage);
+                                   doc->unlock_shared();
+
+                                   if (pdf) {
+                                       auto page = std::make_shared<XojPage>(pdf->getWidth(), pdf->getHeight());
+                                       page->setBackgroundPdfPageNr(pdfPage);
+                                       ctrl->insertPage(page, position);
+                                   }
+                               }
+                           });
+}
+
+void Control::insertNewPage(size_t position, bool automatedInsertion) {
+    pageBackgroundChangeController->insertNewPage(position, automatedInsertion);
+}
+
+void Control::appendNewPdfPages() {
+    auto pageCount = this->doc->getPageCount();
+    // find last page with pdf background and get its pdf page number
+    auto currentPdfPageCount = [&]() {
+        for (size_t i = pageCount; i != 0; --i) {
+            if (auto page = doc->getPage(i - 1); page && page->getBackgroundType().isPdfPage()) {
+                return page->getPdfPageNr() + 1;
+            }
+        }
+        return size_t{0U};
+    }();
+
+    auto pdfPageCount = this->doc->getPdfPageCount();
+    auto insertCount = pdfPageCount - currentPdfPageCount;
+
+    if (insertCount == 0) {
+        string msg = FS(_F("No pdf pages available to append. You may need to reopen the document first."));
+        XojMsgBox::showErrorToUser(getGtkWindow(), msg);
+    }
+    for (size_t i = 0; i != insertCount; ++i) {
+
+        doc->lock_shared();
+        XojPdfPageSPtr pdf = doc->getPdfPage(currentPdfPageCount + i);
+        doc->unlock_shared();
+
+        if (pdf) {
+            auto newPage = std::make_shared<XojPage>(pdf->getWidth(), pdf->getHeight());
+            newPage->setBackgroundPdfPageNr(currentPdfPageCount + i);
+            insertPage(newPage, pageCount + i);
+        } else {
+            string msg = FS(_F("Unable to retrieve pdf page."));  // should not happen
+            XojMsgBox::showErrorToUser(getGtkWindow(), msg);
+        }
+    }
+}
+
+void Control::insertPage(const PageRef& page, size_t position, bool shouldScrollToPage) {
+    this->doc->lock();
+    this->doc->insertPage(page, position);  // insert the new page to the document and update page numbers
+    this->doc->unlock();
+    undoRedo->addUndoAction(std::make_unique<InsertDeletePageUndoAction>(page, position, true));
+
+    // notify document listeners about the inserted page; this creates the new XojViewPage, recalculates the layout
+    // and creates a preview page in the sidebar
+    firePageInserted(position);
+
+    getCursor()->updateCursor();
+
+    // make the inserted page fully visible (or at least as much from the top which fits on the screen),
+    // and make the page appear selected
+    if (shouldScrollToPage) {
+        scrollHandler->scrollToPage(position);
+        firePageSelected(position);
+    }
+
+    updatePageActions();
+}
+
+void Control::gotoPage() {
+    auto popup = xoj::popup::PopupWindowWrapper<xoj::popup::GotoDialog>(
+            this->gladeSearchPath, this->getCurrentPageNo(), this->doc->getPageCount(),
+            [scroll = this->scrollHandler](size_t pageNumber) {
+                xoj_assert(pageNumber != 0);
+                scroll->scrollToPage(pageNumber - 1);
+            });
+    popup.show(GTK_WINDOW(this->win->getWindow()));
+}
+
+void Control::updateBackgroundSizeButton() {
+    if (this->win == nullptr) {
+        return;
+    }
+
+    // Update paper color button
+    auto const& p = getCurrentPage();
+    if (!p || this->win == nullptr) {
+        return;
+    }
+
+    PageType bg = p->getBackgroundType();
+    this->actionDB->enableAction(Action::PAPER_BACKGROUND_COLOR, !bg.isSpecial());
+    // PDF page size is defined, you cannot change it
+    this->actionDB->enableAction(Action::PAPER_FORMAT, !bg.isPdfPage());
+}
+
+void Control::paperTemplate() {
+    auto popup = xoj::popup::PopupWindowWrapper<xoj::popup::PageTemplateDialog>(this->gladeSearchPath, settings,
+                                                                                win->getToolMenuHandler(), pageTypes);
+    popup.show(GTK_WINDOW(this->win->getWindow()));
+}
+
+void Control::paperFormat() {
+    auto const& page = getCurrentPage();
+    if (!page || page->getBackgroundType().isPdfPage()) {
+        return;
+    }
+    clearSelectionEndText();
+
+    auto popup = xoj::popup::PopupWindowWrapper<xoj::popup::FormatDialog>(
+            this->gladeSearchPath, settings, page->getWidth(), page->getHeight(),
+            [ctrl = this, page](double width, double height) {
+                ctrl->doc->lock();
+                double oldW = page->getWidth();
+                double oldH = page->getHeight();
+                Document::setPageSize(page, width, height);
+                size_t pageNo = ctrl->doc->indexOf(page);
+                size_t pageCount = ctrl->doc->getPageCount();
+                ctrl->doc->unlock();
+                ctrl->undoRedo->addUndoAction(std::make_unique<PageSizeChangeUndoAction>(page, oldW, oldH));
+                if (pageNo != npos && pageNo < pageCount) {
+                    ctrl->firePageSizeChanged(pageNo);
+                }
+            });
+    popup.show(GTK_WINDOW(this->win->getWindow()));
+}
+
+void Control::changePageBackgroundColor() {
+    auto pNr = getCurrentPageNo();
+    this->doc->lock_shared();
+    auto const& p = this->doc->getPage(pNr);
+    this->doc->unlock_shared();
+
+    if (!p) {
+        return;
+    }
+
+    clearSelectionEndText();
+
+    PageType bg = p->getBackgroundType();
+    if (bg.isSpecial()) {
+        return;
+    }
+
+    xoj::popup::PopupWindowWrapper<SelectBackgroundColorDialog> dlg(this, [p, pNr, ctrl = this](Color color) {
+        p->setBackgroundColor(color);
+        ctrl->firePageChanged(pNr);
+    });
+    dlg.show(GTK_WINDOW(this->win->getWindow()));
+}
+
+void Control::setViewPairedPages(bool enabled) {
+    settings->setShowPairedPages(enabled);
+    win->getXournal()->layoutPages();
+    scrollHandler->scrollToPage(getCurrentPageNo());
+}
+
+void Control::setViewFullscreenMode(bool enabled) {
+    if (enabled) {
+        this->loadViewMode(VIEW_MODE_FULLSCREEN);
+    } else {
+        this->loadViewMode(VIEW_MODE_DEFAULT);
+    }
+}
+
+void Control::setViewPresentationMode(bool enabled) {
+    if (enabled) {
+        this->loadViewMode(VIEW_MODE_PRESENTATION);
+
+        bool success = zoom->updateZoomPresentationValue();
+        if (!success) {
+            g_warning("Error calculating zoom value");
+            return;
+        }
+    } else {
+        this->loadViewMode(VIEW_MODE_DEFAULT);
+
+        if (settings->isViewFixedRows()) {
+            setViewRows(settings->getViewRows());
+        } else {
+            setViewColumns(settings->getViewColumns());
+        }
+
+        setViewLayoutVert(settings->getViewLayoutVert());
+        setViewLayoutR2L(settings->getViewLayoutR2L());
+        setViewLayoutB2T(settings->getViewLayoutB2T());
+    }
+    zoom->setZoomPresentationMode(enabled);
+    settings->setPresentationMode(enabled);
+
+    // Disable Zoom
+    this->actionDB->enableAction(Action::ZOOM_IN, !enabled);
+    this->actionDB->enableAction(Action::ZOOM_OUT, !enabled);
+    this->actionDB->enableAction(Action::ZOOM_FIT, !enabled);
+    this->actionDB->enableAction(Action::ZOOM_100, !enabled);
+    this->actionDB->enableAction(Action::ZOOM, !enabled);
+
+    // TODO Figure out how to replace this
+    // fireEnableAction(ACTION_FOOTER_ZOOM_SLIDER, !enabled);
+
+    this->actionDB->enableAction(Action::SET_LAYOUT_BOTTOM_TO_TOP, !enabled);
+    this->actionDB->enableAction(Action::SET_LAYOUT_RIGHT_TO_LEFT, !enabled);
+    this->actionDB->enableAction(Action::SET_LAYOUT_VERTICAL, !enabled);
+    this->actionDB->enableAction(Action::SET_COLUMNS_OR_ROWS, !enabled);
+
+    // disable selection of scroll hand tool
+    // TODO Figure out how to replace this
+    // fireEnableAction(ACTION_TOOL_HAND, !enabled);
+
+    win->getXournal()->layoutPages();
+    scrollHandler->scrollToPage(getCurrentPageNo());
+}
+
+void Control::setPairsOffset(int numOffset) {
+    settings->setPairsOffset(numOffset);
+    win->getXournal()->layoutPages();
+    scrollHandler->scrollToPage(getCurrentPageNo());
+}
+
+void Control::setViewColumns(int numColumns) {
+    settings->setViewColumns(numColumns);
+    settings->setViewFixedRows(false);
+    win->getXournal()->layoutPages();
+    scrollHandler->scrollToPage(getCurrentPageNo());
+}
+
+void Control::setViewRows(int numRows) {
+    settings->setViewRows(numRows);
+    settings->setViewFixedRows(true);
+    win->getXournal()->layoutPages();
+    scrollHandler->scrollToPage(getCurrentPageNo());
+}
+
+void Control::setViewLayoutVert(bool vert) {
+    settings->setViewLayoutVert(vert);
+    win->getXournal()->layoutPages();
+    scrollHandler->scrollToPage(getCurrentPageNo());
+}
+
+void Control::setViewLayoutR2L(bool r2l) {
+    settings->setViewLayoutR2L(r2l);
+    win->getXournal()->layoutPages();
+    scrollHandler->scrollToPage(getCurrentPageNo());
+}
+
+void Control::setViewLayoutB2T(bool b2t) {
+    settings->setViewLayoutB2T(b2t);
+    win->getXournal()->layoutPages();
+    scrollHandler->scrollToPage(getCurrentPageNo());
+}
+
+auto Control::getCurrentPageNo() const -> size_t {
+    if (this->win) {
+        return this->win->getXournal()->getCurrentPage();
+    }
+    return 0;
+}
+
+auto Control::searchTextOnPage(const std::string& text, size_t pageNumber, size_t index, size_t* occurrences,
+                               XojPdfRectangle* matchRect) -> bool {
+    return getWindow()->getXournal()->searchTextOnPage(text, pageNumber, index, occurrences, matchRect);
+}
+
+auto Control::getCurrentPage() -> PageRef {
+    this->doc->lock_shared();
+    PageRef p = this->doc->getPage(getCurrentPageNo());
+    this->doc->unlock_shared();
+
+    return p;
+}
+
+void Control::undoRedoChanged() {
+    this->actionDB->enableAction(Action::UNDO, undoRedo->canUndo());
+    this->actionDB->enableAction(Action::REDO, undoRedo->canRedo());
+
+    win->setUndoDescription(undoRedo->undoDescription());
+    win->setRedoDescription(undoRedo->redoDescription());
+
+    updateWindowTitle();
+}
+
+void Control::undoRedoPageChanged(PageRef page) {
+    if (std::find(begin(this->changedPages), end(this->changedPages), page) == end(this->changedPages)) {
+        this->changedPages.emplace_back(std::move(page));
+    }
+}
+
+void Control::selectTool(ToolType type) {
+    // keep text-selection when switching from text to seletion tool
+    auto oldTool = getToolHandler()->getActiveTool();
+    if (oldTool && win && isSelectToolType(type) && oldTool->getToolType() == ToolType::TOOL_TEXT &&
+        this->win->getXournal()->getTextEditor() && !(this->win->getXournal()->getTextEditor()->bufferEmpty())) {
+        auto xournal = this->win->getXournal();
+        Text* textobj = xournal->getTextEditor()->getTextElement();
+        clearSelectionEndText();
+
+        auto pageNr = getCurrentPageNo();
+        XojPageView* view = xournal->getViewFor(pageNr);
+        xoj_assert(view != nullptr);
+        PageRef page = view->getPage();
+        auto sel = SelectionFactory::createFromElementOnActiveLayer(this, page, view, textobj);
+
+        xournal->setSelection(sel.release());
+    }
+
+    toolHandler->selectTool(type);
+    toolHandler->fireToolChanged();
+}
+
+void Control::selectDefaultTool() {
+    ButtonConfig* cfg = settings->getButtonConfig(Button::BUTTON_DEFAULT);
+    cfg->applyConfigToToolbarTool(toolHandler);
+
+    if (toolHandler->getToolType() != TOOL_NONE) {
+        selectTool(toolHandler->getToolType());
+    }
+}
+
+void Control::setFontSelected(const XojFont& font) {
+    this->actionDB->setActionState(Action::FONT, font.asString().c_str());
+}
+
+void Control::toolChanged() {
+    ToolType type = toolHandler->getToolType();
+
+    this->actionDB->setActionState(Action::SELECT_TOOL, type);
+
+    this->actionDB->enableAction(Action::TOOL_DRAW_LINE, toolHandler->hasCapability(TOOL_CAP_RULER));
+    this->actionDB->enableAction(Action::TOOL_DRAW_RECTANGLE, toolHandler->hasCapability(TOOL_CAP_RECTANGLE));
+    this->actionDB->enableAction(Action::TOOL_DRAW_ELLIPSE, toolHandler->hasCapability(TOOL_CAP_ELLIPSE));
+    this->actionDB->enableAction(Action::TOOL_DRAW_ARROW, toolHandler->hasCapability(TOOL_CAP_ARROW));
+    this->actionDB->enableAction(Action::TOOL_DRAW_DOUBLE_ARROW, toolHandler->hasCapability(TOOL_CAP_DOUBLE_ARROW));
+    this->actionDB->enableAction(Action::TOOL_DRAW_COORDINATE_SYSTEM, toolHandler->hasCapability(TOOL_CAP_ARROW));
+    this->actionDB->enableAction(Action::TOOL_DRAW_SPLINE, toolHandler->hasCapability(TOOL_CAP_SPLINE));
+    this->actionDB->enableAction(Action::TOOL_DRAW_SHAPE_RECOGNIZER, toolHandler->hasCapability(TOOL_CAP_RECOGNIZER));
+
+    DrawingType dt = toolHandler->getDrawingType();
+    this->actionDB->setActionState(Action::TOOL_DRAW_LINE, dt == DRAWING_TYPE_LINE);
+    this->actionDB->setActionState(Action::TOOL_DRAW_RECTANGLE, dt == DRAWING_TYPE_RECTANGLE);
+    this->actionDB->setActionState(Action::TOOL_DRAW_ELLIPSE, dt == DRAWING_TYPE_ELLIPSE);
+    this->actionDB->setActionState(Action::TOOL_DRAW_ARROW, dt == DRAWING_TYPE_ARROW);
+    this->actionDB->setActionState(Action::TOOL_DRAW_DOUBLE_ARROW, dt == DRAWING_TYPE_DOUBLE_ARROW);
+    this->actionDB->setActionState(Action::TOOL_DRAW_COORDINATE_SYSTEM, dt == DRAWING_TYPE_COORDINATE_SYSTEM);
+    this->actionDB->setActionState(Action::TOOL_DRAW_SPLINE, dt == DRAWING_TYPE_SPLINE);
+    this->actionDB->setActionState(Action::TOOL_DRAW_SHAPE_RECOGNIZER, dt == DRAWING_TYPE_SHAPE_RECOGNIZER);
+
+    bool enableSize = toolHandler->hasCapability(TOOL_CAP_SIZE);
+    this->actionDB->enableAction(Action::TOOL_SIZE, enableSize);
+    if (enableSize) {
+        toolSizeChanged();
+    }
+
+    // Set or reset the lineStyle
+    toolLineStyleChanged();
+
+    bool enableFill = toolHandler->hasCapability(TOOL_CAP_FILL);
+    this->actionDB->enableAction(Action::TOOL_FILL, enableFill);
+    this->actionDB->enableAction(Action::TOOL_FILL_OPACITY, enableFill);
+    if (enableFill) {
+        toolFillChanged();
+    }
+
+    bool enableColor = toolHandler->hasCapability(TOOL_CAP_COLOR);
+    this->actionDB->enableAction(Action::TOOL_COLOR, enableColor);
+    this->actionDB->enableAction(Action::SELECT_COLOR, enableColor);
+    if (enableColor) {
+        toolColorChanged();
+    }
+
+    getCursor()->updateCursor();
+
+    if (type != TOOL_TEXT) {
+        if (win) {
+            win->getXournal()->endTextAllPages();
+        }
+    }
+    if (toolHandler->getDrawingType() != DRAWING_TYPE_SPLINE) {
+        if (win) {
+            win->getXournal()->endSplineAllPages();
+        }
+    }
+}
+
+void Control::eraserSizeChanged() {
+    this->actionDB->setActionState(Action::TOOL_ERASER_SIZE, toolHandler->getEraserSize());
+}
+
+void Control::penSizeChanged() { this->actionDB->setActionState(Action::TOOL_PEN_SIZE, toolHandler->getPenSize()); }
+
+void Control::highlighterSizeChanged() {
+    this->actionDB->setActionState(Action::TOOL_HIGHLIGHTER_SIZE, toolHandler->getHighlighterSize());
+}
+
+void Control::toolSizeChanged() {
+    if (toolHandler->getToolType() == TOOL_PEN) {
+        penSizeChanged();
+    } else if (toolHandler->getToolType() == TOOL_ERASER) {
+        eraserSizeChanged();
+    } else if (toolHandler->getToolType() == TOOL_HIGHLIGHTER) {
+        highlighterSizeChanged();
+    }
+
+    this->actionDB->setActionState(Action::TOOL_SIZE, toolHandler->getSize());
+
+    getCursor()->updateCursor();
+}
+
+void Control::toolFillChanged() {
+    this->actionDB->setActionState(Action::TOOL_FILL, toolHandler->getFill() != -1);
+    this->actionDB->setActionState(Action::TOOL_PEN_FILL, toolHandler->getPenFillEnabled());
+    this->actionDB->setActionState(Action::TOOL_HIGHLIGHTER_FILL, toolHandler->getHighlighterFillEnabled());
+}
+
+void Control::toolLineStyleChanged() {
+    std::optional<string> style = getLineStyleToSelect();
+    this->actionDB->setActionState(Action::TOOL_PEN_LINE_STYLE, style ? style->c_str() : "none");
+}
+
+auto Control::getLineStyleToSelect() -> std::optional<string> const {
+    std::optional<std::string> style;
+    if (auto* tool = toolHandler->getActiveTool(); tool->getToolType() == TOOL_PEN) {
+        style = StrokeStyle::formatStyle(tool->getLineStyle());
+    }
+
+    if (!win) {
+        return style;
+    }
+
+    const EditSelection* sel = win->getXournal()->getSelection();
+    if (!sel) {
+        return style;
+    }
+
+    bool isFirstPenStrokeElement = true;
+    std::optional<std::string> previous_style;
+
+    // Todo(cpp20) Replace with std::ranges::filter_view and for_first_then_for_each
+    for (const Element* e: sel->getElementsView()) {
+        if (e->getType() == ELEMENT_STROKE) {
+            const auto* s = dynamic_cast<const Stroke*>(e);
+
+            if (s->getToolType().hasLineStyle()) {
+                style = StrokeStyle::formatStyle(s->getLineStyle());
+
+                if (isFirstPenStrokeElement) {
+                    previous_style = style;
+                    isFirstPenStrokeElement = false;
+                } else {
+                    if (style != previous_style) {
+                        return std::nullopt;
+                    }
+                }
+            }
+        }
+    }
+
+    return style;
+}
+
+void Control::toolColorChanged() {
+    this->actionDB->setActionState(Action::TOOL_COLOR, getToolHandler()->getColorMaskAlpha());
+    getCursor()->updateCursor();
+}
+
+void Control::changeColorOfSelection() {
+    if (this->win && toolHandler->hasCapability(TOOL_CAP_COLOR)) {
+        EditSelection* sel = this->win->getXournal()->getSelection();
+        if (sel) {
+            undoRedo->addUndoAction(sel->setColor(toolHandler->getColor()));
+        }
+
+        TextEditor* edit = getTextEditor();
+
+
+        if (this->toolHandler->getToolType() == TOOL_TEXT && edit != nullptr) {
+            // Todo move into selection
+            edit->setColor(toolHandler->getColor());
+        }
+    }
+}
+
+void Control::showSettings() {
+    // take note of some settings before to compare with after
+    struct {
+        Color selectionColor;
+        bool verticalSpace;
+        int verticalSpaceAmountAbove;
+        int verticalSpaceAmountBelow;
+        bool horizontalSpace;
+        int horizontalSpaceAmountRight;
+        int horizontalSpaceAmountLeft;
+        bool unlimitedScrolling;
+        StylusCursorType stylusCursorType;
+        bool highlightPosition;
+        SidebarNumberingStyle sidebarStyle;
+        std::optional<std::filesystem::path> colorPaletteSetting;
+        RecolorParameters recolorParameters;
+    } settingsBeforeDialog = {
+            settings->getBorderColor(),
+            settings->getAddVerticalSpace(),
+            settings->getAddVerticalSpaceAmountAbove(),
+            settings->getAddVerticalSpaceAmountBelow(),
+            settings->getAddHorizontalSpace(),
+            settings->getAddHorizontalSpaceAmountRight(),
+            settings->getAddHorizontalSpaceAmountLeft(),
+            settings->getUnlimitedScrolling(),
+            settings->getStylusCursorType(),
+            settings->isHighlightPosition(),
+            settings->getSidebarNumberingStyle(),
+            settings->getColorPaletteSetting(),
+            settings->getRecolorParameters(),
+    };
+
+    auto dlg = xoj::popup::PopupWindowWrapper<SettingsDialog>(
+            this->gladeSearchPath, settings, this,
+            std::vector<fs::path>{Util::getBuiltInPaletteDirectoryPath(), Util::getCustomPaletteDirectoryPath()},
+            [ctrl = this, settingsBeforeDialog]() {
+                Settings* settings = ctrl->getSettings();
+                MainWindow* win = ctrl->win;
+                XournalView* xournal = win->getXournal();
+                // note which settings have changed and act accordingly
+                if (settingsBeforeDialog.selectionColor != settings->getBorderColor()) {
+                    xournal->forceUpdatePagenumbers();
+                }
+
+                if (!settings->getUnlimitedScrolling() &&
+                    (settingsBeforeDialog.verticalSpace != settings->getAddVerticalSpace() ||
+                     settingsBeforeDialog.horizontalSpace != settings->getAddHorizontalSpace() ||
+                     settingsBeforeDialog.verticalSpaceAmountAbove != settings->getAddVerticalSpaceAmountAbove() ||
+                     settingsBeforeDialog.horizontalSpaceAmountRight != settings->getAddHorizontalSpaceAmountRight() ||
+                     settingsBeforeDialog.verticalSpaceAmountBelow != settings->getAddVerticalSpaceAmountBelow() ||
+                     settingsBeforeDialog.horizontalSpaceAmountLeft != settings->getAddHorizontalSpaceAmountLeft())) {
+                    xournal->layoutPages();
+                    double const xChange =
+                            (settings->getAddHorizontalSpace() ? settings->getAddHorizontalSpaceAmountLeft() : 0) -
+                            (settingsBeforeDialog.horizontalSpace ? settingsBeforeDialog.horizontalSpaceAmountLeft : 0);
+                    const double yChange =
+                            (settings->getAddVerticalSpace() ? settings->getAddVerticalSpaceAmountAbove() : 0) -
+                            (settingsBeforeDialog.verticalSpace ? settingsBeforeDialog.verticalSpaceAmountAbove : 0);
+
+                    win->getLayout()->scrollRelative(xChange, yChange);
+                }
+
+                if (settingsBeforeDialog.unlimitedScrolling != settings->getUnlimitedScrolling()) {
+                    const int xUnlimited = static_cast<int>(win->getLayout()->getVisibleRect().width);
+                    const int yUnlimited = static_cast<int>(win->getLayout()->getVisibleRect().height);
+                    const double xChange =
+                            settingsBeforeDialog.unlimitedScrolling ?
+                                    -xUnlimited + (settingsBeforeDialog.horizontalSpace ?
+                                                           settingsBeforeDialog.horizontalSpaceAmountLeft :
+                                                           0) :
+                                    xUnlimited - (settingsBeforeDialog.horizontalSpace ?
+                                                          settingsBeforeDialog.horizontalSpaceAmountLeft :
+                                                          0);
+                    const double yChange =
+                            settingsBeforeDialog.unlimitedScrolling ?
+                                    -yUnlimited + (settingsBeforeDialog.verticalSpace ?
+                                                           settingsBeforeDialog.verticalSpaceAmountAbove :
+                                                           0) :
+                                    yUnlimited - (settingsBeforeDialog.verticalSpace ?
+                                                          settingsBeforeDialog.verticalSpaceAmountAbove :
+                                                          0);
+
+                    xournal->layoutPages();
+                    win->getLayout()->scrollRelative(xChange, yChange);
+                }
+
+                if (settingsBeforeDialog.stylusCursorType != settings->getStylusCursorType() ||
+                    settingsBeforeDialog.highlightPosition != settings->isHighlightPosition()) {
+                    ctrl->getCursor()->updateCursor();
+                }
+
+
+                bool reloadToolbars = false;
+                if (settingsBeforeDialog.colorPaletteSetting.has_value() &&
+                    settingsBeforeDialog.colorPaletteSetting.value() != settings->getColorPaletteSetting()) {
+                    ctrl->loadPaletteFromSettings();
+                    ctrl->getWindow()->getToolMenuHandler()->updateColorToolItems(ctrl->getPalette());
+                    reloadToolbars = true;
+                }
+
+                if (settingsBeforeDialog.recolorParameters != settings->getRecolorParameters()) {
+                    ctrl->getWindow()->getToolMenuHandler()->updateColorToolItemsRecoloring(
+                            settings->getRecolorParameters().recolorizeMainView ?
+                                    std::make_optional(settings->getRecolorParameters().recolor) :
+                                    std::nullopt);
+                    reloadToolbars = true;
+                }
+
+                if (reloadToolbars) {
+                    ctrl->getWindow()->reloadToolbars();
+                }
+
+                ctrl->getSidebar()->saveSize();
+                ctrl->win->updateScrollbarSidebarPosition();
+                ctrl->updateWindowTitle();
+
+                ctrl->enableAutosave(settings->isAutosaveEnabled());
+
+                ctrl->zoom->setZoomStep(settings->getZoomStep() / 100.0);
+                ctrl->zoom->setZoomStepScroll(settings->getZoomStepScroll() / 100.0);
+                ctrl->win->setDPI();
+
+                if (settingsBeforeDialog.sidebarStyle != settings->getSidebarNumberingStyle()) {
+                    ctrl->getSidebar()->layout();
+                }
+
+                xournal->getHandRecognition()->reload();
+                ctrl->win->updateColorscheme();
+
+                ctrl->getActionDatabase()->setActionState(Action::TOGGLE_TOUCH_DRAWING,
+                                                          settings->getTouchDrawingEnabled());
+            });
+    dlg.show(GTK_WINDOW(this->win->getWindow()));
+}
+
+static std::unique_ptr<Document> createNewDocument(Control* ctrl, fs::path filepath,
+                                                   const std::optional<std::string>& pageTemplate) {
+    auto newDoc = std::make_unique<Document>(ctrl);
+    if (!filepath.empty()) {
+        newDoc->setFilepath(std::move(filepath));
+    }
+    ctrl->addDefaultPage(pageTemplate, newDoc.get());
+    return newDoc;
+}
+
+void Control::newFile(fs::path filepath) {
+    this->close(
+            [ctrl = this, filepath = std::move(filepath)](bool closed) {
+                if (closed) {
+                    ctrl->replaceDocument(createNewDocument(ctrl, std::move(filepath), std::nullopt), -1);
+                }
+            },
+            true);
+}
+
+/**
+ * Check if this is an autosave file, return false in this case and display a user instruction
+ */
+static auto shouldFileOpen(fs::path const& filepath, GtkWindow* win) -> bool {
+    auto basePath = Util::getCacheSubfolder("");
+    auto isChild = Util::isChildOrEquivalent(filepath, basePath);
+    if (isChild) {
+        string msg = FS(_F("Do not open Autosave files. They may will be overwritten!\n"
+                           "Copy the files to another folder.\n"
+                           "Files from Folder {1} cannot be opened.") %
+                        basePath.u8string());
+        XojMsgBox::showErrorToUser(win, msg);
+    }
+    return !isChild;
+}
+
+void Control::askToOpenFile() {
+    /**
+     * Question: in case the current file has not been saved yet, do we want:
+     *      1. First ask to save it, save it or discard it and then show the FileChooserDialog to open a new file
+     *      2. First show the FileChooserDialog, and if a valid file has been selected and successfully opened, ask to
+     *         save or discard the current file
+     * For now, this implements option 1.
+     */
+    this->close([ctrl = this](bool closed) {
+        if (closed) {
+            xoj::OpenDlg::showOpenFileDialog(ctrl->getGtkWindow(), ctrl->settings, [ctrl](fs::path path) {
+                g_message("%s", (_F("file: {1}") % path.string()).c_str());
+                ctrl->openFileWithoutSavingTheCurrentDocument(std::move(path), false, -1, [](bool) {});
+            });
+        }
+    });
+}
+
+void Control::replaceDocument(std::unique_ptr<Document> doc, int scrollToPage) {
+    this->closeDocument();
+
+    fs::path filepath = doc->getFilepath();
+
+    this->doc->lock();
+    *this->doc = *doc;  // This calls fireDocumentChanged(DOCUMENT_CHANGE_COMPLETE). No need to fire it again
+    this->doc->unlock();
+
+    setEmergencyDocument(this->doc);
+
+    // Set folder as last save path, so the next save will be at the current document location
+    // This is important because of the new .xopp format, where Xournal .xoj handled as import,
+    // not as file to load
+    if (!filepath.empty()) {
+        settings->setLastSavePath(filepath.parent_path());
+    }
+
+    fileLoaded(scrollToPage);
+}
+
+void Control::openXoppFile(fs::path filepath, int scrollToPage, std::function<void(bool)> callback) {
+    LoadHandler loadHandler;
+    std::unique_ptr<Document> doc(loadHandler.loadDocument(filepath));
+
+    if (!doc) {
+        string msg = FS(_F("Error opening file \"{1}\"") % filepath.u8string()) + "\n" + loadHandler.getLastError();
+        XojMsgBox::showErrorToUser(this->getGtkWindow(), msg);
+        callback(false);
+        return;
+    }
+
+    std::optional<MissingPdfData> missingPdf;
+    if (!loadHandler.getMissingPdfFilename().empty() || loadHandler.isAttachedPdfMissing()) {
+        missingPdf = {loadHandler.isAttachedPdfMissing(), loadHandler.getMissingPdfFilename()};
+    }
+
+    auto afterOpen = [ctrl = this, missingPdf = std::move(missingPdf), doc = std::move(doc), filepath,
+                      scrollToPage]() mutable {
+        ctrl->replaceDocument(std::move(doc), scrollToPage);
+
+        if (missingPdf && (missingPdf->wasPdfAttached || !missingPdf->missingFileName.empty())) {
+            // give the user a second chance to select a new PDF filepath, or to discard the PDF
+            ctrl->promptMissingPdf(missingPdf.value(), filepath);
+        }
+    };
+
+    if (loadHandler.getFileVersion() > FILE_FORMAT_VERSION) {
+        enum { YES = 1, NO };
+        std::vector<XojMsgBox::Button> buttons = {{_("Yes"), YES}, {_("No"), NO}};
+        XojMsgBox::askQuestion(
+                this->getGtkWindow(), _("File version mismatch"),
+                _("The file being loaded has a file format version newer than the one currently supported by this "
+                  "version of Xournal++, so it may not load properly. Open anyways?"),
+                buttons, [afterOpen = std::move(afterOpen), callback = std::move(callback)](int response) mutable {
+                    if (response == YES) {
+                        afterOpen();
+                        callback(true);
+                    } else {
+                        callback(false);
+                    }
+                });
+    } else {
+        afterOpen();
+        callback(true);
+    }
+}
+
+bool Control::openPdfFile(fs::path filepath, bool attachToDocument, int scrollToPage) {
+    this->getCursor()->setCursorBusy(true);
+    auto doc = std::make_unique<Document>(this);
+    bool success = doc->readPdf(filepath, /*initPages=*/true, attachToDocument);
+    if (success) {
+        this->replaceDocument(std::move(doc), scrollToPage);
+    } else {
+        std::string msg = FS(_F("Error reading PDF file \"{1}\"\n{2}") % filepath.u8string() % doc->getLastErrorMsg());
+        XojMsgBox::showErrorToUser(this->getGtkWindow(), msg);
+    }
+    this->getCursor()->setCursorBusy(false);
+    return success;
+}
+
+bool Control::openPngFile(fs::path filepath, bool attachToDocument, int scrollToPage) {
+    fs::path imagePath(filepath);
+    this->getCursor()->setCursorBusy(true);
+    this->replaceDocument(createNewDocument(this, std::move(filepath), std::nullopt), -1);
+
+    // Put a png file directly in the page
+    this->doc->lock();
+    const size_t pageNr = this->getCurrentPageNo();
+    PageRef page = this->doc->getPage(pageNr);
+    BackgroundImage img;
+    GError* error = nullptr;
+    img.loadFile(imagePath, &error);
+
+    if (error) {
+        std::string msg = FS(_F("Error reading PNG file \"{1}\"") % imagePath.u8string());
+        XojMsgBox::showErrorToUser(this->getGtkWindow(), msg);
+        g_error_free(error);
+        this->doc->unlock();
+        this->getCursor()->setCursorBusy(false);
+        return false;
+    }
+
+    page->setBackgroundImage(std::move(img));
+    page->setBackgroundType(PageType(PageTypeFormat::Image));
+
+    // Apply correct page size
+    GdkPixbuf* pixbuf = page->getBackgroundImage().getPixbuf();
+    if (pixbuf) {
+        page->setSize(gdk_pixbuf_get_width(pixbuf), gdk_pixbuf_get_height(pixbuf));
+    } else {
+        g_warning("PageBackgroundChangeController::setPageImageBackground(): Page with image background but nullptr "
+                  "pixbuf");
+    }
+
+    this->doc->unlock();
+    this->getCursor()->setCursorBusy(false);
+    return true;
+}
+
+bool Control::openXoptFile(fs::path filepath) {
+    auto pageTemplate = Util::readString(filepath);
+    if (!pageTemplate) {
+        // Unable to read the template from the file
+        return false;
+    }
+    this->replaceDocument(createNewDocument(this, std::move(filepath), pageTemplate), -1);
+    return true;
+}
+
+void Control::openFileWithoutSavingTheCurrentDocument(fs::path filepath, bool attachToDocument, int scrollToPage,
+                                                      std::function<void(bool)> callback) {
+    if (filepath.empty()) {
+        this->replaceDocument(createNewDocument(this, fs::path(), std::nullopt), -1);
+        callback(true);
+        return;
+    }
+
+    if (std::error_code err; !fs::exists(filepath, err)) {
+        std::string message =
+                err ? FS(_F("Failed to determine if path exists \"{1}\": {2}") % filepath.u8string() % err.message()) :
+                      FS(_F("That file does not exist:\n\"{1}\"") % filepath.u8string());
+        XojMsgBox::showErrorToUser(getGtkWindow(), message);
+        // We create an empty document to avoid ever being in a "no document" state.
+        this->replaceDocument(createNewDocument(this, fs::path(), std::nullopt), -1);
+        callback(false);
+        return;
+    }
+
+    if (filepath.extension() == ".xopt") {
+        this->openXoptFile(std::move(filepath));
+        callback(true);
+        return;
+    }
+
+    if (Util::hasPngFileExt(filepath)) {
+        callback(this->openPngFile(std::move(filepath), attachToDocument, scrollToPage));
+        return;
+    }
+
+    if (Util::hasPdfFileExt(filepath)) {
+        if (!attachToDocument && this->settings->isAutoloadPdfXoj()) {
+            const std::vector<std::string> exts = {".xopp", ".xoj", ".pdf.xopp", ".pdf.xoj"};
+            fs::path root = filepath;
+            Util::clearExtensions(root, ".pdf");
+            for (const std::string& ext: exts) {
+                fs::path f = root;
+                f += ext;
+                if (fs::exists(f)) {
+                    this->openXoppFile(std::move(f), scrollToPage, std::move(callback));
+                    return;
+                }
+            }
+        }
+        callback(this->openPdfFile(std::move(filepath), attachToDocument, scrollToPage));
+        return;
+    }
+
+    this->openXoppFile(std::move(filepath), scrollToPage, std::move(callback));
+}
+
+void Control::openFile(fs::path filepath, std::function<void(bool)> callback, int scrollToPage, bool forceOpen) {
+    if (filepath.empty() || (!forceOpen && !shouldFileOpen(filepath, getGtkWindow()))) {
+        return;
+    }
+
+    this->close(
+            [ctrl = this, filepath = std::move(filepath), cb = std::move(callback), scrollToPage](bool closed) mutable {
+                if (closed) {
+                    ctrl->openFileWithoutSavingTheCurrentDocument(std::move(filepath), false, scrollToPage,
+                                                                  std::move(cb));
+                }
+            },
+            false, true, forceOpen);
+}
+
+void Control::fileLoaded(int scrollToPage) {
+    this->doc->lock_shared();
+    auto filepath = this->doc->getEvMetadataFilename();
+    this->doc->unlock_shared();
+
+    if (!filepath.empty()) {
+        auto md = MetadataManager::getForFile(filepath);
+        if (md) {
+            if (scrollToPage >= 0) {
+                md->page = scrollToPage;
+            }
+            loadMetadata(*md);
+        }
+        RecentManager::addRecentFileFilename(filepath);
+    } else {
+        zoom->updateZoomFitValue();
+        zoom->setZoomFitMode(true);
+    }
+
+    updateWindowTitle();
+    win->getXournal()->forceUpdatePagenumbers();
+    getCursor()->updateCursor();
+    updatePageActions();
+}
+
+enum class MissingPdfDialogOptions : gint { USE_PROPOSED, SELECT_OTHER, REMOVE, CANCEL };
+
+void Control::promptMissingPdf(Control::MissingPdfData& missingPdf, const fs::path& filepath) {
+    const fs::path missingFilePath = fs::path(missingPdf.missingFileName);
+
+    // create error message
+    std::string parentFolderPath;
+    std::string filename;
+#if defined(WIN32)
+    parentFolderPath = missingFilePath.parent_path().string();
+    filename = missingFilePath.filename().string();
+#else
+    // since POSIX systems detect the whole Windows path as a filename, this checks whether missingFilePath
+    // contains a Windows path
+    std::regex regex(R"([A-Z]:\\(?:.*\\)*(.*))");
+    std::cmatch matchInfo;
+
+    if (std::regex_match(missingFilePath.filename().string().c_str(), matchInfo, regex) && matchInfo[1].matched) {
+        parentFolderPath = missingFilePath.filename().string();
+        filename = matchInfo[1].str();
+    } else {
+        parentFolderPath = missingFilePath.parent_path().string();
+        filename = missingFilePath.filename().string();
+    }
+#endif
+    std::string msg;
+    if (missingPdf.wasPdfAttached) {
+        msg = FS(_F("The attached background file could not be found. It might have been moved, "
+                    "renamed or deleted."));
+    } else {
+        msg = FS(_F("The background file \"{1}\" could not be found. It might have been moved, renamed or "
+                    "deleted.\nIt was last seen at: \"{2}\"") %
+                 filename % parentFolderPath);
+    }
+
+    // try to find file in current directory
+    auto proposedPdfFilepath = filepath.parent_path() / filename;
+    bool proposePdfFile = !missingPdf.wasPdfAttached && !filename.empty() && fs::exists(proposedPdfFilepath) &&
+                          !fs::is_directory(proposedPdfFilepath);
+    if (proposePdfFile) {
+        msg += FS(_F("\nProposed replacement file: \"{1}\"") % proposedPdfFilepath.u8string());
+    }
+
+    // show the dialog
+    std::vector<XojMsgBox::Button> buttons = {
+            {_("Select another PDF"), static_cast<int>(MissingPdfDialogOptions::SELECT_OTHER)},
+            {_("Remove PDF Background"), static_cast<int>(MissingPdfDialogOptions::REMOVE)},
+            {_("Cancel"), static_cast<int>(MissingPdfDialogOptions::CANCEL)}};
+    if (proposePdfFile) {
+        buttons.insert(buttons.begin(),
+                       {_("Use proposed PDF"), static_cast<int>(MissingPdfDialogOptions::USE_PROPOSED)});
+    }
+    XojMsgBox::askQuestion(
+            this->getGtkWindow(), _("Missing PDF background file"), msg, buttons,
+            std::bind(&Control::missingPdfDialogResponseHandler, this, proposedPdfFilepath, std::placeholders::_1));
+}
+
+void Control::missingPdfDialogResponseHandler(fs::path proposedPdfFilepath, int responseId) {
+    switch (static_cast<MissingPdfDialogOptions>(responseId)) {
+        case MissingPdfDialogOptions::USE_PROPOSED:
+            if (!proposedPdfFilepath.empty()) {
+                this->pageBackgroundChangeController->changePdfPagesBackground(proposedPdfFilepath, false);
+            }
+            break;
+        case MissingPdfDialogOptions::SELECT_OTHER:
+            Util::execInUiThread([this]() {
+                xoj::OpenDlg::showAnnotatePdfDialog(getGtkWindow(), settings, [this](fs::path path, bool attachPdf) {
+                    if (!path.empty()) {
+                        this->pageBackgroundChangeController->changePdfPagesBackground(path, attachPdf);
+                    }
+                });
+            });
+            break;
+        case MissingPdfDialogOptions::REMOVE:
+            this->pageBackgroundChangeController->applyBackgroundToAllPages(PageType(PageTypeFormat::Plain));
+            break;
+        default:
+            break;
+    }
+}
+
+class MetadataCallbackData {
+public:
+    Control* ctrl{};
+    MetadataEntry md;
+};
+
+/**
+ * Load the data after processing the document...
+ */
+auto Control::loadMetadataCallback(MetadataCallbackData* data) -> bool {
+    ZoomControl* zoom = data->ctrl->zoom;
+    if (zoom->isZoomPresentationMode()) {
+        data->ctrl->setViewPresentationMode(true);
+    } else if (zoom->isZoomFitMode()) {
+        zoom->updateZoomFitValue();
+        zoom->setZoomFitMode(true);
+    } else {
+        zoom->setZoomFitMode(false);
+        zoom->setZoom(data->md.zoom * zoom->getZoom100Value());
+    }
+    data->ctrl->scrollHandler->scrollToPage(as_unsigned(data->md.page));
+    // Do not call again!
+    return false;
+}
+
+void Control::loadMetadata(MetadataEntry md) {
+    auto* data = new MetadataCallbackData();
+    data->md = std::move(md);
+    data->ctrl = this;
+
+    g_idle_add_full(G_PRIORITY_DEFAULT_IDLE, xoj::util::wrap_v<loadMetadataCallback>, data,
+                    &xoj::util::destroy_cb<MetadataCallbackData>);
+}
+
+void Control::askToAnnotatePdf() {
+    this->close([ctrl = this](bool closed) {
+        if (closed) {
+            xoj::OpenDlg::showAnnotatePdfDialog(ctrl->getGtkWindow(), ctrl->settings,
+                                                [ctrl](fs::path path, bool attachPdf) {
+                                                    if (!path.empty()) {
+                                                        ctrl->openPdfFile(std::move(path), attachPdf, -1);
+                                                    }
+                                                });
+        }
+    });
+}
+
+void Control::print() {
+    this->doc->lock_shared();
+    PrintHandler::print(this->doc, getCurrentPageNo(), this->getGtkWindow());
+    this->doc->unlock_shared();
+}
+
+void Control::block(const string& name) {
+    if (this->isBlocking) {
+        return;
+    }
+
+    // Disable all gui Control, to get full control over the application
+    win->setDynamicallyGeneratedSubmenuDisabled(true);
+    actionDB->disableAll();
+    getCursor()->setCursorBusy(true);
+    disableSidebarTmp(true);
+
+    this->statusbar = this->win->get("statusbar");
+    this->lbState = GTK_LABEL(this->win->get("lbState"));
+    this->pgState = GTK_PROGRESS_BAR(this->win->get("pgState"));
+
+    gtk_label_set_text(this->lbState, name.c_str());
+    gtk_widget_show(this->statusbar);
+
+    this->maxState = 100;
+    this->isBlocking = true;
+}
+
+void Control::unblock() {
+    if (!this->isBlocking) {
+        return;
+    }
+
+    this->win->setDynamicallyGeneratedSubmenuDisabled(false);
+    actionDB->resetEnableStatus();
+    getCursor()->setCursorBusy(false);
+    disableSidebarTmp(false);
+
+    gtk_widget_hide(this->statusbar);
+
+    this->isBlocking = false;
+}
+
+void Control::setMaximumState(size_t max) { this->maxState = max; }
+
+void Control::setCurrentState(size_t state) {
+    Util::execInUiThread([state, this]() {
+        gtk_progress_bar_set_fraction(this->pgState,
+                                      static_cast<gdouble>(state) / static_cast<gdouble>(this->maxState));
+    });
+}
+
+void Control::showFontDialog() {
+    this->actionDB->enableAction(Action::SELECT_FONT, false);  // Only one dialog
+    auto* dlg = gtk_font_chooser_dialog_new(_("Select font"), GTK_WINDOW(this->win->getWindow()));
+    gtk_font_chooser_set_font(GTK_FONT_CHOOSER(dlg), settings->getFont().asString().c_str());
+
+    auto popup = xoj::popup::PopupWindowWrapper<XojMsgBox>(
+            GTK_DIALOG(dlg),
+            [this, dlg](int response) {
+                if (response == GTK_RESPONSE_OK) {
+                    auto font =
+                            xoj::util::OwnedCString::assumeOwnership(gtk_font_chooser_get_font(GTK_FONT_CHOOSER(dlg)));
+                    this->actionDB->fireChangeActionState(Action::FONT, font.get());
+                }
+                this->actionDB->enableAction(Action::SELECT_FONT, true);
+            },
+            XojMsgBox::IMMEDIATE);  // We need IMMEDIATE so accessing GTK_FONT_CHOOSER(dlg) is not UB
+    popup.show(GTK_WINDOW(this->win->getWindow()));
+}
+
+void Control::showColorChooserDialog() {
+    this->actionDB->enableAction(Action::SELECT_COLOR, false);  // Only one dialog
+    auto* dlg = gtk_color_chooser_dialog_new(_("Select color"), GTK_WINDOW(this->win->getWindow()));
+    GdkRGBA c = Util::argb_to_GdkRGBA(toolHandler->getColor());
+    gtk_color_chooser_set_rgba(GTK_COLOR_CHOOSER(dlg), &c);
+    gtk_color_chooser_set_use_alpha(GTK_COLOR_CHOOSER(dlg), false);
+
+    auto popup = xoj::popup::PopupWindowWrapper<XojMsgBox>(
+            GTK_DIALOG(dlg),
+            [this, dlg](int response) {
+                if (response == GTK_RESPONSE_OK) {
+                    GdkRGBA c;
+                    gtk_color_chooser_get_rgba(GTK_COLOR_CHOOSER(dlg), &c);
+                    this->actionDB->fireChangeActionState(Action::TOOL_COLOR, Util::GdkRGBA_to_rgb(c));
+                }
+                this->actionDB->enableAction(Action::SELECT_COLOR, true);
+            },
+            XojMsgBox::IMMEDIATE);  // We need IMMEDIATE so accessing GTK_COLOR_CHOOSER(dlg) is not UB
+    popup.show(GTK_WINDOW(this->win->getWindow()));
+}
+
+void Control::updateWindowTitle() {
+    std::string title{};  ///< Actually a UTF-8 string
+
+    this->doc->lock_shared();
+    const fs::path& refPath = doc->getFilepath().empty() ? doc->getPdfFilepath() : doc->getFilepath();
+    if (refPath.empty()) {
+        title = _("Unsaved Document");
+    } else {
+        if (settings->isPageNumberInTitlebarShown()) {
+            title = "[" + std::to_string(getCurrentPageNo() + 1) + "/" + std::to_string(doc->getPageCount()) + "]  ";
+        }
+        if (undoRedo->isChanged()) {
+            title += "*";
+        }
+
+        if (settings->isFilepathInTitlebarShown()) {
+            title += std::string("[") + char_cast(refPath.parent_path().u8string().c_str()) + "] - ";
+        }
+        title += char_cast(refPath.filename().u8string());
+    }
+    this->doc->unlock_shared();
+
+    title += " - Xournal++";
+
+    gtk_window_set_title(getGtkWindow(), title.c_str());
+}
+
+void Control::exportAsPdf() {
+    this->clearSelectionEndText();
+
+    auto* job = new PdfExportJob(this);
+    job->showFileChooser(
+            [ctrl = this, job]() {
+                ctrl->scheduler->addJob(job, JOB_PRIORITY_NONE);
+                job->unref();
+            },
+            [ctrl = this, job]() {
+                // The job blocked, so we have to unblock, because the job unblocks only after
+                ctrl->unblock();
+                job->unref();
+            });
+}
+
+void Control::exportAs() {
+    this->clearSelectionEndText();
+    auto* job = new CustomExportJob(this);
+    job->showDialogAndRun();
+}
+
+void Control::save(std::function<void(bool)> callback) { saveImpl(false, std::move(callback)); }
+
+void Control::saveAs(std::function<void(bool)> callback) { saveImpl(true, std::move(callback)); }
+
+void Control::saveImpl(bool saveAs, std::function<void(bool)> callback) {
+    // clear selection before saving
+    clearSelectionEndText();
+
+    this->doc->lock_shared();
+    fs::path filepath = this->doc->getFilepath();
+    this->doc->unlock_shared();
+
+    auto doSave = [ctrl = this, cb = std::move(callback)]() {
+        // clear selection before saving
+        ctrl->clearSelectionEndText();
+
+        auto* job = new SaveJob(ctrl, std::move(cb));
+        ctrl->scheduler->addJob(job, JOB_PRIORITY_URGENT);
+        job->unref();
+    };
+
+    if (saveAs || filepath.empty()) {
+        // No need to backup the old saved file, as there is none
+        this->doc->lock_shared();
+        this->doc->setCreateBackupOnSave(false);
+        auto suggestedPath = this->doc->createSaveFoldername(this->settings->getLastSavePath());
+        suggestedPath /= this->doc->createSaveFilename(Document::XOPP, this->settings->getDefaultSaveName());
+        this->doc->unlock_shared();
+        xoj::SaveExportDialog::showSaveFileDialog(getGtkWindow(), settings, std::move(suggestedPath),
+                                                  [doSave = std::move(doSave), ctrl = this](std::optional<fs::path> p) {
+                                                      if (p && !p->empty()) {
+                                                          ctrl->settings->setLastSavePath(p->parent_path());
+                                                          ctrl->doc->lock();
+                                                          ctrl->doc->setFilepath(std::move(p.value()));
+                                                          ctrl->doc->unlock();
+                                                          doSave();
+                                                      }
+                                                  });
+    } else {
+        doSave();
+    }
+}
+
+void Control::resetSavedStatus() {
+    this->doc->lock_shared();
+    auto filepath = this->doc->getFilepath();
+    this->doc->unlock_shared();
+
+    this->undoRedo->documentSaved();
+    RecentManager::addRecentFileFilename(filepath);
+    this->updateWindowTitle();
+}
+
+void Control::quit(bool allowCancel) {
+    g_message("Quitting");
+    auto afterClosed = [this, allowCancel](bool closed) {
+        if (!closed) {
+            g_message("Closing document failed or cancelled");
+            if (!allowCancel) {
+                // Cancel is not allowed, and the user close or did not save
+                // This is probably called from macOS, where the Application
+                // now will be killed - therefore do an emergency save.
+                emergencySave();
+            }
+        } else {
+#ifdef ENABLE_AUDIO
+            if (audioController) {
+                audioController->stopRecording();
+            }
+#endif
+            this->scheduler->lock();
+            this->scheduler->removeAllJobs();
+            this->scheduler->unlock();
+            this->scheduler->stop();  // Finish current task. Must be called to finish pending saves.
+            this->closeDocument();    // Must be done after all jobs has finished (Segfault on save/export)
+            settings->save();
+            g_application_quit(G_APPLICATION(gtkApp));
+        }
+    };
+
+    this->close(std::move(afterClosed), true, allowCancel);
+}
+
+void Control::close(std::function<void(bool)> callback, const bool allowDestroy, const bool allowCancel,
+                    const bool forceClose) {
+    clearSelectionEndText();
+
+    doc->lock_shared();
+    auto const& file = doc->getEvMetadataFilename();
+    doc->unlock_shared();
+    metadata->storeMetadata(file, static_cast<int>(getCurrentPageNo()), zoom->getZoomReal());
+    metadata->documentChanged();
+
+    resetGeometryTool();
+
+    bool safeToClose = forceClose || !undoRedo->isChanged();
+    if (!safeToClose) {
+        fs::path path = doc->getFilepath();
+        const bool fileRemoved = !path.empty() && !fs::exists(path);
+        const auto message = fileRemoved ? _("Document file was removed.") : _("This document is not saved yet.");
+        const bool saveAs = fileRemoved || path.empty();
+        const auto saveLabel = saveAs ? _("Save As...") : _("Save");
+
+        enum { SAVE = 1, DISCARD, CANCEL };
+        std::vector<XojMsgBox::Button> buttons = {{saveLabel, SAVE}, {_("Discard"), DISCARD}};
+        if (allowCancel) {
+            buttons.emplace_back(_("Cancel"), CANCEL);
+        }
+        XojMsgBox::askQuestion(getGtkWindow(), message, std::string(), std::move(buttons),
+                               [ctrl = this, saveAs, allowDestroy, callback = std::move(callback)](int response) {
+                                   auto execAfter = [allowDestroy, ctrl, cb = std::move(callback)](bool saved) {
+                                       if (saved && allowDestroy) {
+                                           ctrl->closeDocument();
+                                       }
+                                       cb(saved);
+                                   };
+                                   if (response == SAVE) {
+                                       ctrl->saveImpl(saveAs, std::move(execAfter));
+                                       return;
+                                   }
+                                   bool safeToClose = response == DISCARD;
+                                   execAfter(safeToClose);
+                               });
+    } else {
+        if (allowDestroy) {
+            this->closeDocument();
+        }
+        callback(true);
+    }
+}
+
+void Control::closeDocument() {
+    this->undoRedo->clearContents();
+
+    this->doc->lock();
+    // FIXME: there could potentially be a data race if a job requires the old document but runs after it is closed
+    this->doc->clearDocument(true);
+    this->doc->unlock();
+
+    this->undoRedoChanged();
+}
+
+void Control::initButtonTool() {
+    std::vector<Button> buttons{Button::BUTTON_ERASER,     Button::BUTTON_STYLUS_ONE,   Button::BUTTON_STYLUS_TWO,
+                                Button::BUTTON_MOUSE_LEFT, Button::BUTTON_MOUSE_MIDDLE, Button::BUTTON_MOUSE_RIGHT,
+                                Button::BUTTON_TOUCH};
+    ButtonConfig* cfg;
+    for (auto b: buttons) {
+        cfg = settings->getButtonConfig(b);
+        cfg->initButton(this->toolHandler, b);
+    }
+}
+
+void Control::showAbout() {
+    auto popup = xoj::popup::PopupWindowWrapper<xoj::popup::AboutDialog>(this->gladeSearchPath);
+    popup.show(GTK_WINDOW(this->win->getWindow()));
+}
+
+static void onGtkDemoShown(GObject* proc_object, GAsyncResult* res, gpointer) {
+    gboolean success = g_subprocess_wait_finish(G_SUBPROCESS(proc_object), res, NULL);
+
+    if (success) {
+        g_message("Gtk demo run successfully!\n");
+    } else {
+        g_message("Something went wrong running the Gtk demo!\n");
+    }
+}
+
+void Control::showGtkDemo() {
+    std::string binary = "gtk3-demo";
+#ifdef __APPLE__
+    if (!xoj::util::OwnedCString::assumeOwnership(g_find_program_in_path(binary.c_str()))) {
+        // Try absolute path for binary
+        auto path = Util::getExePath() / binary;
+
+        binary = Util::toGFilename(path).c_str();
+    }
+#endif
+    gchar* prog = g_find_program_in_path(binary.c_str());
+    if (!prog) {
+        XojMsgBox::showErrorToUser(getGtkWindow(), "gtk3-demo was not found in path");
+        return;
+    }
+    GError* err = nullptr;
+    GSubprocess* process = g_subprocess_new(G_SUBPROCESS_FLAGS_NONE, &err, prog, nullptr);
+    g_free(prog);
+
+    if (err != nullptr) {
+        std::string message =
+                FS(_F("Creating Gtk demo subprocess failed: {1} (exit code: {2})") % err->message % err->code);
+        XojMsgBox::showErrorToUser(getGtkWindow(), message);
+        g_error_free(err);
+    }
+
+    g_subprocess_wait_async(process, nullptr, reinterpret_cast<GAsyncReadyCallback>(onGtkDemoShown), nullptr);
+}
+
+auto Control::loadViewMode(ViewModeId mode) -> bool {
+    if (!settings->loadViewMode(mode)) {
+        return false;
+    }
+    this->win->setMenubarVisible(settings->isMenubarVisible());
+    this->win->setToolbarVisible(settings->isToolbarVisible());
+    this->win->setSidebarVisible(settings->isSidebarVisible());
+    setFullscreen(settings->isFullscreen());
+    return false;
+}
+
+void Control::clipboardCutCopyEnabled(bool enabled) {
+    this->actionDB->enableAction(Action::CUT, enabled);
+    this->actionDB->enableAction(Action::COPY, enabled);
+}
+
+void Control::clipboardPasteEnabled(bool enabled) { this->actionDB->enableAction(Action::PASTE, enabled); }
+
+void Control::clipboardPasteText(string text) {
+    auto t = std::make_unique<Text>();
+    t->setText(std::move(text));
+    t->setFont(settings->getFont());
+    t->setColor(toolHandler->getTool(TOOL_TEXT).getColor());
+
+    clipboardPaste(std::move(t));
+}
+
+void Control::clipboardPasteImage(GdkPixbuf* img) {
+    auto image = std::make_unique<Image>();
+    xoj::util::GObjectSPtr<GdkPixbuf> pixbuf(gdk_pixbuf_apply_embedded_orientation(img), xoj::util::adopt);
+
+    image->setImage(pixbuf.get());
+
+    auto zoom100 = this->getZoomControl()->getZoom100Value();
+
+    auto width = static_cast<double>(gdk_pixbuf_get_width(pixbuf.get())) / zoom100;
+    auto height = static_cast<double>(gdk_pixbuf_get_height(pixbuf.get())) / zoom100;
+
+    auto pageNr = getCurrentPageNo();
+    if (pageNr == npos) {
+        return;
+    }
+
+    this->doc->lock_shared();
+    PageRef page = this->doc->getPage(pageNr);
+    auto pageWidth = page->getWidth();
+    auto pageHeight = page->getHeight();
+    page.reset();  // No need to hold a ref to the page anymore
+    this->doc->unlock_shared();
+
+    // Size: 3/4 of the page size
+    pageWidth = pageWidth * 3.0 / 4.0;
+    pageHeight = pageHeight * 3.0 / 4.0;
+
+    auto scaledWidth = width;
+    auto scaledHeight = height;
+
+    if (width > pageWidth) {
+        scaledWidth = pageWidth;
+        scaledHeight = (scaledWidth * height) / width;
+    }
+
+    if (scaledHeight > pageHeight) {
+        scaledHeight = pageHeight;
+        scaledWidth = (scaledHeight * width) / height;
+    }
+
+    image->setWidth(scaledWidth);
+    image->setHeight(scaledHeight);
+
+    clipboardPaste(std::move(image));
+}
+
+void Control::clipboardPaste(ElementPtr e) {
+    double x = 0;
+    double y = 0;
+    auto pageNr = getCurrentPageNo();
+    if (pageNr == npos) {
+        return;
+    }
+
+    XojPageView* view = win->getXournal()->getViewFor(pageNr);
+    if (view == nullptr) {
+        return;
+    }
+
+    this->doc->lock_shared();
+    PageRef page = this->doc->getPage(pageNr);
+    Layer* layer = page->getSelectedLayer();
+    this->doc->unlock_shared();
+
+    win->getXournal()->getPasteTarget(x, y);
+
+    double width = e->getElementWidth();
+    double height = e->getElementHeight();
+
+    x = std::max(0.0, x - width / 2);
+    y = std::max(0.0, y - height / 2);
+
+    e->setX(x);
+    e->setY(y);
+
+    undoRedo->addUndoAction(std::make_unique<InsertUndoAction>(page, layer, e.get()));
+    auto sel = SelectionFactory::createFromFloatingElement(this, page, layer, view, std::move(e));
+
+    win->getXournal()->setSelection(sel.release());
+}
+
+void Control::registerPluginToolButtons(ToolMenuHandler* toolMenuHandler) {
+    pluginController->registerToolButtons(toolMenuHandler);
+}
+
+void Control::clipboardPasteXournal(ObjectInputStream& in) {
+    auto pNr = getCurrentPageNo();
+    if (pNr == npos && win != nullptr) {
+        return;
+    }
+
+    this->doc->lock();
+    PageRef page = this->doc->getPage(pNr);
+    Layer* layer = page->getSelectedLayer();
+
+    XojPageView* view = win->getXournal()->getViewFor(pNr);
+
+    if (!view || !page) {
+        this->doc->unlock();
+        return;
+    }
+
+    auto selection = std::make_unique<EditSelection>(this, page, page->getSelectedLayer(), view);
+    this->doc->unlock();
+
+    try {
+        ElementPtr element;
+        std::string version = in.readString();
+        if (version != PROJECT_STRING) {
+            g_warning("Paste from Xournal Version %s to Xournal Version %s", version.c_str(), PROJECT_STRING);
+        }
+
+        selection->readSerialized(in);
+
+        // document lock not needed anymore, because we don't change the document, we only change the selection
+
+        int count = in.readInt();
+        auto pasteAddUndoAction = std::make_unique<AddUndoAction>(page, false);
+        // this will undo a group of elements that are inserted
+
+        for (int i = 0; i < count; i++) {
+            std::string name = in.getNextObjectName();
+            element.reset();
+
+            if (name == "Stroke") {
+                element = std::make_unique<Stroke>();
+            } else if (name == "Image") {
+                element = std::make_unique<Image>();
+            } else if (name == "TexImage") {
+                element = std::make_unique<TexImage>();
+            } else if (name == "Text") {
+                element = std::make_unique<Text>();
+            } else {
+                throw InputStreamException(FS(FORMAT_STR("Get unknown object {1}") % name), __FILE__, __LINE__);
+            }
+
+            element->readSerialized(in);
+
+            pasteAddUndoAction->addElement(layer, element.get(), layer->indexOf(element.get()));
+            // Todo: unique_ptr
+            selection->addElement(std::move(element), std::numeric_limits<Element::Index>::max());
+        }
+        undoRedo->addUndoAction(std::move(pasteAddUndoAction));
+
+        double x = 0;
+        double y = 0;
+        // calculate x/y of paste target, see clipboardPaste(Element* e)
+        win->getXournal()->getPasteTarget(x, y);
+
+        x = std::max(0.0, x - selection->getWidth() / 2);
+        y = std::max(0.0, y - selection->getHeight() / 2);
+
+        // calculate difference between current selection position and destination
+        auto dx = x - selection->getXOnView();
+        auto dy = y - selection->getYOnView();
+
+        selection->moveSelection(dx, dy);
+        // update all Elements (same procedure as moving a element selection by hand and releasing the mouse button)
+        selection->mouseUp();
+
+        win->getXournal()->setSelection(selection.release());
+    } catch (const std::exception& e) {
+        g_warning("could not paste, Exception occurred: %s", e.what());
+        Stacktrace::printStacktrace();
+    }
+}
+
+void Control::moveSelectionToLayer(size_t layerNo) {
+    PageRef currentP = getCurrentPage();
+    if (layerNo >= currentP->getLayerCount()) {
+        return;
+    }
+    auto selection = getWindow()->getXournal()->getSelection();
+    if (!selection) {
+        return;
+    }
+
+    auto* oldLayer = currentP->getSelectedLayer();
+    auto* newLayer = currentP->getLayers().at(layerNo);
+    auto moveSelUndo = std::make_unique<MoveSelectionToLayerUndoAction>(currentP, getLayerController(), oldLayer,
+                                                                        currentP->getSelectedLayerId() - 1, layerNo);
+    for (const auto* e: selection->getElementsView()) {
+        moveSelUndo->addElement(newLayer, e, newLayer->indexOf(e));
+    }
+    undoRedo->addUndoAction(std::move(moveSelUndo));
+
+    getLayerController()->switchToLay(layerNo + 1, /*hideShow=*/false, /*clearSelection=*/false);
+}
+
+void Control::deleteSelection() {
+    if (win) {
+        win->getXournal()->deleteSelection();
+    }
+}
+
+void Control::clearSelection() {
+    if (this->win) {
+        this->win->getXournal()->clearSelection();
+        this->win->getPdfToolbox()->userCancelSelection();
+    }
+}
+
+void Control::setClipboardHandlerSelection(EditSelection* selection) {
+    if (this->clipboardHandler) {
+        this->clipboardHandler->setSelection(selection);
+    }
+}
+
+void Control::addChangedDocumentListener(DocumentListener* dl) { this->changedDocumentListeners.push_back(dl); }
+
+void Control::removeChangedDocumentListener(DocumentListener* dl) { this->changedDocumentListeners.remove(dl); }
+
+void Control::setCopyCutEnabled(bool enabled) { this->clipboardHandler->setCopyCutEnabled(enabled); }
+
+void Control::setFill(bool fill) {
+    EditSelection* sel = nullptr;
+    if (this->win) {
+        sel = this->win->getXournal()->getSelection();
+    }
+
+    if (sel) {
+        undoRedo->addUndoAction(UndoActionPtr(
+                sel->setFill(fill ? toolHandler->getPenFill() : -1, fill ? toolHandler->getHighlighterFill() : -1)));
+    }
+    toolHandler->setFillEnabled(fill);
+}
+
+void Control::setLineStyle(const string& style) {
+    LineStyle stl = StrokeStyle::parseStyle(style);
+
+    if (this->win && this->win->getXournal()->getSelection()) {
+        undoRedo->addUndoAction(this->win->getXournal()->getSelection()->setLineStyle(stl));
+    } else if (this->toolHandler->getActiveTool()->getToolType() != TOOL_PEN) {
+        this->selectTool(TOOL_PEN);
+    }
+    this->toolHandler->setLineStyle(stl);
+}
+
+void Control::setEraserType(EraserType type) {
+    if (type != ERASER_TYPE_NONE) {
+        if (this->toolHandler->getActiveTool()->getToolType() != TOOL_ERASER) {
+            this->selectTool(TOOL_ERASER);
+        }
+    }
+    this->toolHandler->setEraserType(type);
+}
+
+void Control::setToolSize(ToolSize size) {
+    EditSelection* sel = nullptr;
+    if (this->win) {
+        sel = this->win->getXournal()->getSelection();
+    }
+
+    if (sel) {
+        undoRedo->addUndoAction(UndoActionPtr(sel->setSize(size, toolHandler->getToolThickness(TOOL_PEN),
+                                                           toolHandler->getToolThickness(TOOL_HIGHLIGHTER),
+                                                           toolHandler->getToolThickness(TOOL_ERASER))));
+    }
+    this->toolHandler->setSize(size);
+}
+
+void Control::fontChanged(const XojFont& font) {
+    settings->setFont(font);
+
+    if (this->win) {
+        if (EditSelection* sel = this->win->getXournal()->getSelection(); sel) {
+            undoRedo->addUndoAction(UndoActionPtr(sel->setFont(font)));
+        }
+    }
+
+    if (TextEditor* editor = getTextEditor(); editor) {
+        editor->setFont(font);
+    }
+}
+
+/**
+ * The core handler for inserting latex
+ */
+void Control::runLatex() {
+    /*
+     * LatexController::run() will open a non-blocking dialog.
+     */
+    LatexController::run(this);
+}
+
+/**
+ * GETTER / SETTER
+ */
+
+auto Control::getUndoRedoHandler() const -> UndoRedoHandler* { return this->undoRedo; }
+
+auto Control::getZoomControl() const -> ZoomControl* { return this->zoom; }
+
+auto Control::getCursor() const -> XournalppCursor* { return this->cursor; }
+
+auto Control::getDocument() const -> Document* { return this->doc; }
+
+auto Control::getToolHandler() const -> ToolHandler* { return this->toolHandler; }
+
+auto Control::getScheduler() const -> XournalScheduler* { return this->scheduler; }
+
+auto Control::getWindow() const -> MainWindow* { return this->win; }
+
+auto Control::getGtkWindow() const -> GtkWindow* { return GTK_WINDOW(this->win->getWindow()); }
+
+void Control::setRotationSnapping(bool enable) {
+    settings->setSnapRotation(enable);
+    this->actionDB->setActionState(Action::ROTATION_SNAPPING, enable);
+}
+
+void Control::setGridSnapping(bool enable) {
+    settings->setSnapGrid(enable);
+    this->actionDB->setActionState(Action::GRID_SNAPPING, enable);
+}
+
+auto Control::getTextEditor() -> TextEditor* {
+    if (this->win) {
+        return this->win->getXournal()->getTextEditor();
+    }
+    return nullptr;
+}
+
+auto Control::getGladeSearchPath() const -> GladeSearchpath* { return this->gladeSearchPath; }
+
+auto Control::getSettings() const -> Settings* { return settings; }
+
+auto Control::getScrollHandler() const -> ScrollHandler* { return this->scrollHandler; }
+
+auto Control::getMetadataManager() const -> MetadataManager* { return this->metadata; }
+
+auto Control::getSidebar() const -> Sidebar* { return this->sidebar; }
+
+auto Control::getSearchBar() const -> SearchBar* { return this->searchBar; }
+
+auto Control::getAudioController() const -> AudioController* { return this->audioController.get(); }
+
+auto Control::getPageTypes() const -> PageTypeHandler* { return this->pageTypes; }
+
+auto Control::getPageBackgroundChangeController() const -> PageBackgroundChangeController* {
+    return this->pageBackgroundChangeController.get();
+}
+
+auto Control::getLayerController() const -> LayerController* { return this->layerController; }
+
+auto Control::getPluginController() const -> PluginController* { return this->pluginController; }
+
+auto Control::getPalette() const -> const Palette& { return *(this->palette); }
+
+auto Control::loadPaletteFromSettings() -> void {
+    const auto palettePath = this->settings->getColorPaletteSetting();
+    if (palettePath.empty()) {
+        this->palette->load_default();
+        return;
+    }
+
+    auto newPalette = std::make_unique<Palette>(palettePath);
+    this->palette = std::move(newPalette);
+
+    // If file does not exist there is no need to attempt parsing it
+    if (!fs::exists(this->palette->getFilePath())) {
+        this->palette->load_default();
+        return;
+    }
+
+    try {
+        this->palette->load();
+    } catch (const std::exception& e) {
+        this->palette->parseErrorDialog(e);
+        this->palette->load_default();
+    }
+}
diff --git a/entry/src/main/cpp/src/core/control/Control.h b/entry/src/main/cpp/src/core/control/Control.h
new file mode 100644
index 0000000..e67e864
--- /dev/null
+++ b/entry/src/main/cpp/src/core/control/Control.h
@@ -0,0 +1,569 @@
+/*
+ * Xournal++
+ *
+ * The main Control
+ *
+ * @author Xournal++ Team
+ * https://github.com/xournalpp/xournalpp
+ *
+ * @license GNU GPLv2 or later
+ */
+
+#pragma once
+
+#include <cstddef>   // for size_t
+#include <memory>    // for unique_ptr
+#include <optional>  // for optional
+#include <string>    // for string, allocator
+#include <vector>    // for vector
+
+#include <gdk-pixbuf/gdk-pixbuf.h>  // for GdkPixbuf
+#include <gio/gio.h>                // for GApplication
+#include <glib.h>                   // for guint
+#include <gtk/gtk.h>                // for GtkLabel
+
+#include "control/ToolEnums.h"                      // for ToolSize, ToolType
+#include "control/jobs/ProgressListener.h"          // for ProgressListener
+#include "control/settings/ViewModes.h"             // for ViewModeId
+#include "control/tools/EditSelection.h"            // for OrderChange
+#include "enums/Action.enum.h"                      // for Action
+#include "gui/toolbarMenubar/model/ColorPalette.h"  // for ColorPalette
+#include "model/DocumentHandler.h"                  // for DocumentHandler
+#include "model/DocumentListener.h"                 // for DocumentListener
+#include "model/GeometryTool.h"                     // for GeometryTool
+#include "model/PageRef.h"                          // for PageRef
+#include "undo/UndoRedoHandler.h"                   // for UndoRedoHandler (ptr only)
+
+#include "ClipboardHandler.h"  // for ClipboardListener
+#include "ToolHandler.h"       // for ToolListener
+#include "filesystem.h"        // for path
+
+class LoadHandler;
+class GeometryToolController;
+class AudioController;
+class FullscreenHandler;
+class Sidebar;
+class GladeSearchpath;
+class MetadataManager;
+class XournalppCursor;
+class ToolbarDragDropHandler;
+class MetadataEntry;
+class MetadataCallbackData;
+class PageBackgroundChangeController;
+class PageTypeHandler;
+class BaseExportJob;
+class LayerController;
+class PluginController;
+class Document;
+class EditSelection;
+class Element;
+class MainWindow;
+class ObjectInputStream;
+class ScrollHandler;
+class SearchBar;
+class Settings;
+class TextEditor;
+class XournalScheduler;
+class ZoomControl;
+class ToolMenuHandler;
+class XojFont;
+class XojPdfRectangle;
+class Callback;
+class ActionDatabase;
+
+class Control:
+        public ToolListener,
+        public DocumentHandler,
+        public UndoRedoListener,
+        public ClipboardListener,
+        public ProgressListener {
+public:
+    Control(GApplication* gtkApp, GladeSearchpath* gladeSearchPath, bool disableAudio);
+    Control(Control const&) = delete;
+    Control(Control&&) = delete;
+    auto operator=(Control const&) -> Control& = delete;
+    auto operator=(Control&&) -> Control& = delete;
+    ~Control() override;
+
+    void initWindow(MainWindow* win);
+
+public:
+    /// Asymchronously closes the current document and replaces it by a new file
+    void newFile(fs::path filepath = {});
+
+    /// @brief Shows an open file dialog and opens the selected file after closing the previously opened file
+    void askToOpenFile();
+    /**
+     * @brief Asynchronously opens the provided path, safely closes the current opened document and replaces it with the
+     * newly parsed file. Calls callback afterwards, with boolean parameter true on success. Does nothing to this->doc
+     * in case of failure at any point.
+     */
+    void openFile(
+            fs::path filepath, std::function<void(bool)> callback = [](bool) {}, int scrollToPage = -1,
+            bool forceOpen = false);
+    /// Shows an open file dialog and opens the selected file
+    void askToAnnotatePdf();
+
+    /**
+     * (Potentially asynchronously) Opens the given file without saving any previously opened Document. Calls callback
+     * afterwards, with boolean parameter true if success. WARNING: may lead to data loss if the current Document has
+     * not been saved yet.
+     */
+    void openFileWithoutSavingTheCurrentDocument(fs::path filepath, bool attachToDocument, int scrollToPage,
+                                                 std::function<void(bool)> callback);
+
+    void print();
+    void exportAsPdf();
+    void exportAs();
+    void quit(bool allowCancel = true);
+
+    /**
+     * @brief Asynchronously saves the document and calls callback afterwards with boolean parameter true on success.
+     * May ask the user for a place to save if necessary.
+     */
+    void save(std::function<void(bool)> callback = [](bool) {});
+    /**
+     * @brief Asks the user for a new location, asynchronously saves the document there and calls callback afterwards.
+     */
+    void saveAs(std::function<void(bool)> callback = [](bool) {});
+
+    /**
+     * Marks the current document as saved if it is currently marked as unsaved.
+     */
+    void resetSavedStatus();
+
+    /**
+     * Close the current document, prompting to save unsaved changes.
+     *
+     * @param callback Called after trying to close the document, with param true in case of success, false otherwise.
+     * @param allowDestroy Whether clicking "Discard" should destroy the current document.
+     * @param allowCancel Whether the user should be able to cancel closing the document.
+     * @param forceClose Whether to skip the save dialog and unconditionally discard unsaved changes.
+     * @return true if the user closed the document, otherwise false.
+     */
+    void close(std::function<void(bool)> callback, bool allowDestroy = false, bool allowCancel = true,
+               bool forceClose = false);
+
+    // Menu edit
+    void showSettings();
+
+    // The core handler for inserting latex
+    void runLatex();
+
+    // Menu Help
+    void showAbout();
+    void showGtkDemo();
+
+    /**
+     * @brief Update the Cursor and the Toolbar based on the active color
+     *
+     */
+    void toolColorChanged() override;
+    /**
+     * @brief Change the color of the current selection based on the active Tool
+     *
+     */
+    void changeColorOfSelection() override;
+    void toolChanged() override;
+    void toolSizeChanged() override;
+    void toolFillChanged() override;
+    void toolLineStyleChanged() override;
+
+    void selectTool(ToolType type);
+    void selectDefaultTool();
+
+    void setFontSelected(const XojFont& font);  ///< Modifies the Action state without triggering callbacks
+    void fontChanged(const XojFont& font);      ///< Set the font after the user selected a font
+
+    void updatePageNumbers(size_t page, size_t pdfPage);
+
+    /**
+     * Save current state (selected tool etc.)
+     */
+    void saveSettings();
+
+    void updateWindowTitle();
+    void setViewPairedPages(bool enabled);
+    void setViewFullscreenMode(bool enabled);
+    void setViewPresentationMode(bool enabled);
+    void setPairsOffset(int numOffset);
+    void setViewColumns(int numColumns);
+    void setViewRows(int numRows);
+    void setViewLayoutVert(bool vert);
+    void setViewLayoutR2L(bool r2l);
+    void setViewLayoutB2T(bool b2t);
+
+    void manageToolbars();
+    void customizeToolbars();
+    void setFullscreen(bool enabled);
+    void setShowSidebar(bool enabled);
+    void setShowToolbar(bool enabled);
+    void setShowMenubar(bool enabled);
+
+    void gotoPage();
+
+    void setToolDrawingType(DrawingType type);
+
+    void paperTemplate();
+    void paperFormat();
+    void changePageBackgroundColor();
+    void updateBackgroundSizeButton();
+
+    /**
+     * Loads the view mode (hide/show menu-,tool-&sidebar)
+     */
+    bool loadViewMode(ViewModeId mode);
+
+    /**
+     * @brief Search text on the given page. The matches (if any) are stored in the XojPageView::SearchControl instance.
+     * @param occurrences If not nullptr, the pointed variable will contain the number of matches on the page
+     * @param matchRect If not nullptr, will contain the topleft point of the first match on the page
+     *                          (Used for scrolling to the first match)
+     * @return true if at least one match was found
+     */
+    bool searchTextOnPage(const std::string& text, size_t pageNumber, size_t index, size_t* occurrences,
+                          XojPdfRectangle* matchRect);
+
+    /**
+     * Fire page selected, but first check if the page Number is valid
+     *
+     * @return the page ID or size_t_npos if the page is not found
+     */
+    size_t firePageSelected(const PageRef& page);
+    void firePageSelected(size_t page);
+
+    void addDefaultPage(const std::optional<std::string>& pageTemplate, Document* doc = nullptr);
+    void duplicatePage();
+    void insertNewPage(size_t position, bool automatedInsertion = false);
+    void appendNewPdfPages();
+    void insertPage(const PageRef& page, size_t position, bool shouldScrollToPage = true);
+    void deletePage();
+    void movePageTowardsBeginning();
+    void movePageTowardsEnd();
+
+    /**
+     * Ask the user whether a page with the given id
+     * should be added to the document.
+     */
+    void askInsertPdfPage(size_t pdfPage);
+
+    /**
+     * Disable / enable page action buttons
+     */
+    void updatePageActions();
+
+    // selection handling
+    void clearSelection();
+
+    void moveSelectionToLayer(size_t layerNo);
+
+    void setCopyCutEnabled(bool enabled);
+
+    void enableAutosave(bool enable);
+
+    void clearSelectionEndText();
+
+    void selectAllOnPage();
+
+    void reorderSelection(EditSelection::OrderChange change);
+
+    void setToolSize(ToolSize size);
+
+    /**
+     * Change the line style of the PEN if select, or of selected elements if any
+     * Otherwise, select the PEN tool and set its linestyle
+     */
+    void setLineStyle(const std::string& style);
+
+    /**
+     * Change the eraser type. If the eraser is not selected, select it as well.
+     */
+    void setEraserType(EraserType type);
+
+    void setFill(bool fill);
+
+    TextEditor* getTextEditor();
+
+    GladeSearchpath* getGladeSearchPath() const;
+
+    void disableSidebarTmp(bool disabled);
+
+    XournalScheduler* getScheduler() const;
+
+    void block(const std::string& name);
+    void unblock();
+
+    void setLastAutosaveFile(fs::path newAutosaveFile);
+    void deleteLastAutosaveFile();
+    void setClipboardHandlerSelection(EditSelection* selection);
+
+    void addChangedDocumentListener(DocumentListener* dl);
+    void removeChangedDocumentListener(DocumentListener* dl);
+
+    MetadataManager* getMetadataManager() const;
+    Settings* getSettings() const;
+    ToolHandler* getToolHandler() const;
+    ZoomControl* getZoomControl() const;
+    Document* getDocument() const;
+    UndoRedoHandler* getUndoRedoHandler() const;
+    MainWindow* getWindow() const;
+    GtkWindow* getGtkWindow() const;
+    ScrollHandler* getScrollHandler() const;
+    PageRef getCurrentPage();
+    size_t getCurrentPageNo() const;
+    XournalppCursor* getCursor() const;
+    Sidebar* getSidebar() const;
+    SearchBar* getSearchBar() const;
+    AudioController* getAudioController() const;
+    PageTypeHandler* getPageTypes() const;
+    PageBackgroundChangeController* getPageBackgroundChangeController() const;
+    LayerController* getLayerController() const;
+    PluginController* getPluginController() const;
+    const Palette& getPalette() const;
+
+    /**
+     * Show floating toolbox at specified coordinates
+     * @param x x coordinate relative to main window
+     * @param y y coordinate relative to main window
+     */
+    void showFloatingToolbox(int x, int y);
+
+    bool copy();
+    bool cut();
+    bool paste();
+
+    void help();
+
+    void selectAlpha(OpacityFeature feature);
+
+    /**
+     * @brief Initialize the all button tools based on the respective ButtonConfigs
+     *
+     */
+    void initButtonTool();
+
+
+public:
+    // UndoRedoListener interface
+    void undoRedoChanged() override;
+    void undoRedoPageChanged(PageRef page) override;
+
+public:
+    // ProgressListener interface
+    void setMaximumState(size_t max) override;
+    void setCurrentState(size_t state) override;
+
+public:
+    // ClipboardListener interface
+    void clipboardCutCopyEnabled(bool enabled) override;
+    void clipboardPasteEnabled(bool enabled) override;
+    void clipboardPasteText(std::string text) override;
+    void clipboardPasteImage(GdkPixbuf* img) override;
+    void clipboardPasteXournal(ObjectInputStream& in) override;
+    void deleteSelection() override;
+
+    void clipboardPaste(ElementPtr e);
+
+public:
+    void registerPluginToolButtons(ToolMenuHandler* toolMenuHandler);
+    inline ActionDatabase* getActionDatabase() const { return actionDB.get(); }
+    void loadPaletteFromSettings();
+
+protected:
+    void setRotationSnapping(bool enable);
+    void setGridSnapping(bool enable);
+
+    void showFontDialog();
+    void showColorChooserDialog();
+
+    void fileLoaded(int scrollToPage = -1);
+
+    void eraserSizeChanged();
+    void penSizeChanged();
+    void highlighterSizeChanged();
+
+    static bool checkChangedDocument(Control* control);
+    static bool autosaveCallback(Control* control);
+
+    /**
+     * Load metadata later, md will be deleted
+     */
+    void loadMetadata(MetadataEntry md);
+
+    static bool loadMetadataCallback(MetadataCallbackData* data);
+
+    void saveImpl(bool saveAs, std::function<void(bool)> callback);
+
+private:
+    /**
+     * @brief Creates the specified geometric tool if it's not on the current page yet. Deletes it if it already exists.
+     * @return true if a geometric tool was created
+     */
+    template <class ToolClass, class ViewClass, class ControllerClass, class InputHandlerClass,
+              GeometryToolType toolType>
+    bool toggleGeometryTool();
+    void resetGeometryTool();
+
+    /**
+     * @brief Creates a compass if it's not on the current page yet. Deletes it if it already exists.
+     * @return true if a compass was created
+     */
+    bool toggleCompass();
+    /**
+     * @brief Creates a setsquare if it's not on the current page yet. Deletes it if it already exists.
+     * @return true if a setsquare was created
+     */
+    bool toggleSetsquare();
+
+    struct MissingPdfData;
+    /**
+     * Prompt the user that the PDF background is missing and offer solution options
+     */
+    void promptMissingPdf(MissingPdfData& missingPdf, const fs::path& filepath);
+
+    /**
+     * Handle the response from the missing PDF dialog
+     */
+    void missingPdfDialogResponseHandler(fs::path proposedPdfFilepath, int responseId);
+
+    /**
+     * "Closes" the document, preparing the editor for a new document.
+     */
+    void closeDocument();
+
+    /**
+     * Forcibly replaces the opened document.
+     * WARNING: Be sure the active document has been saved (or discarded) before calling replaceDocument()
+     */
+    void replaceDocument(std::unique_ptr<Document> doc, int scrollToPage);
+
+    /**
+     * Asynchronously opens the provided path and parse it as a .xopp or .xoj file. Then forcibly replaces the currently
+     * opened document with the new one. Asks the user in case of doubts (e.g. wrong file version) and aborts if the
+     * document was not correctly and entirely parsed. Calls callback afterwards, with boolean parameter true on
+     * success. WARNING: Be sure the active document has been saved (or discarded) before calling openXoppFile()
+     */
+    void openXoppFile(fs::path filepath, int scrollToPage, std::function<void(bool)> callback);
+
+    /**
+     * Opens the provided path and parse it as a PDF file. Then forcibly replaces the currently opened document with a
+     * new one based on the PDF. WARNING: Be sure the active document has been saved (or discarded) before calling
+     * openPdfFile()
+     *
+     * @return true on success
+     */
+    bool openPdfFile(fs::path filepath, bool attachToDocument, int scrollToPage);
+
+    /**
+     * Opens the provided path and parse it as a PNG file. Then forcibly replaces the currently opened document with a
+     * new one based on the PNG. WARNING: Be sure the active document has been saved (or discarded) before calling
+     * openPngFile()
+     *
+     * @return true on success
+     */
+    bool openPngFile(fs::path filepath, bool attachToDocument, int scrollToPage);
+
+    /**
+     * Opens the provided path and parse it as a .xopt template  file. Then forcibly replaces the currently opened
+     * document with a new one based on the template. WARNING: Be sure the active document has been saved (or discarded)
+     * before calling openXoptFile()
+     *
+     * @return true on success
+     */
+    bool openXoptFile(fs::path filepath);
+
+    /**
+     * @brief Get the pen line style to select in the toolbar
+     *
+     * @return style to select, empty if no style should be selected (active
+     * selection with differing line styles)
+     */
+    auto getLineStyleToSelect() -> std::optional<std::string> const;
+
+    UndoRedoHandler* undoRedo = nullptr;
+    ZoomControl* zoom = nullptr;
+
+    Settings* settings = nullptr;
+    std::unique_ptr<Palette> palette;
+    MainWindow* win = nullptr;
+
+    Document* doc = nullptr;
+
+    Sidebar* sidebar = nullptr;
+    SearchBar* searchBar = nullptr;
+
+    ToolHandler* toolHandler;
+
+    ScrollHandler* scrollHandler;
+
+    ToolbarDragDropHandler* dragDropHandler = nullptr;
+
+    GApplication* gtkApp = nullptr;
+
+    /**
+     * The cursor handler
+     */
+    XournalppCursor* cursor;
+
+    /**
+     * Timeout id: the timeout watches the changes and actualizes the previews from time to time
+     */
+    guint changeTimout;
+
+    /**
+     * The pages wihch has changed since the last update (for preview update)
+     */
+    std::vector<PageRef> changedPages;
+
+    /**
+     * DocumentListener instances that are to be updated by checkChangedDocument.
+     */
+    std::list<DocumentListener*> changedDocumentListeners;
+
+    /**
+     * Our clipboard abstraction
+     */
+    ClipboardHandler* clipboardHandler = nullptr;
+
+    /**
+     * The autosave handler ID
+     */
+    guint autosaveTimeout = 0;
+    fs::path lastAutosaveFilename;
+
+    XournalScheduler* scheduler;
+
+    /**
+     * State / Blocking attributes
+     */
+    GtkWidget* statusbar = nullptr;
+    GtkLabel* lbState = nullptr;
+    GtkProgressBar* pgState = nullptr;
+    size_t maxState = 0;
+    bool isBlocking;
+
+    GladeSearchpath* gladeSearchPath;
+
+    MetadataManager* metadata;
+
+    PageTypeHandler* pageTypes;
+
+    std::unique_ptr<PageBackgroundChangeController> pageBackgroundChangeController;
+
+    LayerController* layerController;
+
+    std::unique_ptr<GeometryTool> geometryTool;
+    std::unique_ptr<GeometryToolController> geometryToolController;
+
+    /**
+     * Manage all Xournal++ plugins
+     */
+    PluginController* pluginController;
+
+    std::unique_ptr<ActionDatabase> actionDB;
+    template <Action a>
+    friend struct ActionProperties;
+
+    // Keep after the ActionDatabase so it is destroyed first: ~AudioController refers to the ActionDatabase
+    std::unique_ptr<AudioController> audioController;
+};
diff --git a/entry/src/main/cpp/src/core/control/CrashHandler.cpp b/entry/src/main/cpp/src/core/control/CrashHandler.cpp
new file mode 100644
index 0000000..76e9206
--- /dev/null
+++ b/entry/src/main/cpp/src/core/control/CrashHandler.cpp
@@ -0,0 +1,83 @@
+#include "CrashHandler.h"
+
+#include <atomic>
+#include <csignal>
+#include <iostream>
+#include <string>
+
+#include "control/xojfile/SaveHandler.h"  // for SaveHandler
+#include "util/PathUtil.h"
+#include "util/Stacktrace.h"
+#include "util/VersionInfo.h"
+
+#include "filesystem.h"  // for path
+
+static std::atomic<const Document*> document = nullptr;
+static std::atomic<int> alreadyCrashed = 0;
+
+extern "C" void forceClose(int sig) {
+    g_warning("Force close requested with signal %i", sig);
+    emergencySave();
+    exit(1);
+}
+
+void setEmergencyDocument(const Document* doc) { document = doc; }
+
+void emergencySave() {
+    if (document == nullptr) {
+        return;
+    }
+
+    std::cerr << "Trying to emergency save the current open document..." << std::endl;
+
+    auto const& filepath = Util::getConfigFile("emergencysave.xopp");
+
+    SaveHandler handler;
+    handler.prepareSave(document, filepath);
+    handler.saveTo(filepath);
+
+    if (!handler.getErrorMessage().empty()) {
+        std::cerr << "Error: " << handler.getErrorMessage() << std::endl;
+    } else {
+        std::cerr << "Successfully saved document to \"" << char_cast(filepath.u8string()) << "\"" << std::endl;
+    }
+}
+
+
+/// Print a backtrace and try to make an emergency save
+extern "C" void crashHandler(int sig) {
+    int crash = ++alreadyCrashed;
+
+    std::cerr << "\n\n\n*************************************************************************\n\n";
+    std::cerr << "[Crash Handler] Crashed " << crash << " time(s) with signal " << sig << std::endl;
+    if (crash == 1) {  // Avoid a loop in case we crash again on emergencySave()
+        std::cerr << xoj::util::getVersionInfo() << std::endl;
+
+        std::cerr << "\nTry to get a stacktrace...\n";
+
+        Stacktrace::printStacktrace(std::cerr);
+        std::cerr << std::endl;
+
+        emergencySave();
+    }
+
+#ifdef __unix__
+    // Forward the signal for the system's default handling - we may get a coredump
+    std::signal(sig, SIG_DFL);
+    kill(getpid(), sig);
+#endif
+
+    exit(crash);
+}
+
+void installCrashHandlers() {
+    std::signal(SIGTERM, forceClose);
+    std::signal(SIGINT, forceClose);
+    std::signal(SIGSEGV, crashHandler);
+    std::signal(SIGFPE, crashHandler);
+    std::signal(SIGILL, crashHandler);
+    std::signal(SIGABRT, crashHandler);
+#ifdef SIGTRAP
+    std::signal(SIGTRAP, crashHandler);
+#endif
+}
diff --git a/entry/src/main/cpp/src/core/control/CrashHandler.h b/entry/src/main/cpp/src/core/control/CrashHandler.h
new file mode 100644
index 0000000..8a1010d
--- /dev/null
+++ b/entry/src/main/cpp/src/core/control/CrashHandler.h
@@ -0,0 +1,17 @@
+/*
+ * Xournal++
+ *
+ * Error handler, prints a stacktrace if Xournal++ crashes
+ *
+ * @author Xournal++ Team
+ * https://github.com/xournalpp/xournalpp
+ *
+ * @license GNU GPLv2 or later
+ */
+
+#pragma once
+
+class Document;
+void setEmergencyDocument(const Document* doc);
+void installCrashHandlers();
+void emergencySave();
diff --git a/entry/src/main/cpp/src/core/control/DeviceListHelper.cpp b/entry/src/main/cpp/src/core/control/DeviceListHelper.cpp
new file mode 100644
index 0000000..6421fea
--- /dev/null
+++ b/entry/src/main/cpp/src/core/control/DeviceListHelper.cpp
@@ -0,0 +1,124 @@
+#include "control/DeviceListHelper.h"
+
+#include <algorithm>  // for find, remove_if
+#include <utility>    // for move
+#include <vector>     // for vector
+
+#include <glib.h>  // for g_list_free, g_warning
+
+#include "control/settings/Settings.h"  // for Settings
+#include "util/GListView.h"             // for GListView, GListView<>::GList...
+#include "util/i18n.h"                  // for _
+
+
+void storeNewUnlistedDevice(std::vector<InputDevice>& deviceList, GdkDevice* device) {
+    // This could potentially be problematic with systems having a multitude of input devices as it searches linearily
+    auto it = std::find(deviceList.begin(), deviceList.end(), InputDevice(device));
+    if (it != deviceList.end()) {
+        // Device is already known but source may be unknown
+        it->updateType(gdk_device_get_source(device));
+        return;
+    }
+
+    deviceList.emplace_back(device);
+}
+
+void addDevicesToList(std::vector<InputDevice>& deviceList, GListView<GdkDevice> devView, bool ignoreTouchDevices) {
+    for (GdkDevice& dev: devView) {
+        if (GDK_SOURCE_KEYBOARD == gdk_device_get_source(&dev)) {
+            continue;
+        }
+        if (gdk_device_get_vendor_id(&dev) == nullptr && gdk_device_get_product_id(&dev) == nullptr) {
+            continue;
+        }
+        if (ignoreTouchDevices && GDK_SOURCE_TOUCHSCREEN == gdk_device_get_source(&dev)) {
+            continue;
+        }
+        storeNewUnlistedDevice(deviceList, &dev);
+    }
+}
+
+auto DeviceListHelper::getDeviceList(Settings* settings, bool ignoreTouchDevices) -> std::vector<InputDevice> {
+    std::vector<InputDevice> deviceList = settings->getKnownInputDevices();
+
+    if (ignoreTouchDevices) {
+        deviceList.erase(
+                std::remove_if(deviceList.begin(), deviceList.end(),
+                               [](const InputDevice& device) { return device.getSource() == GDK_SOURCE_TOUCHSCREEN; }),
+                deviceList.end());
+    }
+
+    GdkDisplay* display = gdk_display_get_default();
+    GdkSeat* defaultSeat = gdk_display_get_default_seat(display);
+    GdkDevice* pointer = gdk_seat_get_pointer(defaultSeat);
+    GdkSeat* pointerSeat = gdk_device_get_seat(pointer);
+    auto* pointerSlaves = gdk_seat_get_slaves(pointerSeat, GDK_SEAT_CAPABILITY_ALL_POINTING);
+    addDevicesToList(deviceList, pointerSlaves, ignoreTouchDevices);
+    g_list_free(pointerSlaves);
+
+    if (deviceList.empty()) {
+        g_warning("No device found. Is Xournal++ running in debugger / Eclipse...?\n"
+                  "Probably this is the reason for not finding devices!\n");
+    }
+
+    return deviceList;
+}
+
+InputDeviceClass DeviceListHelper::getSourceMapping(GdkInputSource source, Settings* settings) {
+    auto deviceList = DeviceListHelper::getDeviceList(settings);
+
+    for (InputDevice const& inputDevice: deviceList) {
+        InputDeviceClass deviceClass =
+                InputEvents::translateDeviceType(inputDevice.getName(), inputDevice.getSource(), settings);
+
+        if (inputDevice.getSource() == source) {
+            return deviceClass;
+        }
+    }
+
+    return InputDeviceClass::INPUT_DEVICE_IGNORE;
+}
+
+InputDevice::InputDevice() = default;
+
+InputDevice::InputDevice(GdkDevice* device): name(gdk_device_get_name(device)), source(gdk_device_get_source(device)) {}
+
+InputDevice::InputDevice(std::string name, GdkInputSource source): name(std::move(name)), source(source) {}
+
+auto InputDevice::getName() const -> std::string { return this->name; }
+
+auto InputDevice::getSource() const -> GdkInputSource { return this->source; }
+
+void InputDevice::updateType(GdkInputSource newSource) { this->source = newSource; }
+
+auto InputDevice::getType() const -> std::string {
+    switch (source) {
+        case GDK_SOURCE_MOUSE:
+            return _("mouse");
+        case GDK_SOURCE_PEN:
+            return _("pen");
+        case GDK_SOURCE_ERASER:
+            return _("eraser");
+        case GDK_SOURCE_CURSOR:
+            return _("cursor");
+        case GDK_SOURCE_KEYBOARD:
+            // not used: filtered above
+            return _("keyboard");
+        case GDK_SOURCE_TOUCHSCREEN:
+            return _("touchscreen");
+        case GDK_SOURCE_TOUCHPAD:
+            return _("touchpad");
+#if (GDK_MAJOR_VERSION >= 3 && GDK_MINOR_VERSION >= 22)
+        case GDK_SOURCE_TRACKPOINT:
+            return _("trackpoint");
+        case GDK_SOURCE_TABLET_PAD:
+            return _("tablet pad");
+#endif
+    }
+
+    return "";
+}
+
+auto InputDevice::operator==(const InputDevice& inputDevice) const -> bool {
+    return this->getName() == inputDevice.getName();
+}
diff --git a/entry/src/main/cpp/src/core/control/DeviceListHelper.h b/entry/src/main/cpp/src/core/control/DeviceListHelper.h
new file mode 100644
index 0000000..dad31b2
--- /dev/null
+++ b/entry/src/main/cpp/src/core/control/DeviceListHelper.h
@@ -0,0 +1,46 @@
+/*
+ * Xournal++
+ *
+ * Helper functions to iterate over devices
+ *
+ * @author Xournal++ Team
+ * https://github.com/xournalpp/xournalpp
+ *
+ * @license GNU GPLv2 or later
+ */
+
+#pragma once
+
+#include <string>  // for string, basic_string
+#include <vector>  // for vector
+
+#include <gdk/gdk.h>  // for GdkInputSource, GdkDevice
+
+#include "gui/inputdevices/InputEvents.h"  // for InputDeviceClass
+
+class Settings;
+
+class InputDevice {
+public:
+    InputDevice();
+    explicit InputDevice(GdkDevice* device);
+    explicit InputDevice(std::string name, GdkInputSource source);
+    ~InputDevice() = default;
+
+public:
+    std::string getType() const;
+    std::string getName() const;
+    GdkInputSource getSource() const;
+    void updateType(GdkInputSource newSource);
+
+    bool operator==(const InputDevice& inputDevice) const;
+
+private:
+    std::string name;
+    GdkInputSource source{GDK_SOURCE_MOUSE};
+};
+
+namespace DeviceListHelper {
+std::vector<InputDevice> getDeviceList(Settings* settings, bool ignoreTouchDevices = false);
+InputDeviceClass getSourceMapping(GdkInputSource source, Settings* settings);
+}  // namespace DeviceListHelper
diff --git a/entry/src/main/cpp/src/core/control/ExportHelper.cpp b/entry/src/main/cpp/src/core/control/ExportHelper.cpp
new file mode 100644
index 0000000..7ba01df
--- /dev/null
+++ b/entry/src/main/cpp/src/core/control/ExportHelper.cpp
@@ -0,0 +1,110 @@
+#include "ExportHelper.h"
+
+#include <algorithm>  // for max
+#include <memory>     // for unique_ptr, allocator
+#include <string>     // for string
+
+#include <gio/gio.h>  // for g_file_new_for_commandlin...
+#include <glib.h>     // for g_message, g_error
+
+#include "control/jobs/ImageExport.h"       // for ImageExport, EXPORT_GRAPH...
+#include "control/jobs/ProgressListener.h"  // for DummyProgressListener
+#include "model/Document.h"                 // for Document
+#include "pdf/base/XojPdfExport.h"          // for XojPdfExport
+#include "pdf/base/XojPdfExportFactory.h"   // for XojPdfExportFactory
+#include "util/ElementRange.h"              // for parse, PageRangeVector
+#include "util/i18n.h"                      // for _
+#include "util/raii/GObjectSPtr.h"          // for GObjectSPtr
+
+#include "filesystem.h"  // for operator==, path
+
+namespace ExportHelper {
+
+auto exportImg(Document* doc, fs::path output, const char* range, const char* layerRange, int pngDpi, int pngWidth,
+               int pngHeight, ExportBackgroundType exportBackground) -> int {
+
+    ExportGraphicsFormat format = EXPORT_GRAPHICS_PNG;
+
+    if (output.extension() == ".svg") {
+        format = EXPORT_GRAPHICS_SVG;
+    }
+
+    PageRangeVector exportRange;
+    if (range) {
+        exportRange = ElementRange::parse(range, doc->getPageCount());
+    } else {
+        exportRange.emplace_back(0, doc->getPageCount() - 1);
+    }
+
+    DummyProgressListener progress;
+
+    ImageExport imgExport(doc, std::move(output), format, exportBackground, exportRange);
+
+    if (format == EXPORT_GRAPHICS_PNG) {
+        if (pngDpi > 0) {
+            imgExport.setQualityParameter(EXPORT_QUALITY_DPI, pngDpi);
+        } else if (pngWidth > 0) {
+            imgExport.setQualityParameter(EXPORT_QUALITY_WIDTH, pngWidth);
+        } else if (pngHeight > 0) {
+            imgExport.setQualityParameter(EXPORT_QUALITY_HEIGHT, pngHeight);
+        }
+    }
+
+    imgExport.setLayerRange(layerRange);
+
+    imgExport.exportGraphics(&progress);
+
+    std::string errorMsg = imgExport.getLastErrorMsg();
+    if (!errorMsg.empty()) {
+        g_message("Error exporting image: %s\n", errorMsg.c_str());
+        return -3;
+    }
+
+    g_message("%s", _("Image file successfully created"));
+
+    return 0;  // no error
+}
+
+auto exportPdf(Document* doc, const fs::path& output, const char* range, const char* layerRange,
+               ExportBackgroundType exportBackground, bool progressiveMode, ExportBackend backend) -> int {
+    std::unique_ptr<XojPdfExport> pdfe = XojPdfExportFactory::createExport(doc, nullptr, backend);
+    pdfe->setExportBackground(exportBackground);
+
+    // Check if we're trying to overwrite the background PDF file
+    auto backgroundPDF = doc->getPdfFilepath();
+    try {
+        if (!backgroundPDF.empty() && fs::exists(backgroundPDF)) {
+            if (fs::weakly_canonical(output) == fs::weakly_canonical(backgroundPDF)) {
+                g_message("Do not overwrite the background PDF! This will cause errors!");
+                return -3;  // Return error code for export failure
+            }
+        }
+    } catch (const fs::filesystem_error& fe) {
+        g_warning("The check for overwriting the background failed with: %s", fe.what());
+        return -3;  // Return error code for export failure
+    }
+
+    bool exportSuccess = 0;  // Return of the export job
+
+    pdfe->setLayerRange(layerRange);
+
+    if (range) {
+        // Parse the range
+        PageRangeVector exportRange = ElementRange::parse(range, doc->getPageCount());
+        // Do the export
+        exportSuccess = pdfe->createPdf(output, exportRange, progressiveMode);
+    } else {
+        exportSuccess = pdfe->createPdf(output, progressiveMode);
+    }
+
+    if (!exportSuccess) {
+        g_message("%s", pdfe->getLastError().c_str());
+        return -3;
+    }
+
+    g_message("%s", _("PDF file successfully created"));
+
+    return 0;  // no error
+}
+
+}  // namespace ExportHelper
diff --git a/entry/src/main/cpp/src/core/control/ExportHelper.h b/entry/src/main/cpp/src/core/control/ExportHelper.h
new file mode 100644
index 0000000..e029962
--- /dev/null
+++ b/entry/src/main/cpp/src/core/control/ExportHelper.h
@@ -0,0 +1,62 @@
+/*
+ * Xournal++
+ *
+ * Helper functions to iterate over devices
+ *
+ * @author Xournal++ Team
+ * https://github.com/xournalpp/xournalpp
+ *
+ * @license GNU GPLv2 or later
+ */
+
+#pragma once
+
+
+#include "control/jobs/BaseExportJob.h"  // for ExportBackgroundType
+#include "pdf/base/PdfExportBackend.h"
+
+#include "filesystem.h"
+
+class Document;
+
+namespace ExportHelper {
+/**
+ * @brief Export the input file as a bunch of image files (one per page)
+ * @param doc Document to export
+ * @param output Path to the output file(s)
+ * @param range Page range to be parsed. If range=nullptr, exports the whole file
+ * @param layerRange Layer range to be parsed. Will only export those layers, for every exported page.
+ *                  If a number is too high for the number of layers on a given page, it is just ignored.
+ *                  If range=nullptr, exports all layers.
+ * @param pngDpi Set dpi for Png files. Non positive values are ignored
+ * @param pngWidth Set the width for Png files. Non positive values are ignored
+ * @param pngHeight Set the height for Png files. Non positive values are ignored
+ * @param exportBackground If EXPORT_BACKGROUND_NONE, the exported image file has transparent background
+ *
+ *  The priority is: pngDpi overwrites pngWidth overwrites pngHeight
+ *
+ * @return 0 on success, -2 on failure opening the input file, -3 on export failure
+ */
+int exportImg(Document* doc, fs::path output, const char* range, const char* layerRange, int pngDpi, int pngWidth,
+              int pngHeight, ExportBackgroundType exportBackground);
+
+/**
+ * @brief Export the input file as pdf
+ * @param doc Document to export
+ * @param output Path to the output file
+ * @param range Page range to be parsed. If range=nullptr, exports the whole file
+ * @param layerRange Layer range to be parsed. Will only export those layers, for every exported page.
+ *                  If a number is too high for the number of layers on a given page, it is just ignored.
+ *                  If range=nullptr, exports all layers.
+ * @param exportBackground If EXPORT_BACKGROUND_NONE, the exported pdf file has white background
+ * @param progressiveMode If true, then for each xournalpp page, instead of rendering one PDF page, the page layers are
+ * rendered one by one to produce as many pages as there are layers.
+ *
+ * @return 0 on success, -2 on failure opening the input file, -3 on export failure
+ */
+int exportPdf(Document* doc, const fs::path& output, const char* range, const char* layerRange,
+              ExportBackgroundType exportBackground, bool progressiveMode,
+              ExportBackend backend = ExportBackend::DEFAULT);
+
+
+}  // namespace ExportHelper
diff --git a/entry/src/main/cpp/src/core/control/GeometryToolController.cpp b/entry/src/main/cpp/src/core/control/GeometryToolController.cpp
new file mode 100644
index 0000000..a1f79a3
--- /dev/null
+++ b/entry/src/main/cpp/src/core/control/GeometryToolController.cpp
@@ -0,0 +1,127 @@
+#include "GeometryToolController.h"
+
+#include <memory>
+
+#include "control/Control.h"
+#include "control/layer/LayerController.h"
+#include "gui/XournalView.h"
+#include "gui/XournalppCursor.h"
+#include "model/Document.h"
+#include "model/GeometryTool.h"
+#include "model/Stroke.h"
+#include "model/XojPage.h"
+#include "undo/InsertUndoAction.h"
+
+using xoj::util::Rectangle;
+
+constexpr double MARK_SIZE = 2.;
+
+GeometryToolController::GeometryToolController(XojPageView* view, GeometryTool* geometryTool):
+        view(view), geometryTool(geometryTool) {}
+
+GeometryToolController::~GeometryToolController() = default;
+
+void GeometryToolController::translate(const xoj::util::Point<double>& offset) {
+    geometryTool->setOrigin(geometryTool->getOrigin() + offset);
+    geometryTool->notify();
+}
+
+void GeometryToolController::rotate(double da, const xoj::util::Point<double>& center) {
+    const auto offset = geometryTool->getOrigin() - center;
+    geometryTool->setOrigin(center + xoj::util::Point<double>(offset.x * std::cos(da) - offset.y * std::sin(da),
+                                                              offset.x * std::sin(da) + offset.y * std::cos(da)));
+    this->rotate(da);
+}
+void GeometryToolController::rotate(double da) {
+    geometryTool->setRotation(geometryTool->getRotation() + da);
+    geometryTool->notify();
+}
+
+
+void GeometryToolController::scale(double f, const xoj::util::Point<double>& center) {
+    geometryTool->setOrigin(center + (geometryTool->getOrigin() - center) * f);
+    this->scale(f);
+}
+void GeometryToolController::scale(double f) {
+    geometryTool->setHeight(geometryTool->getHeight() * f);
+    geometryTool->notify(true);
+}
+
+
+void GeometryToolController::markOrigin() {
+    const auto control = view->getXournal()->getControl();
+    const auto h = control->getToolHandler();
+    auto cross = std::make_unique<Stroke>();
+    cross->setWidth(h->getToolThickness(TOOL_PEN)[TOOL_SIZE_FINE]);
+    cross->setColor(h->getTool(TOOL_PEN).getColor());
+    const double x = geometryTool->getOrigin().x;
+    const double y = geometryTool->getOrigin().y;
+    cross->addPoint(Point(x + MARK_SIZE, y + MARK_SIZE));
+    cross->addPoint(Point(x - MARK_SIZE, y - MARK_SIZE));
+    cross->addPoint(Point(x, y));
+    cross->addPoint(Point(x + MARK_SIZE, y - MARK_SIZE));
+    cross->addPoint(Point(x - MARK_SIZE, y + MARK_SIZE));
+
+    auto* ptr = cross.get();
+    const auto doc = control->getDocument();
+    const auto page = view->getPage();
+    doc->lock();
+    const auto layer = page->getSelectedLayer();
+    layer->addElement(std::move(cross));
+    doc->unlock();
+
+    const auto undo = control->getUndoRedoHandler();
+    undo->addUndoAction(std::make_unique<InsertUndoAction>(page, layer, ptr));
+
+
+    const Rectangle<double> rect{ptr->getX(), ptr->getY(), ptr->getElementWidth(), ptr->getElementHeight()};
+    view->rerenderRect(rect.x, rect.y, rect.width, rect.height);
+}
+
+void GeometryToolController::addStrokeToLayer() {
+    const auto xournal = view->getXournal();
+    const auto control = xournal->getControl();
+    const auto doc = control->getDocument();
+    const auto page = view->getPage();
+
+    auto ptr = stroke.get();
+    doc->lock();
+    const auto layer = page->getSelectedLayer();
+    layer->addElement(std::move(this->stroke));
+    doc->unlock();
+
+    const auto undo = control->getUndoRedoHandler();
+    undo->addUndoAction(std::make_unique<InsertUndoAction>(page, layer, ptr));
+    const Rectangle<double> rect{ptr->getX(), ptr->getY(), ptr->getElementWidth(), ptr->getElementHeight()};
+    view->rerenderRect(rect.x, rect.y, rect.width, rect.height);
+    geometryTool->setStroke(nullptr);
+    xournal->getCursor()->updateCursor();
+}
+
+void GeometryToolController::initializeStroke() {
+    const auto h = view->getXournal()->getControl()->getToolHandler();
+    stroke = std::make_unique<Stroke>();
+    geometryTool->setStroke(stroke.get());
+    stroke->setWidth(h->getThickness());
+    stroke->setColor(h->getColor());
+    stroke->setFill(h->getFill());
+    stroke->setLineStyle(h->getLineStyle());
+    switch (h->getToolType()) {
+        case TOOL_PEN:
+            stroke->setToolType(StrokeTool::PEN);
+            break;
+        case TOOL_HIGHLIGHTER:
+            stroke->setToolType(StrokeTool::HIGHLIGHTER);
+            break;
+        case TOOL_ERASER:
+            stroke->setToolType(StrokeTool::ERASER);
+            break;
+        default:
+            g_warning("Unhandled tool when initializing stroke in geometry tool controller");
+            break;
+    }
+}
+
+auto GeometryToolController::getPage() const -> const PageRef { return view->getPage(); }
+
+auto GeometryToolController::getView() const -> XojPageView* { return view; }
diff --git a/entry/src/main/cpp/src/core/control/GeometryToolController.h b/entry/src/main/cpp/src/core/control/GeometryToolController.h
new file mode 100644
index 0000000..523fcb9
--- /dev/null
+++ b/entry/src/main/cpp/src/core/control/GeometryToolController.h
@@ -0,0 +1,103 @@
+/*
+ * Xournal++
+ *
+ * A geometry tool controller
+ *
+ * @author Xournal++ Team
+ * https://github.com/xournalpp/xournalpp
+ *
+ * @license GNU GPLv2 or later
+ */
+
+#pragma once
+
+#include <gtk/gtk.h>
+
+#include "gui/PageView.h"
+#include "model/GeometryTool.h"
+#include "util/Point.h"
+
+class Stroke;
+
+/**
+ * @brief A class that controls a geometry tool
+
+ * The geometry tool can be moved, rotated and scaled
+ * There are methods for translating coordinates
+ * and methods to deal with the temporary stroke
+ */
+
+class GeometryToolController {
+public:
+    GeometryToolController(XojPageView* view, GeometryTool* geometryTool);
+    virtual ~GeometryToolController();
+
+public:
+    /**
+     * @brief translates the geometry tool in x- and y-direction
+     * @param offset the translation vector (in document coordinates)
+     */
+    void translate(const xoj::util::Point<double>& offset);
+
+    /**
+     * @brief rotates the geometry tool around then given rotation center
+     * @param da the rotation angle
+     * @param center the rotation center (in document coordinates
+     */
+    void rotate(double da, const xoj::util::Point<double>& center);
+    /// Rotates around the tool's origin
+    void rotate(double da);
+
+    /**
+     * @brief resizes the geometry tool by the factor f with respect to a given scaling center
+     * @param f the scaling factor
+     * @param center the scaling center (in document coordinates)
+     */
+    void scale(double f, const xoj::util::Point<double>& center);
+    /// Rescales around the tools origin
+    void scale(double f);
+
+    /**
+     * @brief marks the origin with a "x" and puts the mark onto the current layer
+     */
+    void markOrigin();
+
+    /**
+     * @brief adds the stroke to the layer and rerenders the stroke area
+     */
+    void addStrokeToLayer();
+
+    /**
+     * @brief initializes the stroke by using the properties from the tool handler
+     */
+    void initializeStroke();
+
+    /**
+     * @brief the page view of the page with respect to which the geometry tool is initialized
+     */
+    XojPageView* getView() const;
+
+    /**
+     * @brief the page with respect to which the setsquare is initialized
+     */
+    const PageRef getPage() const;
+
+    inline GeometryTool* getGeometryTool() const { return geometryTool; }
+
+    virtual bool isInsideGeometryTool(double x, double y, double border = 0.0) const = 0;
+
+    virtual GeometryToolType getType() const = 0;
+
+protected:
+    XojPageView* view;
+
+    /**
+     * @brief the underlying geometry tool
+     */
+    GeometryTool* geometryTool;
+
+    /**
+     * @brief The stroke drawn
+     */
+    std::unique_ptr<Stroke> stroke;
+};
diff --git a/entry/src/main/cpp/src/core/control/LatexController.cpp b/entry/src/main/cpp/src/core/control/LatexController.cpp
new file mode 100644
index 0000000..54e2133
--- /dev/null
+++ b/entry/src/main/cpp/src/core/control/LatexController.cpp
@@ -0,0 +1,366 @@
+#include "LatexController.h"
+
+#include <cstdlib>   // for free
+#include <fstream>   // for ifstream, basic_istream
+#include <iterator>  // for istreambuf_iterator, ope...
+#include <limits>    // for numeric_limits
+#include <memory>    // for unique_ptr, allocator
+#include <optional>  // for optional
+#include <utility>   // for move
+#include <variant>   // for get_if
+
+#include <glib.h>  // for g_error_free, g_error_ma...
+
+#include "control/Tool.h"                    // for Tool
+#include "control/ToolEnums.h"               // for TOOL_TEXT
+#include "control/ToolHandler.h"             // for ToolHandler
+#include "control/latex/LatexGenerator.h"    // for LatexGenerator::GenError
+#include "control/settings/LatexSettings.h"  // for LatexSettings
+#include "control/settings/Settings.h"       // for Settings
+#include "control/tools/EditSelection.h"     // for EditSelection
+#include "gui/Layout.h"                      // for Layout
+#include "gui/MainWindow.h"                  // for MainWindow
+#include "gui/PageView.h"                    // for XojPageView
+#include "gui/XournalView.h"                 // for XournalView
+#include "gui/dialog/ExtEdLatexDialog.h"     // for ExtEdLatexDialog
+#include "gui/dialog/IntEdLatexDialog.h"     // for IntEdLatexDialog
+#include "model/Document.h"                  // for Document
+#include "model/Element.h"                   // for Element
+#include "model/Layer.h"                     // for Layer
+#include "model/TexImage.h"                  // for TexImage
+#include "model/Text.h"                      // for Text
+#include "model/XojPage.h"                   // for XojPage
+#include "undo/InsertUndoAction.h"           // for InsertUndoAction
+#include "undo/UndoRedoHandler.h"            // for UndoRedoHandler
+#include "util/Assert.h"                     // for xoj_assert
+#include "util/Color.h"                      // for Color, get_color_contrast
+#include "util/PathUtil.h"                   // for ensureFolderExists, getT...
+#include "util/PlaceholderString.h"          // for PlaceholderString
+#include "util/PopupWindowWrapper.h"         // for PopupWindowWrapper
+#include "util/Rectangle.h"                  // for Rectangle
+#include "util/Util.h"                       // for npos
+#include "util/XojMsgBox.h"                  // for XojMsgBox
+#include "util/i18n.h"                       // for FS, _, _F, N_
+#include "util/safe_casts.h"                 // for round_cast
+
+#include "Control.h"  // for Control
+
+using std::string;
+
+constexpr Color LIGHT_PREVIEW_BACKGROUND = Colors::white;
+constexpr Color DARK_PREVIEW_BACKGROUND = Colors::black;
+
+LatexController::LatexController(Control* control):
+        control(control),
+        settings(control->getSettings()->latexSettings),
+        doc(control->getDocument()),
+        texTmpDir(Util::getTmpDirSubfolder("tex")),
+        generator(settings) {
+    Util::ensureFolderExists(this->texTmpDir);
+}
+
+LatexController::~LatexController() {
+    if (updating_cancellable) {
+        g_cancellable_cancel(updating_cancellable);
+        g_object_unref(updating_cancellable);
+    }
+
+    this->control = nullptr;
+}
+
+/**
+ * Find the tex executable, return false if not found
+ */
+auto LatexController::findTexDependencies() -> LatexController::FindDependencyStatus {
+    auto templatePath = this->settings.globalTemplatePath;
+    if (fs::is_regular_file(templatePath)) {
+        std::ifstream is(templatePath, std::ios_base::binary);
+        if (!is.is_open()) {
+            g_message("%s", templatePath.string().c_str());
+            string msg = _("Global template file does not exist. Please check your settings.");
+            return LatexController::FindDependencyStatus(false, msg);
+        }
+        this->latexTemplate = std::string(std::istreambuf_iterator<char>(is), {});
+        if (!is.good()) {
+            string msg = _("Failed to read global template file. Please check your settings.");
+            return LatexController::FindDependencyStatus(false, msg);
+        }
+
+        return LatexController::FindDependencyStatus(true, "");
+    } else {
+        string msg = _("Global template file is not a regular file. Please check your settings. ");
+        return LatexController::FindDependencyStatus(false, msg);
+    }
+}
+
+/**
+ * Find a selected tex element, and load it
+ */
+void LatexController::findSelectedTexElement() {
+    std::shared_lock<Document> lock(*doc);
+    auto pageNr = this->control->getCurrentPageNo();
+    if (pageNr == npos) {
+        return;
+    }
+    this->view = this->control->getWindow()->getXournal()->getViewFor(pageNr);
+    if (view == nullptr) {
+        return;
+    }
+
+    // we get the selection
+    this->page = this->doc->getPage(pageNr);
+    this->layer = page->getSelectedLayer();
+
+    auto* tex = view->getSelectedTex();
+    this->selectedElem =
+            tex != nullptr ? static_cast<const Element*>(tex) : static_cast<const Element*>(view->getSelectedText());
+
+    if (this->selectedElem) {
+        // this will get the position of the Latex properly
+        EditSelection* theSelection = control->getWindow()->getXournal()->getSelection();
+        xoj::util::Rectangle<double> rect = theSelection->getSnappedBounds();
+        this->posx = rect.x;
+        this->posy = rect.y;
+
+        if (auto* img = dynamic_cast<const TexImage*>(this->selectedElem)) {
+            this->initialTex = img->getText();
+            this->temporaryRender = img->cloneTexImage();
+            this->isValidTex = true;
+        } else if (auto* txt = dynamic_cast<const Text*>(this->selectedElem)) {
+            this->initialTex = "\\text{" + txt->getText() + "}";
+        }
+        this->imgwidth = this->selectedElem->getElementWidth();
+        this->imgheight = this->selectedElem->getElementHeight();
+    } else {
+        // This is a new latex object, so here we pick a convenient initial location
+        const double zoom = this->control->getWindow()->getXournal()->getZoom();
+        Layout* layout = this->control->getWindow()->getXournal()->getLayout();
+
+        // Calculate coordinates (screen) of the center of the visible area
+        const auto visibleBounds = layout->getVisibleRect();
+        const double centerX = visibleBounds.x + 0.5 * visibleBounds.width;
+        const double centerY = visibleBounds.y + 0.5 * visibleBounds.height;
+
+        if (layout->getPageViewAt(round_cast<int>(centerX), round_cast<int>(centerY)) == this->view) {
+            // Pick the center of the visible area (converting from screen to page coordinates)
+            this->posx = (centerX - this->view->getX()) / zoom;
+            this->posy = (centerY - this->view->getY()) / zoom;
+        } else {
+            // No better location, so just center it on the page (possibly out of viewport)
+            this->posx = this->page->getWidth() / 2;
+            this->posy = this->page->getHeight() / 2;
+        }
+    }
+}
+
+void LatexController::showTexEditDialog(std::unique_ptr<LatexController> ctrl) {
+    LatexController* texCtrl = ctrl.get();
+    if (ctrl->settings.useExternalEditor) {
+        xoj::popup::PopupWindowWrapper<ExtEdLatexDialog> popup(texCtrl->control->getGladeSearchPath(), std::move(ctrl));
+
+        popup.show(GTK_WINDOW(texCtrl->control->getWindow()->getWindow()));
+    } else {
+        xoj::popup::PopupWindowWrapper<IntEdLatexDialog> popup(texCtrl->control->getGladeSearchPath(), std::move(ctrl));
+
+        popup.show(GTK_WINDOW(texCtrl->control->getWindow()->getWindow()));
+    }
+}
+
+void LatexController::triggerImageUpdate(const string& texString) {
+    if (isUpdating()) {
+        return;
+    }
+
+    Color textColor = control->getToolHandler()->getTool(TOOL_TEXT).getColor();
+
+    // Determine a background color that has enough contrast with the text color:
+    if (Util::get_color_contrast(textColor, LIGHT_PREVIEW_BACKGROUND) > 0.5) {
+        dlg->setPreviewBackgroundColor(LIGHT_PREVIEW_BACKGROUND);
+    } else {
+        dlg->setPreviewBackgroundColor(DARK_PREVIEW_BACKGROUND);
+    }
+
+    lastPreviewedTex = texString;
+    const std::string texContents = LatexGenerator::templateSub(texString, latexTemplate, textColor);
+    auto result = generator.asyncRun(texTmpDir, texContents);
+    if (auto* err = std::get_if<LatexGenerator::GenError>(&result)) {
+        XojMsgBox::showErrorToUser(control->getGtkWindow(), err->message);
+    } else if (auto** proc = std::get_if<GSubprocess*>(&result)) {
+        // Render the TeX and capture the process' output.
+        updating_cancellable = g_cancellable_new();
+        char* stdinBuff = nullptr;  // No stdin
+
+        g_subprocess_communicate_utf8_async(*proc, stdinBuff, updating_cancellable,
+                                            reinterpret_cast<GAsyncReadyCallback>(onPdfRenderComplete), this);
+    }
+
+    updateStatus();
+}
+
+/**
+ * Text-changed handler: when the Buffer in the dialog changes, this handler
+ * removes the previous existing render and creates a new one. We need to do it
+ * through 'self' because signal handlers cannot directly access non-static
+ * methods and non-static fields such as 'dlg' so we need to wrap all the dlg
+ * method inside small methods in 'self'. To improve performance, we render the
+ * text asynchronously.
+ */
+void LatexController::handleTexChanged(LatexController* self) {
+    self->triggerImageUpdate(self->dlg->getBufferContents());
+}
+
+void LatexController::onPdfRenderComplete(GObject* procObj, GAsyncResult* res, LatexController* self) {
+    GError* err = nullptr;
+    bool procExited = false;
+    GSubprocess* proc = G_SUBPROCESS(procObj);
+
+    // Extract the process' output and store it.
+    {
+        char* procStdout_ptr = nullptr;
+
+        // Stdout and stderr should be merged.
+        procExited = g_subprocess_communicate_utf8_finish(proc, res, &procStdout_ptr, nullptr, &err);
+
+        // If we have stdout, store it.
+        if (procStdout_ptr != nullptr) {
+            self->texProcessOutput = procStdout_ptr;
+            free(procStdout_ptr);
+        } else {
+            g_warning("latex command: no stdout stream");
+        }
+    }
+
+    if (err != nullptr) {
+        if (g_error_matches(err, G_IO_ERROR, G_IO_ERROR_CANCELLED)) {
+            // the render was canceled
+            g_error_free(err);
+            return;
+        } else if (!g_error_matches(err, G_SPAWN_EXIT_ERROR, 1)) {
+            // The error was not caused by invalid LaTeX.
+            string message =
+                    FS(_F("Latex generation encountered an error: {1} (exit code: {2})") % err->message % err->code);
+            XojMsgBox::showErrorToUser(self->control->getGtkWindow(), message);
+        }
+
+        self->isValidTex = false;
+        g_error_free(err);
+    } else if (procExited && g_subprocess_get_exit_status(proc) != 0) {
+        // Command exited with non-zero exit status.
+
+        self->isValidTex = false;
+    } else {
+        self->isValidTex = true;
+    }
+
+    // Delete the PDF if the TeX is invalid.
+    if (!self->isValidTex) {
+        fs::path pdfPath = self->texTmpDir / "tex.pdf";
+        fs::remove(pdfPath);
+    }
+
+    const string currentTex = self->dlg->getBufferContents();
+    bool shouldUpdate = self->lastPreviewedTex != currentTex;
+    if (self->isValidTex) {
+        self->temporaryRender = self->loadRendered(currentTex);
+        if (self->temporaryRender != nullptr) {
+            self->dlg->setTempRender(self->temporaryRender->getPdf());
+        }
+    }
+
+    g_clear_object(&self->updating_cancellable);
+    g_clear_object(&proc);
+
+    self->updateStatus();
+
+    // If dlg is an ExtEdLatexDialog and the user has the auto-confirm option set, the dialog might
+    // have closed itself in the above updateStatus call, causing self->dlg to be nullptr.
+    if (shouldUpdate && self->dlg) {
+        self->triggerImageUpdate(currentTex);
+    }
+}
+
+bool LatexController::isUpdating() { return updating_cancellable; }
+
+void LatexController::updateStatus() { this->dlg->setCompilationStatus(isValidTex, !isUpdating(), texProcessOutput); }
+
+void LatexController::deleteOldImage() {
+    if (this->selectedElem) {
+        auto sel = SelectionFactory::createFromElementOnActiveLayer(control, page, view, selectedElem);
+        this->view->getXournal()->deleteSelection(sel.release());
+        this->selectedElem = nullptr;
+    }
+}
+
+auto LatexController::loadRendered(string renderedTex) -> std::unique_ptr<TexImage> {
+    if (!this->isValidTex) {
+        return nullptr;
+    }
+
+    fs::path pdfPath = texTmpDir / "tex.pdf";
+    auto contents = Util::readString(pdfPath, true, std::ios::binary);
+    if (!contents) {
+        return nullptr;
+    }
+
+    auto img = std::make_unique<TexImage>();
+    GError* err{};
+    bool loaded = img->loadData(std::move(*contents), &err);
+
+    if (err != nullptr) {
+        string message = FS(_F("Could not load LaTeX PDF file: {1}") % err->message);
+        XojMsgBox::showErrorToUser(control->getGtkWindow(), message);
+        g_error_free(err);
+        return nullptr;
+    } else if (!loaded || !img->getPdf()) {
+        XojMsgBox::showErrorToUser(control->getGtkWindow(), FS(_F("Could not load LaTeX PDF file")));
+        return nullptr;
+    }
+
+    img->setX(posx);
+    img->setY(posy);
+    img->setText(std::move(renderedTex));
+    if (std::abs(imgheight) > 1024 * std::numeric_limits<double>::epsilon()) {
+        double ratio = img->getElementWidth() / img->getElementHeight();
+        if (ratio == 0) {
+            img->setWidth(imgwidth == 0 ? 10 : imgwidth);
+        } else {
+            img->setWidth(imgheight * ratio);
+        }
+        img->setHeight(imgheight);
+    }
+
+    return img;
+}
+
+void LatexController::insertTexImage() {
+    xoj_assert(this->isValidTex);
+    xoj_assert(this->temporaryRender != nullptr);
+
+    this->control->clearSelectionEndText();
+    this->deleteOldImage();
+
+    control->getUndoRedoHandler()->addUndoAction(
+            std::make_unique<InsertUndoAction>(page, layer, this->temporaryRender.get()));
+
+    // Select element
+    auto selection =
+            SelectionFactory::createFromFloatingElement(control, page, layer, view, std::move(this->temporaryRender));
+    view->getXournal()->setSelection(selection.release());
+}
+
+void LatexController::cancelEditing() {
+    // The original element is currently selected. This drops it back onto the page
+    this->control->clearSelectionEndText();
+}
+
+void LatexController::run(Control* ctrl) {
+    auto self = std::make_unique<LatexController>(ctrl);
+    auto depStatus = self->findTexDependencies();
+    if (!depStatus.success) {
+        XojMsgBox::showErrorToUser(ctrl->getGtkWindow(), depStatus.errorMsg);
+        return;
+    }
+
+    self->findSelectedTexElement();
+    showTexEditDialog(std::move(self));
+}
diff --git a/entry/src/main/cpp/src/core/control/LatexController.h b/entry/src/main/cpp/src/core/control/LatexController.h
new file mode 100644
index 0000000..1368606
--- /dev/null
+++ b/entry/src/main/cpp/src/core/control/LatexController.h
@@ -0,0 +1,230 @@
+/*
+ * Xournal++
+ *
+ * Controller for Latex stuff
+ *
+ * @author W Brenna
+ * http://wbrenna.ca
+ *
+ * @author Xournal++ Team
+ * https://github.com/xournalpp/xournalpp
+ *
+ * @license GNU GPLv2 or later
+ */
+
+#pragma once
+
+#include <memory>  // for unique_ptr
+#include <string>  // for string
+
+#include <gio/gio.h>  // for GAsyncResult, GCancellable
+#include <gtk/gtk.h>  // for GtkTextBuffer
+#include <poppler.h>  // for GObject
+
+#include "control/latex/LatexGenerator.h"  // for LatexGenerator
+#include "gui/dialog/AbstractLatexDialog.h"
+#include "model/PageRef.h"  // for PageRef
+
+#include "filesystem.h"  // for path
+
+class Control;
+class TexImage;
+class Document;
+class XojPageView;
+class Layer;
+class Element;
+class LatexSettings;
+class IntEdLatexDialog;
+
+class LatexController final {
+public:
+    LatexController() = delete;
+    LatexController(const LatexController& other) = delete;
+    LatexController& operator=(const LatexController& other) = delete;
+    LatexController(Control* control);
+    ~LatexController();
+
+public:
+    /**
+     * Open a LatexDialog, wait for the user to provide the LaTeX formula, and
+     * insert the rendered formula into the document if the supplied LaTeX is
+     * valid.
+     */
+    static void run(Control* ctrl);
+
+private:
+    /**
+     * Provides information about whether a particular dependency was found or not.
+     */
+    class FindDependencyStatus {
+    public:
+        FindDependencyStatus(bool success, std::string errorMsg): success(success), errorMsg(std::move(errorMsg)) {};
+        bool success;
+        std::string errorMsg;
+    };
+
+    /**
+     * Set the required LaTeX files, returning false if at least one of them is not found.
+     */
+    LatexController::FindDependencyStatus findTexDependencies();
+
+    /**
+     * Find a selected tex element, and load it
+     */
+    void findSelectedTexElement();
+
+    /**
+     * If a previous image/text is selected, delete it
+     */
+    void deleteOldImage();
+
+    /**
+     * Asynchronously runs the LaTeX command and then updates the TeX image with
+     * the given LaTeX string. If the preview is already being updated, then
+     * this method will be a no-op.
+     */
+    void triggerImageUpdate(const std::string& texString);
+
+    /**
+     * Show the LaTex Editor dialog and process its output
+     */
+    static void showTexEditDialog(std::unique_ptr<LatexController> texCtrl);
+
+    /**
+     * Signal handler, updates the rendered image when the text in the editor
+     * changes.
+     */
+    static void handleTexChanged(LatexController* self);
+
+    /**
+     * Updates the display once the PDF file is generated.
+     *
+     * If the Latex text has changed since the last update, triggerPreviewUpdate
+     * will be called again.
+     */
+    static void onPdfRenderComplete(GObject* procObj, GAsyncResult* res, LatexController* self);
+
+    void updateStatus();
+    bool isUpdating();
+
+    /**
+     * Load the preview PDF from disk and create a TexImage object.
+     */
+    std::unique_ptr<TexImage> loadRendered(std::string renderedTex);
+
+    /**
+     * Insert the generated preview TexImage into the current page.
+     */
+    void insertTexImage();
+
+    /// Cancels the current edition: puts the original Tex element back in place (does nothing if there was none)
+    void cancelEditing();
+
+private:
+    Control* control = nullptr;
+    LatexSettings const& settings;
+
+    /**
+     * The contents of the latex template, loaded from disk.
+     */
+    std::string latexTemplate;
+
+    /**
+     * LaTex editor dialog
+     */
+    AbstractLatexDialog* dlg = nullptr;
+    friend class AbstractLatexDialog;
+    friend class ExtEdLatexDialog;
+    friend class IntEdLatexDialog;
+
+    /**
+     * Tex binary full path
+     */
+    fs::path pdflatexPath;
+
+    /**
+     * The original TeX string when the dialog was opened, or the empty string
+     * if creating a new LaTeX element.
+     */
+    std::string initialTex;
+
+    /**
+     * The last TeX string shown in the preview.
+     */
+    std::string lastPreviewedTex;
+
+    /**
+     * Whether a preview is currently being generated.
+     */
+    GCancellable* updating_cancellable = nullptr;
+
+    /**
+     * The output of the last run of the
+     * TeX command.
+     */
+    std::string texProcessOutput;
+
+    /**
+     * Whether the current TeX string is valid.
+     */
+    bool isValidTex = false;
+
+    /**
+     * X-Position
+     */
+    double posx = 0;
+
+    /**
+     * Y-Position
+     */
+    double posy = 0;
+
+    /**
+     * Image width
+     */
+    double imgwidth = 0;
+
+    /**
+     * Image height
+     */
+    double imgheight = 0;
+
+    /**
+     * Document
+     */
+    Document* doc = nullptr;
+
+    /**
+     * Page View
+     */
+    XojPageView* view = nullptr;
+
+    /**
+     * Selected Page
+     */
+    PageRef page;
+
+    /**
+     * Selected layer
+     */
+    Layer* layer = nullptr;
+
+    /**
+     * The directory in which the LaTeX files will be generated. Note that this
+     * should be within a system temporary directory.
+     */
+    fs::path texTmpDir;
+
+    /**
+     * The element that is currently being edited.
+     */
+    const Element* selectedElem = nullptr;
+
+    /**
+     * The controller owns the rendered preview in order to be able to delete it
+     * when a new render is created
+     */
+    std::unique_ptr<TexImage> temporaryRender;
+
+    LatexGenerator generator;
+};
diff --git a/entry/src/main/cpp/src/core/control/PageBackgroundChangeController.cpp b/entry/src/main/cpp/src/core/control/PageBackgroundChangeController.cpp
new file mode 100644
index 0000000..e0678a8
--- /dev/null
+++ b/entry/src/main/cpp/src/core/control/PageBackgroundChangeController.cpp
@@ -0,0 +1,380 @@
+#include "PageBackgroundChangeController.h"
+
+#include <memory>   // for __shared_ptr...
+#include <string>   // for allocator
+#include <utility>  // for move
+
+#include <gdk-pixbuf/gdk-pixbuf.h>  // for gdk_pixbuf_g...
+#include <gio/gio.h>                // for GFile
+#include <glib.h>                   // for g_error_free
+
+#include "control/settings/PageTemplateSettings.h"       // for PageTemplate...
+#include "control/settings/Settings.h"                   // for Settings
+#include "gui/MainWindow.h"                              // for MainWindow
+#include "gui/XournalView.h"                             // for XournalView
+#include "gui/dialog/backgroundSelect/ImagesDialog.h"    // for ImagesDialog
+#include "gui/dialog/backgroundSelect/PdfPagesDialog.h"  // for PdfPagesDialog
+#include "gui/menus/menubar/Menubar.h"                   // for Menubar
+#include "gui/menus/menubar/PageTypeSubmenu.h"           // for PageTypeSubmenu
+#include "model/BackgroundImage.h"                       // for BackgroundImage
+#include "model/Document.h"                              // for Document
+#include "model/PageType.h"                              // for PageType
+#include "model/XojPage.h"                               // for XojPage
+#include "pdf/base/XojPdfPage.h"                         // for XojPdfPageSPtr
+#include "undo/GroupUndoAction.h"                        // for GroupUndoAction
+#include "undo/MissingPdfUndoAction.h"                   // for MissingPdfUn...
+#include "undo/PageBackgroundChangedUndoAction.h"        // for PageBackgrou...
+#include "undo/UndoAction.h"                             // for UndoAction
+#include "undo/UndoRedoHandler.h"                        // for UndoRedoHandler
+#include "util/Assert.h"                                 // for xoj_assert
+#include "util/PathUtil.h"                               // for fromGFile
+#include "util/PopupWindowWrapper.h"
+#include "util/Util.h"       // for npos
+#include "util/XojMsgBox.h"  // for XojMsgBox
+#include "util/i18n.h"       // for FS, _, _F
+
+#include "Control.h"     // for Control
+#include "filesystem.h"  // for path
+
+
+PageBackgroundChangeController::PageBackgroundChangeController(Control* control):
+        control(control), pageTypeForNewPages(control->getSettings()->getPageTemplateSettings().getPageInsertType()) {
+    registerListener(control);
+}
+
+void PageBackgroundChangeController::applyBackgroundToAllPages(const PageType& pt) {
+    control->clearSelectionEndText();
+
+    auto apply = [pt, this](CommitParameter param = std::nullopt) {
+        auto groupUndoAction = std::make_unique<GroupUndoAction>();
+
+        Document* doc = control->getDocument();
+        doc->lock();
+        auto nbPages = doc->getPageCount();
+        for (size_t p = 0; p < nbPages; p++) {
+            auto undoAction = commitPageTypeChange(p, pt, param);
+            if (undoAction) {
+                groupUndoAction->addAction(std::move(undoAction));
+            }
+        }
+        doc->unlock();
+
+        control->getUndoRedoHandler()->addUndoAction(std::move(groupUndoAction));
+
+        // Special background types may alter the page sizes as well
+        auto fire = pt.isSpecial() ? &Control::firePageSizeChanged : &Control::firePageChanged;
+        for (size_t n = 0; n < nbPages; n++) {
+            (control->*fire)(n);
+        }
+        control->updateBackgroundSizeButton();
+        control->getWindow()->getMenubar()->getPageTypeSubmenu().setSelectedPT(std::move(pt));
+    };
+
+    if (pt.isImagePage()) {
+        askForImageBackground([apply = std::move(apply)](BackgroundImage img) { apply(std::move(img)); });
+    } else if (pt.isPdfPage()) {
+        askForPdfBackground([apply = std::move(apply)](size_t pdfPage) { apply(pdfPage); });
+    } else {
+        apply();
+    }
+}
+
+void PageBackgroundChangeController::applyPageSizeToAllPages(const PaperSize& paperSize) {
+    control->clearSelectionEndText();
+
+    Document* doc = control->getDocument();
+
+    auto groupUndoAction = std::make_unique<GroupUndoAction>();
+
+    for (size_t p = 0; p < doc->getPageCount(); p++) {
+        auto undoAction = commitPageSizeChange(p, paperSize);
+        if (undoAction) {
+            groupUndoAction->addAction(std::move(undoAction));
+        }
+    }
+
+    control->getUndoRedoHandler()->addUndoAction(std::move(groupUndoAction));
+}
+
+void PageBackgroundChangeController::applyCurrentPageBackgroundToAll() {
+    PageType pt = control->getCurrentPage()->getBackgroundType();
+    applyBackgroundToAllPages(pt);
+}
+
+void PageBackgroundChangeController::changePdfPagesBackground(const fs::path& filepath, bool attachPdf) {
+    Document* doc = this->control->getDocument();
+
+    const fs::path oldFilepath = doc->getPdfFilepath();
+    const bool oldAttachPdf = doc->isAttachPdf();
+
+    if (!doc->readPdf(filepath, false, attachPdf)) {
+        std::string msg = FS(_F("Error reading PDF: {1}") % doc->getLastErrorMsg());
+        XojMsgBox::showErrorToUser(this->control->getGtkWindow(), msg);
+        return;
+    }
+    this->control->getWindow()->getXournal()->recreatePdfCache();
+
+    this->control->fireDocumentChanged(DOCUMENT_CHANGE_COMPLETE);
+
+    auto undoAction = std::make_unique<MissingPdfUndoAction>(oldFilepath, oldAttachPdf);
+    this->control->getUndoRedoHandler()->addUndoAction(std::move(undoAction));
+}
+
+void PageBackgroundChangeController::changeCurrentPageBackground(const PageType& pt) {
+    control->clearSelectionEndText();
+
+    const size_t pageNr = control->getCurrentPageNo();
+    xoj_assert(pageNr != npos);
+
+    auto apply = [this, pt, pageNr](CommitParameter param = std::nullopt) {
+        Document* doc = control->getDocument();
+        doc->lock();
+        auto undoAction = commitPageTypeChange(pageNr, pt, std::move(param));
+        doc->unlock();
+        if (undoAction) {
+            control->getUndoRedoHandler()->addUndoAction(std::move(undoAction));
+        }
+
+        // Special background types may alter the page sizes as well
+        if (pt.isSpecial()) {
+            control->firePageSizeChanged(pageNr);
+        } else {
+            control->firePageChanged(pageNr);
+        }
+        control->updateBackgroundSizeButton();
+        control->getWindow()->getMenubar()->getPageTypeSubmenu().setSelectedPT(std::move(pt));
+    };
+
+    if (pt.isImagePage()) {
+        askForImageBackground([apply = std::move(apply)](BackgroundImage img) { apply(std::move(img)); });
+    } else if (pt.isPdfPage()) {
+        askForPdfBackground([apply = std::move(apply)](size_t pdfPage) { apply(pdfPage); });
+    } else {
+        apply();
+    }
+}
+
+void PageBackgroundChangeController::changeCurrentPageSize(const PaperSize& pageSize) {
+    control->clearSelectionEndText();
+
+    auto undoAction = commitPageSizeChange(control->getCurrentPageNo(), pageSize);
+    if (undoAction) {
+        control->getUndoRedoHandler()->addUndoAction(std::move(undoAction));
+    }
+}
+
+void PageBackgroundChangeController::setPageTypeForNewPages(const std::optional<PageType>& pt) {
+    this->pageTypeForNewPages = pt;
+}
+void PageBackgroundChangeController::setPaperSizeForNewPages(const std::optional<PaperSize>& ps) {
+    this->paperSizeForNewPages = ps;
+}
+
+static void setPageImageBackground(const PageRef& page, BackgroundImage img) {
+    page->setBackgroundImage(std::move(img));
+    page->setBackgroundType(PageType(PageTypeFormat::Image));
+
+    // Apply correct page size
+    GdkPixbuf* pixbuf = page->getBackgroundImage().getPixbuf();
+    if (pixbuf) {
+        page->setSize(gdk_pixbuf_get_width(pixbuf), gdk_pixbuf_get_height(pixbuf));
+    } else {
+        g_warning("PageBackgroundChangeController::setPageImageBackground(): Page with image background but nullptr "
+                  "pixbuf");
+    }
+}
+
+static void setPagePdfBackground(const PageRef& page, size_t pdfPageNr, Document* doc) {
+    if (pdfPageNr < doc->getPdfPageCount()) {
+        // no need to set a type, if we set the page number the type is also set
+        page->setBackgroundPdfPageNr(pdfPageNr);
+
+        XojPdfPageSPtr p = doc->getPdfPage(pdfPageNr);
+        page->setSize(p->getWidth(), p->getHeight());
+    } else {
+        g_warning("PageBackgroundChangeController::setPagePdfBackground() with past-the-end PDF page number");
+    }
+}
+
+auto PageBackgroundChangeController::commitPageTypeChange(size_t pageNum, const PageType& pageType,
+                                                          CommitParameter param) -> std::unique_ptr<UndoAction> {
+    xoj_assert(pageType.isImagePage() == std::holds_alternative<BackgroundImage>(param));
+    xoj_assert(pageType.isPdfPage() == std::holds_alternative<size_t>(param));
+
+    PageRef page = control->getDocument()->getPage(pageNum);
+    if (!page) {
+        g_warning("PageBackgroundChangeController::commitPageTypeChange() could not fetch page %zu", pageNum);
+        return {};
+    }
+
+    Document* doc = control->getDocument();
+
+    // Get values for Undo / Redo
+    const double origW = page->getWidth();
+    const double origH = page->getHeight();
+    BackgroundImage origBackgroundImage = page->getBackgroundImage();
+    const size_t origPdfPage = page->getPdfPageNr();
+    PageType origType = page->getBackgroundType();
+
+    // Apply the new background
+    if (std::holds_alternative<BackgroundImage>(param)) {  // Image background
+        xoj_assert(!std::get<BackgroundImage>(param).isEmpty());
+        setPageImageBackground(page, std::move(std::get<BackgroundImage>(param)));
+    } else if (std::holds_alternative<size_t>(param)) {  // PDF background
+        setPagePdfBackground(page, std::get<size_t>(param), doc);
+    } else {
+        page->setBackgroundType(pageType);
+    }
+
+    return std::make_unique<PageBackgroundChangedUndoAction>(page, origType, origPdfPage, origBackgroundImage, origW,
+                                                             origH);
+}
+auto PageBackgroundChangeController::commitPageSizeChange(const size_t pageNum, const PaperSize& pageSize)
+        -> std::unique_ptr<UndoAction> {
+    Document* doc = control->getDocument();
+    doc->lock();
+    PageRef page = doc->getPage(pageNum);
+    if (!page) {
+        doc->unlock();
+        return {};
+    }
+
+    const size_t pageNr = doc->indexOf(page);
+    xoj_assert(pageNr != npos);
+
+    // Get values for Undo / Redo
+    const double origW = page->getWidth();
+    const double origH = page->getHeight();
+    BackgroundImage origBackgroundImage = page->getBackgroundImage();
+    const size_t origPdfPage = page->getPdfPageNr();
+    PageType origType = page->getBackgroundType();
+
+    page->setSize(pageSize.width, pageSize.height);
+    doc->unlock();
+
+    control->firePageSizeChanged(pageNr);
+    return std::make_unique<PageBackgroundChangedUndoAction>(page, origType, origPdfPage, origBackgroundImage, origW,
+                                                             origH);
+}
+
+void PageBackgroundChangeController::askForImageBackground(std::function<void(BackgroundImage)> callback) {
+    Document* doc = control->getDocument();
+
+    auto dlg = xoj::popup::PopupWindowWrapper<ImagesDialog>(control->getGladeSearchPath(), doc, control->getSettings(),
+                                                            std::move(callback));
+    dlg.show(control->getGtkWindow());
+}
+
+void PageBackgroundChangeController::askForPdfBackground(std::function<void(size_t)> callback) {
+    Document* doc = control->getDocument();
+
+    if (doc->getPdfPageCount() == 0) {
+        std::string msg = _("You don't have any PDF pages to select from. Cancel operation.\n"
+                            "Please select another background type: Menu \"Journal\" → \"Configure Page Template\".");
+        XojMsgBox::showErrorToUser(control->getGtkWindow(), msg);
+        return;
+    }
+
+    auto dlg = xoj::popup::PopupWindowWrapper<PdfPagesDialog>(control->getGladeSearchPath(), doc,
+                                                              control->getSettings(), std::move(callback));
+    dlg.show(control->getGtkWindow());
+}
+
+/**
+ * Copy the background from source to target
+ */
+void PageBackgroundChangeController::copyBackgroundFromOtherPage(PageRef target, PageRef source) {
+    // Copy page background type
+    PageType bg = source->getBackgroundType();
+    target->setBackgroundType(bg);
+
+    if (bg.isPdfPage()) {
+        // If PDF: Copy PDF Page and its size
+        target->setSize(source->getWidth(), source->getHeight());
+        target->setBackgroundPdfPageNr(source->getPdfPageNr());
+    } else if (bg.isImagePage()) {
+        // If Image: Copy the Image and its size
+        target->setSize(source->getWidth(), source->getHeight());
+        target->setBackgroundImage(source->getBackgroundImage());
+    } else {
+        // Copy the background color
+        target->setBackgroundColor(source->getBackgroundColor());
+    }
+}
+
+void PageBackgroundChangeController::insertNewPage(size_t position, bool automatedInsertion) {
+    if (automatedInsertion) {
+        if (pageTypeForNewPages && (pageTypeForNewPages->isImagePage() || pageTypeForNewPages->isPdfPage())) {
+            // Do not insert image or pdf pages automatically
+            return;
+        }
+    } else {
+        // If the user acted to get the page create, the selection should be dropped
+        control->clearSelectionEndText();
+    }
+
+    Document* doc = control->getDocument();
+    if (position > doc->getPageCount()) {
+        position = doc->getPageCount();
+    }
+
+    PageRef current = control->getCurrentPage();
+    xoj_assert(current);
+    double width, height;
+    if (paperSizeForNewPages) {
+        width = paperSizeForNewPages->width;
+        height = paperSizeForNewPages->height;
+    } else {
+        width = current->getWidth();
+        height = current->getHeight();
+    }
+    auto page = std::make_shared<XojPage>(width, height);
+
+    auto afterConfigured = [position, shouldScrollToPage = !automatedInsertion, ctrl = this->control](PageRef page) {
+        ctrl->insertPage(page, position, shouldScrollToPage);
+    };
+
+    if (!pageTypeForNewPages) {
+        copyBackgroundFromOtherPage(page, current);
+        afterConfigured(std::move(page));
+    } else if (pageTypeForNewPages->isImagePage()) {
+        askForImageBackground([after = std::move(afterConfigured), page = std::move(page)](BackgroundImage img) {
+            setPageImageBackground(page, std::move(img));
+            after(std::move(page));
+        });
+    } else if (pageTypeForNewPages->isPdfPage()) {
+        askForPdfBackground([after = std::move(afterConfigured), page = std::move(page), doc](size_t pdfPageNr) {
+            setPagePdfBackground(page, pdfPageNr, doc);
+            after(std::move(page));
+        });
+    } else {
+        // Create a new page from template
+        page->setBackgroundType(pageTypeForNewPages.value());
+
+        // Set background Color
+        PageTemplateSettings model;
+        model.parse(control->getSettings()->getPageTemplate());
+        page->setBackgroundColor(model.getBackgroundColor());
+
+        afterConfigured(std::move(page));
+    }
+}
+
+void PageBackgroundChangeController::documentChanged(DocumentChangeType type) {}
+
+void PageBackgroundChangeController::pageSizeChanged(size_t page) {}
+
+void PageBackgroundChangeController::pageChanged(size_t page) {}
+
+void PageBackgroundChangeController::pageInserted(size_t page) {}
+
+void PageBackgroundChangeController::pageDeleted(size_t page) {}
+
+void PageBackgroundChangeController::pageSelected(size_t page) {
+    auto const& current = control->getCurrentPage();
+    if (!current) {
+        return;
+    }
+
+    control->getWindow()->getMenubar()->getPageTypeSubmenu().setSelectedPT(current->getBackgroundType());
+}
diff --git a/entry/src/main/cpp/src/core/control/PageBackgroundChangeController.h b/entry/src/main/cpp/src/core/control/PageBackgroundChangeController.h
new file mode 100644
index 0000000..857a0ca
--- /dev/null
+++ b/entry/src/main/cpp/src/core/control/PageBackgroundChangeController.h
@@ -0,0 +1,103 @@
+/*
+ * Xournal++
+ *
+ * Handle page background change and all other PageBackground stuff
+ *
+ * @author Xournal++ Team
+ * https://github.com/xournalpp/xournalpp
+ *
+ * @license GNU GPLv2 or later
+ */
+
+#pragma once
+
+#include <cstddef>  // for size_t
+#include <functional>
+#include <memory>  // for unique_ptr
+#include <optional>
+#include <variant>
+
+#include "model/BackgroundImage.h"
+#include "model/DocumentChangeType.h"  // for DocumentChangeType
+#include "model/DocumentListener.h"    // for DocumentListener
+#include "model/PageRef.h"             // for PageRef
+#include "model/PageType.h"            // for PageType
+#include "model/PaperSize.h"
+
+#include "filesystem.h"  // for path
+
+class Control;
+class UndoAction;
+
+class PageBackgroundChangeController: public DocumentListener {
+public:
+    PageBackgroundChangeController(Control* control);
+    ~PageBackgroundChangeController() override = default;
+
+public:
+    void changeCurrentPageBackground(const PageType& pageType);
+    void changeCurrentPageSize(const PaperSize& pageSize);
+    /**
+     * @brief (Un)set the page type for newly created pages
+     * @param pageType The new page type.
+     *      Passing std::nullopt will unset the page type.
+     *      If the page type is not set, newly created pages will have the same type as the current page.
+     */
+    void setPageTypeForNewPages(const std::optional<PageType>& pageType);
+    /**
+     * @brief (Un)set the paper size for newly created pages
+     * @param paperSize The new paper size.
+     *      Passing std::nullopt will unset the paper size.
+     *      If the page size is not set, newly created pages will have the same format as the current page.
+     */
+    void setPaperSizeForNewPages(const std::optional<PaperSize>& paperSize);
+    void applyCurrentPageBackgroundToAll();
+    void applyBackgroundToAllPages(const PageType& pt);
+    void applyPageSizeToAllPages(const PaperSize& paperSize);
+    void changePdfPagesBackground(const fs::path& filepath, bool attachPdf);
+    void insertNewPage(size_t position, bool automatedInsertion = false);
+
+    // DocumentListener
+public:
+    void documentChanged(DocumentChangeType type) override;
+    void pageSizeChanged(size_t page) override;
+    void pageChanged(size_t page) override;
+    void pageInserted(size_t page) override;
+    void pageDeleted(size_t page) override;
+    void pageSelected(size_t page) override;
+
+private:
+    /**
+     * Copy the background from source to target
+     */
+    static void copyBackgroundFromOtherPage(PageRef target, PageRef source);
+
+    /// Asks the user to choose a pdf page, and calls callback
+    void askForPdfBackground(std::function<void(size_t)> callback);
+
+    /// Asks the user to choose an image background, and calls callback
+    void askForImageBackground(std::function<void(BackgroundImage)> callback);
+
+    /// Nothing, a BackgroundImage or the number of a pdf page
+    using CommitParameter = std::variant<std::nullopt_t, BackgroundImage, size_t>;
+    /**
+     * Applies pageType to page number pageNum.
+     *      If pageType.isImage(), a BackgroundImage must be provided
+     *      If pageType.isPdf(), a pdf page number must be provided in the std::variant
+     */
+    auto commitPageTypeChange(size_t pageNum, const PageType& pageType, CommitParameter param = std::nullopt)
+            -> std::unique_ptr<UndoAction>;
+
+    /**
+     * Perform page size change.
+     * @param pageNum Index of the page whose size will be changed
+     * @param pageSize New page size
+     * @return Undo action of the page size change
+     */
+    auto commitPageSizeChange(size_t pageNum, const PaperSize& pageSize) -> std::unique_ptr<UndoAction>;
+
+private:
+    Control* control = nullptr;
+    std::optional<PageType> pageTypeForNewPages;
+    std::optional<PaperSize> paperSizeForNewPages;
+};
diff --git a/entry/src/main/cpp/src/core/control/PdfCache.cpp b/entry/src/main/cpp/src/core/control/PdfCache.cpp
new file mode 100644
index 0000000..954809d
--- /dev/null
+++ b/entry/src/main/cpp/src/core/control/PdfCache.cpp
@@ -0,0 +1,164 @@
+#include "PdfCache.h"
+
+#include <algorithm>  // for max
+#include <cmath>      // for ceil, abs
+#include <cstdio>     // for size_t
+#include <memory>     // for shared_ptr, __shared_ptr_access
+#include <string>     // for string
+#include <utility>    // for move
+
+#include <glib.h>  // for g_warning
+
+#include "control/settings/Settings.h"  // for Settings
+#include "pdf/base/XojPdfDocument.h"    // for XojPdfDocument
+#include "util/Assert.h"                // for xoj_assert
+#include "util/Range.h"                 // for Range
+#include "util/i18n.h"                  // for _
+#include "util/safe_casts.h"            // for as_unsigned
+#include "view/Mask.h"                  // for Mask
+
+class PdfCacheEntry {
+public:
+    /**
+     *   Cache [img], the result of rendering [popplerPage] with
+     * the given [zoom].
+     *  A change in the document's zoom causes a change in the
+     * quality of the PDF backgrounds (zoomed in => need a higher
+     * quality rendering).
+     *
+     * @param popplerPage
+     * @param buffer is the result of rendering popplerPage
+     */
+    PdfCacheEntry(XojPdfPageSPtr popplerPage, xoj::view::Mask&& buffer):
+            popplerPage(std::move(popplerPage)), buffer(std::forward<xoj::view::Mask>(buffer)) {}
+
+    ~PdfCacheEntry() = default;
+
+    XojPdfPageSPtr popplerPage;
+    xoj::view::Mask buffer;
+};
+
+static double getPercentZoomChange(double oldZoom, double newZoom) {
+    double averagedZoom = (oldZoom + newZoom) / 2.0;
+    return std::abs(oldZoom - newZoom) * 100.0 / averagedZoom;
+}
+
+PdfCache::PdfCache(const XojPdfDocument& doc, Settings* settings): pdfDocument(doc) { updateSettings(settings); }
+
+PdfCache::~PdfCache() = default;
+
+void PdfCache::setRefreshThreshold(double threshold) { this->zoomRefreshThreshold = threshold; }
+
+void PdfCache::setMaxSize(size_t newSize) {
+    this->maxSize = newSize;
+    if (this->data.size() > this->maxSize) {
+        this->data.resize(this->maxSize);
+    }
+}
+
+void PdfCache::updateSettings(Settings* settings) {
+    if (settings) {
+        setMaxSize(as_unsigned(settings->getPdfPageCacheSize()));
+        setRefreshThreshold(settings->getPDFPageRerenderThreshold());
+    }
+}
+
+void PdfCache::evictAllExcept(const std::unordered_set<size_t>& retainedPdfPages) {
+    std::lock_guard<std::mutex> lock(this->renderMutex);
+
+    for (auto& entry: this->data) {
+        xoj_assert(entry);
+        xoj_assert(entry->popplerPage);
+
+        const size_t pdfPageNo = static_cast<size_t>(entry->popplerPage->getPageId());
+        if (retainedPdfPages.find(pdfPageNo) == retainedPdfPages.end()) {
+            entry.reset();
+        }
+    }
+
+    this->data.erase(std::remove(this->data.begin(), this->data.end(), nullptr), this->data.end());
+}
+
+auto PdfCache::lookup(size_t pdfPageNo) const -> const PdfCacheEntry* {
+    for (auto& e: this->data) {
+        if (static_cast<size_t>(e->popplerPage->getPageId()) == pdfPageNo) {
+            return e.get();
+        }
+    }
+
+    return nullptr;
+}
+
+auto PdfCache::cache(XojPdfPageSPtr popplerPage, xoj::view::Mask&& buffer) -> const PdfCacheEntry* {
+    xoj_assert(this->maxSize > 0);
+    xoj_assert(popplerPage);
+    const auto pageId = popplerPage->getPageId();
+
+    auto existingIt = std::find_if(this->data.begin(), this->data.end(),
+                                   [pageId](const auto& entry) { return entry->popplerPage->getPageId() == pageId; });
+    if (existingIt != this->data.end()) {
+        this->data.erase(existingIt);
+    }
+
+    if (this->data.size() >= this->maxSize) {
+        this->data.resize(this->maxSize - 1);
+    }
+
+    this->data.emplace_front(
+            std::make_unique<PdfCacheEntry>(std::move(popplerPage), std::forward<xoj::view::Mask>(buffer)));
+
+    return this->data.front().get();
+}
+
+void PdfCache::render(cairo_t* cr, size_t pdfPageNo, double zoom, double pageWidth, double pageHeight) {
+    std::lock_guard<std::mutex> lock(this->renderMutex);
+
+    const PdfCacheEntry* cacheResult = lookup(pdfPageNo);
+
+    bool needsRefresh = cacheResult == nullptr;
+
+    if (!needsRefresh) {
+        // If we do have a cached result, is its rendering quality
+        // acceptable for our current zoom?
+        needsRefresh =
+                (zoom > 1.0 && getPercentZoomChange(cacheResult->buffer.getZoom(), zoom) > this->zoomRefreshThreshold);
+    }
+
+    if (needsRefresh) {
+        double renderZoom = std::max(zoom, 1.0);
+
+        auto popplerPage = cacheResult ? cacheResult->popplerPage : pdfDocument.getPage(pdfPageNo);
+
+        if (!popplerPage) {
+            g_warning("PdfCache::render Could not get the pdf page %zu from the document", pdfPageNo);
+            renderMissingPdfPage(cr, pageWidth, pageHeight);
+            return;
+        }
+
+        xoj::view::Mask buffer(cairo_get_target(cr), Range(0, 0, popplerPage->getWidth(), popplerPage->getHeight()),
+                               renderZoom, CAIRO_CONTENT_COLOR_ALPHA);
+        popplerPage->render(buffer.get());
+        if (this->maxSize == 0) {
+            buffer.paintTo(cr);
+            return;
+        }
+
+        cacheResult = cache(popplerPage, std::move(buffer));
+    }
+
+    cacheResult->buffer.paintTo(cr);
+}
+
+void PdfCache::renderMissingPdfPage(cairo_t* cr, double pageWidth, double pageHeight) {
+    cairo_select_font_face(cr, "Sans", CAIRO_FONT_SLANT_NORMAL, CAIRO_FONT_WEIGHT_BOLD);
+    cairo_set_font_size(cr, 26);
+
+    cairo_set_source_rgb(cr, 0.8, 0.8, 0.8);
+
+    cairo_text_extents_t extents = {0};
+    std::string strMissing = _("PDF background missing");
+
+    cairo_text_extents(cr, strMissing.c_str(), &extents);
+    cairo_move_to(cr, pageWidth / 2 - extents.width / 2, pageHeight / 2 - extents.height / 2);
+    cairo_text_path(cr, strMissing.c_str());
+}
diff --git a/entry/src/main/cpp/src/core/control/PdfCache.h b/entry/src/main/cpp/src/core/control/PdfCache.h
new file mode 100644
index 0000000..a7cbccc
--- /dev/null
+++ b/entry/src/main/cpp/src/core/control/PdfCache.h
@@ -0,0 +1,93 @@
+/*
+ * Xournal++
+ *
+ * Caches PDF backgrounds for faster repaint
+ *
+ * @author Xournal++ Team
+ * https://github.com/xournalpp/xournalpp
+ *
+ * @license GNU GPLv2 or later
+ */
+
+#pragma once
+
+#include <cstddef>  // for size_t
+#include <deque>    // for deque
+#include <mutex>    // for mutex
+#include <unordered_set>
+
+#include <cairo.h>  // for cairo_t, cairo_surface_t
+
+#include "pdf/base/XojPdfDocument.h"  // for XojPdfDocument
+#include "pdf/base/XojPdfPage.h"      // for XojPdfPageSPtr
+
+namespace xoj::view {
+class Mask;
+};
+
+class PdfCacheEntry;
+class Settings;
+
+class PdfCache {
+public:
+    PdfCache(const XojPdfDocument& doc, Settings* settings);
+    virtual ~PdfCache();
+
+private:
+    PdfCache(const PdfCache& cache);
+    void operator=(const PdfCache& cache);
+
+public:
+    /**
+     * @brief Render the page with number pdfPageNo of the pdf document to the cairo context
+     * @param cr the cairo context
+     * @param pdfPageNo The page number (in the pdf document)
+     * @param zoom The current zoom level
+     * @param pageWidth/pageHeight Xournal++ page dimensions
+     */
+    void render(cairo_t* cr, size_t pdfPageNo, double zoom, double pageWidth, double pageHeight);
+
+public:
+    /**
+     * @brief Set the maximum tolerable zoom difference, as a percentage.
+     *
+     * @param threshold is the minimum percent-difference between the zoom value at
+     *  which the cached version of the page was rendered and the current zoom,
+     *  for which the page will be re-cached while zooming.
+     */
+    void setRefreshThreshold(double percentDifference);
+
+    void setMaxSize(size_t newSize);
+
+    void updateSettings(Settings* settings);
+
+    /**
+     * @brief Remove cached renderings for PDF pages that are not retained.
+     */
+    void evictAllExcept(const std::unordered_set<size_t>& retainedPdfPages);
+
+    /**
+     * @brief Renders an error background, for when the pdf page cannot be rendered
+     */
+    static void renderMissingPdfPage(cairo_t* cr, double pageWidth, double pageHeight);
+
+private:
+    /**
+     * @brief Look up for a cache entry for the page with number pdfPgeNo in the PDF.
+     */
+    const PdfCacheEntry* lookup(size_t pdfPageNo) const;
+    /**
+     * @brief Push a cache entry
+     */
+    const PdfCacheEntry* cache(XojPdfPageSPtr popplerPage, xoj::view::Mask&& buffer);
+
+private:
+    XojPdfDocument pdfDocument;
+
+    std::mutex renderMutex;
+
+    std::deque<std::unique_ptr<PdfCacheEntry>> data;
+    decltype(data)::size_type maxSize = 0;
+
+    double zoomRefreshThreshold;
+};
diff --git a/entry/src/main/cpp/src/core/control/PrintHandler.cpp b/entry/src/main/cpp/src/core/control/PrintHandler.cpp
new file mode 100644
index 0000000..d93eba3
--- /dev/null
+++ b/entry/src/main/cpp/src/core/control/PrintHandler.cpp
@@ -0,0 +1,128 @@
+#include "PrintHandler.h"
+
+#include <cmath>   // for M_PI_2
+#include <memory>  // for __shared_ptr_access
+#include <string>  // for string
+
+#include <cairo.h>        // for cairo_rotate, cairo_translate, cairo_t
+#include <config-dev.h>   // for PRINT_CONFIG_FILE
+#include <glib-object.h>  // for g_object_unref, G_CALLBACK, g_signa...
+#include <glib.h>         // for GError, g_error_free, g_warning
+
+#include "model/Document.h"       // for Document
+#include "model/PageRef.h"        // for PageRef
+#include "model/PageType.h"       // for PageType
+#include "model/XojPage.h"        // for XojPage
+#include "pdf/base/XojPdfPage.h"  // for XojPdfPageSPtr, XojPdfPage
+#include "util/Assert.h"          // for xoj_assert
+#include "util/PathUtil.h"        // for getConfigFile
+#include "util/StringUtils.h"     // for char_cast
+#include "util/XojMsgBox.h"       // for XojMsgBox
+#include "util/i18n.h"            // for _
+#include "util/safe_casts.h"      // for strict_cast
+#include "view/DocumentView.h"    // for DocumentView
+
+#include "filesystem.h"  // for exists, remove, path
+
+namespace {
+void drawPage(GtkPrintOperation* /*operation*/, GtkPrintContext* context, int pageNr, Document* doc) {
+    cairo_t* cr = gtk_print_context_get_cairo_context(context);
+
+    PageRef page = doc->getPage(static_cast<size_t>(pageNr));
+    if (!page) {
+        return;
+    }
+
+    double width = page->getWidth();
+    double height = page->getHeight();
+
+    if (width > height) {
+        cairo_rotate(cr, M_PI_2);
+        cairo_translate(cr, 0, -height);
+    }
+
+    // For better quality printing, we use a dedicated pdf-renderer in this case
+    if (page->getBackgroundType().isPdfPage()) {
+        XojPdfPageSPtr popplerPage = doc->getPdfPage(page->getPdfPageNr());
+        if (popplerPage) {
+            popplerPage->renderForPrinting(cr);
+        }
+    }
+
+    xoj::view::BackgroundFlags flags = xoj::view::BACKGROUND_SHOW_ALL;
+    flags.showPDF = xoj::view::HIDE_PDF_BACKGROUND;  // Already printed (if any)
+
+    DocumentView view;
+    view.drawPage(page, cr, true /* dont render eraseable */, flags);
+}
+
+void requestPageSetup(GtkPrintOperation* /*op*/, GtkPrintContext* /*ctx*/, int pageNr, GtkPageSetup* setup,
+                      Document* doc) {
+    PageRef page = doc->getPage(static_cast<size_t>(pageNr));  // Can't be negative
+    if (!page) {
+        return;
+    }
+
+    double width = page->getWidth();
+    double height = page->getHeight();
+
+    if (width > height) {
+        gtk_page_setup_set_orientation(setup, GTK_PAGE_ORIENTATION_LANDSCAPE);
+    } else {
+        gtk_page_setup_set_orientation(setup, GTK_PAGE_ORIENTATION_PORTRAIT);
+    }
+
+    GtkPaperSize* size = gtk_paper_size_new_custom("xoj-internal", "xoj-internal", width, height, GTK_UNIT_POINTS);
+    gtk_page_setup_set_paper_size(setup, size);
+    gtk_paper_size_free(size);
+}
+
+inline void handlePrintError(GError*& error, const char* message) {
+    if (error) {
+        g_warning(message, error->message);
+        g_error_free(error);
+        error = nullptr;
+    }
+}
+}  // namespace
+
+// Todo: maybe loop over this twice,
+void PrintHandler::print(Document* doc, size_t currentPage, GtkWindow* parent) {
+    GtkPrintSettings* settings{};
+    auto filepath = Util::getConfigFile(PRINT_CONFIG_FILE);
+    if (fs::exists(filepath)) {
+        GError* error{};
+        settings = gtk_print_settings_new_from_file(char_cast(filepath.u8string().c_str()), &error);
+        handlePrintError(error, "Loading print settings failed with: %s");
+        fs::remove(filepath);
+    }
+    if (settings == nullptr) {
+        settings = gtk_print_settings_new();
+    }
+
+    GtkPrintOperation* op = gtk_print_operation_new();
+    gtk_print_operation_set_print_settings(op, settings);
+    gtk_print_operation_set_n_pages(op, strict_cast<int>(doc->getPageCount()));
+    gtk_print_operation_set_current_page(op, strict_cast<int>(currentPage));
+    gtk_print_operation_set_job_name(op, "Xournal++");
+    gtk_print_operation_set_unit(op, GTK_UNIT_POINTS);
+    gtk_print_operation_set_use_full_page(op, true);
+    g_signal_connect(op, "draw_page", G_CALLBACK(drawPage), doc);
+    g_signal_connect(op, "request-page-setup", G_CALLBACK(requestPageSetup), doc);
+
+    GError* error{};
+    GtkPrintOperationResult res = gtk_print_operation_run(op, GTK_PRINT_OPERATION_ACTION_PRINT_DIALOG, parent, &error);
+    g_object_unref(settings);
+    if (GTK_PRINT_OPERATION_RESULT_APPLY == res) {
+        xoj_assert(!error);
+        settings = gtk_print_operation_get_print_settings(op);
+        gtk_print_settings_to_file(settings, char_cast(filepath.u8string().c_str()), nullptr);
+    } else if (GTK_PRINT_OPERATION_RESULT_ERROR == res) {
+        xoj_assert(error);
+        std::string msg = FS(_F("Running print operation failed with {1}") % error->message);
+        XojMsgBox::showErrorToUser(nullptr, msg);
+        g_error_free(error);
+    }
+
+    g_object_unref(op);
+}
diff --git a/entry/src/main/cpp/src/core/control/PrintHandler.h b/entry/src/main/cpp/src/core/control/PrintHandler.h
new file mode 100644
index 0000000..51f2465
--- /dev/null
+++ b/entry/src/main/cpp/src/core/control/PrintHandler.h
@@ -0,0 +1,22 @@
+/*
+ * Xournal++
+ *
+ * Prints a document
+ *
+ * @author Xournal++ Team
+ * https://github.com/xournalpp/xournalpp
+ *
+ * @license GNU GPLv2 or later
+ */
+
+#pragma once
+
+#include <cstddef>  // for size_t
+
+#include <gtk/gtk.h>  // for GtkWindow
+
+class Document;
+
+namespace PrintHandler {
+void print(Document* doc, size_t currentPage, GtkWindow* parent);
+}
diff --git a/entry/src/main/cpp/src/core/control/RecentManager.cpp b/entry/src/main/cpp/src/core/control/RecentManager.cpp
new file mode 100644
index 0000000..51f09ee
--- /dev/null
+++ b/entry/src/main/cpp/src/core/control/RecentManager.cpp
@@ -0,0 +1,150 @@
+#include "RecentManager.h"
+
+#include <algorithm>   // for sort, max
+#include <ctime>       // for time_t
+#include <functional>  // for greater, less
+#include <string>      // for string, allocator, operator+
+
+#include "util/GListView.h"          // for GListView, GListView<>::GListVie...
+#include "util/PathUtil.h"           // for fromUri, toUri, hasPdfFileExt
+#include "util/TinyVector.h"         // for TinyVector
+#include "util/safe_casts.h"         // for as_signed
+
+#include "Control.h"
+
+template <template <class> class Comp>
+inline auto compareGtkRecentInfo(GtkRecentInfo const& a, GtkRecentInfo const& b) -> bool {
+    auto deconstify = [](auto&& ref) { return const_cast<GtkRecentInfo*>(&ref); };  // NOLINT
+    auto a_time = gtk_recent_info_get_modified(deconstify(a));                      // actually const
+    auto b_time = gtk_recent_info_get_modified(deconstify(b));
+    return Comp<time_t>{}(a_time, b_time);
+}
+
+inline auto operator<(GtkRecentInfo const& a, GtkRecentInfo const& b) -> bool {
+    return compareGtkRecentInfo<std::less>(a, b);
+}
+
+inline auto operator>(GtkRecentInfo const& a, GtkRecentInfo const& b) -> bool {
+    return compareGtkRecentInfo<std::greater>(a, b);
+}
+
+namespace {
+
+enum AcceptedFileType { UNSUPPORTED_FILE_TYPE, XOURNAL_FILE_TYPE, PDF_FILE_TYPE };
+auto getFileType(GtkRecentInfo& info) -> AcceptedFileType {
+    const gchar* uri = gtk_recent_info_get_uri(&info);
+    if (!uri) {  // issue #1071
+        return UNSUPPORTED_FILE_TYPE;
+    }
+    auto p = Util::fromUri(uri);
+    if (!p) {  // Skip remote files
+        return UNSUPPORTED_FILE_TYPE;
+    }
+    if (Util::hasXournalFileExt(*p)) {
+        return XOURNAL_FILE_TYPE;
+    }
+    if (Util::hasPdfFileExt(*p)) {
+        return PDF_FILE_TYPE;
+    }
+    return UNSUPPORTED_FILE_TYPE;
+}
+}  // namespace
+
+void RecentManager::clearRecentFiles() {
+    GtkRecentManager* recentManager = gtk_recent_manager_get_default();
+    GList* items = gtk_recent_manager_get_items(recentManager);
+    auto item_view = GListView<GtkRecentInfo>(items);
+    for (auto& recent: item_view) {
+        if (getFileType(recent) != UNSUPPORTED_FILE_TYPE) {
+            gtk_recent_manager_remove_item(recentManager,
+                                           gtk_recent_info_get_uri(&recent),
+                                           nullptr);
+        }
+    }
+    g_list_free_full(items, GDestroyNotify(gtk_recent_info_unref));
+}
+
+void RecentManager::addRecentFileFilename(const fs::path& filepath) {
+    GtkRecentManager* recentManager = gtk_recent_manager_get_default();
+
+    std::string group_name = GROUP;
+    std::array<gchar*, 2> groups = {group_name.data(), nullptr};
+    std::string app_name = g_get_application_name();
+    std::string app_exec = std::string(g_get_prgname()) + " %u";
+    std::string mime_type = Util::hasPdfFileExt(filepath) ? std::string(MIME_PDF) : std::string(MIME);
+
+    GtkRecentData recentData{};
+    recentData.display_name = nullptr;
+    recentData.description = nullptr;
+    recentData.app_name = app_name.data();
+    recentData.app_exec = app_exec.data();
+    recentData.groups = groups.data();
+    recentData.mime_type = mime_type.data();
+    recentData.is_private = false;
+
+    auto uri = Util::toUri(filepath);
+    if (!uri) {
+        return;
+    }
+    gtk_recent_manager_add_full(recentManager, (*uri).c_str(), &recentData);
+}
+
+void RecentManager::removeRecentFileFilename(const fs::path& filename) {
+    auto uri = Util::toUri(filename);
+    if (!uri) {
+        return;
+    }
+    GtkRecentManager* recentManager = gtk_recent_manager_get_default();
+    gtk_recent_manager_remove_item(recentManager, uri->c_str(), nullptr);
+}
+
+auto RecentManager::getMostRecent() -> GtkRecentInfoSPtr {
+    auto recent_items = gtk_recent_manager_get_items(gtk_recent_manager_get_default());
+    // Todo (cpp20): replace with std::ranges::max_element
+    if (!recent_items) {
+        return nullptr;
+    }
+    GtkRecentInfo* mostRecent = nullptr;
+    for (auto& recent: GListView<GtkRecentInfo>(recent_items)) {
+        auto time = gtk_recent_info_get_modified(&recent);
+        if (as_signed(time) < 0) {
+            continue;
+        }
+        if (getFileType(recent) != XOURNAL_FILE_TYPE) {
+            continue;
+        }
+        if (mostRecent == nullptr || *mostRecent < recent) {
+            mostRecent = &recent;
+        }
+    }
+    // Prolong lifetime past the list deletion
+    GtkRecentInfoSPtr res = mostRecent == nullptr ? nullptr : GtkRecentInfoSPtr(mostRecent, xoj::util::ref);
+
+    g_list_free_full(recent_items, GDestroyNotify(gtk_recent_info_unref));
+
+    return res;
+}
+
+auto RecentManager::getRecentFiles() -> RecentFiles {
+    GtkRecentManager* recentManager = gtk_recent_manager_get_default();
+    GList* items = gtk_recent_manager_get_items(recentManager);
+
+    RecentFiles res;
+    for (auto& recent: GListView<GtkRecentInfo>(items)) {
+        auto fileType = getFileType(recent);
+        if (fileType == PDF_FILE_TYPE && res.recentPdfFiles.size() < MAX_RECENT) {
+            res.recentPdfFiles.emplace_back(&recent, xoj::util::ref);
+        }
+        if (fileType == XOURNAL_FILE_TYPE && res.recentXoppFiles.size() < MAX_RECENT) {
+            res.recentXoppFiles.emplace_back(&recent, xoj::util::ref);
+        }
+    }
+    g_list_free_full(items, GDestroyNotify(gtk_recent_info_unref));
+
+    auto comp = [](const GtkRecentInfoSPtr& p1, const GtkRecentInfoSPtr& p2) { return *p1.get() > *p2.get(); };
+
+    std::sort(res.recentPdfFiles.begin(), res.recentPdfFiles.end(), comp);
+    std::sort(res.recentXoppFiles.begin(), res.recentXoppFiles.end(), comp);
+
+    return res;
+}
diff --git a/entry/src/main/cpp/src/core/control/RecentManager.h b/entry/src/main/cpp/src/core/control/RecentManager.h
new file mode 100644
index 0000000..badd597
--- /dev/null
+++ b/entry/src/main/cpp/src/core/control/RecentManager.h
@@ -0,0 +1,70 @@
+/*
+ * Xournal++
+ *
+ * The recent opened files
+ *
+ * @author Xournal++ Team
+ * https://github.com/xournalpp/xournalpp
+ *
+ * @license GNU GPLv2 or later
+ */
+
+#pragma once
+
+#include <gtk/gtk.h>  // for GtkRecentInfo
+
+#include "util/TinyVector.h"
+#include "util/raii/CLibrariesSPtr.h"
+
+#include "filesystem.h"  // for path
+
+class Control;
+
+/**
+ * @brief Handles the GtkMenu displaying the recent files
+ */
+namespace RecentManager {
+constexpr auto const* MIME = "application/x-xoj";
+constexpr auto const* MIME_PDF = "application/x-pdf";
+constexpr auto const* GROUP = "xournal++";
+constexpr int MAX_RECENT = 10;
+
+/**
+ * Adds a file to the underlying GtkRecentManager
+ */
+void addRecentFileFilename(const fs::path& filename);
+
+/**
+ * Removes a file from the underlying GtkRecentManager
+ */
+void removeRecentFileFilename(const fs::path& filename);
+
+/**
+ * Remove all supported files from the recent file list
+ */
+void clearRecentFiles();
+
+class GtkRecentInfoHandler {
+public:
+    constexpr static auto ref = gtk_recent_info_ref;
+    constexpr static auto unref = gtk_recent_info_unref;
+    // Todo(cpp20): replace with std:identity()
+    constexpr static auto adopt = [](GtkRecentInfo* p) { return p; };
+};
+using GtkRecentInfoSPtr = xoj::util::CLibrariesSPtr<GtkRecentInfo, GtkRecentInfoHandler>;
+
+/**
+ * Returns the most recent xoj item from the underlying GtkRecentManager
+ * or nullptr, if no recent files exist
+ */
+GtkRecentInfoSPtr getMostRecent();
+
+/**
+ *
+ */
+struct RecentFiles {
+    TinyVector<GtkRecentInfoSPtr, MAX_RECENT> recentXoppFiles;
+    TinyVector<GtkRecentInfoSPtr, MAX_RECENT> recentPdfFiles;
+};
+RecentFiles getRecentFiles();
+};  // namespace RecentManager
diff --git a/entry/src/main/cpp/src/core/control/ScrollHandler.cpp b/entry/src/main/cpp/src/core/control/ScrollHandler.cpp
new file mode 100644
index 0000000..dd55c0a
--- /dev/null
+++ b/entry/src/main/cpp/src/core/control/ScrollHandler.cpp
@@ -0,0 +1,125 @@
+#include "ScrollHandler.h"
+
+#include <memory>  // for __shared_ptr_access
+
+#include <glib.h>  // for g_error
+
+#include "control/zoom/ZoomControl.h"     // for ZoomControl
+#include "gui/MainWindow.h"               // for MainWindow
+#include "gui/XournalView.h"              // for XournalView
+#include "gui/sidebar/Sidebar.h"          // for Sidebar
+#include "gui/widgets/SpinPageAdapter.h"  // for SpinPageAdapter
+#include "model/Document.h"               // for Document
+#include "model/LinkDestination.h"        // for LinkDestination
+#include "model/XojPage.h"                // for XojPage
+#include "util/Util.h"                    // for npos
+
+#include "Control.h"  // for Control
+
+ScrollHandler::ScrollHandler(Control* control): control(control) {}
+
+ScrollHandler::~ScrollHandler() = default;
+
+void ScrollHandler::goToPreviousPage() {
+    if (this->control->getWindow()) {
+        scrollToPage(this->control->getWindow()->getXournal()->getCurrentPage() - 1);
+    }
+}
+
+void ScrollHandler::goToNextPage() {
+    if (this->control->getWindow()) {
+        scrollToPage(this->control->getWindow()->getXournal()->getCurrentPage() + 1);
+    }
+}
+
+void ScrollHandler::goToLastPage() {
+    if (this->control->getWindow()) {
+        scrollToPage(this->control->getDocument()->getPageCount() - 1);
+    }
+}
+
+void ScrollHandler::goToFirstPage() {
+    if (this->control->getWindow()) {
+        scrollToPage(0);
+    }
+}
+
+void ScrollHandler::scrollToPage(const PageRef& page, XojPdfRectangle rect) {
+    Document* doc = this->control->getDocument();
+
+    doc->lock_shared();
+    auto p = doc->indexOf(page);
+    doc->unlock_shared();
+
+    if (p != npos) {
+        scrollToPage(p, rect);
+    }
+}
+
+void ScrollHandler::scrollToPage(size_t page, XojPdfRectangle rect) {
+    MainWindow* win = this->control->getWindow();
+    if (win == nullptr) {
+        g_error("Window is nullptr!");
+        return;
+    }
+
+    win->getXournal()->scrollTo(page, rect);
+}
+
+void ScrollHandler::scrollToLinkDest(const LinkDestination& dest) {
+    size_t pdfPage = dest.getPdfPage();
+
+    if (pdfPage != npos) {
+        Document* doc = control->getDocument();
+        doc->lock_shared();
+        size_t page = doc->findPdfPage(pdfPage);
+        doc->unlock_shared();
+
+        if (page == npos) {
+            control->askInsertPdfPage(pdfPage);
+        } else {
+            if (dest.shouldChangeTop()) {
+                control->getScrollHandler()->scrollToPage(page, {dest.getLeft(), dest.getTop(), -1, -1});
+            } else {
+                if (control->getCurrentPageNo() != page) {
+                    control->getScrollHandler()->scrollToPage(page);
+                }
+            }
+        }
+    }
+}
+
+void ScrollHandler::scrollToAnnotatedPage(bool next) {
+    if (!this->control->getWindow()) {
+        return;
+    }
+
+    size_t step = next ? size_t(1) : size_t(-1);  // Don't assume blindly that size_t(-1) == npos
+
+    Document* doc = this->control->getDocument();
+
+    for (size_t i = this->control->getCurrentPageNo() + step; i < doc->getPageCount() && i != size_t(-1); i += step) {
+        if (doc->getPage(i)->isAnnotated()) {
+            scrollToPage(i);
+            break;
+        }
+    }
+}
+
+auto ScrollHandler::isPageVisible(size_t page, int* visibleHeight) -> bool {
+    if (!this->control->getWindow()) {
+        if (visibleHeight) {
+            *visibleHeight = 0;
+        }
+        return false;
+    }
+
+    return this->control->getWindow()->getXournal()->isPageVisible(page, visibleHeight);
+}
+
+void ScrollHandler::pageChanged(size_t page) {
+    if (page == 0) {
+        return;
+    }
+    scrollToPage(page - 1);
+}
diff --git a/entry/src/main/cpp/src/core/control/ScrollHandler.h b/entry/src/main/cpp/src/core/control/ScrollHandler.h
new file mode 100644
index 0000000..fc6180a
--- /dev/null
+++ b/entry/src/main/cpp/src/core/control/ScrollHandler.h
@@ -0,0 +1,58 @@
+/*
+ * Xournal++
+ *
+ * Scroll handler
+ *
+ * @author Xournal++ Team
+ * https://github.com/xournalpp/xournalpp
+ *
+ * @license GNU GPLv2 or later
+ */
+
+#pragma once
+
+#include <cstddef>  // for size_t
+
+#include "gui/widgets/SpinPageAdapter.h"  // for SpinPageListener
+#include "model/PageRef.h"                // for PageRef
+#include "pdf/base/XojPdfPage.h"          // for XojPdfRectangle
+
+class Control;
+class LinkDestination;
+
+class ScrollHandler: public SpinPageListener {
+public:
+    ScrollHandler(Control* control);
+    ~ScrollHandler() override;
+
+public:
+    void goToPreviousPage();
+    void goToNextPage();
+
+    void goToLastPage();
+    void goToFirstPage();
+
+    void scrollToPage(const PageRef& page, XojPdfRectangle rect = {0, 0, -1, -1});
+    void scrollToPage(size_t page, XojPdfRectangle rect = {0, 0, -1, -1});
+
+    void scrollToAnnotatedPage(bool next);
+
+    /**
+     * Scroll to a given link's destination, provided the
+     * destination is a local destination and not a URI.
+     *
+     *  If the destination is a non-existent PDF page,
+     * we ask the user whether to add the missing page or not.
+     *
+     * @param dest is to shown
+     */
+    void scrollToLinkDest(const LinkDestination& dest);
+
+    bool isPageVisible(size_t page, int* visibleHeight = nullptr);
+
+public:
+    void pageChanged(size_t page) override;
+
+private:
+    Control* control = nullptr;
+};
diff --git a/entry/src/main/cpp/src/core/control/SearchControl.cpp b/entry/src/main/cpp/src/core/control/SearchControl.cpp
new file mode 100644
index 0000000..5c4f62e
--- /dev/null
+++ b/entry/src/main/cpp/src/core/control/SearchControl.cpp
@@ -0,0 +1,73 @@
+#include "SearchControl.h"
+
+#include <memory>   // for __shared_ptr_access
+#include <utility>  // for move
+
+#include "model/Element.h"                   // for Element, ELEMENT_TEXT
+#include "model/Layer.h"                     // for Layer
+#include "model/Text.h"                      // for Text
+#include "model/XojPage.h"                   // for XojPage
+#include "view/overlays/SearchResultView.h"  // for SEARCH_CHANGED_NOTIFICATION
+
+SearchControl::SearchControl(const PageRef& page, XojPdfPageSPtr pdf):
+        page(page),
+        pdf(std::move(pdf)),
+        viewPool(std::make_shared<xoj::util::DispatchPool<xoj::view::SearchResultView>>()) {}
+
+SearchControl::~SearchControl() = default;
+
+auto SearchControl::search(const std::string& text, size_t index, size_t* occurrences, XojPdfRectangle* matchRect)
+        -> bool {
+    this->highlightRect = nullptr;
+    if (text.empty()) {
+        if (!this->results.empty()) {
+            this->results.clear();
+            this->currentText.clear();
+            this->viewPool->dispatch(xoj::view::SearchResultView::SEARCH_CHANGED_NOTIFICATION);
+        }
+        return true;
+    }
+
+    if (text != this->currentText) {
+        this->results.clear();
+        this->currentText = text;
+
+        if (this->pdf) {
+            this->results = this->pdf->findText(text);
+        }
+
+        for (Layer* l: this->page->getLayers()) {
+            if (!l->isVisible()) {
+                continue;
+            }
+
+            for (auto&& e: l->getElementsView()) {
+                if (e->getType() == ELEMENT_TEXT) {
+                    const Text* t = dynamic_cast<const Text*>(e);
+
+                    std::vector<XojPdfRectangle> textResult = t->findText(text);
+                    this->results.insert(this->results.end(), textResult.begin(), textResult.end());
+                }
+            }
+        }
+    }
+
+    this->viewPool->dispatch(xoj::view::SearchResultView::SEARCH_CHANGED_NOTIFICATION);
+    if (occurrences) {
+        *occurrences = this->results.size();
+    }
+    bool found;
+    if (index - 1 >= this->results.size()) {
+        if (matchRect) {
+            *matchRect = XojPdfRectangle(0, 0, 0, 0);
+        }
+        found = false;
+    } else {
+        if (matchRect) {
+            this->highlightRect = &this->results[index - 1];
+            *matchRect = *this->highlightRect;
+        }
+        found = true;
+    }
+    return found;
+}
diff --git a/entry/src/main/cpp/src/core/control/SearchControl.h b/entry/src/main/cpp/src/core/control/SearchControl.h
new file mode 100644
index 0000000..7fb64b9
--- /dev/null
+++ b/entry/src/main/cpp/src/core/control/SearchControl.h
@@ -0,0 +1,52 @@
+/*
+ * Xournal++
+ *
+ * Handles text search on a PDF page and in Xournal Texts
+ *
+ * @author Xournal++ Team
+ * https://github.com/xournalpp/xournalpp
+ *
+ * @license GNU GPLv2 or later
+ */
+
+#pragma once
+
+#include <string>  // for string
+#include <vector>  // for vector
+
+#include "model/OverlayBase.h"
+#include "model/PageRef.h"        // for PageRef
+#include "model/Point.h"          // for Point
+#include "pdf/base/XojPdfPage.h"  // for XojPdfPageSPtr, XojPdfRectangle
+#include "util/DispatchPool.h"
+
+namespace xoj::view {
+class OverlayView;
+class Repaintable;
+class SearchResultView;
+};  // namespace xoj::view
+
+class SearchControl: public OverlayBase {
+public:
+    SearchControl(const PageRef& page, XojPdfPageSPtr pdf);
+    virtual ~SearchControl();
+
+    bool search(const std::string& text, size_t index, size_t* occurrences, XojPdfRectangle* UpperMostMatch);
+
+    const std::vector<XojPdfRectangle>& getResults() const { return results; }
+
+    const XojPdfRectangle* getHighlightRect() const { return highlightRect; }
+
+    const std::shared_ptr<xoj::util::DispatchPool<xoj::view::SearchResultView>>& getViewPool() const {
+        return viewPool;
+    }
+
+private:
+    PageRef page;
+    XojPdfPageSPtr pdf;
+    std::string currentText;
+    XojPdfRectangle* highlightRect = nullptr;
+
+    std::vector<XojPdfRectangle> results;
+    std::shared_ptr<xoj::util::DispatchPool<xoj::view::SearchResultView>> viewPool;
+};
diff --git a/entry/src/main/cpp/src/core/control/SetsquareController.cpp b/entry/src/main/cpp/src/core/control/SetsquareController.cpp
new file mode 100644
index 0000000..3aba742
--- /dev/null
+++ b/entry/src/main/cpp/src/core/control/SetsquareController.cpp
@@ -0,0 +1,120 @@
+#include "SetsquareController.h"
+
+#include "control/Control.h"
+#include "control/layer/LayerController.h"
+#include "gui/XournalView.h"
+#include "model/GeometryTool.h"
+#include "model/Setsquare.h"
+#include "model/Stroke.h"
+#include "model/XojPage.h"
+
+using xoj::util::Rectangle;
+SetsquareController::SetsquareController(XojPageView* view, Setsquare* setsquare):
+        GeometryToolController(view, setsquare) {}
+
+SetsquareController::~SetsquareController() = default;
+
+auto SetsquareController::getType() const -> GeometryToolType { return GeometryToolType::SETSQUARE; }
+
+auto SetsquareController::posRelToSide(Leg leg, double x, double y) const -> xoj::util::Point<double> {
+    cairo_matrix_t matrix = geometryTool->getMatrix();
+    cairo_matrix_invert(&matrix);
+    cairo_matrix_transform_point(&matrix, &x, &y);
+    switch (leg) {
+        case HYPOTENUSE:
+            return xoj::util::Point<double>(x, -y);
+        case LEFT_LEG:
+            return xoj::util::Point<double>((y + x) / std::sqrt(2.),
+                                            (y - x - geometryTool->getHeight()) / std::sqrt(2.));
+        case RIGHT_LEG:
+            return xoj::util::Point<double>((y - x) / std::sqrt(2.),
+                                            (y + x - geometryTool->getHeight()) / std::sqrt(2.));
+        default:
+            g_error("Invalid enum value: %d", leg);
+    }
+}
+
+auto SetsquareController::isInsideGeometryTool(double x, double y, double border) const -> bool {
+    return posRelToSide(HYPOTENUSE, x, y).y < border && posRelToSide(LEFT_LEG, x, y).y < border &&
+           posRelToSide(RIGHT_LEG, x, y).y < border;
+}
+
+auto SetsquareController::getPointForPos(double xCoord) const -> xoj::util::Point<double> {
+    double x = xCoord;
+    double y = 0.0;
+    cairo_matrix_t matrix = geometryTool->getMatrix();
+    cairo_matrix_transform_point(&matrix, &x, &y);
+
+    return xoj::util::Point<double>(x, y);
+}
+
+void SetsquareController::createEdgeStroke(double x) {
+    if (!std::isnan(x)) {
+        hypotenuseMax = x;
+        hypotenuseMin = x;
+
+        const auto p = this->getPointForPos(x);
+        initializeStroke();
+        stroke->addPoint(Point(p.x, p.y));
+        stroke->addPoint(Point(p.x, p.y));  // doubled point
+        geometryTool->notify();
+    } else {
+        g_warning("No valid stroke from setsquare!");
+    }
+}
+
+void SetsquareController::createRadialStroke(double x, double y) {
+    const auto p = posRelToSide(HYPOTENUSE, x, y);
+    this->strokeAngle = std::atan2(p.y, p.x);
+    initializeStroke();
+    updateRadialStroke(x, y);
+}
+
+void SetsquareController::updateEdgeStroke(double x) {
+    hypotenuseMax = std::max(this->hypotenuseMax, x);
+    hypotenuseMin = std::min(this->hypotenuseMin, x);
+    stroke->deletePointsFrom(0);
+    const auto p1 = getPointForPos(hypotenuseMin);
+    const auto p2 = getPointForPos(hypotenuseMax);
+
+    stroke->addPoint(Point(p1.x, p1.y));
+    stroke->addPoint(Point(p2.x, p2.y));
+    geometryTool->notify();
+}
+
+void SetsquareController::updateRadialStroke(double x, double y) {
+    stroke->deletePointsFrom(0);
+    const auto c = getPointForPos(0);
+    stroke->addPoint(Point(c.x, c.y));
+
+    const auto p = posRelToSide(HYPOTENUSE, x, y);
+    const auto rad = std::hypot(p.x, p.y);
+
+    if (rad >= Setsquare::radiusFromHeight(geometryTool->getHeight()) || p.y > 0) {
+        this->strokeAngle = std::atan2(p.y, p.x);
+        stroke->addPoint(Point(x, y));
+    } else {
+        cairo_matrix_t matrix = geometryTool->getMatrix();
+        auto qx = rad * std::cos(this->strokeAngle);
+        auto qy = -rad * std::sin(this->strokeAngle);
+        cairo_matrix_transform_point(&matrix, &qx, &qy);
+
+        stroke->addPoint(Point(qx, qy));
+    }
+    geometryTool->notify();
+}
+
+void SetsquareController::finalizeEdgeStroke() {
+    hypotenuseMax = std::numeric_limits<double>::lowest();
+    hypotenuseMin = std::numeric_limits<double>::max();
+    addStrokeToLayer();
+}
+
+void SetsquareController::finalizeRadialStroke() {
+    strokeAngle = NAN;
+    addStrokeToLayer();
+}
+
+auto SetsquareController::existsEdgeStroke() -> bool { return hypotenuseMax != std::numeric_limits<double>::lowest(); }
+
+auto SetsquareController::existsRadialStroke() -> bool { return !std::isnan(strokeAngle); }
diff --git a/entry/src/main/cpp/src/core/control/SetsquareController.h b/entry/src/main/cpp/src/core/control/SetsquareController.h
new file mode 100644
index 0000000..0425e29
--- /dev/null
+++ b/entry/src/main/cpp/src/core/control/SetsquareController.h
@@ -0,0 +1,130 @@
+/*
+ * Xournal++
+ *
+ * A setsquare controller
+ *
+ * @author Xournal++ Team
+ * https://github.com/xournalpp/xournalpp
+ *
+ * @license GNU GPLv2 or later
+ */
+
+#pragma once
+
+#include <gtk/gtk.h>
+
+#include "gui/PageView.h"
+#include "model/GeometryTool.h"
+#include "util/Point.h"
+
+#include "GeometryToolController.h"
+
+class Setsquare;
+class Stroke;
+
+enum Leg { HYPOTENUSE, LEFT_LEG, RIGHT_LEG };
+
+/**
+ * @brief A class that controls a setsquare
+
+ * The setsquare can be moved, rotated and scaled
+ * There are methods for translating coordinates
+ * and methods to deal with the temporary stroke
+ * that is displayed near the longest side or
+ * the midpoint to the longest side of the setsquare.
+ */
+
+class SetsquareController: public GeometryToolController {
+public:
+    SetsquareController(XojPageView* view, Setsquare* setsquare);
+    ~SetsquareController() override;
+
+public:
+    GeometryToolType getType() const override;
+
+    /**
+     * @brief returns the position of a point relative to a coordinate system, in which the given setsquare leg lies on
+     * the x-axis with the origin in its center (where the unit is 1 cm)
+     * @param leg the leg of the setsquare
+     * @param x the x-coordinate of the point (in document coordinates)
+     * @param y the y-coordinate of the point (in document coordinates)
+     */
+    xoj::util::Point<double> posRelToSide(Leg leg, double x, double y) const;
+
+    /**
+     * @brief checks whether a point with given coordinates lies in the setsquare with an additional border enlarging
+     * (or shrinked) it
+     * @param x the x-coordinate of the given point (in document coordinates)
+     * @param y the y-coordinate of the given point (in document coordinates)
+     * @param border the size of the border (if negative, the setsquare is shrinked via the border)
+     */
+    bool isInsideGeometryTool(double x, double y, double border = 0.0) const override;
+
+    /**
+     * @brief the point (in document coordinates) for a given position on the longest side of the setsquare
+     * @param x the x-coordinate of the point on the longest side of the setsquare (when unrotated and untranslated)
+     */
+    xoj::util::Point<double> getPointForPos(double x) const;
+
+    /**
+     * @brief creates a stroke starting at the given position of the longest side of the setsquare
+     * @param x the x-coordinate of the point on the longest side of the setsquare (when unrotated and untranslated)
+     */
+    void createEdgeStroke(double x);
+
+    /**
+     * @brief updates the stroke aligned to the longest side of the setsquare
+     * @param x the x-coordinate of the point on the longest side of the setsquare (when unrotated and untranslated)
+     * updating the stroke
+     */
+    void updateEdgeStroke(double x);
+
+    /**
+     * @brief finishes the stroke aligned to the longest side of the setsquare
+     */
+    void finalizeEdgeStroke();
+
+    /**
+     * @brief creates a radius starting at the given position to the origin of the setsquare
+     * @param x the x-coordinate of the current point
+     * @param y the y-coordinate of the current point
+     */
+    void createRadialStroke(double x, double y);
+
+    /**
+     * @brief updates the radius to the origin of the setsquare
+     * @param x the x-coordinate of the current point
+     * @param y the y-coordinate of the current point
+     * updating the stroke
+     */
+    void updateRadialStroke(double x, double y);
+
+    /**
+     * @brief finishes the radius to the origin of the setsquare
+     */
+    void finalizeRadialStroke();
+
+    /**
+     * checks whether a stroke already exists
+     */
+    bool existsEdgeStroke();
+
+    /**
+     * checks whether a radius already exists
+     */
+    bool existsRadialStroke();
+
+private:
+    /**
+     * @brief when a stroke aligned to the longest side (hypotenuse) of the setsquare is drawn, the minimal and maximal
+     * x-coordinates of the point to be drawn (with respect to an unrotated, and untranslated coordinate system) are
+     * saved in the variables hypotenuseMin and hypotenuseMax
+     */
+    double hypotenuseMax = std::numeric_limits<double>::lowest();
+    double hypotenuseMin = std::numeric_limits<double>::max();
+
+    /**
+     * @brief the current angle at which the temporary radius is drawn
+     */
+    double strokeAngle = NAN;
+};
diff --git a/entry/src/main/cpp/src/core/control/Tool.cpp b/entry/src/main/cpp/src/core/control/Tool.cpp
new file mode 100644
index 0000000..b70b058
--- /dev/null
+++ b/entry/src/main/cpp/src/core/control/Tool.cpp
@@ -0,0 +1,38 @@
+#include "Tool.h"
+
+#include <optional>
+#include <utility>
+
+Tool::Tool(std::string name, ToolType type, Color color, std::optional<std::array<double, toolSizes>> thickness):
+        name{std::move(name)},
+        type{type},
+        thickness{std::move(thickness)},
+        capabilities{xoj::tool::typeToCapabilities(type)} {
+    setColor(color);
+}
+
+Tool::Tool(const Tool& t): name{t.name}, type{t.type}, thickness{t.thickness}, capabilities{t.capabilities} {
+    setColor(t.getColor());
+}
+
+Tool::~Tool() {}
+
+auto Tool::getName() const -> std::string { return this->name; }
+
+auto Tool::getToolType() const -> ToolType { return this->type; }
+
+void Tool::setCapability(ToolCapabilities capability, bool enabled) {
+    if (enabled) {
+        this->capabilities = static_cast<ToolCapabilities>(this->capabilities | capability);
+    } else {
+        this->capabilities = static_cast<ToolCapabilities>(this->capabilities & ~capability);
+    }
+}
+
+auto Tool::hasCapability(ToolCapabilities cap) const -> bool { return (this->capabilities & cap) != 0; }
+
+auto Tool::getThickness(ToolSize size) const -> double { return this->thickness.value()[size - TOOL_SIZE_VERY_FINE]; }
+
+auto Tool::isDrawingTool() const -> bool {
+    return this->type == TOOL_PEN || this->type == TOOL_HIGHLIGHTER || this->type == TOOL_ERASER;
+}
diff --git a/entry/src/main/cpp/src/core/control/Tool.h b/entry/src/main/cpp/src/core/control/Tool.h
new file mode 100644
index 0000000..2c31a94
--- /dev/null
+++ b/entry/src/main/cpp/src/core/control/Tool.h
@@ -0,0 +1,77 @@
+/*
+ * Xournal++
+ *
+ * A tool
+ *
+ * @author Xournal++ Team
+ * https://github.com/xournalpp/xournalpp
+ *
+ * @license GNU GPLv2 or later
+ */
+
+#pragma once
+
+#include <array>     // for array
+#include <optional>  // for optional
+#include <string>    // for string
+
+#include "control/ToolEnums.h"  // for ToolType, ToolCapabilities, ToolSize
+#include "util/Color.h"         // for Color
+
+#include "ToolBase.h"  // for ToolBase
+
+
+class Tool: public ToolBase {
+public:
+    /**
+     * @brief number of different sizes defined for tools with Size capability
+     *
+     */
+    static constexpr int toolSizes = 5;
+
+    Tool(std::string name, ToolType type, Color color, std::optional<std::array<double, Tool::toolSizes>> thickness);
+    /**
+     * @brief Construct a new Tool object based on another tool.
+     * @param t tool to use as basis for new copy.
+     */
+    Tool(const Tool& t);
+    ~Tool() override;
+
+public:
+    std::string getName() const;
+
+    ToolType getToolType() const;
+
+    bool hasCapability(ToolCapabilities cap) const;
+
+    double getThickness(ToolSize size) const;
+
+    /**
+     * @brief Check whether the tool is a Drawing tool.
+     * Drawing tools are considered all tools that directly change the canvas.
+     * Right now these are:
+     *  - Highlighter
+     *  - Pen
+     *  - Eraser
+     *
+     * @return true if tool is a drawing tool
+     * @return false if tool is no drawing tool
+     */
+    bool isDrawingTool() const;
+
+protected:
+    void setCapability(ToolCapabilities capability, bool enabled);
+
+private:
+    void operator=(const Tool& t);
+
+private:
+    std::string name;
+    ToolType type;
+
+    std::optional<std::array<double, toolSizes>> thickness;
+
+    ToolCapabilities capabilities;
+
+    friend class ToolHandler;
+};
diff --git a/entry/src/main/cpp/src/core/control/ToolBase.cpp b/entry/src/main/cpp/src/core/control/ToolBase.cpp
new file mode 100644
index 0000000..db50a40
--- /dev/null
+++ b/entry/src/main/cpp/src/core/control/ToolBase.cpp
@@ -0,0 +1,77 @@
+#include "ToolBase.h"
+
+#include "control/ToolEnums.h"  // for DrawingType, EraserType, ToolSize
+
+ToolBase::ToolBase() = default;
+
+ToolBase::~ToolBase() = default;
+
+/**
+ * @return Color of the tool for all drawing tools
+ */
+auto ToolBase::getColor() const -> Color { return this->color; }
+
+/**
+ * @param color Color of the tool for all drawing tools
+ */
+void ToolBase::setColor(Color color) { this->color = color; }
+
+/**
+ * @return Size of a drawing tool
+ */
+auto ToolBase::getSize() const -> ToolSize { return this->size; }
+
+/**
+ * @param size Size of a drawing tool
+ */
+void ToolBase::setSize(ToolSize size) { this->size = size; }
+
+/**
+ * @return Draw special shape
+ */
+auto ToolBase::getDrawingType() const -> DrawingType { return this->drawingType; }
+
+/**
+ * @param drawingType Draw special shape
+ */
+void ToolBase::setDrawingType(DrawingType drawingType) { this->drawingType = drawingType; }
+
+/**
+ * @return Eraser Type
+ */
+auto ToolBase::getEraserType() const -> EraserType { return this->eraserType; }
+
+/**
+ * @param eraserType type of eraser
+ */
+void ToolBase::setEraserType(EraserType eraserType) { this->eraserType = eraserType; }
+
+/**
+ * @return Fill of the shape is enabled
+ */
+auto ToolBase::getFill() const -> bool { return this->fill; }
+
+/**
+ * @param fill Fill of the shape is enabled
+ */
+void ToolBase::setFill(bool fill) { this->fill = fill; }
+
+/**
+ * @return Alpha for fill
+ */
+auto ToolBase::getFillAlpha() const -> int { return this->fillAlpha; }
+
+/**
+ * @param fillAlpha Alpha for fill
+ */
+void ToolBase::setFillAlpha(int fillAlpha) { this->fillAlpha = fillAlpha; }
+
+/**
+ * @return Style of the line drawing
+ */
+auto ToolBase::getLineStyle() const -> const LineStyle& { return this->lineStyle; }
+
+/**
+ * @param style Style of the line drawing
+ */
+void ToolBase::setLineStyle(const LineStyle& style) { this->lineStyle = style; }
diff --git a/entry/src/main/cpp/src/core/control/ToolBase.h b/entry/src/main/cpp/src/core/control/ToolBase.h
new file mode 100644
index 0000000..0fb4c25
--- /dev/null
+++ b/entry/src/main/cpp/src/core/control/ToolBase.h
@@ -0,0 +1,140 @@
+/*
+ * Xournal++
+ *
+ * Base class for a tool, which contains the tool configuration,
+ * this is also used for other classes, e.g. to store current tool configuration
+ *
+ * @author Xournal++ Team
+ * https://github.com/xournalpp/xournalpp
+ *
+ * @license GNU GPLv2 or later
+ */
+
+#pragma once
+
+#include "model/LineStyle.h"  // for LineStyle
+#include "util/Color.h"       // for Color
+
+#include "ToolEnums.h"  // for DrawingType, EraserType, ToolSize, DRAW...
+
+
+class ToolBase {
+public:
+    ToolBase();
+    virtual ~ToolBase();
+
+private:
+    void operator=(const ToolBase& t);
+    ToolBase(const ToolBase& t);
+
+public:
+    /**
+     * @return Color of the tool for all drawing tools
+     */
+    Color getColor() const;
+
+    /**
+     * @param color Color of the tool for all drawing tools
+     */
+    virtual void setColor(Color color);
+
+    /**
+     * @return Size of a drawing tool
+     */
+    ToolSize getSize() const;
+
+    /**
+     * @param size Size of a drawing tool
+     */
+    void setSize(ToolSize size);
+
+    /**
+     * @return Draw special shape
+     */
+    DrawingType getDrawingType() const;
+
+    /**
+     * @param drawingType Draw special shape
+     */
+    void setDrawingType(DrawingType drawingType);
+
+    /**
+     * @brief Get the Eraser Type object
+     *
+     * @return EraserType
+     */
+    EraserType getEraserType() const;
+
+    /**
+     * @brief Set the Eraser Type object
+     *
+     * @param eraserType
+     */
+    void setEraserType(EraserType eraserType);
+
+    /**
+     * @return Fill of the shape is enabled
+     */
+    bool getFill() const;
+
+    /**
+     * @param fill Fill of the shape is enabled
+     */
+    void setFill(bool fill);
+
+    /**
+     * @return Alpha for fill
+     */
+    int getFillAlpha() const;
+
+    /**
+     * @param fillAlpha Alpha for fill
+     */
+    void setFillAlpha(int fillAlpha);
+
+    /**
+     * @return Style of the line drawing
+     */
+    const LineStyle& getLineStyle() const;
+
+    /**
+     * @param style Style of the line drawing
+     */
+    void setLineStyle(const LineStyle& style);
+
+private:
+    /**
+     * Color of the tool for all drawing tools
+     */
+    Color color = Colors::black;
+
+    /**
+     * Size of a drawing tool
+     */
+    ToolSize size = TOOL_SIZE_MEDIUM;
+
+    /**
+     * Draw special shape
+     */
+    DrawingType drawingType = DRAWING_TYPE_DEFAULT;
+
+    /**
+     * Eraser type
+     */
+    EraserType eraserType = ERASER_TYPE_DEFAULT;
+
+    /**
+     * Fill of the shape is enabled
+     */
+    bool fill = false;
+
+    /**
+     * Alpha for fill
+     */
+    int fillAlpha = 128;
+
+    /**
+     * Style of the line drawing
+     */
+    LineStyle lineStyle;
+};
diff --git a/entry/src/main/cpp/src/core/control/ToolEnums.cpp b/entry/src/main/cpp/src/core/control/ToolEnums.cpp
new file mode 100644
index 0000000..8b91468
--- /dev/null
+++ b/entry/src/main/cpp/src/core/control/ToolEnums.cpp
@@ -0,0 +1,142 @@
+#include "ToolEnums.h"
+
+#include <algorithm>  // for find, remove_if
+
+#include "model/StrokeStyle.h"
+#include "util/Assert.h"
+
+
+auto toolSizeFromString(const std::string& size) -> ToolSize {
+    auto it = std::find(toolSizeNames.begin(), toolSizeNames.end(), size);
+    if (it != toolSizeNames.end()) {
+        return static_cast<ToolSize>(std::distance(toolSizeNames.begin(), it));
+    }
+    return TOOL_SIZE_NONE;
+}
+
+
+auto drawingTypeFromString(const std::string& type) -> DrawingType {
+    auto it = std::find(drawingTypeNames.begin(), drawingTypeNames.end(), type);
+    if (it != drawingTypeNames.end()) {
+        return static_cast<DrawingType>(std::distance(drawingTypeNames.begin(), it));
+    }
+    return DRAWING_TYPE_DEFAULT;
+}
+
+auto isSelectToolType(ToolType type) -> bool {
+    return type == TOOL_SELECT_RECT || type == TOOL_SELECT_REGION || type == TOOL_SELECT_MULTILAYER_RECT ||
+           type == TOOL_SELECT_MULTILAYER_REGION || type == TOOL_SELECT_OBJECT;
+}
+
+auto isSelectToolTypeSingleLayer(ToolType type) -> bool {
+    return type == TOOL_SELECT_RECT || type == TOOL_SELECT_REGION || type == TOOL_SELECT_OBJECT;
+}
+
+auto requiresClearedSelection(ToolType type) -> bool {
+    return type == TOOL_PEN || type == TOOL_HIGHLIGHTER || type == TOOL_ERASER || type == TOOL_TEXT ||
+           type == TOOL_IMAGE || type == TOOL_SELECT_PDF_TEXT_RECT || type == TOOL_SELECT_PDF_TEXT_RECT ||
+           type == TOOL_VERTICAL_SPACE;
+}
+
+
+auto toolTypeFromString(const std::string& type) -> ToolType {
+    auto it = std::find(toolNames.begin(), toolNames.end(), type);
+    if (it != toolNames.end()) {
+        return static_cast<ToolType>(std::distance(toolNames.begin(), it));
+    }
+    // recognize previous spelling of Highlighter, V1.0.19 (Dec 2020) and earlier
+    if (type == "hilighter") {
+        return TOOL_HIGHLIGHTER;
+    }
+    // recognize previous spelling of Ellipse, V1.1.0+dev (Jan 2021) and earlier
+    if (type == "drawCircle") {
+        return TOOL_DRAW_ELLIPSE;
+    }
+    return TOOL_NONE;
+}
+
+
+auto opacityFeatureFromString(const std::string& feature) -> OpacityFeature {
+    auto it = std::find(opacityFeatureNames.begin(), opacityFeatureNames.end(), feature);
+    if (it != opacityFeatureNames.end()) {
+        return static_cast<OpacityFeature>(std::distance(opacityFeatureNames.begin(), it));
+    }
+    return OPACITY_NONE;
+}
+
+
+auto eraserTypeFromString(const std::string& type) -> EraserType {
+    auto it = std::find(eraserTypeNames.begin(), eraserTypeNames.end(), type);
+    if (it != eraserTypeNames.end()) {
+        return static_cast<EraserType>(std::distance(eraserTypeNames.begin(), it));
+    }
+    return ERASER_TYPE_NONE;
+}
+
+auto strokeTypeToLineStyle(StrokeType type) -> LineStyle {
+    switch (type) {
+        case STROKE_TYPE_STANDARD:
+            return {};
+        case STROKE_TYPE_DASHED:
+            return StrokeStyle::parseStyle("dash");
+        case STROKE_TYPE_DASHDOTTED:
+            return StrokeStyle::parseStyle("dashdot");
+        case STROKE_TYPE_DOTTED:
+            return StrokeStyle::parseStyle("dot");
+        default:
+            return {};
+    }
+}
+
+auto strokeTypeFromString(const std::string& type) -> StrokeType {
+    auto it = std::find(strokeTypeNames.begin(), strokeTypeNames.end(), type);
+    if (it != strokeTypeNames.end()) {
+        return static_cast<StrokeType>(std::distance(strokeTypeNames.begin(), it));
+    }
+    return STROKE_TYPE_NONE;
+}
+
+bool xoj::tool::isPdfSelectionTool(ToolType toolType) {
+    return toolType == TOOL_SELECT_PDF_TEXT_LINEAR || toolType == TOOL_SELECT_PDF_TEXT_RECT;
+}
+
+static constexpr auto makeToolCaps() {
+    std::array<std::underlying_type_t<ToolCapabilities>, TOOL_COUNT> caps;
+
+    caps[TOOL_PEN - TOOL_PEN] = TOOL_CAP_COLOR | TOOL_CAP_SIZE | TOOL_CAP_RULER | TOOL_CAP_RECTANGLE |
+                                TOOL_CAP_ELLIPSE | TOOL_CAP_ARROW | TOOL_CAP_DOUBLE_ARROW | TOOL_CAP_SPLINE |
+                                TOOL_CAP_RECOGNIZER | TOOL_CAP_FILL | TOOL_CAP_LINE_STYLE;
+    caps[TOOL_ERASER - TOOL_PEN] = TOOL_CAP_SIZE;
+    caps[TOOL_HIGHLIGHTER - TOOL_PEN] = TOOL_CAP_COLOR | TOOL_CAP_SIZE | TOOL_CAP_RULER | TOOL_CAP_RECTANGLE |
+                                        TOOL_CAP_ELLIPSE | TOOL_CAP_ARROW | TOOL_CAP_DOUBLE_ARROW | TOOL_CAP_SPLINE |
+                                        TOOL_CAP_RECOGNIZER | TOOL_CAP_FILL;
+    caps[TOOL_TEXT - TOOL_PEN] = TOOL_CAP_COLOR;
+    caps[TOOL_IMAGE - TOOL_PEN] = TOOL_CAP_NONE;
+    caps[TOOL_SELECT_RECT - TOOL_PEN] = TOOL_CAP_NONE;
+    caps[TOOL_SELECT_REGION - TOOL_PEN] = TOOL_CAP_NONE;
+    caps[TOOL_SELECT_MULTILAYER_RECT - TOOL_PEN] = TOOL_CAP_NONE;
+    caps[TOOL_SELECT_MULTILAYER_REGION - TOOL_PEN] = TOOL_CAP_NONE;
+    caps[TOOL_SELECT_OBJECT - TOOL_PEN] = TOOL_CAP_NONE;
+    caps[TOOL_VERTICAL_SPACE - TOOL_PEN] = TOOL_CAP_NONE;
+    caps[TOOL_HAND - TOOL_PEN] = TOOL_CAP_NONE;
+    caps[TOOL_PLAY_OBJECT - TOOL_PEN] = TOOL_CAP_NONE;
+    caps[TOOL_DRAW_RECT - TOOL_PEN] = TOOL_CAP_NONE;
+    caps[TOOL_DRAW_ELLIPSE - TOOL_PEN] = TOOL_CAP_NONE;
+    caps[TOOL_DRAW_ARROW - TOOL_PEN] = TOOL_CAP_NONE;
+    caps[TOOL_DRAW_DOUBLE_ARROW - TOOL_PEN] = TOOL_CAP_NONE;
+    caps[TOOL_DRAW_COORDINATE_SYSTEM - TOOL_PEN] = TOOL_CAP_NONE;
+    caps[TOOL_DRAW_SPLINE - TOOL_PEN] = TOOL_CAP_NONE;
+    caps[TOOL_FLOATING_TOOLBOX - TOOL_PEN] = TOOL_CAP_NONE;
+    caps[TOOL_SELECT_PDF_TEXT_LINEAR - TOOL_PEN] = TOOL_CAP_COLOR;
+    caps[TOOL_SELECT_PDF_TEXT_RECT - TOOL_PEN] = TOOL_CAP_COLOR;
+    caps[TOOL_LASER_POINTER_PEN - TOOL_PEN] = TOOL_CAP_COLOR | TOOL_CAP_SIZE;
+    caps[TOOL_LASER_POINTER_HIGHLIGHTER - TOOL_PEN] = TOOL_CAP_COLOR | TOOL_CAP_SIZE;
+
+    return caps;
+}
+
+auto xoj::tool::typeToCapabilities(ToolType type) -> ToolCapabilities {
+    static constexpr auto caps = makeToolCaps();
+    xoj_assert(type >= TOOL_PEN && type - TOOL_PEN < TOOL_COUNT);
+    return static_cast<ToolCapabilities>(caps[type - TOOL_PEN]);
+}
diff --git a/entry/src/main/cpp/src/core/control/ToolEnums.h b/entry/src/main/cpp/src/core/control/ToolEnums.h
new file mode 100644
index 0000000..44089de
--- /dev/null
+++ b/entry/src/main/cpp/src/core/control/ToolEnums.h
@@ -0,0 +1,200 @@
+/*
+ * Xournal++
+ *
+ * Enum definition used for tools
+ *
+ * @author Xournal++ Team
+ * https://github.com/xournalpp/xournalpp
+ *
+ * @license GNU GPLv2 or later
+ */
+
+#pragma once
+
+#include <array>
+#include <string>  // for string
+
+#include "model/LineStyle.h"
+
+enum ToolSize {
+    TOOL_SIZE_VERY_FINE = 0,
+    TOOL_SIZE_FINE,
+    TOOL_SIZE_MEDIUM,
+    TOOL_SIZE_THICK,
+    TOOL_SIZE_VERY_THICK,
+    // None has to be at the end, because this enum is used as memory offset
+    TOOL_SIZE_NONE
+};
+
+static constexpr std::array<std::string_view, 6> toolSizeNames{"veryThin", "thin",      "medium",
+                                                               "thick",    "veryThick", "none"};
+
+static constexpr std::string_view toolSizeToString(ToolSize size) {
+    return toolSizeNames.at(static_cast<size_t>(size));
+}
+ToolSize toolSizeFromString(const std::string& size);
+
+
+enum DrawingType {
+    /**
+     * For config entry, don't change value
+     */
+    DRAWING_TYPE_DONT_CHANGE = 0,
+
+    /**
+     * Default drawing, nothing special
+     */
+    DRAWING_TYPE_DEFAULT,
+    DRAWING_TYPE_LINE,
+    DRAWING_TYPE_RECTANGLE,
+    DRAWING_TYPE_ELLIPSE,
+    DRAWING_TYPE_ARROW,
+    DRAWING_TYPE_DOUBLE_ARROW,
+    DRAWING_TYPE_COORDINATE_SYSTEM,
+    DRAWING_TYPE_SHAPE_RECOGNIZER,
+    DRAWING_TYPE_SPLINE
+};
+static constexpr std::array<std::string_view, 10> drawingTypeNames{
+        "dontChange",           "default",          "line",  "rectangle", "ellipse", "arrow", "doubleArrow",
+        "drawCoordinateSystem", "strokeRecognizer", "spline"};
+
+static constexpr std::string_view drawingTypeToString(DrawingType type) {
+    return drawingTypeNames.at(static_cast<size_t>(type));
+}
+DrawingType drawingTypeFromString(const std::string& type);
+
+// The numbers must agree with the action's targets in ui/mainmenubar.xml
+enum ToolType {
+    TOOL_NONE = 0,
+
+    // First valid tool, often used starting Index 0
+    TOOL_PEN = 1,
+    TOOL_ERASER = 2,
+    TOOL_HIGHLIGHTER = 3,
+    TOOL_TEXT = 4,
+    TOOL_IMAGE = 5,
+    TOOL_SELECT_RECT = 6,
+    TOOL_SELECT_REGION = 7,
+    TOOL_SELECT_MULTILAYER_RECT = 8,
+    TOOL_SELECT_MULTILAYER_REGION = 9,
+    TOOL_SELECT_OBJECT = 10,
+    TOOL_PLAY_OBJECT = 11,
+    TOOL_VERTICAL_SPACE = 12,
+    TOOL_HAND = 13,
+    TOOL_DRAW_RECT = 14,
+    TOOL_DRAW_ELLIPSE = 15,
+    TOOL_DRAW_ARROW = 16,
+    TOOL_DRAW_DOUBLE_ARROW = 17,
+    TOOL_DRAW_COORDINATE_SYSTEM = 18,
+    TOOL_FLOATING_TOOLBOX = 19,
+    TOOL_DRAW_SPLINE = 20,
+    TOOL_SELECT_PDF_TEXT_LINEAR = 21,
+    TOOL_SELECT_PDF_TEXT_RECT = 22,
+    TOOL_LASER_POINTER_PEN = 23,
+    TOOL_LASER_POINTER_HIGHLIGHTER = 24,
+
+    TOOL_END_ENTRY
+};
+static constexpr std::array<std::string_view, 25> toolNames{"none",
+                                                            "pen",
+                                                            "eraser",
+                                                            "highlighter",
+                                                            "text",
+                                                            "image",
+                                                            "selectRect",
+                                                            "selectRegion",
+                                                            "selectMultiLayerRect",
+                                                            "selectMultiLayerRegion",
+                                                            "selectObject",
+                                                            "playObject",
+                                                            "verticalSpace",
+                                                            "hand",
+                                                            "drawRect",
+                                                            "drawEllipse",
+                                                            "drawArrow",
+                                                            "drawDoubleArrow",
+                                                            "drawCoordinateSystem",
+                                                            "showFloatingToolbox",
+                                                            "drawSpline",
+                                                            "selectPdfTextLinear",
+                                                            "selectPdfTextRect",
+                                                            "laserPointerPen",
+                                                            "laserPointerHighlighter"};
+
+auto isSelectToolType(ToolType type) -> bool;
+auto isSelectToolTypeSingleLayer(ToolType type) -> bool;
+
+/**
+ * @brief Whether or not the tool needs the selection to be cleared when selected
+ */
+auto requiresClearedSelection(ToolType type) -> bool;
+
+// The count of tools
+#define TOOL_COUNT (TOOL_END_ENTRY - 1)
+
+static constexpr std::string_view toolTypeToString(ToolType type) { return toolNames.at(static_cast<size_t>(type)); }
+ToolType toolTypeFromString(const std::string& type);
+
+
+enum OpacityFeature {
+    OPACITY_NONE,
+    OPACITY_FILL_PEN,
+    OPACITY_FILL_HIGHLIGHTER,
+    OPACITY_SELECT_PDF_TEXT_MARKER,
+};
+static constexpr std::array<std::string_view, 4> opacityFeatureNames{"none", "opacityFillPen", "opacityFillHighlighter",
+                                                                     "opacitySelectPdfTextMarker"};
+
+static constexpr std::string_view opacityFeatureToString(OpacityFeature feature) {
+    return opacityFeatureNames.at(static_cast<size_t>(feature));
+}
+OpacityFeature opacityFeatureFromString(const std::string& feature);
+
+enum EraserType { ERASER_TYPE_NONE = 0, ERASER_TYPE_DEFAULT, ERASER_TYPE_WHITEOUT, ERASER_TYPE_DELETE_STROKE };
+static constexpr std::array<std::string_view, 4> eraserTypeNames{"none", "default", "whiteout", "deleteStroke"};
+
+static constexpr std::string_view eraserTypeToString(EraserType type) {
+    return eraserTypeNames.at(static_cast<size_t>(type));
+}
+EraserType eraserTypeFromString(const std::string& type);
+
+
+enum ToolCapabilities : unsigned int {
+    TOOL_CAP_NONE = 0,
+    TOOL_CAP_COLOR = 1 << 0,
+    TOOL_CAP_SIZE = 1 << 1,
+    TOOL_CAP_RULER = 1 << 2,
+    TOOL_CAP_RECTANGLE = 1 << 3,
+    TOOL_CAP_ELLIPSE = 1 << 4,
+    TOOL_CAP_ARROW = 1 << 5,
+    TOOL_CAP_DOUBLE_ARROW = 1 << 6,
+    TOOL_CAP_RECOGNIZER = 1 << 7,
+    TOOL_CAP_FILL = 1 << 8,
+    TOOL_CAP_COORDINATE_SYSTEM = 1 << 9,
+    TOOL_CAP_SPLINE = 1 << 10,
+    TOOL_CAP_LINE_STYLE = 1 << 11
+};
+
+enum StrokeType {
+    STROKE_TYPE_NONE = 0,
+    STROKE_TYPE_STANDARD = 1,
+    STROKE_TYPE_DASHED = 2,
+    STROKE_TYPE_DASHDOTTED = 3,
+    STROKE_TYPE_DOTTED = 4
+};
+
+static constexpr std::array<std::string_view, 5> strokeTypeNames{"none", "standard", "dashed", "dashdot", "dot"};
+
+auto strokeTypeFromString(const std::string& type) -> StrokeType;
+auto strokeTypeToLineStyle(StrokeType type) -> LineStyle;
+static constexpr auto strokeTypeToString(StrokeType type) -> std::string_view {
+    return strokeTypeNames.at(static_cast<size_t>(type));
+}
+
+namespace xoj::tool {
+/// \return Whether the provided tool is used for selecting objects on a PDF.
+bool isPdfSelectionTool(ToolType toolType);
+
+ToolCapabilities typeToCapabilities(ToolType type);
+static inline bool hasCapability(ToolType type, ToolCapabilities cap) { return typeToCapabilities(type) & cap; }
+}  // namespace xoj::tool
diff --git a/entry/src/main/cpp/src/core/control/ToolHandler.cpp b/entry/src/main/cpp/src/core/control/ToolHandler.cpp
new file mode 100644
index 0000000..8289e33
--- /dev/null
+++ b/entry/src/main/cpp/src/core/control/ToolHandler.cpp
@@ -0,0 +1,699 @@
+#include "ToolHandler.h"
+
+#include <algorithm>  // for clamp
+#include <cstdint>    // for uint32_t
+#include <cstdio>     // for size_t
+#include <optional>   // for nullopt, optional
+#include <string>     // for operator==, string, basic_string
+#include <utility>    // for move
+
+#include <glib.h>  // for g_warning, g_error
+
+#include "control/Tool.h"  // for Tool, Tool::toolSizes
+#include "control/actions/ActionDatabase.h"
+#include "control/settings/Settings.h"  // for SElement, Settings
+#include "model/StrokeStyle.h"          // for StrokeStyle
+#include "util/Assert.h"
+#include "util/Color.h"
+#include "util/Stacktrace.h"  // for Stac...
+#include "util/safe_casts.h"  // for as_unsigned
+
+
+class LineStyle;
+
+
+ToolListener::~ToolListener() = default;
+
+ToolHandler::ToolHandler(ToolListener* stateChangeListener, ActionDatabase* actionDB, Settings* settings):
+        stateChangeListener(stateChangeListener), actionDB(actionDB), settings(settings) {
+    initTools();
+}
+
+class ToolSelectPDFText: public Tool {
+public:
+    ToolSelectPDFText(std::string name, ToolType type, Color color): Tool(name, type, color, std::nullopt) {}
+
+    ~ToolSelectPDFText() override{};
+
+    void setColor(Color color) override {
+        if (color.alpha == 0) {
+            color.alpha = DEFAULT_SELECT_PDF_TEXT_MARKER_OPACITY;
+        }
+        Tool::setColor(color);
+    }
+
+private:
+    static const int DEFAULT_SELECT_PDF_TEXT_MARKER_OPACITY = 60;
+};
+
+void ToolHandler::initTools() {
+    std::array<double, Tool::toolSizes> thickness;
+    // pen thicknesses = 0.15, 0.3, 0.5, 0.8, 2 mm
+    thickness[TOOL_SIZE_VERY_FINE] = 0.42;
+    thickness[TOOL_SIZE_FINE] = 0.85;
+    thickness[TOOL_SIZE_MEDIUM] = 1.41;
+    thickness[TOOL_SIZE_THICK] = 2.26;
+    thickness[TOOL_SIZE_VERY_THICK] = 5.67;
+    tools[TOOL_PEN - TOOL_PEN] = std::make_unique<Tool>("pen", TOOL_PEN, Colors::xopp_royalblue, thickness);
+
+    thickness[TOOL_SIZE_VERY_FINE] = 1;
+    thickness[TOOL_SIZE_FINE] = 2.83;
+    thickness[TOOL_SIZE_MEDIUM] = 8.50;
+    thickness[TOOL_SIZE_THICK] = 12;
+    thickness[TOOL_SIZE_VERY_THICK] = 18;
+    tools[TOOL_ERASER - TOOL_PEN] = std::make_unique<Tool>("eraser", TOOL_ERASER, Colors::black, thickness);
+
+    // highlighter thicknesses = 1, 3, 7 mm
+    thickness[TOOL_SIZE_VERY_FINE] = 1;
+    thickness[TOOL_SIZE_FINE] = 2.83;
+    thickness[TOOL_SIZE_MEDIUM] = 8.50;
+    thickness[TOOL_SIZE_THICK] = 19.84;
+    thickness[TOOL_SIZE_VERY_THICK] = 30;
+    tools[TOOL_HIGHLIGHTER - TOOL_PEN] =
+            std::make_unique<Tool>("highlighter", TOOL_HIGHLIGHTER, Colors::yellow, thickness);
+
+    tools[TOOL_TEXT - TOOL_PEN] = std::make_unique<Tool>("text", TOOL_TEXT, Colors::black, std::nullopt);
+
+    tools[TOOL_IMAGE - TOOL_PEN] = std::make_unique<Tool>("image", TOOL_IMAGE, Colors::black, std::nullopt);
+
+    tools[TOOL_SELECT_RECT - TOOL_PEN] =
+            std::make_unique<Tool>("selectRect", TOOL_SELECT_RECT, Colors::black, std::nullopt);
+
+    tools[TOOL_SELECT_REGION - TOOL_PEN] =
+            std::make_unique<Tool>("selectRegion", TOOL_SELECT_REGION, Colors::black, std::nullopt);
+
+    tools[TOOL_SELECT_MULTILAYER_RECT - TOOL_PEN] =
+            std::make_unique<Tool>("selectMultiLayerRect", TOOL_SELECT_MULTILAYER_RECT, Colors::black, std::nullopt);
+
+    tools[TOOL_SELECT_MULTILAYER_REGION - TOOL_PEN] = std::make_unique<Tool>(
+            "selectMultiLayerRegion", TOOL_SELECT_MULTILAYER_REGION, Colors::black, std::nullopt);
+
+    tools[TOOL_SELECT_OBJECT - TOOL_PEN] =
+            std::make_unique<Tool>("selectObject", TOOL_SELECT_OBJECT, Colors::black, std::nullopt);
+
+    tools[TOOL_VERTICAL_SPACE - TOOL_PEN] =
+            std::make_unique<Tool>("verticalSpace", TOOL_VERTICAL_SPACE, Colors::black, std::nullopt);
+
+    tools[TOOL_HAND - TOOL_PEN] = std::make_unique<Tool>("hand", TOOL_HAND, Colors::black, std::nullopt);
+
+    tools[TOOL_PLAY_OBJECT - TOOL_PEN] =
+            std::make_unique<Tool>("playObject", TOOL_PLAY_OBJECT, Colors::black, std::nullopt);
+
+    tools[TOOL_DRAW_RECT - TOOL_PEN] = std::make_unique<Tool>("drawRect", TOOL_DRAW_RECT, Colors::black, std::nullopt);
+
+    tools[TOOL_DRAW_ELLIPSE - TOOL_PEN] =
+            std::make_unique<Tool>("drawEllipse", TOOL_DRAW_ELLIPSE, Colors::black, std::nullopt);
+
+    tools[TOOL_DRAW_ARROW - TOOL_PEN] =
+            std::make_unique<Tool>("drawArrow", TOOL_DRAW_ARROW, Colors::black, std::nullopt);
+
+    tools[TOOL_DRAW_DOUBLE_ARROW - TOOL_PEN] =
+            std::make_unique<Tool>("drawDoubleArrow", TOOL_DRAW_DOUBLE_ARROW, Colors::black, std::nullopt);
+
+    tools[TOOL_DRAW_COORDINATE_SYSTEM - TOOL_PEN] =
+            std::make_unique<Tool>("drawCoordinateSystem", TOOL_DRAW_COORDINATE_SYSTEM, Colors::black, std::nullopt);
+
+    tools[TOOL_DRAW_SPLINE - TOOL_PEN] =
+            std::make_unique<Tool>("drawSpline", TOOL_DRAW_SPLINE, Colors::black, std::nullopt);
+
+    tools[TOOL_FLOATING_TOOLBOX - TOOL_PEN] =
+            std::make_unique<Tool>("showFloatingToolbox", TOOL_FLOATING_TOOLBOX, Colors::black, std::nullopt);
+
+    tools[TOOL_SELECT_PDF_TEXT_LINEAR - TOOL_PEN] =
+            std::make_unique<ToolSelectPDFText>("selectPdfTextLinear", TOOL_SELECT_PDF_TEXT_LINEAR, Colors::black);
+
+    tools[TOOL_SELECT_PDF_TEXT_RECT - TOOL_PEN] =
+            std::make_unique<ToolSelectPDFText>("selectPdfTextRect", TOOL_SELECT_PDF_TEXT_RECT, Colors::black);
+
+    thickness[TOOL_SIZE_VERY_FINE] = .7;
+    thickness[TOOL_SIZE_FINE] = 1.41;
+    thickness[TOOL_SIZE_MEDIUM] = 2.4;
+    thickness[TOOL_SIZE_THICK] = 4;
+    thickness[TOOL_SIZE_VERY_THICK] = 7;
+    tools[TOOL_LASER_POINTER_PEN - TOOL_PEN] =
+            std::make_unique<Tool>("laserPointerPen", TOOL_LASER_POINTER_PEN, Colors::red, thickness);
+    thickness[TOOL_SIZE_VERY_FINE] = 1;
+    thickness[TOOL_SIZE_FINE] = 2.83;
+    thickness[TOOL_SIZE_MEDIUM] = 8.50;
+    thickness[TOOL_SIZE_THICK] = 19.84;
+    thickness[TOOL_SIZE_VERY_THICK] = 30;
+    tools[TOOL_LASER_POINTER_HIGHLIGHTER - TOOL_PEN] =
+            std::make_unique<Tool>("laserPointerHighlighter", TOOL_LASER_POINTER_HIGHLIGHTER, Colors::red, thickness);
+
+    this->toolbarSelectedTool = &getTool(TOOL_PEN);
+    this->activeTool = &getTool(TOOL_PEN);
+}
+
+ToolHandler::~ToolHandler() {
+    // Do not delete settings!
+    this->settings = nullptr;
+}
+
+void ToolHandler::setEraserType(EraserType eraserType) {
+    Tool& tool = this->getTool(TOOL_ERASER);
+    tool.setEraserType(eraserType);
+    eraserTypeChanged();
+}
+
+void ToolHandler::setButtonEraserType(EraserType eraserType, Button button) {
+    Tool* tool = getButtonTool(button);
+    xoj_assert(tool);
+    tool->setEraserType(eraserType);
+}
+
+void ToolHandler::eraserTypeChanged() {
+    if (this->actionDB == nullptr) {
+        return;
+    }
+
+    this->actionDB->setActionState(Action::TOOL_ERASER_TYPE, this->getEraserType());
+}
+
+auto ToolHandler::getEraserType() const -> EraserType {
+    // if active tool is eraser get its type
+    if (this->activeTool->type == TOOL_ERASER)
+        return this->activeTool->getEraserType();
+    else  // otherwise get EraserType of Toolbar Eraser
+        return this->getTool(TOOL_ERASER).getEraserType();
+}
+
+void ToolHandler::selectTool(ToolType type) {
+    if (type < 1 || type > TOOL_COUNT) {
+        g_warning("unknown tool selected: %i\n", type);
+        return;
+    }
+    this->toolbarSelectedTool = &getTool(type);
+    // set activeTool is necessary for fireToolChanged()
+    // if called after this method
+    // to result in the correct Button shown as active
+    this->activeTool = this->toolbarSelectedTool;
+}
+
+void ToolHandler::fireToolChanged() const {
+    for (auto&& listener: this->toolChangeListeners) { listener(this->activeTool->type); }
+
+    stateChangeListener->toolChanged();
+}
+
+void ToolHandler::addToolChangedListener(ToolChangedCallback listener) {
+    toolChangeListeners.emplace_back(std::move(listener));
+}
+
+auto ToolHandler::getTool(ToolType type) const -> Tool& { return *(this->tools[type - TOOL_PEN]); }
+
+auto ToolHandler::getActiveTool() const -> Tool* {return this->activeTool; }
+
+auto ToolHandler::getToolType() const -> ToolType {
+    Tool* tool = this->activeTool;
+    return tool->type;
+}
+
+auto ToolHandler::hasCapability(ToolCapabilities cap, SelectedTool selectedTool) const -> bool {
+    Tool* tool = getSelectedTool(selectedTool);
+    return (tool->capabilities & cap) != 0;
+}
+
+auto ToolHandler::isDrawingTool() const -> bool {
+    Tool* tool = this->activeTool;
+    return tool->isDrawingTool();
+}
+
+auto ToolHandler::getSize(SelectedTool selectedTool) const -> ToolSize {
+    Tool* tool = getSelectedTool(selectedTool);
+    return tool->getSize();
+}
+
+auto ToolHandler::getPenSize() const -> ToolSize { return tools[TOOL_PEN - TOOL_PEN]->getSize(); }
+
+auto ToolHandler::getEraserSize() const -> ToolSize { return tools[TOOL_ERASER - TOOL_PEN]->getSize(); }
+
+auto ToolHandler::getHighlighterSize() const -> ToolSize { return tools[TOOL_HIGHLIGHTER - TOOL_PEN]->getSize(); }
+
+void ToolHandler::setPenSize(ToolSize size) {
+    this->tools[TOOL_PEN - TOOL_PEN]->setSize(size);
+
+    if (this->activeTool->type == TOOL_PEN) {
+        this->stateChangeListener->toolSizeChanged();
+    }
+}
+
+void ToolHandler::setEraserSize(ToolSize size) {
+    this->tools[TOOL_ERASER - TOOL_PEN]->setSize(size);
+
+    if (this->activeTool->type == TOOL_ERASER) {
+        this->stateChangeListener->toolSizeChanged();
+    }
+}
+
+void ToolHandler::setHighlighterSize(ToolSize size) {
+    this->tools[TOOL_HIGHLIGHTER - TOOL_PEN]->setSize(size);
+
+    if (this->activeTool->type == TOOL_HIGHLIGHTER) {
+        this->stateChangeListener->toolSizeChanged();
+    }
+}
+
+void ToolHandler::setPenFillEnabled(bool fill) {
+    this->tools[TOOL_PEN - TOOL_PEN]->setFill(fill);
+
+    if (this->activeTool->type == TOOL_PEN) {
+        this->stateChangeListener->toolFillChanged();
+    }
+}
+
+auto ToolHandler::getPenFillEnabled() const -> bool { return this->tools[TOOL_PEN - TOOL_PEN]->getFill(); }
+
+void ToolHandler::setPenFill(int alpha) { this->tools[TOOL_PEN - TOOL_PEN]->setFillAlpha(alpha); }
+
+auto ToolHandler::getPenFill() const -> int { return this->tools[TOOL_PEN - TOOL_PEN]->getFillAlpha(); }
+
+void ToolHandler::setHighlighterFillEnabled(bool fill) {
+    this->tools[TOOL_HIGHLIGHTER - TOOL_PEN]->setFill(fill);
+
+    if (this->activeTool->type == TOOL_HIGHLIGHTER) {
+        this->stateChangeListener->toolFillChanged();
+    }
+}
+
+auto ToolHandler::getHighlighterFillEnabled() const -> bool {
+    return this->tools[TOOL_HIGHLIGHTER - TOOL_PEN]->getFill();
+}
+
+void ToolHandler::setHighlighterFill(int alpha) { this->tools[TOOL_HIGHLIGHTER - TOOL_PEN]->setFillAlpha(alpha); }
+
+auto ToolHandler::getHighlighterFill() const -> int { return this->tools[TOOL_HIGHLIGHTER - TOOL_PEN]->getFillAlpha(); }
+
+static void inline setColorAlpha(Tool& tool, int alpha) {
+    if (tool.hasCapability(TOOL_CAP_COLOR)) {
+        Color color = tool.getColor();
+        color.alpha = static_cast<uint8_t>(alpha);
+        tool.setColor(color);
+    } else {
+        g_warning("setColorAlpha : tool='%s' has no color capability!", tool.getName().c_str());
+        Stacktrace::printStacktrace();
+    }
+}
+
+void ToolHandler::setSelectPDFTextMarkerOpacity(int alpha) {
+    // Use same marker opacity for 'select linear pdf text' or 'select pdf text in rectangle'
+    setColorAlpha(this->getTool(TOOL_SELECT_PDF_TEXT_LINEAR), alpha);
+    setColorAlpha(this->getTool(TOOL_SELECT_PDF_TEXT_RECT), alpha);
+}
+
+auto ToolHandler::getSelectPDFTextMarkerOpacity() const -> int {
+    // Use same marker opacity for 'select linear pdf text' or 'select pdf text in rectangle'
+    return this->getTool(TOOL_SELECT_PDF_TEXT_LINEAR).getColor().alpha;
+}
+
+auto ToolHandler::getThickness() const -> double {
+    Tool* tool = this->activeTool;
+    if (tool->thickness) {
+        return tool->thickness.value()[tool->getSize()];
+    }
+
+    g_warning("Request size of \"%s\"", tool->getName().c_str());
+    return 0;
+}
+
+void ToolHandler::setSize(ToolSize size) {
+    ToolSize clippedSize = std::clamp(size, TOOL_SIZE_VERY_FINE, TOOL_SIZE_VERY_THICK);
+    if (clippedSize != size)
+        g_warning("ToolHandler::setSize: Invalid size! %i", size);
+
+    Tool* tool = this->toolbarSelectedTool;
+    tool->setSize(clippedSize);
+    this->stateChangeListener->toolSizeChanged();
+}
+
+void ToolHandler::setButtonSize(ToolSize size, Button button) {
+    ToolSize clippedSize = std::clamp(size, TOOL_SIZE_VERY_FINE, TOOL_SIZE_VERY_THICK);
+    if (clippedSize != size)
+        g_warning("ToolHandler::setSize: Invalid size! %i", size);
+
+    Tool* tool = getButtonTool(button);
+    xoj_assert(tool);
+    tool->setSize(clippedSize);
+}
+
+void ToolHandler::setLineStyle(const LineStyle& style) {
+    Tool* tool = this->toolbarSelectedTool;
+    tool->setLineStyle(style);
+    this->stateChangeListener->toolLineStyleChanged();
+}
+
+void ToolHandler::setColor(Color color, bool userSelection) {
+    if (this->activeTool != this->toolbarSelectedTool && !this->hasCapability(TOOL_CAP_COLOR, SelectedTool::active)) {
+        this->toolbarSelectedTool->setColor(color);
+    }
+    Tool* tool = this->activeTool;
+    int currentAlpha = tool->getColor().alpha;
+    tool->setColor(color);
+    this->stateChangeListener->toolColorChanged();
+    if (userSelection) {
+        // ensure that tool color alpha is re-applied on new selected color;
+        setColorAlpha(*tool, currentAlpha);
+        this->stateChangeListener->changeColorOfSelection();
+    }
+}
+
+void ToolHandler::setButtonColor(Color color, Button button) {
+    Tool* tool = this->getButtonTool(button);
+    xoj_assert(tool);
+    tool->setColor(color);
+}
+
+auto ToolHandler::getColor() const -> Color { return this->activeTool->getColor(); }
+
+auto ToolHandler::getColorMaskAlpha() const -> Color {
+    Color c = this->activeTool->getColor();
+    c.alpha = 0xff;
+    return c;
+}
+
+void ToolHandler::setFillEnabled(bool fill) {
+    Tool* tool = this->toolbarSelectedTool;
+    tool->setFill(fill);
+    this->stateChangeListener->toolFillChanged();
+}
+
+auto ToolHandler::getFill() const -> int {
+    Tool* tool = this->activeTool;
+    if (!tool->getFill()) {
+        return -1;
+    }
+    return tool->getFillAlpha();
+}
+
+auto ToolHandler::getLineStyle() const -> const LineStyle& {
+    Tool* tool = this->activeTool;
+    return tool->getLineStyle();
+}
+
+auto ToolHandler::getDrawingType(SelectedTool selectedTool) const -> DrawingType {
+    Tool* tool = getSelectedTool(selectedTool);
+    return tool->getDrawingType();
+}
+
+void ToolHandler::setDrawingType(DrawingType drawingType) {
+    Tool* tool = this->toolbarSelectedTool;
+    tool->setDrawingType(drawingType);
+}
+
+void ToolHandler::setButtonDrawingType(DrawingType drawingType, Button button) {
+    Tool* tool = getButtonTool(button);
+    xoj_assert(tool);
+    tool->setDrawingType(drawingType);
+}
+
+void ToolHandler::setButtonStrokeType(StrokeType strokeType, Button button) {
+    this->setButtonStrokeType(strokeTypeToLineStyle(strokeType), button);
+}
+
+void ToolHandler::setButtonStrokeType(const LineStyle& lineStyle, Button button) {
+    Tool* tool = getButtonTool(button);
+    xoj_assert(tool);
+    tool->setLineStyle(lineStyle);
+}
+
+auto ToolHandler::getTools() const -> std::array<std::unique_ptr<Tool>, TOOL_COUNT> const& { return tools; }
+
+void ToolHandler::saveSettings() const {
+    SElement& s = settings->getCustomElement("tools");
+    s.clear();
+
+    s.setString("current", this->activeTool->getName());
+
+    for (auto&& tool: tools) {
+        SElement& st = s.child(tool->getName());
+        if (tool->hasCapability(TOOL_CAP_COLOR)) {
+            st.setIntHex("color", int(uint32_t(tool->getColor())));
+        }
+
+        static constexpr unsigned int SHAPE_CAPS = TOOL_CAP_RULER | TOOL_CAP_RECTANGLE | TOOL_CAP_ELLIPSE |
+                                                   TOOL_CAP_ARROW | TOOL_CAP_DOUBLE_ARROW | TOOL_CAP_RECOGNIZER |
+                                                   TOOL_CAP_SPLINE;
+        if (tool->capabilities & SHAPE_CAPS) {
+            st.setString("drawingType", drawingTypeToString(tool->getDrawingType()).data());
+        }
+
+        if (tool->hasCapability(TOOL_CAP_SIZE)) {
+            std::string value;
+            switch (tool->getSize()) {
+                case TOOL_SIZE_VERY_FINE:
+                    value = "VERY_FINE";
+                    break;
+                case TOOL_SIZE_FINE:
+                    value = "THIN";
+                    break;
+                case TOOL_SIZE_MEDIUM:
+                    value = "MEDIUM";
+                    break;
+                case TOOL_SIZE_THICK:
+                    value = "BIG";
+                    break;
+                case TOOL_SIZE_VERY_THICK:
+                    value = "VERY_BIG";
+                    break;
+                default:
+                    value = "";
+            }
+
+            st.setString("size", value);
+        }
+
+        if (tool->hasCapability(TOOL_CAP_FILL)) {
+            st.setInt("fill", tool->getFill());
+            st.setInt("fillAlpha", tool->getFillAlpha());
+        }
+
+        if (tool->type == TOOL_PEN) {
+            st.setString("style", StrokeStyle::formatStyle(tool->getLineStyle()));
+        }
+
+        if (tool->type == TOOL_ERASER) {
+            if (this->getEraserType() == ERASER_TYPE_DELETE_STROKE) {
+                st.setString("type", "deleteStroke");
+            } else if (this->getEraserType() == ERASER_TYPE_WHITEOUT) {
+                st.setString("type", "whiteout");
+            } else  // ERASER_TYPE_DEFAULT
+            {
+                st.setString("type", "default");
+            }
+        }
+    }
+
+    settings->customSettingsChanged();
+}
+
+void ToolHandler::loadSettings() {
+    SElement& s = settings->getCustomElement("tools");
+
+    std::string selectedTool;
+    if (s.getString("current", selectedTool)) {
+        for (auto&& tool: tools) {
+            SElement& st = s.child(tool->getName());
+
+            if (selectedTool == tool->getName()) {
+                this->activeTool = tool.get();
+            }
+
+            int iColor{};
+            if (tool->hasCapability(TOOL_CAP_COLOR) && st.getInt("color", iColor)) {
+                tool->setColor(Color(as_unsigned(iColor)));
+            }
+
+            std::string drawingType;
+            if (st.getString("drawingType", drawingType)) {
+                tool->setDrawingType(drawingTypeFromString(drawingType));
+            }
+
+            int fill = -1;
+            if (st.getInt("fill", fill)) {
+                tool->setFill(fill);
+            }
+            int fillAlpha = -1;
+            if (st.getInt("fillAlpha", fillAlpha)) {
+                tool->setFillAlpha(fillAlpha);
+            }
+
+            std::string style;
+            if (st.getString("style", style)) {
+                tool->setLineStyle(StrokeStyle::parseStyle(style));
+            }
+
+            std::string value;
+            if (tool->hasCapability(TOOL_CAP_SIZE) && st.getString("size", value)) {
+                if (value == "VERY_FINE") {
+                    tool->setSize(TOOL_SIZE_VERY_FINE);
+                } else if (value == "THIN") {
+                    tool->setSize(TOOL_SIZE_FINE);
+                } else if (value == "MEDIUM") {
+                    tool->setSize(TOOL_SIZE_MEDIUM);
+                } else if (value == "BIG") {
+                    tool->setSize(TOOL_SIZE_THICK);
+                } else if (value == "VERY_BIG") {
+                    tool->setSize(TOOL_SIZE_VERY_THICK);
+                } else {
+                    g_warning("Settings::Unknown tool size: %s\n", value.c_str());
+                }
+            }
+
+            if (tool->type == TOOL_ERASER) {
+                std::string type;
+
+                if (st.getString("type", type)) {
+                    if (type == "deleteStroke") {
+                        setEraserType(ERASER_TYPE_DELETE_STROKE);
+                    } else if (type == "whiteout") {
+                        setEraserType(ERASER_TYPE_WHITEOUT);
+                    } else {
+                        setEraserType(ERASER_TYPE_DEFAULT);
+                    }
+                    eraserTypeChanged();
+                }
+            }
+        }
+    }
+}
+
+bool ToolHandler::pointActiveToolToButtonTool(Button button) {
+    Tool* tool = getButtonTool(button);
+    if (!tool || this->activeTool == tool) {
+        return false;
+    }
+    this->activeTool = tool;
+    return true;
+}
+
+bool ToolHandler::pointActiveToolToToolbarTool() {
+    if (this->activeTool == this->toolbarSelectedTool)
+        return false;
+    this->activeTool = this->toolbarSelectedTool;
+    return true;
+}
+
+auto ToolHandler::getToolThickness(ToolType type) const -> const double* {
+    return this->tools[type - TOOL_PEN]->thickness.value().data();
+}
+
+/**
+ * Change the selection tools capabilities, depending on the selected elements
+ */
+void ToolHandler::setSelectionEditTools(bool setColor, bool setSize, bool setFill, bool setLineStyle) {
+    // For all selection tools, apply the features
+    for (size_t i = TOOL_SELECT_RECT - TOOL_PEN; i <= TOOL_SELECT_OBJECT - TOOL_PEN; i++) {
+        Tool* t = tools[i].get();
+        t->setCapability(TOOL_CAP_COLOR, setColor);
+        t->setCapability(TOOL_CAP_SIZE, setSize);
+        t->setCapability(TOOL_CAP_FILL, setFill);
+        t->setCapability(TOOL_CAP_LINE_STYLE, setLineStyle);
+        t->setSize(TOOL_SIZE_NONE);
+        t->setColor(Colors::white);
+        t->setFill(false);
+    }
+
+    if (this->activeTool->type == TOOL_SELECT_RECT || this->activeTool->type == TOOL_SELECT_REGION ||
+        this->activeTool->type == TOOL_SELECT_MULTILAYER_RECT || this->activeTool->type == TOOL_SELECT_MULTILAYER_REGION ||
+        this->activeTool->type == TOOL_SELECT_OBJECT || this->activeTool->type == TOOL_PLAY_OBJECT) {
+        this->stateChangeListener->toolColorChanged();
+        this->stateChangeListener->toolSizeChanged();
+        this->stateChangeListener->toolFillChanged();
+        this->stateChangeListener->toolLineStyleChanged();
+        this->fireToolChanged();
+    }
+}
+
+auto ToolHandler::isSinglePageTool() const -> bool {
+    ToolType toolType = this->getToolType();
+    DrawingType drawingType = this->getDrawingType();
+
+    return ((toolType == TOOL_PEN || toolType == TOOL_HIGHLIGHTER) &&
+            (drawingType == DRAWING_TYPE_ARROW || drawingType == DRAWING_TYPE_DOUBLE_ARROW ||
+             drawingType == DRAWING_TYPE_ELLIPSE || drawingType == DRAWING_TYPE_COORDINATE_SYSTEM ||
+             drawingType == DRAWING_TYPE_LINE || drawingType == DRAWING_TYPE_RECTANGLE ||
+             drawingType == DRAWING_TYPE_SPLINE)) ||
+           toolType == TOOL_SELECT_RECT || toolType == TOOL_SELECT_REGION || toolType == TOOL_SELECT_MULTILAYER_RECT ||
+           toolType == TOOL_SELECT_MULTILAYER_REGION || toolType == TOOL_SELECT_OBJECT ||
+           toolType == TOOL_DRAW_RECT || toolType == TOOL_DRAW_ELLIPSE || toolType == TOOL_DRAW_COORDINATE_SYSTEM ||
+           toolType == TOOL_DRAW_ARROW || toolType == TOOL_DRAW_DOUBLE_ARROW || toolType == TOOL_FLOATING_TOOLBOX ||
+           toolType == TOOL_DRAW_SPLINE || toolType == TOOL_SELECT_PDF_TEXT_LINEAR ||
+           toolType == TOOL_SELECT_PDF_TEXT_RECT;
+}
+
+auto ToolHandler::acceptsOutOfPageEvents() const -> bool {
+    ToolType toolType = this->getToolType();
+    DrawingType drawingType = this->getDrawingType();
+
+    return ((toolType == TOOL_PEN || toolType == TOOL_HIGHLIGHTER) && (drawingType == DRAWING_TYPE_SPLINE)) ||
+           (toolType == TOOL_DRAW_SPLINE);
+}
+
+auto ToolHandler::supportsTapFilter() const -> bool {
+    ToolType toolType = this->getToolType();
+
+    return toolType == TOOL_PEN || toolType == TOOL_HIGHLIGHTER || toolType == TOOL_LASER_POINTER_PEN ||
+           toolType == TOOL_LASER_POINTER_HIGHLIGHTER || toolType == TOOL_HAND || toolType == TOOL_DRAW_RECT ||
+           toolType == TOOL_DRAW_ELLIPSE || toolType == TOOL_DRAW_COORDINATE_SYSTEM || toolType == TOOL_DRAW_ARROW ||
+           toolType == TOOL_DRAW_DOUBLE_ARROW || toolType == TOOL_DRAW_SPLINE;
+}
+
+auto ToolHandler::getSelectedTool(SelectedTool selectedTool) const -> Tool* {
+    switch (selectedTool) {
+        case SelectedTool::active:
+            return this->activeTool;
+        case SelectedTool::toolbar:
+            return this->toolbarSelectedTool;
+        default:
+            g_error("This button does not exist.");
+    }
+}
+
+auto ToolHandler::getButtonTool(Button button) const -> Tool* {
+    switch (button) {
+        case Button::BUTTON_ERASER:
+            return this->eraserButtonTool.get();
+        case Button::BUTTON_STYLUS_ONE:
+            return this->stylusButton1Tool.get();
+        case Button::BUTTON_STYLUS_TWO:
+            return this->stylusButton2Tool.get();
+        case Button::BUTTON_MOUSE_LEFT:
+            return this->mouseLeftButtonTool.get();
+        case Button::BUTTON_MOUSE_MIDDLE:
+            return this->mouseMiddleButtonTool.get();
+        case Button::BUTTON_MOUSE_RIGHT:
+            return this->mouseRightButtonTool.get();
+        case Button::BUTTON_TOUCH:
+            return this->touchDrawingButtonTool.get();
+        default:
+            g_error("This button is not defined for ToolHandler.");
+    }
+}
+
+void ToolHandler::resetButtonTool(ToolType type, Button button) {
+    auto t = type == TOOL_NONE ? nullptr : std::make_unique<Tool>(*tools[type - TOOL_PEN]);
+    switch (button) {
+        case Button::BUTTON_ERASER:
+            this->eraserButtonTool = std::move(t);
+            break;
+        case Button::BUTTON_STYLUS_ONE:
+            this->stylusButton1Tool = std::move(t);
+            break;
+        case Button::BUTTON_STYLUS_TWO:
+            this->stylusButton2Tool = std::move(t);
+            break;
+        case Button::BUTTON_MOUSE_LEFT:
+            this->mouseLeftButtonTool = std::move(t);
+            break;
+        case Button::BUTTON_MOUSE_MIDDLE:
+            this->mouseMiddleButtonTool = std::move(t);
+            break;
+        case Button::BUTTON_MOUSE_RIGHT:
+            this->mouseRightButtonTool = std::move(t);
+            break;
+        case Button::BUTTON_TOUCH:
+            this->touchDrawingButtonTool = std::move(t);
+            break;
+        default:
+            g_error("This button is not defined for ToolHandler.");
+    }
+}
diff --git a/entry/src/main/cpp/src/core/control/ToolHandler.h b/entry/src/main/cpp/src/core/control/ToolHandler.h
new file mode 100644
index 0000000..c600d85
--- /dev/null
+++ b/entry/src/main/cpp/src/core/control/ToolHandler.h
@@ -0,0 +1,417 @@
+/*
+ * Xournal++
+ *
+ * Handles Tools
+ *
+ * @author Xournal++ Team
+ * https://github.com/xournalpp/xournalpp
+ *
+ * @license GNU GPLv2 or later
+ */
+
+#pragma once
+
+#include <array>       // for array
+#include <functional>  // for function
+#include <memory>      // for unique_ptr
+#include <vector>      // for vector
+
+#include "control/ToolEnums.h"               // for ToolSize, ToolType, Draw...
+#include "control/settings/SettingsEnums.h"  // for Button
+#include "util/Color.h"                      // for Color
+
+#include "Tool.h"  // for Tool
+
+class LineStyle;
+class Settings;
+class ActionDatabase;
+
+
+// enum for ptrs that are dynamically pointing to different tools
+/**
+ * @brief Enum for ptrs that are dynamically pointing to different tools
+ *  - active: describes the currently active tool used for drawing
+ *  - toolbar: describes the tool currently selected in the toolbar
+ *
+ * These tools are to be distinguished from ButtonTools which are mostly static
+ * apart from changes to the Config
+ *
+ */
+enum SelectedTool { active, toolbar };
+
+class ToolListener {
+public:
+    /**
+     * @brief Update the Cursor and the Toolbar based on the active color
+     *
+     */
+    virtual void toolColorChanged() = 0;
+    /**
+     * @brief Change the color of the current selection based on the active Tool
+     *
+     */
+    virtual void changeColorOfSelection() = 0;
+    virtual void toolSizeChanged() = 0;
+    virtual void toolFillChanged() = 0;
+    virtual void toolLineStyleChanged() = 0;
+    virtual void toolChanged() = 0;
+
+    virtual ~ToolListener();
+};
+
+class ToolHandler {
+public:
+    using ToolChangedCallback = std::function<void(ToolType)>;
+    ToolHandler(ToolListener* stateChangedListener, ActionDatabase* actionDB, Settings* settings);
+    virtual ~ToolHandler();
+
+    /**
+     * @brief Reset the Button tool with a new tooltype
+     *
+     * @param type Tooltype to be set for the button
+     * @param button button which should be set
+     */
+    void resetButtonTool(ToolType type, Button button);
+
+    /**
+     * Select the color for the active tool and under certain circumstances toolbar selected tool
+     *
+     * If the current tool does not have the color capability but the toolbar selected tool has
+     * the color can be set for the toolbar selected tool.
+     * This is indicated by a little pen shown on top of the color in the UI.
+     *
+     * @param color Color
+     * @param userSelection
+     * 			true if the user selected the color
+     * 			false if the color is selected by a tool change
+     * 			and therefore should not be applied to a selection
+     */
+    void setColor(Color color, bool userSelection);
+
+    /**
+     * @brief Set the color for a Button
+     * This is a separate function from `setColor` to prevent mixup of different usecases.
+     *
+     * @param color color to be set
+     * @param button button to set color for
+     */
+    void setButtonColor(Color color, Button button);
+
+    /**
+     * @brief Get the Color of the active tool
+     *
+     * @return Color of active tool
+     */
+    Color getColor() const;
+
+    /**
+     * @brief Get the Color of the active tool except the alpha value is replaced by 0xFF
+     */
+    Color getColorMaskAlpha() const;
+
+    /**
+     * @brief Enable/disable fill for the tool selected in the toolbar
+     *
+     * @param fill whether fill should be enabled
+     * @param fireEvent whether a toolFillChanged event should be fired
+     */
+    void setFillEnabled(bool fill);
+
+    /**
+     * @brief Get the Fill of the active tool
+     *
+     * @return -1 if fill is disabled
+     * @return int > 0 otherwise
+     */
+    int getFill() const;
+
+    /**
+     * @brief Get the Drawing Type one of selected tools
+     *
+     * @param selectedTool by the default the active one
+     * @return DrawingType
+     */
+    DrawingType getDrawingType(SelectedTool selectedTool = SelectedTool::active) const;
+
+    /**
+     * @brief Set the Drawing Type of the toolbar selected tool
+     * @note It is safer to always set the toolbar tool as the active tool could be pointing to a button tool which
+     * could lead to hard to debug behaviour
+     *
+     * @param drawingType
+     */
+    void setDrawingType(DrawingType drawingType);
+
+    /**
+     * @brief Set the Button Drawing Type  of the button tool
+     *
+     * @param drawingType
+     * @param button button tool to be selected
+     */
+    void setButtonDrawingType(DrawingType drawingType, Button button);
+
+    /**
+     * @brief Set the Stroke Type of a button tool
+     *
+     * @param strokeType The stroke type to apply
+     * @param button The button tool to change
+     */
+    void setButtonStrokeType(StrokeType strokeType, Button button);
+    void setButtonStrokeType(const LineStyle& lineStyle, Button button);
+
+    /**
+     * @brief Get the Line Style of active tool
+     *
+     * @return const LineStyle&
+     */
+    const LineStyle& getLineStyle() const;
+
+    /**
+     * @brief Get the Size of one of the selected tools
+     *
+     * @param selectedTool
+     * @return ToolSize
+     */
+    ToolSize getSize(SelectedTool selectedTool = SelectedTool::active) const;
+
+    /**
+     * @brief Set the Size of toolbar selected tool
+     * @note It is safer to always set the toolbar tool as the active tool could be pointing to a button tool which
+     * could lead to hard to debug behaviour
+     *
+     * @param size is clamped to be within the defined range [0,5)
+     */
+    void setSize(ToolSize size);
+
+    /**
+     * @brief Set the Button Size
+     *
+     * @param size is clamped to be within the defined range [0,5)
+     * @param button size will be applied to
+     */
+    void setButtonSize(ToolSize size, Button button);
+
+    /**
+     * @brief Get the Thickness of the active tool
+     *
+     * @return double
+     */
+    double getThickness() const;
+
+    void setLineStyle(const LineStyle& style);
+
+    ToolSize getPenSize() const;
+    ToolSize getEraserSize() const;
+    ToolSize getHighlighterSize() const;
+    void setPenSize(ToolSize size);
+    void setEraserSize(ToolSize size);
+    void setHighlighterSize(ToolSize size);
+
+    void setPenFillEnabled(bool fill);
+    bool getPenFillEnabled() const;
+    void setPenFill(int alpha);
+    int getPenFill() const;
+
+    void setHighlighterFillEnabled(bool fill);
+    bool getHighlighterFillEnabled() const;
+    void setHighlighterFill(int alpha);
+    int getHighlighterFill() const;
+
+    void setSelectPDFTextMarkerOpacity(int alpha);
+    int getSelectPDFTextMarkerOpacity() const;
+
+    /**
+     * @brief Set the toolbar selected tool to the type
+     * This will also point the active tool to the same tool as the toolbar selected tool.
+     * This ensure that the toolbar and the cursor are correctly updated right after selecting the tool in the toolbar.
+     *
+     * @param type
+     */
+    void selectTool(ToolType type);
+
+    /**
+     * @brief Get the Tool Type of active tool
+     *
+     * @return ToolType
+     */
+    ToolType getToolType() const;
+
+    /**
+     * @brief Update the Toolbar and the cursor based on the active Tool
+     *
+     */
+    void fireToolChanged() const;
+
+    /**
+     * @brief Listen for tool changes.
+     *
+     * Different from the listener given to the constructor -- [listener]
+     * here only listens for when the current tool is changed to another.
+     *
+     * @param listener A callback, called when the user/client
+     *  changes tools.
+     */
+    void addToolChangedListener(ToolChangedCallback listener);
+
+    /**
+     * @brief Get the Tool of a certain type
+     *
+     * @param type
+     * @return Tool&
+     */
+    Tool& getTool(ToolType type) const;
+
+    /**
+     * @brief Get the active Tool, returns nullptr if no tool is active
+     *
+     * @return Tool*
+     */
+    Tool* getActiveTool() const;
+
+    /**
+     * @brief Set the Eraser Type of the Eraser in the toolbar
+     * @note Here the Eraser Tool in the toolbar is changed regardless of the the tool currently selected.
+     * This is necessary to allow users to change the Eraser type for their Button Tools while having another tool
+     * active. This is relevant in case of Eraser Type being set to "Don't Change" for the button.
+     *
+     * @param eraserType
+     */
+    void setEraserType(EraserType eraserType);
+
+    /**
+     * @brief Set the Button Eraser Type
+     *
+     * @param eraserType
+     * @param button
+     */
+    void setButtonEraserType(EraserType eraserType, Button button);
+
+    /**
+     * @brief Get the Eraser Type
+     * If the currently active Tool is an eraser it's type is returned (relevant for Buttontools).
+     * If the currently active Tool is not a eraser the erasertype of the eraser in the toolbar is obtained.
+     *
+     * @param selectedTool
+     * @return EraserType
+     */
+    EraserType getEraserType() const;
+
+    /**
+     * @brief Update the toolbar based on the Eraser type of the active tool
+     *
+     */
+    void eraserTypeChanged();
+
+    /**
+     * @brief Check whether the selectedTool has a certain capability
+     *
+     * @param cap
+     * @param selectedTool
+     * @return true if tool has the capability
+     * @return false if tool does not have the capability
+     */
+    bool hasCapability(ToolCapabilities cap, SelectedTool selectedTool = SelectedTool::active) const;
+
+    /**
+     * @brief Check whether the active tool is a Drawing tool.
+     * Drawing tools are considered all tools that directly change the canvas.
+     * Right now these are:
+     *  - Highlighter
+     *  - Pen
+     *  - Eraser
+     *
+     * @return true if active tool is a drawing tool
+     * @return false if active tool is no drawing tool
+     */
+    bool isDrawingTool() const;
+
+    void saveSettings() const;
+    void loadSettings();
+
+    /**
+     * @brief Point the active tool to the corresponding button tool if it is not already pointing to it
+     *
+     * @param button Button tool which should be pointed to
+     * @return true if the active toolpointer was changed
+     * @return false if the active toolpointer was not changed (it was already pointing to the right button)
+     */
+    bool pointActiveToolToButtonTool(Button button);
+    /**
+     * @brief Point the active tool to tool selected in the toolbar
+     *
+     * @return true if the active toolpointer was changed
+     * @return false if the active toolpointer was not changed (it was already pointing to the toolbar-tool)
+     */
+    bool pointActiveToolToToolbarTool();
+
+    [[maybe_unused]] std::array<std::unique_ptr<Tool>, TOOL_COUNT> const& getTools() const;
+
+    /**
+     * Change the selection tools capabilities, depending on the selected elements
+     */
+    void setSelectionEditTools(bool setColor, bool setSize, bool setFill, bool setLineStyle);
+
+    const double* getToolThickness(ToolType type) const;
+
+    /**
+     * Returns whether the current tool will create an element that may only reside on a single page even when the
+     * pointer moves to another
+     * @return
+     */
+    bool isSinglePageTool() const;
+
+    /**
+     * Returns whether the current tool accepts events from outside the page input started in (i.e. events
+     * should not be clamped to the page)
+     */
+    bool acceptsOutOfPageEvents() const;
+
+    /**
+     * @brief Whether the tool supports short taps filtering (for floating toolbox or selection)
+     * see Preferences->Drawing Area->Action on Tool tap
+     */
+    bool supportsTapFilter() const;
+
+protected:
+    void initTools();
+
+private:
+    std::array<std::unique_ptr<Tool>, TOOL_COUNT> tools;
+
+    /**
+     * @brief Get the Button Tool pointer based on enum
+     *
+     * @param button
+     * @return Tool*
+     */
+    Tool* getButtonTool(Button button) const;
+
+    /**
+     * @brief Get the Selected Tool pointer based on enum
+     *
+     * @param selectedTool
+     * @return Tool*
+     */
+    Tool* getSelectedTool(SelectedTool selectedTool) const;
+
+    // active Tool which is used for drawing
+    Tool* activeTool = nullptr;
+
+    // tool which is selected in the toolbar
+    Tool* toolbarSelectedTool = nullptr;
+
+    // tools set for the different Buttons
+    std::unique_ptr<Tool> stylusButton1Tool;
+    std::unique_ptr<Tool> stylusButton2Tool;
+    std::unique_ptr<Tool> eraserButtonTool;
+    std::unique_ptr<Tool> mouseLeftButtonTool;
+    std::unique_ptr<Tool> mouseMiddleButtonTool;
+    std::unique_ptr<Tool> mouseRightButtonTool;
+    std::unique_ptr<Tool> touchDrawingButtonTool;
+
+    std::vector<ToolChangedCallback> toolChangeListeners;
+
+    ToolListener* stateChangeListener = nullptr;
+    ActionDatabase* actionDB = nullptr;
+    Settings* settings = nullptr;
+};
diff --git a/entry/src/main/cpp/src/core/control/UndoRedoController.cpp b/entry/src/main/cpp/src/core/control/UndoRedoController.cpp
new file mode 100644
index 0000000..f0aaabb
--- /dev/null
+++ b/entry/src/main/cpp/src/core/control/UndoRedoController.cpp
@@ -0,0 +1,89 @@
+#include "UndoRedoController.h"
+
+#include <algorithm>  // for copy, max
+#include <cstddef>    // for size_t
+#include <iterator>   // for back_insert_iterator, back_...
+#include <mutex>      // for unique_lock
+
+#include "control/tools/EditSelection.h"  // for EditSelection
+#include "gui/MainWindow.h"               // for MainWindow
+#include "gui/XournalView.h"              // for XournalView
+#include "model/Document.h"               // for Document
+#include "model/ElementInsertionPosition.h"
+#include "model/Layer.h"                  // for Layer
+#include "model/PageRef.h"                // for PageRef
+#include "model/XojPage.h"                // for XojPage
+#include "undo/UndoRedoHandler.h"         // for UndoRedoHandler
+
+#include "Control.h"  // for Control
+
+class XojPageView;
+
+UndoRedoController::UndoRedoController(Control* control): control(control) {}
+
+UndoRedoController::~UndoRedoController() = default;
+
+void UndoRedoController::before() {
+    EditSelection* selection = control->getWindow()->getXournal()->getSelection();
+    if (selection != nullptr) {
+        layer = selection->getSourceLayer();
+        elements = selection->getElementsView().clone();
+    }
+
+    control->clearSelectionEndText();
+}
+
+void UndoRedoController::after() {
+    // Restore selection, if any
+
+    if (layer == nullptr) {
+        // No layer - no selection
+        return;
+    }
+
+    Document* doc = control->getDocument();
+
+    PageRef page = control->getCurrentPage();
+    std::unique_lock lock(*doc);
+    size_t pageNo = doc->indexOf(page);
+    XojPageView* view = control->getWindow()->getXournal()->getViewFor(pageNo);
+
+    if (!view || !page) {
+        // The page may have been undone
+        return;
+    }
+
+    InsertionOrderRef remainingElements;
+    for (const Element* e: elements) {
+        // Test, if the element has been removed since
+        if (auto pos = layer->indexOf(e); pos != -1) {
+            remainingElements.emplace_back(e, pos);
+        }
+    }
+    if (!remainingElements.empty()) {
+        auto removedElements = layer->removeElementsAt(remainingElements);
+        lock.unlock();  // For all other paths, the lock is released via ~unique_lock()
+        auto [sel, bounds] =
+                SelectionFactory::createFromFloatingElements(control, page, layer, view, std::move(removedElements));
+        control->getWindow()->getXournal()->setSelection(sel.release());
+        page->fireRangeChanged(bounds);
+    }
+}
+
+void UndoRedoController::undo(Control* control) {
+    UndoRedoController handler(control);
+    handler.before();
+
+    control->getUndoRedoHandler()->undo();
+
+    handler.after();
+}
+
+void UndoRedoController::redo(Control* control) {
+    UndoRedoController handler(control);
+    handler.before();
+
+    control->getUndoRedoHandler()->redo();
+
+    handler.after();
+}
diff --git a/entry/src/main/cpp/src/core/control/UndoRedoController.h b/entry/src/main/cpp/src/core/control/UndoRedoController.h
new file mode 100644
index 0000000..e055635
--- /dev/null
+++ b/entry/src/main/cpp/src/core/control/UndoRedoController.h
@@ -0,0 +1,48 @@
+/*
+ * Xournal++
+ *
+ * Wrapper for undo / redo stuff, to move out the logic of the main Control class
+ *
+ * @author Xournal++ Team
+ * https://github.com/xournalpp/xournalpp
+ *
+ * @license GNU GPLv2 or later
+ */
+
+#pragma once
+
+#include <vector>  // for vector
+
+class Control;
+class Layer;
+class Element;
+
+class UndoRedoController {
+private:
+    UndoRedoController(Control* control);
+    virtual ~UndoRedoController();
+
+private:
+    void before();
+    void after();
+
+public:
+    static void undo(Control* control);
+    static void redo(Control* control);
+
+private:
+    /**
+     * Controller
+     */
+    Control* control = nullptr;
+
+    /**
+     * Layer of the selection before change
+     */
+    Layer* layer = nullptr;
+
+    /**
+     * Selected elements
+     */
+    std::vector<const Element*> elements;
+};
diff --git a/entry/src/main/cpp/src/core/control/XournalMain.cpp b/entry/src/main/cpp/src/core/control/XournalMain.cpp
new file mode 100644
index 0000000..b363373
--- /dev/null
+++ b/entry/src/main/cpp/src/core/control/XournalMain.cpp
@@ -0,0 +1,705 @@
+#include "XournalMain.h"
+
+#include <algorithm>  // for copy, sort, max
+#include <array>      // for array
+#include <chrono>     // for time_point, duration, hours...
+#include <clocale>    // for setlocale, LC_NUMERIC
+#include <cstdio>     // for printf
+#include <cstdlib>    // for exit, size_t
+#include <exception>  // for exception
+#include <iostream>   // for operator<<, endl, basic_...
+#include <locale>     // for locale
+#include <memory>     // for unique_ptr, allocator
+#include <optional>   // for optional, nullopt
+#include <sstream>    // for stringstream
+#include <stdexcept>  // for runtime_error
+#include <string>     // for string, basic_string
+#include <vector>     // for vector
+
+#include <gio/gio.h>      // for GApplication, G_APPLICATION
+#include <glib-object.h>  // for G_CALLBACK, g_signal_con...
+#include <glib.h>         // for GOptionEntry, gchar, G_O...
+#include <libintl.h>      // for bindtextdomain, textdomain
+
+#include "control/RecentManager.h"           // for RecentManager
+#include "control/jobs/BaseExportJob.h"      // for ExportBackgroundType
+#include "control/jobs/XournalScheduler.h"   // for XournalScheduler
+#include "control/settings/LatexSettings.h"  // for LatexSettings
+#include "control/settings/Settings.h"       // for Settings
+#include "control/settings/SettingsEnums.h"  // for ICON_THEME_COLOR, ICON_T...
+#include "control/xojfile/LoadHandler.h"     // for LoadHandler
+#include "control/xojfile/SaveHandler.h"     // for SaveHandler
+#include "gui/GladeSearchpath.h"             // for GladeSearchpath
+#include "gui/MainWindow.h"                  // for MainWindow
+#include "gui/XournalView.h"                 // for XournalView
+#include "model/Document.h"                  // for Document
+#include "undo/EmergencySaveRestore.h"       // for EmergencySaveRestore
+#include "undo/UndoRedoHandler.h"            // for UndoRedoHandler
+#include "util/PathUtil.h"                   // for getConfigFolder, openFil...
+#include "util/PlaceholderString.h"          // for PlaceholderString
+#include "util/Util.h"                       // for execInUiThread
+#include "util/VersionInfo.h"                // for getVersionInfo
+#include "util/XojMsgBox.h"                  // for XojMsgBox
+#include "util/i18n.h"                       // for _, FS, _F
+
+#include "Control.h"       // for Control
+#include "ExportHelper.h"  // for exportImg, exportPdf
+#include "config-dev.h"    // for ERRORLOG_DIR
+#include "config-git.h"    // for GIT_BRANCH, GIT_ORIGIN_O...
+#include "config.h"        // for GETTEXT_PACKAGE, ENABLE_NLS
+#include "filesystem.h"    // for path, operator/, exists
+
+namespace {
+
+constexpr auto APP_FLAGS =
+        GApplicationFlags(G_APPLICATION_SEND_ENVIRONMENT | G_APPLICATION_NON_UNIQUE | G_APPLICATION_HANDLES_OPEN);
+
+/// Configuration migration status.
+enum class MigrateStatus {
+    NotNeeded,  ///< No migration was needed.
+    Success,    ///< Migration was carried out successfully.
+    Failure,    ///< Migration failed. */
+};
+
+struct MigrateResult {
+    MigrateStatus status{};
+    std::string message;  ///< Any additional information about the migration status.
+};
+
+auto migrateSettings() -> MigrateResult;
+
+void initResourcePath(GladeSearchpath* gladePath, const gchar* relativePathAndFile, bool failIfNotFound = true);
+
+void initCAndCoutLocales() {
+    /**
+     * Force numbers to be printed out and parsed by C libraries (cairo) in the "classic" locale.
+     * This avoids issue with tags when exporting to PDF, see #3551
+     */
+    setlocale(LC_NUMERIC, "C");
+
+    std::cout.imbue(std::locale());
+}
+
+auto migrateSettings() -> MigrateResult {
+    const fs::path newConfigPath = Util::getConfigFolder();
+
+    if (!fs::exists(newConfigPath)) {
+        const std::array oldPaths = {
+                Util::getConfigFolder().parent_path() / "com.github.xournalpp.xournalpp",
+                Util::getConfigFolder().parent_path() / "com.github.xournalpp.xournalpp.exe",
+                Util::GFilename(g_get_home_dir()).toPath().value_or(fs::path()) / ".xournalpp",
+        };
+        for (auto const& oldPath: oldPaths) {
+            if (!fs::is_directory(oldPath)) {
+                continue;
+            }
+            g_message("Migrating configuration from %s to %s", oldPath.string().c_str(),
+                      newConfigPath.string().c_str());
+            Util::ensureFolderExists(newConfigPath.parent_path());
+            try {
+                fs::copy(oldPath, newConfigPath, fs::copy_options::recursive);
+                constexpr auto msg = "Due to a recent update, Xournal++ has changed where its configuration files are "
+                                     "stored.\nThey have been automatically copied from\n\t{1}\nto\n\t{2}";
+                return {MigrateStatus::Success, FS(_F(msg) % oldPath.u8string() % newConfigPath.u8string())};
+            } catch (const fs::filesystem_error& e) {
+                constexpr auto msg =
+                        "Due to a recent update, Xournal++ has changed where its configuration files are "
+                        "stored.\nHowever, when attempting to copy\n\t{1}\nto\n\t{2}\nmigration failed:\n{3}";
+                g_message("Migration failed: %s", e.what());
+                return {MigrateStatus::Failure, FS(_F(msg) % oldPath.u8string() % newConfigPath.u8string() % e.what())};
+            }
+        }
+    }
+    return {MigrateStatus::NotNeeded, ""};
+}
+
+static void deleteFile(const fs::path& file, GtkWindow* win) {
+    std::error_code error;
+    if (!fs::remove(file, error)) {
+        std::stringstream msg;
+        msg << FS(_F("Failed to delete file: {1}") % file.u8string()) << std::endl;
+        msg << error << std::endl << error.message() << std::endl;
+        msg << FS(_F("Please delete the file manually"));
+        XojMsgBox::showErrorToUser(win, msg.str());
+    }
+}
+
+void checkForEmergencySave(Control* control) {
+    auto file = Util::getConfigFile("emergencysave.xopp");
+
+    if (!fs::exists(file)) {
+        return;
+    }
+
+    const std::string msg = _("Xournal++ crashed last time. Would you like to restore the last edited file?");
+    enum { DELETE_FILE = 1, RESTORE_FILE };
+    XojMsgBox::askQuestion(
+            control->getGtkWindow(), _("Recovery file detected"), msg,
+            {{_("Delete file"), DELETE_FILE}, {_("Restore file"), RESTORE_FILE}},
+            [file = std::move(file), ctrl = control](int response) mutable {
+                if (response == DELETE_FILE) {
+                    deleteFile(file, ctrl->getGtkWindow());
+                } else if (response == RESTORE_FILE) {
+                    ctrl->openFileWithoutSavingTheCurrentDocument(file, false, -1, [ctrl, file](bool) {
+                        ctrl->getDocument()->setFilepath("");
+
+                        // Todo Make sure the document is changed + ask for saving
+                        ctrl->getUndoRedoHandler()->addUndoAction(std::make_unique<EmergencySaveRestore>());
+                        deleteFile(file, ctrl->getGtkWindow());
+                    });
+                }
+            });
+}
+
+namespace {
+void exitOnMissingPdfFileName(const LoadHandler& loader) {
+    if (!loader.getMissingPdfFilename().empty()) {
+        auto msg =
+                FS(_F("The background file \"{1}\" could not be found. It might have been moved, renamed or deleted.") %
+                   loader.getMissingPdfFilename());
+        std::cerr << msg << std::endl;
+        exit(-2);
+    }
+}
+}  // namespace
+
+
+/**
+ * @brief Export the input file as a bunch of image files (one per page)
+ * @param infile Path to the input file
+ * @param outfile Path to the output file(s)
+ * @param range Page range to be parsed. If range=nullptr, exports the whole file
+ * @param layerRange Layer range to be parsed. Will only export those layers, for every exported page.
+ *                  If a number is too high for the number of layers on a given page, it is just ignored.
+ *                  If range=nullptr, exports all layers.
+ * @param pngDpi Set dpi for Png files. Non positive values are ignored
+ * @param pngWidth Set the width for Png files. Non positive values are ignored
+ * @param pngHeight Set the height for Png files. Non positive values are ignored
+ * @param exportBackground If EXPORT_BACKGROUND_NONE, the exported image file has transparent background
+ *
+ *  The priority is: pngDpi overwrites pngWidth overwrites pngHeight
+ *
+ * @return 0 on success
+ *
+ * Calls std::exit(-2) on failure opening the input file and std::exit(-3) on export failure
+ */
+auto exportImg(fs::path infile, fs::path outfile, const char* range, const char* layerRange, int pngDpi, int pngWidth,
+               int pngHeight, ExportBackgroundType exportBackground) -> int {
+
+    LoadHandler loader;
+
+    auto doc = loader.loadDocument(infile);
+    if (doc == nullptr) {
+        g_message("%s", loader.getLastError().c_str());
+        std::exit(-2);
+    }
+
+    exitOnMissingPdfFileName(loader);
+
+    const auto res = ExportHelper::exportImg(doc.get(), std::move(outfile), range, layerRange, pngDpi, pngWidth,
+                                             pngHeight, exportBackground);
+    if (res != 0) {
+        std::exit(res);
+    }
+    return 0;
+}
+
+/**
+ * @brief Save a xopp-file with given pdf-background
+ *
+ * @param infile Path to the input .pdf file
+ * @param outfile Path to the output .xopp file
+ * @return int 0 on success
+ *
+ * Calls std::exit(-2) on failure reading the input file and std::exit(-3) on save failure
+ */
+auto saveDoc(fs::path infile, fs::path outfile) -> int {
+    SaveHandler saver;
+    auto handler = std::make_unique<DocumentHandler>();
+    auto newDoc = std::make_unique<Document>(handler.get());
+    const bool res = newDoc->readPdf(infile, /*initPages=*/true, false);
+    if (!res) {
+        g_message("%s", FC(_F("Error: {1}") % newDoc->getLastErrorMsg().c_str()));
+        std::exit(-2);
+    }
+    const fs::path out = fs::absolute(outfile);
+    saver.prepareSave(newDoc.get(), out);
+    saver.saveTo(out);
+
+    if (!saver.getErrorMessage().empty()) {
+        g_message("%s", FC(_F("Error: {1}") % saver.getErrorMessage()));
+        std::exit(-3);
+    }
+    return 0;
+}
+
+/**
+ * @brief Export the input file as pdf
+ * @param infile Path to the input file
+ * @param outfile Path to the output file
+ * @param layerRange Layer range to be parsed. Will only export those layers, for every exported page.
+ *                  If a number is too high for the number of layers on a given page, it is just ignored.
+ *                  If range=nullptr, exports all layers.
+ * @param range Page range to be parsed. If range=nullptr, exports the whole file
+ * @param exportBackground If EXPORT_BACKGROUND_NONE, the exported pdf file has white background
+ * @param progressiveMode If true, then for each xournalpp page, instead of rendering one PDF page, the page layers are
+ * rendered one by one to produce as many pages as there are layers.
+ * @param backend The requested backend
+ *
+ * @return 0 on success
+ *
+ * Calls std::exit(-2) on failure opening the input file and std::exit(-3) on export failure
+ */
+auto exportPdf(fs::path infile, fs::path outfile, const char* range, const char* layerRange,
+               ExportBackgroundType exportBackground, bool progressiveMode, ExportBackend backend) -> int {
+    LoadHandler loader;
+    auto doc = loader.loadDocument(infile);
+    if (doc == nullptr) {
+        g_message("%s", loader.getLastError().c_str());
+        std::exit(-2);
+    }
+
+    exitOnMissingPdfFileName(loader);
+
+    const auto res =
+            ExportHelper::exportPdf(doc.get(), outfile, range, layerRange, exportBackground, progressiveMode, backend);
+    if (res != 0) {
+        std::exit(res);
+    }
+    return 0;
+}
+
+struct XournalMainPrivate {
+    XournalMainPrivate() = default;
+    XournalMainPrivate(XournalMainPrivate&&) = delete;
+    XournalMainPrivate(XournalMainPrivate const&) = delete;
+    auto operator=(XournalMainPrivate&&) -> XournalMainPrivate = delete;
+    auto operator=(XournalMainPrivate const&) -> XournalMainPrivate = delete;
+
+    ~XournalMainPrivate() {
+        g_strfreev(optFilename);
+        g_free(pdfFilename);
+        g_free(imgFilename);
+        g_free(docFilename);
+    }
+
+    gchar** optFilename{};  ///< Array of paths, in GFilename encoding
+    gchar* pdfFilename{};   ///< Single path, in GFilename encoding
+    gchar* imgFilename{};   ///< Single path, in GFilename encoding
+    gchar* docFilename{};   ///< Single path, in GFilename encoding
+    gboolean showVersion = false;
+    int openAtPageNumber = 0;  // when no --page is used, the document opens at the page specified in the metadata file
+    gchar* exportRange{};
+    gchar* exportLayerRange{};
+    int exportPngDpi = -1;
+    int exportPngWidth = -1;
+    int exportPngHeight = -1;
+    gboolean exportNoBackground = false;
+    gboolean exportNoRuling = false;
+    gboolean progressiveMode = false;
+    gboolean disableAudio = false;
+    gboolean attachMode = false;
+    gchar* exportPdfBackend{};
+    std::unique_ptr<GladeSearchpath> gladePath;
+    std::unique_ptr<Control> control;
+    std::unique_ptr<MainWindow> win;
+};
+using XMPtr = XournalMainPrivate*;
+
+/// Checks for input method compatibility and ensures it
+void ensure_input_model_compatibility() {
+    const char* imModule = g_getenv("GTK_IM_MODULE");
+    if (imModule != nullptr) {
+        const std::string imModuleString{imModule};
+        if (imModuleString == "xim") {
+            g_warning("Unsupported input method: %s", imModule);
+        }
+    }
+}
+
+/**
+ * Find a file in a resource folder, and return the resource folder path
+ * Return an empty string, if the folder was not found
+ */
+auto findResourcePath(const fs::path& searchFile) -> fs::path {
+    auto search_for = [&searchFile](fs::path start) -> std::optional<fs::path> {
+        constexpr auto* postfix = "share/xournalpp";
+        /// 1. relative install
+        /// 2. windows install
+        /// 3. build dir
+        for (int i = 0; i < 3; ++i, start = start.parent_path()) {
+            if (auto target = start / searchFile; fs::exists(target)) {
+                return target.parent_path();
+            }
+
+            if (auto folder = start / postfix / searchFile; fs::exists(folder)) {
+                return folder.parent_path();
+            }
+        }
+        return std::nullopt;
+    };
+    /*    /// relative execution path
+        if (auto path = search_for(fs::path{}); path) {
+            return *path;
+        }*/
+    /// real execution path
+    if (auto path = search_for(Util::getExePath().parent_path()); path) {
+        return *path;
+    }
+    // Not found
+    return {};
+}
+
+void initResourcePath(GladeSearchpath* gladePath, const gchar* relativePathAndFile, bool failIfNotFound) {
+    auto uiPath = findResourcePath(relativePathAndFile);  // i.e.  relativePathAndFile = "ui/about.glade"
+
+    if (!uiPath.empty()) {
+        gladePath->addSearchDirectory(uiPath);
+        return;
+    }
+
+    // -----------------------------------------------------------------------
+
+    fs::path p = Util::getDataPath();
+    p /= relativePathAndFile;
+
+    if (fs::exists(p)) {
+        gladePath->addSearchDirectory(p.parent_path());
+        return;
+    }
+
+    std::string msg =
+            FS(_F("<span foreground='red' size='x-large'>Missing the needed UI file:\n<b>{1}</b></span>\nCould "
+                  "not find them at any location.\n  Not relative\n  Not in the Working Path\n  Not in {2}") %
+               relativePathAndFile % Util::getDataPath().u8string());
+
+    if (!failIfNotFound) {
+        msg += _("\n\nWill now attempt to run without this file.");
+        XojMsgBox::showErrorToUser(nullptr, msg);
+    } else {
+        XojMsgBox::showErrorAndQuit(msg, 12);
+    }
+}
+
+void on_activate(GApplication*, XMPtr) {}
+
+gint on_command_line(GApplication*, GApplicationCommandLine*, XMPtr) {
+    g_message("XournalMain::on_command_line: This should never happen, please file a bugreport with a detailed "
+              "description how to reproduce this message");
+    // Todo: implement this, if someone files the bug report
+    return 0;
+}
+
+void on_open_files(GApplication* application, gpointer f, gint numFiles, gchar* hint, XMPtr app_data) {
+    if (numFiles <= 0) {
+        return;
+    }
+    auto* files = (GFile**)f;
+    if (numFiles != 1) {
+        const std::string msg = _("Sorry, Xournal++ can only open one file at once.\n"
+                                  "Others are ignored.");
+        XojMsgBox::showErrorToUser(GTK_WINDOW(app_data->win->getWindow()), msg);
+    }
+
+    const fs::path p = Util::fromGFile(files[0]);
+
+    try {
+        if (fs::exists(p)) {
+            app_data->control->openFile(fs::absolute(p));
+        } else {
+            const std::string msg = FS(_F("File {1} does not exist.") % p.u8string());
+            XojMsgBox::showErrorToUser(GTK_WINDOW(app_data->win->getWindow()), msg);
+        }
+    } catch (const fs::filesystem_error& e) {
+        const std::string msg = FS(_F("Filesystem error: {1}\n"
+                                      "Sorry, Xournal++ cannot open the file: {2}\n"
+                                      "Consider copying the file to a local directory.") %
+                                   e.what() % p.u8string());
+        XojMsgBox::showErrorToUser(GTK_WINDOW(app_data->win->getWindow()), msg);
+    }
+    gtk_window_present(GTK_WINDOW(app_data->win->getWindow()));
+}
+
+void on_startup(GApplication* application, XMPtr app_data) {
+    XournalMain::initLocalisation();
+    ensure_input_model_compatibility();
+    const MigrateResult migrateResult = migrateSettings();
+
+    app_data->gladePath = std::make_unique<GladeSearchpath>();
+    initResourcePath(app_data->gladePath.get(), "ui/about.glade");
+    initResourcePath(app_data->gladePath.get(), "ui/xournalpp.css", false);
+    initResourcePath(app_data->gladePath.get(), "ui/toolbar.ini", false);
+
+    app_data->control = std::make_unique<Control>(application, app_data->gladePath.get(), app_data->disableAudio);
+
+    auto& globalLatexTemplatePath = app_data->control->getSettings()->latexSettings.globalTemplatePath;
+    if (globalLatexTemplatePath.empty()) {
+        globalLatexTemplatePath = findResourcePath("resources/") / "default_template.tex";
+        g_message("Using default latex template in %s", globalLatexTemplatePath.string().c_str());
+        app_data->control->getSettings()->save();
+    }
+
+    app_data->win = std::make_unique<MainWindow>(app_data->gladePath.get(), app_data->control.get(),
+                                                 GTK_APPLICATION(application));
+    app_data->control->initWindow(app_data->win.get());
+    app_data->win->populate(app_data->gladePath.get());
+
+    if (migrateResult.status != MigrateStatus::NotNeeded) {
+        Util::execInUiThread(
+                [=]() { XojMsgBox::showErrorToUser(app_data->control->getGtkWindow(), migrateResult.message); });
+    }
+
+    gtk_application_set_menubar(GTK_APPLICATION(application), app_data->win->getMenuModel());
+    // Do we want stuff in gtk_application_set_app_menu?
+
+    app_data->win->show(nullptr);
+
+    fs::path p;
+    if (app_data->optFilename) {
+        if (g_strv_length(app_data->optFilename) != 1) {
+            const std::string msg = _("Sorry, Xournal++ can only open one file at once.\n"
+                                      "Others are ignored.");
+            XojMsgBox::showErrorToUser(GTK_WINDOW(app_data->win->getWindow()), msg);
+        }
+        p = Util::fromGFilename(app_data->optFilename[0]);
+        try {
+            p = fs::absolute(p);
+        } catch (const fs::filesystem_error& e) {
+            g_warning("Unable to convert path %s to absolute path: %s", app_data->optFilename[0], e.what());
+        }
+    } else if (app_data->control->getSettings()->isAutoloadMostRecent()) {
+        auto most_recent = RecentManager::getMostRecent();
+        if (most_recent) {
+            if (auto opt = Util::fromUri(gtk_recent_info_get_uri(most_recent.get()))) {
+                p = opt.value();
+            }
+            if (std::error_code err; !fs::exists(p, err)) {
+                if (err) {
+                    g_warning("Failed to determine if recent path exists \"%s\": %s", char_cast(p.u8string().c_str()),
+                              err.message().c_str());
+                } else {
+                    g_warning("Tried to open the most recent file but it no longer exists:\n\"%s\"",
+                              char_cast(p.u8string().c_str()));
+                }
+                p = fs::path();
+            }
+        }
+    }
+
+    app_data->control->openFileWithoutSavingTheCurrentDocument(
+            std::move(p), app_data->attachMode, app_data->openAtPageNumber - 1,
+            [ctrl = app_data->control.get(), app = GTK_APPLICATION(application)](bool) {
+                ctrl->getScheduler()->start();
+
+                checkForEmergencySave(ctrl);
+
+                // There is a timing issue with the layout
+                // This fixes it, see #405
+                Util::execInUiThread([ctrl]() { ctrl->getWindow()->getXournal()->layoutPages(); });
+                gtk_application_add_window(app, ctrl->getGtkWindow());
+            });
+}
+
+auto on_handle_local_options(GApplication*, GVariantDict*, XMPtr app_data) -> gint {
+    initCAndCoutLocales();
+
+    auto print_version = [&] { std::cout << xoj::util::getVersionInfo() << std::endl; };
+
+    auto exec_guarded = [&](auto&& fun, auto&& s) {
+        try {
+            return fun();
+        } catch (const std::exception& e) {
+            std::cerr << "Error: " << e.what() << std::endl;
+            std::cerr << "In: " << s << std::endl;
+            print_version();
+            return (1);
+        } catch (...) {
+            std::cerr << "Error: Unknown exception" << std::endl;
+            std::cerr << "In: " << s << std::endl;
+            print_version();
+            return (1);
+        }
+    };
+
+    if (app_data->showVersion) {
+        print_version();
+        return (0);
+    }
+
+    if (app_data->pdfFilename && app_data->optFilename && *app_data->optFilename) {
+        return exec_guarded(
+                [&] {
+                    return exportPdf(Util::fromGFilename(*app_data->optFilename),
+                                     Util::fromGFilename(app_data->pdfFilename), app_data->exportRange,
+                                     app_data->exportLayerRange,
+                                     app_data->exportNoBackground ? EXPORT_BACKGROUND_NONE :
+                                     app_data->exportNoRuling     ? EXPORT_BACKGROUND_UNRULED :
+                                                                    EXPORT_BACKGROUND_ALL,
+                                     app_data->progressiveMode, ExportBackend::fromString(app_data->exportPdfBackend));
+                },
+                "exportPdf");
+    }
+    if (app_data->imgFilename && app_data->optFilename && *app_data->optFilename) {
+        return exec_guarded(
+                [&] {
+                    return exportImg(Util::fromGFilename(*app_data->optFilename),
+                                     Util::fromGFilename(app_data->imgFilename), app_data->exportRange,
+                                     app_data->exportLayerRange, app_data->exportPngDpi, app_data->exportPngWidth,
+                                     app_data->exportPngHeight,
+                                     app_data->exportNoBackground ? EXPORT_BACKGROUND_NONE :
+                                     app_data->exportNoRuling     ? EXPORT_BACKGROUND_UNRULED :
+                                                                    EXPORT_BACKGROUND_ALL);
+                },
+                "exportImg");
+    }
+    if (app_data->docFilename && app_data->optFilename && *app_data->optFilename) {
+        return exec_guarded(
+                [&] {
+                    return saveDoc(Util::fromGFilename(*app_data->optFilename),
+                                   Util::fromGFilename(app_data->docFilename));
+                },
+                "saveDocument");
+    }
+    return -1;
+}
+
+void on_shutdown(GApplication*, XMPtr app_data) {
+    app_data->control->saveSettings();
+    app_data->win->getXournal()->clearSelection();
+    app_data->control->getScheduler()->stop();
+}
+
+}  // namespace
+
+
+void XournalMain::initLocalisation() {
+#ifdef ENABLE_NLS
+    fs::path localeDir = Util::getGettextFilepath(Util::getLocalePath());
+
+#ifdef _WIN32
+    wbindtextdomain(GETTEXT_PACKAGE, localeDir.wstring().c_str());
+#else
+    bindtextdomain(GETTEXT_PACKAGE, char_cast(localeDir.u8string().c_str()));
+#endif
+
+    textdomain(GETTEXT_PACKAGE);
+    bind_textdomain_codeset(GETTEXT_PACKAGE, "UTF-8");
+
+#endif  // ENABLE_NLS
+
+    // Not working on GNU g++(mingww) forWindows! Only working on Linux/macOS and with msvc
+    try {
+        std::locale::global(std::locale(""));  // "" - system default locale
+    } catch (const std::runtime_error& e) {
+        g_warning("XournalMain: System default locale could not be set.\n - Caused by: %s\n - Note that it is not "
+                  "supported to set the locale using mingw-w64 on windows.\n - This could be solved by compiling "
+                  "xournalpp with msvc",
+                  e.what());
+    }
+
+    initCAndCoutLocales();
+}
+
+auto XournalMain::run(int argc, char** argv) -> int {
+
+    XournalMainPrivate app_data;
+    GtkApplication* app = gtk_application_new("com.github.xournalpp.xournalpp", APP_FLAGS);
+    g_object_set(G_OBJECT(app), "register-session", true, nullptr);  // Needed for opening files on MacOS from Finder
+    g_set_prgname("com.github.xournalpp.xournalpp");
+    g_signal_connect(app, "activate", G_CALLBACK(&on_activate), &app_data);
+    g_signal_connect(app, "command-line", G_CALLBACK(&on_command_line), &app_data);
+    g_signal_connect(app, "open", G_CALLBACK(&on_open_files), &app_data);
+    g_signal_connect(app, "startup", G_CALLBACK(&on_startup), &app_data);
+    g_signal_connect(app, "shutdown", G_CALLBACK(&on_shutdown), &app_data);
+    g_signal_connect(app, "handle-local-options", G_CALLBACK(&on_handle_local_options), &app_data);
+
+    std::array options = {GOptionEntry{"page", 'n', 0, G_OPTION_ARG_INT, &app_data.openAtPageNumber,
+                                       _("Jump to Page (first Page: 1)"), "N"},
+                          GOptionEntry{G_OPTION_REMAINING, 0, 0, G_OPTION_ARG_FILENAME_ARRAY, &app_data.optFilename,
+                                       "<input>", nullptr},
+                          GOptionEntry{"version", 0, 0, G_OPTION_ARG_NONE, &app_data.showVersion,
+                                       _("Get version of xournalpp"), nullptr},
+                          GOptionEntry{"disable-audio", 0, 0, G_OPTION_ARG_NONE, &app_data.disableAudio,
+                                       _("Disable audio for this session"), nullptr},
+                          GOptionEntry{"attach-mode", 0, 0, G_OPTION_ARG_NONE, &app_data.attachMode,
+                                       _("Open PDF in attach mode\n"
+                                         "                                       Ignored if no PDF file is specified."),
+                                       nullptr},
+                          GOptionEntry{"save", 's', 0, G_OPTION_ARG_FILENAME, &app_data.docFilename,
+                                       _("Save xopp-file with the background PDF specified as FILE"), "XOPPFILE"},
+                          GOptionEntry{nullptr}};  // Must be terminated by a nullptr. See gtk doc
+    g_application_add_main_option_entries(G_APPLICATION(app), options.data());
+
+    std::string pdfbackendMessage =
+            FS(_F("Use the provided backend for PDF exports.\n"
+                  "                                       Available backends: {1}\n"
+                  "                                       No effect without -p/--create-pdf=foo.pdf") %
+               ExportBackend::listAvailableBackends());
+    /**
+     * Export related options
+     */
+    std::array exportOptions = {
+            GOptionEntry{"create-pdf", 'p', G_OPTION_FLAG_IN_MAIN, G_OPTION_ARG_FILENAME, &app_data.pdfFilename,
+                         _("Export FILE as PDF"), "PDFFILE"},
+            GOptionEntry{
+                    "create-img", 'i', G_OPTION_FLAG_IN_MAIN, G_OPTION_ARG_FILENAME, &app_data.imgFilename,
+                    _("Export FILE as image files (one per page)\n"
+                      "                                       Guess the output format from the extension of IMGFILE\n"
+                      "                                       Supported formats: .png, .svg"),
+                    "IMGFILE"},
+            GOptionEntry{
+                    "export-no-background", 0, 0, G_OPTION_ARG_NONE, &app_data.exportNoBackground,
+                    _("Export without background\n"
+                      "                                       The exported file has transparent or white background,\n"
+                      "                                       depending on what its format supports\n"),
+                    0},
+            GOptionEntry{"export-no-ruling", 0, 0, G_OPTION_ARG_NONE, &app_data.exportNoRuling,
+                         _("Export without ruling\n"
+                           "                                       The exported file has no paper ruling\n"),
+                         0},
+            GOptionEntry{
+                    "export-layers-progressively", 0, 0, G_OPTION_ARG_NONE, &app_data.progressiveMode,
+                    _("Export layers progressively\n"
+                      "                                       In PDF export, Render layers progressively one by one.\n"
+                      "                                       This results in N export pages per page with N layers,\n"
+                      "                                       building up the layer stack progressively.\n"
+                      "                                       The resulting PDF file can be used for a "
+                      "presentation.\n"),
+                    0},
+            GOptionEntry{
+                    "export-range", 0, 0, G_OPTION_ARG_STRING, &app_data.exportRange,
+                    _("Only export the pages specified by RANGE (e.g. \"2-3,5,7-\")\n"
+                      "                                       No effect without -p/--create-pdf or -i/--create-img"),
+                    "RANGE"},
+            GOptionEntry{
+                    "export-layer-range", 0, 0, G_OPTION_ARG_STRING, &app_data.exportLayerRange,
+                    _("Only export the layers specified by RANGE (e.g. \"2-3,5,7-\")\n"
+                      "                                       No effect without -p/--create-pdf or -i/--create-img"),
+                    "RANGE"},
+            GOptionEntry{"export-png-dpi", 0, 0, G_OPTION_ARG_INT, &app_data.exportPngDpi,
+                         _("Set DPI for PNG exports. Default is 300\n"
+                           "                                       No effect without -i/--create-img=foo.png"),
+                         "N"},
+            GOptionEntry{"export-png-width", 0, 0, G_OPTION_ARG_INT, &app_data.exportPngWidth,
+                         _("Set page width for PNG exports\n"
+                           "                                       No effect without -i/--create-img=foo.png\n"
+                           "                                       Ignored if --export-png-dpi is used"),
+                         "N"},
+            GOptionEntry{"export-png-height", 0, 0, G_OPTION_ARG_INT, &app_data.exportPngHeight,
+                         _("Set page height for PNG exports\n"
+                           "                                       No effect without -i/--create-img=foo.png\n"
+                           "                                       Ignored if --export-png-dpi or --export-png-width "
+                           "is used"),
+                         "N"},
+            GOptionEntry{"export-pdf-backend", 0, 0, G_OPTION_ARG_STRING, &app_data.exportPdfBackend,
+                         pdfbackendMessage.c_str(), "BACKEND"},
+            GOptionEntry{nullptr}};  // Must be terminated by a nullptr. See gtk doc
+    GOptionGroup* exportGroup = g_option_group_new("export", _("Advanced export options"),
+                                                   _("Display advanced export options"), nullptr, nullptr);
+    g_option_group_add_entries(exportGroup, exportOptions.data());
+    g_application_add_option_group(G_APPLICATION(app), exportGroup);
+
+    auto rv = g_application_run(G_APPLICATION(app), argc, argv);
+    g_object_unref(app);
+    return rv;
+}
diff --git a/entry/src/main/cpp/src/core/control/XournalMain.h b/entry/src/main/cpp/src/core/control/XournalMain.h
new file mode 100644
index 0000000..54e4e95
--- /dev/null
+++ b/entry/src/main/cpp/src/core/control/XournalMain.h
@@ -0,0 +1,20 @@
+/*
+ * Xournal++
+ *
+ * Xournal main entry, commandline parser
+ *
+ * @author Xournal++ Team
+ * https://github.com/xournalpp/xournalpp
+ *
+ * @license GNU GPLv2 or later
+ */
+
+#pragma once
+
+
+
+
+namespace XournalMain {
+auto run(int argc, char** argv) -> int;
+void initLocalisation();
+}
diff --git a/entry/src/main/cpp/src/core/control/actions/ActionDatabase.cpp b/entry/src/main/cpp/src/core/control/actions/ActionDatabase.cpp
new file mode 100644
index 0000000..814cb8f
--- /dev/null
+++ b/entry/src/main/cpp/src/core/control/actions/ActionDatabase.cpp
@@ -0,0 +1,209 @@
+#include "ActionDatabase.h"
+
+#include <type_traits>
+#include <utility>
+
+#include <gobject/gsignal.h>
+
+#include "control/Control.h"
+#include "gui/MainWindow.h"
+#include "util/GVariantTemplate.h"
+#include "util/safe_casts.h"  // for to_underlying Todo(cpp20) remove
+
+#include "ActionProperties.h"
+
+#ifdef DEBUG_ACTION_DB
+#define START_ROW "   * " << std::left << std::setw(30) << std::boolalpha << Action_toString(a)
+#endif
+
+template <Action a, class U = void>
+struct InitiallyEnabled {
+    static inline void setup(ActionDatabase* db, Control*) { db->enableAction(a, true); }
+};
+template <Action a>
+struct InitiallyEnabled<a, std::void_t<decltype(&ActionProperties<a>::initiallyEnabled)>> {
+    static inline void setup(ActionDatabase* db, Control* ctrl) {
+        db->enableAction(a, ActionProperties<a>::initiallyEnabled(ctrl));
+    }
+};
+
+
+class ActionDatabase::Populator {
+    /// Choose the right action namespace
+    template <Action a, class U = void>
+    struct ActionNamespace {
+        static constexpr auto ACTION_NAMESPACE = "win.";
+        static void addToActionMap(ActionDatabase* db) {
+            g_action_map_add_action(G_ACTION_MAP(db->win), G_ACTION(db->gActions[a].get()));
+        }
+    };
+    template <Action a>
+    struct ActionNamespace<
+            a, std::enable_if_t<std::is_same_v<typename ActionProperties<a>::app_namespace, std::true_type>, void>> {
+        static constexpr auto ACTION_NAMESPACE = "app.";
+        static void addToActionMap(ActionDatabase* db) {
+            g_action_map_add_action(G_ACTION_MAP(gtk_window_get_application(GTK_WINDOW(db->win))),
+                                    G_ACTION(db->gActions[a].get()));
+        }
+    };
+
+    /**
+     * Accelerators<a>::setup(ctrl); will setup the accelerators listed in ActionProperties<a>::accelerators (if any)
+     */
+    template <Action a, class U = void>
+    struct Accelerators {
+        static inline void setup(Control*) {}
+    };
+    template <Action a>
+    struct Accelerators<a, std::void_t<decltype(&ActionProperties<a>::accelerators)>> {
+        static_assert(std::is_array_v<decltype(ActionProperties<a>::accelerators)>);
+        static_assert(
+                std::is_same_v<std::remove_extent_t<decltype(ActionProperties<a>::accelerators)>, const char* const>);
+        static_assert(
+                ActionProperties<a>::accelerators[std::extent_v<decltype(ActionProperties<a>::accelerators)> - 1] ==
+                        nullptr,
+                "ActionProperties<a>::accelerators must be null terminated");
+
+        static inline void setup(Control* ctrl) {
+            // Todo(cpp20) constexpr this concatenation
+            std::string fullActionName = ActionNamespace<a>::ACTION_NAMESPACE;
+            fullActionName += Action_toString(a);
+            gtk_application_set_accels_for_action(GTK_APPLICATION(gtk_window_get_application(ctrl->getGtkWindow())),
+                                                  fullActionName.c_str(), ActionProperties<a>::accelerators);
+        }
+    };
+
+    template <Action a>
+    static inline void finishSetup(ActionDatabase* db, const char* signal) {
+        db->signalIds[a] = g_signal_connect(G_OBJECT(db->gActions[a].get()), signal,
+                                            G_CALLBACK(ActionProperties<a>::callback), db->control);
+        ActionNamespace<a>::addToActionMap(db);
+        // g_action_map_add_action(G_ACTION_MAP(db->win), G_ACTION(db->gActions[a].get()));
+        Accelerators<a>::setup(db->control);
+        InitiallyEnabled<a>::setup(db, db->control);
+    }
+
+    // Actions without state or parameter
+    template <Action a, std::enable_if_t<!has_param<a>() && !has_state<a>(), bool> = true>
+    static void assign(ActionDatabase* db) {
+
+        ACTIONDB_PRINT_DEBUG(START_ROW << " |               |            |");
+
+        db->gActions[a].reset(g_simple_action_new(Action_toString(a), nullptr), xoj::util::adopt);
+
+        finishSetup<a>(db, "activate");
+    }
+
+    // Actions with parameter but no state
+    template <Action a, std::enable_if_t<has_param<a>() && !has_state<a>(), bool> = true>
+    static void assign(ActionDatabase* db) {
+
+        ACTIONDB_PRINT_DEBUG(START_ROW << " |               | type = \""
+                                       << (const char*)gVariantType<typename ActionProperties<a>::parameter_type>()
+                                       << "\" |");
+
+        db->gActions[a].reset(
+                g_simple_action_new(Action_toString(a), gVariantType<typename ActionProperties<a>::parameter_type>()),
+                xoj::util::adopt);
+
+        finishSetup<a>(db, "activate");
+    }
+
+    // Actions with a state but no parameter
+    template <Action a, std::enable_if_t<!has_param<a>() && has_state<a>(), bool> = true>
+    static void assign(ActionDatabase* db) {
+
+        ACTIONDB_PRINT_DEBUG(START_ROW << " | \""
+                                       << (const char*)gVariantType<typename ActionProperties<a>::state_type>()
+                                       << "\" = " << std::setw(7) << ActionProperties<a>::initialState(db->control)
+                                       << " |            |");
+
+        db->gActions[a].reset(g_simple_action_new_stateful(Action_toString(a), nullptr,
+                                                           makeGVariant<typename ActionProperties<a>::state_type>(
+                                                                   ActionProperties<a>::initialState(db->control))),
+                              xoj::util::adopt);
+
+        finishSetup<a>(db, "change-state");
+    }
+
+    // Actions with both state and parameter (with matching type)
+    template <Action a, std::enable_if_t<has_param<a>() && has_state<a>(), bool> = true>
+    static void assign(ActionDatabase* db) {
+        static_assert(
+                std::is_same_v<typename ActionProperties<a>::state_type, typename ActionProperties<a>::parameter_type>);
+
+        ACTIONDB_PRINT_DEBUG(
+                START_ROW << " | \"" << (const char*)gVariantType<typename ActionProperties<a>::state_type>()
+                          << "\" = " << std::setw(7) << ActionProperties<a>::initialState(db->control) << " | type = \""
+                          << (const char*)gVariantType<typename ActionProperties<a>::state_type>() << "\" |");
+
+        db->gActions[a].reset(g_simple_action_new_stateful(Action_toString(a),
+                                                           gVariantType<typename ActionProperties<a>::state_type>(),
+                                                           makeGVariant<typename ActionProperties<a>::state_type>(
+                                                                   ActionProperties<a>::initialState(db->control))),
+                              xoj::util::adopt);
+
+        finishSetup<a>(db, "change-state");
+    }
+
+    template <size_t... As>
+    static void populateImpl(std::index_sequence<As...>, ActionDatabase* db) {
+        ((assign<static_cast<Action>(As)>(db)), ...);
+    }
+
+
+public:
+    static void populate(ActionDatabase* db);
+};
+
+void ActionDatabase::Populator::populate(ActionDatabase* db) {
+    ACTIONDB_PRINT_DEBUG("Populating ActionDatabase:");
+    ACTIONDB_PRINT_DEBUG("        ACTION NAME:                |  STATE INIT   | PARAM TYPE |");
+
+    populateImpl(std::make_index_sequence<xoj::to_underlying(Action::ENUMERATOR_COUNT)>(), db);
+}
+
+ActionDatabase::ActionDatabase(Control* control):
+        control(control), win(GTK_APPLICATION_WINDOW(control->getWindow()->getWindow())) {
+    Populator::populate(this);
+}
+
+ActionDatabase::~ActionDatabase() {
+    auto sig = signalIds.begin();
+    for (auto& a: gActions) {
+        /**
+         * The GAction's might still be referenced elsewhere (e.g. by the GtkApplicationWindow), so we need to
+         * disconnect the signals in case a callback is called and the Control instance has been destroyed
+         */
+        g_signal_handler_disconnect(a.get(), *sig++);
+    }
+}
+
+
+void ActionDatabase::enableAction(Action action, bool enable) {
+    xoj_assert(gActions[action]);
+    g_simple_action_set_enabled(gActions[action].get(), enable);
+    ACTIONDB_PRINT_DEBUG((enable ? "Enabling Action \"" : "Disabling Action\"") << Action_toString(action) << "\"");
+}
+
+auto ActionDatabase::getAction(Action a) const -> ActionRef { return gActions[a]; }
+
+bool ActionDatabase::isActionEnabled(Action a) const {
+    xoj_assert(gActions[a]);
+    return g_action_get_enabled(G_ACTION(gActions[a].get()));
+}
+
+void ActionDatabase::disableAll() {
+    for (auto&& a: gActions) {
+        g_simple_action_set_enabled(a.get(), false);
+    }
+}
+
+template <size_t... As>
+static void resetEnableStatusImpl(std::index_sequence<As...>, ActionDatabase* db, Control* ctrl) {
+    ((InitiallyEnabled<static_cast<Action>(As)>::setup(db, ctrl)), ...);
+}
+
+void ActionDatabase::resetEnableStatus() {
+    resetEnableStatusImpl(std::make_index_sequence<xoj::to_underlying(Action::ENUMERATOR_COUNT)>(), this, control);
+}
diff --git a/entry/src/main/cpp/src/core/control/actions/ActionDatabase.h b/entry/src/main/cpp/src/core/control/actions/ActionDatabase.h
new file mode 100644
index 0000000..46282b4
--- /dev/null
+++ b/entry/src/main/cpp/src/core/control/actions/ActionDatabase.h
@@ -0,0 +1,120 @@
+/*
+ * Xournal++
+ *
+ * A database for GSimpleAction corresponding to enum/Action.enum.h
+ *
+ * @author Xournal++ Team
+ * https://github.com/xournalpp/xournalpp
+ *
+ * @license GNU GPLv2 or later
+ */
+#pragma once
+
+#include <gio/gio.h>
+#include <gtk/gtk.h>
+
+#include "enums/Action.enum.h"
+#include "util/Assert.h"
+#include "util/EnumIndexedArray.h"
+#include "util/GVariantTemplate.h"
+#include "util/raii/GObjectSPtr.h"
+
+#include "ActionRef.h"
+#include "config-debug.h"  // for DEBUG_ACTION_DB
+
+class Control;
+
+#ifdef DEBUG_ACTION_DB
+#include <iomanip>
+#include <iostream>
+
+#include "util/Color.h"
+#include "util/safe_casts.h"
+#include "util/serdesstream.h"
+#define ACTIONDB_PRINT_DEBUG(f) std::cout << f << std::endl
+template <class T, typename = void>
+struct to_stream {
+    to_stream(const T& t): t(t) {}
+    const T& t;
+    friend std::ostream& operator<<(std::ostream& str, const to_stream& self) { return str << self.t; }
+};
+template <class T>
+struct to_stream<T, std::enable_if_t<std::is_enum_v<T>, void>> {
+    to_stream(const T& t): t(t) {}
+    const T& t;
+    friend std::ostream& operator<<(std::ostream& str, const to_stream& self) {
+        return str << xoj::to_underlying(self.t);
+    }
+};
+template <>
+struct to_stream<Color, void> {
+    to_stream(const Color& t): t(t) {}
+    const Color& t;
+    friend std::ostream& operator<<(std::ostream& str, const to_stream& self) {
+        auto s = serdes_stream<std::stringstream>();
+        s << std::hex << std::showbase << static_cast<uint32_t>(self.t);
+        return str << s.str();
+    }
+};
+#else
+#define ACTIONDB_PRINT_DEBUG(f)
+#endif
+
+class ActionDatabase {
+public:
+    ActionDatabase(Control* control);
+    ~ActionDatabase();
+
+    void enableAction(Action a, bool enable);
+    ActionRef getAction(Action a) const;
+    bool isActionEnabled(Action a) const;
+
+    /// Disables every action
+    void disableAll();
+    /// Set the actions enabled flag depending on ActionProperties::initiallyEnabled()
+    void resetEnableStatus();
+
+    /**
+     * @brief Set the action's state, without triggering callbacks
+     */
+    template <typename state_type>
+    inline void setActionState(Action a, state_type state) {
+        xoj_assert(gActions[a]);
+        g_simple_action_set_state(gActions[a].get(), makeGVariant(state));
+        ACTIONDB_PRINT_DEBUG("Set action \"" << Action_toString(a) << "\" state to " << to_stream(state));
+    }
+
+    /**
+     * @brief Change the action's state, triggering callbacks
+     */
+    template <typename state_type>
+    inline void fireChangeActionState(Action a, state_type state) {
+        xoj_assert(gActions[a]);
+        g_action_change_state(G_ACTION(gActions[a].get()), makeGVariant(state));
+        ACTIONDB_PRINT_DEBUG("Fire action \"" << Action_toString(a) << "\" state change to " << to_stream(state));
+    }
+
+    /**
+     * @brief Activate the action, triggering callbacks
+     */
+    inline void fireActivateAction(Action a) {
+        xoj_assert(gActions[a]);
+        g_action_activate(G_ACTION(gActions[a].get()), nullptr);
+        ACTIONDB_PRINT_DEBUG("Fire action \"" << Action_toString(a) << "\" activate");
+    }
+    template <typename param_type>
+    inline void fireActivateAction(Action a, param_type param) {
+        xoj_assert(gActions[a]);
+        g_action_activate(G_ACTION(gActions[a].get()), makeGVariant(param));
+        ACTIONDB_PRINT_DEBUG("Fire action \"" << Action_toString(a) << "\" activate with param " << to_stream(param));
+    }
+
+private:
+    EnumIndexedArray<ActionRef, Action> gActions;
+    EnumIndexedArray<gulong, Action> signalIds;
+    Control* control;
+    GtkApplicationWindow* win;
+
+    class Populator;
+    friend class Populator;
+};
diff --git a/entry/src/main/cpp/src/core/control/actions/ActionProperties.h b/entry/src/main/cpp/src/core/control/actions/ActionProperties.h
new file mode 100644
index 0000000..5a64b3c
--- /dev/null
+++ b/entry/src/main/cpp/src/core/control/actions/ActionProperties.h
@@ -0,0 +1,1100 @@
+/**
+ *
+ *
+ */
+#pragma once
+
+#include <type_traits>
+
+#include "control/AudioController.h"
+#include "control/Control.h"
+#include "control/ScrollHandler.h"
+#include "control/ToolEnums.h"
+#include "control/UndoRedoController.h"
+#include "control/layer/LayerController.h"
+#include "control/settings/Settings.h"
+#include "control/zoom/ZoomControl.h"
+#include "enums/Action.enum.h"
+#include "gui/MainWindow.h"
+#include "gui/SearchBar.h"
+#include "gui/XournalView.h"
+#include "gui/dialog/RenameLayerDialog.h"
+#include "gui/toolbarMenubar/ToolMenuHandler.h"
+#include "model/Document.h"
+#include "model/Font.h"
+#include "model/StrokeStyle.h"
+#include "model/XojPage.h"
+#include "plugin/PluginController.h"
+#include "util/Assert.h"
+#include "util/PopupWindowWrapper.h"
+#include "util/Util.h"
+#include "util/XojMsgBox.h"
+#include "util/i18n.h"
+
+#include "ActionDatabase.h"
+
+/**
+ * Template class to store Action properties. Expected members are:
+ *      * a static member function
+ *              static void callback(GSimpleAction*, GVariant*, Control*);
+ *      * (optional) a member type state_type. If a state_type is provided, there must be a static member function
+ *              static state_type initialState(Control* ctrl);
+ *      * (optional) a member type parameter_type. If both are provided, parameter_type and state_type must agree.
+ *      * (optional) a member static constexpr const char* accelerators[] = {"accel1", "accel2", nullptr} for
+ *          accelerators that need to be set in the code rather than in the .xml files
+ *      * (optional) a static member function
+ *              static bool initiallyEnabled(Control*);
+ *          Defaults to [](Control*){return true;}
+ *      * (optional) a member type app_namespace = std::true_type if the action should be added to the app. namespace
+ *          Otherwise, it is added to the win. namespace
+ *
+ * Note that both state_type and parameter_type must be convertible to GVariant. See util/GVariantTemplate.h
+ */
+template <Action action>
+struct ActionProperties {};
+
+/**
+ * @brief true if the Action has a parameter
+ */
+template <Action a, class U = void>
+struct has_param: std::false_type {};
+template <Action a>
+struct has_param<a, std::void_t<typename ActionProperties<a>::parameter_type>>: std::true_type {};
+
+/**
+ * @brief true if the Action has a state
+ */
+template <Action a, class U = void>
+struct has_state: std::false_type {};
+template <Action a>
+struct has_state<a, std::void_t<typename ActionProperties<a>::state_type>>: std::true_type {};
+
+
+/*** SPECIALIZATIONS ***/
+
+/** File Menu **/
+template <>
+struct ActionProperties<Action::NEW_FILE> {
+    static void callback(GSimpleAction*, GVariant*, Control* ctrl) {
+        ctrl->clearSelectionEndText();
+        ctrl->newFile();
+    }
+};
+
+template <>
+struct ActionProperties<Action::OPEN> {
+    static void callback(GSimpleAction*, GVariant*, Control* ctrl) { ctrl->askToOpenFile(); }
+};
+
+template <>
+struct ActionProperties<Action::ANNOTATE_PDF> {
+    static void callback(GSimpleAction*, GVariant*, Control* ctrl) {
+        ctrl->clearSelectionEndText();
+        ctrl->askToAnnotatePdf();
+    }
+};
+
+template <>
+struct ActionProperties<Action::SAVE> {
+    static void callback(GSimpleAction*, GVariant*, Control* ctrl) { ctrl->save(); }
+};
+
+template <>
+struct ActionProperties<Action::SAVE_AS> {
+    static void callback(GSimpleAction*, GVariant*, Control* ctrl) { ctrl->saveAs(); }
+};
+
+template <>
+struct ActionProperties<Action::EXPORT_AS_PDF> {
+    static void callback(GSimpleAction*, GVariant*, Control* ctrl) { ctrl->exportAsPdf(); }
+};
+
+template <>
+struct ActionProperties<Action::EXPORT_AS> {
+    static void callback(GSimpleAction*, GVariant*, Control* ctrl) { ctrl->exportAs(); }
+};
+template <>
+struct ActionProperties<Action::PRINT> {
+    static void callback(GSimpleAction*, GVariant*, Control* ctrl) { ctrl->print(); }
+};
+template <>
+struct ActionProperties<Action::QUIT> {
+    using app_namespace = std::true_type;
+#ifdef __APPLE__
+    static constexpr const char* accelerators[] = {"<Meta>Q", nullptr};
+#else
+    static constexpr const char* accelerators[] = {"<Ctrl>Q", nullptr};
+#endif
+    static void callback(GSimpleAction*, GVariant*, Control* ctrl) { ctrl->quit(); }
+};
+
+
+/** Edit Menu **/
+template <>
+struct ActionProperties<Action::UNDO> {
+#ifdef __APPLE__
+    static constexpr const char* accelerators[] = {"<Meta>Z", nullptr};
+#else
+    static constexpr const char* accelerators[] = {"<Ctrl>Z", nullptr};
+#endif
+    static bool initiallyEnabled(Control* ctrl) { return ctrl->undoRedo->canUndo(); }
+    static void callback(GSimpleAction*, GVariant*, Control* ctrl) { UndoRedoController::undo(ctrl); }
+};
+template <>
+struct ActionProperties<Action::REDO> {
+#ifdef __APPLE__
+    static constexpr const char* accelerators[] = {"<Meta><Shift>Z", "<Meta>Y", nullptr};
+#else
+    static constexpr const char* accelerators[] = {"<Ctrl><Shift>Z", "<Ctrl>Y", nullptr};
+#endif
+    static bool initiallyEnabled(Control* ctrl) { return ctrl->undoRedo->canRedo(); }
+    static void callback(GSimpleAction*, GVariant*, Control* ctrl) {
+        ctrl->clearSelectionEndText();
+        UndoRedoController::redo(ctrl);
+    }
+};
+template <>
+struct ActionProperties<Action::CUT> {
+#ifdef __APPLE__
+    static constexpr const char* accelerators[] = {"<Meta>X", "Cut", nullptr};
+#else
+    static constexpr const char* accelerators[] = {"<Ctrl>X", "Cut", nullptr};
+#endif
+    static void callback(GSimpleAction*, GVariant*, Control* ctrl) { ctrl->cut(); }
+};
+template <>
+struct ActionProperties<Action::COPY> {
+#ifdef __APPLE__
+    static constexpr const char* accelerators[] = {"<Meta>C", "Copy", nullptr};
+#else
+    static constexpr const char* accelerators[] = {"<Ctrl>C", "Copy", nullptr};
+#endif
+    static void callback(GSimpleAction*, GVariant*, Control* ctrl) { ctrl->copy(); }
+};
+template <>
+struct ActionProperties<Action::PASTE> {
+#ifdef __APPLE__
+    static constexpr const char* accelerators[] = {"<Meta>V", "Paste", nullptr};
+#else
+    static constexpr const char* accelerators[] = {"<Ctrl>V", "Paste", nullptr};
+#endif
+    static void callback(GSimpleAction*, GVariant*, Control* ctrl) { ctrl->paste(); }
+};
+template <>
+struct ActionProperties<Action::SEARCH> {
+    static void callback(GSimpleAction*, GVariant*, Control* ctrl) {
+        ctrl->clearSelectionEndText();
+        ctrl->getSearchBar()->showSearchBar(true);
+    }
+};
+
+template <>
+struct ActionProperties<Action::SELECT_ALL> {
+    static void callback(GSimpleAction*, GVariant*, Control* ctrl) { ctrl->selectAllOnPage(); }
+};
+template <>
+struct ActionProperties<Action::DELETE> {
+    static void callback(GSimpleAction*, GVariant*, Control* ctrl) {
+        if (!ctrl->getWindow()->getXournal()->actionDelete()) {
+            ctrl->deleteSelection();
+        }
+    }
+};
+
+template <>
+struct ActionProperties<Action::ARRANGE_SELECTION_ORDER> {
+    using parameter_type = EditSelection::OrderChange;
+    static void callback(GSimpleAction*, GVariant* p, Control* ctrl) {
+        auto change = getGVariantValue<EditSelection::OrderChange>(p);
+        xoj_assert(change <= EditSelection::OrderChange::SendToBack);
+        ctrl->reorderSelection(change);
+    }
+};
+
+template <>
+struct ActionProperties<Action::MOVE_SELECTION_LAYER_UP> {
+    static void callback(GSimpleAction*, GVariant*, Control* ctrl) {
+        // moveSelectionToLayer takes layer number (layerid - 1) not id
+        // therefore the new layer is "layerid - 1 + 1"
+        ctrl->moveSelectionToLayer(ctrl->getCurrentPage()->getSelectedLayerId());
+    }
+};
+
+template <>
+struct ActionProperties<Action::MOVE_SELECTION_LAYER_DOWN> {
+    static void callback(GSimpleAction*, GVariant*, Control* ctrl) {
+        if (ctrl->getLayerController()->getCurrentLayerId() >= 2) {
+            // moveSelectionToLayer takes layer number (layerid - 1) not id
+            // therefore the new layer is "layerid - 1 - 1"
+            ctrl->moveSelectionToLayer(ctrl->getCurrentPage()->getSelectedLayerId() - 2);
+        }
+    }
+};
+
+template <>
+struct ActionProperties<Action::ROTATION_SNAPPING> {
+    using state_type = bool;
+    static state_type initialState(Control* ctrl) { return ctrl->getSettings()->isSnapRotation(); }
+    static void callback(GSimpleAction* ga, GVariant* p, Control* ctrl) {
+        g_simple_action_set_state(ga, p);
+        bool enable = g_variant_get_boolean(p);
+        ctrl->setRotationSnapping(enable);
+    }
+};
+
+template <>
+struct ActionProperties<Action::GRID_SNAPPING> {
+    using state_type = bool;
+    static state_type initialState(Control* ctrl) { return ctrl->getSettings()->isSnapGrid(); }
+    static void callback(GSimpleAction* ga, GVariant* p, Control* ctrl) {
+        g_simple_action_set_state(ga, p);
+        bool enable = g_variant_get_boolean(p);
+        ctrl->setGridSnapping(enable);
+    }
+};
+
+template <>
+struct ActionProperties<Action::PREFERENCES> {
+    using app_namespace = std::true_type;
+    static void callback(GSimpleAction*, GVariant*, Control* ctrl) { ctrl->showSettings(); }
+};
+
+
+/** View Menu **/
+template <>
+struct ActionProperties<Action::PAIRED_PAGES_MODE> {
+    using state_type = bool;
+    static state_type initialState(Control* ctrl) { return ctrl->getSettings()->isShowPairedPages(); }
+    static void callback(GSimpleAction* ga, GVariant* p, Control* ctrl) {
+        g_simple_action_set_state(ga, p);
+        bool enabled = g_variant_get_boolean(p);
+        ctrl->setViewPairedPages(enabled);
+    }
+};
+
+template <>
+struct ActionProperties<Action::PAIRED_PAGES_OFFSET> {
+    using state_type = int;
+    static state_type initialState(Control* ctrl) { return ctrl->getSettings()->getPairsOffset(); }
+    static void callback(GSimpleAction* ga, GVariant* p, Control* ctrl) {
+        g_simple_action_set_state(ga, p);
+        int offset = g_variant_get_int32(p);
+        ctrl->setPairsOffset(offset);
+    }
+};
+
+template <>
+struct ActionProperties<Action::PRESENTATION_MODE> {
+    using state_type = bool;
+    static state_type initialState(Control* ctrl) { return ctrl->getSettings()->isPresentationMode(); }
+    static void callback(GSimpleAction* ga, GVariant* p, Control* ctrl) {
+        g_simple_action_set_state(ga, p);
+        bool enabled = g_variant_get_boolean(p);
+        ctrl->setViewPresentationMode(enabled);
+    }
+};
+
+template <>
+struct ActionProperties<Action::FULLSCREEN> {
+    using state_type = bool;
+    static constexpr state_type initialState(Control*) { return false; }
+    static void callback(GSimpleAction* ga, GVariant* p, Control* ctrl) {
+        g_simple_action_set_state(ga, p);
+        bool enabled = g_variant_get_boolean(p);
+        ctrl->setViewFullscreenMode(enabled);
+    }
+};
+
+template <>
+struct ActionProperties<Action::SHOW_SIDEBAR> {
+    using state_type = bool;
+    static state_type initialState(Control* ctrl) { return ctrl->getSettings()->isSidebarVisible(); }
+    static void callback(GSimpleAction*, GVariant* p, Control* ctrl) { ctrl->setShowSidebar(g_variant_get_boolean(p)); }
+};
+
+template <>
+struct ActionProperties<Action::SHOW_TOOLBAR> {
+    using state_type = bool;
+    static state_type initialState(Control* ctrl) { return ctrl->getSettings()->isToolbarVisible(); }
+    static void callback(GSimpleAction*, GVariant* p, Control* ctrl) { ctrl->setShowToolbar(g_variant_get_boolean(p)); }
+};
+
+template <>
+struct ActionProperties<Action::SET_LAYOUT_VERTICAL> {
+    using state_type = bool;
+    using parameter_type = state_type;
+    static state_type initialState(Control* ctrl) { return ctrl->getSettings()->getViewLayoutVert(); }
+    static void callback(GSimpleAction* ga, GVariant* p, Control* ctrl) {
+        g_simple_action_set_state(ga, p);
+        bool vertical = g_variant_get_boolean(p);
+        ctrl->setViewLayoutVert(vertical);
+    }
+};
+
+template <>
+struct ActionProperties<Action::SET_LAYOUT_RIGHT_TO_LEFT> {
+    using state_type = bool;
+    using parameter_type = state_type;
+    static state_type initialState(Control* ctrl) { return ctrl->getSettings()->getViewLayoutR2L(); }
+    static void callback(GSimpleAction* ga, GVariant* p, Control* ctrl) {
+        g_simple_action_set_state(ga, p);
+        bool rightToLeft = g_variant_get_boolean(p);
+        ctrl->setViewLayoutR2L(rightToLeft);
+    }
+};
+
+template <>
+struct ActionProperties<Action::SET_LAYOUT_BOTTOM_TO_TOP> {
+    using state_type = bool;
+    using parameter_type = state_type;
+    static state_type initialState(Control* ctrl) { return ctrl->getSettings()->getViewLayoutB2T(); }
+    static void callback(GSimpleAction* ga, GVariant* p, Control* ctrl) {
+        g_simple_action_set_state(ga, p);
+        bool bottomToTop = g_variant_get_boolean(p);
+        ctrl->setViewLayoutB2T(bottomToTop);
+    }
+};
+
+template <>
+struct ActionProperties<Action::SET_COLUMNS_OR_ROWS> {
+    using state_type = int;
+    using parameter_type = state_type;
+    static state_type initialState(Control* ctrl) {
+        auto* settings = ctrl->getSettings();
+        return settings->isViewFixedRows() ? -settings->getViewRows() : settings->getViewColumns();
+    }
+    static void callback(GSimpleAction* ga, GVariant* p, Control* ctrl) {
+        g_simple_action_set_state(ga, p);
+        int value = g_variant_get_int32(p);
+        xoj_assert(value != 0);
+        if (value > 0) {
+            ctrl->setViewColumns(value);
+        } else {
+            ctrl->setViewRows(std::abs(value));
+        }
+    }
+};
+
+template <>
+struct ActionProperties<Action::MANAGE_TOOLBAR> {
+    static void callback(GSimpleAction*, GVariant*, Control* ctrl) { ctrl->manageToolbars(); }
+};
+template <>
+struct ActionProperties<Action::CUSTOMIZE_TOOLBAR> {
+    static void callback(GSimpleAction*, GVariant*, Control* ctrl) { ctrl->customizeToolbars(); }
+};
+template <>
+struct ActionProperties<Action::SHOW_MENUBAR> {
+    using state_type = bool;
+    static state_type initialState(Control* ctrl) { return ctrl->getSettings()->isMenubarVisible(); }
+    static void callback(GSimpleAction*, GVariant* p, Control* ctrl) { ctrl->setShowMenubar(g_variant_get_boolean(p)); }
+};
+
+
+/*
+ * Zoom callbacks are postponed to later in the UI Thread
+ * On slower machine this feels more fluent.
+ */
+template <>
+struct ActionProperties<Action::ZOOM_IN> {
+#ifdef __APPLE__
+    static constexpr const char* accelerators[] = {"<Meta>plus", "<Meta>KP_Add", "<Meta>equal", nullptr};
+#else
+    static constexpr const char* accelerators[] = {"<Ctrl>plus", "<Ctrl>KP_Add", "<Ctrl>equal", nullptr};
+#endif
+    static void callback(GSimpleAction*, GVariant*, Control* ctrl) {
+        Util::execInUiThread([zoom = ctrl->getZoomControl()]() { zoom->zoomOneStep(ZOOM_IN); });
+    }
+};
+
+template <>
+struct ActionProperties<Action::ZOOM_OUT> {
+#ifdef __APPLE__
+    static constexpr const char* accelerators[] = {"<Meta>minus", "<Meta>KP_Subtract", nullptr};
+#else
+    static constexpr const char* accelerators[] = {"<Ctrl>minus", "<Ctrl>KP_Subtract", nullptr};
+#endif
+    static void callback(GSimpleAction*, GVariant*, Control* ctrl) {
+        Util::execInUiThread([zoom = ctrl->getZoomControl()]() { zoom->zoomOneStep(ZOOM_OUT); });
+    }
+};
+
+template <>
+struct ActionProperties<Action::ZOOM_100> {
+    static void callback(GSimpleAction*, GVariant*, Control* ctrl) {
+        Util::execInUiThread([zoom = ctrl->getZoomControl()]() { zoom->zoom100(); });
+    }
+};
+
+template <>
+struct ActionProperties<Action::ZOOM_FIT> {
+    using state_type = bool;
+    static state_type initialState(Control* ctrl) { return ctrl->getZoomControl()->isZoomFitMode(); }
+    static void callback(GSimpleAction* ga, GVariant* p, Control* ctrl) {
+        g_simple_action_set_state(ga, p);
+        bool enabled = g_variant_get_boolean(p);
+        Util::execInUiThread([enabled, zoom = ctrl->getZoomControl()]() {
+            if (enabled) {
+                zoom->updateZoomFitValue();
+            }
+            // enable/disable ZoomFit
+            zoom->setZoomFitMode(enabled);
+        });
+    }
+};
+
+template <>
+struct ActionProperties<Action::ZOOM> {
+    using state_type = double;
+    static state_type initialState(Control* ctrl) { return ctrl->getZoomControl()->getZoom(); }
+    static void callback(GSimpleAction* ga, GVariant* p, Control* ctrl) {
+        g_simple_action_set_state(ga, p);
+        double scale = g_variant_get_double(p);
+        xoj_assert(scale >= DEFAULT_ZOOM_MIN && scale <= DEFAULT_ZOOM_MAX);
+        Util::execInUiThread([scale, zoomctrl = ctrl->getZoomControl()]() {
+            double newZoom = zoomctrl->getZoom100Value() * scale;
+            zoomctrl->setZoomFitMode(false);
+            zoomctrl->startZoomSequence();
+            zoomctrl->zoomSequenceChange(newZoom, false);
+            zoomctrl->endZoomSequence();
+        });
+    }
+};
+
+/** Navigation menu **/
+template <>
+struct ActionProperties<Action::GOTO_FIRST> {
+    static void callback(GSimpleAction*, GVariant*, Control* ctrl) { ctrl->getScrollHandler()->scrollToPage(0); }
+};
+template <>
+struct ActionProperties<Action::GOTO_PREVIOUS> {
+    static void callback(GSimpleAction*, GVariant*, Control* ctrl) { ctrl->getScrollHandler()->goToPreviousPage(); }
+};
+
+template <>
+struct ActionProperties<Action::GOTO_PAGE> {
+    static void callback(GSimpleAction*, GVariant*, Control* ctrl) { ctrl->gotoPage(); }
+};
+template <>
+struct ActionProperties<Action::GOTO_NEXT> {
+    static void callback(GSimpleAction*, GVariant*, Control* ctrl) { ctrl->getScrollHandler()->goToNextPage(); }
+};
+template <>
+struct ActionProperties<Action::GOTO_LAST> {
+    static void callback(GSimpleAction*, GVariant*, Control* ctrl) {
+        ctrl->getScrollHandler()->scrollToPage(ctrl->getDocument()->getPageCount() - 1);
+    }
+};
+
+template <>
+struct ActionProperties<Action::GOTO_NEXT_ANNOTATED_PAGE> {
+    static void callback(GSimpleAction*, GVariant*, Control* ctrl) {
+        ctrl->getScrollHandler()->scrollToAnnotatedPage(true);
+    }
+};
+
+template <>
+struct ActionProperties<Action::GOTO_PREVIOUS_ANNOTATED_PAGE> {
+    static void callback(GSimpleAction*, GVariant*, Control* ctrl) {
+        ctrl->getScrollHandler()->scrollToAnnotatedPage(false);
+    }
+};
+
+
+/** Journal Menu **/
+template <>
+struct ActionProperties<Action::NEW_PAGE_BEFORE> {
+    static void callback(GSimpleAction*, GVariant*, Control* ctrl) { ctrl->insertNewPage(ctrl->getCurrentPageNo()); }
+};
+
+template <>
+struct ActionProperties<Action::NEW_PAGE_AFTER> {
+    static void callback(GSimpleAction*, GVariant*, Control* ctrl) {
+        ctrl->insertNewPage(ctrl->getCurrentPageNo() + 1);
+    }
+};
+
+template <>
+struct ActionProperties<Action::NEW_PAGE_AT_END> {
+    static void callback(GSimpleAction*, GVariant*, Control* ctrl) {
+        ctrl->insertNewPage(ctrl->getDocument()->getPageCount());
+    }
+};
+
+template <>
+struct ActionProperties<Action::DUPLICATE_PAGE> {
+    static void callback(GSimpleAction*, GVariant*, Control* ctrl) { ctrl->duplicatePage(); }
+};
+template <>
+struct ActionProperties<Action::MOVE_PAGE_TOWARDS_BEGINNING> {
+    static void callback(GSimpleAction*, GVariant*, Control* ctrl) { ctrl->movePageTowardsBeginning(); }
+};
+template <>
+struct ActionProperties<Action::MOVE_PAGE_TOWARDS_END> {
+    static void callback(GSimpleAction*, GVariant*, Control* ctrl) { ctrl->movePageTowardsEnd(); }
+};
+
+template <>
+struct ActionProperties<Action::APPEND_NEW_PDF_PAGES> {
+    static void callback(GSimpleAction*, GVariant*, Control* ctrl) { ctrl->appendNewPdfPages(); }
+};
+template <>
+struct ActionProperties<Action::CONFIGURE_PAGE_TEMPLATE> {
+    static void callback(GSimpleAction*, GVariant*, Control* ctrl) { ctrl->paperTemplate(); }
+};
+template <>
+struct ActionProperties<Action::DELETE_PAGE> {
+    static void callback(GSimpleAction*, GVariant*, Control* ctrl) { ctrl->deletePage(); }
+};
+
+template <>
+struct ActionProperties<Action::PAPER_FORMAT> {
+    static void callback(GSimpleAction*, GVariant*, Control* ctrl) { ctrl->paperFormat(); }
+};
+template <>
+struct ActionProperties<Action::PAPER_BACKGROUND_COLOR> {
+    static void callback(GSimpleAction*, GVariant*, Control* ctrl) { ctrl->changePageBackgroundColor(); }
+};
+
+
+/** Tool menu **/
+template <>
+struct ActionProperties<Action::SELECT_TOOL> {
+    using state_type = ToolType;
+    using parameter_type = state_type;
+    static state_type initialState(Control* ctrl) { return ctrl->getToolHandler()->getActiveTool()->getToolType(); }
+    static void callback(GSimpleAction* ga, GVariant* p, Control* ctrl) {
+        g_simple_action_set_state(ga, p);
+        ToolType tt = getGVariantValue<ToolType>(p);
+        xoj_assert(tt < TOOL_END_ENTRY);
+        if (requiresClearedSelection(tt)) {
+            ctrl->clearSelection();
+        }
+        ctrl->selectTool(tt);
+    }
+};
+
+template <>
+struct ActionProperties<Action::SELECT_DEFAULT_TOOL> {
+    static void callback(GSimpleAction*, GVariant*, Control* ctrl) { ctrl->selectDefaultTool(); }
+};
+
+/*
+ * To have the menu entries drawn as check boxes and not as radio buttons, each drawing type has a boolean-state
+ * action (on/off). This action cannot take a parameter: we need one callback per drawing type
+ */
+template <DrawingType type>
+struct ActionPropDrawingTypes {
+    using state_type = bool;
+    static state_type initialState(Control* ctrl) {
+        return ctrl->getToolHandler()->getActiveTool()->getDrawingType() == type;
+    }
+    static void callback(GSimpleAction* ga, GVariant* p, Control* ctrl) {
+        auto* actionDB = ctrl->getActionDatabase();
+
+        actionDB->setActionState(Action::TOOL_DRAW_SHAPE_RECOGNIZER, false);
+        actionDB->setActionState(Action::TOOL_DRAW_RECTANGLE, false);
+        actionDB->setActionState(Action::TOOL_DRAW_ELLIPSE, false);
+        actionDB->setActionState(Action::TOOL_DRAW_ARROW, false);
+        actionDB->setActionState(Action::TOOL_DRAW_DOUBLE_ARROW, false);
+        actionDB->setActionState(Action::TOOL_DRAW_COORDINATE_SYSTEM, false);
+        actionDB->setActionState(Action::TOOL_DRAW_LINE, false);
+        actionDB->setActionState(Action::TOOL_DRAW_SPLINE, false);
+
+        g_simple_action_set_state(ga, p);
+        bool enabled = g_variant_get_boolean(p);
+
+        ctrl->setToolDrawingType(enabled ? type : DRAWING_TYPE_DEFAULT);
+    }
+};
+
+template <>
+struct ActionProperties<Action::TOOL_DRAW_SHAPE_RECOGNIZER>: ActionPropDrawingTypes<DRAWING_TYPE_SHAPE_RECOGNIZER> {};
+template <>
+struct ActionProperties<Action::TOOL_DRAW_RECTANGLE>: ActionPropDrawingTypes<DRAWING_TYPE_RECTANGLE> {};
+template <>
+struct ActionProperties<Action::TOOL_DRAW_ELLIPSE>: ActionPropDrawingTypes<DRAWING_TYPE_ELLIPSE> {};
+template <>
+struct ActionProperties<Action::TOOL_DRAW_ARROW>: ActionPropDrawingTypes<DRAWING_TYPE_ARROW> {};
+template <>
+struct ActionProperties<Action::TOOL_DRAW_DOUBLE_ARROW>: ActionPropDrawingTypes<DRAWING_TYPE_DOUBLE_ARROW> {};
+template <>
+struct ActionProperties<Action::TOOL_DRAW_COORDINATE_SYSTEM>: ActionPropDrawingTypes<DRAWING_TYPE_COORDINATE_SYSTEM> {};
+template <>
+struct ActionProperties<Action::TOOL_DRAW_LINE>: ActionPropDrawingTypes<DRAWING_TYPE_LINE> {};
+template <>
+struct ActionProperties<Action::TOOL_DRAW_SPLINE>: ActionPropDrawingTypes<DRAWING_TYPE_SPLINE> {};
+
+template <>
+struct ActionProperties<Action::SETSQUARE> {
+    using state_type = bool;
+    static constexpr state_type initialState(Control*) { return false; }
+    static void callback(GSimpleAction* ga, GVariant*, Control* ctrl) {
+        // Only one GeometryTool is activated at a time
+        ctrl->getActionDatabase()->setActionState(Action::COMPASS, false);
+        g_simple_action_set_state(ga, makeGVariant(ctrl->toggleSetsquare()));
+    }
+};
+
+template <>
+struct ActionProperties<Action::COMPASS> {
+    using state_type = bool;
+    static constexpr state_type initialState(Control*) { return false; }
+    static void callback(GSimpleAction* ga, GVariant*, Control* ctrl) {
+        // Only one GeometryTool is activated at a time
+        ctrl->getActionDatabase()->setActionState(Action::SETSQUARE, false);
+        g_simple_action_set_state(ga, makeGVariant(ctrl->toggleCompass()));
+    }
+};
+
+// Pen submenu
+template <>
+struct ActionProperties<Action::TOOL_PEN_SIZE> {
+    using state_type = ToolSize;
+    using parameter_type = state_type;
+    static state_type initialState(Control* ctrl) { return ctrl->getToolHandler()->getPenSize(); }
+    static void callback(GSimpleAction* ga, GVariant* p, Control* ctrl) {
+        g_simple_action_set_state(ga, p);
+        ToolSize size = getGVariantValue<ToolSize>(p);
+        xoj_assert(size < TOOL_SIZE_NONE);
+        ctrl->getToolHandler()->setPenSize(size);
+        ctrl->penSizeChanged();
+    }
+};
+
+template <>
+struct ActionProperties<Action::TOOL_PEN_LINE_STYLE> {
+    using state_type = const std::string&;
+    using parameter_type = state_type;
+    static std::string initialState(Control* ctrl) { return ctrl->getLineStyleToSelect().value_or("none"); }
+    static void callback(GSimpleAction* ga, GVariant* p, Control* ctrl) {
+        g_simple_action_set_state(ga, p);
+        const char* styleName = g_variant_get_string(p, nullptr);
+        ctrl->setLineStyle(styleName);
+    }
+};
+
+template <>
+struct ActionProperties<Action::TOOL_PEN_FILL> {
+    using state_type = bool;
+    static state_type initialState(Control* ctrl) { return ctrl->getToolHandler()->getTool(TOOL_PEN).getFill(); }
+    static void callback(GSimpleAction* ga, GVariant* p, Control* ctrl) {
+        g_simple_action_set_state(ga, p);
+        bool enabled = g_variant_get_boolean(p);
+        ctrl->getToolHandler()->setPenFillEnabled(enabled);
+    }
+};
+
+template <>
+struct ActionProperties<Action::TOOL_PEN_FILL_OPACITY> {
+    static void callback(GSimpleAction*, GVariant*, Control* ctrl) { ctrl->selectAlpha(OPACITY_FILL_PEN); }
+};
+// Eraser submenu
+template <>
+struct ActionProperties<Action::TOOL_ERASER_SIZE> {
+    using state_type = ToolSize;
+    using parameter_type = state_type;
+    static state_type initialState(Control* ctrl) { return ctrl->getToolHandler()->getEraserSize(); }
+    static void callback(GSimpleAction* ga, GVariant* p, Control* ctrl) {
+        g_simple_action_set_state(ga, p);
+        ToolSize size = getGVariantValue<ToolSize>(p);
+        xoj_assert(size < TOOL_SIZE_NONE);
+        ctrl->getToolHandler()->setEraserSize(size);
+        ctrl->eraserSizeChanged();
+    }
+};
+
+template <>
+struct ActionProperties<Action::TOOL_ERASER_TYPE> {
+    using state_type = EraserType;
+    using parameter_type = state_type;
+    static state_type initialState(Control* ctrl) { return ctrl->getToolHandler()->getEraserType(); }
+    static void callback(GSimpleAction* ga, GVariant* p, Control* ctrl) {
+        g_simple_action_set_state(ga, p);
+        EraserType type = getGVariantValue<EraserType>(p);
+        ctrl->setEraserType(type);
+    }
+};
+
+// Highlighter submenu
+template <>
+struct ActionProperties<Action::TOOL_HIGHLIGHTER_SIZE> {
+    using state_type = ToolSize;
+    using parameter_type = state_type;
+    static state_type initialState(Control* ctrl) { return ctrl->getToolHandler()->getHighlighterSize(); }
+    static void callback(GSimpleAction* ga, GVariant* p, Control* ctrl) {
+        g_simple_action_set_state(ga, p);
+        ToolSize size = getGVariantValue<ToolSize>(p);
+        xoj_assert(size < TOOL_SIZE_NONE);
+        ctrl->getToolHandler()->setHighlighterSize(size);
+        ctrl->highlighterSizeChanged();
+    }
+};
+
+template <>
+struct ActionProperties<Action::TOOL_HIGHLIGHTER_FILL> {
+    using state_type = bool;
+    static state_type initialState(Control* ctrl) {
+        return ctrl->getToolHandler()->getTool(TOOL_HIGHLIGHTER).getFill();
+    }
+    static void callback(GSimpleAction* ga, GVariant* p, Control* ctrl) {
+        g_simple_action_set_state(ga, p);
+        bool enabled = g_variant_get_boolean(p);
+        ctrl->getToolHandler()->setHighlighterFillEnabled(enabled);
+    }
+};
+
+template <>
+struct ActionProperties<Action::TOOL_HIGHLIGHTER_FILL_OPACITY> {
+    static void callback(GSimpleAction*, GVariant*, Control* ctrl) { ctrl->selectAlpha(OPACITY_FILL_HIGHLIGHTER); }
+};
+
+template <>
+struct ActionProperties<Action::TOOL_SELECT_PDF_TEXT_MARKER_OPACITY> {
+    static void callback(GSimpleAction*, GVariant*, Control* ctrl) {
+        ctrl->selectAlpha(OPACITY_SELECT_PDF_TEXT_MARKER);
+    }
+};
+
+template <>
+struct ActionProperties<Action::TOGGLE_TOUCH_DRAWING> {
+    using state_type = bool;
+    static state_type initialState(Control* ctrl) { return ctrl->getSettings()->getTouchDrawingEnabled(); }
+    static void callback(GSimpleAction* ga, GVariant* p, Control* ctrl) {
+        g_simple_action_set_state(ga, p);
+        bool enabled = g_variant_get_boolean(p);
+        ctrl->getSettings()->setTouchDrawingEnabled(enabled);
+    }
+};
+
+template <>
+struct ActionProperties<Action::SELECT_FONT> {
+    static void callback(GSimpleAction*, GVariant*, Control* ctrl) { ctrl->showFontDialog(); }
+};
+
+template <>
+struct ActionProperties<Action::FONT> {
+    using state_type = const std::string&;
+    using parameter_type = state_type;
+    static std::string initialState(Control* ctrl) { return ctrl->getSettings()->getFont().asString(); }
+    static void callback(GSimpleAction* ga, GVariant* p, Control* ctrl) {
+        g_simple_action_set_state(ga, p);
+        ctrl->fontChanged(XojFont(g_variant_get_string(p, nullptr)));
+    }
+};
+
+template <>
+struct ActionProperties<Action::AUDIO_RECORD> {
+    using state_type = bool;
+    static constexpr state_type initialState(Control*) { return false; }
+    static void callback(GSimpleAction* ga, GVariant* p, Control* ctrl) {
+#ifdef ENABLE_AUDIO
+        if (!ctrl->audioController) {
+            g_warning("Audio has been disabled");
+            return;
+        }
+        bool enabled = g_variant_get_boolean(p);
+        bool success = false;
+        if (enabled) {
+            success = ctrl->getAudioController()->startRecording();
+        } else {
+            success = ctrl->getAudioController()->stopRecording();
+        }
+
+        if (success) {
+            g_simple_action_set_state(ga, p);
+        } else {
+            g_simple_action_set_state(ga, g_variant_new_boolean(!enabled));
+            Util::execInUiThread([win = ctrl->getGtkWindow()]() {
+                XojMsgBox::showErrorToUser(win, _("Recorder could not be started."));
+            });
+        }
+#else
+        g_warning("Audio has been disabled at compile time");
+#endif
+    }
+};
+template <>
+struct ActionProperties<Action::AUDIO_PAUSE_PLAYBACK> {
+    using state_type = bool;
+    static constexpr state_type initialState(Control*) { return false; }
+    static constexpr bool initiallyEnabled(Control*) { return false; }
+    static void callback(GSimpleAction* ga, GVariant* p, Control* ctrl) {
+#ifdef ENABLE_AUDIO
+        if (!ctrl->audioController) {
+            g_warning("Audio has been disabled");
+            return;
+        }
+        g_simple_action_set_state(ga, p);
+        bool enabled = g_variant_get_boolean(p);
+        if (enabled) {
+            ctrl->getAudioController()->pausePlayback();
+        } else {
+            ctrl->getAudioController()->continuePlayback();
+        }
+#else
+        g_warning("Audio has been disabled at compile time");
+#endif
+    }
+};
+
+template <>
+struct ActionProperties<Action::AUDIO_SEEK_FORWARDS> {
+    static constexpr bool initiallyEnabled(Control*) { return false; }
+    static void callback(GSimpleAction*, GVariant*, Control* ctrl) {
+#ifdef ENABLE_AUDIO
+        if (!ctrl->audioController) {
+            g_warning("Audio has been disabled");
+            return;
+        }
+        ctrl->getAudioController()->seekForwards();
+#else
+        g_warning("Audio has been disabled at compile time");
+#endif
+    }
+};
+
+template <>
+struct ActionProperties<Action::AUDIO_SEEK_BACKWARDS> {
+    static constexpr bool initiallyEnabled(Control*) { return false; }
+    static void callback(GSimpleAction*, GVariant*, Control* ctrl) {
+#ifdef ENABLE_AUDIO
+        if (!ctrl->audioController) {
+            g_warning("Audio has been disabled");
+            return;
+        }
+        ctrl->getAudioController()->seekBackwards();
+#else
+        g_warning("Audio has been disabled at compile time");
+#endif
+    }
+};
+
+template <>
+struct ActionProperties<Action::AUDIO_STOP_PLAYBACK> {
+    static constexpr bool initiallyEnabled(Control*) { return false; }
+    static void callback(GSimpleAction*, GVariant*, Control* ctrl) {
+#ifdef ENABLE_AUDIO
+        if (!ctrl->audioController) {
+            g_warning("Audio has been disabled");
+            return;
+        }
+        ctrl->getAudioController()->stopPlayback();
+#else
+        g_warning("Audio has been disabled at compile time");
+#endif
+    }
+};
+
+template <>
+struct ActionProperties<Action::TEX> {
+    static void callback(GSimpleAction*, GVariant*, Control* ctrl) { ctrl->runLatex(); }
+};
+
+
+/** Plugin menu **/
+template <>
+struct ActionProperties<Action::PLUGIN_MANAGER> {
+    static void callback(GSimpleAction*, GVariant*, Control* ctrl) { ctrl->pluginController->showPluginManager(); }
+};
+
+
+/** Help menu **/
+template <>
+struct ActionProperties<Action::HELP> {
+    static void callback(GSimpleAction*, GVariant*, Control* ctrl) { XojMsgBox::showHelp(ctrl->getGtkWindow()); }
+};
+
+template <>
+struct ActionProperties<Action::DEMO> {
+    static void callback(GSimpleAction*, GVariant*, Control* ctrl) { ctrl->showGtkDemo(); }
+};
+
+template <>
+struct ActionProperties<Action::ABOUT> {
+    using app_namespace = std::true_type;
+    static void callback(GSimpleAction*, GVariant*, Control* ctrl) { ctrl->showAbout(); }
+};
+
+
+/** Generic tool config, for the toolbars **/
+template <>
+struct ActionProperties<Action::TOOL_SIZE> {
+    using state_type = ToolSize;
+    using parameter_type = state_type;
+    static state_type initialState(Control* ctrl) {
+        bool sizeEnable = ctrl->getToolHandler()->hasCapability(TOOL_CAP_SIZE);
+        return sizeEnable ? ctrl->getToolHandler()->getActiveTool()->getSize() : TOOL_SIZE_NONE;
+    }
+    static bool initiallyEnabled(Control* ctrl) { return ctrl->getToolHandler()->hasCapability(TOOL_CAP_SIZE); }
+    static void callback(GSimpleAction* ga, GVariant* p, Control* ctrl) {
+        g_simple_action_set_state(ga, p);
+        ToolSize size = getGVariantValue<ToolSize>(p);
+        xoj_assert(size < TOOL_SIZE_NONE);
+        ctrl->setToolSize(size);
+    }
+};
+
+template <>
+struct ActionProperties<Action::TOOL_FILL> {
+    using state_type = bool;
+    static state_type initialState(Control* ctrl) {
+        return ctrl->getToolHandler()->hasCapability(TOOL_CAP_FILL) &&
+               ctrl->getToolHandler()->getActiveTool()->getFill();
+    }
+    static bool initiallyEnabled(Control* ctrl) { return ctrl->getToolHandler()->hasCapability(TOOL_CAP_FILL); }
+    static void callback(GSimpleAction* ga, GVariant* p, Control* ctrl) {
+        g_simple_action_set_state(ga, p);
+        bool enabled = g_variant_get_boolean(p);
+        ctrl->setFill(enabled);
+    }
+};
+
+template <>
+struct ActionProperties<Action::TOOL_FILL_OPACITY> {
+    static bool initiallyEnabled(Control* ctrl) { return ctrl->getToolHandler()->hasCapability(TOOL_CAP_FILL); }
+    static void callback(GSimpleAction*, GVariant*, Control* ctrl) {
+        if (auto tt = ctrl->getToolHandler()->getToolType(); tt == TOOL_PEN) {
+            ctrl->selectAlpha(OPACITY_FILL_PEN);
+        } else if (tt == TOOL_HIGHLIGHTER) {
+            ctrl->selectAlpha(OPACITY_FILL_HIGHLIGHTER);
+        } else if (tt == TOOL_SELECT_PDF_TEXT_LINEAR || tt == TOOL_SELECT_PDF_TEXT_RECT) {
+            ctrl->selectAlpha(OPACITY_SELECT_PDF_TEXT_MARKER);
+        }
+    }
+};
+
+template <>
+struct ActionProperties<Action::TOOL_COLOR> {
+    using state_type = Color;
+    using parameter_type = state_type;
+    static state_type initialState(Control* ctrl) {
+        bool enable = ctrl->getToolHandler()->hasCapability(TOOL_CAP_COLOR);
+        return enable ? ctrl->getToolHandler()->getActiveTool()->getColor() : Colors::black;
+    }
+    static bool initiallyEnabled(Control* ctrl) { return ctrl->getToolHandler()->hasCapability(TOOL_CAP_COLOR); }
+    static void callback(GSimpleAction* ga, GVariant* p, Control* ctrl) {
+        g_simple_action_set_state(ga, p);
+        ctrl->getToolHandler()->setColor(getGVariantValue<Color>(p), true);
+    }
+};
+
+template <>
+struct ActionProperties<Action::SELECT_COLOR> {
+    static bool initiallyEnabled(Control* ctrl) { return ctrl->getToolHandler()->hasCapability(TOOL_CAP_COLOR); }
+    static void callback(GSimpleAction*, GVariant*, Control* ctrl) { ctrl->showColorChooserDialog(); }
+};
+
+// Layers
+template <>
+struct ActionProperties<Action::LAYER_SHOW_ALL> {
+    static void callback(GSimpleAction*, GVariant*, Control* ctrl) { ctrl->getLayerController()->showAllLayer(); }
+};
+template <>
+struct ActionProperties<Action::LAYER_HIDE_ALL> {
+    static void callback(GSimpleAction*, GVariant*, Control* ctrl) { ctrl->getLayerController()->hideAllLayer(); }
+};
+
+template <>
+struct ActionProperties<Action::LAYER_NEW_ABOVE_CURRENT> {
+    static void callback(GSimpleAction*, GVariant*, Control* ctrl) { ctrl->getLayerController()->addNewLayer(false); }
+};
+
+template <>
+struct ActionProperties<Action::LAYER_NEW_BELOW_CURRENT> {
+    static void callback(GSimpleAction*, GVariant*, Control* ctrl) { ctrl->getLayerController()->addNewLayer(true); }
+};
+
+template <>
+struct ActionProperties<Action::LAYER_COPY> {
+    static void callback(GSimpleAction*, GVariant*, Control* ctrl) { ctrl->getLayerController()->copyCurrentLayer(); }
+};
+
+template <>
+struct ActionProperties<Action::LAYER_MOVE_UP> {
+    static void callback(GSimpleAction*, GVariant*, Control* ctrl) {
+        ctrl->getLayerController()->moveCurrentLayer(true);
+    }
+};
+
+template <>
+struct ActionProperties<Action::LAYER_MOVE_DOWN> {
+    static void callback(GSimpleAction*, GVariant*, Control* ctrl) {
+        ctrl->getLayerController()->moveCurrentLayer(false);
+    }
+};
+
+template <>
+struct ActionProperties<Action::LAYER_DELETE> {
+    static void callback(GSimpleAction*, GVariant*, Control* ctrl) { ctrl->getLayerController()->deleteCurrentLayer(); }
+};
+
+template <>
+struct ActionProperties<Action::LAYER_MERGE_DOWN> {
+    static void callback(GSimpleAction*, GVariant*, Control* ctrl) {
+        ctrl->getLayerController()->mergeCurrentLayerDown();
+    }
+};
+
+template <>
+struct ActionProperties<Action::LAYER_RENAME> {
+    static void callback(GSimpleAction*, GVariant*, Control* ctrl) {
+        xoj::popup::PopupWindowWrapper<RenameLayerDialog> dialog(
+                ctrl->getGladeSearchPath(), ctrl->getUndoRedoHandler(), ctrl->getLayerController(),
+                ctrl->getLayerController()->getCurrentPage()->getSelectedLayer());
+        dialog.show(ctrl->getGtkWindow());
+    }
+};
+
+template <>
+struct ActionProperties<Action::LAYER_GOTO_NEXT> {
+    static void callback(GSimpleAction*, GVariant*, Control* ctrl) {
+        PageRef p = ctrl->getCurrentPage();
+        auto layer = p->getSelectedLayerId();
+        if (layer < p->getLayerCount()) {
+            ctrl->getLayerController()->switchToLay(layer + 1, true);
+        }
+    }
+};
+template <>
+struct ActionProperties<Action::LAYER_GOTO_PREVIOUS> {
+    static void callback(GSimpleAction*, GVariant*, Control* ctrl) {
+        PageRef p = ctrl->getCurrentPage();
+        auto layer = p->getSelectedLayerId();
+        if (layer > 0) {
+            ctrl->getLayerController()->switchToLay(layer - 1, true);
+        }
+    }
+};
+template <>
+struct ActionProperties<Action::LAYER_GOTO_TOP> {
+    static void callback(GSimpleAction*, GVariant*, Control* ctrl) {
+        PageRef p = ctrl->getCurrentPage();
+        ctrl->getLayerController()->switchToLay(p->getLayerCount(), true);
+    }
+};
+template <>
+struct ActionProperties<Action::LAYER_ACTIVE> {
+    using state_type = Layer::Index;
+    using parameter_type = state_type;
+    static state_type initialState(Control* ctrl) { return ctrl->getLayerController()->getCurrentLayerId(); }
+    static void callback(GSimpleAction* ga, GVariant* p, Control* ctrl) {
+        Layer::Index max = ctrl->getLayerController()->getLayerCount();
+        Layer::Index current = ctrl->getLayerController()->getCurrentLayerId();
+        Layer::Index n = getGVariantValue<Layer::Index>(p);
+        if (n != current && n <= max) {
+            ctrl->getLayerController()->switchToLay(n);  // Will set the right state for this action
+        }
+    }
+};
+
+template <>
+struct ActionProperties<Action::POSITION_HIGHLIGHTING> {
+    using state_type = bool;
+    static state_type initialState(Control* ctrl) { return ctrl->getSettings()->isHighlightPosition(); }
+    static void callback(GSimpleAction* ga, GVariant* p, Control* ctrl) {
+        g_simple_action_set_state(ga, p);
+        bool enable = g_variant_get_boolean(p);
+        ctrl->getSettings()->setHighlightPosition(enable);
+    }
+};
diff --git a/entry/src/main/cpp/src/core/control/actions/ActionRef.h b/entry/src/main/cpp/src/core/control/actions/ActionRef.h
new file mode 100644
index 0000000..8eb6b5f
--- /dev/null
+++ b/entry/src/main/cpp/src/core/control/actions/ActionRef.h
@@ -0,0 +1,15 @@
+/*
+ * Xournal++
+ *
+ * @author Xournal++ Team
+ * https://github.com/xournalpp/xournalpp
+ *
+ * @license GNU GPLv2 or later
+ */
+#pragma once
+
+#include <gio/gio.h>
+
+#include "util/raii/GObjectSPtr.h"
+
+using ActionRef = xoj::util::GObjectSPtr<GSimpleAction>;
diff --git a/entry/src/main/cpp/src/core/control/jobs/AutosaveJob.cpp b/entry/src/main/cpp/src/core/control/jobs/AutosaveJob.cpp
new file mode 100644
index 0000000..0f4ffa9
--- /dev/null
+++ b/entry/src/main/cpp/src/core/control/jobs/AutosaveJob.cpp
@@ -0,0 +1,79 @@
+#include "AutosaveJob.h"
+
+#include <glib.h>  // for g_message, g_warning
+
+#include "control/Control.h"              // for Control
+#include "control/jobs/Job.h"             // for JOB_TYPE_AUTOSAVE, JobType
+#include "control/xojfile/SaveHandler.h"  // for SaveHandler
+#include "model/Document.h"               // for Document
+#include "undo/UndoRedoHandler.h"         // for UndoRedoHandler
+#include "util/PathUtil.h"                // for clearExtensions, getAutosav...
+#include "util/XojMsgBox.h"               // for XojMsgBox
+#include "util/i18n.h"                    // for FS, _F
+
+#include "filesystem.h"  // for path
+
+AutosaveJob::AutosaveJob(Control* control): control(control) {}
+
+AutosaveJob::~AutosaveJob() = default;
+
+void AutosaveJob::afterRun() {
+    std::string msg = FS(_F("Error while autosaving: {1}") % this->error);
+    XojMsgBox::showErrorToUser(control->getGtkWindow(), msg);
+}
+
+void AutosaveJob::run() {
+    SaveHandler handler;
+
+    control->getUndoRedoHandler()->documentAutosaved();
+
+    Document* doc = control->getDocument();
+
+    doc->lock_shared();
+    auto filepath = doc->getFilepath();
+
+    if (filepath.empty()) {
+        filepath = Util::getAutosaveFilepath();
+    } else {
+        filepath.replace_filename(fs::path(".") += filepath.filename());
+    }
+    Util::clearExtensions(filepath);
+    filepath += ".autosave.xopp";
+
+    handler.prepareSave(doc, filepath);
+    doc->unlock_shared();
+
+    g_message("%s", FS(_F("Autosaving to {1}") % filepath.string()).c_str());
+
+    fs::path tempfile = filepath;
+    tempfile += u8"~";
+    handler.saveTo(tempfile);
+
+    doc->lock();
+    handler.updateDocumentInfo(doc);
+    doc->unlock();
+
+    this->error = handler.getErrorMessage();
+    if (!this->error.empty()) {
+        callAfterRun();
+    } else {
+        try {
+            if (fs::exists(filepath)) {
+                fs::path swaptmpfile = filepath;
+                swaptmpfile += u8".swap";
+                Util::safeRenameFile(filepath, swaptmpfile);
+                Util::safeRenameFile(tempfile, filepath);
+                // All went well, we can delete the old autosave file
+                fs::remove(swaptmpfile);
+            } else {
+                Util::safeRenameFile(tempfile, filepath);
+            }
+            control->setLastAutosaveFile(filepath);
+        } catch (const fs::filesystem_error& e) {
+            auto fmtstr = _F("Could not rename autosave file from \"{1}\" to \"{2}\": {3}");
+            this->error = FS(fmtstr % tempfile.u8string() % filepath.u8string() % e.what());
+        }
+    }
+}
+
+auto AutosaveJob::getType() -> JobType { return JOB_TYPE_AUTOSAVE; }
diff --git a/entry/src/main/cpp/src/core/control/jobs/AutosaveJob.h b/entry/src/main/cpp/src/core/control/jobs/AutosaveJob.h
new file mode 100644
index 0000000..83d7230
--- /dev/null
+++ b/entry/src/main/cpp/src/core/control/jobs/AutosaveJob.h
@@ -0,0 +1,36 @@
+/*
+ * Xournal++
+ *
+ * Autosave job
+ *
+ * @author Xournal++ Team
+ * https://github.com/xournalpp/xournalpp
+ *
+ * @license GNU GPLv2 or later
+ */
+
+#pragma once
+
+#include <string>  // for string
+
+#include "Job.h"  // for Job, JobType
+
+class Control;
+
+class AutosaveJob: public Job {
+public:
+    AutosaveJob(Control* control);
+
+protected:
+    ~AutosaveJob() override;
+
+public:
+    void run() override;
+    void afterRun() override;
+
+    JobType getType() override;
+
+private:
+    Control* control = nullptr;
+    std::string error;
+};
diff --git a/entry/src/main/cpp/src/core/control/jobs/BaseExportJob.cpp b/entry/src/main/cpp/src/core/control/jobs/BaseExportJob.cpp
new file mode 100644
index 0000000..a64e3b4
--- /dev/null
+++ b/entry/src/main/cpp/src/core/control/jobs/BaseExportJob.cpp
@@ -0,0 +1,104 @@
+#include "BaseExportJob.h"
+
+#include <utility>  // for move
+
+#include <glib.h>  // for g_warning
+
+#include "control/Control.h"            // for Control
+#include "control/jobs/BlockingJob.h"   // for BlockingJob
+#include "control/settings/Settings.h"  // for Settings
+#include "gui/MainWindow.h"             // for MainWindow
+#include "gui/dialog/XojSaveDlg.h"
+#include "model/Document.h"             // for Document, Document::PDF
+#include "util/PathUtil.h"              // for clearExtensions
+#include "util/PopupWindowWrapper.h"    // for PopupWindowWrapper
+#include "util/XojMsgBox.h"             // for XojMsgBox
+#include "util/glib_casts.h"            // for wrap_for_g_callback_v
+#include "util/i18n.h"                  // for _, FS, _F
+
+BaseExportJob::BaseExportJob(Control* control, const std::string& name): BlockingJob(control, name) {}
+
+BaseExportJob::~BaseExportJob() = default;
+
+void BaseExportJob::addFileFilterToDialog(GtkFileChooser* dialog, const std::string& name, const std::string& mime) {
+    GtkFileFilter* filter = gtk_file_filter_new();
+    gtk_file_filter_set_name(filter, name.c_str());
+    gtk_file_filter_add_mime_type(filter, mime.c_str());
+    gtk_file_chooser_add_filter(dialog, filter);
+}
+
+auto BaseExportJob::checkOverwriteBackgroundPDF(fs::path const& file) const -> bool {
+    auto backgroundPDF = control->getDocument()->getPdfFilepath();
+    try {
+        if (backgroundPDF.empty() || !fs::exists(backgroundPDF)) {
+            // If there is no background, we can return
+            return true;
+        }
+
+        if (fs::weakly_canonical(file) == fs::weakly_canonical(backgroundPDF)) {
+            // If the new file name (with the selected extension) is the previously selected pdf, warn the user
+            std::string msg = _("Do not overwrite the background PDF! This will cause errors!");
+            XojMsgBox::showErrorToUser(control->getGtkWindow(), msg);
+            return false;
+        }
+    } catch (const fs::filesystem_error& fe) {
+        g_warning("%s", fe.what());
+        auto msg = std::string(_("The check for overwriting the background failed with:\n")) + fe.what();
+        XojMsgBox::showErrorToUser(control->getGtkWindow(), msg);
+        return false;
+    }
+    return true;
+}
+
+void BaseExportJob::showFileChooser(std::function<void()> onFileSelected, std::function<void()> onCancel) {
+    Settings* settings = control->getSettings();
+    Document* doc = control->getDocument();
+    doc->lock_shared();
+    fs::path suggestedPath = doc->createSaveFoldername(settings->getLastSavePath());
+    suggestedPath /=
+            doc->createSaveFilename(Document::PDF, settings->getDefaultSaveName(), settings->getDefaultPdfExportName());
+    doc->unlock_shared();
+
+    auto pathValidation = [job = this](fs::path& p, const char* filterName) {
+        job->setExtensionFromFilter(p, filterName);
+        return job->testAndSetFilepath(p);
+    };
+
+    auto callback = [settings, onFileSelected = std::move(onFileSelected),
+                     onCancel = std::move(onCancel)](std::optional<fs::path> p) {
+        if (p && !p->empty()) {
+            settings->setLastSavePath(p->parent_path());
+            onFileSelected();
+        } else {
+            onCancel();
+        }
+    };
+
+    auto popup = xoj::popup::PopupWindowWrapper<xoj::SaveExportDialog>(control->getSettings(), std::move(suggestedPath),
+                                                                       _("Export File"), _("Export"),
+                                                                       std::move(pathValidation), std::move(callback));
+
+    auto* fc = GTK_FILE_CHOOSER(popup.getPopup()->getWindow());
+    addFilterToDialog(fc);
+
+    popup.show(GTK_WINDOW(this->control->getWindow()->getWindow()));
+}
+
+auto BaseExportJob::testAndSetFilepath(const fs::path& file) -> bool {
+    try {
+        if (!file.empty() && fs::is_directory(file.parent_path()) && checkOverwriteBackgroundPDF(file)) {
+            this->filepath = file;
+            return true;
+        }
+    } catch (const fs::filesystem_error& e) {
+        std::string msg = FS(_F("Failed to resolve path with the following error:\n{1}") % e.what());
+        XojMsgBox::showErrorToUser(control->getGtkWindow(), msg);
+    }
+    return false;
+}
+
+void BaseExportJob::afterRun() {
+    if (!this->errorMsg.empty()) {
+        XojMsgBox::showErrorToUser(control->getGtkWindow(), this->errorMsg);
+    }
+}
diff --git a/entry/src/main/cpp/src/core/control/jobs/BaseExportJob.h b/entry/src/main/cpp/src/core/control/jobs/BaseExportJob.h
new file mode 100644
index 0000000..38a457e
--- /dev/null
+++ b/entry/src/main/cpp/src/core/control/jobs/BaseExportJob.h
@@ -0,0 +1,74 @@
+/*
+ * Xournal++
+ *
+ * Base class for Exports
+ *
+ * @author Xournal++ Team
+ * https://github.com/xournalpp/xournalpp
+ *
+ * @license GNU GPLv2 or later
+ */
+
+#pragma once
+
+#include <functional>
+#include <string>  // for string
+
+#include <gtk/gtk.h>  // for GtkWidget
+
+#include "BlockingJob.h"  // for BlockingJob
+#include "filesystem.h"   // for path
+
+/**
+ *  @brief List of types for the export of background components.
+ *  The order must agree with the corresponding listBackgroundType in ui/exportSettings.glade.
+ *  It is constructed so that one can check for intermediate types using comparison.
+ */
+enum ExportBackgroundType { EXPORT_BACKGROUND_NONE, EXPORT_BACKGROUND_UNRULED, EXPORT_BACKGROUND_ALL };
+
+class Control;
+
+class BaseExportJob: public BlockingJob {
+public:
+    BaseExportJob(Control* control, const std::string& name);
+
+protected:
+    ~BaseExportJob() override;
+
+public:
+    void afterRun() override;
+
+public:
+    virtual void showFileChooser(std::function<void()> onFileSelected, std::function<void()> onCancel);
+
+protected:
+    virtual void addFilterToDialog(GtkFileChooser* dialog) = 0;
+    static void addFileFilterToDialog(GtkFileChooser* dialog, const std::string& name, const std::string& mimetype);
+    bool checkOverwriteBackgroundPDF(fs::path const& file) const;
+
+    virtual void setExtensionFromFilter(fs::path& p, const char* filterName) const = 0;
+
+    /**
+     * Test if the given path is valid and records the path for the instance's later export tasks.
+     *
+     * Returns true if the path is validated.
+     */
+    bool testAndSetFilepath(const fs::path& file);
+
+private:
+protected:
+    fs::path filepath;
+
+    /**
+     * Error message to show to the user
+     */
+    std::string errorMsg;
+
+    class ExportType {
+    public:
+        std::string extension;
+        std::string mimeType;
+
+        ExportType(std::string ext, std::string mime): extension(std::move(ext)), mimeType(std::move(mime)) {}
+    };
+};
diff --git a/entry/src/main/cpp/src/core/control/jobs/BlockingJob.cpp b/entry/src/main/cpp/src/core/control/jobs/BlockingJob.cpp
new file mode 100644
index 0000000..5c24721
--- /dev/null
+++ b/entry/src/main/cpp/src/core/control/jobs/BlockingJob.cpp
@@ -0,0 +1,25 @@
+#include "BlockingJob.h"
+
+#include <glib.h>  // for g_idle_add
+
+#include "control/Control.h"   // for Control
+#include "control/jobs/Job.h"  // for JOB_TYPE_BLOCKING, JobType
+#include "gui/MainWindow.h"    // for MainWindow
+#include "gui/XournalView.h"   // for XournalView
+#include "util/Util.h"         // for execInUiThread
+#include "util/glib_casts.h"   // for wrap_for_once_v
+
+BlockingJob::BlockingJob(Control* control, const std::string& name): control(control) { control->block(name); }
+
+BlockingJob::~BlockingJob() { this->control = nullptr; }
+
+void BlockingJob::execute() {
+    this->run();
+
+    Util::execInUiThread([control = this->control]() {
+        control->unblock();
+        control->getWindow()->getXournal()->requestFocus();
+    });
+}
+
+auto BlockingJob::getType() -> JobType { return JOB_TYPE_BLOCKING; }
diff --git a/entry/src/main/cpp/src/core/control/jobs/BlockingJob.h b/entry/src/main/cpp/src/core/control/jobs/BlockingJob.h
new file mode 100644
index 0000000..854df6c
--- /dev/null
+++ b/entry/src/main/cpp/src/core/control/jobs/BlockingJob.h
@@ -0,0 +1,34 @@
+/*
+ * Xournal++
+ *
+ * A job which is done in the GTK main thread, but the application is blocked
+ *
+ * @author Xournal++ Team
+ * https://github.com/xournalpp/xournalpp
+ *
+ * @license GNU GPLv2 or later
+ */
+
+#pragma once
+
+#include <string>  // for string
+
+#include "Job.h"  // for Job, JobType
+
+class Control;
+
+class BlockingJob: public Job {
+public:
+    BlockingJob(Control* control, const std::string& name);
+
+protected:
+    ~BlockingJob() override;
+
+public:
+    void execute() override;
+
+    JobType getType() override;
+
+protected:
+    Control* control;
+};
diff --git a/entry/src/main/cpp/src/core/control/jobs/CustomExportJob.cpp b/entry/src/main/cpp/src/core/control/jobs/CustomExportJob.cpp
new file mode 100644
index 0000000..3e7759e
--- /dev/null
+++ b/entry/src/main/cpp/src/core/control/jobs/CustomExportJob.cpp
@@ -0,0 +1,158 @@
+#include "CustomExportJob.h"
+
+#include <memory>   // for unique_ptr
+#include <utility>  // for move, pair
+
+#include <gtk/gtk.h>  // for GTK_WINDOW
+
+#include "control/Control.h"                   // for Control
+#include "control/jobs/BaseExportJob.h"        // for BaseExportJob::ExportType
+#include "control/xojfile/XojExportHandler.h"  // for XojExportHandler
+#include "gui/MainWindow.h"                    // for MainWindow
+#include "gui/dialog/ExportDialog.h"           // for ExportDialog
+#include "model/Document.h"                    // for Document
+#include "pdf/base/XojPdfExport.h"             // for XojPdfExport
+#include "pdf/base/XojPdfExportFactory.h"      // for XojPdfExportFactory
+#include "util/PathUtil.h"                     // for clearExtensions
+#include "util/PopupWindowWrapper.h"           // for PopupWindowWrapper
+#include "util/Util.h"                         // for execInUiThread
+#include "util/XojMsgBox.h"                    // for XojMsgBox
+#include "util/i18n.h"                         // for _, FS, _F
+
+#include "ImageExport.h"  // for ImageExport, EXPORT_GR...
+#include "SaveJob.h"      // for SaveJob
+#include "XournalScheduler.h"
+
+
+CustomExportJob::CustomExportJob(Control* control): BaseExportJob(control, _("Custom Export")) {
+    // Supported filters
+    filters.insert({_("PDF files"), ExportType(".pdf", "application/pdf")});
+    filters.insert({_("PNG graphics"), ExportType(".png", "image/png")});
+    filters.insert({_("SVG graphics"), ExportType(".svg", "image/svg+xml")});
+    filters.insert({_("Xournal (Compatibility)"), ExportType(".xoj", "application/x-xojpp")});
+}
+
+CustomExportJob::~CustomExportJob() = default;
+
+void CustomExportJob::addFilterToDialog(GtkFileChooser* dialog) {
+    // Runs on every filter inside the filters map
+    for (auto& filter: filters) {
+        addFileFilterToDialog(dialog, filter.first, filter.second.mimeType);
+    }
+}
+
+void CustomExportJob::setExtensionFromFilter(fs::path& file, const char* filterName) const {
+    // Extract the file filter selected
+    const auto& chosenFilter = filters.at(filterName);
+
+    // Remove any pre-existing extension and adds the chosen one
+    Util::clearExtensions(file, chosenFilter.extension);
+    file += chosenFilter.extension;
+}
+
+void CustomExportJob::showDialogAndRun() {
+
+    auto onFileSelected = [job = this]() {
+        Util::execInUiThread([job]() {
+            if (job->filepath.extension() == ".xoj") {
+                job->exportTypeXoj = true;
+                job->control->getScheduler()->addJob(job, JOB_PRIORITY_NONE);
+                return;
+            }
+
+            if (auto ext = job->filepath.extension(); ext == ".pdf") {
+                job->format = EXPORT_GRAPHICS_PDF;
+            } else if (ext == ".svg") {
+                job->format = EXPORT_GRAPHICS_SVG;
+            } else if (ext == ".png") {
+                job->format = EXPORT_GRAPHICS_PNG;
+            } else {
+                g_warning("Unknown extension");
+            }
+
+            auto* ctrl = job->control;
+            xoj::popup::PopupWindowWrapper<xoj::popup::ExportDialog> popup(
+                    ctrl->getGladeSearchPath(), job->format, ctrl->getCurrentPageNo() + 1,
+                    ctrl->getDocument()->getPageCount(), !ctrl->getDocument()->getPdfFilepath().empty(),
+                    [job](const xoj::popup::ExportDialog& dialog) {
+                        if (dialog.isConfirmed()) {
+                            job->exportRange = dialog.getRange();
+                            job->progressiveMode = dialog.progressiveModeSelected();
+                            job->exportBackground = dialog.getBackgroundType();
+                            job->pdfExportBackend = dialog.getPdfExportBackend();
+
+                            if (job->format == EXPORT_GRAPHICS_PNG) {
+                                job->pngQualityParameter = dialog.getPngQualityParameter();
+                            }
+
+                            job->control->getScheduler()->addJob(job, JOB_PRIORITY_NONE);
+                        } else {
+                            // The job blocked, so we have to unblock, because the job
+                            // unblocks only after run
+                            job->control->unblock();
+                        }
+                        job->unref();
+                    });
+            popup.show(GTK_WINDOW(job->control->getWindow()->getWindow()));
+        });
+    };
+
+    auto onCancel = [job = this]() {
+        job->control->unblock();
+        job->unref();
+    };
+
+    BaseExportJob::showFileChooser(std::move(onFileSelected), std::move(onCancel));
+}
+
+/**
+ * Create one Graphics file per page
+ */
+void CustomExportJob::exportGraphics() {
+    ImageExport imgExport(control->getDocument(), filepath, format, exportBackground, exportRange);
+    if (format == EXPORT_GRAPHICS_PNG) {
+        imgExport.setQualityParameter(pngQualityParameter);
+    }
+    imgExport.exportGraphics(control);
+    errorMsg = imgExport.getLastErrorMsg();
+}
+
+void CustomExportJob::run() {
+    if (exportTypeXoj) {
+        SaveJob::updatePreview(control);
+        Document* doc = this->control->getDocument();
+
+        XojExportHandler h;
+        doc->lock_shared();
+        h.prepareSave(doc, filepath);
+        h.saveTo(filepath, this->control);
+        doc->unlock_shared();
+
+        if (!h.getErrorMessage().empty()) {
+            this->lastError = FS(_F("Save file error: {1}") % h.getErrorMessage());
+
+            callAfterRun();
+        }
+    } else if (format == EXPORT_GRAPHICS_PDF) {
+        // don't lock the page here for the whole flow, else we get a dead lock...
+        // the ui is blocked, so there should be no changes...
+        Document* doc = control->getDocument();
+
+        std::unique_ptr<XojPdfExport> pdfe = XojPdfExportFactory::createExport(doc, control, pdfExportBackend);
+
+        pdfe->setExportBackground(exportBackground);
+
+        if (!pdfe->createPdf(this->filepath, exportRange, progressiveMode)) {
+            this->errorMsg = pdfe->getLastError();
+        }
+
+    } else {
+        exportGraphics();
+    }
+}
+
+void CustomExportJob::afterRun() {
+    if (!this->lastError.empty()) {
+        XojMsgBox::showErrorToUser(control->getGtkWindow(), this->lastError);
+    }
+}
diff --git a/entry/src/main/cpp/src/core/control/jobs/CustomExportJob.h b/entry/src/main/cpp/src/core/control/jobs/CustomExportJob.h
new file mode 100644
index 0000000..5aaf869
--- /dev/null
+++ b/entry/src/main/cpp/src/core/control/jobs/CustomExportJob.h
@@ -0,0 +1,91 @@
+/*
+ * Xournal++
+ *
+ * A customized export
+ *
+ * @author Xournal++ Team
+ * https://github.com/xournalpp/xournalpp
+ *
+ * @license GNU GPLv2 or later
+ */
+
+#pragma once
+
+#include <map>     // for map
+#include <string>  // for string
+
+#include "pdf/base/PdfExportBackend.h"
+#include "util/ElementRange.h"  // for PageRangeVector
+
+#include "BaseExportJob.h"  // for BaseExportJob, EXPORT_BACKGROUND_ALL
+#include "ImageExport.h"    // for RasterImageQualityParameter, EXPORT_GRAP...
+#include "filesystem.h"     // for path
+
+class Control;
+
+
+class CustomExportJob: public BaseExportJob {
+public:
+    CustomExportJob(Control* control);
+
+protected:
+    ~CustomExportJob() override;
+
+public:
+    void run() override;
+
+public:
+    void showDialogAndRun();
+
+protected:
+    void afterRun() override;
+
+    void addFilterToDialog(GtkFileChooser* dialog) override;
+    void setExtensionFromFilter(fs::path& p, const char* filterName) const override;
+
+    /**
+     * Create one Graphics file per page
+     */
+    void exportGraphics();
+
+
+private:
+    /**
+     * The range to export
+     */
+    PageRangeVector exportRange;
+
+    /**
+     * @brief Quality parameter for PNG exports
+     */
+    RasterImageQualityParameter pngQualityParameter = RasterImageQualityParameter();
+
+    /**
+     * Export graphics format
+     */
+    ExportGraphicsFormat format = EXPORT_GRAPHICS_UNDEFINED;
+
+    /**
+     * XOJ Export, else PNG Export
+     */
+    bool exportTypeXoj = false;
+
+    /**
+     * Background export type
+     */
+    ExportBackgroundType exportBackground = EXPORT_BACKGROUND_ALL;
+
+    /// Backend used for exporting the PDF background to PDF
+    ExportBackend pdfExportBackend = ExportBackend::DEFAULT;
+
+    /**
+     * Export all Layers progressively
+     */
+    bool progressiveMode = false;
+
+    std::string lastError;
+
+    std::string chosenFilterName;
+
+    std::map<std::string, ExportType> filters;
+};
diff --git a/entry/src/main/cpp/src/core/control/jobs/ImageExport.cpp b/entry/src/main/cpp/src/core/control/jobs/ImageExport.cpp
new file mode 100644
index 0000000..c708a7e
--- /dev/null
+++ b/entry/src/main/cpp/src/core/control/jobs/ImageExport.cpp
@@ -0,0 +1,260 @@
+#include "ImageExport.h"
+
+#include <cmath>    // for round
+#include <cstddef>  // for size_t
+#include <memory>   // for __shared_ptr_access, allocat...
+#include <utility>  // for move
+#include <vector>   // for vector
+
+#include <cairo-svg.h>  // for cairo_svg_surface_create
+
+#include "control/jobs/BaseExportJob.h"  // for EXPORT_BACKGROUND_NONE, EXPO...
+#include "model/Document.h"              // for Document
+#include "model/PageRef.h"               // for PageRef
+#include "model/PageType.h"              // for PageType
+#include "model/XojPage.h"               // for XojPage
+#include "pdf/base/XojPdfPage.h"         // for XojPdfPageSPtr, XojPdfPage
+#include "util/StringUtils.h"            // for char_cast
+#include "util/Util.h"                   // for DPI_NORMALIZATION_FACTOR
+#include "util/i18n.h"                   // for _
+#include "view/DocumentView.h"           // for DocumentView
+#include "view/LayerView.h"
+#include "view/View.h"
+#include "view/background/BackgroundView.h"
+
+#include "ProgressListener.h"  // for ProgressListener
+
+using std::string;
+
+
+ImageExport::ImageExport(Document* doc, fs::path file, ExportGraphicsFormat format,
+                         ExportBackgroundType exportBackground, const PageRangeVector& exportRange):
+        doc(doc), file(std::move(file)), format(format), exportBackground(exportBackground), exportRange(exportRange) {}
+
+ImageExport::~ImageExport() = default;
+
+/**
+ * @brief Set a quality level for PNG exports
+ * @param qParam A quality parameter for the export
+ */
+void ImageExport::setQualityParameter(RasterImageQualityParameter qParam) { this->qualityParameter = qParam; }
+
+/**
+ * @brief Set a quality level for PNG exports
+ * @param criterion A quality criterion for the export
+ * @param value The target value of this criterion
+ */
+void ImageExport::setQualityParameter(ExportQualityCriterion criterion, int value) {
+    this->qualityParameter = RasterImageQualityParameter(criterion, value);
+}
+
+/**
+ * @brief Select layers to export by parsing str
+ * @param rangeStr A string parsed to get a list of layers
+ */
+void ImageExport::setLayerRange(const char* rangeStr) {
+    if (rangeStr) {
+        // Use no upper bound for layer indices, as the maximal value can vary between pages
+        layerRange =
+                std::make_unique<LayerRangeVector>(ElementRange::parse(rangeStr, std::numeric_limits<size_t>::max()));
+    }
+}
+
+/**
+ * @brief Get the last error message
+ * @return The last error message to show to the user
+ */
+auto ImageExport::getLastErrorMsg() const -> string { return lastError; }
+
+/**
+ * @brief Create Cairo surface for a given page
+ * @param width the width of the page being exported
+ * @param height the height of the page being exported
+ * @param id the id of the page being exported
+ * @param zoomRatio the zoom ratio for PNG exports with fixed DPI
+ *
+ * @return the zoom ratio of the current page if the export type is PNG, 0.0 otherwise
+ *          The return value may differ from that of the parameter zoomRatio if the export has fixed page width or
+ * height (in pixels). In this case, the zoomRatio (and the DPI) is page-dependent as soon as the document has pages of
+ * different sizes.
+ */
+auto ImageExport::createSurface(double width, double height, size_t id, double zoomRatio) -> double {
+    switch (this->format) {
+        case EXPORT_GRAPHICS_PNG:
+            switch (this->qualityParameter.getQualityCriterion()) {
+                case EXPORT_QUALITY_WIDTH:
+                    zoomRatio = ((double)this->qualityParameter.getValue()) / width;
+                    this->surface = cairo_image_surface_create(CAIRO_FORMAT_ARGB32, this->qualityParameter.getValue(),
+                                                               (int)std::round(height * zoomRatio));
+                    break;
+                case EXPORT_QUALITY_HEIGHT:
+                    zoomRatio = ((double)this->qualityParameter.getValue()) / height;
+                    this->surface = cairo_image_surface_create(CAIRO_FORMAT_ARGB32, (int)std::round(width * zoomRatio),
+                                                               this->qualityParameter.getValue());
+                    break;
+                case EXPORT_QUALITY_DPI:  // Use the zoomRatio given as argument
+                    this->surface = cairo_image_surface_create(CAIRO_FORMAT_ARGB32, (int)std::round(width * zoomRatio),
+                                                               (int)std::round(height * zoomRatio));
+                    break;
+            }
+            this->cr = cairo_create(this->surface);
+            cairo_scale(this->cr, zoomRatio, zoomRatio);
+            return zoomRatio;
+        case EXPORT_GRAPHICS_SVG:
+            this->surface =
+                    cairo_svg_surface_create(char_cast(getFilenameWithNumber(id).u8string().c_str()), width, height);
+            cairo_svg_surface_restrict_to_version(this->surface, CAIRO_SVG_VERSION_1_2);
+            this->cr = cairo_create(this->surface);
+            break;
+        default:
+            this->lastError = _("Unsupported graphics format: ") + std::to_string(this->format);
+    }
+    return 0.0;
+}
+
+/**
+ * Free / store the surface
+ */
+auto ImageExport::freeSurface(size_t id) -> bool {
+    cairo_destroy(this->cr);
+
+    cairo_status_t status = CAIRO_STATUS_SUCCESS;
+    if (format == EXPORT_GRAPHICS_PNG) {
+        auto filepath = getFilenameWithNumber(id);
+        status = cairo_surface_write_to_png(surface, char_cast(filepath.u8string().c_str()));
+    }
+    cairo_surface_destroy(surface);
+
+    // we ignore this problem
+    return status == CAIRO_STATUS_SUCCESS;
+}
+
+/**
+ * @brief Get a filename with a (page) number appended
+ * @param no The appended number. If no==-1, does not append anything.
+ * e.g. .../export-2.png, if the no is -1, return .../export.png
+ *
+ * @return The filename
+ */
+auto ImageExport::getFilenameWithNumber(size_t no) const -> fs::path {
+    if (no == SINGLE_PAGE) {
+        // No number to add
+        return file;
+    }
+
+    auto ext = file.extension();
+    auto path(file);
+    path.replace_extension();
+    (path += (std::string("-") + std::to_string(no))) += ext;
+    return path;
+}
+
+/**
+ * @brief Export a single PNG/SVG page
+ * @param pageId The index of the page being exported
+ * @param id The number of the page being exported
+ * @param zoomRatio The zoom ratio for PNG exports with fixed DPI
+ * @param format The format of the exported image
+ * @param view A DocumentView for drawing the page
+ */
+void ImageExport::exportImagePage(size_t pageId, size_t id, double zoomRatio, ExportGraphicsFormat format,
+                                  DocumentView& view) {
+    std::shared_lock<Document> lock(*doc);
+    ConstPageRef page = doc->getPage(pageId);
+
+    zoomRatio = createSurface(page->getWidth(), page->getHeight(), id, zoomRatio);
+
+    cairo_status_t state = cairo_surface_status(this->surface);
+    if (state != CAIRO_STATUS_SUCCESS) {
+        this->lastError = _("Error save image #1");
+        return;
+    }
+
+    if (page->getBackgroundType().isPdfPage() && (exportBackground != EXPORT_BACKGROUND_NONE)) {
+        // Handle the pdf page separately, to call renderForPrinting for better quality.
+        auto pgNo = page->getPdfPageNr();
+        XojPdfPageSPtr popplerPage = doc->getPdfPage(pgNo);
+        if (!popplerPage) {
+            this->lastError = _("Error while exporting the pdf background: I cannot find the pdf page number ");
+            this->lastError += std::to_string(pgNo);
+        } else if (format == EXPORT_GRAPHICS_PNG) {
+            popplerPage->render(cr);
+        } else {
+            popplerPage->renderForPrinting(cr);
+        }
+    }
+
+    xoj::view::BackgroundFlags flags;
+    flags.showPDF = xoj::view::HIDE_PDF_BACKGROUND;  // Already exported (if any)
+    flags.showImage = exportBackground == EXPORT_BACKGROUND_NONE ? xoj::view::HIDE_IMAGE_BACKGROUND :
+                                                                   xoj::view::SHOW_IMAGE_BACKGROUND;
+    flags.showRuling = exportBackground <= EXPORT_BACKGROUND_UNRULED ? xoj::view::HIDE_RULING_BACKGROUND :
+                                                                       xoj::view::SHOW_RULING_BACKGROUND;
+
+    if (layerRange) {
+        view.drawLayersOfPage(*layerRange, page, this->cr, true /* dont render eraseable */, flags);
+    } else {
+        view.drawPage(page, this->cr, true /* dont render eraseable */, flags);
+    }
+
+    if (!freeSurface(id)) {
+        // could not create this file...
+        this->lastError = _("Error save image #2");
+        return;
+    }
+}
+
+/**
+ * @brief Create one Graphics file per page
+ * @param stateListener A listener to track the export progress
+ */
+void ImageExport::exportGraphics(ProgressListener* stateListener) {
+    // don't lock the page here for the whole flow, else we get a dead lock...
+    // the ui is blocked, so there should be no changes...
+    auto count = doc->getPageCount();
+
+    bool onePage = ((this->exportRange.size() == 1) && (this->exportRange[0].first == this->exportRange[0].last));
+
+    std::vector<char> selectedPages(count, 0);
+    size_t selectedCount = 0;
+    for (PageRangeEntry const& e: this->exportRange) {
+        for (size_t x = e.first; x <= e.last; x++) {
+            selectedPages[x] = true;
+            selectedCount++;
+        }
+    }
+
+    stateListener->setMaximumState(selectedCount);
+
+    /*
+     * Compute the zoomRatio only once if using DPI as a PNG quality criterion
+     */
+    double zoomRatio = 1.0;
+    if ((this->format == EXPORT_GRAPHICS_PNG) && (this->qualityParameter.getQualityCriterion() == EXPORT_QUALITY_DPI)) {
+        zoomRatio = ((double)this->qualityParameter.getValue()) / Util::DPI_NORMALIZATION_FACTOR;
+    }
+
+    DocumentView view;
+    size_t current = 0;
+
+    for (size_t i = 0; i < count; i++) {
+        auto id = i + 1;
+        if (onePage) {
+            id = SINGLE_PAGE;
+        }
+
+        if (selectedPages[i]) {
+            exportImagePage(i, id, zoomRatio, format, view);
+            stateListener->setCurrentState(++current);
+        }
+    }
+}
+
+RasterImageQualityParameter::RasterImageQualityParameter() = default;
+RasterImageQualityParameter::RasterImageQualityParameter(ExportQualityCriterion criterion, int value):
+        qualityCriterion(criterion), value(value) {}
+RasterImageQualityParameter::~RasterImageQualityParameter() = default;
+
+auto RasterImageQualityParameter::getQualityCriterion() -> ExportQualityCriterion { return qualityCriterion; }
+
+auto RasterImageQualityParameter::getValue() -> int { return value; }
diff --git a/entry/src/main/cpp/src/core/control/jobs/ImageExport.h b/entry/src/main/cpp/src/core/control/jobs/ImageExport.h
new file mode 100644
index 0000000..9c61c58
--- /dev/null
+++ b/entry/src/main/cpp/src/core/control/jobs/ImageExport.h
@@ -0,0 +1,196 @@
+/*
+ * Xournal++
+ *
+ * Image export implementation
+ *
+ * @author Xournal++ Team
+ * https://github.com/xournalpp/xournalpp
+ *
+ * @license GNU GPLv2 or later
+ */
+
+#pragma once
+
+#include <cstddef>  // for size_t
+#include <string>   // for string
+
+#include <cairo.h>  // for cairo_surface_t, cairo_t
+
+#include "util/ElementRange.h"  // for PageRangeVector, LayerRangeVector
+
+#include "BaseExportJob.h"  // for ExportBackgroundType, EXPORT_BACKGROUND_ALL
+#include "filesystem.h"     // for path
+
+class Document;
+class ProgressListener;
+class DocumentView;
+
+enum ExportGraphicsFormat { EXPORT_GRAPHICS_UNDEFINED, EXPORT_GRAPHICS_PDF, EXPORT_GRAPHICS_PNG, EXPORT_GRAPHICS_SVG };
+
+/**
+ * @brief List of available criterion for determining a PNG export quality.
+ * The order must agree with the corresponding listAvailableCriterion in ui/exportSettings.glade
+ */
+enum ExportQualityCriterion { EXPORT_QUALITY_DPI, EXPORT_QUALITY_WIDTH, EXPORT_QUALITY_HEIGHT };
+
+/**
+ * @brief A class storing the available quality parameters for PNG export
+ */
+class RasterImageQualityParameter {
+public:
+    RasterImageQualityParameter(ExportQualityCriterion criterion, int value);
+    RasterImageQualityParameter();
+    ~RasterImageQualityParameter();
+
+    /**
+     * @brief Get the quality criterion of this parameter
+     * @return The quality criterion
+     */
+    ExportQualityCriterion getQualityCriterion();
+
+    /**
+     * @brief Get the target value of this parameter
+     * @return The target value
+     */
+    int getValue();
+
+private:
+    /**
+     * @brief Default quality is: DPI=300
+     */
+    ExportQualityCriterion qualityCriterion = EXPORT_QUALITY_DPI;
+    int value = 300;
+};
+
+/**
+ * @brief A class handling export as images
+ */
+class ImageExport {
+public:
+    ImageExport(Document* doc, fs::path file, ExportGraphicsFormat format, ExportBackgroundType exportBackground,
+                const PageRangeVector& exportRange);
+    virtual ~ImageExport();
+
+public:
+    /**
+     * @brief Get the last error message
+     * @return The last error message to show to the user
+     */
+    std::string getLastErrorMsg() const;
+
+    /**
+     * @brief Create one Graphics file per page
+     * @param stateListener A listener to track the progress
+     */
+    void exportGraphics(ProgressListener* stateListener);
+
+    /**
+     * @brief Set a quality level for PNG exports
+     * @param qParam A quality parameter for the export
+     */
+    void setQualityParameter(RasterImageQualityParameter qParam);
+
+    /**
+     * @brief Set a quality level for PNG exports
+     * @param criterion A quality criterion for the export
+     * @param value The target value of this criterion
+     */
+    void setQualityParameter(ExportQualityCriterion criterion, int value);
+
+    /**
+     * @brief Select layers to export by parsing str
+     * @param str A string parsed to get a list of layers
+     */
+    void setLayerRange(const char* str);
+
+private:
+    /**
+     * @brief Create Cairo surface for a given page
+     * @param width the width of the page being exported
+     * @param height the height of the page being exported
+     * @param id the id of the page being exported
+     * @param zoomRatio the zoom ratio for PNG exports with fixed DPI
+     *
+     * @return the zoom ratio of the current page if the export type is PNG, 0.0 otherwise
+     *          The return value may differ from that of the parameter zoomRatio
+     *          if the export has fixed page width or height (in pixels)
+     */
+    double createSurface(double width, double height, size_t id, double zoomRatio);
+
+    /**
+     * Free / store the surface
+     */
+    bool freeSurface(size_t id);
+
+    /**
+     * @brief Get a filename with a (page) number appended
+     * @param no The appended number. If no==-1, does not append anything.
+     * e.g. .../export-2.png, if the no is -1, return .../export.png
+     *
+     * @return The filename
+     */
+    fs::path getFilenameWithNumber(size_t no) const;
+
+    /**
+     * @brief Export a single PNG/SVG page
+     * @param pageId The index of the page being exported
+     * @param id The number of the page being exported
+     * @param zoomRatio The zoom ratio for PNG exports with fixed DPI
+     * @param format The format of the exported image
+     * @param view A DocumentView for drawing the page
+     */
+    void exportImagePage(size_t pageId, size_t id, double zoomRatio, ExportGraphicsFormat format, DocumentView& view);
+
+    static constexpr size_t SINGLE_PAGE = size_t(-1);
+
+public:
+    /**
+     * Document to export
+     */
+    Document* doc = nullptr;
+
+    /**
+     * Filename for export
+     */
+    fs::path file;
+
+    /**
+     * Export graphics format
+     */
+    ExportGraphicsFormat format = EXPORT_GRAPHICS_UNDEFINED;
+
+    /**
+     * Do not export the Background
+     */
+    ExportBackgroundType exportBackground = EXPORT_BACKGROUND_ALL;
+
+    /**
+     * The range to export
+     */
+    const PageRangeVector& exportRange;
+
+    /**
+     * @brief A pointer to a range of layers to export (the same for every exported pages)
+     */
+    std::unique_ptr<LayerRangeVector> layerRange;
+
+    /**
+     * @brief The export quality parameters, used if format==EXPORT_GRAPHICS_PNG
+     */
+    RasterImageQualityParameter qualityParameter = RasterImageQualityParameter();
+
+    /**
+     * Export surface
+     */
+    cairo_surface_t* surface = nullptr;
+
+    /**
+     * Cairo context
+     */
+    cairo_t* cr = nullptr;
+
+    /**
+     * The last error message to show to the user
+     */
+    std::string lastError;
+};
diff --git a/entry/src/main/cpp/src/core/control/jobs/Job.cpp b/entry/src/main/cpp/src/core/control/jobs/Job.cpp
new file mode 100644
index 0000000..0d495d9
--- /dev/null
+++ b/entry/src/main/cpp/src/core/control/jobs/Job.cpp
@@ -0,0 +1,55 @@
+#include "Job.h"
+
+#include <gdk/gdk.h>  // for gdk_threads_add_idle
+#include <glib.h>     // for g_source_remove
+
+#include "util/glib_casts.h"  // for wrap_for_once_v
+
+
+Job::Job(): refCount(1) {}
+
+Job::~Job() = default;
+
+void Job::unref() {
+    if (refCount.fetch_sub(1, std::memory_order_acq_rel) == 1) {
+        delete this;
+    }
+}
+
+void Job::ref() {
+    refCount.fetch_add(1, std::memory_order_relaxed);
+}
+
+void Job::deleteJob() {
+    this->onDelete();
+
+    if (this->afterRunId) {
+        g_source_remove(this->afterRunId);
+        this->unref();
+    }
+}
+
+void Job::onDelete() {}
+
+void Job::execute() { this->run(); }
+
+auto Job::getSource() -> void* { return nullptr; }
+
+auto Job::callAfterCallback(Job* job) -> bool {
+    job->afterRun();
+
+    job->afterRunId = 0;
+    job->unref();
+    return false;  // do not call again
+}
+
+void Job::callAfterRun() {
+    if (this->afterRunId) {
+        return;
+    }
+
+    this->ref();
+    this->afterRunId = gdk_threads_add_idle(xoj::util::wrap_for_once_v<Job::callAfterCallback>, this);
+}
+
+void Job::afterRun() {}
diff --git a/entry/src/main/cpp/src/core/control/jobs/Job.h b/entry/src/main/cpp/src/core/control/jobs/Job.h
new file mode 100644
index 0000000..dca241d
--- /dev/null
+++ b/entry/src/main/cpp/src/core/control/jobs/Job.h
@@ -0,0 +1,99 @@
+/*
+ * Xournal++
+ *
+ * A job which is done
+ *
+ * @author Xournal++ Team
+ * https://github.com/xournalpp/xournalpp
+ *
+ * @license GNU GPLv2 or later
+ */
+
+#pragma once
+
+#include <atomic>
+
+enum JobType { JOB_TYPE_BLOCKING, JOB_TYPE_PREVIEW, JOB_TYPE_RENDER, JOB_TYPE_AUTOSAVE };
+
+/**
+ * A manually ref-counted class representing an asynchronous job to be used with
+ * the Xournal++ scheduler.
+ *
+ * Instances of Job (and its subclasses) should be constructed exclusively using
+ * the `new` keyword.
+ */
+class Job {
+public:
+    Job();
+    Job(const Job&) = delete;
+    Job& operator=(const Job&) = delete;
+    Job(Job&&) = delete;
+    Job& operator=(Job&&) = delete;
+
+protected:
+    virtual ~Job();
+
+public:
+    /**
+     * Unref the Job, the initial refcount is set to 1 on creation
+     */
+    void unref();
+
+    /**
+     * Increase the refcount
+     */
+    void ref();
+
+    /**
+     * Delete Job because e.g. the source was removed
+     */
+    void deleteJob();
+
+public:
+    virtual JobType getType() = 0;
+
+public:
+    /**
+     * this method is called
+     */
+    virtual void execute();
+
+    virtual void* getSource();
+
+protected:
+    /**
+     * override this method
+     */
+    virtual void run() = 0;
+
+    /**
+     * This method should be called as _last_ operation in run
+     *
+     * If you call it in another position the object will be deleted before run is finished!
+     */
+    void callAfterRun();
+
+    /**
+     * After run will be called from UI Thread after the Job is finished
+     *
+     * All UI Stuff should happen here
+     */
+    virtual void afterRun();
+
+    /**
+     * Called when the job is to be removed from the
+     * scheduler.
+     */
+    virtual void onDelete();
+
+private:
+    /**
+     * Internal callback sent to the GLib main loop which invokes `afterRun`.
+     */
+    static bool callAfterCallback(Job* job);
+
+private:
+    unsigned int afterRunId = 0;
+
+    std::atomic<unsigned int> refCount;
+};
diff --git a/entry/src/main/cpp/src/core/control/jobs/PdfExportJob.cpp b/entry/src/main/cpp/src/core/control/jobs/PdfExportJob.cpp
new file mode 100644
index 0000000..cadb9fc
--- /dev/null
+++ b/entry/src/main/cpp/src/core/control/jobs/PdfExportJob.cpp
@@ -0,0 +1,42 @@
+#include "PdfExportJob.h"
+
+#include <memory>   // for unique_ptr, allocator
+#include <string>   // for string
+#include <utility>  // for move
+
+#include "control/Control.h"               // for Control
+#include "control/jobs/BaseExportJob.h"    // for BaseExportJob
+#include "model/Document.h"                // for Document
+#include "pdf/base/XojPdfExport.h"         // for XojPdfExport
+#include "pdf/base/XojPdfExportFactory.h"  // for XojPdfExportFactory
+#include "util/PathUtil.h"                 // for clearExtensions
+#include "util/i18n.h"                     // for _
+
+PdfExportJob::PdfExportJob(Control* control): BaseExportJob(control, _("PDF Export")) {}
+
+PdfExportJob::~PdfExportJob() = default;
+
+void PdfExportJob::addFilterToDialog(GtkFileChooser* dialog) {
+    addFileFilterToDialog(dialog, _("PDF files"), "application/pdf");
+}
+
+void PdfExportJob::setExtensionFromFilter(fs::path& file, const char* /*filterName*/) const {
+    // Remove any pre-existing extension and adds .pdf
+    Util::clearExtensions(file, ".pdf");
+    file += ".pdf";
+}
+
+void PdfExportJob::run() {
+    Document* doc = control->getDocument();
+
+    doc->lock_shared();
+    std::unique_ptr<XojPdfExport> pdfe = XojPdfExportFactory::createExport(doc, control);
+    doc->unlock_shared();
+
+    if (!pdfe->createPdf(this->filepath, false)) {
+        this->errorMsg = pdfe->getLastError();
+        if (control->getWindow()) {
+            callAfterRun();
+        }
+    }
+}
diff --git a/entry/src/main/cpp/src/core/control/jobs/PdfExportJob.h b/entry/src/main/cpp/src/core/control/jobs/PdfExportJob.h
new file mode 100644
index 0000000..aa41e68
--- /dev/null
+++ b/entry/src/main/cpp/src/core/control/jobs/PdfExportJob.h
@@ -0,0 +1,32 @@
+/*
+ * Xournal++
+ *
+ * A job to export PDF
+ *
+ * @author Xournal++ Team
+ * https://github.com/xournalpp/xournalpp
+ *
+ * @license GNU GPLv2 or later
+ */
+
+#pragma once
+
+#include "BaseExportJob.h"  // for BaseExportJob
+#include "filesystem.h"     // for path
+
+class Control;
+
+class PdfExportJob: public BaseExportJob {
+public:
+    PdfExportJob(Control* control);
+
+protected:
+    ~PdfExportJob() override;
+
+public:
+    void run() override;
+
+protected:
+    void addFilterToDialog(GtkFileChooser* dialog) override;
+    void setExtensionFromFilter(fs::path& p, const char* filterName) const override;
+};
diff --git a/entry/src/main/cpp/src/core/control/jobs/PreviewJob.cpp b/entry/src/main/cpp/src/core/control/jobs/PreviewJob.cpp
new file mode 100644
index 0000000..8dde25c
--- /dev/null
+++ b/entry/src/main/cpp/src/core/control/jobs/PreviewJob.cpp
@@ -0,0 +1,132 @@
+#include "PreviewJob.h"
+
+#include <memory>  // for __s...
+#include <mutex>   // for mutex
+#include <vector>  // for vector
+
+#include <glib-object.h>  // for g_o...
+#include <gtk/gtk.h>      // for Gtk...
+
+#include "control/Control.h"                                      // for Con...
+#include "control/jobs/Job.h"                                     // for JOB...
+#include "gui/Shadow.h"                                           // for Shadow
+#include "gui/sidebar/previews/base/SidebarPreviewBase.h"         // for Sid...
+#include "gui/sidebar/previews/base/SidebarPreviewBaseEntry.h"    // for Sid...
+#include "gui/sidebar/previews/layer/SidebarPreviewLayerEntry.h"  // for Sid...
+#include "model/Document.h"                                       // for Doc...
+#include "model/Layer.h"                                          // for Layer
+#include "model/PageRef.h"                                        // for Pag...
+#include "model/XojPage.h"                                        // for Xoj...
+#include "util/Util.h"                                            // for exe...
+#include "view/DocumentView.h"                                    // for Doc...
+#include "view/LayerView.h"                                       // for Lay...
+#include "view/View.h"                                            // for Con...
+#include "view/background/BackgroundFlags.h"                      // for BAC...
+
+PreviewJob::PreviewJob(SidebarPreviewBaseEntry* sidebar): sidebarPreview(sidebar) {}
+
+PreviewJob::~PreviewJob() { this->sidebarPreview = nullptr; }
+
+void PreviewJob::onDelete() { this->sidebarPreview = nullptr; }
+
+auto PreviewJob::getSource() -> void* { return this->sidebarPreview; }
+
+auto PreviewJob::getType() -> JobType { return JOB_TYPE_PREVIEW; }
+
+void PreviewJob::initGraphics() {
+    auto w = this->sidebarPreview->imageWidth;
+    auto h = this->sidebarPreview->imageHeight;
+    auto DPIscaling = this->sidebarPreview->DPIscaling;
+    buffer.reset(cairo_image_surface_create(CAIRO_FORMAT_ARGB32, w * DPIscaling, h * DPIscaling), xoj::util::adopt);
+    cairo_surface_set_device_scale(buffer.get(), DPIscaling, DPIscaling);
+    cr.reset(cairo_create(buffer.get()), xoj::util::adopt);
+    double zoom = this->sidebarPreview->sidebar->getZoom();
+    cairo_translate(cr.get(), Shadow::getShadowTopLeftSize() + 2, Shadow::getShadowTopLeftSize() + 2);
+    cairo_scale(cr.get(), zoom, zoom);
+}
+
+void PreviewJob::finishPaint() {
+    auto lock = std::lock_guard(this->sidebarPreview->drawingMutex);
+    this->sidebarPreview->buffer = std::move(this->buffer);
+    Util::execInUiThread([btn = this->sidebarPreview->button]() { gtk_widget_queue_draw(btn.get()); });
+}
+
+void PreviewJob::drawPage() {
+    ConstPageRef page = this->sidebarPreview->page;
+    Document* doc = this->sidebarPreview->sidebar->getControl()->getDocument();
+    DocumentView view;
+    view.setPdfCache(this->sidebarPreview->sidebar->getCache());
+    PreviewRenderType type = this->sidebarPreview->getRenderType();
+    Layer::Index layer = 0;
+
+    doc->lock_shared();
+
+    // getLayer is not defined for page preview
+    if (type != RENDER_TYPE_PAGE_PREVIEW) {
+        layer = (dynamic_cast<SidebarPreviewLayerEntry*>(this->sidebarPreview))->getLayer();
+    }
+
+    auto context = xoj::view::Context::createDefault(cr.get());
+
+    switch (type) {
+        case RENDER_TYPE_PAGE_PREVIEW:
+            // render all layers
+            view.drawPage(page, cr.get(), true);
+            break;
+
+        case RENDER_TYPE_PAGE_LAYER:
+            // render single layer
+            view.initDrawing(page, cr.get(), true);
+            if (layer == 0) {
+                auto flags = xoj::view::BACKGROUND_SHOW_ALL;
+                flags.forceVisible = xoj::view::FORCE_VISIBLE;
+                view.drawBackground(flags);
+            } else {
+                view.drawBackground(xoj::view::BACKGROUND_FORCE_PAINT_BACKGROUND_COLOR_ONLY);
+                const Layer* drawLayer = page->getLayersView()[layer - 1];
+                xoj::view::LayerView layerView(drawLayer);
+                layerView.draw(context);
+            }
+            view.finializeDrawing();
+            break;
+
+        case RENDER_TYPE_PAGE_LAYERSTACK: {
+            // render all layers up to layer
+            view.initDrawing(page, cr.get(), true);
+            auto flags = xoj::view::BACKGROUND_SHOW_ALL;
+            flags.forceVisible = xoj::view::FORCE_VISIBLE;
+            view.drawBackground(flags);
+            const auto layers = page->getLayersView();
+            for (Layer::Index i = 0; i < layer; i++) {
+                const Layer* drawLayer = layers[i];
+                xoj::view::LayerView layerView(drawLayer);
+                layerView.draw(context);
+            }
+            view.finializeDrawing();
+            break;
+        }
+        default:
+            // unknown type
+            break;
+    }
+
+    doc->unlock_shared();
+}
+
+void PreviewJob::clipToPage() {
+    // Only render within the preview page. Without this, the when preview jobs attempt
+    // to clear the display, we fill a region larger than the inside of the preview page!
+    cairo_rectangle(cr.get(), 0, 0, this->sidebarPreview->page->getWidth(), this->sidebarPreview->page->getHeight());
+    cairo_clip(cr.get());
+}
+
+void PreviewJob::run() {
+    if (this->sidebarPreview == nullptr) {
+        return;
+    }
+
+    initGraphics();
+    clipToPage();
+    drawPage();
+    finishPaint();
+}
diff --git a/entry/src/main/cpp/src/core/control/jobs/PreviewJob.h b/entry/src/main/cpp/src/core/control/jobs/PreviewJob.h
new file mode 100644
index 0000000..da8dbe2
--- /dev/null
+++ b/entry/src/main/cpp/src/core/control/jobs/PreviewJob.h
@@ -0,0 +1,61 @@
+/*
+ * Xournal++
+ *
+ * A job which handles preview repaint
+ *
+ * @author Xournal++ Team
+ * https://github.com/xournalpp/xournalpp
+ *
+ * @license GNU GPLv2 or later
+ */
+
+#pragma once
+
+#include <cairo.h>  // for cairo_surface_t, cairo_t
+
+#include "util/raii/CairoWrappers.h"
+
+#include "Job.h"  // for Job, JobType
+
+class SidebarPreviewBaseEntry;
+
+/**
+ * @brief A Job which renders a SidebarPreviewPage
+ */
+class PreviewJob: public Job {
+public:
+    PreviewJob(SidebarPreviewBaseEntry* sidebar);
+
+protected:
+    void onDelete() override;
+    ~PreviewJob() override;
+
+public:
+    void* getSource() override;
+
+    void run() override;
+
+    JobType getType() override;
+
+private:
+    void initGraphics();
+    void clipToPage();
+    void finishPaint();
+    void drawPage();
+
+private:
+    /**
+     * Graphics buffer
+     */
+    xoj::util::CairoSurfaceSPtr buffer;
+
+    /**
+     * Graphics drawing
+     */
+    xoj::util::CairoSPtr cr;
+
+    /**
+     * Sidebar preview
+     */
+    SidebarPreviewBaseEntry* sidebarPreview = nullptr;
+};
diff --git a/entry/src/main/cpp/src/core/control/jobs/ProgressListener.h b/entry/src/main/cpp/src/core/control/jobs/ProgressListener.h
new file mode 100644
index 0000000..9770ce8
--- /dev/null
+++ b/entry/src/main/cpp/src/core/control/jobs/ProgressListener.h
@@ -0,0 +1,28 @@
+/*
+ * Xournal++
+ *
+ * Interface for progress state
+ *
+ * @author Xournal++ Team
+ * https://github.com/xournalpp/xournalpp
+ *
+ * @license GNU GPLv2 or later
+ */
+
+#pragma once
+
+class ProgressListener {
+public:
+    virtual void setMaximumState(size_t max) = 0;
+    virtual void setCurrentState(size_t state) = 0;
+
+    virtual ~ProgressListener(){};
+};
+
+class DummyProgressListener: public ProgressListener {
+public:
+    void setMaximumState(size_t max) override{};
+    void setCurrentState(size_t state) override{};
+
+    ~DummyProgressListener() override{};
+};
diff --git a/entry/src/main/cpp/src/core/control/jobs/RenderJob.cpp b/entry/src/main/cpp/src/core/control/jobs/RenderJob.cpp
new file mode 100644
index 0000000..b1b20e5
--- /dev/null
+++ b/entry/src/main/cpp/src/core/control/jobs/RenderJob.cpp
@@ -0,0 +1,120 @@
+#include "RenderJob.h"
+
+#include <mutex>    // for mutex
+#include <utility>  // for move
+#include <vector>   // for vector
+
+#include <cairo.h>  // for cairo_create, cairo_destroy, cairo_...
+
+#include "control/Control.h"            // for Control
+#include "control/ToolEnums.h"          // for TOOL_PLAY_OBJECT
+#include "control/ToolHandler.h"        // for ToolHandler
+#include "control/jobs/Job.h"           // for JOB_TYPE_RENDER, JobType
+#include "gui/PageView.h"               // for XojPageView
+#include "gui/XournalView.h"            // for XournalView
+#include "gui/widgets/XournalWidget.h"  // for gtk_xournal_repaint_area
+#include "model/Document.h"             // for Document
+#include "model/XojPage.h"              // for Page
+#include "util/Assert.h"                // for xoj_assert
+#include "util/Rectangle.h"             // for Rectangle
+#include "util/Util.h"                  // for execInUiThread
+#include "util/raii/CairoWrappers.h"    // for CairoSurfaceSPtr, CairoSPtr
+#include "util/safe_casts.h"            // for strict_cast, as_signed, as_si...
+#include "view/DocumentView.h"          // for DocumentView
+#include "view/Mask.h"                  // for Mask
+
+#if defined(__has_cpp_attribute) && __has_cpp_attribute(likely)
+#define XOJ_CPP20_UNLIKELY [[unlikely]]
+#else
+#define XOJ_CPP20_UNLIKELY
+#endif
+
+using xoj::util::Rectangle;
+
+RenderJob::RenderJob(XojPageView* view): view(view) {}
+
+auto RenderJob::getSource() -> void* { return this->view; }
+
+void RenderJob::rerenderRectangle(Rectangle<double> const& rect) {
+    /**
+     * Padding seems to be necessary to prevent artefacts of most strokes.
+     * These artefacts are most pronounced when using the stroke deletion
+     * tool on ellipses, but also occur occasionally when removing regular
+     * strokes.
+     **/
+    constexpr int RENDER_PADDING = 1;
+
+    Range maskRange(rect);
+    maskRange.addPadding(RENDER_PADDING);
+    xoj::view::Mask newMask(view->xournal->getDpiScaleFactor(), maskRange, view->xournal->getZoom(),
+                            CAIRO_CONTENT_COLOR_ALPHA);
+
+    renderToBuffer(newMask.get());
+
+    std::lock_guard lock(this->view->drawingMutex);
+    if (!view->buffer.isInitialized()) {
+        // Todo: the buffer must not be uninitializable here, either by moving it into the job or by locking it at job
+        // creation a shared prt may also be suffice.
+        XOJ_CPP20_UNLIKELY return;
+    }
+    newMask.paintTo(view->buffer.get());
+}
+
+void RenderJob::run() {
+    this->view->repaintRectMutex.lock();
+
+    bool rerenderComplete = std::exchange(this->view->rerenderComplete, false);
+    bool sizeChanged = std::exchange(this->view->sizeChanged, false);
+    auto rerenderRects = std::move(this->view->rerenderRects);
+
+    this->view->repaintRectMutex.unlock();
+
+    if (rerenderComplete) {
+        xoj::view::Mask newMask(view->xournal->getDpiScaleFactor(),
+                                Range(0, 0, view->page->getWidth(), view->page->getHeight()), view->xournal->getZoom(),
+                                CAIRO_CONTENT_COLOR_ALPHA);
+
+        renderToBuffer(newMask.get());
+        {
+            std::lock_guard lock(this->view->drawingMutex);
+            std::swap(this->view->buffer, newMask);
+        }
+        if (sizeChanged) {
+            // We do not have any control on what portion of the widget needs to be redrawn. Redraw it all.
+            Util::execInUiThread([w = view->xournal->getWidget()]() { gtk_widget_queue_draw(w); });
+        } else {
+            repaintPage();
+        }
+    } else {
+        for (Rectangle<double> const& rect: rerenderRects) {
+            rerenderRectangle(rect);
+            repaintPageArea(rect.x, rect.y, rect.x + rect.width, rect.y + rect.height);
+        }
+    }
+}
+
+static void repaintWidgetArea(GtkWidget* widget, int x1, int y1, int x2, int y2) {
+    Util::execInUiThread([=]() { gtk_xournal_repaint_area(widget, x1, y1, x2, y2); });
+}
+
+void RenderJob::repaintPage() const { repaintPageArea(0, 0, view->getWidth(), view->getHeight()); }
+
+void RenderJob::repaintPageArea(double x1, double y1, double x2, double y2) const {
+    double zoom = view->xournal->getZoom();
+    int x = view->getX();
+    int y = view->getY();
+    repaintWidgetArea(view->xournal->getWidget(), x + floor_cast<int>(zoom * x1), y + floor_cast<int>(zoom * y1),
+                      x + ceil_cast<int>(zoom * x2), y + ceil_cast<int>(zoom * y2));
+}
+
+void RenderJob::renderToBuffer(cairo_t* cr) const {
+    DocumentView localView;
+    localView.setMarkAudioStroke(this->view->getXournal()->getControl()->getToolHandler()->getToolType() ==
+                                 TOOL_PLAY_OBJECT);
+    localView.setPdfCache(this->view->xournal->getCache());
+
+    std::shared_lock<Document> lock(*this->view->xournal->getDocument());
+    localView.drawPage(this->view->page, cr, false);
+}
+
+auto RenderJob::getType() -> JobType { return JOB_TYPE_RENDER; }
diff --git a/entry/src/main/cpp/src/core/control/jobs/RenderJob.h b/entry/src/main/cpp/src/core/control/jobs/RenderJob.h
new file mode 100644
index 0000000..cf2feb4
--- /dev/null
+++ b/entry/src/main/cpp/src/core/control/jobs/RenderJob.h
@@ -0,0 +1,50 @@
+/*
+ * Xournal++
+ *
+ * A job which redraws a page or a page region
+ *
+ * @author Xournal++ Team
+ * https://github.com/xournalpp/xournalpp
+ *
+ * @license GNU GPLv2 or later
+ */
+
+#pragma once
+
+#include <cairo.h>    // for cairo_surface_t
+#include <gtk/gtk.h>  // for GtkWidget
+
+#include "Job.h"  // for Job, JobType
+
+class XojPageView;
+namespace xoj::util {
+template <class T>
+class Rectangle;
+}  // namespace xoj::util
+
+class RenderJob: public Job {
+public:
+    RenderJob(XojPageView* view);
+
+protected:
+    ~RenderJob() override = default;
+
+public:
+    JobType getType() override;
+
+    void* getSource() override;
+
+    void run() override;
+
+private:
+    void repaintPage() const;
+
+    void repaintPageArea(double x1, double y1, double x2, double y2) const;
+
+    void rerenderRectangle(xoj::util::Rectangle<double> const& rect);
+
+    void renderToBuffer(cairo_t* cr) const;
+
+private:
+    XojPageView* view;
+};
diff --git a/entry/src/main/cpp/src/core/control/jobs/SaveJob.cpp b/entry/src/main/cpp/src/core/control/jobs/SaveJob.cpp
new file mode 100644
index 0000000..c068dde
--- /dev/null
+++ b/entry/src/main/cpp/src/core/control/jobs/SaveJob.cpp
@@ -0,0 +1,156 @@
+#include "SaveJob.h"
+
+#include <memory>  // for __shared_ptr_access
+
+#include <cairo.h>  // for cairo_create, cairo_destroy
+#include <glib.h>   // for g_warning, g_error
+
+#include "control/Control.h"              // for Control
+#include "control/jobs/BlockingJob.h"     // for BlockingJob
+#include "control/xojfile/SaveHandler.h"  // for SaveHandler
+#include "model/Document.h"               // for Document
+#include "model/PageRef.h"                // for PageRef
+#include "model/PageType.h"               // for PageType
+#include "model/XojPage.h"                // for XojPage
+#include "pdf/base/XojPdfPage.h"          // for XojPdfPageSPtr, XojPdfPage
+#include "util/PathUtil.h"                // for clearExtensions, safeRename...
+#include "util/XojMsgBox.h"               // for XojMsgBox
+#include "util/i18n.h"                    // for FS, _, _F
+#include "view/DocumentView.h"            // for DocumentView
+
+#include "filesystem.h"  // for path, filesystem_error, remove
+
+
+SaveJob::SaveJob(Control* control, std::function<void(bool)> callback):
+        BlockingJob(control, _("Save")), callback(std::move(callback)) {}
+
+SaveJob::~SaveJob() = default;
+
+void SaveJob::run() {
+    save();
+
+    if (this->control->getWindow()) {
+        callAfterRun();
+    }
+}
+
+void SaveJob::afterRun() {
+    if (!this->lastError.empty()) {
+        XojMsgBox::showErrorToUser(control->getGtkWindow(), this->lastError);
+        callback(false);
+    } else {
+        this->control->resetSavedStatus();
+        callback(true);
+    }
+}
+
+void SaveJob::updatePreview(Control* control) {
+    const int previewSize = 128;
+
+    Document* doc = control->getDocument();
+    xoj::util::CairoSurfaceSPtr crBuffer;
+
+    doc->lock_shared();
+    if (doc->getPageCount() > 0) {
+        PageRef page = doc->getPage(0);
+
+        double width = page->getWidth();
+        double height = page->getHeight();
+
+        double zoom = 1;
+
+        if (width < height) {
+            zoom = previewSize / height;
+        } else {
+            zoom = previewSize / width;
+        }
+        width *= zoom;
+        height *= zoom;
+
+        crBuffer.reset(cairo_image_surface_create(CAIRO_FORMAT_ARGB32, ceil_cast<int>(width), ceil_cast<int>(height)),
+                       xoj::util::adopt);
+
+        cairo_t* cr = cairo_create(crBuffer.get());
+        cairo_scale(cr, zoom, zoom);
+
+        xoj::view::BackgroundFlags flags = xoj::view::BACKGROUND_SHOW_ALL;
+
+        // We don't have access to a PdfCache on which DocumentView relies for PDF backgrounds.
+        // We thus print the PDF background by hand.
+        if (page->getBackgroundType().isPdfPage()) {
+            auto pgNo = page->getPdfPageNr();
+            XojPdfPageSPtr popplerPage = doc->getPdfPage(pgNo);
+            if (popplerPage) {
+                popplerPage->render(cr);
+            }
+            flags.showPDF = xoj::view::HIDE_PDF_BACKGROUND;  // Already printed (if any)
+        } else {
+            flags.forceBackgroundColor = xoj::view::FORCE_AT_LEAST_BACKGROUND_COLOR;
+        }
+
+        DocumentView view;
+        view.drawPage(page, cr, true /* don't render erasable */, flags);
+        cairo_destroy(cr);
+    }
+    doc->unlock_shared();
+
+    doc->lock();
+    doc->setPreview(std::move(crBuffer));
+    doc->unlock();
+}
+
+auto SaveJob::save() -> bool {
+    updatePreview(control);
+    Document* doc = this->control->getDocument();
+    SaveHandler h;
+
+    doc->lock_shared();
+    fs::path target = doc->getFilepath();
+    Util::safeReplaceExtension(target, "xopp");
+
+    h.prepareSave(doc, target);
+    doc->unlock_shared();
+
+    auto const createBackup = doc->shouldCreateBackupOnSave();
+
+    if (createBackup) {
+        try {
+            // Note: The backup must be created for the target as this is the filepath
+            // which will be written to. Do not use the `filepath` variable!
+            Util::safeRenameFile(target, fs::path{target} += "~");
+        } catch (const fs::filesystem_error& fe) {
+            g_warning("Could not create backup! Failed with %s", fe.what());
+            this->lastError = FS(_F("Save file error, can't backup: {1}") % std::string(fe.what()));
+            if (!control->getWindow()) {
+                g_error("%s", this->lastError.c_str());
+            }
+            return false;
+        }
+    }
+
+    h.saveTo(target, this->control);
+
+    doc->lock();
+    h.updateDocumentInfo(doc);
+    doc->setFilepath(target);
+    doc->unlock();
+
+    if (!h.getErrorMessage().empty()) {
+        this->lastError = FS(_F("Save file error: {1}") % h.getErrorMessage());
+        if (!control->getWindow()) {
+            g_error("%s", this->lastError.c_str());
+        }
+        return false;
+    } else if (createBackup) {
+        try {
+            // If a backup was created it can be removed now since no error occured during the save
+            fs::remove(fs::path{target} += "~");
+        } catch (const fs::filesystem_error& fe) {
+            g_warning("Could not delete backup! Failed with %s", fe.what());
+        }
+    } else {
+        doc->setCreateBackupOnSave(true);
+    }
+
+    return true;
+}
diff --git a/entry/src/main/cpp/src/core/control/jobs/SaveJob.h b/entry/src/main/cpp/src/core/control/jobs/SaveJob.h
new file mode 100644
index 0000000..7d0a5de
--- /dev/null
+++ b/entry/src/main/cpp/src/core/control/jobs/SaveJob.h
@@ -0,0 +1,43 @@
+/*
+ * Xournal++
+ *
+ * A job which saves a Document
+ *
+ * @author Xournal++ Team
+ * https://github.com/xournalpp/xournalpp
+ *
+ * @license GNU GPLv2 or later
+ */
+
+#pragma once
+
+#include <functional>
+#include <string>  // for string
+
+#include "BlockingJob.h"  // for BlockingJob
+
+class Control;
+
+
+class SaveJob: public BlockingJob {
+public:
+    SaveJob(Control* control, std::function<void(bool)> = [](bool) {});
+
+protected:
+    ~SaveJob() override;
+
+public:
+    void run() override;
+
+    bool save();
+
+    static void updatePreview(Control* control);
+
+protected:
+    void afterRun() override;
+
+private:
+    std::string lastError;
+    /// Called after saving, with boolean parameter true on success, false on failure (error)
+    std::function<void(bool)> callback;
+};
diff --git a/entry/src/main/cpp/src/core/control/jobs/Scheduler.cpp b/entry/src/main/cpp/src/core/control/jobs/Scheduler.cpp
new file mode 100644
index 0000000..a1c7819
--- /dev/null
+++ b/entry/src/main/cpp/src/core/control/jobs/Scheduler.cpp
@@ -0,0 +1,212 @@
+#include "Scheduler.h"
+
+#include <cinttypes>  // for PRId64
+#include <cstdint>    // for uint64_t
+
+#include "control/jobs/Job.h"  // for Job, JOB_TYPE_RENDER
+#include "util/Assert.h"       // for xoj_assert
+#include "util/glib_casts.h"   // for wrap_for_once_v
+
+#include "config-debug.h"  // for DEBUG_SCHEDULER
+
+#ifdef DEBUG_SCHEDULER
+#define SDEBUG g_message
+#else
+#define SDEBUG(msg, ...)
+#endif
+
+Scheduler::Scheduler() {
+    this->name = "Scheduler";
+
+    // Queue
+    this->jobQueue[JOB_PRIORITY_URGENT] = &this->queueUrgent;
+    this->jobQueue[JOB_PRIORITY_HIGH] = &this->queueHigh;
+    this->jobQueue[JOB_PRIORITY_LOW] = &this->queueLow;
+    this->jobQueue[JOB_PRIORITY_NONE] = &this->queueNone;
+}
+
+Scheduler::~Scheduler() {
+    SDEBUG("Destroy scheduler");
+
+    if (auto id = this->jobRenderThreadTimerId.exchange(0); id != 0) {
+        g_source_remove(id);
+    }
+
+    stop();
+
+    Job* job = nullptr;
+    while ((job = getNextJobUnlocked()) != nullptr) {
+        job->unref();
+    }
+}
+
+void Scheduler::start() {
+    SDEBUG("Starting scheduler");
+    g_return_if_fail(this->thread == nullptr);
+
+    this->thread = g_thread_new(name.c_str(), reinterpret_cast<GThreadFunc>(jobThreadCallback), this);
+}
+
+void Scheduler::stop() {
+    SDEBUG("Stopping scheduler");
+
+    if (!this->threadRunning) {
+        return;
+    }
+    this->threadRunning = false;
+    this->jobQueueCond.notify_all();
+
+    if (this->thread) {
+        g_thread_join(this->thread);
+    }
+}
+
+void Scheduler::addJob(Job* job, JobPriority priority) {
+    SDEBUG("Adding job...");
+
+    {
+        std::lock_guard lock{this->jobQueueMutex};
+
+        job->ref();
+        this->jobQueue[priority]->push_back(job);
+    }
+
+    SDEBUG("add job: %" PRId64 "; type: %" PRId64, (uint64_t)job, (uint64_t)job->getType());
+    this->jobQueueCond.notify_all();
+}
+
+auto Scheduler::getNextJobUnlocked(bool onlyNotRender, bool* hasRenderJobs) -> Job* {
+    Job* job = nullptr;
+
+    for (size_t i = JOB_PRIORITY_URGENT; i < JOB_N_PRIORITIES; i++) {
+        std::deque<Job*>& queue = *this->jobQueue[i];
+
+        if (onlyNotRender) {
+            for (auto it = queue.begin(); it != queue.end(); ++it) {
+                job = *it;
+
+                if (job->getType() != JOB_TYPE_RENDER) {
+                    queue.erase(it);
+                    return job;
+                }
+
+                if (hasRenderJobs != nullptr) {
+                    *hasRenderJobs = true;
+                }
+            }
+        } else if (!queue.empty()) {
+            job = queue.front();
+            queue.pop_front();
+            xoj_assert(job != nullptr);
+
+            return job;
+        }
+    }
+
+    return nullptr;
+}
+
+/**
+ * Locks the complete scheduler
+ */
+void Scheduler::lock() { this->schedulerMutex.lock(); }
+
+/**
+ * Unlocks the complete scheduler
+ */
+void Scheduler::unlock() { this->schedulerMutex.unlock(); }
+
+#define ZOOM_WAIT_US_TIMEOUT 300000  // 0.3s
+
+void Scheduler::blockRerenderZoom() { this->blockRenderZoomTime = g_get_monotonic_time() + ZOOM_WAIT_US_TIMEOUT; }
+
+void Scheduler::unblockRerenderZoom() {
+    this->blockRenderZoomTime = 0;
+
+    if (auto id = this->jobRenderThreadTimerId.exchange(0); id != 0) {
+        g_source_remove(id);
+    }
+
+    this->jobQueueCond.notify_all();
+}
+
+/**
+ * If the Scheduler is blocking because we are zooming and there are only render jobs
+ * we need to wakeup it later
+ */
+auto Scheduler::jobRenderThreadTimer(Scheduler* scheduler) -> bool {
+    scheduler->jobRenderThreadTimerId = 0;
+    scheduler->blockRenderZoomTime = 0;
+
+    scheduler->jobQueueCond.notify_all();
+
+    return false;
+}
+
+auto Scheduler::jobThreadCallback(Scheduler* scheduler) -> gpointer {
+    while (scheduler->threadRunning) {
+        // lock the whole scheduler
+        std::unique_lock schedulerLock{scheduler->schedulerMutex};
+        SDEBUG("Job Thread: Blocked scheduler.");
+
+        bool onlyNonRenderJobs = false;
+        gint64 diff = 1000;
+        if (scheduler->blockRenderZoomTime) {
+            SDEBUG("Zoom re-render blocking.");
+
+            diff = (scheduler->blockRenderZoomTime - g_get_monotonic_time()) / 1000;
+            if (diff <= 0) {
+                scheduler->blockRenderZoomTime = 0;
+                SDEBUG("Ended zoom re-render blocking.");
+            } else {
+                onlyNonRenderJobs = true;
+                SDEBUG("Rendering blocked: Only running non-rendering jobs.");
+            }
+        }
+
+        Job* job;
+
+        {
+            std::unique_lock jobLock{scheduler->jobQueueMutex};
+            SDEBUG("Job Thread: Locked job queue.");
+
+            bool hasOnlyRenderJobs = false;
+            job = scheduler->getNextJobUnlocked(onlyNonRenderJobs, &hasOnlyRenderJobs);
+            if (job != nullptr) {
+                hasOnlyRenderJobs = false;
+            }
+
+            SDEBUG("get job: %" PRId64, (uint64_t)job);
+
+            if (job == nullptr) {
+                // unlock the whole scheduler
+                schedulerLock.unlock();
+
+                if (hasOnlyRenderJobs) {
+                    if (auto id = scheduler->jobRenderThreadTimerId.exchange(g_timeout_add(
+                                static_cast<guint>(diff), xoj::util::wrap_for_once_v<jobRenderThreadTimer>, scheduler));
+                        id != 0) {
+                        g_source_remove(id);
+                    }
+                }
+
+                scheduler->jobQueueCond.wait(jobLock);
+                continue;
+            }
+        }
+
+        // Run the job.
+        {
+            std::lock_guard lock{scheduler->jobRunningMutex};
+            SDEBUG("do job: %" PRId64, (uint64_t)job);
+            job->execute();
+            job->unref();
+        }
+
+        SDEBUG("next");
+    }
+
+    SDEBUG("finished");
+
+    return nullptr;
+}
diff --git a/entry/src/main/cpp/src/core/control/jobs/Scheduler.h b/entry/src/main/cpp/src/core/control/jobs/Scheduler.h
new file mode 100644
index 0000000..06e3ee7
--- /dev/null
+++ b/entry/src/main/cpp/src/core/control/jobs/Scheduler.h
@@ -0,0 +1,147 @@
+/*
+ * Xournal++
+ *
+ * A scheduler for background jobs
+ *
+ * Some code from Evince project
+ *
+ * @author Xournal++ Team
+ * https://github.com/xournalpp/xournalpp
+ *
+ * @license GNU GPLv2 or later
+ */
+
+#pragma once
+
+#include <array>               // for array
+#include <atomic>              // for atomic
+#include <condition_variable>  // for condition_variable
+#include <deque>               // for deque
+#include <mutex>               // for mutex
+#include <string>              // for string
+
+#include <glib.h>  // for GThread, GTimeVal, gpointer
+
+class Job;
+
+/**
+ * @file Scheduler.h
+ * @brief A file containing the definition of the Scheduler
+ */
+
+/**
+ * @enum JobPriority
+ *
+ * The priority of the job affects the order of execution:
+ * Jobs with higher priority are processed before the
+ * lower ones.
+ */
+enum JobPriority {
+    /**
+     * Urgent: used for rendering the current page
+     */
+    JOB_PRIORITY_URGENT,
+
+    /**
+     * High: used for rendering thumbnail ranges
+     */
+    JOB_PRIORITY_HIGH,
+
+    /**
+     * Low: used for rendering of pages not in the current range
+     */
+    JOB_PRIORITY_LOW,
+
+    /**
+     * None: used for any other job (loading / saving / printing...)
+     */
+    JOB_PRIORITY_NONE,
+
+    /**
+     * The number of priorities
+     */
+    JOB_N_PRIORITIES
+};
+
+
+class Scheduler {
+public:
+    Scheduler();
+    virtual ~Scheduler();
+
+public:
+    /**
+     * Adds a Job to the Scheduler
+     *
+     * @param Job      the job
+     * @param priority the desired priority
+     *
+     * The Job is now owned by the scheduler, and automatically freed if it is done
+     */
+    void addJob(Job* job, JobPriority priority);
+
+    void start();
+    void stop();
+
+    /**
+     * Locks the complete scheduler
+     */
+    void lock();
+
+    /**
+     * Unlocks the complete scheduler
+     */
+    void unlock();
+
+    /**
+     * Don't render the next X ms so the scrolling performance is better
+     */
+    void blockRerenderZoom();
+
+    /**
+     * Remove the blocked rendering manually
+     */
+    void unblockRerenderZoom();
+
+private:
+    static auto jobThreadCallback(Scheduler* scheduler) -> gpointer;
+    auto getNextJobUnlocked(bool onlyNotRender = false, bool* hasRenderJobs = nullptr) -> Job*;
+
+    static auto jobRenderThreadTimer(Scheduler* scheduler) -> bool;
+
+protected:
+    bool threadRunning = true;
+
+    GThread* thread = nullptr;
+
+    std::condition_variable jobQueueCond{};
+    std::mutex jobQueueMutex{};
+    std::mutex schedulerMutex{};
+
+    /**
+     * This is need to be sure there is no job running if we delete a page.
+     * If a job is, we may access deleted memory.
+     */
+    std::mutex jobRunningMutex{};
+
+    /**
+     * Jobs of each priority. New jobs
+     * are added to the back of each queue.
+     */
+    std::deque<Job*> queueUrgent{};
+    std::deque<Job*> queueHigh{};
+    std::deque<Job*> queueLow{};
+    std::deque<Job*> queueNone{};
+
+    /**
+     * Map (JobPriority) -> queue of that priority.
+     * For example,
+     *   jobQueue[JOB_PRIORITY_URGENT] is &queueUrgent.
+     */
+    std::array<std::deque<Job*>*, JOB_N_PRIORITIES> jobQueue{};
+
+    std::atomic<gint64> blockRenderZoomTime = 0;
+    std::atomic<guint> jobRenderThreadTimerId = 0;
+
+    std::string name;
+};
diff --git a/entry/src/main/cpp/src/core/control/jobs/XournalScheduler.cpp b/entry/src/main/cpp/src/core/control/jobs/XournalScheduler.cpp
new file mode 100644
index 0000000..9eb4d94
--- /dev/null
+++ b/entry/src/main/cpp/src/core/control/jobs/XournalScheduler.cpp
@@ -0,0 +1,119 @@
+#include "XournalScheduler.h"
+
+#include <array>   // for array
+#include <deque>   // for _Deque_iterator, deque, operator!=
+#include <mutex>   // for lock_guard
+#include <string>  // for string
+
+#include "control/jobs/Scheduler.h"  // for JOB_PRIORITY_URGENT, JOB_PRIORIT...
+
+#include "PreviewJob.h"  // for PreviewJob
+#include "RenderJob.h"   // for RenderJob
+
+class SidebarPreviewBaseEntry;
+class XojPageView;
+
+XournalScheduler::XournalScheduler() { this->name = "XournalScheduler"; }
+
+XournalScheduler::~XournalScheduler() = default;
+
+void XournalScheduler::removeSidebar(SidebarPreviewBaseEntry* preview) {
+    // Wait for running jobs to finish: Currently running jobs may still be
+    //  using `preview`, and, as such, it is not completely removed.
+    bool waitForTaskCompletion = true;
+    removeSource(preview, JOB_TYPE_PREVIEW, JOB_PRIORITY_HIGH, waitForTaskCompletion);
+}
+
+void XournalScheduler::removePage(XojPageView* view) { removeSource(view, JOB_TYPE_RENDER, JOB_PRIORITY_URGENT); }
+
+void XournalScheduler::removeAllJobs() {
+    std::lock_guard lock{this->jobQueueMutex};
+
+    for (size_t priority = JOB_PRIORITY_URGENT; priority < JOB_N_PRIORITIES; priority++) {
+        std::deque<Job*>& queue = *this->jobQueue[priority];
+        auto it = queue.begin();
+
+        while (it != queue.end()) {
+            Job* job = *it;
+
+            // Only remove PREVIEW and RENDER jobs; we aren't
+            // responsible for other types of jobs.
+            JobType type = job->getType();
+            if (type == JOB_TYPE_PREVIEW || type == JOB_TYPE_RENDER) {
+                job->deleteJob();
+
+                it = queue.erase(it);
+
+                job->unref();
+                job = nullptr;
+            } else {
+                ++it;
+            }
+        }
+    }
+}
+
+void XournalScheduler::finishTask() { std::lock_guard lock{this->jobRunningMutex}; }
+
+void XournalScheduler::removeSource(void* source, JobType type, JobPriority priority, bool awaitFinishTask) {
+    {
+        std::lock_guard lock{this->jobQueueMutex};
+        std::deque<Job*>& queue = *this->jobQueue[priority];
+
+        auto it = queue.begin();
+
+        while (it != queue.end()) {
+            Job* job = *it;
+
+            if (job->getType() == type && job->getSource() == source) {
+                it = queue.erase(it);
+
+                job->deleteJob();
+                job->unref();
+                job = nullptr;
+            } else {
+                ++it;
+            }
+        }
+    }
+
+    // wait until the last job is done
+    // we can be sure we don't access "source"
+    if (awaitFinishTask) {
+        finishTask();
+    }
+}
+
+auto XournalScheduler::existsSource(void* source, JobType type, JobPriority priority) -> bool {
+    bool exists = false;
+    std::lock_guard lock{this->jobQueueMutex};
+
+    for (Job* job: *this->jobQueue[priority]) {
+        if (job->getType() == type && job->getSource() == source) {
+            exists = true;
+            break;
+        }
+    }
+
+    return exists;
+}
+
+void XournalScheduler::addRepaintSidebar(SidebarPreviewBaseEntry* preview) {
+    if (existsSource(preview, JOB_TYPE_PREVIEW, JOB_PRIORITY_HIGH)) {
+        return;
+    }
+
+    auto* job = new PreviewJob(preview);
+    addJob(job, JOB_PRIORITY_HIGH);
+    job->unref();
+}
+
+void XournalScheduler::addRerenderPage(XojPageView* view) {
+    if (existsSource(view, JOB_TYPE_RENDER, JOB_PRIORITY_URGENT)) {
+        return;
+    }
+
+    auto* job = new RenderJob(view);
+    addJob(job, JOB_PRIORITY_URGENT);
+    job->unref();
+}
diff --git a/entry/src/main/cpp/src/core/control/jobs/XournalScheduler.h b/entry/src/main/cpp/src/core/control/jobs/XournalScheduler.h
new file mode 100644
index 0000000..6f39e69
--- /dev/null
+++ b/entry/src/main/cpp/src/core/control/jobs/XournalScheduler.h
@@ -0,0 +1,58 @@
+/*
+ * Xournal++
+ *
+ * A scheduler for Xournal background tasks
+ *
+ * Some code from Evince project
+ *
+ * @author Xournal++ Team
+ * https://github.com/xournalpp/xournalpp
+ *
+ * @license GNU GPLv2 or later
+ */
+
+#pragma once
+
+#include "control/jobs/Job.h"  // for JobType
+
+#include "Scheduler.h"  // for JobPriority, Scheduler
+
+class SidebarPreviewBaseEntry;
+class XojPageView;
+
+class XournalScheduler: public Scheduler {
+public:
+    XournalScheduler();
+    ~XournalScheduler() override;
+
+public:
+    /**
+     * Remove source, e.g. if a page is removed they don't need to repaint.
+     * Blocks until all jobs that could be using the source have finished.
+     */
+    void removeSidebar(SidebarPreviewBaseEntry* preview);
+    void removePage(XojPageView* view);
+
+    /**
+     * Removes all PreviewJob%s / RenderJob%s scheduled to be run
+     */
+    void removeAllJobs();
+
+    void addRepaintSidebar(SidebarPreviewBaseEntry* preview);
+    void addRerenderPage(XojPageView* view);
+
+    /**
+     * Blocks until all currently running Job%s have been executed
+     */
+    void finishTask();
+
+private:
+    /**
+     * Remove source, e.g. if a page is removed they don't need to repaint
+     */
+    void removeSource(void* source, JobType type, JobPriority priority, bool awaitFinishTask = true);
+
+    bool existsSource(void* source, JobType type, JobPriority priority);
+
+private:
+};
diff --git a/entry/src/main/cpp/src/core/control/latex/LatexGenerator.cpp b/entry/src/main/cpp/src/core/control/latex/LatexGenerator.cpp
new file mode 100644
index 0000000..1493880
--- /dev/null
+++ b/entry/src/main/cpp/src/core/control/latex/LatexGenerator.cpp
@@ -0,0 +1,95 @@
+#include "LatexGenerator.h"
+
+#include <regex>        // for smatch, sregex_iterator
+#include <sstream>      // for ostringstream
+#include <string_view>  // for string_view
+
+#include <glib.h>     // for GError, gchar, g_error_free
+#include <poppler.h>  // for g_object_unref
+
+#include "control/settings/LatexSettings.h"  // for LatexSettings
+#include "util/PathUtil.h"                   // for getLongPath
+#include "util/PlaceholderString.h"          // for PlaceholderString
+#include "util/Util.h"                       // for Util
+#include "util/i18n.h"                       // for FS, _F
+#include "util/raii/GLibGuards.h"            // for GErrorGuard, GStrvGuard
+#include "util/raii/GObjectSPtr.h"           // for GObjectSptr
+#include "util/safe_casts.h"                 // for as_signed
+
+
+using namespace xoj::util;
+
+LatexGenerator::LatexGenerator(const LatexSettings& settings): settings(settings) {}
+
+auto LatexGenerator::templateSub(const std::string& input, const std::string& templ, const Color textColor)
+        -> std::string {
+    const static std::regex substRe("%%XPP_((TOOL_INPUT)|(TEXT_COLOR))%%");
+    std::string output;
+    output.reserve(templ.length());
+    size_t templatePos = 0;
+    for (std::sregex_iterator it(templ.begin(), templ.end(), substRe); it != std::sregex_iterator{}; it++) {
+        std::smatch match = *it;
+        std::string matchStr = match[1];
+        std::string repl;
+        // Performance can be optimized here by precomputing hashes
+        if (matchStr == "TOOL_INPUT") {
+            repl = input;
+        } else if (matchStr == "TEXT_COLOR") {
+            repl = Util::rgb_to_hex_string(textColor).substr(1);
+        }
+        output.append(templ, templatePos, as_unsigned(match.position()) - templatePos);
+        output.append(repl);
+        templatePos = as_unsigned(match.position() + match.length());
+    }
+    output.append(templ, templatePos);
+    return output;
+}
+
+auto LatexGenerator::asyncRun(const fs::path& texDir, const std::string& texFileContents) -> Result {
+    std::string cmd = this->settings.genCmd;
+    GErrorGuard err{};
+    std::string texFilePathOSEncoding = Util::GFilename(Util::getLongPath(texDir) / "tex.tex").c_str();
+
+    for (auto i = cmd.find("{}"); i != std::string::npos; i = cmd.find("{}", i + texFilePathOSEncoding.length())) {
+        cmd.replace(i, 2, texFilePathOSEncoding);
+    }
+    // Todo (rolandlo): is this a todo?
+    // Windows note: g_shell_parse_argv assumes POSIX paths, so Windows paths need to be escaped.
+    GStrvGuard argv{};
+    if (!g_shell_parse_argv(cmd.c_str(), nullptr, out_ptr(argv), out_ptr(err))) {
+        return GenError{FS(_F("Failed to parse LaTeX generator command: {1}") % err->message)};
+    }
+    gchar* prog = argv.get()[0];
+    if (!prog || !(prog = g_find_program_in_path(prog))) {
+        if (Util::isFlatpakInstallation()) {
+            return GenError{
+                    FS(_F("Failed to find LaTeX generator program in PATH: {1}\n\nSince installation is detected "
+                          "within Flatpak, you need to install the Flatpak freedesktop Tex Live extension. For "
+                          "example, by running:\n\n$ flatpak install flathub org.freedesktop.Sdk.Extension.texlive") %
+                       argv.get()[0])};
+        } else {
+            return GenError{FS(_F("Failed to find LaTeX generator program in PATH: {1}") % argv.get()[0])};
+        }
+    }
+    g_free(argv.get()[0]);
+    argv.get()[0] = prog;
+
+    if (!g_file_set_contents(texFilePathOSEncoding.c_str(), texFileContents.c_str(), as_signed(texFileContents.size()),
+                             out_ptr(err))) {
+        return GenError({FS(_F("Could not save .tex file: {1}") % err->message)});
+    }
+
+    auto flags = static_cast<GSubprocessFlags>(G_SUBPROCESS_FLAGS_STDOUT_PIPE | G_SUBPROCESS_FLAGS_STDERR_MERGE);
+    xoj::util::GObjectSPtr<GSubprocessLauncher> launcher(g_subprocess_launcher_new(flags), xoj::util::adopt);
+    g_subprocess_launcher_set_cwd(launcher.get(), Util::GFilename(texDir).c_str());
+    auto* proc = g_subprocess_launcher_spawnv(launcher.get(), argv.get(), out_ptr(err));
+
+    if (proc) {
+        return {proc};
+    }
+    std::ostringstream ss;
+    for (char** iter = argv.get(); iter != nullptr && *iter != nullptr; ++iter) {
+        ss << std::string_view(*iter) << ", ";
+    }
+    return GenError({FS(_F("Could not start {1}: {2} (exit code: {3})") % ss.str() % err->message % err->code)});
+}
diff --git a/entry/src/main/cpp/src/core/control/latex/LatexGenerator.h b/entry/src/main/cpp/src/core/control/latex/LatexGenerator.h
new file mode 100644
index 0000000..b425636
--- /dev/null
+++ b/entry/src/main/cpp/src/core/control/latex/LatexGenerator.h
@@ -0,0 +1,55 @@
+/*
+ * Xournal++
+ *
+ * Latex file generator
+ *
+ * @author Xournal++ Team
+ * https://github.com/xournalpp/xournalpp
+ *
+ * @license GNU GPLv2 or later
+ */
+
+#pragma once
+
+#include <string>   // for string
+#include <variant>  // for variant
+
+#include <gio/gio.h>  // for GSubprocess
+
+#include "util/Color.h"  // for Color
+
+#include "filesystem.h"  // for path
+
+class LatexSettings;
+
+class LatexGenerator {
+public:
+    LatexGenerator(const LatexSettings& settings);
+    LatexGenerator(const LatexGenerator&) = delete;
+    LatexGenerator& operator=(const LatexGenerator&) = delete;
+    LatexGenerator(const LatexGenerator&&) = delete;
+    LatexGenerator&& operator=(const LatexGenerator&&) = delete;
+    virtual ~LatexGenerator() = default;
+
+    struct GenError {
+        std::string message;
+    };
+    using Result = std::variant<GSubprocess*, GenError>;
+
+    /**
+     * Run the LaTeX command asynchronously to generate a preview for the given
+     * LaTeX file. The contents of the LaTeX file will be written to "tex.tex"
+     * in the given directory.
+     * The resultant process will have its standard error and (original) standard output
+     * combined into a single standard out stream.
+     */
+    Result asyncRun(const fs::path& texDir, const std::string& texFileContents);
+
+    /**
+     * Instantiate the LaTeX template.
+     */
+    static std::string templateSub(const std::string& input, const std::string& templ, Color textColor);
+
+private:
+    const LatexSettings& settings;
+};
diff --git a/entry/src/main/cpp/src/core/control/layer/LayerController.cpp b/entry/src/main/cpp/src/core/control/layer/LayerController.cpp
new file mode 100644
index 0000000..85c75ff
--- /dev/null
+++ b/entry/src/main/cpp/src/core/control/layer/LayerController.cpp
@@ -0,0 +1,453 @@
+#include "LayerController.h"
+
+#include <memory>   // for __shared_ptr_access, make...
+#include <mutex>    // for unique_lock
+#include <utility>  // for move
+#include <vector>   // for vector
+
+#include "control/Control.h"                 // for Control
+#include "control/actions/ActionDatabase.h"  // for ActionDatabase
+#include "gui/MainWindow.h"                  // for MainWindow
+#include "gui/XournalView.h"                 // for XournalView
+#include "model/Document.h"                  // for Document
+#include "model/XojPage.h"                   // for XojPage
+#include "undo/InsertLayerUndoAction.h"      // for InsertLayerUndoAction
+#include "undo/MergeLayerDownUndoAction.h"   // for MergeLayerDownUndoAction
+#include "undo/MoveLayerUndoAction.h"        // for MoveLayerUndoAction
+#include "undo/RemoveLayerUndoAction.h"      // for RemoveLayerUndoAction
+#include "undo/UndoAction.h"                 // for UndoActionPtr, UndoAction
+#include "undo/UndoRedoHandler.h"            // for UndoRedoHandler
+#include "util/Util.h"                       // for npos
+#include "util/i18n.h"                       // for FS, _F
+
+#include "LayerCtrlListener.h"  // for LayerCtrlListener
+
+LayerController::LayerController(Control* control): control(control), selectedPage(npos) {}
+
+void LayerController::documentChanged(DocumentChangeType type) {
+    if (type == DOCUMENT_CHANGE_CLEARED || type == DOCUMENT_CHANGE_COMPLETE) {
+        fireRebuildLayerMenu();
+    }
+}
+
+void LayerController::pageSelected(size_t page) {
+    if (selectedPage == page) {
+        return;
+    }
+    selectedPage = page;
+
+    fireRebuildLayerMenu();
+}
+
+void LayerController::insertLayer(PageRef page, Layer* layer, Layer::Index layerPos) {
+    xoj_assert(layer);
+    bool empty = layer->getElements().empty();
+    control->getDocument()->lock();
+    page->insertLayer(layer, layerPos);
+    auto id = empty ? npos : control->getDocument()->indexOf(page);
+    control->getDocument()->unlock();
+    fireRebuildLayerMenu();
+    if (!empty) {
+        // Rerender the page
+        control->getWindow()->getXournal()->layerChanged(id);
+    }
+}
+
+void LayerController::removeLayer(PageRef page, Layer* layer) {
+    control->getDocument()->lock();
+    bool empty = layer->getElements().empty();
+    page->removeLayer(layer);
+    auto id = empty ? npos : control->getDocument()->indexOf(page);
+    control->getDocument()->unlock();
+    fireRebuildLayerMenu();
+    if (!empty) {
+        // Rerender the page
+        control->getWindow()->getXournal()->layerChanged(id);
+    }
+}
+
+void LayerController::moveLayer(PageRef page, Layer* layer, Layer::Index newPos) {
+    control->getDocument()->lock();
+    page->removeLayer(layer);
+    page->insertLayer(layer, newPos);
+    auto id = control->getDocument()->indexOf(page);
+    control->getDocument()->unlock();
+    fireRebuildLayerMenu();
+    // Rerender the page
+    control->getWindow()->getXournal()->layerChanged(id);
+}
+
+void LayerController::mergeLayers(PageRef page, Layer* bottomLayer, Layer* topLayer) {
+    control->getDocument()->lock();
+    page->removeLayer(topLayer);
+
+    for (auto&& elem: topLayer->clearNoFree()) {
+        bottomLayer->addElement(std::move(elem));
+    }
+    auto id = control->getDocument()->indexOf(page);
+    control->getDocument()->unlock();
+
+    fireRebuildLayerMenu();
+    control->getWindow()->getXournal()->layerChanged(id);  // Rerender the page
+}
+
+void LayerController::moveElementsFromLayerToFreeLayer(PageRef page, Layer* layer,
+                                                       const std::vector<const Element*>& elts, Layer* freeLayer,
+                                                       Layer::Index newLayerId) {
+    control->getDocument()->lock();
+
+    for (const Element* elem: elts) {
+        freeLayer->addElement(layer->removeElement(elem).e);
+    }
+
+    // add the upper layer back at its old pos
+    page->insertLayer(freeLayer, newLayerId);
+    auto id = control->getDocument()->indexOf(page);
+    control->getDocument()->unlock();
+
+    fireRebuildLayerMenu();
+    control->getWindow()->getXournal()->layerChanged(id);  // Rerender the page
+}
+
+
+void LayerController::addListener(LayerCtrlListener* listener) { this->listener.push_back(listener); }
+
+void LayerController::removeListener(LayerCtrlListener* listener) { this->listener.remove(listener); }
+
+void LayerController::updateActions() {
+    auto layer = getCurrentLayerId();
+    auto maxLayer = getLayerCount();
+
+    auto* actionDB = control->getActionDatabase();
+
+    actionDB->enableAction(Action::LAYER_DELETE, layer > 0);
+    actionDB->enableAction(Action::LAYER_MERGE_DOWN, layer > 1);
+    actionDB->enableAction(Action::LAYER_MOVE_UP, layer < maxLayer);
+    actionDB->enableAction(Action::LAYER_MOVE_DOWN, layer > 1);
+    actionDB->enableAction(Action::MOVE_SELECTION_LAYER_UP, layer < maxLayer);
+    actionDB->enableAction(Action::MOVE_SELECTION_LAYER_DOWN, layer > 1);
+    actionDB->enableAction(Action::LAYER_GOTO_NEXT, layer < maxLayer);
+    actionDB->enableAction(Action::LAYER_GOTO_PREVIOUS, layer > 0);
+    actionDB->enableAction(Action::LAYER_GOTO_TOP, layer < maxLayer);
+
+    actionDB->setActionState(Action::LAYER_ACTIVE, layer);
+}
+
+void LayerController::fireRebuildLayerMenu() {
+    for (LayerCtrlListener* l: this->listener) { l->rebuildLayerMenu(); }
+    updateActions();
+}
+
+void LayerController::fireLayerVisibilityChanged() {
+    for (LayerCtrlListener* l: this->listener) { l->layerVisibilityChanged(); }
+
+    // Rerenders the page - Todo: make this another listener
+    control->getWindow()->getXournal()->layerChanged(selectedPage);
+}
+
+void LayerController::fireSelectedLayerChanged() {
+    for (LayerCtrlListener* l: this->listener) {
+        l->updateSelectedLayer();
+    }
+    updateActions();
+}
+
+/**
+ * Show all layer on the current page
+ */
+void LayerController::showAllLayer() { showOrHideAllLayer(true); }
+
+/**
+ * Hide all layer on the current page
+ */
+void LayerController::hideAllLayer() { showOrHideAllLayer(false); }
+
+/**
+ * Show / Hide all layer on the current page
+ */
+void LayerController::showOrHideAllLayer(bool show) {
+    auto lock = std::unique_lock(*control->getDocument());
+    PageRef page = getCurrentPage();
+    for (Layer::Index i = 1; i <= page->getLayerCount(); i++) { page->setLayerVisible(i, show); }
+    lock.unlock();
+
+    fireLayerVisibilityChanged();
+}
+
+void LayerController::addNewLayer(bool belowCurrentLayer) {
+    control->clearSelectionEndText();
+
+    auto lock = std::unique_lock(*control->getDocument());
+    PageRef p = getCurrentPage();
+    if (!p) {
+        return;
+    }
+
+    auto* l = new Layer();
+    xoj_assert(p->getSelectedLayerId() > 0);
+    auto layerPos = belowCurrentLayer ? p->getSelectedLayerId() - 1 : p->getSelectedLayerId();
+    p->insertLayer(l, layerPos);
+    lock.unlock();
+
+    control->getUndoRedoHandler()->addUndoAction(std::make_unique<InsertLayerUndoAction>(this, p, l, layerPos));
+
+    fireRebuildLayerMenu();
+    // Repaint is not needed here - the new layer is empty
+}
+
+void LayerController::deleteCurrentLayer() {
+    control->clearSelectionEndText();
+
+    auto lock = std::unique_lock(*control->getDocument());
+    PageRef p = getCurrentPage();
+    auto pId = selectedPage;
+    if (!p) {
+        return;
+    }
+
+    auto lId = p->getSelectedLayerId();
+    if (lId == 0) {
+        return;
+    }
+    Layer* l = p->getSelectedLayer();
+
+    p->removeLayer(l);
+    lock.unlock();
+
+    MainWindow* win = control->getWindow();
+    if (win) {
+        win->getXournal()->layerChanged(pId);
+    }
+
+    control->getUndoRedoHandler()->addUndoAction(std::make_unique<RemoveLayerUndoAction>(this, p, l, lId - 1));
+
+    fireRebuildLayerMenu();
+}
+
+void LayerController::moveCurrentLayer(bool up) {
+    control->clearSelectionEndText();
+
+    auto lock = std::unique_lock(*control->getDocument());
+    PageRef p = getCurrentPage();
+    auto pId = selectedPage;
+    if (!p) {
+        return;
+    }
+
+    auto lId = p->getSelectedLayerId();
+    Layer* currentLayer = p->getSelectedLayer();
+    if (lId == 0) {
+        // Background cannot be moved
+        return;
+    }
+
+    if (lId == 1 && !up) {
+        // bottom layer cannot be moved down
+        return;
+    }
+
+    if (lId == p->getLayerCount() && up) {
+        // top layer cannot be moved up
+        return;
+    }
+
+    p->removeLayer(currentLayer);
+
+    // Layer IDs are a bit strange, because background is 0
+    // so the first layer is 1, technical the first layer is still
+    // index 0 in the vector... confusing...
+    auto newIndex = up ? lId : lId - 2;
+    p->insertLayer(currentLayer, newIndex);
+    lock.unlock();
+
+    MainWindow* win = control->getWindow();
+    if (win) {
+        win->getXournal()->layerChanged(pId);
+    }
+
+    control->getUndoRedoHandler()->addUndoAction(
+            std::make_unique<MoveLayerUndoAction>(this, p, currentLayer, lId - 1, newIndex));
+
+    fireRebuildLayerMenu();
+}
+
+void LayerController::mergeCurrentLayerDown() {
+    control->clearSelectionEndText();
+
+    auto lock = std::shared_lock(*control->getDocument());
+    PageRef page = getCurrentPage();
+    auto pageID = selectedPage;
+    if (page == nullptr) {
+        return;
+    }
+
+    /*
+     * layerID value:
+     *    ...
+     *    2: layer 2
+     *    1: layer 1
+     *    0: background
+     */
+    const auto layerID = page->getSelectedLayerId();
+    Layer* currentLayer = page->getSelectedLayer();
+    if (layerID < 2) {
+        /*
+         * lowest (non-background) layer cannot be merged into background
+         * and the background itself obviously also cannot be merged down
+         */
+        return;
+    }
+
+    /*
+     * We know this cannot be the background (or even an underflow) because
+     * we checked for !(layerID < 2) before.
+     */
+    const auto layerBelowID = layerID - 1;
+    /*
+     * Layer indices in the vector are off by one from the layer IDs because
+     * the background is not in the vector, so layer 1 has index 0 and so on.
+     */
+    const Layer::Index layerBelowIndex = layerBelowID - 1;
+    Layer* layerBelow = page->getLayers()[layerBelowIndex];
+
+    UndoActionPtr undo_redo_action =
+            std::make_unique<MergeLayerDownUndoAction>(this, page, currentLayer, layerID - 1, layerBelow, pageID);
+    lock.unlock();
+    // The mutex is locked in RW in redo()
+    undo_redo_action->redo(this->control);
+
+    control->getUndoRedoHandler()->addUndoAction(std::move(undo_redo_action));
+
+    fireRebuildLayerMenu();
+}
+
+void LayerController::copyCurrentLayer() {
+    control->clearSelectionEndText();
+
+    auto lock = std::unique_lock(*control->getDocument());
+    PageRef p = getCurrentPage();
+    auto pId = selectedPage;
+    if (!p) {
+        return;
+    }
+
+    auto lId = p->getSelectedLayerId();
+    if (lId == 0) {
+        return;
+    }
+    Layer* l = p->getSelectedLayer();
+    Layer* cloned = l->clone();
+
+    p->insertLayer(cloned, lId);
+    lock.unlock();
+
+    MainWindow* win = control->getWindow();
+    if (win) {
+        win->getXournal()->layerChanged(pId);
+    }
+
+    control->getUndoRedoHandler()->addUndoAction(std::make_unique<InsertLayerUndoAction>(this, p, cloned, lId));
+
+    fireRebuildLayerMenu();
+}
+
+auto LayerController::getCurrentPage() const -> PageRef { return control->getDocument()->getPage(selectedPage); }
+
+auto LayerController::getCurrentPageId() const -> size_t { return selectedPage; }
+
+void LayerController::setLayerVisible(Layer::Index layerId, bool visible) {
+    getCurrentPage()->setLayerVisible(layerId, visible);
+    fireLayerVisibilityChanged();
+}
+
+/**
+ * Switch to a layer
+ *
+ * @param hideShow	Auto hide / show other layers,
+ * 					as it was before the advance layer menu
+ * @param clearSelection Clear / keep current selection before switching layers.
+ */
+void LayerController::switchToLay(Layer::Index layerId, bool hideShow, bool clearSelection) {
+    if (clearSelection) {
+        control->clearSelectionEndText();
+    }
+
+    auto lock = std::shared_lock(*control->getDocument());
+    PageRef p = getCurrentPage();
+    if (!p) {
+        return;
+    }
+
+    p->setSelectedLayerId(layerId);
+    lock.unlock();
+    fireSelectedLayerChanged();
+
+    if (hideShow) {
+        for (Layer::Index i = 1; i <= p->getLayerCount(); i++) { p->setLayerVisible(i, i <= layerId); }
+
+        fireLayerVisibilityChanged();
+    }
+}
+
+/**
+ * @return Layer count of the current page
+ */
+auto LayerController::getLayerCount() const -> Layer::Index {
+    PageRef page = getCurrentPage();
+    if (!page) {
+        return 0;
+    }
+
+    return page->getLayerCount();
+}
+
+/**
+ * @return Current layer ID
+ */
+auto LayerController::getCurrentLayerId() const -> Layer::Index {
+    PageRef page = getCurrentPage();
+    if (!page) {
+        return 0;
+    }
+    return page->getSelectedLayerId();
+}
+
+/// Make sure the document's mutex is locked when calling this
+static auto getLayerNameOnPage(const PageRef& page, Layer::Index id) -> std::string {
+    if (page == nullptr || id > page->getLayerCount()) {
+        return "Unknown layer name";
+    } else if (id == 0) {  // If is background
+        return page->getBackgroundName();
+    } else if (auto layer = page->getLayersView()[id - 1]; layer->hasName()) {
+        return layer->getName();
+    } else {
+        return FS(_F("Layer {1}") % static_cast<long>(id));
+    }
+}
+
+auto LayerController::getCurrentLayerName() const -> std::string {
+    auto lock = std::shared_lock(*control->getDocument());
+    return getLayerNameOnPage(getCurrentPage(), getCurrentLayerId());
+}
+auto LayerController::getLayerNameById(Layer::Index id) const -> std::string {
+    auto lock = std::shared_lock(*control->getDocument());
+    return getLayerNameOnPage(getCurrentPage(), id);
+}
+
+void LayerController::setCurrentLayerName(const std::string& newName) {
+    auto lock = std::unique_lock(*control->getDocument());
+    PageRef page = getCurrentPage();
+
+    if (page == nullptr) {
+        return;
+    }
+
+    if (getCurrentLayerId() == 0) {  // Background
+        page->setBackgroundName(newName);
+    } else {  // Any other layer
+        page->getSelectedLayer()->setName(newName);
+    }
+    lock.unlock();
+
+    fireRebuildLayerMenu();
+}
diff --git a/entry/src/main/cpp/src/core/control/layer/LayerController.h b/entry/src/main/cpp/src/core/control/layer/LayerController.h
new file mode 100644
index 0000000..4026472
--- /dev/null
+++ b/entry/src/main/cpp/src/core/control/layer/LayerController.h
@@ -0,0 +1,121 @@
+/*
+ * Xournal++
+ *
+ * Handler for layer selection and hiding / showing layer
+ *
+ * @author Xournal++ Team
+ * https://github.com/xournalpp/xournalpp
+ *
+ * @license GNU GPLv2 or later
+ */
+
+#pragma once
+
+#include <cstddef>  // for size_t
+#include <list>     // for list
+#include <string>   // for string
+
+#include "model/DocumentChangeType.h"  // for DocumentChangeType
+#include "model/DocumentListener.h"    // for DocumentListener
+#include "model/Layer.h"               // for Layer, Layer::Index
+#include "model/PageRef.h"             // for PageRef
+
+class LayerCtrlListener;
+class Control;
+
+class LayerController: public DocumentListener {
+public:
+    LayerController(Control* control);
+    ~LayerController() override = default;
+
+public:
+    void documentChanged(DocumentChangeType type) override;
+    void pageSelected(size_t page) override;
+
+public:
+    /// Insert a layer, without adding an UndoAction
+    void insertLayer(PageRef page, Layer* layer, Layer::Index layerPos);
+    /// Remove a layer, without adding an UndoAction
+    void removeLayer(PageRef page, Layer* layer);
+    /// Moves a Layer to a new index, without adding an UndoAction. Assumes `layer` is in `page`
+    void moveLayer(PageRef page, Layer* layer, Layer::Index newPos);
+    /// Move every elements of topLayer onto bottomLayer and removes topLayer, without adding an UndoAction
+    void mergeLayers(PageRef page, Layer* bottomLayer, Layer* topLayer);
+    /// Move the given elements from `layer` to `freeLayer` and add `freeLayer` to the page at the given position
+    void moveElementsFromLayerToFreeLayer(PageRef page, Layer* layer, const std::vector<const Element*>& elts,
+                                          Layer* freeLayer, Layer::Index newLayerId);
+
+    // Listener handling
+public:
+    void addListener(LayerCtrlListener* listener);
+    void removeListener(LayerCtrlListener* listener);
+    void fireRebuildLayerMenu();
+
+protected:
+    void fireLayerVisibilityChanged();
+    void fireSelectedLayerChanged();
+
+    void updateActions();
+
+public:
+    /**
+     * Show all layer on the current page
+     */
+    void showAllLayer();
+
+    /**
+     * Hide all layer on the current page
+     */
+    void hideAllLayer();
+
+    /**
+     * Show / Hide all layer on the current page
+     */
+    void showOrHideAllLayer(bool show);
+
+    /// Adds a new layer above/below the active layer. Adds the appropriate UndoAction
+    void addNewLayer(bool belowCurrentLayer);
+    void deleteCurrentLayer();
+    void copyCurrentLayer();
+    void moveCurrentLayer(bool up);
+    void mergeCurrentLayerDown();
+    void switchToLay(Layer::Index layerId, bool hideShow = false, bool clearSelection = true);
+    void setLayerVisible(Layer::Index layerId, bool visible);
+
+    PageRef getCurrentPage() const;
+    size_t getCurrentPageId() const;
+
+    /**
+     * @return Layer count of the current page
+     */
+    Layer::Index getLayerCount() const;
+
+    /**
+     * @return Current layer ID
+     */
+    Layer::Index getCurrentLayerId() const;
+
+    /**
+     * @return Current layer name
+     */
+    std::string getCurrentLayerName() const;
+
+    /**
+     * @return Get layer name by layer id
+     */
+    std::string getLayerNameById(Layer::Index id) const;
+
+    /**
+     * Sets current layer name
+     */
+    void setCurrentLayerName(const std::string& newName);
+
+private:
+    Control* control;
+
+    std::list<LayerCtrlListener*> listener;
+
+    size_t selectedPage;
+
+    friend class LayerRenameUndoAction;
+};
diff --git a/entry/src/main/cpp/src/core/control/layer/LayerCtrlListener.cpp b/entry/src/main/cpp/src/core/control/layer/LayerCtrlListener.cpp
new file mode 100644
index 0000000..7580add
--- /dev/null
+++ b/entry/src/main/cpp/src/core/control/layer/LayerCtrlListener.cpp
@@ -0,0 +1,19 @@
+#include "LayerCtrlListener.h"
+
+#include "LayerController.h"
+
+LayerCtrlListener::LayerCtrlListener(): handler(nullptr) {}
+
+LayerCtrlListener::~LayerCtrlListener() { unregisterListener(); }
+
+void LayerCtrlListener::registerListener(LayerController* handler) {
+    this->handler = handler;
+    handler->addListener(this);
+}
+
+void LayerCtrlListener::unregisterListener() {
+    if (this->handler) {
+        this->handler->removeListener(this);
+        this->handler = nullptr;
+    }
+}
diff --git a/entry/src/main/cpp/src/core/control/layer/LayerCtrlListener.h b/entry/src/main/cpp/src/core/control/layer/LayerCtrlListener.h
new file mode 100644
index 0000000..87aa2af
--- /dev/null
+++ b/entry/src/main/cpp/src/core/control/layer/LayerCtrlListener.h
@@ -0,0 +1,31 @@
+/*
+ * Xournal++
+ *
+ * Layer Controller listener
+ *
+ * @author Xournal++ Team
+ * https://github.com/xournalpp/xournalpp
+ *
+ * @license GNU GPLv2 or later
+ */
+
+#pragma once
+
+class LayerController;
+
+class LayerCtrlListener {
+public:
+    LayerCtrlListener();
+    virtual ~LayerCtrlListener();
+
+public:
+    void registerListener(LayerController* handler);
+    void unregisterListener();
+
+    virtual void rebuildLayerMenu() = 0;
+    virtual void layerVisibilityChanged() = 0;
+    virtual void updateSelectedLayer() = 0;
+
+private:
+    LayerController* handler;
+};
diff --git a/entry/src/main/cpp/src/core/control/pagetype/PageTypeHandler.cpp b/entry/src/main/cpp/src/core/control/pagetype/PageTypeHandler.cpp
new file mode 100644
index 0000000..be6445c
--- /dev/null
+++ b/entry/src/main/cpp/src/core/control/pagetype/PageTypeHandler.cpp
@@ -0,0 +1,166 @@
+#include "PageTypeHandler.h"
+
+#include <algorithm>
+#include <utility>
+
+#include "gui/GladeSearchpath.h"
+#include "util/PathUtil.h"
+#include "util/StringUtils.h"
+#include "util/XojMsgBox.h"
+#include "util/i18n.h"
+
+static void addPageTypeInfo(const std::string& name, PageTypeFormat format, const std::string& config,
+                            std::vector<std::unique_ptr<PageTypeInfo>>& types) {
+    auto pt = std::make_unique<PageTypeInfo>();
+    pt->name = std::move(name);
+    pt->page.format = format;
+    pt->page.config = std::move(config);
+
+    types.emplace_back(std::move(pt));
+}
+
+PageTypeHandler::PageTypeHandler(GladeSearchpath* gladeSearchPath) {
+    auto file = gladeSearchPath->findFile("", "pagetemplates.ini");
+
+    if (!parseIni(file) || this->types.size() < 5) {
+
+        std::string msg = FS(_F("Could not load pagetemplates.ini file"));
+        XojMsgBox::showErrorToUser(nullptr, msg);
+
+        // On failure load the hardcoded and predefined values
+        addPageTypeInfo(_("Plain"), PageTypeFormat::Plain, "", types);
+        addPageTypeInfo(_("Ruled"), PageTypeFormat::Ruled, "", types);
+        addPageTypeInfo(_("Ruled with vertical line"), PageTypeFormat::Lined, "", types);
+        addPageTypeInfo(_("Staves"), PageTypeFormat::Staves, "", types);
+        addPageTypeInfo(_("Graph"), PageTypeFormat::Graph, "", types);
+        addPageTypeInfo(_("Dotted"), PageTypeFormat::Dotted, "", types);
+        addPageTypeInfo(_("Isometric Dotted"), PageTypeFormat::IsoDotted, "", types);
+        addPageTypeInfo(_("Isometric Graph"), PageTypeFormat::IsoGraph, "", types);
+    }
+
+    // Special types
+    addPageTypeInfo(_("With PDF background"), PageTypeFormat::Pdf, "", specialTypes);
+    addPageTypeInfo(_("Image"), PageTypeFormat::Image, "", specialTypes);
+}
+
+PageTypeHandler::~PageTypeHandler() = default;
+
+auto PageTypeHandler::parseIni(fs::path const& filepath) -> bool {
+    GKeyFile* config = g_key_file_new();
+    g_key_file_set_list_separator(config, ',');
+    if (!g_key_file_load_from_file(config, Util::toGFilename(filepath).c_str(), G_KEY_FILE_NONE, nullptr)) {
+        g_key_file_free(config);
+        return false;
+    }
+
+    gsize length = 0;
+    gchar** groups = g_key_file_get_groups(config, &length);
+
+    for (gsize i = 0; i < length; i++) { loadFormat(config, groups[i]); }
+
+    g_strfreev(groups);
+    g_key_file_free(config);
+    return true;
+}
+
+void PageTypeHandler::loadFormat(GKeyFile* config, const char* group) {
+    std::string strName;
+    gchar* name = g_key_file_get_locale_string(config, group, "name", nullptr, nullptr);
+    if (name != nullptr) {
+        strName = name;
+        g_free(name);
+    }
+
+    std::string strFormat;
+    gchar* format = g_key_file_get_string(config, group, "format", nullptr);
+    if (format != nullptr) {
+        strFormat = format;
+        g_free(format);
+    }
+
+    std::string strConfig;
+    gchar* cconfig = g_key_file_get_string(config, group, "config", nullptr);
+    if (cconfig != nullptr) {
+        strConfig = cconfig;
+        g_free(cconfig);
+    }
+
+    addPageTypeInfo(strName, getPageTypeFormatForString(strFormat), strConfig, types);
+}
+
+auto PageTypeHandler::getPageTypes() -> const std::vector<std::unique_ptr<PageTypeInfo>>& { return this->types; }
+auto PageTypeHandler::getSpecialPageTypes() -> const std::vector<std::unique_ptr<PageTypeInfo>>& {
+    return this->specialTypes;
+}
+
+auto PageTypeHandler::getInfoOn(const PageType& pt) const -> const PageTypeInfo* {
+    const auto& vector = pt.isSpecial() ? specialTypes : types;
+    auto it = std::find_if(vector.begin(), vector.end(), [&](const auto& info) { return info->page == pt; });
+    return it == vector.end() ? nullptr : it->get();
+}
+
+auto PageTypeHandler::getPageTypeFormatForString(const std::string& format) -> PageTypeFormat {
+    if (format == "plain") {
+        return PageTypeFormat::Plain;
+    }
+    if (format == "ruled") {
+        return PageTypeFormat::Ruled;
+    }
+    if (format == "lined") {
+        return PageTypeFormat::Lined;
+    }
+    if (format == "staves") {
+        return PageTypeFormat::Staves;
+    }
+    if (format == "graph") {
+        return PageTypeFormat::Graph;
+    }
+    if (format == "dotted") {
+        return PageTypeFormat::Dotted;
+    }
+    if (format == "isodotted") {
+        return PageTypeFormat::IsoDotted;
+    }
+    if (format == "isograph") {
+        return PageTypeFormat::IsoGraph;
+    }
+    if (format == ":pdf") {
+        return PageTypeFormat::Pdf;
+    }
+    if (format == ":image") {
+        return PageTypeFormat::Image;
+    }
+    g_warning("PageTypeHandler::getPageTypeFormatForString: unknown PageType: \"%s\". Replacing with "
+              "PageTypeFormat::Plain",
+              format.c_str());
+    return PageTypeFormat::Plain;
+}
+
+auto PageTypeHandler::getStringForPageTypeFormat(const PageTypeFormat& format) -> std::string {
+    switch (format) {
+        case PageTypeFormat::Plain:
+            return "plain";
+        case PageTypeFormat::Ruled:
+            return "ruled";
+        case PageTypeFormat::Lined:
+            return "lined";
+        case PageTypeFormat::Staves:
+            return "staves";
+        case PageTypeFormat::Graph:
+            return "graph";
+        case PageTypeFormat::Dotted:
+            return "dotted";
+        case PageTypeFormat::IsoDotted:
+            return "isodotted";
+        case PageTypeFormat::IsoGraph:
+            return "isograph";
+        case PageTypeFormat::Pdf:
+            return ":pdf";
+        case PageTypeFormat::Image:
+            return ":image";
+    }
+    g_warning("PageTypeHandler::getStringForPageTypeFormat: unknown PageType: %d. Replacing with "
+              "PageTypeFormat::Ruled",
+              static_cast<int>(format));
+    return "ruled";
+}
diff --git a/entry/src/main/cpp/src/core/control/pagetype/PageTypeHandler.h b/entry/src/main/cpp/src/core/control/pagetype/PageTypeHandler.h
new file mode 100644
index 0000000..5af7f03
--- /dev/null
+++ b/entry/src/main/cpp/src/core/control/pagetype/PageTypeHandler.h
@@ -0,0 +1,51 @@
+/*
+ * Xournal++
+ *
+ * Handles different page background types
+ *
+ * @author Xournal++ Team
+ * https://github.com/xournalpp/xournalpp
+ *
+ * @license GNU GPLv2 or later
+ */
+
+#pragma once
+
+#include <memory>
+#include <string>  // for string
+#include <vector>  // for vector
+
+#include <glib.h>  // for GKeyFile
+
+#include "model/PageType.h"  // for PageTypeFormat, PageType
+
+#include "filesystem.h"  // for path
+
+class PageTypeInfo {
+public:
+    PageType page;
+    std::string name;
+};
+
+class GladeSearchpath;
+
+class PageTypeHandler {
+public:
+    PageTypeHandler(GladeSearchpath* gladeSearchPath);
+    virtual ~PageTypeHandler();
+
+public:
+    const std::vector<std::unique_ptr<PageTypeInfo>>& getPageTypes();
+    const std::vector<std::unique_ptr<PageTypeInfo>>& getSpecialPageTypes();
+    static PageTypeFormat getPageTypeFormatForString(const std::string& format);
+    static std::string getStringForPageTypeFormat(const PageTypeFormat& format);
+    const PageTypeInfo* getInfoOn(const PageType& pt) const;
+
+private:
+    bool parseIni(fs::path const& filepath);
+    void loadFormat(GKeyFile* config, const char* group);
+
+private:
+    std::vector<std::unique_ptr<PageTypeInfo>> types;
+    std::vector<std::unique_ptr<PageTypeInfo>> specialTypes;
+};
diff --git a/entry/src/main/cpp/src/core/control/settings/ButtonConfig.cpp b/entry/src/main/cpp/src/core/control/settings/ButtonConfig.cpp
new file mode 100644
index 0000000..03dc546
--- /dev/null
+++ b/entry/src/main/cpp/src/core/control/settings/ButtonConfig.cpp
@@ -0,0 +1,103 @@
+#include "ButtonConfig.h"
+
+#include "control/Tool.h"         // for Tool
+#include "control/ToolHandler.h"  // for ToolHandler
+
+ButtonConfig::ButtonConfig(ToolType action, Color color, ToolSize size, DrawingType drawingType, EraserType eraserMode,
+                           StrokeType strokeType):
+        action(action),
+        color(color),
+        size(size),
+        eraserMode(eraserMode),
+        drawingType(drawingType),
+        strokeType(strokeType),
+        disableDrawing(false) {}
+
+ButtonConfig::~ButtonConfig() = default;
+
+auto ButtonConfig::getDisableDrawing() const -> bool { return this->disableDrawing; }
+
+auto ButtonConfig::getDrawingType() const -> DrawingType { return this->drawingType; }
+
+auto ButtonConfig::getAction() const -> ToolType { return this->action; }
+
+void ButtonConfig::initButton(ToolHandler* toolHandler, Button button) const {
+    toolHandler->resetButtonTool(this->action, button);
+
+    if (this->action == TOOL_NONE) {
+        return;
+    }
+
+    const Tool& t = toolHandler->getTool(this->action);
+
+    if (t.hasCapability(TOOL_CAP_SIZE) && this->size != TOOL_SIZE_NONE) {
+        toolHandler->setButtonSize(this->size, button);
+    }
+    if (t.hasCapability(TOOL_CAP_COLOR)) {
+        toolHandler->setButtonColor(this->color, button);
+    }
+    if (t.hasCapability(TOOL_CAP_LINE_STYLE) && this->strokeType != STROKE_TYPE_NONE) {
+        toolHandler->setButtonStrokeType(this->strokeType, button);
+    }
+
+    // No TOOL_CAP_BLA for that
+    if ((this->action == TOOL_PEN || this->action == TOOL_HIGHLIGHTER) &&
+        this->drawingType != DRAWING_TYPE_DONT_CHANGE) {
+        toolHandler->setButtonDrawingType(this->drawingType, button);
+    }
+    if (this->action == TOOL_ERASER && this->eraserMode != ERASER_TYPE_NONE) {
+        toolHandler->setButtonEraserType(this->eraserMode, button);
+    }
+}
+
+void ButtonConfig::applyConfigToToolbarTool(ToolHandler* toolHandler) const {
+    if (this->action == TOOL_NONE) {
+        return;
+    }
+    toolHandler->selectTool(this->action);
+    const Tool* t = toolHandler->getActiveTool();
+
+    if (t->hasCapability(TOOL_CAP_SIZE) && this->size != TOOL_SIZE_NONE) {
+        toolHandler->setSize(this->size);
+    }
+    if (t->hasCapability(TOOL_CAP_COLOR)) {
+        toolHandler->setColor(this->color, false);
+    }
+    if (t->hasCapability(TOOL_CAP_LINE_STYLE) && this->strokeType != STROKE_TYPE_NONE) {
+        toolHandler->setLineStyle(strokeTypeToLineStyle(this->strokeType));
+    }
+
+    // No TOOL_CAP_BLA for that
+    if ((this->action == TOOL_PEN || this->action == TOOL_HIGHLIGHTER) &&
+        this->drawingType != DRAWING_TYPE_DONT_CHANGE) {
+        toolHandler->setDrawingType(this->drawingType);
+    }
+    if (this->action == TOOL_ERASER && this->eraserMode != ERASER_TYPE_NONE) {
+        toolHandler->setEraserType(this->eraserMode);
+    }
+}
+
+auto ButtonConfig::applyNoChangeSettings(ToolHandler* toolHandler, Button button) const -> bool {
+    if (this->action == TOOL_NONE) {
+        return false;
+    }
+    Tool const& t = toolHandler->getTool(this->action);
+
+    if (t.hasCapability(TOOL_CAP_SIZE) && this->size == TOOL_SIZE_NONE) {
+        toolHandler->setButtonSize(t.getSize(), button);
+    }
+    if (t.hasCapability(TOOL_CAP_LINE_STYLE) && this->strokeType == STROKE_TYPE_NONE) {
+        toolHandler->setButtonStrokeType(t.getLineStyle(), button);
+    }
+
+    // No TOOL_CAP_BLA for that
+    if ((this->action == TOOL_PEN || this->action == TOOL_HIGHLIGHTER) &&
+        this->drawingType == DRAWING_TYPE_DONT_CHANGE) {
+        toolHandler->setButtonDrawingType(t.getDrawingType(), button);
+    }
+    if (this->action == TOOL_ERASER && this->eraserMode == ERASER_TYPE_NONE) {
+        toolHandler->setButtonEraserType(t.getEraserType(), button);
+    }
+
+    return true;
+}
diff --git a/entry/src/main/cpp/src/core/control/settings/ButtonConfig.h b/entry/src/main/cpp/src/core/control/settings/ButtonConfig.h
new file mode 100644
index 0000000..257d0e2
--- /dev/null
+++ b/entry/src/main/cpp/src/core/control/settings/ButtonConfig.h
@@ -0,0 +1,81 @@
+/*
+ * Xournal++
+ *
+ * Configuration for Mouse Buttons, Eraser and default configuration
+ *
+ * @author Xournal++ Team
+ * https://github.com/xournalpp/xournalpp
+ *
+ * @license GNU GPLv2 or later
+ */
+
+#pragma once
+
+#include <string>  // for string
+
+#include "control/ToolEnums.h"               // for DrawingType, ToolType
+#include "control/settings/SettingsEnums.h"  // for Button
+#include "model/LineStyle.h"
+#include "util/Color.h"                      // for Color
+
+class ToolHandler;
+
+class ButtonConfig {
+public:
+    ButtonConfig(ToolType action, Color color, ToolSize size, DrawingType drawingType, EraserType eraserMode,
+                 StrokeType strokeType = STROKE_TYPE_NONE);
+    virtual ~ButtonConfig();
+
+public:
+    /**
+     * @brief Apply Changes to the button tool in case "Don't Change" was selected for one of it's properties
+     * This is usually used after switching to a button tool from the toolbar tool
+     * Note: In case of the setting "Don't Change" for Size/DrawingType/EraserType the
+     * Size/DrawingType/EraserType of the corresponding tool in the toolbar is used.
+     *
+     * @param toolHandler
+     * @param button button to be applied
+     * @return true if some action was selected
+     * @return false if no action was selected
+     */
+    bool applyNoChangeSettings(ToolHandler* toolHandler, Button button) const;
+
+    /**
+     * @brief Initialize Button tool
+     * In case of "No change" settings the property will remain in it's default value.
+     * As this will be overwritten during `applyNoChangeSettings` this makes sense.
+     *
+     * @param toolHandler
+     * @param button
+     */
+    void initButton(ToolHandler* toolHandler, Button button) const;
+
+    /**
+     * @brief Apply the Config to the toolbar Tool
+     * This is used for applying the Default Button Config
+     *
+     * @param toolHandler
+     */
+    void applyConfigToToolbarTool(ToolHandler* toolHandler) const;
+
+
+    ToolType getAction() const;
+    bool getDisableDrawing() const;
+    DrawingType getDrawingType() const;
+
+private:
+    ToolType action;
+    Color color{};
+    ToolSize size;
+    EraserType eraserMode;
+    DrawingType drawingType;
+    StrokeType strokeType;
+
+    bool disableDrawing;
+
+public:
+    std::string device;
+
+    friend class Settings;
+    friend class ButtonConfigGui;
+};
diff --git a/entry/src/main/cpp/src/core/control/settings/LatexSettings.cpp b/entry/src/main/cpp/src/core/control/settings/LatexSettings.cpp
new file mode 100644
index 0000000..fce065f
--- /dev/null
+++ b/entry/src/main/cpp/src/core/control/settings/LatexSettings.cpp
@@ -0,0 +1 @@
+#include "LatexSettings.h"
diff --git a/entry/src/main/cpp/src/core/control/settings/LatexSettings.h b/entry/src/main/cpp/src/core/control/settings/LatexSettings.h
new file mode 100644
index 0000000..30ebfcf
--- /dev/null
+++ b/entry/src/main/cpp/src/core/control/settings/LatexSettings.h
@@ -0,0 +1,51 @@
+/*
+ * Xournal++
+ *
+ * Latex settings
+ *
+ * @author Xournal++ Team
+ * https://github.com/xournalpp/xournalpp
+ *
+ * @license GNU GPLv2 or later
+ */
+
+#pragma once
+
+#include <string>
+
+#include "model/Font.h"
+#include "filesystem.h"
+
+class LatexSettings {
+public:
+    bool autoCheckDependencies{true};
+    std::string defaultText{"x^2"};
+    fs::path globalTemplatePath{};
+#ifdef __APPLE__
+    std::string genCmd{"/Library/TeX/texbin/pdflatex -halt-on-error -interaction=nonstopmode '{}'"};
+#else
+    std::string genCmd{"pdflatex -halt-on-error -interaction=nonstopmode '{}'"};
+#endif
+
+    /**
+     * LaTeX editor theme. Only used if linked with the GtkSourceView
+     * library.
+     */
+    std::string sourceViewThemeId{};
+    bool sourceViewAutoIndent{true};
+    bool sourceViewSyntaxHighlight{true};
+    bool sourceViewShowLineNumbers{false};
+
+    /**
+     * Font to be used by the editor.
+     */
+    XojFont editorFont{"Monospace", 12};
+    bool useCustomEditorFont{false};
+
+    bool editorWordWrap{true};
+
+    bool useExternalEditor{false};
+    bool externalEditorAutoConfirm{false};
+    std::string externalEditorCmd{};
+    std::string temporaryFileExt{"tex"};
+};
diff --git a/entry/src/main/cpp/src/core/control/settings/MetadataManager.cpp b/entry/src/main/cpp/src/core/control/settings/MetadataManager.cpp
new file mode 100644
index 0000000..d302e0c
--- /dev/null
+++ b/entry/src/main/cpp/src/core/control/settings/MetadataManager.cpp
@@ -0,0 +1,239 @@
+#include "MetadataManager.h"
+
+#include <algorithm>  // for sort
+#include <cstdlib>    // for strtoll, strtod
+#include <fstream>    // for operator<<, basic_ostream, basic_stringb...
+#include <memory>     // for allocator_traits<>::value_type
+#include <sstream>    // for istringstream
+#include <string>     // for char_traits, string, getline, operator!=
+
+#include <glib.h>  // for g_get_real_time, g_message, g_warning, gint64
+
+#include "util/PathUtil.h"   // for getConfigSubfolder, getStateSubfolder
+#include "util/StringUtils.h"
+#include "util/XojMsgBox.h"  // for XojMsgBox
+#include "util/serdesstream.h"
+#include "util/utf8_view.h"
+
+/**
+ * Get directory to store metadata files to
+ */
+static fs::path getMetadataDirectory() { return Util::getStateSubfolder("metadata"); }
+
+/**
+ * Migrate metadata directory from legacy location
+ */
+static void migrateMetadataDirectory() {
+    // do not pass "metadata" to getConfigSubfolder() to avoid creating directory if it doesn't exist
+    auto legacyDir = Util::getConfigSubfolder() / "metadata";
+
+    if (!fs::is_directory(legacyDir)) {
+        // nothing to do
+        return;
+    }
+
+    // move all files to the new directory
+    auto newDir = getMetadataDirectory();
+
+    if (fs::equivalent(legacyDir, newDir)) {  // Happens on Windows by default
+        // nothing to do
+        return;
+    }
+
+    for (auto const& e: fs::directory_iterator(legacyDir)) {
+        auto newPath = newDir / e.path().filename();
+        Util::safeRenameFile(e, newPath);
+    }
+
+    // remove legacy directory
+    try {
+        fs::remove(legacyDir);
+    } catch (const fs::filesystem_error&) {
+        g_warning("Could not delete legacy metadata directory %s", char_cast(legacyDir.u8string().c_str()));
+    }
+
+    g_message("Migrated metadata directory from %s to %s", char_cast(legacyDir.u8string().c_str()),
+              char_cast(newDir.u8string().c_str()));
+}
+
+MetadataEntry::MetadataEntry(): zoom(1), page(0), time(0) {}
+
+MetadataManager::~MetadataManager() { documentChanged(); }
+
+/**
+ * Delete an old metadata file
+ */
+void MetadataManager::deleteMetadataFile(fs::path const& path) {
+    // be careful, delete the Metadata file, NOT the Document!
+    if (path.extension() != ".metadata") {
+        g_warning("Try to delete non-metadata file: %s", char_cast(path.u8string().c_str()));
+        return;
+    }
+
+    try {
+        fs::remove(path);
+    } catch (const fs::filesystem_error&) {
+        g_warning("Could not delete metadata file %s", char_cast(path.u8string().c_str()));
+    }
+}
+
+/**
+ * Document was closed, a new document was opened etc.
+ */
+void MetadataManager::documentChanged() {
+    // take ownership of metadata
+    this->mutex.lock();
+    auto m = std::move(this->metadata);
+    this->mutex.unlock();
+
+    if (m == nullptr) {
+        return;
+    }
+
+    storeMetadata(*m);
+}
+
+auto sortMetadata(MetadataEntry& a, MetadataEntry& b) -> bool { return a.time > b.time; }
+
+/**
+ * Load the metadata list (sorted)
+ */
+auto MetadataManager::loadList() -> std::vector<MetadataEntry> {
+    migrateMetadataDirectory();
+    auto folder = getMetadataDirectory();
+
+    std::vector<MetadataEntry> data;
+    try {
+        for (auto const& f: fs::directory_iterator(folder)) {
+            auto path = folder / f;
+
+            auto entry = loadMetadataFile(path);
+
+            if (entry) {
+                data.emplace_back(std::move(*entry));
+            } else {
+                // Invalid metadata file
+                deleteMetadataFile(path);
+            }
+        }
+    } catch (const fs::filesystem_error& e) {
+        XojMsgBox::showErrorToUser(nullptr, e.what());
+        return data;
+    }
+
+    std::sort(data.begin(), data.end(), sortMetadata);
+
+    return data;
+}
+
+/**
+ * Parse a single metadata file
+ */
+auto MetadataManager::loadMetadataFile(fs::path const& path) -> std::optional<MetadataEntry> {
+    MetadataEntry entry;
+    entry.metadataFile = path;
+
+    std::string line;
+    std::ifstream infile(path);
+
+    auto time = path.stem().string();
+    entry.time = strtoll(time.c_str(), nullptr, 10);
+
+    if (!getline(infile, line) || line != "XOJ-METADATA/1.0") {
+        // Not valid
+        return std::nullopt;
+    }
+
+    if (!getline(infile, line)) {
+        // Not valid
+        return std::nullopt;
+    }
+    std::istringstream iss(line);
+    std::string p;
+    iss >> std::quoted(p);
+    entry.path = fs::path(xoj::util::utf8(p));
+
+    if (!getline(infile, line) || line.length() < 6 || line.substr(0, 5) != "page=") {
+        // Not valid
+        return std::nullopt;
+    }
+    entry.page = static_cast<int>(strtoll(line.substr(5).c_str(), nullptr, 10));
+
+    if (!getline(infile, line) || line.length() < 6 || line.substr(0, 5) != "zoom=") {
+        // Not valid
+        return std::nullopt;
+    }
+    entry.zoom = strtod(line.substr(5).c_str(), nullptr);
+
+    return entry;
+}
+
+/**
+ * Get the metadata for a file
+ */
+auto MetadataManager::getForFile(fs::path const& file) -> std::optional<MetadataEntry> {
+    std::vector<MetadataEntry> files = loadList();
+
+    std::optional<MetadataEntry> entry = std::nullopt;
+    for (const MetadataEntry& e: files) {
+        if (e.path == file) {
+            entry = e;
+            break;
+        }
+    }
+
+    for (size_t i = 20; i < files.size(); i++) {
+        auto path = files[i].metadataFile;
+        deleteMetadataFile(path);
+    }
+
+    return entry;
+}
+
+/**
+ * Store metadata to file
+ */
+void MetadataManager::storeMetadata(const MetadataEntry& m) {
+    std::vector<MetadataEntry> files = loadList();
+    for (const MetadataEntry& e: files) {
+        if (e.path == m.path) {
+            // This is an old entry with the same path
+            deleteMetadataFile(e.metadataFile);
+        }
+    }
+
+    auto path = getMetadataDirectory();
+    gint64 time = g_get_real_time();
+    path /= std::to_string(time);
+    path += ".metadata";
+    writeMetadataToFile(m, path);
+}
+
+void MetadataManager::writeMetadataToFile(const MetadataEntry& m, const fs::path& path) {
+    auto out = serdes_stream<std::ofstream>(path);
+    out << "XOJ-METADATA/1.0\n";
+    out << std::quoted(char_cast(m.path.u8string())) << "\n";
+    out << "page=" << m.page << "\n";
+    out << "zoom=" << m.zoom << "\n";
+    out.close();
+}
+
+/**
+ * Store the current data into metadata
+ */
+void MetadataManager::storeMetadata(fs::path const& file, int page, double zoom) {
+    if (file.empty()) {
+        return;
+    }
+
+    this->mutex.lock();
+    if (metadata == nullptr) {
+        metadata = std::make_unique<MetadataEntry>();
+    }
+
+    metadata->path = file;
+    metadata->zoom = zoom;
+    metadata->page = page;
+    metadata->time = g_get_real_time();
+    this->mutex.unlock();
+}
diff --git a/entry/src/main/cpp/src/core/control/settings/MetadataManager.h b/entry/src/main/cpp/src/core/control/settings/MetadataManager.h
new file mode 100644
index 0000000..a1fb086
--- /dev/null
+++ b/entry/src/main/cpp/src/core/control/settings/MetadataManager.h
@@ -0,0 +1,86 @@
+/*
+ * Xournal++
+ *
+ * Last opened files with all settings
+ *
+ * @author Xournal++ Team
+ * https://github.com/xournalpp/xournalpp
+ *
+ * @license GNU GPLv2 or later
+ */
+
+#pragma once
+
+#include <mutex>  // for mutex
+#include <optional>
+#include <vector>  // for vector
+
+#include <glib.h>  // for gint64
+
+#include "filesystem.h"  // for path
+
+
+class MetadataEntry {
+public:
+    MetadataEntry();
+
+public:
+    fs::path metadataFile;
+    fs::path path;
+    double zoom;
+    int page;
+    gint64 time;
+};
+
+class MetadataManager {
+public:
+    MetadataManager() = default;
+    virtual ~MetadataManager();
+
+public:
+    /**
+     * Get the metadata for a file
+     */
+    static std::optional<MetadataEntry> getForFile(fs::path const& file);
+
+    /**
+     * Store the current data into metadata
+     */
+    void storeMetadata(fs::path const& file, int page, double zoom);
+
+    /**
+     * Document was closed, a new document was opened etc.
+     */
+    void documentChanged();
+
+private:
+    /**
+     * Delete an old metadata file
+     */
+    static void deleteMetadataFile(fs::path const& path);
+
+    /**
+     * Parse a single metadata file
+     */
+    static std::optional<MetadataEntry> loadMetadataFile(fs::path const& path);
+
+    /**
+     * Store metadata to file
+     */
+    static void storeMetadata(const MetadataEntry& m);
+
+    static void writeMetadataToFile(const MetadataEntry& m, const fs::path& file);
+
+private:
+    /**
+     * Load the metadata list (sorted)
+     */
+    static std::vector<MetadataEntry> loadList();
+
+private:
+    std::mutex mutex;
+    std::unique_ptr<MetadataEntry> metadata;
+
+    friend class Metadata_testRead_Test;
+    friend class Metadata_testWriteReadCycle_Test;
+};
diff --git a/entry/src/main/cpp/src/core/control/settings/PageTemplateSettings.cpp b/entry/src/main/cpp/src/core/control/settings/PageTemplateSettings.cpp
new file mode 100644
index 0000000..e50150d
--- /dev/null
+++ b/entry/src/main/cpp/src/core/control/settings/PageTemplateSettings.cpp
@@ -0,0 +1,119 @@
+#include "PageTemplateSettings.h"
+
+#include <sstream>  // for basic_istream, strings...
+
+#include "control/pagetype/PageTypeHandler.h"  // for PageTypeHandler
+
+using std::string;
+using std::stringstream;
+
+PageTemplateSettings::PageTemplateSettings():
+        copyLastPageSettings(true),
+        copyLastPageSize(false),
+        pageWidth(595.275591),
+        pageHeight(841.889764),
+        backgroundColor(Colors::white) {
+    backgroundType.format = PageTypeFormat::Lined;
+}
+
+PageTemplateSettings::~PageTemplateSettings() = default;
+
+auto PageTemplateSettings::isCopyLastPageSettings() const -> bool { return this->copyLastPageSettings; }
+
+void PageTemplateSettings::setCopyLastPageSettings(bool copyLastPageSettings) {
+    this->copyLastPageSettings = copyLastPageSettings;
+}
+
+auto PageTemplateSettings::isCopyLastPageSize() const -> bool { return this->copyLastPageSize; }
+
+void PageTemplateSettings::setCopyLastPageSize(bool copyLastPageSize) { this->copyLastPageSize = copyLastPageSize; }
+
+auto PageTemplateSettings::getPageWidth() const -> double { return this->pageWidth; }
+
+void PageTemplateSettings::setPageWidth(double pageWidth) { this->pageWidth = pageWidth; }
+
+auto PageTemplateSettings::getPageHeight() const -> double { return this->pageHeight; }
+
+void PageTemplateSettings::setPageHeight(double pageHeight) { this->pageHeight = pageHeight; }
+
+auto PageTemplateSettings::getBackgroundColor() const -> Color { return this->backgroundColor; }
+
+void PageTemplateSettings::setBackgroundColor(Color backgroundColor) { this->backgroundColor = backgroundColor; }
+
+auto PageTemplateSettings::getBackgroundType() -> PageType { return backgroundType; }
+
+auto PageTemplateSettings::getPageInsertType() -> std::optional<PageType> {
+    if (copyLastPageSettings) {
+        return std::nullopt;
+    }
+
+    return backgroundType;
+}
+
+void PageTemplateSettings::setBackgroundType(const PageType& backgroundType) { this->backgroundType = backgroundType; }
+
+/**
+ * Parse a template string
+ *
+ * @return true if valid
+ */
+auto PageTemplateSettings::parse(const std::string& tpl) -> bool {
+    stringstream ss(tpl);
+    string line;
+
+    if (!std::getline(ss, line, '\n')) {
+        return false;
+    }
+
+    if (line != "xoj/template") {
+        return false;
+    }
+
+    while (std::getline(ss, line, '\n')) {
+        size_t pos = line.find('=');
+        if (pos == string::npos) {
+            continue;
+        }
+
+        string key = line.substr(0, pos);
+        string value = line.substr(pos + 1);
+
+        if (key == "copyLastPageSettings") {
+            copyLastPageSettings = value == "true";
+        } else if (key == "copyLastPageSize") {
+            copyLastPageSize = value == "true";
+        } else if (key == "size") {
+            pos = value.find('x');
+            pageWidth = std::stod(value.substr(0, pos));
+            pageHeight = std::stod(value.substr(pos + 1));
+        } else if (key == "backgroundColor") {
+            backgroundColor = Color(static_cast<uint32_t>(std::stoul(value.substr(1), nullptr, 16)));
+        } else if (key == "backgroundType") {
+            this->backgroundType.format = PageTypeHandler::getPageTypeFormatForString(value);
+        } else if (key == "backgroundTypeConfig") {
+            this->backgroundType.config = value;
+        }
+    }
+
+    return true;
+}
+
+/**
+ * Convert to a parsable string
+ */
+auto PageTemplateSettings::toString() const -> string {
+    string str = "xoj/template\n";
+
+    str += string("copyLastPageSize=") + (copyLastPageSize ? "true" : "false") + "\n";
+    str += string("copyLastPageSettings=") + (copyLastPageSettings ? "true" : "false") + "\n";
+    str += string("size=") + std::to_string(pageWidth) + "x" + std::to_string(pageHeight) + "\n";
+    str += string("backgroundType=") + PageTypeHandler::getStringForPageTypeFormat(backgroundType.format) + "\n";
+
+    if (!backgroundType.config.empty()) {
+        str += string("backgroundTypeConfig=") + backgroundType.config + "\n";
+    }
+
+    str += string("backgroundColor=") + Util::rgb_to_hex_string(this->backgroundColor) + "\n";
+
+    return str;
+}
diff --git a/entry/src/main/cpp/src/core/control/settings/PageTemplateSettings.h b/entry/src/main/cpp/src/core/control/settings/PageTemplateSettings.h
new file mode 100644
index 0000000..bd63121
--- /dev/null
+++ b/entry/src/main/cpp/src/core/control/settings/PageTemplateSettings.h
@@ -0,0 +1,81 @@
+/*
+ * Xournal++
+ *
+ * Page template settings handler
+ *
+ * @author Xournal++ Team
+ * https://github.com/xournalpp/xournalpp
+ *
+ * @license GNU GPLv2 or later
+ */
+
+#pragma once
+
+#include <optional>
+#include <string>  // for string
+
+#include "model/PageType.h"  // for PageType
+#include "util/Color.h"      // for Color
+
+
+class PageTemplateSettings {
+public:
+    PageTemplateSettings();
+    virtual ~PageTemplateSettings();
+
+public:
+    /**
+     * Parse a template string
+     *
+     * @return true if valid
+     */
+    bool parse(const std::string& tpl);
+
+    /**
+     * Convert to a parsable string
+     */
+    std::string toString() const;
+
+    bool isCopyLastPageSettings() const;
+    void setCopyLastPageSettings(bool copyLastPageSettings);
+
+    bool isCopyLastPageSize() const;
+    void setCopyLastPageSize(bool copyLastPageSize);
+
+    double getPageWidth() const;
+    void setPageWidth(double pageWidth);
+
+    double getPageHeight() const;
+    void setPageHeight(double pageHeight);
+
+    Color getBackgroundColor() const;
+    void setBackgroundColor(Color backgroundColor);
+
+    PageType getBackgroundType();
+    std::optional<PageType> getPageInsertType();
+    void setBackgroundType(const PageType& backgroundType);
+
+private:
+    /**
+     * Copy the settings from the last page
+     */
+    bool copyLastPageSettings;
+
+    /**
+     * Copy the last page size
+     */
+    bool copyLastPageSize;
+
+    double pageWidth;
+    double pageHeight;
+
+    /**
+     * Background color in RGB
+     */
+    Color backgroundColor;
+
+    /**
+     * Background type
+     */
+    PageType backgroundType;
+};
diff --git a/entry/src/main/cpp/src/core/control/settings/RecolorParameters.h b/entry/src/main/cpp/src/core/control/settings/RecolorParameters.h
new file mode 100644
index 0000000..cf89aba
--- /dev/null
+++ b/entry/src/main/cpp/src/core/control/settings/RecolorParameters.h
@@ -0,0 +1,16 @@
+#pragma once
+
+#include "util/Recolor.h"
+
+struct RecolorParameters {
+    bool recolorizeMainView = false;
+    bool recolorizeSidebarMiniatures = false;
+    Recolor recolor;
+
+    bool operator==(const RecolorParameters& other) const {
+        return recolorizeMainView == other.recolorizeMainView &&
+               recolorizeSidebarMiniatures == other.recolorizeSidebarMiniatures && recolor == other.recolor;
+    }
+
+    bool operator!=(const RecolorParameters& other) const { return !(*this == other); }
+};
diff --git a/entry/src/main/cpp/src/core/control/settings/Settings.cpp b/entry/src/main/cpp/src/core/control/settings/Settings.cpp
new file mode 100644
index 0000000..f700ee2
--- /dev/null
+++ b/entry/src/main/cpp/src/core/control/settings/Settings.cpp
@@ -0,0 +1,2697 @@
+#include "Settings.h"
+
+#include <algorithm>    // for max
+#include <cstdint>      // for uint32_t, int32_t
+#include <cstdio>       // for sscanf, size_t
+#include <cstdlib>      // for atoi
+#include <cstring>      // for strcmp
+#include <exception>    // for exception
+#include <type_traits>  // for add_const<>::type
+#include <utility>      // for pair, move, make_...
+
+#include <libxml/globals.h>    // for xmlFree, xmlInden...
+#include <libxml/parser.h>     // for xmlKeepBlanksDefault
+#include <libxml/xmlstring.h>  // for xmlStrcmp, xmlChar
+
+#include "control/DeviceListHelper.h"               // for InputDevice
+#include "control/ToolEnums.h"                      // for ERASER_TYPE_NONE
+#include "control/settings/LatexSettings.h"         // for LatexSettings
+#include "control/settings/PageTemplateSettings.h"  // for PageTemplateSettings
+#include "control/settings/SettingsEnums.h"         // for InputDeviceTypeOp...
+#include "gui/toolbarMenubar/model/ColorPalette.h"  // for Palette
+#include "model/FormatDefinitions.h"                // for FormatUnits, XOJ_...
+#include "util/Color.h"
+#include "util/PathUtil.h"  // for getConfigFile
+#include "util/Util.h"      // for PRECISION_FORMAT_...
+#include "util/i18n.h"      // for _
+#include "util/safe_casts.h"  // for as_unsigned
+#include "util/utf8_view.h"   // for utf8_view
+
+#include "ButtonConfig.h"  // for ButtonConfig
+#include "config-dev.h"    // for PALETTE_FILE
+#include "config-dev.h"
+#include "filesystem.h"  // for path, exists
+
+
+using std::string;
+
+constexpr auto const* DEFAULT_FONT = "Sans";
+constexpr auto DEFAULT_FONT_SIZE = 12;
+constexpr auto DEFAULT_TOOLBAR = "Portrait";
+
+#define SAVE_BOOL_PROP(var) xmlNode = saveProperty((const char*)#var, (var) ? "true" : "false", root)
+#define SAVE_STRING_PROP(var) xmlNode = saveProperty((const char*)#var, (var).empty() ? "" : (var).data(), root)
+#define SAVE_FONT_PROP(var) xmlNode = saveProperty((const char*)#var, var.asString().c_str(), root)
+#define SAVE_INT_PROP(var) xmlNode = saveProperty((const char*)#var, var, root)
+#define SAVE_UINT_PROP(var) xmlNode = savePropertyUnsigned((const char*)#var, var, root)
+#define SAVE_DOUBLE_PROP(var) xmlNode = savePropertyDouble((const char*)#var, var, root)
+#define ATTACH_COMMENT(var)                     \
+    com = xmlNewComment((const xmlChar*)(var)); \
+    xmlAddPrevSibling(xmlNode, com);
+
+Settings::Settings(fs::path filepath): filepath(std::move(filepath)) { loadDefault(); }
+
+Settings::~Settings() = default;
+
+void Settings::loadDefault() {
+    this->pressureSensitivity = true;
+    this->minimumPressure = 0.05;
+    this->pressureMultiplier = 1.0;
+    this->pressureGuessing = false;
+    this->zoomGesturesEnabled = true;
+
+    this->maximized = false;
+    this->showPairedPages = false;
+    this->presentationMode = false;
+
+    this->numColumns = 1;  // only one of these applies at a time
+    this->numRows = 1;
+    this->viewFixedRows = false;
+
+    this->layoutVertical = false;
+    this->layoutRightToLeft = false;
+    this->layoutBottomToTop = false;
+
+    this->numPairsOffset = 1;
+
+    this->emptyLastPageAppend = EmptyLastPageAppendType::Disabled;
+
+    this->edgePanSpeed = 20.0;
+    this->edgePanMaxMult = 5.0;
+
+    this->zoomStep = 10.0;
+    this->zoomStepScroll = 2.0;
+
+    this->displayDpi = -1;  // Automatic detection
+
+    this->font.setName(DEFAULT_FONT);
+    this->font.setSize(DEFAULT_FONT_SIZE);
+
+    this->mainWndWidth = 800;
+    this->mainWndHeight = 600;
+
+    this->fullscreenActive = false;
+
+    this->showSidebar = true;
+    this->sidebarWidth = 150;
+    this->sidebarNumberingStyle = SidebarNumberingStyle::DEFAULT;
+
+    this->showToolbar = true;
+    this->selectedToolbar = DEFAULT_TOOLBAR;
+
+    this->sidebarOnRight = false;
+
+    this->scrollbarOnLeft = false;
+
+    this->menubarVisible = true;
+
+    this->autoloadMostRecent = false;
+    this->autoloadPdfXoj = true;
+
+    this->stylusCursorType = STYLUS_CURSOR_DOT;
+    this->eraserVisibility = ERASER_VISIBILITY_ALWAYS;
+    this->iconTheme = ICON_THEME_COLOR;
+    this->themeVariant = THEME_VARIANT_USE_SYSTEM;
+    this->highlightPosition = false;
+    this->cursorHighlightColor = 0x80FFFF00;  // Yellow with 50% opacity
+    this->cursorHighlightRadius = 30.0;
+    this->cursorHighlightBorderColor = 0x800000FF;  // Blue with 50% opacity
+    this->cursorHighlightBorderWidth = 0.0;
+    this->useStockIcons = false;
+    this->scrollbarHideType = SCROLLBAR_HIDE_NONE;
+    this->disableScrollbarFadeout = false;
+    this->disableAudio = false;
+
+    // Set this for autosave frequency in minutes.
+    this->autosaveTimeout = 3;
+    this->autosaveEnabled = true;
+
+    this->addHorizontalSpace = false;
+    this->addHorizontalSpaceAmountRight = 150;
+    this->addHorizontalSpaceAmountLeft = 150;
+    this->addVerticalSpace = false;
+    this->addVerticalSpaceAmountAbove = 150;
+    this->addVerticalSpaceAmountBelow = 150;
+
+    this->unlimitedScrolling = false;
+
+    // Drawing direction emulates modifier keys
+    this->drawDirModsRadius = 50;
+    this->drawDirModsEnabled = false;
+
+    this->snapRotation = true;
+    this->snapRotationTolerance = 0.30;
+
+    this->snapGrid = true;
+    this->snapGridTolerance = 0.50;
+    this->snapGridSize = DEFAULT_GRID_SIZE;
+
+    this->strokeRecognizerMinSize = 40;
+
+    this->touchDrawing = false;
+    this->gtkTouchInertialScrolling = true;
+
+    this->defaultSaveName = xoj::util::utf8(_("%F-Note-%H-%M")).str();
+    this->defaultPdfExportName = xoj::util::utf8(_("%{name}_annotated")).str();
+
+    // Eraser
+    this->buttonConfig[BUTTON_ERASER] = std::make_unique<ButtonConfig>(TOOL_ERASER, Colors::black, TOOL_SIZE_NONE,
+                                                                       DRAWING_TYPE_DEFAULT, ERASER_TYPE_NONE);
+    // Left button
+    this->buttonConfig[BUTTON_MOUSE_LEFT] = std::make_unique<ButtonConfig>(TOOL_NONE, Colors::black, TOOL_SIZE_NONE,
+                                                                           DRAWING_TYPE_DEFAULT, ERASER_TYPE_NONE);
+    // Middle button
+    this->buttonConfig[BUTTON_MOUSE_MIDDLE] = std::make_unique<ButtonConfig>(TOOL_HAND, Colors::black, TOOL_SIZE_NONE,
+                                                                             DRAWING_TYPE_DEFAULT, ERASER_TYPE_NONE);
+    // Right button
+    this->buttonConfig[BUTTON_MOUSE_RIGHT] = std::make_unique<ButtonConfig>(TOOL_NONE, Colors::black, TOOL_SIZE_NONE,
+                                                                            DRAWING_TYPE_DEFAULT, ERASER_TYPE_NONE);
+    // Touch
+    this->buttonConfig[BUTTON_TOUCH] = std::make_unique<ButtonConfig>(TOOL_NONE, Colors::black, TOOL_SIZE_NONE,
+                                                                      DRAWING_TYPE_DEFAULT, ERASER_TYPE_NONE);
+    // Default config
+    this->buttonConfig[BUTTON_DEFAULT] = std::make_unique<ButtonConfig>(TOOL_PEN, Colors::black, TOOL_SIZE_FINE,
+                                                                        DRAWING_TYPE_DEFAULT, ERASER_TYPE_NONE);
+    // Pen button 1
+    this->buttonConfig[BUTTON_STYLUS_ONE] = std::make_unique<ButtonConfig>(TOOL_NONE, Colors::black, TOOL_SIZE_NONE,
+                                                                           DRAWING_TYPE_DEFAULT, ERASER_TYPE_NONE);
+    // Pen button 2
+    this->buttonConfig[BUTTON_STYLUS_TWO] = std::make_unique<ButtonConfig>(TOOL_NONE, Colors::black, TOOL_SIZE_NONE,
+                                                                           DRAWING_TYPE_DEFAULT, ERASER_TYPE_NONE);
+
+    // default view modes
+    this->activeViewMode = PresetViewModeIds::VIEW_MODE_DEFAULT;
+    this->viewModes =
+            std::vector<ViewMode>{VIEW_MODE_STRUCT_DEFAULT, VIEW_MODE_STRUCT_FULLSCREEN, VIEW_MODE_STRUCT_PRESENTATION};
+
+    this->touchZoomStartThreshold = 0.0;
+
+    this->pageRerenderThreshold = 5.0;
+    this->pdfPageCacheSize = 10;
+    this->preloadPagesBefore = 3U;
+    this->preloadPagesAfter = 5U;
+    this->eagerPageCleanup = true;
+
+    this->selectionBorderColor = Colors::red;
+    this->selectionMarkerColor = Colors::xopp_cornflowerblue;
+    this->activeSelectionColor = Colors::lawngreen;
+
+    this->recolorParameters = {false, false, Recolor(ColorU8{198, 208, 245}, ColorU8{48, 52, 70})};
+
+    this->backgroundColor = Colors::xopp_gainsboro02;
+
+    // clang-format off
+	this->pageTemplate = "xoj/template\ncopyLastPageSettings=true\nsize=595.275591x841.889764\nbackgroundType=lined\nbackgroundColor=#ffffff\n";
+    // clang-format on
+
+#ifdef ENABLE_AUDIO
+    this->audioSampleRate = 44100.0;
+    this->audioInputDevice = AUDIO_INPUT_SYSTEM_DEFAULT;
+    this->audioOutputDevice = AUDIO_OUTPUT_SYSTEM_DEFAULT;
+    this->audioGain = 1.0;
+    this->defaultSeekTime = 5;
+#endif
+
+    this->pluginEnabled = "";
+    this->pluginDisabled = "";
+
+    this->numIgnoredStylusEvents = 0;
+
+#ifdef _WIN32
+    // This option should be on on Windows:
+    // GTK (at least until 3.24.49) only creates GDK_BUTTON_PRESS events on mouse-events or stylus-down-events
+    this->inputSystemTPCButton = true;
+#else
+    this->inputSystemTPCButton = false;
+#endif
+
+    this->inputSystemDrawOutsideWindow = true;
+
+    this->strokeFilterIgnoreTime = 150;
+    this->strokeFilterIgnoreLength = 1;
+    this->strokeFilterSuccessiveTime = 500;
+    this->strokeFilterEnabled = false;
+    this->doActionOnStrokeFiltered = false;
+    this->trySelectOnStrokeFiltered = false;
+
+    this->snapRecognizedShapesEnabled = false;
+    this->restoreLineWidthEnabled = false;
+
+    this->inTransaction = false;
+
+    /**
+     * Stabilizer related settings
+     */
+    this->stabilizerAveragingMethod = StrokeStabilizer::AveragingMethod::NONE;
+    this->stabilizerPreprocessor = StrokeStabilizer::Preprocessor::NONE;
+    this->stabilizerBuffersize = 20;
+    this->stabilizerSigma = 0.5;
+    this->stabilizerDeadzoneRadius = 1.3;
+    this->stabilizerCuspDetection = true;
+    this->stabilizerDrag = 0.4;
+    this->stabilizerMass = 5.0;
+    this->stabilizerFinalizeStroke = true;
+    /**/
+
+    this->useSpacesForTab = false;
+    this->numberOfSpacesForTab = 4;
+
+    this->laserPointerFadeOutTime = 500;
+
+    this->colorPaletteSetting = Util::getBuiltInPaletteDirectoryPath() / DEFAULT_PALETTE_FILE;
+}
+
+auto Settings::loadViewMode(ViewModeId mode) -> bool {
+    if (mode < 0 || mode >= viewModes.size()) {
+        return false;
+    }
+    auto viewMode = viewModes.at(mode);
+    fullscreenActive = viewMode.goFullscreen;
+    menubarVisible = viewMode.showMenubar;
+    showToolbar = viewMode.showToolbar;
+    showSidebar = viewMode.showSidebar;
+    this->activeViewMode = mode;
+    return true;
+}
+
+auto Settings::getViewModes() const -> const std::vector<ViewMode>& { return this->viewModes; }
+
+auto Settings::getActiveViewMode() const -> ViewModeId { return this->activeViewMode; }
+
+/**
+ * tempg_ascii_strtod
+ * 	Transition to using g_ascii_strtod to minimize disruption. May, 2019.
+ *  Delete this and replace calls to this function with calls to g_ascii_strtod() in 2020.
+ * 	See: https://developer.gnome.org/glib/stable/glib-String-Utility-Functions.html#g-strtod
+ */
+auto tempg_ascii_strtod(const gchar* txt, gchar** endptr) -> double {
+    return g_strtod(txt,
+                    endptr);  //  makes best guess between locale formatted and C formatted numbers. See link above.
+}
+
+
+void Settings::parseData(xmlNodePtr cur, SElement& elem) {
+    for (xmlNodePtr x = cur->children; x != nullptr; x = x->next) {
+        if (!xmlStrcmp(x->name, reinterpret_cast<const xmlChar*>("data"))) {
+            xmlChar* name = xmlGetProp(x, reinterpret_cast<const xmlChar*>("name"));
+            parseData(x, elem.child(reinterpret_cast<const char*>(name)));
+            xmlFree(name);
+        } else if (!xmlStrcmp(x->name, reinterpret_cast<const xmlChar*>("attribute"))) {
+            xmlChar* name = xmlGetProp(x, reinterpret_cast<const xmlChar*>("name"));
+            xmlChar* value = xmlGetProp(x, reinterpret_cast<const xmlChar*>("value"));
+            xmlChar* type = xmlGetProp(x, reinterpret_cast<const xmlChar*>("type"));
+
+            string sType = reinterpret_cast<const char*>(type);
+
+            if (sType == "int") {
+                int i = atoi(reinterpret_cast<const char*>(value));
+                elem.setInt(reinterpret_cast<const char*>(name), i);
+            } else if (sType == "double") {
+                double d = tempg_ascii_strtod(reinterpret_cast<const char*>(value),
+                                              nullptr);  // g_ascii_strtod ignores locale setting.
+                elem.setDouble(reinterpret_cast<const char*>(name), d);
+            } else if (sType == "hex") {
+                int i = 0;
+                if (sscanf(reinterpret_cast<const char*>(value), "%x", &i)) {
+                    elem.setIntHex(reinterpret_cast<const char*>(name), i);
+                } else {
+                    g_warning("Settings::Unknown hex value: %s:%s\n", name, value);
+                }
+            } else if (sType == "string") {
+                elem.setString(reinterpret_cast<const char*>(name), reinterpret_cast<const char*>(value));
+            } else if (sType == "boolean") {
+                elem.setBool(reinterpret_cast<const char*>(name),
+                             strcmp(reinterpret_cast<const char*>(value), "true") == 0);
+            } else {
+                g_warning("Settings::Unknown datatype: %s\n", sType.c_str());
+            }
+
+            xmlFree(name);
+            xmlFree(type);
+            xmlFree(value);
+        } else {
+            g_warning("Settings::parseData: Unknown XML node: %s\n", x->name);
+            continue;
+        }
+    }
+}
+
+void Settings::parseItem(xmlDocPtr doc, xmlNodePtr cur) {
+    // Parse data map
+    if (!xmlStrcmp(cur->name, reinterpret_cast<const xmlChar*>("data"))) {
+        xmlChar* name = xmlGetProp(cur, reinterpret_cast<const xmlChar*>("name"));
+        if (name == nullptr) {
+            g_warning("Settings::%s:No name property!\n", cur->name);
+            return;
+        }
+
+        parseData(cur, data[reinterpret_cast<const char*>(name)]);
+
+        xmlFree(name);
+        return;
+    }
+
+    if (cur->type == XML_COMMENT_NODE) {
+        return;
+    }
+
+    if (xmlStrcmp(cur->name, reinterpret_cast<const xmlChar*>("property"))) {
+        g_warning("Settings::Unknown XML node: %s\n", cur->name);
+        return;
+    }
+
+    xmlChar* name = xmlGetProp(cur, reinterpret_cast<const xmlChar*>("name"));
+    if (name == nullptr) {
+        g_warning("Settings::%s:No name property!\n", cur->name);
+        return;
+    }
+
+    if (xmlStrcmp(name, reinterpret_cast<const xmlChar*>("font")) == 0) {
+        xmlFree(name);
+        xmlChar* font = nullptr;
+        xmlChar* size = nullptr;
+
+        font = xmlGetProp(cur, reinterpret_cast<const xmlChar*>("font"));
+        if (font) {
+            this->font.setName(reinterpret_cast<const char*>(font));
+            xmlFree(font);
+        }
+
+        size = xmlGetProp(cur, reinterpret_cast<const xmlChar*>("size"));
+        if (size) {
+            double dSize = DEFAULT_FONT_SIZE;
+            if (sscanf(reinterpret_cast<const char*>(size), "%lf", &dSize) == 1) {
+                this->font.setSize(dSize);
+            }
+            xmlFree(size);
+        }
+        return;
+    }
+
+    xmlChar* value = xmlGetProp(cur, reinterpret_cast<const xmlChar*>("value"));
+    if (value == nullptr) {
+        xmlFree(name);
+        g_warning("Settings::No value property!\n");
+        return;
+    }
+
+    // TODO(fabian): remove this typo fix in 2-3 release cycles
+    if (xmlStrcmp(name, reinterpret_cast<const xmlChar*>("presureSensitivity")) == 0) {
+        this->pressureSensitivity = xmlStrcmp(value, reinterpret_cast<const xmlChar*>("true")) == 0;
+    }
+    if (xmlStrcmp(name, reinterpret_cast<const xmlChar*>("pressureSensitivity")) == 0) {
+        this->pressureSensitivity = xmlStrcmp(value, reinterpret_cast<const xmlChar*>("true")) == 0;
+    } else if (xmlStrcmp(name, reinterpret_cast<const xmlChar*>("minimumPressure")) == 0) {
+        // std::max is for backwards compatibility for users who might have set this value too small
+        this->minimumPressure = std::max(0.01, g_ascii_strtod(reinterpret_cast<const char*>(value), nullptr));
+    } else if (xmlStrcmp(name, reinterpret_cast<const xmlChar*>("pressureMultiplier")) == 0) {
+        this->pressureMultiplier = g_ascii_strtod(reinterpret_cast<const char*>(value), nullptr);
+    } else if (xmlStrcmp(name, reinterpret_cast<const xmlChar*>("zoomGesturesEnabled")) == 0) {
+        this->zoomGesturesEnabled = xmlStrcmp(value, reinterpret_cast<const xmlChar*>("true")) == 0;
+    } else if (xmlStrcmp(name, reinterpret_cast<const xmlChar*>("selectedToolbar")) == 0) {
+        this->selectedToolbar = reinterpret_cast<const char*>(value);
+    } else if (xmlStrcmp(name, reinterpret_cast<const xmlChar*>("lastSavePath")) == 0) {
+        this->lastSavePath = fs::path(xoj::util::utf8(value));
+    } else if (xmlStrcmp(name, reinterpret_cast<const xmlChar*>("lastOpenPath")) == 0) {
+        this->lastOpenPath = fs::path(xoj::util::utf8(value));
+    } else if (xmlStrcmp(name, reinterpret_cast<const xmlChar*>("lastImagePath")) == 0) {
+        this->lastImagePath = fs::path(xoj::util::utf8(value));
+    } else if (xmlStrcmp(name, reinterpret_cast<const xmlChar*>("edgePanSpeed")) == 0) {
+        this->edgePanSpeed = tempg_ascii_strtod(reinterpret_cast<const char*>(value), nullptr);
+    } else if (xmlStrcmp(name, reinterpret_cast<const xmlChar*>("edgePanMaxMult")) == 0) {
+        this->edgePanMaxMult = tempg_ascii_strtod(reinterpret_cast<const char*>(value), nullptr);
+    } else if (xmlStrcmp(name, reinterpret_cast<const xmlChar*>("zoomStep")) == 0) {
+        this->zoomStep = tempg_ascii_strtod(reinterpret_cast<const char*>(value), nullptr);
+    } else if (xmlStrcmp(name, reinterpret_cast<const xmlChar*>("zoomStepScroll")) == 0) {
+        this->zoomStepScroll = tempg_ascii_strtod(reinterpret_cast<const char*>(value), nullptr);
+    } else if (xmlStrcmp(name, reinterpret_cast<const xmlChar*>("displayDpi")) == 0) {
+        this->displayDpi = g_ascii_strtoll(reinterpret_cast<const char*>(value), nullptr, 10);
+    } else if (xmlStrcmp(name, reinterpret_cast<const xmlChar*>("mainWndWidth")) == 0) {
+        this->mainWndWidth = g_ascii_strtoll(reinterpret_cast<const char*>(value), nullptr, 10);
+    } else if (xmlStrcmp(name, reinterpret_cast<const xmlChar*>("mainWndHeight")) == 0) {
+        this->mainWndHeight = g_ascii_strtoll(reinterpret_cast<const char*>(value), nullptr, 10);
+    } else if (xmlStrcmp(name, reinterpret_cast<const xmlChar*>("maximized")) == 0) {
+        this->maximized = xmlStrcmp(value, reinterpret_cast<const xmlChar*>("true")) == 0;
+    } else if (xmlStrcmp(name, reinterpret_cast<const xmlChar*>("showToolbar")) == 0) {
+        this->showToolbar = xmlStrcmp(value, reinterpret_cast<const xmlChar*>("true")) == 0;
+    } else if (xmlStrcmp(name, reinterpret_cast<const xmlChar*>("filepathShownInTitlebar")) == 0) {
+        this->filepathShownInTitlebar = xmlStrcmp(value, reinterpret_cast<const xmlChar*>("true")) == 0;
+    } else if (xmlStrcmp(name, reinterpret_cast<const xmlChar*>("pageNumberShownInTitlebar")) == 0) {
+        this->pageNumberShownInTitlebar = xmlStrcmp(value, reinterpret_cast<const xmlChar*>("true")) == 0;
+    } else if (xmlStrcmp(name, reinterpret_cast<const xmlChar*>("showSidebar")) == 0) {
+        this->showSidebar = xmlStrcmp(value, reinterpret_cast<const xmlChar*>("true")) == 0;
+    } else if (xmlStrcmp(name, reinterpret_cast<const xmlChar*>("sidebarNumberingStyle")) == 0) {
+        int num = std::stoi(reinterpret_cast<char*>(value));
+        if (num < static_cast<int>(SidebarNumberingStyle::MIN) || static_cast<int>(SidebarNumberingStyle::MAX) < num) {
+            num = static_cast<int>(SidebarNumberingStyle::DEFAULT);
+            g_warning("Settings::Invalid sidebarNumberingStyle value. Reset to default.");
+        }
+        this->sidebarNumberingStyle = static_cast<SidebarNumberingStyle>(num);
+    } else if (xmlStrcmp(name, reinterpret_cast<const xmlChar*>("sidebarWidth")) == 0) {
+        this->sidebarWidth = std::max<int>(g_ascii_strtoll(reinterpret_cast<const char*>(value), nullptr, 10), 50);
+    } else if (xmlStrcmp(name, reinterpret_cast<const xmlChar*>("sidebarOnRight")) == 0) {
+        this->sidebarOnRight = xmlStrcmp(value, reinterpret_cast<const xmlChar*>("true")) == 0;
+    } else if (xmlStrcmp(name, reinterpret_cast<const xmlChar*>("scrollbarOnLeft")) == 0) {
+        this->scrollbarOnLeft = xmlStrcmp(value, reinterpret_cast<const xmlChar*>("true")) == 0;
+    } else if (xmlStrcmp(name, reinterpret_cast<const xmlChar*>("menubarVisible")) == 0) {
+        this->menubarVisible = xmlStrcmp(value, reinterpret_cast<const xmlChar*>("true")) == 0;
+    } else if (xmlStrcmp(name, reinterpret_cast<const xmlChar*>("numColumns")) == 0) {
+        this->numColumns = g_ascii_strtoll(reinterpret_cast<const char*>(value), nullptr, 10);
+    } else if (xmlStrcmp(name, reinterpret_cast<const xmlChar*>("numRows")) == 0) {
+        this->numRows = g_ascii_strtoll(reinterpret_cast<const char*>(value), nullptr, 10);
+    } else if (xmlStrcmp(name, reinterpret_cast<const xmlChar*>("viewFixedRows")) == 0) {
+        this->viewFixedRows = xmlStrcmp(value, reinterpret_cast<const xmlChar*>("true")) == 0;
+    } else if (xmlStrcmp(name, reinterpret_cast<const xmlChar*>("layoutVertical")) == 0) {
+        this->layoutVertical = xmlStrcmp(value, reinterpret_cast<const xmlChar*>("true")) == 0;
+    } else if (xmlStrcmp(name, reinterpret_cast<const xmlChar*>("layoutRightToLeft")) == 0) {
+        this->layoutRightToLeft = xmlStrcmp(value, reinterpret_cast<const xmlChar*>("true")) == 0;
+    } else if (xmlStrcmp(name, reinterpret_cast<const xmlChar*>("layoutBottomToTop")) == 0) {
+        this->layoutBottomToTop = xmlStrcmp(value, reinterpret_cast<const xmlChar*>("true")) == 0;
+    } else if (xmlStrcmp(name, reinterpret_cast<const xmlChar*>("showPairedPages")) == 0) {
+        this->showPairedPages = xmlStrcmp(value, reinterpret_cast<const xmlChar*>("true")) == 0;
+    } else if (xmlStrcmp(name, reinterpret_cast<const xmlChar*>("numPairsOffset")) == 0) {
+        this->numPairsOffset = g_ascii_strtoll(reinterpret_cast<const char*>(value), nullptr, 10);
+    } else if (xmlStrcmp(name, reinterpret_cast<const xmlChar*>("presentationMode")) == 0) {
+        this->presentationMode = xmlStrcmp(value, reinterpret_cast<const xmlChar*>("true")) == 0;
+    } else if (xmlStrcmp(name, reinterpret_cast<const xmlChar*>("autoloadMostRecent")) == 0) {
+        this->autoloadMostRecent = xmlStrcmp(value, reinterpret_cast<const xmlChar*>("true")) == 0;
+    } else if (xmlStrcmp(name, reinterpret_cast<const xmlChar*>("autoloadPdfXoj")) == 0) {
+        this->autoloadPdfXoj = xmlStrcmp(value, reinterpret_cast<const xmlChar*>("true")) == 0;
+    } else if (xmlStrcmp(name, reinterpret_cast<const xmlChar*>("stylusCursorType")) == 0) {
+        this->stylusCursorType = stylusCursorTypeFromString(reinterpret_cast<const char*>(value));
+    } else if (xmlStrcmp(name, reinterpret_cast<const xmlChar*>("eraserVisibility")) == 0) {
+        this->eraserVisibility = eraserVisibilityFromString(reinterpret_cast<const char*>(value));
+    } else if (xmlStrcmp(name, reinterpret_cast<const xmlChar*>("iconTheme")) == 0) {
+        this->iconTheme = iconThemeFromString(reinterpret_cast<const char*>(value));
+    } else if (xmlStrcmp(name, reinterpret_cast<const xmlChar*>("themeVariant")) == 0) {
+        this->themeVariant = themeVariantFromString(reinterpret_cast<const char*>(value));
+    } else if (xmlStrcmp(name, reinterpret_cast<const xmlChar*>("highlightPosition")) == 0) {
+        this->highlightPosition = xmlStrcmp(value, reinterpret_cast<const xmlChar*>("true")) == 0;
+    } else if (xmlStrcmp(name, reinterpret_cast<const xmlChar*>("cursorHighlightColor")) == 0) {
+        this->cursorHighlightColor = g_ascii_strtoull(reinterpret_cast<const char*>(value), nullptr, 10);
+    } else if (xmlStrcmp(name, reinterpret_cast<const xmlChar*>("cursorHighlightRadius")) == 0) {
+        this->cursorHighlightRadius = g_ascii_strtod(reinterpret_cast<const char*>(value), nullptr);
+    } else if (xmlStrcmp(name, reinterpret_cast<const xmlChar*>("cursorHighlightBorderColor")) == 0) {
+        this->cursorHighlightBorderColor = g_ascii_strtoull(reinterpret_cast<const char*>(value), nullptr, 10);
+    } else if (xmlStrcmp(name, reinterpret_cast<const xmlChar*>("cursorHighlightBorderWidth")) == 0) {
+        this->cursorHighlightBorderWidth = g_ascii_strtod(reinterpret_cast<const char*>(value), nullptr);
+    } else if (xmlStrcmp(name, reinterpret_cast<const xmlChar*>("useStockIcons")) == 0) {
+        this->useStockIcons = xmlStrcmp(value, reinterpret_cast<const xmlChar*>("true")) == 0;
+    } else if (xmlStrcmp(name, reinterpret_cast<const xmlChar*>("defaultSaveName")) == 0) {
+        this->defaultSaveName = xoj::util::utf8(value).str();
+    } else if (xmlStrcmp(name, reinterpret_cast<const xmlChar*>("defaultPdfExportName")) == 0) {
+        this->defaultPdfExportName = xoj::util::utf8(value).str();
+    } else if (xmlStrcmp(name, reinterpret_cast<const xmlChar*>("pluginEnabled")) == 0) {
+        this->pluginEnabled = reinterpret_cast<const char*>(value);
+    } else if (xmlStrcmp(name, reinterpret_cast<const xmlChar*>("pluginDisabled")) == 0) {
+        this->pluginDisabled = reinterpret_cast<const char*>(value);
+    } else if (xmlStrcmp(name, reinterpret_cast<const xmlChar*>("pageTemplate")) == 0) {
+        this->pageTemplate = reinterpret_cast<const char*>(value);
+    } else if (xmlStrcmp(name, reinterpret_cast<const xmlChar*>("sizeUnit")) == 0) {
+        this->sizeUnit = reinterpret_cast<const char*>(value);
+    } else if (xmlStrcmp(name, reinterpret_cast<const xmlChar*>("audioFolder")) == 0) {
+        this->audioFolder = fs::path(xoj::util::utf8(value));
+    } else if (xmlStrcmp(name, reinterpret_cast<const xmlChar*>("autosaveEnabled")) == 0) {
+        this->autosaveEnabled = xmlStrcmp(value, reinterpret_cast<const xmlChar*>("true")) == 0;
+    } else if (xmlStrcmp(name, reinterpret_cast<const xmlChar*>("autosaveTimeout")) == 0) {
+        this->autosaveTimeout = g_ascii_strtoll(reinterpret_cast<const char*>(value), nullptr, 10);
+    } else if (xmlStrcmp(name, reinterpret_cast<const xmlChar*>("defaultViewModeAttributes")) == 0) {
+        this->viewModes.at(PresetViewModeIds::VIEW_MODE_DEFAULT) =
+                settingsStringToViewMode(reinterpret_cast<const char*>(value));
+    } else if (xmlStrcmp(name, reinterpret_cast<const xmlChar*>("fullscreenViewModeAttributes")) == 0) {
+        this->viewModes.at(PresetViewModeIds::VIEW_MODE_FULLSCREEN) =
+                settingsStringToViewMode(reinterpret_cast<const char*>(value));
+    } else if (xmlStrcmp(name, reinterpret_cast<const xmlChar*>("presentationViewModeAttributes")) == 0) {
+        this->viewModes.at(PresetViewModeIds::VIEW_MODE_PRESENTATION) =
+                settingsStringToViewMode(reinterpret_cast<const char*>(value));
+    } else if (xmlStrcmp(name, reinterpret_cast<const xmlChar*>("touchZoomStartThreshold")) == 0) {
+        this->touchZoomStartThreshold = g_ascii_strtod(reinterpret_cast<const char*>(value), nullptr);
+    } else if (xmlStrcmp(name, reinterpret_cast<const xmlChar*>("pageRerenderThreshold")) == 0) {
+        this->pageRerenderThreshold = g_ascii_strtod(reinterpret_cast<const char*>(value), nullptr);
+    } else if (xmlStrcmp(name, reinterpret_cast<const xmlChar*>("pdfPageCacheSize")) == 0) {
+        this->pdfPageCacheSize = g_ascii_strtoll(reinterpret_cast<const char*>(value), nullptr, 10);
+    } else if (xmlStrcmp(name, reinterpret_cast<const xmlChar*>("preloadPagesBefore")) == 0) {
+        this->preloadPagesBefore = g_ascii_strtoull(reinterpret_cast<const char*>(value), nullptr, 10);
+    } else if (xmlStrcmp(name, reinterpret_cast<const xmlChar*>("preloadPagesAfter")) == 0) {
+        this->preloadPagesAfter = g_ascii_strtoull(reinterpret_cast<const char*>(value), nullptr, 10);
+    } else if (xmlStrcmp(name, reinterpret_cast<const xmlChar*>("eagerPageCleanup")) == 0) {
+        this->eagerPageCleanup = xmlStrcmp(value, reinterpret_cast<const xmlChar*>("true")) == 0;
+    } else if (xmlStrcmp(name, reinterpret_cast<const xmlChar*>("selectionBorderColor")) == 0) {
+        this->selectionBorderColor = Color(g_ascii_strtoull(reinterpret_cast<const char*>(value), nullptr, 10));
+    } else if (xmlStrcmp(name, reinterpret_cast<const xmlChar*>("selectionMarkerColor")) == 0) {
+        this->selectionMarkerColor = Color(g_ascii_strtoull(reinterpret_cast<const char*>(value), nullptr, 10));
+    } else if (xmlStrcmp(name, reinterpret_cast<const xmlChar*>("activeSelectionColor")) == 0) {
+        this->activeSelectionColor = Color(g_ascii_strtoull(reinterpret_cast<const char*>(value), nullptr, 10));
+
+    } else if (xmlStrcmp(name, reinterpret_cast<const xmlChar*>("recolor.enabled")) == 0) {
+        this->recolorParameters.recolorizeMainView = xmlStrcmp(value, reinterpret_cast<const xmlChar*>("true")) == 0;
+    } else if (xmlStrcmp(name, reinterpret_cast<const xmlChar*>("recolor.sidebar")) == 0) {
+        this->recolorParameters.recolorizeSidebarMiniatures =
+                xmlStrcmp(value, reinterpret_cast<const xmlChar*>("true")) == 0;
+    } else if (xmlStrcmp(name, reinterpret_cast<const xmlChar*>("recolor.light")) == 0) {
+        this->recolorParameters.recolor =
+                Recolor(ColorU8(g_ascii_strtoull(reinterpret_cast<const char*>(value), nullptr, 10)),
+                        this->recolorParameters.recolor.getDark());
+    } else if (xmlStrcmp(name, reinterpret_cast<const xmlChar*>("recolor.dark")) == 0) {
+        this->recolorParameters.recolor =
+                Recolor(this->recolorParameters.recolor.getLight(),
+                        ColorU8(g_ascii_strtoull(reinterpret_cast<const char*>(value), nullptr, 10)));
+
+    } else if (xmlStrcmp(name, reinterpret_cast<const xmlChar*>("backgroundColor")) == 0) {
+        this->backgroundColor = Color(g_ascii_strtoull(reinterpret_cast<const char*>(value), nullptr, 10));
+    } else if (xmlStrcmp(name, reinterpret_cast<const xmlChar*>("addHorizontalSpace")) == 0) {
+        this->addHorizontalSpace = xmlStrcmp(value, reinterpret_cast<const xmlChar*>("true")) == 0;
+    } else if (xmlStrcmp(name, reinterpret_cast<const xmlChar*>("addHorizontalSpaceAmount")) == 0) {
+        const int oldHorizontalAmount =
+                static_cast<int>(g_ascii_strtoll(reinterpret_cast<const char*>(value), nullptr, 10));
+        this->addHorizontalSpaceAmountLeft = oldHorizontalAmount;
+        this->addHorizontalSpaceAmountRight = oldHorizontalAmount;
+    } else if (xmlStrcmp(name, reinterpret_cast<const xmlChar*>("addHorizontalSpaceAmountRight")) == 0) {
+        this->addHorizontalSpaceAmountRight =
+                static_cast<int>(g_ascii_strtoll(reinterpret_cast<const char*>(value), nullptr, 10));
+    } else if (xmlStrcmp(name, reinterpret_cast<const xmlChar*>("addVerticalSpace")) == 0) {
+        this->addVerticalSpace = xmlStrcmp(value, reinterpret_cast<const xmlChar*>("true")) == 0;
+    } else if (xmlStrcmp(name, reinterpret_cast<const xmlChar*>("addVerticalSpaceAmount")) == 0) {
+        const int oldVerticalAmount =
+                static_cast<int>(g_ascii_strtoll(reinterpret_cast<const char*>(value), nullptr, 10));
+        this->addHorizontalSpaceAmountLeft = oldVerticalAmount;
+        this->addHorizontalSpaceAmountRight = oldVerticalAmount;
+    } else if (xmlStrcmp(name, reinterpret_cast<const xmlChar*>("addVerticalSpaceAmountAbove")) == 0) {
+        this->addVerticalSpaceAmountAbove =
+                static_cast<int>(g_ascii_strtoll(reinterpret_cast<const char*>(value), nullptr, 10));
+    } else if (xmlStrcmp(name, reinterpret_cast<const xmlChar*>("addHorizontalSpaceAmountLeft")) == 0) {
+        this->addHorizontalSpaceAmountLeft =
+                static_cast<int>(g_ascii_strtoll(reinterpret_cast<const char*>(value), nullptr, 10));
+    } else if (xmlStrcmp(name, reinterpret_cast<const xmlChar*>("addVerticalSpaceAmountBelow")) == 0) {
+        this->addVerticalSpaceAmountBelow =
+                static_cast<int>(g_ascii_strtoll(reinterpret_cast<const char*>(value), nullptr, 10));
+    } else if (xmlStrcmp(name, reinterpret_cast<const xmlChar*>("unlimitedScrolling")) == 0) {
+        this->unlimitedScrolling = xmlStrcmp(value, reinterpret_cast<const xmlChar*>("true")) == 0;
+    } else if (xmlStrcmp(name, reinterpret_cast<const xmlChar*>("drawDirModsEnabled")) == 0) {
+        this->drawDirModsEnabled = xmlStrcmp(value, reinterpret_cast<const xmlChar*>("true")) == 0;
+    } else if (xmlStrcmp(name, reinterpret_cast<const xmlChar*>("drawDirModsRadius")) == 0) {
+        this->drawDirModsRadius = g_ascii_strtoll(reinterpret_cast<const char*>(value), nullptr, 10);
+    } else if (xmlStrcmp(name, reinterpret_cast<const xmlChar*>("snapRotation")) == 0) {
+        this->snapRotation = xmlStrcmp(value, reinterpret_cast<const xmlChar*>("true")) == 0;
+    } else if (xmlStrcmp(name, reinterpret_cast<const xmlChar*>("snapRotationTolerance")) == 0) {
+        this->snapRotationTolerance = tempg_ascii_strtod(reinterpret_cast<const char*>(value), nullptr);
+    } else if (xmlStrcmp(name, reinterpret_cast<const xmlChar*>("snapGrid")) == 0) {
+        this->snapGrid = xmlStrcmp(value, reinterpret_cast<const xmlChar*>("true")) == 0;
+    } else if (xmlStrcmp(name, reinterpret_cast<const xmlChar*>("snapGridSize")) == 0) {
+        this->snapGridSize = tempg_ascii_strtod(reinterpret_cast<const char*>(value), nullptr);
+    } else if (xmlStrcmp(name, reinterpret_cast<const xmlChar*>("snapGridTolerance")) == 0) {
+        this->snapGridTolerance = tempg_ascii_strtod(reinterpret_cast<const char*>(value), nullptr);
+    } else if (xmlStrcmp(name, reinterpret_cast<const xmlChar*>("strokeRecognizerMinSize")) == 0) {
+        this->strokeRecognizerMinSize = tempg_ascii_strtod(reinterpret_cast<const char*>(value), nullptr);
+    } else if (xmlStrcmp(name, reinterpret_cast<const xmlChar*>("touchDrawing")) == 0) {
+        this->touchDrawing = xmlStrcmp(value, reinterpret_cast<const xmlChar*>("true")) == 0;
+    } else if (xmlStrcmp(name, reinterpret_cast<const xmlChar*>("gtkTouchInertialScrolling")) == 0) {
+        this->gtkTouchInertialScrolling = xmlStrcmp(value, reinterpret_cast<const xmlChar*>("true")) == 0;
+    } else if (xmlStrcmp(name, reinterpret_cast<const xmlChar*>("pressureGuessing")) == 0) {
+        this->pressureGuessing = xmlStrcmp(value, reinterpret_cast<const xmlChar*>("true")) == 0;
+    } else if (xmlStrcmp(name, reinterpret_cast<const xmlChar*>("scrollbarHideType")) == 0) {
+        if (xmlStrcmp(value, reinterpret_cast<const xmlChar*>("both")) == 0) {
+            this->scrollbarHideType = SCROLLBAR_HIDE_BOTH;
+        } else if (xmlStrcmp(value, reinterpret_cast<const xmlChar*>("horizontal")) == 0) {
+            this->scrollbarHideType = SCROLLBAR_HIDE_HORIZONTAL;
+        } else if (xmlStrcmp(value, reinterpret_cast<const xmlChar*>("vertical")) == 0) {
+            this->scrollbarHideType = SCROLLBAR_HIDE_VERTICAL;
+        } else {
+            this->scrollbarHideType = SCROLLBAR_HIDE_NONE;
+        }
+    } else if (xmlStrcmp(name, reinterpret_cast<const xmlChar*>("disableScrollbarFadeout")) == 0) {
+        this->disableScrollbarFadeout = xmlStrcmp(value, reinterpret_cast<const xmlChar*>("true")) == 0;
+    } else if (xmlStrcmp(name, reinterpret_cast<const xmlChar*>("disableAudio")) == 0) {
+        this->disableAudio = xmlStrcmp(value, reinterpret_cast<const xmlChar*>("true")) == 0;
+#ifdef ENABLE_AUDIO
+    } else if (xmlStrcmp(name, reinterpret_cast<const xmlChar*>("audioSampleRate")) == 0) {
+        this->audioSampleRate = tempg_ascii_strtod(reinterpret_cast<const char*>(value), nullptr);
+    } else if (xmlStrcmp(name, reinterpret_cast<const xmlChar*>("audioGain")) == 0) {
+        this->audioGain = tempg_ascii_strtod(reinterpret_cast<const char*>(value), nullptr);
+    } else if (xmlStrcmp(name, reinterpret_cast<const xmlChar*>("defaultSeekTime")) == 0) {
+        this->defaultSeekTime = tempg_ascii_strtod(reinterpret_cast<const char*>(value), nullptr);
+    } else if (xmlStrcmp(name, reinterpret_cast<const xmlChar*>("audioInputDevice")) == 0) {
+        this->audioInputDevice = g_ascii_strtoll(reinterpret_cast<const char*>(value), nullptr, 10);
+    } else if (xmlStrcmp(name, reinterpret_cast<const xmlChar*>("audioOutputDevice")) == 0) {
+        this->audioOutputDevice = g_ascii_strtoll(reinterpret_cast<const char*>(value), nullptr, 10);
+#endif
+    } else if (xmlStrcmp(name, reinterpret_cast<const xmlChar*>("numIgnoredStylusEvents")) == 0) {
+        this->numIgnoredStylusEvents =
+                std::max<int>(g_ascii_strtoll(reinterpret_cast<const char*>(value), nullptr, 10), 0);
+    } else if (xmlStrcmp(name, reinterpret_cast<const xmlChar*>("inputSystemTPCButton")) == 0) {
+        this->inputSystemTPCButton = xmlStrcmp(value, reinterpret_cast<const xmlChar*>("true")) == 0;
+    } else if (xmlStrcmp(name, reinterpret_cast<const xmlChar*>("inputSystemDrawOutsideWindow")) == 0) {
+        this->inputSystemDrawOutsideWindow = xmlStrcmp(value, reinterpret_cast<const xmlChar*>("true")) == 0;
+    } else if (xmlStrcmp(name, reinterpret_cast<const xmlChar*>("emptyLastPageAppend")) == 0) {
+        this->emptyLastPageAppend = emptyLastPageAppendFromString(reinterpret_cast<char*>(value));
+    } else if (xmlStrcmp(name, reinterpret_cast<const xmlChar*>("strokeFilterIgnoreTime")) == 0) {
+        this->strokeFilterIgnoreTime = g_ascii_strtoll(reinterpret_cast<const char*>(value), nullptr, 10);
+    } else if (xmlStrcmp(name, reinterpret_cast<const xmlChar*>("strokeFilterIgnoreLength")) == 0) {
+        this->strokeFilterIgnoreLength = tempg_ascii_strtod(reinterpret_cast<const char*>(value), nullptr);
+    } else if (xmlStrcmp(name, reinterpret_cast<const xmlChar*>("strokeFilterSuccessiveTime")) == 0) {
+        this->strokeFilterSuccessiveTime = g_ascii_strtoll(reinterpret_cast<const char*>(value), nullptr, 10);
+    } else if (xmlStrcmp(name, reinterpret_cast<const xmlChar*>("strokeFilterEnabled")) == 0) {
+        this->strokeFilterEnabled = xmlStrcmp(value, reinterpret_cast<const xmlChar*>("true")) == 0;
+    } else if (xmlStrcmp(name, reinterpret_cast<const xmlChar*>("doActionOnStrokeFiltered")) == 0) {
+        this->doActionOnStrokeFiltered = xmlStrcmp(value, reinterpret_cast<const xmlChar*>("true")) == 0;
+    } else if (xmlStrcmp(name, reinterpret_cast<const xmlChar*>("trySelectOnStrokeFiltered")) == 0) {
+        this->trySelectOnStrokeFiltered = xmlStrcmp(value, reinterpret_cast<const xmlChar*>("true")) == 0;
+    } else if (xmlStrcmp(name, reinterpret_cast<const xmlChar*>("latexSettings.autoCheckDependencies")) == 0) {
+        this->latexSettings.autoCheckDependencies = xmlStrcmp(value, reinterpret_cast<const xmlChar*>("true")) == 0;
+    } else if (xmlStrcmp(name, reinterpret_cast<const xmlChar*>("latexSettings.defaultText")) == 0) {
+        this->latexSettings.defaultText = reinterpret_cast<char*>(value);
+    } else if (xmlStrcmp(name, reinterpret_cast<const xmlChar*>("latexSettings.globalTemplatePath")) == 0) {
+        this->latexSettings.globalTemplatePath = fs::path(xoj::util::utf8(value));
+    } else if (xmlStrcmp(name, reinterpret_cast<const xmlChar*>("latexSettings.genCmd")) == 0) {
+        this->latexSettings.genCmd = reinterpret_cast<char*>(value);
+    } else if (xmlStrcmp(name, reinterpret_cast<const xmlChar*>("latexSettings.sourceViewThemeId")) == 0) {
+        this->latexSettings.sourceViewThemeId = reinterpret_cast<char*>(value);
+    } else if (xmlStrcmp(name, reinterpret_cast<const xmlChar*>("latexSettings.editorFont")) == 0) {
+        this->latexSettings.editorFont = std::string{reinterpret_cast<char*>(value)};
+    } else if (xmlStrcmp(name, reinterpret_cast<const xmlChar*>("latexSettings.useCustomEditorFont")) == 0) {
+        this->latexSettings.useCustomEditorFont = xmlStrcmp(value, reinterpret_cast<const xmlChar*>("true")) == 0;
+    } else if (xmlStrcmp(name, reinterpret_cast<const xmlChar*>("latexSettings.editorWordWrap")) == 0) {
+        this->latexSettings.editorWordWrap = xmlStrcmp(value, reinterpret_cast<const xmlChar*>("true")) == 0;
+    } else if (xmlStrcmp(name, reinterpret_cast<const xmlChar*>("latexSettings.sourceViewAutoIndent")) == 0) {
+        this->latexSettings.sourceViewAutoIndent = xmlStrcmp(value, reinterpret_cast<const xmlChar*>("true")) == 0;
+    } else if (xmlStrcmp(name, reinterpret_cast<const xmlChar*>("latexSettings.sourceViewSyntaxHighlight")) == 0) {
+        this->latexSettings.sourceViewSyntaxHighlight = xmlStrcmp(value, reinterpret_cast<const xmlChar*>("true")) == 0;
+    } else if (xmlStrcmp(name, reinterpret_cast<const xmlChar*>("latexSettings.sourceViewShowLineNumbers")) == 0) {
+        this->latexSettings.sourceViewShowLineNumbers = xmlStrcmp(value, reinterpret_cast<const xmlChar*>("true")) == 0;
+    } else if (xmlStrcmp(name, reinterpret_cast<const xmlChar*>("latexSettings.useExternalEditor")) == 0) {
+        this->latexSettings.useExternalEditor = xmlStrcmp(value, reinterpret_cast<const xmlChar*>("true")) == 0;
+    } else if (xmlStrcmp(name, reinterpret_cast<const xmlChar*>("latexSettings.externalEditorAutoConfirm")) == 0) {
+        this->latexSettings.externalEditorAutoConfirm = xmlStrcmp(value, reinterpret_cast<const xmlChar*>("true")) == 0;
+    } else if (xmlStrcmp(name, reinterpret_cast<const xmlChar*>("latexSettings.externalEditorCmd")) == 0) {
+        this->latexSettings.externalEditorCmd = std::string{reinterpret_cast<char*>(value)};
+    } else if (xmlStrcmp(name, reinterpret_cast<const xmlChar*>("latexSettings.temporaryFileExt")) == 0) {
+        this->latexSettings.temporaryFileExt = std::string{reinterpret_cast<char*>(value)};
+    } else if (xmlStrcmp(name, reinterpret_cast<const xmlChar*>("snapRecognizedShapesEnabled")) == 0) {
+        this->snapRecognizedShapesEnabled = xmlStrcmp(value, reinterpret_cast<const xmlChar*>("true")) == 0;
+    } else if (xmlStrcmp(name, reinterpret_cast<const xmlChar*>("restoreLineWidthEnabled")) == 0) {
+        this->restoreLineWidthEnabled = xmlStrcmp(value, reinterpret_cast<const xmlChar*>("true")) == 0;
+    } else if (xmlStrcmp(name, reinterpret_cast<const xmlChar*>("preferredLocale")) == 0) {
+        this->preferredLocale = reinterpret_cast<char*>(value);
+    } else if (xmlStrcmp(name, reinterpret_cast<const xmlChar*>("useSpacesForTab")) == 0) {
+        this->setUseSpacesAsTab(xmlStrcmp(value, reinterpret_cast<const xmlChar*>("true")) == 0);
+    } else if (xmlStrcmp(name, reinterpret_cast<const xmlChar*>("numberOfSpacesForTab")) == 0) {
+        this->setNumberOfSpacesForTab(
+                static_cast<unsigned int>(g_ascii_strtoull(reinterpret_cast<const char*>(value), nullptr, 10)));
+    } else if (xmlStrcmp(name, reinterpret_cast<const xmlChar*>("laserPointerFadeOutTime")) == 0) {
+        this->laserPointerFadeOutTime =
+                static_cast<unsigned int>(g_ascii_strtoull(reinterpret_cast<const char*>(value), nullptr, 10));
+        /**
+         * Stabilizer related settings
+         */
+    } else if (xmlStrcmp(name, reinterpret_cast<const xmlChar*>("stabilizerAveragingMethod")) == 0) {
+        this->stabilizerAveragingMethod =
+                (StrokeStabilizer::AveragingMethod)g_ascii_strtoll(reinterpret_cast<const char*>(value), nullptr, 10);
+    } else if (xmlStrcmp(name, reinterpret_cast<const xmlChar*>("stabilizerPreprocessor")) == 0) {
+        this->stabilizerPreprocessor =
+                (StrokeStabilizer::Preprocessor)g_ascii_strtoll(reinterpret_cast<const char*>(value), nullptr, 10);
+    } else if (xmlStrcmp(name, reinterpret_cast<const xmlChar*>("stabilizerBuffersize")) == 0) {
+        this->stabilizerBuffersize = g_ascii_strtoull(reinterpret_cast<const char*>(value), nullptr, 10);
+    } else if (xmlStrcmp(name, reinterpret_cast<const xmlChar*>("stabilizerSigma")) == 0) {
+        this->stabilizerSigma = tempg_ascii_strtod(reinterpret_cast<const char*>(value), nullptr);
+    } else if (xmlStrcmp(name, reinterpret_cast<const xmlChar*>("stabilizerDeadzoneRadius")) == 0) {
+        this->stabilizerDeadzoneRadius = tempg_ascii_strtod(reinterpret_cast<const char*>(value), nullptr);
+    } else if (xmlStrcmp(name, reinterpret_cast<const xmlChar*>("stabilizerDrag")) == 0) {
+        this->stabilizerDrag = tempg_ascii_strtod(reinterpret_cast<const char*>(value), nullptr);
+    } else if (xmlStrcmp(name, reinterpret_cast<const xmlChar*>("stabilizerMass")) == 0) {
+        this->stabilizerMass = tempg_ascii_strtod(reinterpret_cast<const char*>(value), nullptr);
+    } else if (xmlStrcmp(name, reinterpret_cast<const xmlChar*>("stabilizerCuspDetection")) == 0) {
+        this->stabilizerCuspDetection = xmlStrcmp(value, reinterpret_cast<const xmlChar*>("true")) == 0;
+    } else if (xmlStrcmp(name, reinterpret_cast<const xmlChar*>("stabilizerFinalizeStroke")) == 0) {
+        this->stabilizerFinalizeStroke = xmlStrcmp(value, reinterpret_cast<const xmlChar*>("true")) == 0;
+    } else if (xmlStrcmp(name, reinterpret_cast<const xmlChar*>("colorPalette")) == 0) {
+        std::string_view paletteConfig = std::string_view{reinterpret_cast<const char*>(value)};
+        if (!paletteConfig.empty()) {
+            this->colorPaletteSetting = fs::path(xoj::util::utf8(paletteConfig));
+        }
+    }
+    /**/
+
+    xmlFree(name);
+    xmlFree(value);
+}
+
+void Settings::loadDeviceClasses() {
+    SElement& s = getCustomElement("deviceClasses");
+    for (auto device: s.children()) {
+        SElement& deviceNode = device.second;
+        int deviceClass = 0;
+        int deviceSource = 0;
+        deviceNode.getInt("deviceClass", deviceClass);
+        deviceNode.getInt("deviceSource", deviceSource);
+        auto devClass = static_cast<InputDeviceTypeOption>(deviceClass);
+        if (devClass == InputDeviceTypeOption::MouseKeyboardCombo) {
+            // This extra class is no longer handled differently from Mouse. Merge them.
+            devClass = InputDeviceTypeOption::Mouse;
+        }
+        inputDeviceClasses.emplace(device.first, std::make_pair(devClass, static_cast<GdkInputSource>(deviceSource)));
+    }
+}
+
+void Settings::loadButtonConfig() {
+    SElement& s = getCustomElement("buttonConfig");
+
+    for (size_t i = 0; i < BUTTON_COUNT; i++) {
+        SElement& e = s.child(buttonToString(static_cast<Button>(i)));
+        const auto& cfg = buttonConfig[i];
+
+        string sType;
+        if (e.getString("tool", sType)) {
+            ToolType type = toolTypeFromString(sType);
+            cfg->action = type;
+
+            if (type != TOOL_NONE) {
+                if (type == TOOL_PEN) {
+                    string strokeType;
+                    cfg->strokeType =
+                            e.getString("strokeType", strokeType) ? strokeTypeFromString(strokeType) : STROKE_TYPE_NONE;
+                }
+
+                if (type == TOOL_PEN || type == TOOL_HIGHLIGHTER) {
+                    string drawingType;
+                    if (e.getString("drawingType", drawingType)) {
+                        cfg->drawingType = drawingTypeFromString(drawingType);
+                    }
+                }
+
+                if (type == TOOL_ERASER) {
+                    std::string sEraserMode;
+                    if (e.getString("eraserMode", sEraserMode)) {
+                        cfg->eraserMode = eraserTypeFromString(sEraserMode);
+                    } else {
+                        // If not specified: do not change
+                        cfg->eraserMode = ERASER_TYPE_NONE;
+                    }
+                }
+
+                if (xoj::tool::hasCapability(type, TOOL_CAP_SIZE)) {
+                    std::string sSize;
+                    if (e.getString("size", sSize)) {
+                        cfg->size = toolSizeFromString(sSize);
+                    } else {
+                        // If not specified: do not change
+                        cfg->size = TOOL_SIZE_NONE;
+                    }
+                }
+
+                if (xoj::tool::hasCapability(type, TOOL_CAP_COLOR)) {
+                    if (int iColor; e.getInt("color", iColor)) {
+                        cfg->color = Color(as_unsigned(iColor));
+                    }
+                }
+            }
+
+            // Touch device
+            if (i == BUTTON_TOUCH) {
+                if (!e.getString("device", cfg->device)) {
+                    cfg->device = "";
+                }
+
+                e.getBool("disableDrawing", cfg->disableDrawing);
+            }
+        } else {
+            continue;
+        }
+    }
+}
+
+auto Settings::load() -> bool {
+    xmlKeepBlanksDefault(0);
+
+    if (!fs::exists(filepath)) {
+        g_warning("Settings file %s does not exist. Regenerating. ", filepath.string().c_str());
+        save();
+    }
+
+    xmlDocPtr doc = xmlParseFile(char_cast(filepath.u8string().c_str()));
+
+    if (doc == nullptr) {
+        g_warning("Settings::load:: doc == null, could not load Settings!\n");
+        return false;
+    }
+
+    xmlNodePtr cur = xmlDocGetRootElement(doc);
+    if (cur == nullptr) {
+        g_message("The settings file \"%s\" is empty", filepath.string().c_str());
+        xmlFreeDoc(doc);
+
+        return false;
+    }
+
+    if (xmlStrcmp(cur->name, reinterpret_cast<const xmlChar*>("settings"))) {
+        g_message("File \"%s\" is of the wrong type", filepath.string().c_str());
+        xmlFreeDoc(doc);
+
+        return false;
+    }
+
+    cur = xmlDocGetRootElement(doc);
+    cur = cur->xmlChildrenNode;
+
+    while (cur != nullptr) {
+        parseItem(doc, cur);
+
+        cur = cur->next;
+    }
+
+    xmlFreeDoc(doc);
+
+    loadButtonConfig();
+    loadDeviceClasses();
+
+    // This must be done before the color palette to ensure the color names are translated properly
+#ifdef _WIN32
+    _putenv_s("LANGUAGE", this->preferredLocale.c_str());
+#else
+    setenv("LANGUAGE", this->preferredLocale.c_str(), 1);
+#endif
+
+    return true;
+}
+
+auto Settings::savePropertyDouble(const gchar* key, double value, xmlNodePtr parent) -> xmlNodePtr {
+    char text[G_ASCII_DTOSTR_BUF_SIZE];
+    //  g_ascii_ version uses C locale always.
+    g_ascii_formatd(text, G_ASCII_DTOSTR_BUF_SIZE, Util::PRECISION_FORMAT_STRING, value);
+    xmlNodePtr xmlNode = saveProperty(key, text, parent);
+    return xmlNode;
+}
+
+auto Settings::saveProperty(const gchar* key, int value, xmlNodePtr parent) -> xmlNodePtr {
+    char* text = g_strdup_printf("%i", value);
+    xmlNodePtr xmlNode = saveProperty(key, text, parent);
+    g_free(text);
+    return xmlNode;
+}
+
+auto Settings::savePropertyUnsigned(const gchar* key, unsigned int value, xmlNodePtr parent) -> xmlNodePtr {
+    char* text = g_strdup_printf("%u", value);
+    xmlNodePtr xmlNode = saveProperty(key, text, parent);
+    g_free(text);
+    return xmlNode;
+}
+
+auto Settings::saveProperty(const gchar* key, const gchar* value, xmlNodePtr parent) -> xmlNodePtr {
+    xmlNodePtr xmlNode = xmlNewChild(parent, nullptr, reinterpret_cast<const xmlChar*>("property"), nullptr);
+
+    xmlSetProp(xmlNode, reinterpret_cast<const xmlChar*>("name"), reinterpret_cast<const xmlChar*>(key));
+
+    xmlSetProp(xmlNode, reinterpret_cast<const xmlChar*>("value"), reinterpret_cast<const xmlChar*>(value));
+
+    return xmlNode;
+}
+
+void Settings::saveDeviceClasses() {
+    SElement& s = getCustomElement("deviceClasses");
+
+    for (auto& device: inputDeviceClasses) {
+        const std::string& name = device.first;
+        InputDeviceTypeOption& deviceClass = device.second.first;
+        GdkInputSource& source = device.second.second;
+        SElement& e = s.child(name);
+        e.setInt("deviceClass", static_cast<int>(deviceClass));
+        e.setInt("deviceSource", source);
+    }
+}
+
+void Settings::saveButtonConfig() {
+    SElement& s = getCustomElement("buttonConfig");
+    s.clear();
+
+    for (size_t i = 0; i < BUTTON_COUNT; i++) {
+        SElement& e = s.child(buttonToString(static_cast<Button>(i)));
+        const auto& cfg = buttonConfig[i];
+
+        ToolType const type = cfg->action;
+        e.setString("tool", toolTypeToString(type).data());
+
+        if (type != TOOL_NONE) {
+            if (type == TOOL_PEN) {
+                e.setString("strokeType", strokeTypeToString(cfg->strokeType).data());
+            }
+
+            if (type == TOOL_PEN || type == TOOL_HIGHLIGHTER) {
+                e.setString("drawingType", drawingTypeToString(cfg->drawingType).data());
+            }
+
+            if (type == TOOL_ERASER) {
+                e.setString("eraserMode", eraserTypeToString(cfg->eraserMode).data());
+            }
+
+            if (xoj::tool::hasCapability(type, TOOL_CAP_SIZE)) {
+                e.setString("size", toolSizeToString(cfg->size).data());
+            }
+
+            if (xoj::tool::hasCapability(type, TOOL_CAP_COLOR)) {
+                e.setIntHex("color", int32_t(uint32_t(cfg->color)));
+            }
+        }
+
+        // Touch device
+        if (i == BUTTON_TOUCH) {
+            e.setString("device", cfg->device);
+            e.setBool("disableDrawing", cfg->disableDrawing);
+        }
+    }
+}
+
+/**
+ * Do not save settings until transactionEnd() is called
+ */
+void Settings::transactionStart() { inTransaction = true; }
+
+/**
+ * Stop transaction and save settings
+ */
+void Settings::transactionEnd() {
+    inTransaction = false;
+    save();
+}
+
+void Settings::save() {
+    if (inTransaction) {
+        return;
+    }
+
+    xmlDocPtr doc = nullptr;
+    xmlNodePtr root = nullptr;
+    xmlNodePtr xmlNode = nullptr;
+
+    xmlIndentTreeOutput = true;
+
+    doc = xmlNewDoc(reinterpret_cast<const xmlChar*>("1.0"));
+    if (doc == nullptr) {
+        return;
+    }
+
+    saveButtonConfig();
+    saveDeviceClasses();
+
+    /* Create metadata root */
+    root = xmlNewDocNode(doc, nullptr, reinterpret_cast<const xmlChar*>("settings"), nullptr);
+    xmlDocSetRootElement(doc, root);
+    xmlNodePtr com = xmlNewComment(
+            reinterpret_cast<const xmlChar*>("The Xournal++ settings file. Do not edit this file! "
+                                             "Most settings are available in the Settings dialog, "
+                                             "the others are commented in this file, but handle with care!"));
+    xmlAddPrevSibling(root, com);
+
+    SAVE_BOOL_PROP(pressureSensitivity);
+    SAVE_DOUBLE_PROP(minimumPressure);
+    SAVE_DOUBLE_PROP(pressureMultiplier);
+
+    SAVE_BOOL_PROP(zoomGesturesEnabled);
+
+    SAVE_STRING_PROP(selectedToolbar);
+
+    saveProperty("lastSavePath", char_cast(this->lastSavePath.u8string().c_str()), root);
+    saveProperty("lastOpenPath", char_cast(this->lastOpenPath.u8string().c_str()), root);
+    saveProperty("lastImagePath", char_cast(this->lastImagePath.u8string().c_str()), root);
+
+    SAVE_DOUBLE_PROP(edgePanSpeed);
+    SAVE_DOUBLE_PROP(edgePanMaxMult);
+    SAVE_DOUBLE_PROP(zoomStep);
+    SAVE_DOUBLE_PROP(zoomStepScroll);
+    SAVE_INT_PROP(displayDpi);
+    SAVE_INT_PROP(mainWndWidth);
+    SAVE_INT_PROP(mainWndHeight);
+    SAVE_BOOL_PROP(maximized);
+
+    SAVE_BOOL_PROP(showToolbar);
+
+    SAVE_BOOL_PROP(showSidebar);
+    SAVE_INT_PROP(sidebarWidth);
+    xmlNode = saveProperty("sidebarNumberingStyle", static_cast<int>(sidebarNumberingStyle), root);
+
+    SAVE_BOOL_PROP(sidebarOnRight);
+    SAVE_BOOL_PROP(scrollbarOnLeft);
+    SAVE_BOOL_PROP(menubarVisible);
+    SAVE_BOOL_PROP(filepathShownInTitlebar);
+    SAVE_BOOL_PROP(pageNumberShownInTitlebar);
+    SAVE_INT_PROP(numColumns);
+    SAVE_INT_PROP(numRows);
+    SAVE_BOOL_PROP(viewFixedRows);
+    SAVE_BOOL_PROP(showPairedPages);
+    SAVE_BOOL_PROP(layoutVertical);
+    SAVE_BOOL_PROP(layoutRightToLeft);
+    SAVE_BOOL_PROP(layoutBottomToTop);
+    SAVE_INT_PROP(numPairsOffset);
+    xmlNode = saveProperty("emptyLastPageAppend", emptyLastPageAppendToString(this->emptyLastPageAppend), root);
+    ATTACH_COMMENT("The icon theme, allowed values are \"disabled\", \"onDrawOfLastPage\", and \"onScrollOfLastPage\"");
+    SAVE_BOOL_PROP(presentationMode);
+
+    auto defaultViewModeAttributes = viewModeToSettingsString(viewModes.at(PresetViewModeIds::VIEW_MODE_DEFAULT));
+    auto fullscreenViewModeAttributes = viewModeToSettingsString(viewModes.at(PresetViewModeIds::VIEW_MODE_FULLSCREEN));
+    auto presentationViewModeAttributes =
+            viewModeToSettingsString(viewModes.at(PresetViewModeIds::VIEW_MODE_PRESENTATION));
+    SAVE_STRING_PROP(defaultViewModeAttributes);
+    ATTACH_COMMENT("Which GUI elements are shown in default view mode, separated by a colon (,)");
+    SAVE_STRING_PROP(fullscreenViewModeAttributes);
+    ATTACH_COMMENT("Which GUI elements are shown in fullscreen view mode, separated by a colon (,)");
+    SAVE_STRING_PROP(presentationViewModeAttributes);
+    ATTACH_COMMENT("Which GUI elements are shown in presentation view mode, separated by a colon (,)");
+
+    xmlNode = saveProperty("stylusCursorType", stylusCursorTypeToString(this->stylusCursorType), root);
+    ATTACH_COMMENT("The cursor icon used with a stylus, allowed values are \"none\", \"dot\", \"big\", \"arrow\"");
+
+    xmlNode = saveProperty("eraserVisibility", eraserVisibilityToString(this->eraserVisibility), root);
+    ATTACH_COMMENT("The eraser cursor visibility used with a stylus, allowed values are \"never\", \"always\", "
+                   "\"hover\", \"touch\"");
+
+    xmlNode = saveProperty("iconTheme", iconThemeToString(this->iconTheme), root);
+    ATTACH_COMMENT("The icon theme, allowed values are \"iconsColor\", \"iconsLucide\"");
+
+    xmlNode = saveProperty("themeVariant", themeVariantToString(this->themeVariant), root);
+    ATTACH_COMMENT("Dark/light mode, allowed values are \"useSystem\", \"forceLight\", \"forceDark\"");
+
+    SAVE_BOOL_PROP(highlightPosition);
+    xmlNode = savePropertyUnsigned("cursorHighlightColor", uint32_t(cursorHighlightColor), root);
+    xmlNode = savePropertyUnsigned("cursorHighlightBorderColor", uint32_t(cursorHighlightBorderColor), root);
+    SAVE_DOUBLE_PROP(cursorHighlightRadius);
+    SAVE_DOUBLE_PROP(cursorHighlightBorderWidth);
+    SAVE_BOOL_PROP(useStockIcons);
+
+    SAVE_BOOL_PROP(disableScrollbarFadeout);
+    SAVE_BOOL_PROP(disableAudio);
+
+    if (this->scrollbarHideType == SCROLLBAR_HIDE_BOTH) {
+        xmlNode = saveProperty("scrollbarHideType", "both", root);
+    } else if (this->scrollbarHideType == SCROLLBAR_HIDE_HORIZONTAL) {
+        xmlNode = saveProperty("scrollbarHideType", "horizontal", root);
+    } else if (this->scrollbarHideType == SCROLLBAR_HIDE_VERTICAL) {
+        xmlNode = saveProperty("scrollbarHideType", "vertical", root);
+    } else {
+        xmlNode = saveProperty("scrollbarHideType", "none", root);
+    }
+    ATTACH_COMMENT("Hides scroolbars in the main window, allowed values: \"none\", \"horizontal\", \"vertical\", "
+                   "\"both\"");
+
+    SAVE_BOOL_PROP(autoloadMostRecent);
+    SAVE_BOOL_PROP(autoloadPdfXoj);
+    saveProperty("defaultSaveName", defaultSaveName.empty() ? "" : char_cast(defaultSaveName.c_str()), root);
+    saveProperty("defaultPdfExportName", defaultPdfExportName.empty() ? "" : char_cast(defaultPdfExportName.c_str()),
+                 root);
+
+    SAVE_BOOL_PROP(autosaveEnabled);
+    SAVE_INT_PROP(autosaveTimeout);
+
+    SAVE_BOOL_PROP(addHorizontalSpace);
+    SAVE_INT_PROP(addHorizontalSpaceAmountRight);
+    SAVE_INT_PROP(addHorizontalSpaceAmountLeft);
+    SAVE_BOOL_PROP(addVerticalSpace);
+    SAVE_INT_PROP(addVerticalSpaceAmountAbove);
+    SAVE_INT_PROP(addVerticalSpaceAmountBelow);
+
+    SAVE_BOOL_PROP(unlimitedScrolling);
+
+    SAVE_BOOL_PROP(drawDirModsEnabled);
+    SAVE_INT_PROP(drawDirModsRadius);
+
+
+    SAVE_BOOL_PROP(snapRotation);
+    SAVE_DOUBLE_PROP(snapRotationTolerance);
+    SAVE_BOOL_PROP(snapGrid);
+    SAVE_DOUBLE_PROP(snapGridTolerance);
+    SAVE_DOUBLE_PROP(snapGridSize);
+
+    SAVE_DOUBLE_PROP(strokeRecognizerMinSize);
+
+    SAVE_BOOL_PROP(touchDrawing);
+    SAVE_BOOL_PROP(gtkTouchInertialScrolling);
+    SAVE_BOOL_PROP(pressureGuessing);
+
+    xmlNode = saveProperty("recolor.enabled", recolorParameters.recolorizeMainView ? "true" : "false", root);
+    xmlNode = saveProperty("recolor.sidebar", recolorParameters.recolorizeSidebarMiniatures ? "true" : "false", root);
+    xmlNode = savePropertyUnsigned("recolor.dark", uint32_t(recolorParameters.recolor.getDark()), root);
+    xmlNode = savePropertyUnsigned("recolor.light", uint32_t(recolorParameters.recolor.getLight()), root);
+
+    xmlNode = savePropertyUnsigned("selectionBorderColor", uint32_t(selectionBorderColor), root);
+    xmlNode = savePropertyUnsigned("backgroundColor", uint32_t(backgroundColor), root);
+    xmlNode = savePropertyUnsigned("selectionMarkerColor", uint32_t(selectionMarkerColor), root);
+    xmlNode = savePropertyUnsigned("activeSelectionColor", uint32_t(activeSelectionColor), root);
+
+    SAVE_DOUBLE_PROP(touchZoomStartThreshold);
+    SAVE_DOUBLE_PROP(pageRerenderThreshold);
+
+    SAVE_INT_PROP(pdfPageCacheSize);
+    ATTACH_COMMENT("The count of rendered PDF pages which will be cached.");
+    SAVE_UINT_PROP(preloadPagesBefore);
+    SAVE_UINT_PROP(preloadPagesAfter);
+    SAVE_BOOL_PROP(eagerPageCleanup);
+
+    SAVE_STRING_PROP(pageTemplate);
+    ATTACH_COMMENT("Config for new pages");
+
+    SAVE_STRING_PROP(sizeUnit);
+
+#ifdef ENABLE_AUDIO
+    saveProperty("audioFolder", char_cast(this->audioFolder.u8string().c_str()), root);
+    SAVE_INT_PROP(audioInputDevice);
+    SAVE_INT_PROP(audioOutputDevice);
+    SAVE_DOUBLE_PROP(audioSampleRate);
+    SAVE_DOUBLE_PROP(audioGain);
+    SAVE_INT_PROP(defaultSeekTime);
+#endif
+
+    SAVE_STRING_PROP(pluginEnabled);
+    SAVE_STRING_PROP(pluginDisabled);
+
+    SAVE_INT_PROP(strokeFilterIgnoreTime);
+    SAVE_DOUBLE_PROP(strokeFilterIgnoreLength);
+    SAVE_INT_PROP(strokeFilterSuccessiveTime);
+    SAVE_BOOL_PROP(strokeFilterEnabled);
+    SAVE_BOOL_PROP(doActionOnStrokeFiltered);
+    SAVE_BOOL_PROP(trySelectOnStrokeFiltered);
+
+    SAVE_BOOL_PROP(snapRecognizedShapesEnabled);
+    SAVE_BOOL_PROP(restoreLineWidthEnabled);
+
+    SAVE_INT_PROP(numIgnoredStylusEvents);
+
+    SAVE_BOOL_PROP(inputSystemTPCButton);
+    SAVE_BOOL_PROP(inputSystemDrawOutsideWindow);
+
+    SAVE_STRING_PROP(preferredLocale);
+
+    SAVE_BOOL_PROP(useSpacesForTab);
+    SAVE_UINT_PROP(numberOfSpacesForTab);
+
+    SAVE_UINT_PROP(laserPointerFadeOutTime);
+
+    /**
+     * Stabilizer related settings
+     */
+    saveProperty("stabilizerAveragingMethod", static_cast<int>(stabilizerAveragingMethod), root);
+    saveProperty("stabilizerPreprocessor", static_cast<int>(stabilizerPreprocessor), root);
+    SAVE_UINT_PROP(stabilizerBuffersize);
+    SAVE_DOUBLE_PROP(stabilizerSigma);
+    SAVE_DOUBLE_PROP(stabilizerDeadzoneRadius);
+    SAVE_DOUBLE_PROP(stabilizerDrag);
+    SAVE_DOUBLE_PROP(stabilizerMass);
+    SAVE_BOOL_PROP(stabilizerCuspDetection);
+    SAVE_BOOL_PROP(stabilizerFinalizeStroke);
+
+    if (!this->colorPaletteSetting.empty()) {
+        saveProperty("colorPalette", char_cast(this->colorPaletteSetting.u8string().c_str()), root);
+    }
+
+    /**/
+
+    SAVE_BOOL_PROP(latexSettings.autoCheckDependencies);
+    SAVE_STRING_PROP(latexSettings.defaultText);
+    // Inline SAVE_STRING_PROP(latexSettings.globalTemplatePath) since it
+    // breaks on Windows due to the native character representation being
+    // wchar_t instead of char
+    fs::path& p = latexSettings.globalTemplatePath;
+    xmlNode = saveProperty("latexSettings.globalTemplatePath", p.empty() ? "" : char_cast(p.u8string().c_str()), root);
+    SAVE_STRING_PROP(latexSettings.genCmd);
+    SAVE_STRING_PROP(latexSettings.sourceViewThemeId);
+    SAVE_FONT_PROP(latexSettings.editorFont);
+    SAVE_BOOL_PROP(latexSettings.useCustomEditorFont);
+    SAVE_BOOL_PROP(latexSettings.editorWordWrap);
+    SAVE_BOOL_PROP(latexSettings.sourceViewAutoIndent);
+    SAVE_BOOL_PROP(latexSettings.sourceViewSyntaxHighlight);
+    SAVE_BOOL_PROP(latexSettings.sourceViewShowLineNumbers);
+    SAVE_BOOL_PROP(latexSettings.useExternalEditor);
+    SAVE_BOOL_PROP(latexSettings.externalEditorAutoConfirm);
+    SAVE_STRING_PROP(latexSettings.externalEditorCmd);
+    SAVE_STRING_PROP(latexSettings.temporaryFileExt);
+
+    xmlNodePtr xmlFont = nullptr;
+    xmlFont = xmlNewChild(root, nullptr, reinterpret_cast<const xmlChar*>("property"), nullptr);
+    xmlSetProp(xmlFont, reinterpret_cast<const xmlChar*>("name"), reinterpret_cast<const xmlChar*>("font"));
+    xmlSetProp(xmlFont, reinterpret_cast<const xmlChar*>("font"),
+               reinterpret_cast<const xmlChar*>(this->font.getName().c_str()));
+
+    char sSize[G_ASCII_DTOSTR_BUF_SIZE];
+
+    g_ascii_formatd(sSize, G_ASCII_DTOSTR_BUF_SIZE, Util::PRECISION_FORMAT_STRING,
+                    this->font.getSize());  // no locale
+    xmlSetProp(xmlFont, reinterpret_cast<const xmlChar*>("size"), reinterpret_cast<const xmlChar*>(sSize));
+
+
+    for (std::map<string, SElement>::value_type p: data) {
+        saveData(root, p.first, p.second);
+    }
+
+    xmlSaveFormatFileEnc(char_cast(filepath.u8string().c_str()), doc, "UTF-8", 1);
+    xmlFreeDoc(doc);
+}
+
+void Settings::saveData(xmlNodePtr root, const string& name, SElement& elem) {
+    xmlNodePtr xmlNode = xmlNewChild(root, nullptr, reinterpret_cast<const xmlChar*>("data"), nullptr);
+
+    xmlSetProp(xmlNode, reinterpret_cast<const xmlChar*>("name"), reinterpret_cast<const xmlChar*>(name.c_str()));
+
+    for (auto const& [aname, attrib]: elem.attributes()) {
+        string type;
+        string value;
+
+        if (attrib.type == ATTRIBUTE_TYPE_BOOLEAN) {
+            type = "boolean";
+
+            if (attrib.iValue) {
+                value = "true";
+            } else {
+                value = "false";
+            }
+        } else if (attrib.type == ATTRIBUTE_TYPE_INT) {
+            type = "int";
+
+            char* tmp = g_strdup_printf("%i", attrib.iValue);
+            value = tmp;
+            g_free(tmp);
+        } else if (attrib.type == ATTRIBUTE_TYPE_DOUBLE) {
+            type = "double";
+
+            char tmp[G_ASCII_DTOSTR_BUF_SIZE];
+            g_ascii_formatd(tmp, G_ASCII_DTOSTR_BUF_SIZE, Util::PRECISION_FORMAT_STRING, attrib.dValue);
+            value = tmp;
+        } else if (attrib.type == ATTRIBUTE_TYPE_INT_HEX) {
+            type = "hex";
+
+            char* tmp = g_strdup_printf("%06x", attrib.iValue);
+            value = tmp;
+            g_free(tmp);
+        } else if (attrib.type == ATTRIBUTE_TYPE_STRING) {
+            type = "string";
+            value = attrib.sValue;
+        } else {
+            // Unknown type or empty attribute
+            continue;
+        }
+
+        xmlNodePtr at = nullptr;
+        at = xmlNewChild(xmlNode, nullptr, reinterpret_cast<const xmlChar*>("attribute"), nullptr);
+
+        xmlSetProp(at, reinterpret_cast<const xmlChar*>("name"), reinterpret_cast<const xmlChar*>(aname.c_str()));
+        xmlSetProp(at, reinterpret_cast<const xmlChar*>("type"), reinterpret_cast<const xmlChar*>(type.c_str()));
+        xmlSetProp(at, reinterpret_cast<const xmlChar*>("value"), reinterpret_cast<const xmlChar*>(value.c_str()));
+
+        if (!attrib.comment.empty()) {
+            xmlNodePtr com = xmlNewComment(reinterpret_cast<const xmlChar*>(attrib.comment.c_str()));
+            xmlAddPrevSibling(xmlNode, com);
+        }
+    }
+
+    for (std::map<string, SElement>::value_type p: elem.children()) {
+        saveData(xmlNode, p.first, p.second);
+    }
+}
+
+// Getter- / Setter
+auto Settings::isPressureSensitivity() const -> bool { return this->pressureSensitivity; }
+
+auto Settings::isZoomGesturesEnabled() const -> bool { return this->zoomGesturesEnabled; }
+
+void Settings::setZoomGesturesEnabled(bool enable) {
+    if (this->zoomGesturesEnabled == enable) {
+        return;
+    }
+    this->zoomGesturesEnabled = enable;
+    save();
+}
+
+auto Settings::isSidebarOnRight() const -> bool { return this->sidebarOnRight; }
+
+void Settings::setSidebarOnRight(bool right) {
+    if (this->sidebarOnRight == right) {
+        return;
+    }
+
+    this->sidebarOnRight = right;
+
+    save();
+}
+
+auto Settings::isScrollbarOnLeft() const -> bool { return this->scrollbarOnLeft; }
+
+void Settings::setScrollbarOnLeft(bool right) {
+    if (this->scrollbarOnLeft == right) {
+        return;
+    }
+
+    this->scrollbarOnLeft = right;
+
+    save();
+}
+
+auto Settings::isMenubarVisible() const -> bool { return this->menubarVisible; }
+
+void Settings::setMenubarVisible(bool visible) {
+    if (this->menubarVisible == visible) {
+        return;
+    }
+
+    this->menubarVisible = visible;
+
+    save();
+}
+
+const bool Settings::isFilepathInTitlebarShown() const { return this->filepathShownInTitlebar; }
+
+void Settings::setFilepathInTitlebarShown(const bool shown) {
+    if (this->filepathShownInTitlebar == shown) {
+        return;
+    }
+
+    this->filepathShownInTitlebar = shown;
+
+    save();
+}
+
+const bool Settings::isPageNumberInTitlebarShown() const { return this->pageNumberShownInTitlebar; }
+
+void Settings::setPageNumberInTitlebarShown(const bool shown) {
+    if (this->pageNumberShownInTitlebar == shown) {
+        return;
+    }
+
+    this->pageNumberShownInTitlebar = shown;
+
+    save();
+}
+
+auto Settings::getAutosaveTimeout() const -> int { return this->autosaveTimeout; }
+
+void Settings::setAutosaveTimeout(int autosave) {
+    if (this->autosaveTimeout == autosave) {
+        return;
+    }
+
+    this->autosaveTimeout = autosave;
+
+    save();
+}
+
+auto Settings::isAutosaveEnabled() const -> bool { return this->autosaveEnabled; }
+
+void Settings::setAutosaveEnabled(bool autosave) {
+    if (this->autosaveEnabled == autosave) {
+        return;
+    }
+
+    this->autosaveEnabled = autosave;
+
+    save();
+}
+
+auto Settings::getAddVerticalSpace() const -> bool { return this->addVerticalSpace; }
+
+void Settings::setAddVerticalSpace(bool space) { this->addVerticalSpace = space; }
+
+auto Settings::getAddVerticalSpaceAmountAbove() const -> int { return this->addVerticalSpaceAmountAbove; }
+
+void Settings::setAddVerticalSpaceAmountAbove(int pixels) {
+    if (this->addVerticalSpaceAmountAbove == pixels) {
+        return;
+    }
+
+    this->addVerticalSpaceAmountAbove = pixels;
+}
+
+auto Settings::getAddVerticalSpaceAmountBelow() const -> int { return this->addVerticalSpaceAmountBelow; }
+
+void Settings::setAddVerticalSpaceAmountBelow(int pixels) {
+    if (this->addVerticalSpaceAmountBelow == pixels) {
+        return;
+    }
+
+    this->addVerticalSpaceAmountBelow = pixels;
+}
+
+
+auto Settings::getAddHorizontalSpace() const -> bool { return this->addHorizontalSpace; }
+
+void Settings::setAddHorizontalSpace(bool space) { this->addHorizontalSpace = space; }
+
+auto Settings::getAddHorizontalSpaceAmountRight() const -> int { return this->addHorizontalSpaceAmountRight; }
+
+void Settings::setAddHorizontalSpaceAmountRight(int pixels) {
+    if (this->addHorizontalSpaceAmountRight == pixels) {
+        return;
+    }
+
+    this->addHorizontalSpaceAmountRight = pixels;
+}
+
+auto Settings::getAddHorizontalSpaceAmountLeft() const -> int { return this->addHorizontalSpaceAmountLeft; }
+
+void Settings::setAddHorizontalSpaceAmountLeft(int pixels) {
+    if (this->addHorizontalSpaceAmountLeft == pixels) {
+        return;
+    }
+
+    this->addHorizontalSpaceAmountLeft = pixels;
+}
+
+auto Settings::getUnlimitedScrolling() const -> bool { return this->unlimitedScrolling; }
+
+void Settings::setUnlimitedScrolling(bool enable) {
+    if (enable == this->unlimitedScrolling) {
+        return;
+    }
+
+    this->unlimitedScrolling = enable;
+}
+
+auto Settings::getDrawDirModsEnabled() const -> bool { return this->drawDirModsEnabled; }
+
+void Settings::setDrawDirModsEnabled(bool enable) { this->drawDirModsEnabled = enable; }
+
+auto Settings::getDrawDirModsRadius() const -> int { return this->drawDirModsRadius; }
+
+void Settings::setDrawDirModsRadius(int pixels) {
+    if (this->drawDirModsRadius == pixels) {
+        return;
+    }
+
+    this->drawDirModsRadius = pixels;
+    save();
+}
+
+auto Settings::getStylusCursorType() const -> StylusCursorType { return this->stylusCursorType; }
+
+void Settings::setStylusCursorType(StylusCursorType type) {
+    if (this->stylusCursorType == type) {
+        return;
+    }
+
+    this->stylusCursorType = type;
+
+    save();
+}
+
+auto Settings::getEraserVisibility() const -> EraserVisibility { return this->eraserVisibility; }
+
+void Settings::setEraserVisibility(EraserVisibility eraserVisibility) {
+    if (this->eraserVisibility == eraserVisibility) {
+        return;
+    }
+
+    this->eraserVisibility = eraserVisibility;
+
+    save();
+}
+
+auto Settings::getIconTheme() const -> IconTheme { return this->iconTheme; }
+
+void Settings::setIconTheme(IconTheme iconTheme) {
+    if (this->iconTheme == iconTheme) {
+        return;
+    }
+
+    this->iconTheme = iconTheme;
+
+    save();
+}
+
+auto Settings::getThemeVariant() const -> ThemeVariant { return this->themeVariant; }
+
+void Settings::setThemeVariant(ThemeVariant theme) {
+    if (this->themeVariant == theme) {
+        return;
+    }
+    this->themeVariant = theme;
+    save();
+}
+
+auto Settings::getSidebarNumberingStyle() const -> SidebarNumberingStyle { return this->sidebarNumberingStyle; };
+
+void Settings::setSidebarNumberingStyle(SidebarNumberingStyle numberingStyle) {
+    if (this->sidebarNumberingStyle == numberingStyle) {
+        return;
+    }
+
+    this->sidebarNumberingStyle = numberingStyle;
+
+    save();
+}
+
+auto Settings::isHighlightPosition() const -> bool { return this->highlightPosition; }
+
+void Settings::setHighlightPosition(bool highlight) {
+    if (this->highlightPosition == highlight) {
+        return;
+    }
+
+    this->highlightPosition = highlight;
+    save();
+}
+
+auto Settings::getCursorHighlightColor() const -> Color { return this->cursorHighlightColor; }
+
+void Settings::setCursorHighlightColor(Color color) {
+    if (this->cursorHighlightColor != color) {
+        this->cursorHighlightColor = color;
+        save();
+    }
+}
+
+auto Settings::getCursorHighlightRadius() const -> double { return this->cursorHighlightRadius; }
+
+void Settings::setCursorHighlightRadius(double radius) {
+    if (this->cursorHighlightRadius != radius) {
+        this->cursorHighlightRadius = radius;
+        save();
+    }
+}
+
+auto Settings::getCursorHighlightBorderColor() const -> Color { return this->cursorHighlightBorderColor; }
+
+void Settings::setCursorHighlightBorderColor(Color color) {
+    if (this->cursorHighlightBorderColor != color) {
+        this->cursorHighlightBorderColor = color;
+        save();
+    }
+}
+
+auto Settings::getCursorHighlightBorderWidth() const -> double { return this->cursorHighlightBorderWidth; }
+
+void Settings::setCursorHighlightBorderWidth(double radius) {
+    if (this->cursorHighlightBorderWidth != radius) {
+        this->cursorHighlightBorderWidth = radius;
+        save();
+    }
+}
+
+auto Settings::isSnapRotation() const -> bool { return this->snapRotation; }
+
+void Settings::setSnapRotation(bool b) {
+    if (this->snapRotation == b) {
+        return;
+    }
+
+    this->snapRotation = b;
+    save();
+}
+
+auto Settings::getSnapRotationTolerance() const -> double { return this->snapRotationTolerance; }
+
+void Settings::setSnapRotationTolerance(double tolerance) {
+    this->snapRotationTolerance = tolerance;
+    save();
+}
+
+auto Settings::isSnapGrid() const -> bool { return this->snapGrid; }
+
+void Settings::setSnapGrid(bool b) {
+    if (this->snapGrid == b) {
+        return;
+    }
+
+    this->snapGrid = b;
+    save();
+}
+
+void Settings::setSnapGridTolerance(double tolerance) {
+    this->snapGridTolerance = tolerance;
+    save();
+}
+
+auto Settings::getSnapGridTolerance() const -> double { return this->snapGridTolerance; }
+auto Settings::getSnapGridSize() const -> double { return this->snapGridSize; };
+void Settings::setSnapGridSize(double gridSize) {
+    if (this->snapGridSize == gridSize) {
+        return;
+    }
+    this->snapGridSize = gridSize;
+    save();
+}
+
+auto Settings::getStrokeRecognizerMinSize() const -> double { return this->strokeRecognizerMinSize; };
+void Settings::setStrokeRecognizerMinSize(double value) {
+    if (this->strokeRecognizerMinSize == value) {
+        return;
+    }
+
+    this->strokeRecognizerMinSize = value;
+    save();
+};
+
+auto Settings::getTouchDrawingEnabled() const -> bool { return this->touchDrawing; }
+
+void Settings::setTouchDrawingEnabled(bool b) {
+    if (this->touchDrawing == b) {
+        return;
+    }
+
+    this->touchDrawing = b;
+    save();
+}
+
+auto Settings::getGtkTouchInertialScrollingEnabled() const -> bool { return this->gtkTouchInertialScrolling; };
+
+void Settings::setGtkTouchInertialScrollingEnabled(bool b) {
+    if (this->gtkTouchInertialScrolling == b) {
+        return;
+    }
+
+    this->gtkTouchInertialScrolling = b;
+    save();
+}
+
+auto Settings::isPressureGuessingEnabled() const -> bool { return this->pressureGuessing; }
+void Settings::setPressureGuessingEnabled(bool b) {
+    if (this->pressureGuessing == b) {
+        return;
+    }
+
+    this->pressureGuessing = b;
+    save();
+}
+
+double Settings::getMinimumPressure() const { return this->minimumPressure; }
+void Settings::setMinimumPressure(double minimumPressure) {
+    if (this->minimumPressure == minimumPressure) {
+        return;
+    }
+
+    this->minimumPressure = minimumPressure;
+    save();
+}
+
+double Settings::getPressureMultiplier() const { return this->pressureMultiplier; }
+void Settings::setPressureMultiplier(double multiplier) {
+    if (this->pressureMultiplier == multiplier) {
+        return;
+    }
+
+    this->pressureMultiplier = multiplier;
+    save();
+}
+
+auto Settings::getScrollbarHideType() const -> ScrollbarHideType { return this->scrollbarHideType; }
+
+void Settings::setScrollbarHideType(ScrollbarHideType type) {
+    if (this->scrollbarHideType == type) {
+        return;
+    }
+
+    this->scrollbarHideType = type;
+
+    save();
+}
+
+auto Settings::isAutoloadMostRecent() const -> bool { return this->autoloadMostRecent; }
+
+void Settings::setAutoloadMostRecent(bool load) {
+    if (this->autoloadMostRecent == load) {
+        return;
+    }
+    this->autoloadMostRecent = load;
+    save();
+}
+
+auto Settings::isAutoloadPdfXoj() const -> bool { return this->autoloadPdfXoj; }
+
+void Settings::setAutoloadPdfXoj(bool load) {
+    if (this->autoloadPdfXoj == load) {
+        return;
+    }
+    this->autoloadPdfXoj = load;
+    save();
+}
+
+auto Settings::getDefaultSaveName() const -> std::u8string const& { return this->defaultSaveName; }
+
+void Settings::setDefaultSaveName(const std::u8string& name) {
+    if (this->defaultSaveName == name) {
+        return;
+    }
+
+    this->defaultSaveName = name;
+
+    save();
+}
+
+auto Settings::getDefaultPdfExportName() const -> std::u8string const& { return this->defaultPdfExportName; }
+
+void Settings::setDefaultPdfExportName(const std::u8string& name) {
+    if (this->defaultPdfExportName == name) {
+        return;
+    }
+
+    this->defaultPdfExportName = name;
+
+    save();
+}
+
+auto Settings::getPageTemplate() const -> string const& { return this->pageTemplate; }
+
+auto Settings::getPageTemplateSettings() const -> PageTemplateSettings {
+    PageTemplateSettings model;
+    model.parse(this->pageTemplate);
+    return model;
+}
+
+void Settings::setPageTemplate(const string& pageTemplate) {
+    if (this->pageTemplate == pageTemplate) {
+        return;
+    }
+
+    this->pageTemplate = pageTemplate;
+
+    save();
+}
+
+auto Settings::getSizeUnit() const -> string const& { return sizeUnit; }
+
+void Settings::setSizeUnit(const string& sizeUnit) {
+    if (this->sizeUnit == sizeUnit) {
+        return;
+    }
+
+    this->sizeUnit = sizeUnit;
+
+    save();
+}
+
+/**
+ * Get size index in XOJ_UNITS
+ */
+auto Settings::getSizeUnitIndex() const -> int {
+    string unit = getSizeUnit();
+
+    for (int i = 0; i < XOJ_UNIT_COUNT; i++) {
+        if (unit == XOJ_UNITS[i].name) {
+            return i;
+        }
+    }
+
+    return 0;
+}
+
+/**
+ * Set size index in XOJ_UNITS
+ */
+void Settings::setSizeUnitIndex(int sizeUnitId) {
+    if (sizeUnitId < 0 || sizeUnitId >= XOJ_UNIT_COUNT) {
+        sizeUnitId = 0;
+    }
+
+    setSizeUnit(XOJ_UNITS[sizeUnitId].name);
+}
+
+void Settings::setShowPairedPages(bool showPairedPages) {
+    if (this->showPairedPages == showPairedPages) {
+        return;
+    }
+
+    this->showPairedPages = showPairedPages;
+    save();
+}
+
+auto Settings::isShowPairedPages() const -> bool { return this->showPairedPages; }
+
+void Settings::setPresentationMode(bool presentationMode) {
+    if (this->presentationMode == presentationMode) {
+        return;
+    }
+    if (presentationMode) {
+        this->activeViewMode = PresetViewModeIds::VIEW_MODE_PRESENTATION;
+    }
+    this->presentationMode = presentationMode;
+    save();
+}
+
+auto Settings::isPresentationMode() const -> bool {
+    return this->activeViewMode == PresetViewModeIds::VIEW_MODE_PRESENTATION;
+}
+
+void Settings::setPressureSensitivity(gboolean presureSensitivity) {
+    if (this->pressureSensitivity == presureSensitivity) {
+        return;
+    }
+    this->pressureSensitivity = presureSensitivity;
+
+    save();
+}
+
+void Settings::setPairsOffset(int numOffset) {
+    if (this->numPairsOffset == numOffset) {
+        return;
+    }
+
+    this->numPairsOffset = numOffset;
+    save();
+}
+
+auto Settings::getPairsOffset() const -> int { return this->numPairsOffset; }
+
+void Settings::setEmptyLastPageAppend(EmptyLastPageAppendType emptyLastPageAppend) {
+    if (this->emptyLastPageAppend == emptyLastPageAppend) {
+        return;
+    }
+
+    this->emptyLastPageAppend = emptyLastPageAppend;
+    save();
+}
+
+auto Settings::getEmptyLastPageAppend() const -> EmptyLastPageAppendType { return this->emptyLastPageAppend; }
+
+void Settings::setViewColumns(int numColumns) {
+    if (this->numColumns == numColumns) {
+        return;
+    }
+
+    this->numColumns = numColumns;
+    save();
+}
+
+auto Settings::getViewColumns() const -> int { return this->numColumns; }
+
+
+void Settings::setViewRows(int numRows) {
+    if (this->numRows == numRows) {
+        return;
+    }
+
+    this->numRows = numRows;
+    save();
+}
+
+auto Settings::getViewRows() const -> int { return this->numRows; }
+
+void Settings::setViewFixedRows(bool viewFixedRows) {
+    if (this->viewFixedRows == viewFixedRows) {
+        return;
+    }
+
+    this->viewFixedRows = viewFixedRows;
+    save();
+}
+
+auto Settings::isViewFixedRows() const -> bool { return this->viewFixedRows; }
+
+void Settings::setViewLayoutVert(bool vert) {
+    if (this->layoutVertical == vert) {
+        return;
+    }
+
+    this->layoutVertical = vert;
+    save();
+}
+
+auto Settings::getViewLayoutVert() const -> bool { return this->layoutVertical; }
+
+void Settings::setViewLayoutR2L(bool r2l) {
+    if (this->layoutRightToLeft == r2l) {
+        return;
+    }
+
+    this->layoutRightToLeft = r2l;
+    save();
+}
+
+auto Settings::getViewLayoutR2L() const -> bool { return this->layoutRightToLeft; }
+
+void Settings::setViewLayoutB2T(bool b2t) {
+    if (this->layoutBottomToTop == b2t) {
+        return;
+    }
+
+    this->layoutBottomToTop = b2t;
+    save();
+}
+
+auto Settings::getViewLayoutB2T() const -> bool { return this->layoutBottomToTop; }
+
+void Settings::setLastSavePath(fs::path p) {
+    this->lastSavePath = std::move(p);
+    save();
+}
+
+auto Settings::getLastSavePath() const -> fs::path const& { return this->lastSavePath; }
+
+void Settings::setLastOpenPath(fs::path p) {
+    this->lastOpenPath = std::move(p);
+    save();
+}
+
+auto Settings::getLastOpenPath() const -> fs::path const& { return this->lastOpenPath; }
+
+void Settings::setLastImagePath(const fs::path& path) {
+    if (this->lastImagePath == path) {
+        return;
+    }
+    this->lastImagePath = path;
+    save();
+}
+
+auto Settings::getLastImagePath() const -> fs::path const& { return this->lastImagePath; }
+
+void Settings::setZoomStep(double zoomStep) {
+    if (this->zoomStep == zoomStep) {
+        return;
+    }
+    this->zoomStep = zoomStep;
+    save();
+}
+
+auto Settings::getZoomStep() const -> double { return this->zoomStep; }
+
+void Settings::setZoomStepScroll(double zoomStepScroll) {
+    if (this->zoomStepScroll == zoomStepScroll) {
+        return;
+    }
+    this->zoomStepScroll = zoomStepScroll;
+    save();
+}
+
+auto Settings::getZoomStepScroll() const -> double { return this->zoomStepScroll; }
+
+void Settings::setEdgePanSpeed(double speed) {
+    if (this->edgePanSpeed == speed) {
+        return;
+    }
+    this->edgePanSpeed = speed;
+    save();
+}
+
+auto Settings::getEdgePanSpeed() const -> double { return this->edgePanSpeed; }
+
+void Settings::setEdgePanMaxMult(double maxMult) {
+    if (this->edgePanMaxMult == maxMult) {
+        return;
+    }
+    this->edgePanMaxMult = maxMult;
+    save();
+}
+
+auto Settings::getEdgePanMaxMult() const -> double { return this->edgePanMaxMult; }
+
+void Settings::setDisplayDpi(int dpi) {
+    if (this->displayDpi == dpi) {
+        return;
+    }
+    this->displayDpi = dpi;
+    save();
+}
+
+auto Settings::getDisplayDpi() const -> int { return this->displayDpi; }
+
+void Settings::setAreStockIconsUsed(bool use) {
+    if (this->useStockIcons == use) {
+        return;
+    }
+    this->useStockIcons = use;
+    save();
+}
+
+auto Settings::areStockIconsUsed() const -> bool { return this->useStockIcons; }
+
+auto Settings::isFullscreen() const -> bool { return this->fullscreenActive; }
+
+auto Settings::isSidebarVisible() const -> bool { return this->showSidebar; }
+
+void Settings::setSidebarVisible(bool visible) {
+    if (this->showSidebar == visible) {
+        return;
+    }
+    this->showSidebar = visible;
+    save();
+}
+
+auto Settings::isToolbarVisible() const -> bool { return this->showToolbar; }
+
+void Settings::setToolbarVisible(bool visible) {
+    if (this->showToolbar == visible) {
+        return;
+    }
+    this->showToolbar = visible;
+    save();
+}
+
+auto Settings::getSidebarWidth() const -> int { return this->sidebarWidth; }
+
+void Settings::setSidebarWidth(int width) {
+    width = std::max(width, 50);
+
+    if (this->sidebarWidth == width) {
+        return;
+    }
+    this->sidebarWidth = width;
+    save();
+}
+
+void Settings::setMainWndSize(int width, int height) {
+    this->mainWndWidth = width;
+    this->mainWndHeight = height;
+
+    save();
+}
+
+auto Settings::getMainWndWidth() const -> int { return this->mainWndWidth; }
+
+auto Settings::getMainWndHeight() const -> int { return this->mainWndHeight; }
+
+auto Settings::isMainWndMaximized() const -> bool { return this->maximized; }
+
+void Settings::setMainWndMaximized(bool max) {
+    if (this->maximized == max) {
+        return;
+    }
+    this->maximized = max;
+    save();
+}
+
+void Settings::setSelectedToolbar(const string& name) {
+    if (this->selectedToolbar == name) {
+        return;
+    }
+    this->selectedToolbar = name;
+    save();
+}
+
+auto Settings::getSelectedToolbar() const -> string const& { return this->selectedToolbar; }
+
+auto Settings::getCustomElement(const string& name) -> SElement& { return this->data[name]; }
+
+void Settings::customSettingsChanged() { save(); }
+
+auto Settings::getButtonConfig(unsigned int id) -> ButtonConfig* {
+    if (id >= this->buttonConfig.size()) {
+        g_error("Settings::getButtonConfig try to get id=%i out of range!", id);
+        return nullptr;
+    }
+    return this->buttonConfig[id].get();
+}
+
+void Settings::setViewMode(ViewModeId mode, ViewMode viewMode) {
+    if (this->viewModes[mode] == viewMode) {
+        return;
+    }
+    this->viewModes.at(mode) = viewMode;
+    save();
+}
+
+auto Settings::getTouchZoomStartThreshold() const -> double { return this->touchZoomStartThreshold; }
+void Settings::setTouchZoomStartThreshold(double threshold) {
+    if (this->touchZoomStartThreshold == threshold) {
+        return;
+    }
+
+    this->touchZoomStartThreshold = threshold;
+    save();
+}
+
+
+auto Settings::getPDFPageRerenderThreshold() const -> double { return this->pageRerenderThreshold; }
+void Settings::setPDFPageRerenderThreshold(double threshold) {
+    if (this->pageRerenderThreshold == threshold) {
+        return;
+    }
+
+    this->pageRerenderThreshold = threshold;
+    save();
+}
+
+auto Settings::getPdfPageCacheSize() const -> int { return this->pdfPageCacheSize; }
+
+void Settings::setPdfPageCacheSize(int size) {
+    if (this->pdfPageCacheSize == size) {
+        return;
+    }
+    this->pdfPageCacheSize = size;
+    save();
+}
+
+auto Settings::getPreloadPagesBefore() const -> unsigned int { return this->preloadPagesBefore; }
+
+void Settings::setPreloadPagesBefore(unsigned int n) {
+    if (this->preloadPagesBefore == n) {
+        return;
+    }
+    this->preloadPagesBefore = n;
+    save();
+}
+
+auto Settings::getPreloadPagesAfter() const -> unsigned int { return this->preloadPagesAfter; }
+
+void Settings::setPreloadPagesAfter(unsigned int n) {
+    if (this->preloadPagesAfter == n) {
+        return;
+    }
+    this->preloadPagesAfter = n;
+    save();
+}
+
+auto Settings::isEagerPageCleanup() const -> bool { return this->eagerPageCleanup; }
+
+void Settings::setEagerPageCleanup(bool b) {
+    if (this->eagerPageCleanup == b) {
+        return;
+    }
+    this->eagerPageCleanup = b;
+    save();
+}
+
+auto Settings::getBorderColor() const -> Color { return this->selectionBorderColor; }
+
+void Settings::setBorderColor(Color color) {
+    if (this->selectionBorderColor == color) {
+        return;
+    }
+    this->selectionBorderColor = color;
+    save();
+}
+
+auto Settings::getSelectionColor() const -> Color { return this->selectionMarkerColor; }
+
+void Settings::setSelectionColor(Color color) {
+    if (this->selectionMarkerColor == color) {
+        return;
+    }
+    this->selectionMarkerColor = color;
+    save();
+}
+
+auto Settings::getActiveSelectionColor() const -> Color { return this->activeSelectionColor; }
+
+void Settings::setActiveSelectionColor(Color color) {
+    if (this->activeSelectionColor == color) {
+        return;
+    }
+    this->activeSelectionColor = color;
+    save();
+}
+
+auto Settings::getRecolorParameters() const -> const RecolorParameters& { return this->recolorParameters; }
+
+void Settings::setRecolorParameters(RecolorParameters&& recolor) {
+    if (this->recolorParameters == recolor) {
+        return;
+    }
+    this->recolorParameters = recolor;
+    save();
+}
+
+auto Settings::getBackgroundColor() const -> Color { return this->backgroundColor; }
+
+void Settings::setBackgroundColor(Color color) {
+    if (this->backgroundColor == color) {
+        return;
+    }
+    this->backgroundColor = color;
+    save();
+}
+
+auto Settings::getFont() -> XojFont& { return this->font; }
+
+void Settings::setFont(const XojFont& font) {
+    this->font = font;
+    save();
+}
+
+#ifdef ENABLE_AUDIO
+auto Settings::getAudioFolder() const -> fs::path const& { return this->audioFolder; }
+
+void Settings::setAudioFolder(fs::path audioFolder) {
+    if (this->audioFolder == audioFolder) {
+        return;
+    }
+
+    this->audioFolder = std::move(audioFolder);
+
+    save();
+}
+
+auto Settings::getAudioInputDevice() const -> PaDeviceIndex { return this->audioInputDevice; }
+
+void Settings::setAudioInputDevice(PaDeviceIndex deviceIndex) {
+    if (this->audioInputDevice == deviceIndex) {
+        return;
+    }
+    this->audioInputDevice = deviceIndex;
+    save();
+}
+
+auto Settings::getAudioOutputDevice() const -> PaDeviceIndex { return this->audioOutputDevice; }
+
+void Settings::setAudioOutputDevice(PaDeviceIndex deviceIndex) {
+    if (this->audioOutputDevice == deviceIndex) {
+        return;
+    }
+    this->audioOutputDevice = deviceIndex;
+    save();
+}
+
+auto Settings::getAudioSampleRate() const -> double { return this->audioSampleRate; }
+
+void Settings::setAudioSampleRate(double sampleRate) {
+    if (this->audioSampleRate == sampleRate) {
+        return;
+    }
+    this->audioSampleRate = sampleRate;
+    save();
+}
+
+auto Settings::getAudioGain() const -> double { return this->audioGain; }
+
+void Settings::setAudioGain(double gain) {
+    if (this->audioGain == gain) {
+        return;
+    }
+    this->audioGain = gain;
+    save();
+}
+
+auto Settings::getDefaultSeekTime() const -> unsigned int { return this->defaultSeekTime; }
+
+void Settings::setDefaultSeekTime(unsigned int t) {
+    if (this->defaultSeekTime == t) {
+        return;
+    }
+    this->defaultSeekTime = t;
+    save();
+}
+#endif
+
+auto Settings::getPluginEnabled() const -> string const& { return this->pluginEnabled; }
+
+void Settings::setPluginEnabled(const string& pluginEnabled) {
+    if (this->pluginEnabled == pluginEnabled) {
+        return;
+    }
+    this->pluginEnabled = pluginEnabled;
+    save();
+}
+
+auto Settings::getPluginDisabled() const -> string const& { return this->pluginDisabled; }
+
+void Settings::setPluginDisabled(const string& pluginDisabled) {
+    if (this->pluginDisabled == pluginDisabled) {
+        return;
+    }
+    this->pluginDisabled = pluginDisabled;
+    save();
+}
+
+
+void Settings::getStrokeFilter(int* ignoreTime, double* ignoreLength, int* successiveTime) const {
+    *ignoreTime = this->strokeFilterIgnoreTime;
+    *ignoreLength = this->strokeFilterIgnoreLength;
+    *successiveTime = this->strokeFilterSuccessiveTime;
+}
+
+void Settings::setStrokeFilter(int ignoreTime, double ignoreLength, int successiveTime) {
+    this->strokeFilterIgnoreTime = ignoreTime;
+    this->strokeFilterIgnoreLength = ignoreLength;
+    this->strokeFilterSuccessiveTime = successiveTime;
+}
+
+void Settings::setStrokeFilterEnabled(bool enabled) { this->strokeFilterEnabled = enabled; }
+
+auto Settings::getStrokeFilterEnabled() const -> bool { return this->strokeFilterEnabled; }
+
+void Settings::setDoActionOnStrokeFiltered(bool enabled) { this->doActionOnStrokeFiltered = enabled; }
+
+auto Settings::getDoActionOnStrokeFiltered() const -> bool { return this->doActionOnStrokeFiltered; }
+
+void Settings::setTrySelectOnStrokeFiltered(bool enabled) { this->trySelectOnStrokeFiltered = enabled; }
+
+auto Settings::getTrySelectOnStrokeFiltered() const -> bool { return this->trySelectOnStrokeFiltered; }
+
+void Settings::setSnapRecognizedShapesEnabled(bool enabled) { this->snapRecognizedShapesEnabled = enabled; }
+
+auto Settings::getSnapRecognizedShapesEnabled() const -> bool { return this->snapRecognizedShapesEnabled; }
+
+
+void Settings::setRestoreLineWidthEnabled(bool enabled) { this->restoreLineWidthEnabled = enabled; }
+
+auto Settings::getRestoreLineWidthEnabled() const -> bool { return this->restoreLineWidthEnabled; }
+
+auto Settings::setPreferredLocale(std::string const& locale) -> void { this->preferredLocale = locale; }
+
+auto Settings::getPreferredLocale() const -> std::string { return this->preferredLocale; }
+
+void Settings::setIgnoredStylusEvents(int numEvents) {
+    if (this->numIgnoredStylusEvents == numEvents) {
+        return;
+    }
+    this->numIgnoredStylusEvents = std::max<int>(numEvents, 0);
+    save();
+}
+
+auto Settings::getIgnoredStylusEvents() const -> int { return this->numIgnoredStylusEvents; }
+
+void Settings::setInputSystemTPCButtonEnabled(bool tpcButtonEnabled) {
+    if (this->inputSystemTPCButton == tpcButtonEnabled) {
+        return;
+    }
+    this->inputSystemTPCButton = tpcButtonEnabled;
+    save();
+}
+
+auto Settings::getInputSystemTPCButtonEnabled() const -> bool { return this->inputSystemTPCButton; }
+
+void Settings::setInputSystemDrawOutsideWindowEnabled(bool drawOutsideWindowEnabled) {
+    if (this->inputSystemDrawOutsideWindow == drawOutsideWindowEnabled) {
+        return;
+    }
+    this->inputSystemDrawOutsideWindow = drawOutsideWindowEnabled;
+    save();
+}
+
+auto Settings::getInputSystemDrawOutsideWindowEnabled() const -> bool { return this->inputSystemDrawOutsideWindow; }
+
+void Settings::setDeviceClassForDevice(GdkDevice* device, InputDeviceTypeOption deviceClass) {
+    this->setDeviceClassForDevice(gdk_device_get_name(device), gdk_device_get_source(device), deviceClass);
+}
+
+void Settings::setDeviceClassForDevice(const string& deviceName, GdkInputSource deviceSource,
+                                       InputDeviceTypeOption deviceClass) {
+    auto it = inputDeviceClasses.find(deviceName);
+    if (it != inputDeviceClasses.end()) {
+        it->second.first = deviceClass;
+        it->second.second = deviceSource;
+    } else {
+        inputDeviceClasses.emplace(deviceName, std::make_pair(deviceClass, deviceSource));
+    }
+}
+
+auto Settings::getKnownInputDevices() const -> std::vector<InputDevice> {
+    std::vector<InputDevice> inputDevices;
+    for (auto pair: inputDeviceClasses) {
+        const std::string& name = pair.first;
+        GdkInputSource& source = pair.second.second;
+        inputDevices.emplace_back(name, source);
+    }
+    return inputDevices;
+}
+
+auto Settings::getDeviceClassForDevice(GdkDevice* device) const -> InputDeviceTypeOption {
+    return this->getDeviceClassForDevice(gdk_device_get_name(device), gdk_device_get_source(device));
+}
+
+auto Settings::getDeviceClassForDevice(const string& deviceName, GdkInputSource deviceSource) const
+        -> InputDeviceTypeOption {
+    auto search = inputDeviceClasses.find(deviceName);
+    if (search != inputDeviceClasses.end()) {
+        return search->second.first;
+    }
+
+
+    InputDeviceTypeOption deviceType = InputDeviceTypeOption::Disabled;
+    switch (deviceSource) {
+        case GDK_SOURCE_CURSOR:
+#if (GDK_MAJOR_VERSION >= 3 && GDK_MINOR_VERSION >= 22)
+        case GDK_SOURCE_TABLET_PAD:
+#endif
+        case GDK_SOURCE_KEYBOARD:
+            deviceType = InputDeviceTypeOption::Disabled;
+            break;
+        case GDK_SOURCE_MOUSE:
+        case GDK_SOURCE_TOUCHPAD:
+#if (GDK_MAJOR_VERSION >= 3 && GDK_MINOR_VERSION >= 22)
+        case GDK_SOURCE_TRACKPOINT:
+#endif
+            deviceType = InputDeviceTypeOption::Mouse;
+            break;
+        case GDK_SOURCE_PEN:
+            deviceType = InputDeviceTypeOption::Pen;
+            break;
+        case GDK_SOURCE_ERASER:
+            deviceType = InputDeviceTypeOption::Eraser;
+            break;
+        case GDK_SOURCE_TOUCHSCREEN:
+            deviceType = InputDeviceTypeOption::Touchscreen;
+            break;
+        default:
+            deviceType = InputDeviceTypeOption::Disabled;
+    }
+    return deviceType;
+}
+
+auto Settings::isScrollbarFadeoutDisabled() const -> bool { return disableScrollbarFadeout; }
+
+void Settings::setScrollbarFadeoutDisabled(bool disable) {
+    if (disableScrollbarFadeout == disable) {
+        return;
+    }
+    disableScrollbarFadeout = disable;
+    save();
+}
+
+auto Settings::isAudioDisabled() const -> bool { return disableAudio; }
+
+void Settings::setAudioDisabled(bool disable) {
+    if (disableAudio == disable) {
+        return;
+    }
+    disableAudio = disable;
+    save();
+}
+
+//////////////////////////////////////////////////
+
+SAttribute::SAttribute() {
+    this->dValue = 0;
+    this->iValue = 0;
+    this->type = ATTRIBUTE_TYPE_NONE;
+}
+
+SAttribute::SAttribute(const SAttribute& attrib) { *this = attrib; }
+
+SAttribute::~SAttribute() {
+    this->iValue = 0;
+    this->type = ATTRIBUTE_TYPE_NONE;
+}
+
+//////////////////////////////////////////////////
+
+auto SElement::attributes() -> std::map<string, SAttribute>& { return this->element->attributes; }
+
+auto SElement::children() -> std::map<string, SElement>& { return this->element->children; }
+
+void SElement::clear() {
+    this->element->attributes.clear();
+    this->element->children.clear();
+}
+
+auto SElement::child(const string& name) -> SElement& { return this->element->children[name]; }
+
+void SElement::setComment(const string& name, const string& comment) {
+    SAttribute& attrib = this->element->attributes[name];
+    attrib.comment = comment;
+}
+
+void SElement::setIntHex(const string& name, const int value) {
+    SAttribute& attrib = this->element->attributes[name];
+    attrib.iValue = value;
+    attrib.type = ATTRIBUTE_TYPE_INT_HEX;
+}
+
+void SElement::setInt(const string& name, const int value) {
+    SAttribute& attrib = this->element->attributes[name];
+    attrib.iValue = value;
+    attrib.type = ATTRIBUTE_TYPE_INT;
+}
+
+void SElement::setBool(const string& name, const bool value) {
+    SAttribute& attrib = this->element->attributes[name];
+    attrib.iValue = value;
+    attrib.type = ATTRIBUTE_TYPE_BOOLEAN;
+}
+
+void SElement::setString(const string& name, const string& value) {
+    SAttribute& attrib = this->element->attributes[name];
+    attrib.sValue = value;
+    attrib.type = ATTRIBUTE_TYPE_STRING;
+}
+
+void SElement::setDouble(const string& name, const double value) {
+    SAttribute& attrib = this->element->attributes[name];
+    attrib.dValue = value;
+    attrib.type = ATTRIBUTE_TYPE_DOUBLE;
+}
+
+auto SElement::getDouble(const string& name, double& value) -> bool {
+    SAttribute& attrib = this->element->attributes[name];
+    if (attrib.type == ATTRIBUTE_TYPE_NONE) {
+        this->element->attributes.erase(name);
+        return false;
+    }
+
+    if (attrib.type != ATTRIBUTE_TYPE_DOUBLE) {
+        return false;
+    }
+
+    value = attrib.dValue;
+
+    return true;
+}
+
+auto SElement::getInt(const string& name, int& value) -> bool {
+    SAttribute& attrib = this->element->attributes[name];
+    if (attrib.type == ATTRIBUTE_TYPE_NONE) {
+        this->element->attributes.erase(name);
+        return false;
+    }
+
+    if (attrib.type != ATTRIBUTE_TYPE_INT && attrib.type != ATTRIBUTE_TYPE_INT_HEX) {
+        return false;
+    }
+
+    value = attrib.iValue;
+
+    return true;
+}
+
+auto SElement::getBool(const string& name, bool& value) -> bool {
+    SAttribute& attrib = this->element->attributes[name];
+    if (attrib.type == ATTRIBUTE_TYPE_NONE) {
+        this->element->attributes.erase(name);
+        return false;
+    }
+
+    if (attrib.type != ATTRIBUTE_TYPE_BOOLEAN) {
+        return false;
+    }
+
+    value = attrib.iValue;
+
+    return true;
+}
+
+auto SElement::getString(const string& name, string& value) -> bool {
+    SAttribute& attrib = this->element->attributes[name];
+    if (attrib.type == ATTRIBUTE_TYPE_NONE) {
+        this->element->attributes.erase(name);
+        return false;
+    }
+
+    if (attrib.type != ATTRIBUTE_TYPE_STRING) {
+        return false;
+    }
+
+    value = attrib.sValue;
+
+    return true;
+}
+
+/**
+ * Stabilizer related getters and setters
+ */
+auto Settings::getStabilizerCuspDetection() const -> bool { return stabilizerCuspDetection; }
+auto Settings::getStabilizerFinalizeStroke() const -> bool { return stabilizerFinalizeStroke; }
+auto Settings::getStabilizerBuffersize() const -> size_t { return stabilizerBuffersize; }
+auto Settings::getStabilizerDeadzoneRadius() const -> double { return stabilizerDeadzoneRadius; }
+auto Settings::getStabilizerDrag() const -> double { return stabilizerDrag; }
+auto Settings::getStabilizerMass() const -> double { return stabilizerMass; }
+auto Settings::getStabilizerSigma() const -> double { return stabilizerSigma; }
+auto Settings::getStabilizerAveragingMethod() const -> StrokeStabilizer::AveragingMethod {
+    return stabilizerAveragingMethod;
+}
+auto Settings::getStabilizerPreprocessor() const -> StrokeStabilizer::Preprocessor { return stabilizerPreprocessor; }
+
+void Settings::setStabilizerCuspDetection(bool cuspDetection) {
+    if (stabilizerCuspDetection == cuspDetection) {
+        return;
+    }
+    stabilizerCuspDetection = cuspDetection;
+    save();
+}
+void Settings::setStabilizerFinalizeStroke(bool finalizeStroke) {
+    if (stabilizerFinalizeStroke == finalizeStroke) {
+        return;
+    }
+    stabilizerFinalizeStroke = finalizeStroke;
+    save();
+}
+void Settings::setStabilizerBuffersize(size_t buffersize) {
+    if (stabilizerBuffersize == buffersize) {
+        return;
+    }
+    stabilizerBuffersize = buffersize;
+    save();
+}
+void Settings::setStabilizerDeadzoneRadius(double deadzoneRadius) {
+    if (stabilizerDeadzoneRadius == deadzoneRadius) {
+        return;
+    }
+    stabilizerDeadzoneRadius = deadzoneRadius;
+    save();
+}
+void Settings::setStabilizerDrag(double drag) {
+    if (stabilizerDrag == drag) {
+        return;
+    }
+    stabilizerDrag = drag;
+    save();
+}
+void Settings::setStabilizerMass(double mass) {
+    if (stabilizerMass == mass) {
+        return;
+    }
+    stabilizerMass = mass;
+    save();
+}
+void Settings::setStabilizerSigma(double sigma) {
+    if (stabilizerSigma == sigma) {
+        return;
+    }
+    stabilizerSigma = sigma;
+    save();
+}
+void Settings::setStabilizerAveragingMethod(StrokeStabilizer::AveragingMethod averagingMethod) {
+    const StrokeStabilizer::AveragingMethod method =
+            StrokeStabilizer::isValid(averagingMethod) ? averagingMethod : StrokeStabilizer::AveragingMethod::NONE;
+
+    if (stabilizerAveragingMethod == method) {
+        return;
+    }
+    stabilizerAveragingMethod = method;
+    save();
+}
+void Settings::setStabilizerPreprocessor(StrokeStabilizer::Preprocessor preprocessor) {
+    const StrokeStabilizer::Preprocessor p =
+            StrokeStabilizer::isValid(preprocessor) ? preprocessor : StrokeStabilizer::Preprocessor::NONE;
+
+    if (stabilizerPreprocessor == p) {
+        return;
+    }
+    stabilizerPreprocessor = p;
+    save();
+}
+
+
+auto Settings::getColorPaletteSetting() -> fs::path const& { return this->colorPaletteSetting; }
+
+void Settings::setColorPaletteSetting(fs::path palettePath) { this->colorPaletteSetting = palettePath; }
+
+
+void Settings::setUseSpacesAsTab(bool useSpaces) { this->useSpacesForTab = useSpaces; }
+bool Settings::getUseSpacesAsTab() const { return this->useSpacesForTab; }
+
+void Settings::setNumberOfSpacesForTab(unsigned int numberOfSpaces) {
+    if (this->numberOfSpacesForTab == numberOfSpaces) {
+        return;
+    }
+
+    // For performance reasons the number of spaces for a tab should be limited
+    // if this limit is exceeded use a default value
+    if (numberOfSpaces < 0 || numberOfSpaces > MAX_SPACES_FOR_TAB) {
+        g_warning("Settings::Invalid number of spaces for tab. Reset to default!");
+        numberOfSpaces = 4;
+    }
+    this->numberOfSpacesForTab = numberOfSpaces;
+    save();
+}
+
+unsigned int Settings::getNumberOfSpacesForTab() const { return this->numberOfSpacesForTab; }
+
+void Settings::setLaserPointerFadeOutTime(unsigned int timeInMs) {
+    if (this->laserPointerFadeOutTime == timeInMs) {
+        return;
+    }
+    this->laserPointerFadeOutTime = timeInMs;
+    save();
+}
+
+unsigned int Settings::getLaserPointerFadeOutTime() const { return this->laserPointerFadeOutTime; }
diff --git a/entry/src/main/cpp/src/core/control/settings/Settings.h b/entry/src/main/cpp/src/core/control/settings/Settings.h
new file mode 100644
index 0000000..a9395d9
--- /dev/null
+++ b/entry/src/main/cpp/src/core/control/settings/Settings.h
@@ -0,0 +1,1186 @@
+/*
+ * Xournal++
+ *
+ * Xournal Settings
+ *
+ * @author Xournal++ Team
+ * https://github.com/xournalpp/xournalpp
+ *
+ * @license GNU GPLv2 or later
+ */
+
+#pragma once
+
+#include <array>     // for array
+#include <cstddef>   // for size_t
+#include <map>       // for map
+#include <memory>    // for make_shared, shared_ptr
+#include <optional>  // for optional
+#include <string>    // for string, basic_string
+#include <utility>   // for pair
+#include <vector>    // for vector
+
+#include <gdk/gdk.h>      // for GdkInputSource, GdkD...
+#include <glib.h>         // for gchar, gboolean, gint
+#include <libxml/tree.h>  // for xmlNodePtr, xmlDocPtr
+
+#include "control/tools/StrokeStabilizerEnum.h"  // for AveragingMethod, Pre...
+#include "model/Font.h"                          // for XojFont
+#include "util/Color.h"                          // for Color
+
+#include "LatexSettings.h"      // for LatexSettings
+#include "RecolorParameters.h"  // for RecolorParameters
+#include "SettingsEnums.h"      // for InputDeviceTypeOption
+#include "ViewModes.h"          // for ViewModes
+#include "config-features.h"    // for ENABLE_AUDIO
+#include "filesystem.h"         // for path
+
+#ifdef ENABLE_AUDIO
+#include <portaudiocpp/PortAudioCpp.hxx>  // for PaDeviceIndex
+#endif
+
+struct Palette;
+
+constexpr auto DEFAULT_GRID_SIZE = 14.17;
+constexpr unsigned int MAX_SPACES_FOR_TAB = 8U;
+
+class ButtonConfig;
+class InputDevice;
+class PageTemplateSettings;
+
+class SAttribute {
+public:
+    SAttribute();
+    SAttribute(const SAttribute& attrib);
+    virtual ~SAttribute();
+
+public:
+    std::string sValue;
+    int iValue{};
+    double dValue{};
+
+    AttributeType type;
+
+    std::string comment;
+};
+
+
+class SElement final {
+    struct SElementData {
+    private:
+        std::map<std::string, SAttribute> attributes;
+        std::map<std::string, SElement> children;
+        friend class SElement;
+    };
+
+public:
+    SElement() = default;
+
+    void clear();
+
+    SElement& child(const std::string& name);
+
+    void setIntHex(const std::string& name, const int value);
+    void setInt(const std::string& name, const int value);
+    void setDouble(const std::string& name, const double value);
+    void setBool(const std::string& name, const bool value);
+    void setString(const std::string& name, const std::string& value);
+
+    [[maybe_unused]] void setComment(const std::string& name, const std::string& comment);
+
+    bool getInt(const std::string& name, int& value);
+    [[maybe_unused]] bool getDouble(const std::string& name, double& value);
+    bool getBool(const std::string& name, bool& value);
+    bool getString(const std::string& name, std::string& value);
+
+    std::map<std::string, SAttribute>& attributes();
+    std::map<std::string, SElement>& children();
+
+private:
+    std::shared_ptr<SElementData> element = std::make_shared<SElementData>();
+};
+
+class Settings {
+public:
+    /*[[implicit]]*/ Settings(fs::path filepath);
+    Settings(const Settings& settings) = delete;
+    void operator=(const Settings& settings) = delete;
+    virtual ~Settings();
+
+public:
+    bool load();
+    void parseData(xmlNodePtr cur, SElement& elem);
+
+    void save();
+
+private:
+    void loadDefault();
+    void parseItem(xmlDocPtr doc, xmlNodePtr cur);
+
+    static xmlNodePtr savePropertyDouble(const gchar* key, double value, xmlNodePtr parent);
+    static xmlNodePtr saveProperty(const gchar* key, int value, xmlNodePtr parent);
+    static xmlNodePtr savePropertyUnsigned(const gchar* key, unsigned int value, xmlNodePtr parent);
+    static xmlNodePtr saveProperty(const gchar* key, const gchar* value, xmlNodePtr parent);
+
+    void saveData(xmlNodePtr root, const std::string& name, SElement& elem);
+
+    void saveButtonConfig();
+    void loadButtonConfig();
+
+public:
+    // View Mode
+    bool loadViewMode(ViewModeId mode);
+
+    // Getter- / Setter
+    const std::vector<ViewMode>& getViewModes() const;
+    ViewModeId getActiveViewMode() const;
+
+    bool isPressureSensitivity() const;
+    void setPressureSensitivity(gboolean presureSensitivity);
+
+    /**
+     * Input device pressure options
+     */
+    double getMinimumPressure() const;
+    void setMinimumPressure(double minimumPressure);
+
+    double getPressureMultiplier() const;
+    void setPressureMultiplier(double multiplier);
+
+    /**
+     * Getter, enable/disable
+     */
+    bool isZoomGesturesEnabled() const;
+    void setZoomGesturesEnabled(bool enable);
+
+    /**
+     * The last used font
+     */
+    XojFont& getFont();
+    void setFont(const XojFont& font);
+
+    /**
+     * The selected Toolbar
+     */
+    void setSelectedToolbar(const std::string& name);
+    std::string const& getSelectedToolbar() const;
+
+    void setEdgePanSpeed(double speed);
+    double getEdgePanSpeed() const;
+
+    void setEdgePanMaxMult(double mult);
+    double getEdgePanMaxMult() const;
+
+    /**
+     * Set the Zoomstep for one step in percent
+     */
+    void setZoomStep(double zoomStep);
+    double getZoomStep() const;
+
+    /**
+     * Set the Zoomstep for Ctrl + Scroll in percent
+     */
+    void setZoomStepScroll(double zoomStepScroll);
+    double getZoomStepScroll() const;
+
+    /**
+     * Sets the screen resolution in DPI
+     */
+    void setDisplayDpi(int dpi);
+    int getDisplayDpi() const;
+
+    void setAreStockIconsUsed(bool use);
+    bool areStockIconsUsed() const;
+
+    /**
+     * The last saved path
+     */
+    void setLastSavePath(fs::path p);
+    fs::path const& getLastSavePath() const;
+
+    /**
+     * The last open path
+     */
+    void setLastOpenPath(fs::path p);
+    fs::path const& getLastOpenPath() const;
+
+    void setLastImagePath(const fs::path& p);
+    fs::path const& getLastImagePath() const;
+
+    void setMainWndSize(int width, int height);
+    void setMainWndMaximized(bool max);
+    int getMainWndWidth() const;
+    int getMainWndHeight() const;
+    bool isMainWndMaximized() const;
+
+    bool isFullscreen() const;
+
+    bool isSidebarVisible() const;
+    void setSidebarVisible(bool visible);
+
+    bool isToolbarVisible() const;
+    void setToolbarVisible(bool visible);
+
+    int getSidebarWidth() const;
+    void setSidebarWidth(int width);
+
+    bool isSidebarOnRight() const;
+    void setSidebarOnRight(bool right);
+
+    bool isScrollbarOnLeft() const;
+    void setScrollbarOnLeft(bool right);
+
+    bool isMenubarVisible() const;
+    void setMenubarVisible(bool visible);
+
+    const bool isFilepathInTitlebarShown() const;
+    void setFilepathInTitlebarShown(const bool shown);
+
+    const bool isPageNumberInTitlebarShown() const;
+    void setPageNumberInTitlebarShown(const bool shown);
+
+    void setShowPairedPages(bool showPairedPages);
+    bool isShowPairedPages() const;
+
+    void setPresentationMode(bool presentationMode);
+    bool isPresentationMode() const;
+
+    void setPairsOffset(int numOffset);
+    int getPairsOffset() const;
+
+    void setEmptyLastPageAppend(EmptyLastPageAppendType emptyLastPageAppend);
+    EmptyLastPageAppendType getEmptyLastPageAppend() const;
+
+    void setViewColumns(int numColumns);
+    int getViewColumns() const;
+
+    void setViewRows(int numRows);
+    int getViewRows() const;
+
+    void setViewFixedRows(bool viewFixedRows);
+    bool isViewFixedRows() const;
+
+    void setViewLayoutVert(bool vert);
+    bool getViewLayoutVert() const;
+
+    void setViewLayoutR2L(bool r2l);
+    bool getViewLayoutR2L() const;
+
+    void setViewLayoutB2T(bool b2t);
+    bool getViewLayoutB2T() const;
+
+    bool isAutoloadMostRecent() const;
+    void setAutoloadMostRecent(bool load);
+
+    bool isAutoloadPdfXoj() const;
+    void setAutoloadPdfXoj(bool load);
+
+    int getAutosaveTimeout() const;
+    void setAutosaveTimeout(int autosave);
+    bool isAutosaveEnabled() const;
+    void setAutosaveEnabled(bool autosave);
+
+    bool getAddVerticalSpace() const;
+    void setAddVerticalSpace(bool space);
+    int getAddVerticalSpaceAmountAbove() const;
+    void setAddVerticalSpaceAmountAbove(int pixels);
+    int getAddVerticalSpaceAmountBelow() const;
+    void setAddVerticalSpaceAmountBelow(int pixels);
+
+    bool getAddHorizontalSpace() const;
+    void setAddHorizontalSpace(bool space);
+    int getAddHorizontalSpaceAmountRight() const;
+    void setAddHorizontalSpaceAmountRight(int pixels);
+    int getAddHorizontalSpaceAmountLeft() const;
+    void setAddHorizontalSpaceAmountLeft(int pixels);
+
+    bool getUnlimitedScrolling() const;
+    void setUnlimitedScrolling(bool enable);
+
+    bool getDrawDirModsEnabled() const;
+    void setDrawDirModsEnabled(bool enable);
+    int getDrawDirModsRadius() const;
+    void setDrawDirModsRadius(int pixels);
+
+    bool getTouchDrawingEnabled() const;
+    void setTouchDrawingEnabled(bool b);
+
+    bool getGtkTouchInertialScrollingEnabled() const;
+    void setGtkTouchInertialScrollingEnabled(bool b);
+
+    bool isPressureGuessingEnabled() const;
+    void setPressureGuessingEnabled(bool b);
+
+    bool isSnapRotation() const;
+    void setSnapRotation(bool b);
+    double getSnapRotationTolerance() const;
+    void setSnapRotationTolerance(double tolerance);
+
+    bool isSnapGrid() const;
+    void setSnapGrid(bool b);
+    double getSnapGridTolerance() const;
+    void setSnapGridTolerance(double tolerance);
+    double getSnapGridSize() const;
+    void setSnapGridSize(double gridSize);
+
+    double getStrokeRecognizerMinSize() const;
+    void setStrokeRecognizerMinSize(double value);
+
+    StylusCursorType getStylusCursorType() const;
+    void setStylusCursorType(StylusCursorType stylusCursorType);
+
+    EraserVisibility getEraserVisibility() const;
+    void setEraserVisibility(EraserVisibility eraserVisibility);
+
+    IconTheme getIconTheme() const;
+    void setIconTheme(IconTheme iconTheme);
+
+    void setThemeVariant(ThemeVariant theme);
+    ThemeVariant getThemeVariant() const;
+
+    SidebarNumberingStyle getSidebarNumberingStyle() const;
+    void setSidebarNumberingStyle(SidebarNumberingStyle numberingStyle);
+
+    bool isHighlightPosition() const;
+    void setHighlightPosition(bool highlight);
+
+    Color getCursorHighlightColor() const;
+    void setCursorHighlightColor(Color color);
+
+    double getCursorHighlightRadius() const;
+    void setCursorHighlightRadius(double radius);
+
+    Color getCursorHighlightBorderColor() const;
+    void setCursorHighlightBorderColor(Color color);
+
+    double getCursorHighlightBorderWidth() const;
+    void setCursorHighlightBorderWidth(double width);
+
+    ScrollbarHideType getScrollbarHideType() const;
+    void setScrollbarHideType(ScrollbarHideType type);
+
+    bool isScrollbarFadeoutDisabled() const;
+    void setScrollbarFadeoutDisabled(bool disable);
+
+    bool isAudioDisabled() const;
+    void setAudioDisabled(bool disable);
+
+    std::u8string const& getDefaultSaveName() const;
+    void setDefaultSaveName(const std::u8string& name);
+
+    std::u8string const& getDefaultPdfExportName() const;
+    void setDefaultPdfExportName(const std::u8string& name);
+
+    ButtonConfig* getButtonConfig(unsigned int id);
+
+    void setViewMode(ViewModeId mode, ViewMode ViewMode);
+
+    Color getBorderColor() const;
+    void setBorderColor(Color color);
+
+    Color getSelectionColor() const;
+    void setSelectionColor(Color color);
+
+    Color getBackgroundColor() const;
+    void setBackgroundColor(Color color);
+
+    Color getActiveSelectionColor() const;
+    void setActiveSelectionColor(Color color);
+
+    const RecolorParameters& getRecolorParameters() const;
+    void setRecolorParameters(RecolorParameters&& recolorParameters);
+
+    // Re-render pages if document zoom differs from the last render zoom by the given threshold.
+    double getPDFPageRerenderThreshold() const;
+    void setPDFPageRerenderThreshold(double threshold);
+
+    double getTouchZoomStartThreshold() const;
+    void setTouchZoomStartThreshold(double threshold);
+
+    int getPdfPageCacheSize() const;
+    [[maybe_unused]] void setPdfPageCacheSize(int size);
+
+    unsigned int getPreloadPagesBefore() const;
+    void setPreloadPagesBefore(unsigned int n);
+
+    unsigned int getPreloadPagesAfter() const;
+    void setPreloadPagesAfter(unsigned int n);
+
+    bool isEagerPageCleanup() const;
+    void setEagerPageCleanup(bool b);
+
+    std::string const& getPageTemplate() const;
+    PageTemplateSettings getPageTemplateSettings() const;
+    void setPageTemplate(const std::string& pageTemplate);
+
+#ifdef ENABLE_AUDIO
+    fs::path const& getAudioFolder() const;
+    void setAudioFolder(fs::path audioFolder);
+
+    static constexpr PaDeviceIndex AUDIO_INPUT_SYSTEM_DEFAULT = -1;
+    PaDeviceIndex getAudioInputDevice() const;
+    void setAudioInputDevice(PaDeviceIndex deviceIndex);
+
+    static constexpr PaDeviceIndex AUDIO_OUTPUT_SYSTEM_DEFAULT = -1;
+    PaDeviceIndex getAudioOutputDevice() const;
+    void setAudioOutputDevice(PaDeviceIndex deviceIndex);
+
+    double getAudioSampleRate() const;
+    void setAudioSampleRate(double sampleRate);
+
+    double getAudioGain() const;
+    void setAudioGain(double gain);
+
+    unsigned int getDefaultSeekTime() const;
+    void setDefaultSeekTime(unsigned int t);
+#endif
+
+    std::string const& getPluginEnabled() const;
+    void setPluginEnabled(const std::string& pluginEnabled);
+
+    std::string const& getPluginDisabled() const;
+    void setPluginDisabled(const std::string& pluginDisabled);
+
+    /**
+     * Sets #numIgnoredStylusEvents. If given a negative value writes 0 instead.
+     */
+    void setIgnoredStylusEvents(int numEvents);
+    /**
+     * Returns #numIgnoredStylusEvents.
+     */
+    int getIgnoredStylusEvents() const;
+
+    bool getInputSystemTPCButtonEnabled() const;
+    void setInputSystemTPCButtonEnabled(bool tpcButtonEnabled);
+
+    bool getInputSystemDrawOutsideWindowEnabled() const;
+    void setInputSystemDrawOutsideWindowEnabled(bool drawOutsideWindowEnabled);
+
+    void loadDeviceClasses();
+    void saveDeviceClasses();
+    void setDeviceClassForDevice(GdkDevice* device, InputDeviceTypeOption deviceClass);
+    void setDeviceClassForDevice(const std::string& deviceName, GdkInputSource deviceSource,
+                                 InputDeviceTypeOption deviceClass);
+    InputDeviceTypeOption getDeviceClassForDevice(GdkDevice* device) const;
+    InputDeviceTypeOption getDeviceClassForDevice(const std::string& deviceName, GdkInputSource deviceSource) const;
+    std::vector<InputDevice> getKnownInputDevices() const;
+
+    /**
+     * Get name, e.g. "cm"
+     */
+    std::string const& getSizeUnit() const;
+
+    /**
+     * Get size index in XOJ_UNITS
+     */
+    int getSizeUnitIndex() const;
+
+    /**
+     * Set Unit, e.g. "cm"
+     */
+    void setSizeUnit(const std::string& sizeUnit);
+
+    /**
+     * Set size index in XOJ_UNITS
+     */
+    void setSizeUnitIndex(int sizeUnitId);
+
+    /**
+     * Set StrokeFilter enabled
+     */
+    void setStrokeFilterEnabled(bool enabled);
+
+    /**
+     * Get StrokeFilter enabled
+     */
+    bool getStrokeFilterEnabled() const;
+
+    /**
+     * get strokeFilter settings
+     */
+    void getStrokeFilter(int* strokeFilterIgnoreTime, double* strokeFilterIgnoreLength,
+                         int* strokeFilterSuccessiveTime) const;
+
+    /**
+     * configure stroke filter
+     */
+    void setStrokeFilter(int strokeFilterIgnoreTime, double strokeFilterIgnoreLength, int strokeFilterSuccessiveTime);
+
+    /**
+     * Set DoActionOnStrokeFilter enabled
+     */
+    void setDoActionOnStrokeFiltered(bool enabled);
+
+    /**
+     * Get DoActionOnStrokeFilter enabled
+     */
+    bool getDoActionOnStrokeFiltered() const;
+
+    /**
+     * Set TrySelectOnStrokeFilter enabled
+     */
+    void setTrySelectOnStrokeFiltered(bool enabled);
+
+    /**
+     * Get TrySelectOnStrokeFilter enabled
+     */
+    bool getTrySelectOnStrokeFiltered() const;
+
+    /**
+     * Set snap recognized shapes enabled
+     */
+    void setSnapRecognizedShapesEnabled(bool enabled);
+
+    /**
+     * Get snap recognized shapes enabled
+     */
+    bool getSnapRecognizedShapesEnabled() const;
+
+    /**
+     * Set line width restoring for resized edit selctions enabled
+     */
+    void setRestoreLineWidthEnabled(bool enabled);
+
+    /**
+     * Get line width restoring enabled
+     */
+    bool getRestoreLineWidthEnabled() const;
+
+    /**
+     * Set the preferred locale
+     */
+    void setPreferredLocale(std::string const& locale);
+
+    /**
+     * Get the preferred locale
+     */
+    std::string getPreferredLocale() const;
+
+    /**
+     * Stabilizer related getters and setters
+     */
+    bool getStabilizerCuspDetection() const;
+    bool getStabilizerFinalizeStroke() const;
+    size_t getStabilizerBuffersize() const;
+    double getStabilizerDeadzoneRadius() const;
+    double getStabilizerDrag() const;
+    double getStabilizerMass() const;
+    double getStabilizerSigma() const;
+    StrokeStabilizer::AveragingMethod getStabilizerAveragingMethod() const;
+    StrokeStabilizer::Preprocessor getStabilizerPreprocessor() const;
+
+    void setStabilizerCuspDetection(bool cuspDetection);
+    void setStabilizerFinalizeStroke(bool finalizeStroke);
+    void setStabilizerBuffersize(size_t buffersize);
+    void setStabilizerDeadzoneRadius(double deadzoneRadius);
+    void setStabilizerDrag(double drag);
+    void setStabilizerMass(double mass);
+    void setStabilizerSigma(double sigma);
+    void setStabilizerAveragingMethod(StrokeStabilizer::AveragingMethod averagingMethod);
+    void setStabilizerPreprocessor(StrokeStabilizer::Preprocessor preprocessor);
+
+    fs::path const& getColorPaletteSetting();
+    void setColorPaletteSetting(fs::path palettePath);
+
+    void setNumberOfSpacesForTab(unsigned int numberSpaces);
+    unsigned int getNumberOfSpacesForTab() const;
+
+    void setUseSpacesAsTab(bool useSpaces);
+    bool getUseSpacesAsTab() const;
+
+    void setLaserPointerFadeOutTime(unsigned int timeInMs);
+    unsigned int getLaserPointerFadeOutTime() const;
+
+public:
+    // Custom settings
+    SElement& getCustomElement(const std::string& name);
+
+    /**
+     * Call this after you have done all custom settings changes
+     */
+    void customSettingsChanged();
+
+    /**
+     * Do not save settings until transactionEnd() is called
+     */
+    void transactionStart();
+
+    /**
+     * Stop transaction and save settings
+     */
+    void transactionEnd();
+
+    LatexSettings latexSettings{};
+
+    inline const fs::path& getSettingsFile() const { return filepath; }
+
+private:
+    /**
+     *  The config filepath
+     */
+    fs::path filepath;
+
+private:
+    /**
+     * The settings tree
+     */
+    std::map<std::string, SElement> data;
+
+    /**
+     *  Use pen pressure to control stroke width?
+     */
+    bool pressureSensitivity{};
+
+    /**
+     * Adjust input pressure?
+     */
+    double minimumPressure{};
+    double pressureMultiplier{};
+
+    /**
+     * If the touch zoom gestures are enabled
+     */
+    bool zoomGesturesEnabled{};
+
+    /**
+     *  If fullscreen is active
+     */
+    bool fullscreenActive{};
+
+    /**
+     *  If the sidebar is visible
+     */
+    bool showSidebar{};
+
+    /**
+     *  If the sidebar is visible
+     */
+    bool showToolbar{};
+
+    /**
+     *  The Width of the Sidebar
+     */
+    int sidebarWidth{};
+
+    /**
+     *  If the sidebar is on the right
+     */
+    bool sidebarOnRight{};
+
+    /**
+     *  Type of cursor icon to use with a stylus
+     */
+    StylusCursorType stylusCursorType;
+
+    /**
+     * Visibility of eraser cursor
+     */
+    EraserVisibility eraserVisibility;
+
+    /**
+     * Icon Theme
+     */
+    IconTheme iconTheme;
+
+    /**
+     * Follow system's default theme variant or force one or the other
+     */
+    ThemeVariant themeVariant;
+
+    /**
+     * Sidebar page number style
+     */
+    SidebarNumberingStyle sidebarNumberingStyle;
+
+    /**
+     * Show a colored circle around the cursor
+     */
+    bool highlightPosition{};
+
+    /**
+     * Cursor highlight color (ARGB format)
+     */
+    Color cursorHighlightColor{};
+
+    /**
+     * Radius of cursor highlight circle. Note that this is limited by the size
+     * of the cursor in the display server (default is probably 30 pixels).
+     */
+    double cursorHighlightRadius{};
+
+    /**
+     * Cursor highlight border color (ARGB format)
+     */
+    Color cursorHighlightBorderColor{};
+
+    /**
+     * Width of cursor highlight border, in pixels.
+     */
+    double cursorHighlightBorderWidth{};
+
+    /**
+     * If stock icons are used instead of Xournal++ icons when available
+     */
+    bool useStockIcons{};
+
+    /**
+     * If the menu bar is visible on startup
+     */
+    bool menubarVisible{};
+
+    /**
+     * If the filepath is shown in titlebar
+     */
+    bool filepathShownInTitlebar{};
+
+    /**
+     * If the page number is shown in titlebar
+     */
+    bool pageNumberShownInTitlebar{};
+
+    /**
+     *  Hide the scrollbar
+     */
+    ScrollbarHideType scrollbarHideType;
+
+    /**
+     * Disable scrollbar fade out (overlay scrolling)
+     */
+    bool disableScrollbarFadeout{};
+
+    /**
+     * Disable the audio system
+     */
+    bool disableAudio{};
+
+    /**
+     *  The selected Toolbar name
+     */
+    std::string selectedToolbar;
+
+    /**
+     *  The last saved folder
+     */
+    fs::path lastSavePath;
+
+    /**
+     *  The last opened folder
+     */
+    fs::path lastOpenPath;
+
+    /**
+     *  The last "insert image" folder
+     */
+    fs::path lastImagePath;
+
+    /**
+     * The last used font
+     */
+    XojFont font;
+
+    /**
+     * Base speed (as a percentage of visible canvas) of edge pan per
+     * second
+     */
+    double edgePanSpeed{};
+
+    /**
+     * Maximum multiplier of edge pan speed due to proportion of selection out
+     * of view
+     */
+    double edgePanMaxMult{};
+
+    /**
+     * Zoomstep for one step
+     */
+    double zoomStep{};
+
+    /**
+     * Zoomstep for Ctrl + Scroll zooming
+     */
+    double zoomStepScroll{};
+
+    /**
+     * The display resolution, in pixels per inch. -1 for automatic detection
+     */
+    int displayDpi{};
+
+    /**
+     *  If the window is maximized
+     */
+    bool maximized{};
+
+    /**
+     * Width of the main window
+     */
+    int mainWndWidth{};
+
+    /**
+     * Height of the main window
+     */
+    int mainWndHeight{};
+
+    /**
+     * Show the scrollbar on the left side
+     */
+    bool scrollbarOnLeft{};
+
+    /**
+     *  Pairs pages
+     */
+    bool showPairedPages{};
+
+    /**
+     *  Sets presentation mode
+     */
+    bool presentationMode{};
+
+    /**
+     *  Offsets first page ( to align pairing )
+     */
+    int numPairsOffset{};
+
+    /**
+     * Preference for appending an empty last page to the document
+     */
+    EmptyLastPageAppendType emptyLastPageAppend{};
+
+    /**
+     *  Use when fixed number of columns
+     */
+    int numColumns{};
+
+    /**
+     *  Use when fixed number of rows
+     */
+    int numRows{};
+
+    /**
+     *  USE  fixed rows, otherwise fixed columns
+     */
+    bool viewFixedRows{};
+
+    /**
+     *  Layout Vertical then Horizontal
+     */
+    bool layoutVertical{};
+
+    /**
+     *  Layout pages right to left
+     */
+    bool layoutRightToLeft{};
+
+    /**
+     *  Layout Bottom to Top
+     */
+    bool layoutBottomToTop{};
+
+
+    /**
+     * Automatically load filename.pdf.xoj / .pdf.xopp instead of filename.pdf (true/false)
+     */
+    bool autoloadPdfXoj{};
+
+    /**
+     * Automatically load most recent document on application startup (true/false)
+     */
+    bool autoloadMostRecent{};
+
+    /**
+     * Automatically save documents for crash recovery each x minutes
+     */
+    int autosaveTimeout{};
+
+    /**
+     *  Enable automatic save
+     */
+    bool autosaveEnabled{};
+
+    /**
+     * Allow scroll outside the page display area (horizontal)
+     */
+    bool addHorizontalSpace{};
+
+    /**
+     * How much allowance to scroll outside the page display area on the right
+     */
+    int addHorizontalSpaceAmountRight{};
+
+    /**
+     * How much allowance to scroll outside the page display area on the left
+     */
+    int addHorizontalSpaceAmountLeft{};
+
+    /**
+     * Allow scroll outside the page display area (vertical)
+     */
+    bool addVerticalSpace{};
+
+    /**
+     * How much allowance to scroll outside the page display area above
+     */
+    int addVerticalSpaceAmountAbove{};
+
+    /**
+     * How much allowance to scroll outside the page display area below
+     */
+    int addVerticalSpaceAmountBelow{};
+
+    /**
+     * Enables unlimited scrolling, which automatically adds maximum space to scroll outside the page
+     */
+    bool unlimitedScrolling{};
+
+    /**
+     * Emulate modifier keys based on initial direction of drawing tool ( for Rectangle, Ellipse etc. )
+     */
+    bool drawDirModsEnabled{};
+
+    /**
+     * Radius at which emulated modifiers are locked on for the rest of drawing operation
+     */
+    int drawDirModsRadius{};
+
+    /**
+     * Rotation snapping enabled by default
+     */
+    bool snapRotation{};
+
+    /**
+     * grid snapping enabled by default
+     */
+    bool snapGrid{};
+
+    /**
+     * Default name if you save a new document
+     */
+    std::u8string defaultSaveName;  // should be string - don't change to path
+
+    std::u8string defaultPdfExportName;
+
+    /**
+     * The button config
+     */
+    std::array<std::unique_ptr<ButtonConfig>, BUTTON_COUNT> buttonConfig;
+
+    /**
+     * View-modes. Predefined: 0=default, 1=fullscreen, 2=presentation
+     */
+    ViewModeId activeViewMode;
+    std::vector<ViewMode> viewModes;
+
+    /**
+     *  The count of pages which will be cached
+     */
+    int pdfPageCacheSize{};
+
+    /**
+     *  Percentage by which the page's zoom must change
+     * for PDF pages to re-render while zooming.
+     */
+    double pageRerenderThreshold{};
+
+    /**
+     * Don't start zooming with touch until the difference in distances between the
+     * current touch points and the original is greater than this percentage of the
+     * original distance.
+     */
+    double touchZoomStartThreshold{};
+
+    /**
+     * The color to draw borders on selected elements
+     * (Page, insert image selection etc.)
+     */
+    Color selectionBorderColor{};
+
+    /**
+     * Color for Text selection, Stroke selection etc.
+     */
+    Color selectionMarkerColor{};
+
+    /**
+     * Color for active selection.
+     */
+    Color activeSelectionColor{};
+
+    /**
+     * The color for Xournal page background
+     */
+    Color backgroundColor{};
+
+    /**
+     * The parameters for the recoloring logic
+     * Also contains fields whether it is active at all
+     */
+    RecolorParameters recolorParameters{};
+
+    /**
+     * Page template String
+     */
+    std::string pageTemplate;
+
+    /**
+     * Unit, see XOJ_UNITS
+     */
+    std::string sizeUnit;
+
+    /**
+     * Audio folder for audio recording
+     */
+    fs::path audioFolder;
+
+    /**
+     * Snap tolerance for the graph/dotted grid
+     */
+    double snapGridTolerance{};
+
+    /**
+     * Rotation epsilon for rotation snapping feature
+     */
+    double snapRotationTolerance{};
+
+    /// Grid size for Snapping
+    double snapGridSize{};
+
+    /**
+     * Minimum size of stroke to detect shape
+     */
+    double strokeRecognizerMinSize{};
+
+    /// Touchscreens act like multi-touch-aware pens.
+    bool touchDrawing{};
+
+    /// True iff we use GTK's built-in kinetic/inertial scrolling
+    /// for touchscreen devices. If false, we use our own.
+    bool gtkTouchInertialScrolling{};
+
+    /**
+     * Infer pressure from speed when device pressure
+     * is unavailable (e.g. drawing with a mouse).
+     */
+    bool pressureGuessing{};
+
+#ifdef ENABLE_AUDIO
+    /**
+     * The index of the audio device used for recording
+     */
+    PaDeviceIndex audioInputDevice{};
+
+    /**
+     * The index of the audio device used for playback
+     */
+    PaDeviceIndex audioOutputDevice{};
+
+    /**
+     * The sample rate used for recording
+     */
+    double audioSampleRate{};
+
+    /**
+     * The gain by which to amplify the recorded audio samples
+     */
+    double audioGain{};
+
+    /**
+     * The default time by which the playback will seek backwards and forwards
+     */
+    unsigned int defaultSeekTime{};
+#endif
+
+    /**
+     * List of enabled plugins (only the one which are not enabled by default)
+     */
+    std::string pluginEnabled;
+
+    /**
+     * List of disabled plugins (only the one which are not disabled by default)
+     */
+    std::string pluginDisabled;
+
+
+    /**
+     * Used to filter strokes of short time and length unless successive in order to do something else ( i.e. select
+     * object, float Toolbox menu ). strokeFilterIgnoreLength			this many mm ( double ) strokeFilterIgnoreTime
+     * within this time (ms)  will be ignored.. strokeFilterSuccessiveTime		...unless successive within this time.
+     */
+    int strokeFilterIgnoreTime{};
+    double strokeFilterIgnoreLength{};
+    int strokeFilterSuccessiveTime{};
+    bool strokeFilterEnabled{};
+    bool doActionOnStrokeFiltered{};
+    bool trySelectOnStrokeFiltered{};
+
+    /**
+     * Whether snapping for recognized shapes is enabled
+     */
+    bool snapRecognizedShapesEnabled{};
+
+    /**
+     * Whether the line width should be preserved in a resizing operation
+     */
+    bool restoreLineWidthEnabled{};
+
+    /**
+     * How many stylus events since hitting the screen should be ignored before actually starting the action. If set to
+     * 0, no event will be ignored. Should not be negative.
+     */
+    int numIgnoredStylusEvents{};
+
+    /**
+     * Whether Wacom parameter TabletPCButton is enabled
+     */
+    bool inputSystemTPCButton{};
+
+    bool inputSystemDrawOutsideWindow{};
+
+    std::map<std::string, std::pair<InputDeviceTypeOption, GdkInputSource>> inputDeviceClasses = {};
+
+    /**
+     * "Transaction" running, do not save until the end is reached
+     */
+    bool inTransaction{};
+
+    /** The preferred locale as its language code
+     * e.g. "en_US"
+     */
+    std::string preferredLocale;
+
+    /**
+     * The number of pages to pre-load before the current page.
+     */
+    unsigned int preloadPagesBefore{};
+
+    /**
+     * The number of pages to pre-load after the current page.
+     */
+    unsigned int preloadPagesAfter{};
+
+    /**
+     * Whether to evict from the page buffer cache when scrolling.
+     */
+    bool eagerPageCleanup{};
+
+    /**
+     * Stabilizer related settings
+     */
+    bool stabilizerCuspDetection{};
+    bool stabilizerFinalizeStroke{};
+
+    size_t stabilizerBuffersize{};
+    double stabilizerDeadzoneRadius{};
+    double stabilizerDrag{};
+    double stabilizerMass{};
+    double stabilizerSigma{};
+    StrokeStabilizer::AveragingMethod stabilizerAveragingMethod{};
+    StrokeStabilizer::Preprocessor stabilizerPreprocessor{};
+
+    fs::path colorPaletteSetting;
+
+    /**
+     * Tab control settings
+     */
+    bool useSpacesForTab{};
+    unsigned int numberOfSpacesForTab{};
+
+    unsigned int laserPointerFadeOutTime{};  ///< Time in ms before the laser pointer strokes start fading out
+};
diff --git a/entry/src/main/cpp/src/core/control/settings/SettingsEnums.cpp b/entry/src/main/cpp/src/core/control/settings/SettingsEnums.cpp
new file mode 100644
index 0000000..b8968f0
--- /dev/null
+++ b/entry/src/main/cpp/src/core/control/settings/SettingsEnums.cpp
@@ -0,0 +1,77 @@
+#include "SettingsEnums.h"
+
+#include <glib.h>  // for g_warning
+
+auto stylusCursorTypeFromString(const std::string& stylusCursorTypeStr) -> StylusCursorType {
+    if (stylusCursorTypeStr == "none") {
+        return STYLUS_CURSOR_NONE;
+    }
+    if (stylusCursorTypeStr == "dot") {
+        return STYLUS_CURSOR_DOT;
+    }
+    if (stylusCursorTypeStr == "big") {
+        return STYLUS_CURSOR_BIG;
+    }
+    if (stylusCursorTypeStr == "arrow") {
+        return STYLUS_CURSOR_ARROW;
+    }
+    g_warning("Settings::Unknown stylus cursor type: %s\n", stylusCursorTypeStr.c_str());
+    return STYLUS_CURSOR_DOT;
+}
+
+auto eraserVisibilityFromString(const std::string& eraserVisibility) -> EraserVisibility {
+    if (eraserVisibility == "never") {
+        return ERASER_VISIBILITY_NEVER;
+    }
+    if (eraserVisibility == "always") {
+        return ERASER_VISIBILITY_ALWAYS;
+    }
+    if (eraserVisibility == "hover") {
+        return ERASER_VISIBILITY_HOVER;
+    }
+    if (eraserVisibility == "touch") {
+        return ERASER_VISIBILITY_TOUCH;
+    }
+    g_warning("Settings::Unknown eraser visibility: %s\n", eraserVisibility.c_str());
+    return ERASER_VISIBILITY_ALWAYS;
+}
+
+auto iconThemeFromString(const std::string& iconThemeStr) -> IconTheme {
+    if (iconThemeStr == "iconsColor") {
+        return ICON_THEME_COLOR;
+    }
+    if (iconThemeStr == "iconsLucide") {
+        return ICON_THEME_LUCIDE;
+    }
+    g_warning("Settings::Unknown icon theme: %s\n", iconThemeStr.c_str());
+    return ICON_THEME_COLOR;
+}
+
+auto themeVariantFromString(const std::string& themeVariantStr) -> ThemeVariant {
+    if (themeVariantStr == "useSystem") {
+        return THEME_VARIANT_USE_SYSTEM;
+    }
+    if (themeVariantStr == "forceLight") {
+        return THEME_VARIANT_FORCE_LIGHT;
+    }
+    if (themeVariantStr == "forceDark") {
+        return THEME_VARIANT_FORCE_DARK;
+    }
+    g_warning("Settings::Unknown theme variant: %s\n", themeVariantStr.c_str());
+    return THEME_VARIANT_USE_SYSTEM;
+}
+
+auto emptyLastPageAppendFromString(const std::string& str) -> EmptyLastPageAppendType {
+    if (str == "disabled") {
+        return EmptyLastPageAppendType::Disabled;
+    }
+    if (str == "onDrawOfLastPage") {
+        return EmptyLastPageAppendType::OnDrawOfLastPage;
+    }
+    if (str == "onScrollOfLastPage") {
+        return EmptyLastPageAppendType::OnScrollToEndOfLastPage;
+    }
+
+    g_warning("Settings::Unknown empty last page append type: %s\n", str.c_str());
+    return EmptyLastPageAppendType::Disabled;
+}
diff --git a/entry/src/main/cpp/src/core/control/settings/SettingsEnums.h b/entry/src/main/cpp/src/core/control/settings/SettingsEnums.h
new file mode 100644
index 0000000..a8f1be7
--- /dev/null
+++ b/entry/src/main/cpp/src/core/control/settings/SettingsEnums.h
@@ -0,0 +1,205 @@
+/*
+ * Xournal++
+ *
+ * Enum definition used for tools
+ *
+ * @author Xournal++ Team
+ * https://github.com/xournalpp/xournalpp
+ *
+ * @license GNU GPLv2 or later
+ */
+
+#pragma once
+
+#include <string>  // for string
+
+
+/**
+ * @brief Buttons that can have a configuration attached to them
+ * Used for ButtonConfig and ToolHandler
+ *
+ */
+enum Button {
+    BUTTON_ERASER,
+    BUTTON_MOUSE_LEFT,
+    BUTTON_MOUSE_MIDDLE,
+    BUTTON_MOUSE_RIGHT,
+    BUTTON_TOUCH,
+    BUTTON_DEFAULT,
+    BUTTON_STYLUS_ONE,
+    BUTTON_STYLUS_TWO,
+    BUTTON_COUNT
+};
+
+enum AttributeType {
+    ATTRIBUTE_TYPE_NONE,
+    ATTRIBUTE_TYPE_STRING,
+    ATTRIBUTE_TYPE_INT,
+    ATTRIBUTE_TYPE_DOUBLE,
+    ATTRIBUTE_TYPE_INT_HEX,
+    ATTRIBUTE_TYPE_BOOLEAN,
+};
+
+// use this as a bit flag
+enum ScrollbarHideType {
+    SCROLLBAR_HIDE_NONE = 0,
+    SCROLLBAR_HIDE_HORIZONTAL = 1 << 1,
+    SCROLLBAR_HIDE_VERTICAL = 1 << 2,
+    SCROLLBAR_HIDE_BOTH = SCROLLBAR_HIDE_HORIZONTAL | SCROLLBAR_HIDE_VERTICAL
+};
+
+enum class EmptyLastPageAppendType {
+    Disabled = 0,
+    OnDrawOfLastPage = 1,
+    OnScrollToEndOfLastPage = 2,
+};
+
+/**
+ * The user-selectable device types
+ *
+ *  Those values are stored as integers in settings.xml. DO NOT ALTER THE VALUES!
+ */
+enum class InputDeviceTypeOption {
+    Disabled = 0,
+    Mouse = 1,
+    Pen = 2,
+    Eraser = 3,
+    Touchscreen = 4,
+    MouseKeyboardCombo = 5,  ///< Deprecated
+};
+
+enum StylusCursorType {
+    STYLUS_CURSOR_NONE = 0,
+    STYLUS_CURSOR_DOT = 1,
+    STYLUS_CURSOR_BIG = 2,
+    STYLUS_CURSOR_ARROW = 3,
+};
+
+enum EraserVisibility {
+    ERASER_VISIBILITY_NEVER = 0,
+    ERASER_VISIBILITY_ALWAYS = 1,
+    ERASER_VISIBILITY_HOVER = 2,
+    ERASER_VISIBILITY_TOUCH = 3,
+};
+
+enum IconTheme {
+    ICON_THEME_COLOR = 0,
+    ICON_THEME_LUCIDE = 1,
+};
+
+enum ThemeVariant { THEME_VARIANT_USE_SYSTEM, THEME_VARIANT_FORCE_LIGHT, THEME_VARIANT_FORCE_DARK };
+
+/**
+ * The user-selectable Page Preview Decoration style
+ */
+enum class SidebarNumberingStyle {
+    /* No page numbers are displayed */
+    NONE = 0,
+    /* Page numbers are displayed below previews */
+    NUMBER_BELOW_PREVIEW = 1,
+    /* Page numbers are displayed in a circle in the lower right corner */
+    NUMBER_WITH_CIRCULAR_BACKGROUND = 2,
+    /* Page numbers are displayed in a square in the lower right corner */
+    NUMBER_WITH_SQUARE_BACKGROUND = 3,
+
+    /* MIN, MAX and Default values. Need to be updated when new style is added. */
+    MIN = SidebarNumberingStyle::NONE,
+    MAX = SidebarNumberingStyle::NUMBER_WITH_SQUARE_BACKGROUND,
+    DEFAULT = SidebarNumberingStyle::NUMBER_BELOW_PREVIEW
+};
+
+constexpr auto buttonToString(Button button) -> const char* {
+    switch (button) {
+        case BUTTON_ERASER:
+            return "eraser";
+        case BUTTON_MOUSE_LEFT:
+            return "left";
+        case BUTTON_MOUSE_MIDDLE:
+            return "middle";
+        case BUTTON_MOUSE_RIGHT:
+            return "right";
+        case BUTTON_TOUCH:
+            return "touch";
+        case BUTTON_DEFAULT:
+            return "default";
+        case BUTTON_STYLUS_ONE:
+            return "stylus";
+        case BUTTON_STYLUS_TWO:
+            return "stylus2";
+        default:
+            return "unknown";
+    }
+}
+
+constexpr auto stylusCursorTypeToString(StylusCursorType stylusCursorType) -> const char* {
+    switch (stylusCursorType) {
+        case STYLUS_CURSOR_NONE:
+            return "none";
+        case STYLUS_CURSOR_DOT:
+            return "dot";
+        case STYLUS_CURSOR_BIG:
+            return "big";
+        case STYLUS_CURSOR_ARROW:
+            return "arrow";
+        default:
+            return "unknown";
+    }
+}
+
+constexpr auto eraserVisibilityToString(EraserVisibility eraserVisibility) -> const char* {
+    switch (eraserVisibility) {
+        case ERASER_VISIBILITY_NEVER:
+            return "never";
+        case ERASER_VISIBILITY_ALWAYS:
+            return "always";
+        case ERASER_VISIBILITY_HOVER:
+            return "hover";
+        case ERASER_VISIBILITY_TOUCH:
+            return "touch";
+        default:
+            return "unknown";
+    }
+}
+
+constexpr auto iconThemeToString(IconTheme iconTheme) -> const char* {
+    switch (iconTheme) {
+        case ICON_THEME_COLOR:
+            return "iconsColor";
+        case ICON_THEME_LUCIDE:
+            return "iconsLucide";
+        default:
+            return "unknown";
+    }
+}
+
+constexpr auto themeVariantToString(ThemeVariant variant) -> const char* {
+    switch (variant) {
+        case THEME_VARIANT_USE_SYSTEM:
+            return "useSystem";
+        case THEME_VARIANT_FORCE_LIGHT:
+            return "forceLight";
+        case THEME_VARIANT_FORCE_DARK:
+            return "forceDark";
+        default:
+            return "unknown";
+    }
+}
+
+constexpr auto emptyLastPageAppendToString(EmptyLastPageAppendType appendType) -> const char* {
+    switch (appendType) {
+        case EmptyLastPageAppendType::Disabled:
+            return "disabled";
+        case EmptyLastPageAppendType::OnDrawOfLastPage:
+            return "onDrawOfLastPage";
+        case EmptyLastPageAppendType::OnScrollToEndOfLastPage:
+            return "onScrollOfLastPage";
+        default:
+            return "unknown";
+    }
+}
+
+StylusCursorType stylusCursorTypeFromString(const std::string& stylusCursorTypeStr);
+EraserVisibility eraserVisibilityFromString(const std::string& eraserVisibilityStr);
+IconTheme iconThemeFromString(const std::string& iconThemeStr);
+ThemeVariant themeVariantFromString(const std::string& themeVariantStr);
+EmptyLastPageAppendType emptyLastPageAppendFromString(const std::string& str);
diff --git a/entry/src/main/cpp/src/core/control/settings/ViewModes.cpp b/entry/src/main/cpp/src/core/control/settings/ViewModes.cpp
new file mode 100644
index 0000000..acf5d74
--- /dev/null
+++ b/entry/src/main/cpp/src/core/control/settings/ViewModes.cpp
@@ -0,0 +1,35 @@
+#include "ViewModes.h"
+#include "util/StringUtils.h"
+
+#include <iostream>
+
+auto ViewMode::operator==(const ViewMode& other) const -> bool {
+    return (this->goFullscreen == other.goFullscreen) && (this->showMenubar == other.showMenubar) &&
+           (this->showToolbar == other.showToolbar) && (this->showSidebar == other.showSidebar);
+}
+
+struct ViewMode settingsStringToViewMode(std::string viewModeString) {
+    struct ViewMode viewMode;
+    for (const std::string& attr : StringUtils::split(viewModeString, ',')) {
+        if (attr.compare(ATTR_GO_FULLSCREEN) == 0) {
+            viewMode.goFullscreen = true;
+        } else if (attr.compare(ATTR_SHOW_MENUBAR) == 0) {
+            viewMode.showMenubar = true;
+        } else if (attr.compare(ATTR_SHOW_TOOLBAR) == 0) {
+            viewMode.showToolbar = true;
+        } else if (attr.compare(ATTR_SHOW_SIDEBAR) == 0) {
+            viewMode.showSidebar = true;
+        }
+    }
+    return viewMode;
+}
+
+const std::string viewModeToSettingsString(struct ViewMode viewMode) {
+    if (!(viewMode.goFullscreen || viewMode.showMenubar || viewMode.showToolbar || viewMode.showSidebar)) {
+        return "";
+    }
+    return ((viewMode.goFullscreen ? "," + static_cast<std::string>(ATTR_GO_FULLSCREEN) : "")
+        + (viewMode.showMenubar ? "," + static_cast<std::string>(ATTR_SHOW_MENUBAR) : "")
+        + (viewMode.showToolbar ? "," + static_cast<std::string>(ATTR_SHOW_TOOLBAR) : "")
+        + (viewMode.showSidebar ? "," + static_cast<std::string>(ATTR_SHOW_SIDEBAR) : "")).erase(0,1);
+}
diff --git a/entry/src/main/cpp/src/core/control/settings/ViewModes.h b/entry/src/main/cpp/src/core/control/settings/ViewModes.h
new file mode 100644
index 0000000..04360b7
--- /dev/null
+++ b/entry/src/main/cpp/src/core/control/settings/ViewModes.h
@@ -0,0 +1,48 @@
+/*
+ * Xournal++
+ *
+ * View Mode struct & attribute definitions
+ *
+ * @author Xournal++ Team
+ * https://github.com/xournalpp/xournalpp
+ *
+ * @license GNU GPLv2 or later
+ */
+
+#pragma once
+
+#include <string>           // for string
+#include <vector>           // for vector
+#include <unordered_map>    // for unordered_map
+
+using ViewModeId = size_t;
+
+// reserved default view mode ids
+enum PresetViewModeIds {
+    VIEW_MODE_DEFAULT = 0,
+    VIEW_MODE_FULLSCREEN = 1,
+    VIEW_MODE_PRESENTATION = 2
+};
+
+// view mode attributes
+constexpr auto ATTR_GO_FULLSCREEN = "goFullscren";
+constexpr auto ATTR_SHOW_MENUBAR  = "showMenubar";
+constexpr auto ATTR_SHOW_TOOLBAR  = "showToolbar";
+constexpr auto ATTR_SHOW_SIDEBAR  = "showSidebar";
+
+struct ViewMode {
+    bool goFullscreen{false};
+    bool showMenubar{false};
+    bool showToolbar{false};
+    bool showSidebar{false};
+
+    bool operator==(const ViewMode& other) const;
+};
+
+// default ViewModes
+constexpr ViewMode VIEW_MODE_STRUCT_DEFAULT{false, true, true, true};
+constexpr ViewMode VIEW_MODE_STRUCT_FULLSCREEN{true, false, true, true};
+constexpr ViewMode VIEW_MODE_STRUCT_PRESENTATION{true, false, true, false};
+
+struct ViewMode settingsStringToViewMode(std::string viewModeString);
+const std::string viewModeToSettingsString(struct ViewMode viewMode);
diff --git a/entry/src/main/cpp/src/core/control/shaperecognizer/CircleRecognizer.cpp b/entry/src/main/cpp/src/core/control/shaperecognizer/CircleRecognizer.cpp
new file mode 100644
index 0000000..4c99164
--- /dev/null
+++ b/entry/src/main/cpp/src/core/control/shaperecognizer/CircleRecognizer.cpp
@@ -0,0 +1,77 @@
+#include "CircleRecognizer.h"
+
+#include <cmath>     // for hypot, cos, fabs, sin, M_PI
+#include <iterator>  // for begin, end, next
+#include <memory>
+#include <vector>    // for vector
+
+#include "model/Point.h"   // for Point
+#include "model/Stroke.h"  // for Stroke
+
+#include "Inertia.h"                // for Inertia
+#include "ShapeRecognizerConfig.h"  // for RDEBUG, CIRCLE_MAX_SCORE, CIRCLE_...
+
+/**
+ * Create circle stroke for inertia
+ */
+auto CircleRecognizer::makeCircleShape(Stroke* originalStroke, Inertia& inertia) -> std::unique_ptr<Stroke> {
+    int npts = static_cast<int>(2 * inertia.rad());
+    if (npts < 24) {
+        npts = 24;  // min. number of points
+    }
+
+    auto s = std::make_unique<Stroke>();
+    s->applyStyleFrom(originalStroke);
+
+    for (int i = 0; i <= npts; i++) {
+        double x = inertia.centerX() + inertia.rad() * cos((2 * M_PI * i) / npts);
+        double y = inertia.centerY() + inertia.rad() * sin((2 * M_PI * i) / npts);
+        s->addPoint(Point(x, y));
+    }
+
+    return s;
+}
+
+/**
+ *  Test if we have a circle; inertia has been precomputed by caller
+ */
+auto CircleRecognizer::scoreCircle(Stroke* s, Inertia& inertia) -> double {
+    double r0 = inertia.rad();
+    double divisor = inertia.getMass() * r0;
+
+    // Todo: test: std::abs(divisor) <= std::numeric_limits<double>::epsilon()
+    if (divisor == 0) {
+        return 0;
+    }
+
+    double sum = 0.0;
+    double x0 = inertia.centerX();
+    double y0 = inertia.centerY();
+
+    auto const& pv = s->getPointVector();
+    for (auto pt_1st = begin(pv), pt_2nd = std::next(pt_1st), p_end_i = end(pv); pt_1st != p_end_i && pt_2nd != p_end_i;
+         ++pt_2nd, ++pt_1st) {
+        double dm = hypot(pt_2nd->x - pt_1st->x, pt_2nd->y - pt_1st->y);
+        double deltar = hypot(pt_1st->x - x0, pt_1st->y - y0) - r0;
+        sum += dm * fabs(deltar);
+    }
+
+    return sum / (divisor);
+}
+
+auto CircleRecognizer::recognize(Stroke* stroke) -> std::unique_ptr<Stroke> {
+    Inertia s;
+    s.calc(stroke->getPointVector());
+    RDEBUG("Mass=%.0f, Center=(%.1f,%.1f), I=(%.0f,%.0f, %.0f), Rad=%.2f, Det=%.4f", s.getMass(), s.centerX(),
+           s.centerY(), s.xx(), s.yy(), s.xy(), s.rad(), s.det());
+
+    if (s.det() > CIRCLE_MIN_DET) {
+        double score = CircleRecognizer::scoreCircle(stroke, s);
+        RDEBUG("Circle score: %.2f", score);
+        if (score < CIRCLE_MAX_SCORE) {
+            return CircleRecognizer::makeCircleShape(stroke, s);
+        }
+    }
+
+    return nullptr;
+}
diff --git a/entry/src/main/cpp/src/core/control/shaperecognizer/CircleRecognizer.h b/entry/src/main/cpp/src/core/control/shaperecognizer/CircleRecognizer.h
new file mode 100644
index 0000000..91867d4
--- /dev/null
+++ b/entry/src/main/cpp/src/core/control/shaperecognizer/CircleRecognizer.h
@@ -0,0 +1,29 @@
+/*
+ * Xournal++
+ *
+ * Part of the Xournal shape recognizer
+ *
+ * @author Xournal++ Team
+ * https://github.com/xournalpp/xournalpp
+ *
+ * @license GNU GPLv2 or later
+ */
+
+#pragma once
+
+#include <memory>
+class Stroke;
+class Inertia;
+
+class CircleRecognizer {
+private:
+    CircleRecognizer();
+    virtual ~CircleRecognizer();
+
+public:
+    static auto recognize(Stroke* s) -> std::unique_ptr<Stroke>;
+
+private:
+    static auto makeCircleShape(Stroke* originalStroke, Inertia& inertia) -> std::unique_ptr<Stroke>;
+    static auto scoreCircle(Stroke* s, Inertia& inertia) -> double;
+};
diff --git a/entry/src/main/cpp/src/core/control/shaperecognizer/Inertia.cpp b/entry/src/main/cpp/src/core/control/shaperecognizer/Inertia.cpp
new file mode 100644
index 0000000..6871550
--- /dev/null
+++ b/entry/src/main/cpp/src/core/control/shaperecognizer/Inertia.cpp
@@ -0,0 +1,87 @@
+#include "Inertia.h"
+
+#include <cmath>
+#include <span>
+
+#include "model/Point.h"
+
+Inertia::Inertia() {
+    this->mass = 0;
+    this->sx = 0;
+    this->sxx = 0;
+    this->sxy = 0;
+    this->sy = 0;
+    this->syy = 0;
+}
+
+Inertia::Inertia(const Inertia& inertia) { *this = inertia; }
+
+Inertia::~Inertia() = default;
+
+auto Inertia::centerX() const -> double { return this->sx / this->mass; }
+
+auto Inertia::centerY() const -> double { return this->sy / this->mass; }
+
+auto Inertia::xx() const -> double {
+    if (this->mass <= 0.0) {
+        return 0.0;
+    }
+    return (this->sxx - this->sx * this->sx / this->mass) / this->mass;
+}
+
+auto Inertia::xy() const -> double {
+    if (this->mass <= 0.0) {
+        return 0.0;
+    }
+    return (this->sxy - this->sx * this->sy / this->mass) / this->mass;
+}
+
+auto Inertia::yy() const -> double {
+    if (this->mass <= 0.0) {
+        return 0.0;
+    }
+    return (this->syy - this->sy * this->sy / this->mass) / this->mass;
+}
+
+auto Inertia::rad() const -> double {
+    double ixx = this->xx();
+    double iyy = this->yy();
+    if (ixx + iyy <= 0.0) {
+        return 0.0;
+    }
+    return sqrt(ixx + iyy);
+}
+
+auto Inertia::det() const -> double {
+    double ixx = this->xx();
+    double iyy = this->yy();
+    double ixy = this->xy();
+    if (this->mass <= 0.0) {
+        return 0.0;
+    }
+
+    if (ixx + iyy <= 0.0) {
+        return 0.0;
+    }
+
+    return 4 * (ixx * iyy - ixy * ixy) / (ixx + iyy) / (ixx + iyy);
+}
+
+auto Inertia::getMass() const -> double { return mass; }
+
+void Inertia::increase(Point p1, Point p2, int coef) {
+    double dm = coef * hypot(p2.x - p1.x, p2.y - p1.y);
+    this->mass += dm;
+    this->sx += dm * p1.x;
+    this->sy += dm * p1.y;
+    this->sxx += dm * p1.x * p1.x;
+    this->syy += dm * p1.y * p1.y;
+    this->sxy += dm * p1.x * p1.y;
+}
+
+void Inertia::calc(std::span<const Point> points) {
+    this->mass = this->sx = this->sy = this->sxx = this->sxy = this->syy = 0.;
+    for (auto it = points.begin(); it + 1 < points.end(); ++it) {
+        this->increase(*it, *(it + 1), 1);
+    }
+}
diff --git a/entry/src/main/cpp/src/core/control/shaperecognizer/Inertia.h b/entry/src/main/cpp/src/core/control/shaperecognizer/Inertia.h
new file mode 100644
index 0000000..e052600
--- /dev/null
+++ b/entry/src/main/cpp/src/core/control/shaperecognizer/Inertia.h
@@ -0,0 +1,48 @@
+/*
+ * Xournal++
+ *
+ * Part of the Xournal shape recognizer
+ *
+ * @author Xournal++ Team
+ * https://github.com/xournalpp/xournalpp
+ *
+ * @license GNU GPLv2 or later
+ */
+
+#pragma once
+
+#include <span>
+
+class Point;
+
+class Inertia {
+public:
+    Inertia();
+    Inertia(const Inertia& inertia);
+    virtual ~Inertia();
+
+public:
+    double centerX() const;
+    double centerY() const;
+
+    double xx() const;
+    double xy() const;
+    double yy() const;
+
+    double rad() const;
+
+    double det() const;
+
+    double getMass() const;
+
+    void increase(Point p1, Point p2, int coef);
+    void calc(std::span<const Point> points);
+
+private:
+    double mass{};
+    double sx{};
+    double sy{};
+    double sxx{};
+    double sxy{};
+    double syy{};
+};
diff --git a/entry/src/main/cpp/src/core/control/shaperecognizer/RecoSegment.cpp b/entry/src/main/cpp/src/core/control/shaperecognizer/RecoSegment.cpp
new file mode 100644
index 0000000..27c7750
--- /dev/null
+++ b/entry/src/main/cpp/src/core/control/shaperecognizer/RecoSegment.cpp
@@ -0,0 +1,48 @@
+#include "RecoSegment.h"
+
+#include <cmath>
+
+#include "Inertia.h"
+
+auto RecoSegment::calcEdgeIsect(RecoSegment* r2) const -> Point {
+    double t = (r2->xcenter - this->xcenter) * sin(r2->angle) - (r2->ycenter - this->ycenter) * cos(r2->angle);
+    t /= sin(r2->angle - this->angle);
+    double x = this->xcenter + t * cos(this->angle);
+    double y = this->ycenter + t * sin(this->angle);
+
+    return Point(x, y);
+}
+
+/**
+ * Find the geometry of a recognized segment
+ */
+void RecoSegment::calcSegmentGeometry(const Point* pt, int start, int end, Inertia* s) {
+    this->xcenter = s->centerX();
+    this->ycenter = s->centerY();
+    double a = s->xx();
+    double b = s->xy();
+    double c = s->yy();
+
+    // max angle for inertia quadratic form solves: tan(2t) = 2b/(a-c)
+    this->angle = atan2(2 * b, a - c) / 2;
+    this->radius = sqrt(3 * (a + c));
+
+    double lmin = 0;
+    double lmax = 0;
+
+    for (int i = start; i <= end; i++) {
+        double l = (pt[i].x - this->xcenter) * cos(this->angle) + (pt[i].y - this->ycenter) * sin(this->angle);
+        if (l < lmin) {
+            lmin = l;
+        }
+
+        if (l > lmax) {
+            lmax = l;
+        }
+    }
+
+    this->x1 = this->xcenter + lmin * cos(this->angle);
+    this->y1 = this->ycenter + lmin * sin(this->angle);
+    this->x2 = this->xcenter + lmax * cos(this->angle);
+    this->y2 = this->ycenter + lmax * sin(this->angle);
+}
diff --git a/entry/src/main/cpp/src/core/control/shaperecognizer/RecoSegment.h b/entry/src/main/cpp/src/core/control/shaperecognizer/RecoSegment.h
new file mode 100644
index 0000000..01987fd
--- /dev/null
+++ b/entry/src/main/cpp/src/core/control/shaperecognizer/RecoSegment.h
@@ -0,0 +1,41 @@
+/*
+ * Xournal++
+ *
+ * Part of the Xournal shape recognizer
+ *
+ * @author Xournal++ Team
+ * https://github.com/xournalpp/xournalpp
+ *
+ * @license GNU GPLv2 or later
+ */
+#pragma once
+
+#include "model/Point.h"
+
+class Stroke;
+class Inertia;
+
+struct RecoSegment final {
+    Point calcEdgeIsect(RecoSegment* r2) const;
+
+    /**
+     * Find the geometry of a recognized segment
+     */
+    void calcSegmentGeometry(const Point* pt, int start, int end, Inertia* s);
+
+    Stroke* stroke{nullptr};
+    int startpt{0};
+    int endpt{0};
+
+    double xcenter{0};
+    double ycenter{0};
+    double angle{0};
+    double radius{0};
+
+    double x1{0};
+    double y1{0};
+    double x2{0};
+    double y2{0};
+
+    bool reversed{};
+};
diff --git a/entry/src/main/cpp/src/core/control/shaperecognizer/ShapeRecognizer.cpp b/entry/src/main/cpp/src/core/control/shaperecognizer/ShapeRecognizer.cpp
new file mode 100644
index 0000000..f264f8f
--- /dev/null
+++ b/entry/src/main/cpp/src/core/control/shaperecognizer/ShapeRecognizer.cpp
@@ -0,0 +1,449 @@
+#include "ShapeRecognizer.h"
+
+#include <cmath>     // for fabs, M_PI
+#include <iterator>  // for begin, next
+#include <memory>    // for allocator...
+#include <span>      // for span
+#include <utility>   // for move
+#include <vector>    // for vector
+
+#include <glib.h>  // for g_message
+
+#include "control/shaperecognizer/RecoSegment.h"            // for RecoSegment
+#include "control/shaperecognizer/ShapeRecognizerConfig.h"  // for RDEBUG
+#include "model/Point.h"                                    // for Point
+#include "model/Stroke.h"                                   // for Stroke
+#include "util/safe_casts.h"                                // for as_unsigned
+
+#include "CircleRecognizer.h"  // for CircleRec...
+#include "Inertia.h"           // for Inertia
+#include "config-debug.h"      // for DEBUG_REC...
+
+ShapeRecognizer::ShapeRecognizer() {
+    resetRecognizer();
+    this->stroke = nullptr;
+    this->queueLength = 0;
+}
+
+ShapeRecognizer::~ShapeRecognizer() { resetRecognizer(); }
+
+void ShapeRecognizer::resetRecognizer() {
+    RDEBUG("reset");
+    this->queue = {};
+    this->queueLength = 0;
+}
+
+inline double dist2(const Point& P, const Point& Q) {
+    const double dx = P.x - Q.x;
+    const double dy = P.y - Q.y;
+    return dx * dx + dy * dy;
+}
+
+auto ShapeRecognizer::tryTriangle() -> std::unique_ptr<Stroke> {
+    // first, we need whole strokes to combine to 3 segments...
+    if (this->queueLength < 3) {
+        return nullptr;
+    }
+
+    RecoSegment* rs = &this->queue[as_unsigned(this->queueLength - 3)];
+    if (rs->startpt != 0) {
+        return nullptr;
+    }
+
+    /*
+    Make segments be oriented so that, for every pair of neighbouring segments,
+    the first segment points towards the second. This should make the polygon
+    have all of its segments oriented either clockwise or counter-clockwise.
+
+    The direction of any segment R is defined from P to Q where
+    if R is not reversed then
+        P is (x1,y1)
+        Q is (x2,y2)
+    else
+        P is (x2,y2)
+        Q is (x1,y1)
+    */
+    for (int i = 0; i <= 2; i++) {
+        RecoSegment& r1 = rs[i];
+        const RecoSegment& r2 = rs[(i + 1) % 3];
+
+        const Point P(r1.x1, r1.y1);
+        const Point Q(r1.x2, r1.y2);
+        const Point R(r2.x1, r2.y1);
+        const Point S(r2.x2, r2.y2);
+        const double min_PR_PS = std::min(dist2(P, R), dist2(P, S));
+        const double min_QR_QS = std::min(dist2(Q, R), dist2(Q, S));
+        r1.reversed = min_PR_PS < min_QR_QS;
+    }
+
+    for (int i = 0; i <= 2; i++) {
+        const RecoSegment& r1 = rs[i];
+        const RecoSegment& r2 = rs[(i + 1) % 3];
+
+        const double x1 = r1.reversed ? r1.x1 : r1.x2;
+        const double y1 = r1.reversed ? r1.y1 : r1.y2;
+        const double x2 = r2.reversed ? r2.x2 : r2.x1;
+        const double y2 = r2.reversed ? r2.y2 : r2.y1;
+
+        const double dist = hypot(x1 - x2, y1 - y2);
+        if (dist > TRIANGLE_LINEAR_TOLERANCE * (r1.radius + r2.radius)) {
+            return nullptr;
+        }
+    }
+
+    auto s = std::make_unique<Stroke>();
+    s->applyStyleFrom(this->stroke);
+
+    for (int i = 0; i <= 2; i++) {
+        Point p = rs[i].calcEdgeIsect(&rs[(i + 1) % 3]);
+        s->addPoint(p);
+    }
+
+    s->addPoint(s->getPoint(0));
+
+    return s;
+}
+
+/**
+ *  Test if segments form standard shapes
+ */
+auto ShapeRecognizer::tryRectangle() -> std::unique_ptr<Stroke> {
+    // first, we need whole strokes to combine to 4 segments...
+    if (this->queueLength < 4) {
+        return nullptr;
+    }
+
+    RecoSegment* rs = &this->queue[as_unsigned(this->queueLength - 4)];
+    if (rs->startpt != 0) {
+        return nullptr;
+    }
+
+    // check edges make angles ~= Pi/2 and vertices roughly match
+    double avgAngle = 0.;
+    for (int i = 0; i <= 3; i++) {
+        RecoSegment* r1 = &rs[i];
+        RecoSegment* r2 = &rs[(i + 1) % 4];
+        if (fabs(fabs(r1->angle - r2->angle) - M_PI / 2) > RECTANGLE_ANGLE_TOLERANCE) {
+            return nullptr;
+        }
+        avgAngle += r1->angle;
+        if (r2->angle > r1->angle) {
+            avgAngle += (i + 1) * M_PI / 2;
+        } else {
+            avgAngle -= (i + 1) * M_PI / 2;
+        }
+
+        // test if r1 points away from r2 rather than towards it
+        r1->reversed =
+                ((r1->x2 - r1->x1) * (r2->xcenter - r1->xcenter) + (r1->y2 - r1->y1) * (r2->ycenter - r1->ycenter)) < 0;
+    }
+    for (int i = 0; i <= 3; i++) {
+        RecoSegment* r1 = &rs[i];
+        RecoSegment* r2 = &rs[(i + 1) % 4];
+        double dist = hypot((r1->reversed ? r1->x1 : r1->x2) - (r2->reversed ? r2->x2 : r2->x1),
+                            (r1->reversed ? r1->y1 : r1->y2) - (r2->reversed ? r2->y2 : r2->y1));
+        if (dist > RECTANGLE_LINEAR_TOLERANCE * (r1->radius + r2->radius)) {
+            return nullptr;
+        }
+    }
+
+    // make a rectangle of the correct size and slope
+    avgAngle = avgAngle / 4;
+    if (fabs(avgAngle) < SLANT_TOLERANCE) {
+        avgAngle = 0.;
+    }
+
+    if (fabs(avgAngle) > M_PI / 2 - SLANT_TOLERANCE) {
+        avgAngle = M_PI / 2;
+    }
+
+    auto s = std::make_unique<Stroke>();
+    s->applyStyleFrom(this->stroke);
+
+    for (int i = 0; i <= 3; i++) {
+        rs[i].angle = avgAngle + i * M_PI / 2;
+    }
+
+    for (int i = 0; i <= 3; i++) {
+        Point p = rs[i].calcEdgeIsect(&rs[(i + 1) % 4]);
+        s->addPoint(p);
+    }
+
+    s->addPoint(s->getPoint(0));
+
+    return s;
+}
+
+/**
+ * Check if something is a polygonal line with at most nsides sides.
+ * [start, finish] (inclusive) specifies the range to operate on in the pt array.
+ */
+auto ShapeRecognizer::findPolygonal(const Point* pt, int start, int finish, int nsides, int* breaks, Inertia* ss)
+        -> int {
+    Inertia s;
+    int i1 = 0, i2 = 0, n1 = 0, n2 = 0;
+
+    if (finish == start) {
+        return 0;  // no way
+    }
+
+    if (nsides <= 0) {
+        return 0;
+    }
+
+    if (finish - start < 5) {
+        nsides = 1;  // too small for a polygon
+    }
+
+    // look for a linear piece that's big enough
+    int k = 0;
+    for (; k < nsides; k++) {
+        i1 = start + (k * (finish - start)) / nsides;
+        i2 = start + ((k + 1) * (finish - start)) / nsides;
+        s.calc(std::span<const Point>(pt + i1, pt + i2 + 1));
+        if (s.det() < SEGMENT_MAX_DET) {
+            break;
+        }
+    }
+    if (k == nsides) {
+        return 0;  // failed!
+    }
+
+    double det1{};
+    double det2{};
+    Inertia s1;
+    Inertia s2;
+
+    // grow the linear piece we found
+    while (true) {
+        if (i1 > start) {
+            s1 = s;
+            s1.increase(pt[i1 - 1], pt[i1], 1);
+            det1 = s1.det();
+        } else {
+            det1 = 1.0;
+        }
+
+        if (i2 < finish) {
+            s2 = s;
+            s2.increase(pt[i2], pt[i2 + 1], 1);
+            det2 = s2.det();
+        } else {
+            det2 = 1.0;
+        }
+
+        if (det1 < det2 && det1 < SEGMENT_MAX_DET) {
+            i1--;
+            s = s1;
+        } else if (det2 < det1 && det2 < SEGMENT_MAX_DET) {
+            i2++;
+            s = s2;
+        } else {
+            break;
+        }
+    }
+
+    if (i1 > start) {
+        n1 = findPolygonal(pt, start, i1, (i2 == finish) ? (nsides - 1) : (nsides - 2), breaks, ss);
+        if (n1 == 0) {
+            return 0;  // it doesn't work
+        }
+    } else {
+        n1 = 0;
+    }
+
+    breaks[n1] = i1;
+    breaks[n1 + 1] = i2;
+    ss[n1] = s;
+
+    if (i2 < finish) {
+        n2 = findPolygonal(pt, i2, finish, nsides - n1 - 1, breaks + n1 + 1, ss + n1 + 1);
+        if (n2 == 0) {
+            return 0;
+        }
+    } else {
+        n2 = 0;
+    }
+
+    return n1 + n2 + 1;
+}
+
+/**
+ * Improve on the polygon found by find_polygonal()
+ */
+void ShapeRecognizer::optimizePolygonal(const Point* pt, int nsides, int* breaks, Inertia* ss) {
+    for (int i = 1; i < nsides; i++) {
+        // optimize break between sides i and i+1
+        double cost = ss[i - 1].det() * ss[i - 1].det() + ss[i].det() * ss[i].det();
+        Inertia s1 = ss[i - 1];
+        Inertia s2 = ss[i];
+        bool improved = false;
+        while (breaks[i] > breaks[i - 1] + 1) {
+            // try moving the break to the left
+            s1.increase(pt[breaks[i] - 1], pt[breaks[i] - 2], -1);
+            s2.increase(pt[breaks[i] - 1], pt[breaks[i] - 2], 1);
+            double newcost = s1.det() * s1.det() + s2.det() * s2.det();
+
+            if (newcost >= cost) {
+                break;
+            }
+
+            improved = true;
+            cost = newcost;
+            breaks[i]--;
+            ss[i - 1] = s1;
+            ss[i] = s2;
+        }
+
+        if (improved) {
+            continue;
+        }
+
+        s1 = ss[i - 1];
+        s2 = ss[i];
+        while (breaks[i] < breaks[i + 1] - 1) {
+            // try moving the break to the right
+            s1.increase(pt[breaks[i]], pt[breaks[i] + 1], 1);
+            s2.increase(pt[breaks[i]], pt[breaks[i] + 1], -1);
+
+            double newcost = s1.det() * s1.det() + s2.det() * s2.det();
+            if (newcost >= cost) {
+                break;
+            }
+
+            cost = newcost;
+            breaks[i]++;
+            ss[i - 1] = s1;
+            ss[i] = s2;
+        }
+    }
+}
+
+/**
+ * Determine if a particular stroke is large enough as to make a shape out of it
+ */
+auto ShapeRecognizer::isStrokeLargeEnough(Stroke* stroke, double strokeMinSize) -> bool {
+    if (stroke->getPointCount() < 3) {
+        return false;
+    }
+
+    auto rect = stroke->getSnappedBounds();
+    return std::hypot(rect.width, rect.height) >= strokeMinSize;
+}
+
+/**
+ * The main pattern recognition function
+ */
+auto ShapeRecognizer::recognizePatterns(Stroke* stroke, double strokeMinSize) -> std::unique_ptr<Stroke> {
+    this->stroke = stroke;
+
+    if (!isStrokeLargeEnough(stroke, strokeMinSize)) {
+        return nullptr;
+    }
+
+    Inertia ss[4];
+    int brk[5] = {0};
+
+    // first see if it's a polygon
+    int n = findPolygonal(stroke->getPoints(), 0, static_cast<int>(stroke->getPointCount()) - 1, MAX_POLYGON_SIDES, brk,
+                          ss);
+    if (n > 0) {
+        optimizePolygonal(stroke->getPoints(), n, brk, ss);
+#ifdef DEBUG_RECOGNIZER
+        g_message("--");
+        g_message("ShapeReco:: Polygon, %d edges:", n);
+        for (int i = 0; i < n; i++) {
+            g_message("ShapeReco::      %d-%d (M=%.0f, det=%.4f)", brk[i], brk[i + 1], ss[i].getMass(), ss[i].det());
+        }
+        g_message("--");
+#endif
+        // update recognizer segment queue (most recent at end)
+        while (n + queueLength > MAX_POLYGON_SIDES) {
+            // remove oldest polygonal stroke
+            int i = 1;
+            while (i < queueLength && queue[as_unsigned(i)].startpt != 0) {
+                i++;
+            }
+            queueLength -= i;
+            std::move(std::next(begin(queue), i), std::next(begin(queue), i + queueLength), begin(queue));
+        }
+
+        RDEBUG("Queue now has %i + %i edges", this->queueLength, n);
+
+        RecoSegment* rs = &this->queue[as_unsigned(this->queueLength)];
+        this->queueLength += n;
+
+        for (int i = 0; i < n; i++) {
+            rs[i].startpt = brk[i];
+            rs[i].endpt = brk[i + 1];
+            rs[i].calcSegmentGeometry(stroke->getPoints(), brk[i], brk[i + 1], ss + i);
+        }
+
+        if (auto result = tryTriangle(); result != nullptr) {
+            RDEBUG("return triangle");
+            return result;
+        }
+        if (auto result = tryRectangle(); result != nullptr) {
+            RDEBUG("return rectangle");
+            return result;
+        }
+
+        // Removed complicated recognition in commit 5494bd002050182cde3af70bd1924f4062579be5
+
+        if (n == 1 && ss->det() < LINE_MAX_DET)  // current stroke is a line
+        {
+            bool aligned = true;
+            if (fabs(rs->angle) < SLANT_TOLERANCE)  // nearly horizontal
+            {
+                rs->angle = 0.0;
+                rs->y1 = rs->y2 = rs->ycenter;
+            } else if (fabs(rs->angle) > M_PI / 2 - SLANT_TOLERANCE) {  // nearly vertical
+                rs->angle = (rs->angle > 0) ? (M_PI / 2) : (-M_PI / 2);
+                rs->x1 = rs->x2 = rs->xcenter;
+            } else {
+                aligned = false;
+            }
+
+            auto s = std::make_unique<Stroke>();
+            s->applyStyleFrom(this->stroke);
+
+            if (aligned) {
+                s->addPoint(Point(rs->x1, rs->y1));
+                s->addPoint(Point(rs->x2, rs->y2));
+            } else {
+                const Point P(rs->x1, rs->y1);
+                const Point Q(rs->x2, rs->y2);
+
+                const auto& points = stroke->getPointVector();
+                const Point& last = points.back();
+
+                const double dx = Q.x - P.x;
+                const double dy = Q.y - P.y;
+                const double num = dy * last.x - dx * last.y + Q.x * P.y - Q.y * P.x;
+                const double num2 = num * num;
+                const double den2 = dy * dy + dx * dx;
+                const double dist2 = num2 / den2;
+
+                if (dist2 < LINE_POINT_DIST2_THRESHOLD) {
+                    s->addPoint(P);
+                    s->addPoint(Q);
+                } else {
+                    s->addPoint(Point(points.front().x, points.front().y));
+                    s->addPoint(Point(points.back().x, points.back().y));
+                }
+            }
+
+            RDEBUG("return line");
+            return s;
+        }
+    }
+
+    // not a polygon: maybe a circle ?
+    auto s = CircleRecognizer::recognize(stroke);
+    if (s) {
+        RDEBUG("return circle");
+        return s;
+    }
+
+    return nullptr;
+}
diff --git a/entry/src/main/cpp/src/core/control/shaperecognizer/ShapeRecognizer.h b/entry/src/main/cpp/src/core/control/shaperecognizer/ShapeRecognizer.h
new file mode 100644
index 0000000..70c6617
--- /dev/null
+++ b/entry/src/main/cpp/src/core/control/shaperecognizer/ShapeRecognizer.h
@@ -0,0 +1,50 @@
+/*
+ * Xournal++
+ *
+ * Xournal Shape recognizer
+ *
+ * @author Xournal++ Team
+ * https://github.com/xournalpp/xournalpp
+ *
+ * @license GNU GPLv2 or later
+ */
+
+#pragma once
+
+#include <array>  // for array
+#include <memory>
+
+#include "RecoSegment.h"
+#include "ShapeRecognizerConfig.h"  // for MAX_POLYGON_SIDES
+
+class Stroke;
+class Point;
+class Inertia;
+struct RecoSegment;
+
+class ShapeRecognizer {
+public:
+    ShapeRecognizer();
+    virtual ~ShapeRecognizer();
+
+    auto recognizePatterns(Stroke* stroke, double strokeMinSize) -> std::unique_ptr<Stroke>;
+    void resetRecognizer();
+
+private:
+    auto tryTriangle() -> std::unique_ptr<Stroke>;
+    auto tryRectangle() -> std::unique_ptr<Stroke>;
+
+    // function Stroke* tryArrow(); removed after commit a3f7a251282dcfea8b4de695f28ce52bf2035da2
+
+    static void optimizePolygonal(const Point* pt, int nsides, int* breaks, Inertia* ss);
+
+    int findPolygonal(const Point* pt, int start, int finish, int nsides, int* breaks, Inertia* ss);
+
+    static bool isStrokeLargeEnough(Stroke* stroke, double strokeMinSize);
+
+private:
+    std::array<RecoSegment, MAX_POLYGON_SIDES + 1> queue{};
+    int queueLength;
+
+    Stroke* stroke;
+};
diff --git a/entry/src/main/cpp/src/core/control/shaperecognizer/ShapeRecognizerConfig.h b/entry/src/main/cpp/src/core/control/shaperecognizer/ShapeRecognizerConfig.h
new file mode 100644
index 0000000..6ff72f1
--- /dev/null
+++ b/entry/src/main/cpp/src/core/control/shaperecognizer/ShapeRecognizerConfig.h
@@ -0,0 +1,34 @@
+/*
+ * Xournal++
+ *
+ * Part of the Xournal shape recognizer
+ *
+ * @author Xournal++ Team
+ * https://github.com/xournalpp/xournalpp
+ *
+ * @license GNU GPLv2 or later
+ */
+
+#pragma once
+#include <config-debug.h>
+#include <glib.h>
+
+#define MAX_POLYGON_SIDES 4
+
+#define LINE_POINT_DIST2_THRESHOLD 15                // threshold of maximum distance from point to line
+#define SEGMENT_MAX_DET 0.045                        // maximum score for a polygon segment (ideal line = 0)
+#define LINE_MAX_DET 0.015                           // maximum score for single line, stricter than for polygons
+#define CIRCLE_MIN_DET 0.95                          // minimum det. score for circle (ideal circle = 1)
+#define CIRCLE_MAX_SCORE 0.10                        // max circle score for circle (ideal circle = 0)
+#define SLANT_TOLERANCE (5 * M_PI / 180)             // ignore slanting by +/- 5 degrees
+#define TRIANGLE_LINEAR_TOLERANCE 0.3                // vertex gap tolerance in triangles
+#define RECTANGLE_ANGLE_TOLERANCE (15 * M_PI / 180)  // angle tolerance in rectangles
+#define RECTANGLE_LINEAR_TOLERANCE 0.20              // vertex gap tolerance in rectangles
+#define POLYGON_LINEAR_TOLERANCE 0.20                // vertex gap tolerance in closed polygons
+
+
+#ifdef DEBUG_RECOGNIZER
+#define RDEBUG(msg, ...) g_message("ShapeReco::" msg, ##__VA_ARGS__)
+#else
+#define RDEBUG(msg, ...)
+#endif
diff --git a/entry/src/main/cpp/src/core/control/tools/ArrowHandler.cpp b/entry/src/main/cpp/src/core/control/tools/ArrowHandler.cpp
new file mode 100644
index 0000000..1f8bb35
--- /dev/null
+++ b/entry/src/main/cpp/src/core/control/tools/ArrowHandler.cpp
@@ -0,0 +1,87 @@
+#include "ArrowHandler.h"
+
+#include <algorithm>  // for minmax_element
+#include <cmath>      // for cos, sin, atan2, M_PI
+
+#include "control/Control.h"                       // for Control
+#include "control/ToolHandler.h"                   // for ToolHandler
+#include "control/tools/BaseShapeHandler.h"        // for BaseShapeHandler
+#include "control/tools/SnapToGridInputHandler.h"  // for SnapToGridInputHan...
+#include "gui/inputdevices/PositionInputData.h"    // for PositionInputData
+#include "model/Point.h"                           // for Point
+#include "util/Range.h"                            // for Range
+
+ArrowHandler::ArrowHandler(Control* control, const PageRef& page, bool doubleEnded):
+        BaseShapeHandler(control, page), doubleEnded(doubleEnded) {}
+
+ArrowHandler::~ArrowHandler() = default;
+
+auto ArrowHandler::createShape(bool isAltDown, bool isShiftDown, bool isControlDown)
+        -> std::pair<std::vector<Point>, Range> {
+    Point c = snappingHandler.snap(this->currPoint, this->startPoint, isAltDown);
+    const double lineLength = std::hypot(c.x - this->startPoint.x, c.y - this->startPoint.y);
+    const double thickness = control->getToolHandler()->getThickness();
+    const double slimness = lineLength / thickness;
+
+    // We've now computed the line points for the arrow
+    // so we just have to build the head:
+    // arrowDist is the distance between the line's and the arrow's tips
+    // delta is the angle between each arrow leg and the line
+
+    // an appropriate opening angle 2*delta is Pi/3 radians for an arrow shape
+    double delta = M_PI / 6.0;
+    // We use different slimness regimes for proper sizing:
+    const double THICK1 = 7, THICK3 = 1.6;
+    const double LENGTH2 = 0.4, LENGTH4 = (doubleEnded ? 0.5 : 0.8);
+    // set up the size of the arrow head to be THICK1 x the thickness of the line
+    double arrowDist = thickness * THICK1;
+    // but not too large compared to the line length
+    if (slimness >= THICK1 / LENGTH2) {
+        // arrow head is not too long compared to the line length (regime 1)
+    } else if (slimness >= THICK3 / LENGTH2) {
+        // arrow head is not too short compared to the thickness (regime 2)
+        arrowDist = lineLength * LENGTH2;
+    } else if (slimness >= THICK3 / LENGTH4) {
+        // arrow head is not too thick compared to the line length (regime 3)
+        arrowDist = thickness * THICK3;
+        // help visibility by widening the angle
+        delta = (1 + (slimness - THICK3 / LENGTH2) / (THICK3 / LENGTH4 - THICK3 / LENGTH2)) *  M_PI / 6.0;
+        // which allows to shorten the tips and keep the horizonzal distance
+        arrowDist *= sin(M_PI / 6.0) / sin(delta);
+    } else {
+        // shrinking down gracefully (regime 4)
+        arrowDist = lineLength * LENGTH4;
+        delta = M_PI / 3.0;
+        arrowDist *= sin(M_PI / 6.0) / sin(M_PI / 3.0);
+    }
+
+    const double angle = atan2(c.y - this->startPoint.y, c.x - this->startPoint.x);
+
+    std::pair<std::vector<Point>, Range> res; // members initialised below
+    std::vector<Point>& shape = res.first;
+
+    shape.reserve(doubleEnded ? 10 : 6);
+
+    shape.emplace_back(this->startPoint);
+
+    if (doubleEnded) {
+        shape.emplace_back(startPoint.x + arrowDist * cos(angle + delta),
+                           startPoint.y + arrowDist * sin(angle + delta));
+        shape.emplace_back(startPoint);
+        shape.emplace_back(startPoint.x + arrowDist * cos(angle - delta),
+                           startPoint.y + arrowDist * sin(angle - delta));
+        shape.emplace_back(startPoint);
+    }
+
+    shape.emplace_back(c);
+    shape.emplace_back(c.x - arrowDist * cos(angle + delta), c.y - arrowDist * sin(angle + delta));
+    shape.emplace_back(c);
+    shape.emplace_back(c.x - arrowDist * cos(angle - delta), c.y - arrowDist * sin(angle - delta));
+    shape.emplace_back(c);
+
+    auto [minX, maxX] = std::minmax_element(shape.begin(), shape.end(), [](auto& p, auto& q) { return p.x < q.x; });
+    auto [minY, maxY] = std::minmax_element(shape.begin(), shape.end(), [](auto& p, auto& q) { return p.y < q.y; });
+    res.second = Range(minX->x, minY->y, maxX->x, maxY->y);
+
+    return res;
+}
diff --git a/entry/src/main/cpp/src/core/control/tools/ArrowHandler.h b/entry/src/main/cpp/src/core/control/tools/ArrowHandler.h
new file mode 100644
index 0000000..fd8df63
--- /dev/null
+++ b/entry/src/main/cpp/src/core/control/tools/ArrowHandler.h
@@ -0,0 +1,32 @@
+/*
+ * Xournal++
+ *
+ * Handles input to draw an arrow
+ *
+ * @author Xournal++ Team
+ * https://github.com/xournalpp/xournalpp
+ *
+ * @license GNU GPLv2 or later
+ */
+
+#pragma once
+
+#include <vector>  // for vector
+
+#include "model/PageRef.h"  // for PageRef
+
+#include "BaseShapeHandler.h"  // for BaseShapeHandler
+
+class Point;
+class Control;
+
+class ArrowHandler: public BaseShapeHandler {
+public:
+    ArrowHandler(Control* control, const PageRef& page, bool doubleEnded);
+    ~ArrowHandler() override;
+
+private:
+    auto createShape(bool isAltDown, bool isShiftDown, bool isControlDown)
+            -> std::pair<std::vector<Point>, Range> override;
+    bool doubleEnded = false;
+};
diff --git a/entry/src/main/cpp/src/core/control/tools/BaseShapeHandler.cpp b/entry/src/main/cpp/src/core/control/tools/BaseShapeHandler.cpp
new file mode 100644
index 0000000..cd4ab98
--- /dev/null
+++ b/entry/src/main/cpp/src/core/control/tools/BaseShapeHandler.cpp
@@ -0,0 +1,180 @@
+#include "BaseShapeHandler.h"
+
+#include <cmath>   // for pow, NAN
+#include <memory>  // for make_unique, __share...
+
+#include <gdk/gdkkeysyms.h>  // for GDK_KEY_Alt_L, GDK_K...
+
+#include "control/Control.h"                       // for Control
+#include "control/layer/LayerController.h"         // for LayerController
+#include "control/settings/Settings.h"             // for Settings
+#include "control/tools/InputHandler.h"            // for InputHandler
+#include "control/tools/SnapToGridInputHandler.h"  // for SnapToGridInputHandler
+#include "gui/XournalppCursor.h"                   // for XournalppCursor
+#include "gui/inputdevices/PositionInputData.h"    // for PositionInputData
+#include "model/Document.h"                        // for Document
+#include "model/Layer.h"                           // for Layer
+#include "model/Stroke.h"                          // for Stroke
+#include "model/XojPage.h"                         // for XojPage
+#include "undo/InsertUndoAction.h"                 // for InsertUndoAction
+#include "undo/UndoRedoHandler.h"                  // for UndoRedoHandler
+#include "util/Assert.h"                           // for xoj_assert
+#include "util/DispatchPool.h"                     // for DispatchPool
+#include "view/overlays/ShapeToolView.h"           // for ShapeToolView
+
+
+BaseShapeHandler::BaseShapeHandler(Control* control, const PageRef& page, bool flipShift, bool flipControl):
+        InputHandler(control, page),
+        flipShift(flipShift),
+        flipControl(flipControl),
+        snappingHandler(control->getSettings()),
+        viewPool(std::make_shared<xoj::util::DispatchPool<xoj::view::ShapeToolView>>()) {
+    snappingHandler.setPageRef(page);
+}
+
+BaseShapeHandler::~BaseShapeHandler() = default;
+
+void BaseShapeHandler::updateShape(bool isAltDown, bool isShiftDown, bool isControlDown) {
+    auto [shape, rg] = this->createShape(isAltDown, isShiftDown, isControlDown);
+    std::swap(shape, this->shape);
+    Range repaintRange = rg.unite(lastSnappingRange);
+    lastSnappingRange = rg;
+    repaintRange.addPadding(0.5 * this->stroke->getWidth());
+    viewPool->dispatch(xoj::view::ShapeToolView::FLAG_DIRTY_REGION, repaintRange);
+}
+
+void BaseShapeHandler::cancelStroke() {
+    this->shape.clear();
+    Range repaintRange = this->lastSnappingRange;
+    repaintRange.addPadding(0.5 * this->stroke->getWidth());
+    this->viewPool->dispatchAndClear(xoj::view::ShapeToolView::FINALIZATION_REQUEST, repaintRange);
+    this->lastSnappingRange = Range();
+}
+
+auto BaseShapeHandler::onKeyEvent(const KeyEvent& event, bool pressed) -> bool {
+    bool isAltDown = event.state & GDK_MOD1_MASK;
+    bool isShiftDown = event.state & GDK_SHIFT_MASK;
+    bool isControlDown = event.state & GDK_CONTROL_MASK;
+    // event->state contains the modifiers' states BEFORE the current event
+    if (event.keyval == GDK_KEY_Shift_L || event.keyval == GDK_KEY_Shift_R) {
+        isShiftDown = pressed;
+    } else if (event.keyval == GDK_KEY_Control_L || event.keyval == GDK_KEY_Control_R) {
+        isControlDown = pressed;
+    } else if (event.keyval == GDK_KEY_Alt_L || event.keyval == GDK_KEY_Alt_R) {
+        isAltDown = pressed;
+    } else {
+        return false;
+    }
+    this->updateShape(isAltDown, isShiftDown, isControlDown);
+
+    return true;
+}
+
+auto BaseShapeHandler::onKeyPressEvent(const KeyEvent& event) -> bool { return onKeyEvent(event, true); }
+
+auto BaseShapeHandler::onKeyReleaseEvent(const KeyEvent& event) -> bool { return onKeyEvent(event, false); }
+
+
+auto BaseShapeHandler::onMotionNotifyEvent(const PositionInputData& pos, double zoom) -> bool {
+    Point newPoint(pos.x / zoom, pos.y / zoom);
+    if (!validMotion(newPoint, this->currPoint)) {
+        return true;
+    }
+    this->currPoint = newPoint;
+
+    this->updateShape(pos.isAltDown(), pos.isShiftDown(), pos.isControlDown());
+
+    return true;
+}
+
+void BaseShapeHandler::onSequenceCancelEvent() { this->cancelStroke(); }
+
+void BaseShapeHandler::onButtonReleaseEvent(const PositionInputData& pos, double zoom) {
+    control->getCursor()->activateDrawDirCursor(false);  // in case released within  fixate_Dir_Mods_Dist
+
+    if (this->shape.size() <= 1) {
+        // We need at least two points to make a stroke (it can be twice the same)
+        this->cancelStroke();
+        return;
+    }
+
+    Layer* layer = page->getSelectedLayer();
+
+    UndoRedoHandler* undo = control->getUndoRedoHandler();
+
+    stroke->setPointVector(this->shape, &lastSnappingRange);
+
+    Range repaintRange = lastSnappingRange;
+    repaintRange.addPadding(0.5 * this->stroke->getWidth());
+    this->viewPool->dispatchAndClear(xoj::view::ShapeToolView::FINALIZATION_REQUEST, repaintRange);
+
+    undo->addUndoAction(std::make_unique<InsertUndoAction>(page, layer, stroke.get()));
+
+    auto ptr = stroke.get();
+    Document* doc = control->getDocument();
+    doc->lock();
+    layer->addElement(std::move(stroke));
+    doc->unlock();
+    page->fireElementChanged(ptr);
+
+    control->getCursor()->updateCursor();
+}
+
+void BaseShapeHandler::onButtonPressEvent(const PositionInputData& pos, double zoom) {
+    xoj_assert(this->viewPool->empty());
+    this->buttonDownPoint.x = pos.x / zoom;
+    this->buttonDownPoint.y = pos.y / zoom;
+
+    this->startPoint = snappingHandler.snapToGrid(this->buttonDownPoint, pos.isAltDown());
+    this->currPoint = this->startPoint;
+
+    this->stroke = createStroke(this->control);
+}
+
+void BaseShapeHandler::onButtonDoublePressEvent(const PositionInputData&, double) {
+    // nothing to do
+}
+
+void BaseShapeHandler::modifyModifiersByDrawDir(double width, double height, double zoom, bool changeCursor) {
+    bool gestureShift = this->flipShift;
+    bool gestureControl = this->flipControl;
+
+    if (this->drawModifierFixed == NONE) {
+        // User hasn't dragged out past DrawDirModsRadius  i.e. modifier not yet locked.
+        gestureShift = (width < 0) != gestureShift;
+        gestureControl = (height < 0) != gestureControl;
+
+        this->modShift = this->modShift == !gestureShift;
+        this->modControl = this->modControl == !gestureControl;
+
+        double fixate_Dir_Mods_Dist = control->getSettings()->getDrawDirModsRadius() / zoom;
+        xoj_assert(fixate_Dir_Mods_Dist > 0.0);
+        if (std::abs(width) > fixate_Dir_Mods_Dist || std::abs(height) > fixate_Dir_Mods_Dist) {
+            this->drawModifierFixed = static_cast<DIRSET_MODIFIERS>(SET | (gestureShift ? SHIFT : NONE) |
+                                                                    (gestureControl ? CONTROL : NONE));
+            if (changeCursor) {
+                control->getCursor()->activateDrawDirCursor(false);
+            }
+        } else {
+            if (changeCursor) {
+                control->getCursor()->activateDrawDirCursor(true, this->modShift, this->modControl);
+            }
+        }
+    } else {
+        gestureShift = gestureShift == !(this->drawModifierFixed & SHIFT);
+        gestureControl = gestureControl == !(this->drawModifierFixed & CONTROL);
+        this->modShift = this->modShift == !gestureShift;
+        this->modControl = this->modControl == !gestureControl;
+    }
+}
+
+auto BaseShapeHandler::getShape() const -> const std::vector<Point>& { return this->shape; }
+
+auto BaseShapeHandler::createView(xoj::view::Repaintable* parent) const -> std::unique_ptr<xoj::view::OverlayView> {
+    return std::make_unique<xoj::view::ShapeToolView>(this, parent);
+}
+
+auto BaseShapeHandler::getViewPool() const
+        -> const std::shared_ptr<xoj::util::DispatchPool<xoj::view::ShapeToolView>>& {
+    return viewPool;
+}
diff --git a/entry/src/main/cpp/src/core/control/tools/BaseShapeHandler.h b/entry/src/main/cpp/src/core/control/tools/BaseShapeHandler.h
new file mode 100644
index 0000000..459c448
--- /dev/null
+++ b/entry/src/main/cpp/src/core/control/tools/BaseShapeHandler.h
@@ -0,0 +1,116 @@
+/*
+ * Xournal++
+ *
+ * Handles input of the ruler
+ *
+ * @author Xournal++ Team
+ * https://github.com/xournalpp/xournalpp
+ *
+ * @license GNU GPLv2 or later
+ */
+
+#pragma once
+
+#include <memory>  // for shared_ptr
+#include <utility>  // for pair
+#include <vector>   // for vector
+
+#include <gdk/gdk.h>  // for GdkEventKey
+
+#include "model/PageRef.h"  // for PageRef
+#include "model/Point.h"    // for Point
+#include "util/Range.h"     // for Range
+
+#include "InputHandler.h"            // for InputHandler
+#include "SnapToGridInputHandler.h"  // for SnapToGridInputHandler
+
+class PositionInputData;
+
+namespace xoj::util {
+template <class T>
+class DispatchPool;
+}
+
+namespace xoj::view {
+class OverlayView;
+class Repaintable;
+class ShapeToolView;
+};
+
+enum DIRSET_MODIFIERS { NONE = 0, SET = 1, SHIFT = 1 << 1, CONTROL = 1 << 2 };
+
+
+class BaseShapeHandler: public InputHandler {
+public:
+    BaseShapeHandler(Control* control, const PageRef& page, bool flipShift = false, bool flipControl = false);
+
+    ~BaseShapeHandler() override;
+
+    void onSequenceCancelEvent() override;
+    bool onMotionNotifyEvent(const PositionInputData& pos, double zoom) override;
+    void onButtonReleaseEvent(const PositionInputData& pos, double zoom) override;
+    void onButtonPressEvent(const PositionInputData& pos, double zoom) override;
+    void onButtonDoublePressEvent(const PositionInputData& pos, double zoom) override;
+    bool onKeyPressEvent(const KeyEvent& event) override;
+    bool onKeyReleaseEvent(const KeyEvent& event) override;
+
+    std::unique_ptr<xoj::view::OverlayView> createView(xoj::view::Repaintable* parent) const override;
+
+    const std::shared_ptr<xoj::util::DispatchPool<xoj::view::ShapeToolView>>& getViewPool() const;
+
+    /**
+     * @brief Get the shape's points.
+     */
+    const std::vector<Point>& getShape() const;
+
+private:
+    /**
+     * @brief Create the shape (to be drawn and added as a stroke), depending on the last event in
+     * @return Pair [vector, range] where vector contains the points drawing the shape and range is the smallest range
+     * containing all those points. WARNING: Stroke thickness is not taken into account.
+     */
+    virtual std::pair<std::vector<Point>, Range> createShape(bool isAltDown, bool isShiftDown, bool isControlDown) = 0;
+
+    /**
+     * @brief Update the current shape with the latest event info.
+     *      Also warns the listeners about the change, usually triggering a redraw during the next screen update.
+     */
+    void updateShape(bool isAltDown, bool isShiftDown, bool isControlDown);
+
+    /**
+     * @brief Cancel the current shape creation: clears all data and wipes any drawing made
+     */
+    void cancelStroke();
+
+    bool onKeyEvent(const KeyEvent& event, bool pressed);
+
+protected:
+    /**
+     * modifyModifiersByDrawDir
+     * @brief 	Toggle shift and control modifiers depending on initial drawing direction.
+     */
+    void modifyModifiersByDrawDir(double width, double height, double zoom, bool changeCursor = true);
+
+protected:
+    std::vector<Point> shape;
+
+    /**
+     * @brief Bounding box of the stroke after its last update
+     *      WARNING: The stroke width is not taken into account (i.e. this is the snapping box)
+     */
+    Range lastSnappingRange;
+
+    DIRSET_MODIFIERS drawModifierFixed = NONE;
+    bool flipShift =
+            false;  // use to reverse Shift key modifier action. i.e.  for separate Rectangle and Square Tool buttons.
+    bool flipControl = false;  // use to reverse Control key modifier action.
+    bool modShift = false;
+    bool modControl = false;
+    SnapToGridInputHandler snappingHandler;
+
+    Point currPoint;
+    Point buttonDownPoint;  // used for tapSelect and filtering - never snapped to grid.
+    Point startPoint;       // May be snapped to grid
+
+    std::shared_ptr<xoj::util::DispatchPool<xoj::view::ShapeToolView>> viewPool;
+};
diff --git a/entry/src/main/cpp/src/core/control/tools/CoordinateSystemHandler.cpp b/entry/src/main/cpp/src/core/control/tools/CoordinateSystemHandler.cpp
new file mode 100644
index 0000000..0629296
--- /dev/null
+++ b/entry/src/main/cpp/src/core/control/tools/CoordinateSystemHandler.cpp
@@ -0,0 +1,65 @@
+#include "CoordinateSystemHandler.h"
+
+#include <algorithm>  // for max
+
+#include "control/Control.h"                       // for Control
+#include "control/settings/Settings.h"             // for Settings
+#include "control/tools/BaseShapeHandler.h"        // for BaseShapeHandler
+#include "control/tools/SnapToGridInputHandler.h"  // for SnapToGridInputHan...
+#include "gui/XournalView.h"                       // for XournalView
+#include "gui/inputdevices/PositionInputData.h"    // for PositionInputData
+#include "model/Point.h"                           // for Point
+
+CoordinateSystemHandler::CoordinateSystemHandler(Control* control, const PageRef& page, bool flipShift,
+                                                 bool flipControl):
+        BaseShapeHandler(control, page, flipShift, flipControl) {}
+
+CoordinateSystemHandler::~CoordinateSystemHandler() = default;
+
+/**
+ * Draw a Cartesian coordinate system.
+ *
+ * @param currentPoint The current point the mouse cursor is pointing to.
+ * @param shiftDown Boolean to indicate if "shift" is currently pressed.
+ *                  It is currently not used.
+ */
+auto CoordinateSystemHandler::createShape(bool isAltDown, bool isShiftDown, bool isControlDown)
+        -> std::pair<std::vector<Point>, Range> {
+    /**
+     * Snap point to grid (if enabled)
+     */
+    Point c = snappingHandler.snapToGrid(this->currPoint, isAltDown);
+
+    double width = c.x - this->startPoint.x;
+    double height = c.y - this->startPoint.y;
+
+    this->modShift = isShiftDown;
+    this->modControl = isControlDown;
+
+    Settings* settings = control->getSettings();
+    if (settings->getDrawDirModsEnabled()) {
+        // change modifiers based on draw dir
+        this->modifyModifiersByDrawDir(width, height, true);
+    }
+
+    if (this->modShift) {
+        // make square
+        int signW = width > 0 ? 1 : -1;
+        int signH = height > 0 ? 1 : -1;
+        width = std::max(width * signW, height * signH) * signW;
+        height = (width * signW) * signH;
+    }
+
+    const Point& p1 = this->startPoint;
+
+    Range rg(p1.x, p1.y);
+    rg.addPoint(p1.x + width, p1.y + height);
+
+    if (!this->modControl) {
+        // draw out from starting point
+        return {{p1, Point(p1.x, p1.y + height), Point(p1.x + width, p1.y + height)}, rg};
+    } else {
+        // Control is down
+        return {{Point(p1.x, p1.y + height), p1, Point(p1.x + width, p1.y)}, rg};
+    }
+}
diff --git a/entry/src/main/cpp/src/core/control/tools/CoordinateSystemHandler.h b/entry/src/main/cpp/src/core/control/tools/CoordinateSystemHandler.h
new file mode 100644
index 0000000..f41a624
--- /dev/null
+++ b/entry/src/main/cpp/src/core/control/tools/CoordinateSystemHandler.h
@@ -0,0 +1,30 @@
+/*
+ * Xournal++
+ *
+ * Handles input to draw an coordinate system
+ *
+ * @author Xournal++ Team
+ * https://github.com/xournalpp/xournalpp
+ *
+ * @license GNU GPLv2 or later
+ */
+
+#pragma once
+
+#include <vector>  // for vector
+
+#include "model/PageRef.h"  // for PageRef
+
+#include "BaseShapeHandler.h"  // for BaseShapeHandler
+
+class XournalView;
+
+class CoordinateSystemHandler: public BaseShapeHandler {
+public:
+    CoordinateSystemHandler(Control* control, const PageRef& page, bool flipShift = false, bool flipControl = false);
+    ~CoordinateSystemHandler() override;
+
+private:
+    auto createShape(bool isAltDown, bool isShiftDown, bool isControlDown)
+            -> std::pair<std::vector<Point>, Range> override;
+};
diff --git a/entry/src/main/cpp/src/core/control/tools/CursorSelectionType.h b/entry/src/main/cpp/src/core/control/tools/CursorSelectionType.h
new file mode 100644
index 0000000..542a6b0
--- /dev/null
+++ b/entry/src/main/cpp/src/core/control/tools/CursorSelectionType.h
@@ -0,0 +1,32 @@
+/*
+ * Xournal++
+ *
+ * The cursor types for selections
+ *
+ * @author Xournal++ Team
+ * https://github.com/xournalpp/xournalpp
+ *
+ * @license GNU GPLv2 or later
+ */
+
+#pragma once
+
+enum CursorSelectionType {
+    CURSOR_SELECTION_NONE = 0,
+    // Inside the selection
+    CURSOR_SELECTION_MOVE = 1,
+
+    // Edges
+    CURSOR_SELECTION_TOP_LEFT,
+    CURSOR_SELECTION_TOP_RIGHT,
+    CURSOR_SELECTION_BOTTOM_LEFT,
+    CURSOR_SELECTION_BOTTOM_RIGHT,
+
+    // Sides
+    CURSOR_SELECTION_LEFT,
+    CURSOR_SELECTION_RIGHT,
+    CURSOR_SELECTION_TOP,
+    CURSOR_SELECTION_BOTTOM,
+    CURSOR_SELECTION_ROTATE,
+    CURSOR_SELECTION_DELETE
+};
diff --git a/entry/src/main/cpp/src/core/control/tools/EditSelection.cpp b/entry/src/main/cpp/src/core/control/tools/EditSelection.cpp
new file mode 100644
index 0000000..36718aa
--- /dev/null
+++ b/entry/src/main/cpp/src/core/control/tools/EditSelection.cpp
@@ -0,0 +1,1262 @@
+#include "EditSelection.h"
+
+#include <algorithm>  // for min, max, stable_sort
+#include <cmath>      // for abs, cos, sin, cop...
+#include <cstddef>    // for size_t
+#include <limits>     // for numeric_limits
+#include <memory>     // for make_unique, __sha...
+#include <numeric>    // for reduce
+#include <string>     // for string
+#include <utility>
+
+#include <gdk/gdk.h>  // for gdk_cairo_set_sour...
+
+#include "control/Control.h"                       // for Control
+#include "control/settings/Settings.h"             // for Settings
+#include "control/tools/CursorSelectionType.h"     // for CURSOR_SELECTION_NONE
+#include "control/tools/SnapToGridInputHandler.h"  // for SnapToGridInputHan...
+#include "control/zoom/ZoomControl.h"              // for ZoomControl
+#include "gui/Layout.h"                            // for Layout
+#include "gui/PageView.h"                          // for XojPageView
+#include "gui/XournalView.h"                       // for XournalView
+#include "gui/XournalppCursor.h"                   // for XournalppCursor
+#include "model/Document.h"                        // for Document
+#include "model/Element.h"                         // for Element::Index
+#include "model/ElementInsertionPosition.h"
+#include "model/Layer.h"                          // for Layer
+#include "model/LineStyle.h"                      // for LineStyle
+#include "model/Point.h"                          // for Point
+#include "model/XojPage.h"                        // for XojPage
+#include "undo/ArrangeUndoAction.h"               // for ArrangeUndoAction
+#include "undo/InsertUndoAction.h"                // for InsertsUndoAction
+#include "undo/UndoRedoHandler.h"                 // for UndoRedoHandler
+#include "util/Range.h"                           // for Range
+#include "util/Util.h"                            // for cairo_set_dash_from_vector
+#include "util/glib_casts.h"                      // for wrap_v
+#include "util/i18n.h"                            // for _
+#include "util/serializing/ObjectInputStream.h"   // for ObjectInputStream
+#include "util/serializing/ObjectOutputStream.h"  // for ObjectOutputStream
+
+#include "EditSelectionContents.h"  // for EditSelectionConte...
+
+class XojFont;
+
+using std::vector;
+using xoj::util::Rectangle;
+
+/// Smallest can scale down to, in pixels.
+constexpr size_t MINPIXSIZE = 5;
+
+/// Padding for ui buttons
+constexpr int DELETE_PADDING = 20;
+constexpr int ROTATE_PADDING = 8;
+
+/// Number of times to trigger edge pan timer per second
+constexpr unsigned int PAN_TIMER_RATE = 30;
+
+namespace SelectionFactory {
+/// @return Bounds and SnappingBounds
+static auto computeBoxes(const InsertionOrder& elts) -> std::pair<Range, Range> {
+    return std::transform_reduce(
+            elts.begin(), elts.end(), std::pair<Range, Range>(),
+            [](auto&& p, auto&& q) {
+                return std::pair<Range, Range>(p.first.unite(q.first), p.second.unite(q.second));
+            },
+            [](auto&& e) { return std::make_pair(Range(e.e->boundingRect()), Range(e.e->getSnappedBounds())); });
+}
+
+auto createFromFloatingElement(Control* ctrl, const PageRef& page, Layer* layer, XojPageView* view, ElementPtr eOwn)
+        -> std::unique_ptr<EditSelection> {
+    auto* e = eOwn.get();  // Order of parameter evaluation is unspecified, eOwn.get() must be evaluated before moving
+    InsertionOrder i{1};
+    i[0] = InsertionPosition{std::move(eOwn)};
+    return std::make_unique<EditSelection>(ctrl, std::move(i), page, layer, view, Range(e->boundingRect()),
+                                           Range(e->getSnappedBounds()));
+}
+
+auto createFromFloatingElements(Control* ctrl, const PageRef& page, Layer* layer, XojPageView* view,
+                                InsertionOrder elts) -> std::pair<std::unique_ptr<EditSelection>, Range> {
+    xoj_assert(std::is_sorted(elts.begin(), elts.end()));
+    auto [bounds, snappingBounds] = computeBoxes(elts);
+    return std::make_pair(
+            std::make_unique<EditSelection>(ctrl, std::move(elts), page, layer, view, bounds, snappingBounds), bounds);
+}
+
+auto createFromElementOnActiveLayer(Control* ctrl, const PageRef& page, XojPageView* view, const Element* e,
+                                    Element::Index pos) -> std::unique_ptr<EditSelection> {
+    Document* doc = ctrl->getDocument();
+    Layer* layer = nullptr;
+
+    InsertionOrder i(1);
+    i[0] = [&] {
+        std::lock_guard lock(*doc);  // lock scope
+        layer = page->getSelectedLayer();
+        return layer->removeElementAt(e, pos);
+    }();
+    page->fireElementChanged(e);
+    return std::make_unique<EditSelection>(ctrl, std::move(i), page, layer, view, Range(e->boundingRect()),
+                                           Range(e->getSnappedBounds()));
+}
+
+auto createFromElementsOnActiveLayer(Control* ctrl, const PageRef& page, XojPageView* view, InsertionOrderRef elts)
+        -> std::unique_ptr<EditSelection> {
+    xoj_assert(std::is_sorted(elts.begin(), elts.end()));
+    Document* doc = ctrl->getDocument();
+    Layer* layer = nullptr;
+    auto ownedElts = [&] {
+        std::lock_guard lock(*doc);  // lock scope
+        layer = page->getSelectedLayer();
+        return layer->removeElementsAt(elts);
+    }();
+
+    auto [bounds, snappingBounds] = computeBoxes(ownedElts);
+    page->fireRangeChanged(bounds);
+
+    return std::make_unique<EditSelection>(ctrl, std::move(ownedElts), page, layer, view, bounds, snappingBounds);
+}
+
+auto addElementFromActiveLayer(Control* ctrl, EditSelection* base, const Element* e, Element::Index pos)
+        -> std::unique_ptr<EditSelection> {
+    Document* doc = ctrl->getDocument();
+    Layer* layer = base->getSourceLayer();
+    auto ownedElem = [&] {
+        std::lock_guard lock(*doc);  // lock scope
+        return layer->removeElementAt(e, pos);
+    }();
+    pos = ownedElem.pos;
+    const PageRef& page = base->getSourcePage();
+    page->fireElementChanged(e);
+
+    InsertionOrder elts = base->makeMoveEffective();
+    xoj_assert(!elts.empty());
+    xoj_assert(std::is_sorted(elts.begin(), elts.end()));
+    /**
+     * To sort out the proper Element::Index of the added element *e,  we need to imagine elts were added to the layer,
+     * so that the index may need to be increased.
+     * Explicitly, we need to insert (e, pos + n) at position n so that the resulting vector is still sorted. Figuring
+     * out the value of n requires our own binary search (std::lower_bound won't work).
+     */
+    auto begin = elts.begin(), first = begin, last = elts.end();
+    while (first != last) {
+        auto it = std::next(first, std::distance(first, last) / 2);
+        if (it->pos <= pos + std::distance(begin, it)) {
+            first = std::next(it);
+        } else {
+            last = it;
+        }
+    }
+    ownedElem.pos += std::distance(begin, first);
+    elts.insert(first, std::move(ownedElem));
+    xoj_assert(std::is_sorted(elts.begin(), elts.end()));
+
+    auto [bounds, snappingBounds] = computeBoxes(elts);
+
+    return std::make_unique<EditSelection>(ctrl, std::move(elts), page, layer, base->getView(), bounds, snappingBounds);
+}
+
+auto addElementsFromActiveLayer(Control* ctrl, EditSelection* base, const InsertionOrderRef& newElts)
+        -> std::unique_ptr<EditSelection> {
+    xoj_assert(std::is_sorted(newElts.begin(), newElts.end()));
+    Document* doc = ctrl->getDocument();
+    Layer* layer = base->getSourceLayer();
+    auto ownedElts = [&] {  // lock scope
+        std::lock_guard lock(*doc);
+        return layer->removeElementsAt(newElts);
+    }();
+
+    auto [bounds, snappingBounds] = computeBoxes(ownedElts);
+    const PageRef& page = base->getSourcePage();
+    page->fireRangeChanged(bounds);
+
+    InsertionOrder oldElts = base->makeMoveEffective();
+    xoj_assert(std::is_sorted(oldElts.begin(), oldElts.end()));
+    auto [oldBounds, oldSnappingBounds] = computeBoxes(oldElts);
+
+    InsertionOrder newSelection;
+    newSelection.reserve(oldElts.size() + newElts.size());
+    /**
+     * To sort out the proper Element::Indices, we need to imagine oldElts were added back to the layer, so that some of
+     * newElts' would see their indices increase. A simple std::merge won't do. See comment in addElementFromActiveLayer
+     */
+    auto oldIt = oldElts.begin(), oldEnd = oldElts.end();
+    std::ptrdiff_t shift = 0;  // number of elements from oldElts that have been added to newSelection
+
+    for (auto newIt = ownedElts.begin(), newEnd = ownedElts.end(); newIt != newEnd;) {
+        if (oldIt == oldEnd) {
+            xoj_assert(shift == static_cast<std::ptrdiff_t>(oldElts.size()));
+            for (; newIt != newEnd; ++newIt) {
+                newSelection.emplace_back(std::move(newIt->e), newIt->pos + shift);
+            }
+            break;
+        }
+
+        if (oldIt->pos < newIt->pos + shift) {
+            newSelection.emplace_back(std::move(*oldIt));
+            ++oldIt;
+            ++shift;
+        } else {
+            newSelection.emplace_back(std::move(newIt->e), newIt->pos + shift);
+            ++newIt;
+        }
+    }
+    std::move(oldIt, oldEnd, std::back_inserter(newSelection));
+    xoj_assert(newSelection.size() == oldElts.size() + newElts.size());
+    xoj_assert(std::is_sorted(newSelection.begin(), newSelection.end()));
+    return std::make_unique<EditSelection>(ctrl, std::move(newSelection), page, layer, base->getView(),
+                                           bounds.unite(oldBounds), snappingBounds.unite(oldSnappingBounds));
+}
+};  // namespace SelectionFactory
+
+static int getBtnWidth(Control* c) {
+    return std::max(10, round_cast<int>(c->getZoomControl()->getZoom100Value() * Util::DPI_NORMALIZATION_FACTOR / 8));
+}
+
+EditSelection::EditSelection(Control* ctrl, InsertionOrder elts, const PageRef& page, Layer* layer, XojPageView* view,
+                             const Range& bounds, const Range& snappingBounds):
+        snappedBounds(snappingBounds),
+        btnWidth(getBtnWidth(ctrl)),
+        sourcePage(page),
+        sourceLayer(layer),
+        view(view),
+        undo(ctrl->getUndoRedoHandler()),
+        snappingHandler(ctrl->getSettings()) {
+    snappingHandler.setPageRef(page);
+    // make the visible bounding box large enough so that anchors do not collapse even for horizontal/vertical strokes
+    const double PADDING = 12.;
+    x = bounds.minX - PADDING;
+    y = bounds.minY - PADDING;
+    width = bounds.getWidth() + 2 * PADDING;
+    height = bounds.getHeight() + 2 * PADDING;
+
+    this->contents = std::make_unique<EditSelectionContents>(this->getRect(), this->snappedBounds, this->sourcePage,
+                                                             this->sourceLayer, this->view);
+    this->contents->replaceInsertionOrder(std::move(elts));
+
+    cairo_matrix_init_identity(&this->cmatrix);
+    this->view->getXournal()->getCursor()->setRotationAngle(0);
+    this->view->getXournal()->getCursor()->setMirror(false);
+
+    for (const auto& e: contents->getElementsView()) {
+        this->preserveAspectRatio = this->preserveAspectRatio || e->rescaleOnlyAspectRatio();
+        this->supportMirroring = this->supportMirroring && e->rescaleWithMirror();
+        this->supportRotation = this->supportRotation && e->getType() == ELEMENT_STROKE;
+    }
+}
+
+
+EditSelection::EditSelection(Control* ctrl, const PageRef& page, Layer* layer, XojPageView* view):
+        snappedBounds(Rectangle<double>{}),
+        btnWidth(getBtnWidth(ctrl)),
+        sourcePage(page),
+        sourceLayer(layer),
+        view(view),
+        undo(ctrl->getUndoRedoHandler()),
+        snappingHandler(ctrl->getSettings()) {
+    snappingHandler.setPageRef(page);
+}
+
+EditSelection::~EditSelection() {
+    this->edgePanHandler.cancel();
+    finalizeSelection();
+}
+
+/**
+ * Finishes all pending changes, move the elements, scale the elements and add
+ * them to new layer if any or to the old if no new layer
+ */
+void EditSelection::finalizeSelection() {
+    XojPageView* v = getPageViewUnderCursor();
+    if (v == nullptr) {  // Not on any page - move back to original page and position
+        double ox = this->snappedBounds.x - this->x;
+        double oy = this->snappedBounds.y - this->y;
+        this->x = this->contents->getOriginalX();
+        this->y = this->contents->getOriginalY();
+        this->snappedBounds.x = this->x + ox;
+        this->snappedBounds.y = this->y + oy;
+        v = this->contents->getSourceView();
+
+        PageRef page = v->getPage();
+        Layer* layer = page->getSelectedLayer();
+        // Create an Undo action to compensate - avoids Segfault/Freeze if the user presses undo after this happened
+        this->contents->updateContent(this->getRect(), this->snappedBounds, this->rotation, this->preserveAspectRatio,
+                                      layer, page, this->undo, CURSOR_SELECTION_MOVE);
+    }
+
+
+    this->view = v;
+
+    auto insertOrder =
+            this->contents->makeMoveEffective(this->getRect(), this->snappedBounds, this->preserveAspectRatio);
+
+
+    auto* doc = view->getXournal()->getControl()->getDocument();
+    doc->lock();
+
+    Layer* destinationLayer = this->view->getPage()->getSelectedLayer();
+    for (auto&& [e, index]: insertOrder) {
+        if (index == Element::InvalidIndex) {
+            // if the element didn't have a source layer (e.g, clipboard)
+            destinationLayer->addElement(std::move(e));
+        } else {
+            destinationLayer->insertElement(std::move(e), index);
+        }
+    }
+    doc->unlock();
+
+
+    // Calculate new clip region delta due to rotation:
+    double addW =
+            std::abs(this->width * cos(this->rotation)) + std::abs(this->height * sin(this->rotation)) - this->width;
+    double addH =
+            std::abs(this->width * sin(this->rotation)) + std::abs(this->height * cos(this->rotation)) - this->height;
+
+
+    this->view->rerenderRect(this->x - addW / 2.0, this->y - addH / 2.0, this->width + addW, this->height + addH);
+
+    // This is needed if the selection not was 100% on a page
+    this->view->getXournal()->repaintSelection(true);
+}
+
+auto EditSelection::makeMoveEffective() -> InsertionOrder {
+    return contents->makeMoveEffective(this->getRect(), this->snappedBounds, this->preserveAspectRatio);
+}
+
+
+/**
+ * get the X coordinate relative to the provided view (getView())
+ * in document coordinates
+ */
+auto EditSelection::getXOnView() const -> double { return this->x; }
+
+/**
+ * get the Y coordinate relative to the provided view (getView())
+ * in document coordinates
+ */
+auto EditSelection::getYOnView() const -> double { return this->y; }
+
+auto EditSelection::getOriginalXOnView() -> double { return this->contents->getOriginalX(); }
+
+auto EditSelection::getOriginalYOnView() -> double { return this->contents->getOriginalY(); }
+
+/**
+ * get the width in document coordinates (multiple with zoom)
+ */
+auto EditSelection::getWidth() const -> double { return this->width; }
+
+/**
+ * get the height in document coordinates (multiple with zoom)
+ */
+auto EditSelection::getHeight() const -> double { return this->height; }
+
+/**
+ * get the bounding rectangle in document coordinates (multiple with zoom)
+ */
+auto EditSelection::getRect() const -> Rectangle<double> {
+    return Rectangle<double>{this->x, this->y, this->width, this->height};
+}
+
+/**
+ * gets the minimal bounding box containing all elements of the selection used for e.g. grid snapping
+ */
+auto EditSelection::getSnappedBounds() const -> Rectangle<double> { return Rectangle<double>{this->snappedBounds}; }
+
+/**
+ * get the original bounding rectangle in document coordinates
+ */
+auto EditSelection::getOriginalBounds() const -> Rectangle<double> {
+    return Rectangle<double>{this->contents->getOriginalBounds()};
+}
+
+/**
+ * Get the rotation angle of the selection
+ */
+auto EditSelection::getRotation() const -> double { return this->rotation; }
+
+/**
+ * Get if the selection supports being rotated
+ */
+auto EditSelection::isRotationSupported() const -> bool { return this->supportRotation; }
+
+/**
+ * Get the source page (where the selection was done)
+ */
+auto EditSelection::getSourcePage() const -> PageRef { return this->sourcePage; }
+
+/**
+ * Get the source layer (form where the Elements come)
+ */
+auto EditSelection::getSourceLayer() const -> Layer* { return this->sourceLayer; }
+
+/**
+ * Get the X coordinate in View coordinates (absolute)
+ */
+auto EditSelection::getXOnViewAbsolute() const -> int {
+    double zoom = view->getXournal()->getZoom();
+    return this->view->getX() + static_cast<int>(this->getXOnView() * zoom);
+}
+
+/**
+ * Get the Y coordinate in View coordinates (absolute)
+ */
+auto EditSelection::getYOnViewAbsolute() const -> int {
+    double zoom = view->getXournal()->getZoom();
+    return this->view->getY() + static_cast<int>(this->getYOnView() * zoom);
+}
+
+/**
+ * Sets the tool size for pen or eraser, returs an undo action
+ * (or nullptr if nothing is done)
+ */
+auto EditSelection::setSize(ToolSize size, const double* thicknessPen, const double* thicknessHighlighter,
+                            const double* thicknessEraser) -> UndoActionPtr {
+    return this->contents->setSize(size, thicknessPen, thicknessHighlighter, thicknessEraser);
+}
+
+/**
+ * Fills the stroke, return an undo action
+ * (Or nullptr if nothing done, e.g. because there is only an image)
+ */
+auto EditSelection::setFill(int alphaPen, int alphaHighligther) -> UndoActionPtr {
+    return this->contents->setFill(alphaPen, alphaHighligther);
+}
+
+/**
+ * Set the line style of all elements, return an undo action
+ * (Or nullptr if nothing done)
+ */
+auto EditSelection::setLineStyle(LineStyle style) -> UndoActionPtr { return this->contents->setLineStyle(style); }
+
+/**
+ * Set the color of all elements, return an undo action
+ * (Or nullptr if nothing done, e.g. because there is only an image)
+ */
+auto EditSelection::setColor(Color color) -> UndoActionPtr { return this->contents->setColor(color); }
+
+/**
+ * Sets the font of all containing text elements, return an undo action
+ * (or nullptr if there are no Text elements)
+ */
+auto EditSelection::setFont(const XojFont& font) -> UndoActionPtr { return this->contents->setFont(font); }
+
+/**
+ * Fills de undo item if the selection is deleted
+ * the selection is cleared after
+ */
+void EditSelection::fillUndoItem(DeleteUndoAction* undo) { this->contents->fillUndoItem(undo); }
+
+/**
+ * Add an element to this selection
+ *
+ */
+void EditSelection::addElement(ElementPtr eOwned, Element::Index order) {
+    auto e = eOwned.get();
+    this->contents->addElement(std::move(eOwned), order);
+    this->preserveAspectRatio = this->preserveAspectRatio || e->rescaleOnlyAspectRatio();
+    this->supportMirroring = this->supportMirroring && e->rescaleWithMirror();
+    this->supportRotation = this->supportRotation && e->getType() == ELEMENT_STROKE;
+}
+
+/**
+ * Returns all containing elements of this selection
+ */
+auto EditSelection::getElementsView() const -> xoj::util::PointerContainerView<std::vector<Element*>> {
+    return this->contents->getElementsView();
+}
+
+void EditSelection::forEachElement(std::function<void(const Element*)> f) const {
+    this->contents->forEachElement(std::move(f));
+}
+
+/**
+ * Returns the insert order of this selection
+ */
+auto EditSelection::getInsertionOrder() const -> const InsertionOrder& { return this->contents->getInsertionOrder(); }
+
+auto EditSelection::rearrangeInsertionOrder(const OrderChange change) -> UndoActionPtr {
+    InsertionOrder orderOwned = this->contents->stealInsertionOrder();
+    auto oldOrd = refInsertionOrder(orderOwned);
+    std::string desc = _("Arrange");
+    switch (change) {
+        case OrderChange::BringToFront:
+            for (auto& [_, i]: orderOwned) {
+                i = std::numeric_limits<Element::Index>::max();
+            }
+            break;
+        case OrderChange::BringForward:
+            // Set indices of elements to range from [max(indices) + 1, max(indices) + 1 + num elements)
+            if (!orderOwned.empty()) {
+                Element::Index i = orderOwned.back().pos + 1;
+                for (auto& [_, pos]: orderOwned) {
+                    pos = i++;
+                }
+            }
+            desc = _("Bring forward");
+            break;
+        case OrderChange::SendBackward:
+            // Set indices of elements to range from [min(indices) - 1, min(indices) + num elements - 1)
+            if (!orderOwned.empty()) {
+                Element::Index i = orderOwned.front().pos;
+                i = i > 0 ? i - 1 : 0;
+                for (auto& [_, pos]: orderOwned) {
+                    pos = i++;
+                }
+            }
+            desc = _("Send backward");
+            break;
+        case OrderChange::SendToBack:
+            Element::Index i = 0;
+            for (auto& [_, pos]: orderOwned) {
+                pos = i++;
+            }
+            desc = _("Send to back");
+            break;
+    }
+
+
+    auto newOrd = refInsertionOrder(orderOwned);
+    this->contents->replaceInsertionOrder(std::move(orderOwned));
+    PageRef page = this->view->getPage();
+
+    return std::make_unique<ArrangeUndoAction>(page, page->getSelectedLayer(), desc, std::move(oldOrd),
+                                               std::move(newOrd));
+}
+
+/**
+ * Finish the current movement
+ * (should be called in the mouse-button-released event handler)
+ */
+void EditSelection::mouseUp() {
+    if (this->mouseDownType == CURSOR_SELECTION_DELETE) {
+        this->view->getXournal()->deleteSelection();
+        return;
+    }
+
+
+    PageRef page = this->view->getPage();
+    Layer* layer = page->getSelectedLayer();
+    this->rotation = snappingHandler.snapAngle(this->rotation, false);
+
+    this->sourcePage = page;
+    this->sourceLayer = layer;
+
+    this->contents->updateContent(this->getRect(), this->snappedBounds, this->rotation, this->preserveAspectRatio,
+                                  layer, page, this->undo, this->mouseDownType);
+
+    this->mouseDownType = CURSOR_SELECTION_NONE;
+
+    const bool wasEdgePanning = this->isEdgePanning();
+    this->setEdgePan(false);
+    updateMatrix();
+    if (wasEdgePanning) {
+        this->ensureWithinVisibleArea();
+    }
+}
+
+/**
+ * Handles mouse input for moving and resizing, coordinates are relative to "view"
+ */
+void EditSelection::mouseDown(CursorSelectionType type, double x, double y) {
+    double zoom = this->view->getXournal()->getZoom();
+
+    this->mouseDownType = type;
+
+    // coordinates relative to top left corner of snapped bounds in coordinate system which is not modified
+    this->relMousePosX = x / zoom - this->snappedBounds.x;
+    this->relMousePosY = y / zoom - this->snappedBounds.y;
+
+    // coordinates relative to top left corner of snapped bounds in coordinate system which is rotated to make bounding
+    // box edges horizontal/vertical
+    cairo_matrix_transform_point(&this->cmatrix, &x, &y);
+    this->relMousePosRotX = x / zoom - this->snappedBounds.x;
+    this->relMousePosRotY = y / zoom - this->snappedBounds.y;
+}
+
+/**
+ * Handles mouse input for moving and resizing, coordinates are relative to "view"
+ */
+void EditSelection::mouseMove(double mouseX, double mouseY, bool alt) {
+    double zoom = this->view->getXournal()->getZoom();
+
+    if (this->mouseDownType == CURSOR_SELECTION_MOVE) {
+        // compute translation (without snapping)
+        double dx = mouseX / zoom - this->snappedBounds.x - this->relMousePosX;
+        double dy = mouseY / zoom - this->snappedBounds.y - this->relMousePosY;
+
+        // find corner of reduced bounding box in rotated coordinate system closest to grabbing position
+        double cx = this->snappedBounds.x;
+        double cy = this->snappedBounds.y;
+        if ((this->relMousePosRotX > this->snappedBounds.width / 2) ==
+            (this->snappedBounds.width > 0)) {  // closer to the right side
+            cx += this->snappedBounds.width;
+        }
+        if ((this->relMousePosRotY > this->snappedBounds.height / 2) ==
+            (this->snappedBounds.height > 0)) {  // closer to the lower side
+            cy += this->snappedBounds.height;
+        }
+
+        // compute corner of reduced bounding box in unmodified coordinate system closest to grabbing position
+        cairo_matrix_t inv = this->cmatrix;
+        cairo_matrix_invert(&inv);
+        cx *= zoom;
+        cy *= zoom;
+        cairo_matrix_transform_point(&inv, &cx, &cy);
+        cx /= zoom;
+        cy /= zoom;
+
+        // compute position where unsnapped corner would move
+        Point p = Point(cx + dx, cy + dy);
+
+        // snap this corner
+        p = snappingHandler.snapToGrid(p, alt);
+
+        // move
+        if (!this->edgePanInhibitNext) {
+            moveSelection(p.x - cx, p.y - cy);
+            this->setEdgePan(true);
+        } else {
+            this->edgePanInhibitNext = false;
+        }
+    } else if (this->mouseDownType == CURSOR_SELECTION_ROTATE && supportRotation) {  // catch rotation here
+        double rdx = mouseX / zoom - this->snappedBounds.x - this->snappedBounds.width / 2;
+        double rdy = mouseY / zoom - this->snappedBounds.y - this->snappedBounds.height / 2;
+
+        double angle = atan2(rdy, rdx);
+        this->rotation = angle;
+        this->view->getXournal()->getCursor()->setRotationAngle(180 / M_PI * angle);
+    } else {
+        // Translate mouse position into rotated coordinate system:
+        double rx = mouseX;
+        double ry = mouseY;
+        cairo_matrix_transform_point(&this->cmatrix, &rx, &ry);
+        rx /= zoom;
+        ry /= zoom;
+
+        double minSize = MINPIXSIZE / zoom;
+
+        // store pull direction value
+        int xSide = 0;
+        int ySide = 0;
+        if (this->mouseDownType == CURSOR_SELECTION_TOP_LEFT) {
+            xSide = -1;
+            ySide = -1;
+        } else if (this->mouseDownType == CURSOR_SELECTION_TOP_RIGHT) {
+            xSide = 1;
+            ySide = -1;
+        } else if (this->mouseDownType == CURSOR_SELECTION_BOTTOM_LEFT) {
+            xSide = -1;
+            ySide = 1;
+        } else if (this->mouseDownType == CURSOR_SELECTION_BOTTOM_RIGHT) {
+            xSide = 1;
+            ySide = 1;
+        } else if (this->mouseDownType == CURSOR_SELECTION_TOP) {
+            ySide = -1;
+        } else if (this->mouseDownType == CURSOR_SELECTION_BOTTOM) {
+            ySide = 1;
+        } else if (this->mouseDownType == CURSOR_SELECTION_LEFT) {
+            xSide = -1;
+        } else if (this->mouseDownType == CURSOR_SELECTION_RIGHT) {
+            xSide = 1;
+        }
+        // sanity check
+        if (xSide || ySide) {
+            // get normalized direction vector for input interpretation (dependent on aspect ratio)
+            double diag = hypot(xSide * this->width, ySide * this->height);
+            double nx = xSide * this->width / diag;
+            double ny = ySide * this->height / diag;
+
+            int xMul = (xSide + 1) / 2;
+            int yMul = (ySide + 1) / 2;
+            double xOffset =
+                    (rx - this->x) - this->width * xMul;  // x-offset from corner/side that is used for resizing
+            double yOffset =
+                    (ry - this->y) - this->height * yMul;  // y-offset from corner/side that is used for resizing
+
+            // calculate scale factor using dot product
+            double f = (xOffset * nx + yOffset * ny + diag) / diag;
+            f = std::copysign(std::max(std::abs(f), minSize / std::min(std::abs(this->width), std::abs(this->height))),
+                              f);
+            if (supportMirroring || f > 0) {
+                scaleShift(xSide ? f : 1, ySide ? f : 1, xSide == -1, ySide == -1);
+
+                // in each case first scale without snapping consideration then snap
+                // take care that wSnap and hSnap are not too small
+                double snappedX =
+                        snappingHandler.snapHorizontally(this->snappedBounds.x + this->snappedBounds.width * xMul, alt);
+                double snappedY =
+                        snappingHandler.snapVertically(this->snappedBounds.y + this->snappedBounds.height * yMul, alt);
+                double dx = snappedX - this->snappedBounds.x - this->snappedBounds.width * xMul;
+                double dy = snappedY - this->snappedBounds.y - this->snappedBounds.height * yMul;
+                double fx = (std::abs(this->snappedBounds.width) > minSize) ?
+                                    (this->snappedBounds.width + dx * xSide) / this->snappedBounds.width :
+                                    1;
+                double fy = (std::abs(this->snappedBounds.height) > minSize) ?
+                                    (this->snappedBounds.height + dy * ySide) / this->snappedBounds.height :
+                                    1;
+                f = (((std::abs(dx) < std::abs(dy)) && (fx != 1)) || fy == 1) ? fx : fy;
+                f = (std::abs(this->width) * std::abs(f) < minSize || std::abs(this->height) * std::abs(f) < minSize) ?
+                            1 :
+                            f;
+                scaleShift(xSide ? f : 1, ySide ? f : 1, xSide == -1, ySide == -1);
+
+                this->view->getXournal()->getCursor()->setMirror(this->width * this->height < 0);
+            }
+        }
+    }
+
+    this->view->getXournal()->repaintSelection();
+
+    if (this->mouseDownType == CURSOR_SELECTION_MOVE) {
+        XojPageView* v = getPageViewUnderCursor();
+
+        if (v && v != this->view) {
+            XournalView* xournal = this->view->getXournal();
+            const auto pageNr = xournal->getControl()->getDocument()->indexOf(v->getPage());
+
+            xournal->pageSelected(pageNr);
+
+            translateToView(v);
+        }
+    }
+}
+
+// scales with scale factors fx and fy fixing the corner of the reduced bounding box defined by changeLeft and
+// changeTop
+void EditSelection::scaleShift(double fx, double fy, bool changeLeft, bool changeTop) {
+    double dx = (changeLeft) ? this->snappedBounds.width * (1 - fx) : 0;
+    double dy = (changeTop) ? this->snappedBounds.height * (1 - fy) : 0;
+    this->width *= fx;
+    this->height *= fy;
+    this->snappedBounds.width *= fx;
+    this->snappedBounds.height *= fy;
+
+    this->x += dx + (this->x - this->snappedBounds.x) * (fx - 1);
+    this->y += dy + (this->y - this->snappedBounds.y) * (fy - 1);
+    this->snappedBounds.x += dx;
+    this->snappedBounds.y += dy;
+
+    // compute new rotation center
+    double cx = this->snappedBounds.x + this->snappedBounds.width / 2;
+    double cy = this->snappedBounds.y + this->snappedBounds.height / 2;
+    // transform it back with old rotation center
+    double zoom = this->view->getXournal()->getZoom();
+    double cxRot = cx * zoom;
+    double cyRot = cy * zoom;
+    cairo_matrix_t inv = this->cmatrix;
+    cairo_matrix_invert(&inv);
+    cairo_matrix_transform_point(&inv, &cxRot, &cyRot);
+    cxRot /= zoom;
+    cyRot /= zoom;
+    // move to compensate for changed rotation centers
+    moveSelection(cxRot - cx, cyRot - cy);
+}
+
+auto EditSelection::getPageViewUnderCursor() -> XojPageView* {
+    double zoom = view->getXournal()->getZoom();
+
+    // get grabbing hand position
+    double hx = this->view->getX() + (this->snappedBounds.x + this->relMousePosX) * zoom;
+    double hy = this->view->getY() + (this->snappedBounds.y + this->relMousePosY) * zoom;
+
+
+    Layout* layout = this->view->getXournal()->getLayout();
+    XojPageView* v = layout->getPageViewAt(static_cast<int>(hx), static_cast<int>(hy));
+
+    return v;
+}
+
+/**
+ * Translate all coordinates which are relative to the current view to the new view,
+ * and set the attribute view to the new view
+ */
+void EditSelection::translateToView(XojPageView* v) {
+    double zoom = view->getXournal()->getZoom();
+
+    double ox = this->snappedBounds.x - this->x;
+    double oy = this->snappedBounds.y - this->y;
+    int aX1 = getXOnViewAbsolute();
+    int aY1 = getYOnViewAbsolute();
+
+    this->x = (aX1 - v->getX()) / zoom;
+    this->y = (aY1 - v->getY()) / zoom;
+    this->snappedBounds.x = this->x + ox;
+    this->snappedBounds.y = this->y + oy;
+
+    this->view = v;
+
+    //	int aX2 = getXOnViewAbsolute();
+    //	int aY2 = getYOnViewAbsolute();
+    //
+    //	if (aX1 != aX2)
+    //	{
+    //		g_message("aX1 != aX2!! %i / %i", aX1, aX2);
+    //	}
+    //	if (aY1 != aY2)
+    //	{
+    //		g_message("aY1 != aY2!! %i / %i", aY1, aY2);
+    //	}
+}
+
+void EditSelection::copySelection() {
+    // clone elements in the insert order
+    auto const& orig = getInsertionOrder();
+    InsertionOrder clonedInsertionOrder;
+    clonedInsertionOrder.reserve(orig.size());
+    for (const auto& [e, index]: orig) {
+        clonedInsertionOrder.emplace_back(e->clone(), index);
+    }
+
+    // apply transformations and add to layer
+    finalizeSelection();
+
+    // restore insert order
+    contents->replaceInsertionOrder(std::move(clonedInsertionOrder));
+
+    // add undo action
+    PageRef page = this->view->getPage();
+    Layer* layer = page->getSelectedLayer();
+    undo->addUndoAction(std::make_unique<InsertsUndoAction>(page, layer, getElementsView().clone()));
+}
+
+/**
+ * If the selection should moved (or rescaled)
+ */
+auto EditSelection::isMoving() const -> bool { return this->mouseDownType != CURSOR_SELECTION_NONE; }
+
+auto EditSelection::isDeleting() const -> bool { return this->mouseDownType == CURSOR_SELECTION_DELETE; }
+
+
+/**
+ * Move the selection
+ */
+
+void EditSelection::updateMatrix() {
+    double zoom = this->view->getXournal()->getZoom();
+    // store rotation matrix for pointer use; the center of the rotation is the center of the bounding box
+    double rx = (this->snappedBounds.x + this->snappedBounds.width / 2) * zoom;
+    double ry = (this->snappedBounds.y + this->snappedBounds.height / 2) * zoom;
+
+    cairo_matrix_init_identity(&this->cmatrix);
+    cairo_matrix_translate(&this->cmatrix, rx, ry);
+    cairo_matrix_rotate(&this->cmatrix, -this->rotation);
+    cairo_matrix_translate(&this->cmatrix, -rx, -ry);
+}
+
+void EditSelection::moveSelection(double dx, double dy, bool addMoveUndo) {
+    this->x += dx;
+    this->y += dy;
+    this->snappedBounds.x += dx;
+    this->snappedBounds.y += dy;
+
+    updateMatrix();
+
+    if (addMoveUndo) {
+        XojPageView* v = getPageViewUnderCursor();
+
+        if (v && v != this->view) {
+            XournalView* xournal = this->view->getXournal();
+            const auto pageNr = xournal->getControl()->getDocument()->indexOf(v->getPage());
+
+            xournal->pageSelected(pageNr);
+
+            translateToView(v);
+        }
+        this->contents->updateContent(this->getRect(), this->snappedBounds, this->rotation, this->preserveAspectRatio,
+                                      this->view->getPage()->getSelectedLayer(), this->view->getPage(), this->undo,
+                                      CURSOR_SELECTION_MOVE);
+    }
+
+    this->view->getXournal()->repaintSelection();
+}
+
+void EditSelection::setEdgePan(bool pan) {
+    if (pan && !this->edgePanHandler) {
+        this->edgePanHandler =
+                g_timeout_add(1000 / PAN_TIMER_RATE, xoj::util::wrap_v<EditSelection::handleEdgePan>, this);
+    } else if (!pan) {
+        this->edgePanHandler.cancel();
+        this->edgePanInhibitNext = false;
+    }
+}
+
+bool EditSelection::isEdgePanning() const { return this->edgePanHandler; }
+
+bool EditSelection::handleEdgePan(EditSelection* self) {
+    if (self->view->getXournal()->getControl()->getZoomControl()->isZoomPresentationMode()) {
+        self->edgePanHandler.consume();
+        self->edgePanInhibitNext = false;
+        return false;
+    }
+
+
+    Layout* layout = self->view->getXournal()->getLayout();
+    const Settings* const settings = self->getView()->getXournal()->getControl()->getSettings();
+    const double zoom = self->view->getXournal()->getZoom();
+
+    // Helper function to compute scroll amount for a single dimension, based on visible region and selection bbox
+    const auto computeScrollAmt = [&](double visMin, double visLen, double bboxMin, double bboxLen, double layoutSize,
+                                      double relMousePos) -> double {
+        const bool belowMin = bboxMin < visMin;
+        const bool aboveMax = bboxMin + bboxLen > visMin + visLen;
+        const double visMax = visMin + visLen;
+        const double bboxMax = bboxMin + bboxLen;
+
+        const bool isLargeSelection = bboxLen > visLen;
+        const auto centerVis = (visMin + visLen / 2);
+        const auto mouseDiff = (bboxMin + relMousePos * zoom - centerVis);
+
+        // Scroll amount multiplier
+        double mult = 0.0;
+
+        const double maxMult = settings->getEdgePanMaxMult();
+        int panDir = 0;
+
+        // If the selection is larger than the view, scroll based on mouse position relative to the center of the
+        // visible view Otherwise calculate bonus scroll amount due to proportion of selection out of view.
+        if (isLargeSelection) {
+            mult = maxMult * std::abs(mouseDiff) / (visLen);
+            if (mouseDiff > 0.1 * visLen / 2.0) {
+                panDir = 1;
+            } else if (mouseDiff < -0.1 * visLen / 2.0) {
+                panDir = -1;
+            }
+        } else {
+            if (aboveMax) {
+                panDir = 1;
+                mult = maxMult * std::min(bboxLen, bboxMax - visMax) / bboxLen;
+            } else if (belowMin) {
+                panDir = -1;
+                mult = maxMult * std::min(bboxLen, visMin - bboxMin) / bboxLen;
+            }
+        }
+
+        // Base amount to translate selection (in document coordinates) per timer tick
+        const double panSpeed = settings->getEdgePanSpeed();
+        const double translateAmt = visLen * panSpeed / (100.0 * PAN_TIMER_RATE);
+
+        // Amount to scroll the visible area by (in layout coordinates), accounting for multiplier
+        double layoutScroll = zoom * panDir * (translateAmt * mult);
+
+        // If scrolling past layout boundaries, clamp scroll amount to boundary
+        if (visMin + layoutScroll < 0) {
+            layoutScroll = -visMin;
+        } else if (visMax + layoutScroll > layoutSize) {
+            layoutScroll = std::max(0.0, layoutSize - visMax);
+        }
+
+        return layoutScroll;
+    };
+    // Compute scroll (for layout) and translation (for selection) for x and y
+    const int layoutWidth = layout->getMinimalWidth();
+    const int layoutHeight = layout->getMinimalHeight();
+    const auto visRect = layout->getVisibleRect();
+    const auto bbox = self->getBoundingBoxInView();
+    const auto layoutScrollX =
+            computeScrollAmt(visRect.x, visRect.width, bbox.x, bbox.width, layoutWidth, self->relMousePosX);
+    const auto layoutScrollY =
+            computeScrollAmt(visRect.y, visRect.height, bbox.y, bbox.height, layoutHeight, self->relMousePosY);
+    const auto translateX = layoutScrollX / zoom;
+    const auto translateY = layoutScrollY / zoom;
+
+    // Perform the scrolling
+    if (self->isMoving() && (layoutScrollX != 0.0 || layoutScrollY != 0.0)) {
+        layout->scrollRelative(layoutScrollX, layoutScrollY);  // May create a page
+        self->moveSelection(translateX, translateY);
+
+        if (XojPageView* v = self->getPageViewUnderCursor(); v && v != self->view) {
+            XournalView* xournal = self->view->getXournal();
+            xournal->pageSelected(xournal->getControl()->getDocument()->indexOf(v->getPage()));
+
+            self->translateToView(v);
+        }
+
+        // To prevent the selection from jumping and to reduce jitter, block the selection movement triggered by user
+        // input
+        self->edgePanInhibitNext = true;
+
+        return true;
+    } else {
+        // No panning, so disable the timer.
+        self->edgePanHandler.consume();
+        self->edgePanInhibitNext = false;
+
+        return false;
+    }
+}
+
+auto EditSelection::getBoundingBoxInView() const -> Rectangle<double> {
+    int viewx = this->view->getX();
+    int viewy = this->view->getY();
+    double zoom = this->view->getXournal()->getZoom();
+
+    double sin = std::sin(this->rotation);
+    double cos = std::cos(this->rotation);
+    double w = std::abs(this->width * cos) + std::abs(this->height * sin);
+    double h = std::abs(this->width * sin) + std::abs(this->height * cos);
+    double cx = this->x + this->width / 2.0;
+    double cy = this->y + this->height / 2.0;
+    double minx = cx - w / 2.0;
+    double miny = cy - h / 2.0;
+
+    return {viewx + minx * zoom, viewy + miny * zoom, w * zoom, h * zoom};
+}
+
+void EditSelection::ensureWithinVisibleArea() {
+    const Rectangle<double> viewRect = this->getBoundingBoxInView();
+    // need to modify this to take into account the position
+    // of the object, plus typecast because XojPageView takes ints
+    this->view->getXournal()->ensureRectIsVisible(static_cast<int>(viewRect.x), static_cast<int>(viewRect.y),
+                                                  static_cast<int>(viewRect.width), static_cast<int>(viewRect.height));
+}
+
+/**
+ * Get the cursor type for the current position (if 0 then the default cursor should be used)
+ */
+auto EditSelection::getSelectionTypeForPos(double x, double y, double zoom) -> CursorSelectionType {
+    double x1 = getXOnView() * zoom;
+    double x2 = x1 + this->width * zoom;
+    double y1 = getYOnView() * zoom;
+    double y2 = y1 + this->height * zoom;
+    double xmin = std::min(x1, x2);
+    double xmax = std::max(x1, x2);
+    double ymin = std::min(y1, y2);
+    double ymax = std::max(y1, y2);
+
+    cairo_matrix_transform_point(&this->cmatrix, &x, &y);
+
+
+    const int EDGE_PADDING = (this->btnWidth / 2) + 2;
+    const int BORDER_PADDING = (this->btnWidth / 2);
+
+    if (x1 - EDGE_PADDING <= x && x <= x1 + EDGE_PADDING && y1 - EDGE_PADDING <= y && y <= y1 + EDGE_PADDING) {
+        return CURSOR_SELECTION_TOP_LEFT;
+    }
+
+    if (x2 - EDGE_PADDING <= x && x <= x2 + EDGE_PADDING && y1 - EDGE_PADDING <= y && y <= y1 + EDGE_PADDING) {
+        return CURSOR_SELECTION_TOP_RIGHT;
+    }
+
+    if (x1 - EDGE_PADDING <= x && x <= x1 + EDGE_PADDING && y2 - EDGE_PADDING <= y && y <= y2 + EDGE_PADDING) {
+        return CURSOR_SELECTION_BOTTOM_LEFT;
+    }
+
+    if (x2 - EDGE_PADDING <= x && x <= x2 + EDGE_PADDING && y2 - EDGE_PADDING <= y && y <= y2 + EDGE_PADDING) {
+        return CURSOR_SELECTION_BOTTOM_RIGHT;
+    }
+
+    if (xmin - (DELETE_PADDING + this->btnWidth) - BORDER_PADDING <= x &&
+        x <= xmin - (DELETE_PADDING + this->btnWidth) + BORDER_PADDING && y1 - BORDER_PADDING <= y &&
+        y <= y1 + BORDER_PADDING) {
+        return CURSOR_SELECTION_DELETE;
+    }
+
+
+    if (supportRotation && xmax - BORDER_PADDING + ROTATE_PADDING + this->btnWidth <= x &&
+        x <= xmax + BORDER_PADDING + ROTATE_PADDING + this->btnWidth && (y2 + y1) / 2 - 4 - BORDER_PADDING <= y &&
+        (y2 + y1) / 2 + 4 + BORDER_PADDING >= y) {
+        return CURSOR_SELECTION_ROTATE;
+    }
+
+    if (!this->preserveAspectRatio) {
+        if (xmin <= x && x <= xmax) {
+            if (y1 - BORDER_PADDING <= y && y <= y1 + BORDER_PADDING) {
+                return CURSOR_SELECTION_TOP;
+            }
+
+            if (y2 - BORDER_PADDING <= y && y <= y2 + BORDER_PADDING) {
+                return CURSOR_SELECTION_BOTTOM;
+            }
+        }
+
+        if (ymin <= y && y <= ymax) {
+            if (x1 - BORDER_PADDING <= x && x <= x1 + BORDER_PADDING) {
+                return CURSOR_SELECTION_LEFT;
+            }
+
+            if (x2 - BORDER_PADDING <= x && x <= x2 + BORDER_PADDING) {
+                return CURSOR_SELECTION_RIGHT;
+            }
+        }
+    }
+
+    if (xmin <= x && x <= xmax && ymin <= y && y <= ymax) {
+        return CURSOR_SELECTION_MOVE;
+    }
+
+    return CURSOR_SELECTION_NONE;
+}
+
+/**
+ * Paints the selection to cr, with the given zoom factor. The coordinates of cr
+ * should be relative to the provided view by getView() (use translateEvent())
+ */
+void EditSelection::paint(cairo_t* cr, double zoom) {
+    double x = this->x;
+    double y = this->y;
+
+
+    if (std::abs(this->rotation) > std::numeric_limits<double>::epsilon()) {
+        this->rotation = snappingHandler.snapAngle(this->rotation, false);
+
+
+        double rx = (snappedBounds.x + snappedBounds.width / 2) * zoom;
+        double ry = (snappedBounds.y + snappedBounds.height / 2) * zoom;
+
+        cairo_translate(cr, rx, ry);
+        cairo_rotate(cr, this->rotation);
+
+        // Draw the rotation point for debugging
+        // cairo_set_source_rgb(cr, 0, 1, 0);
+        // cairo_rectangle(cr, 0, 0, 10, 10);
+        // cairo_stroke(cr);
+
+        cairo_translate(cr, -rx, -ry);
+    }
+    this->contents->paint(cr, x, y, this->rotation, this->width, this->height, zoom);
+
+    cairo_set_operator(cr, CAIRO_OPERATOR_OVER);
+
+    GdkRGBA selectionColor = view->getSelectionColor();
+
+    // set the line always the same size on display
+    cairo_set_line_width(cr, 1);
+
+    const std::vector<double> dashes = {10.0, 10.0};
+    Util::cairo_set_dash_from_vector(cr, dashes, 0);
+    gdk_cairo_set_source_rgba(cr, &selectionColor);
+
+    cairo_rectangle(cr, std::min(x, x + width) * zoom, std::min(y, y + height) * zoom, std::abs(width) * zoom,
+                    std::abs(height) * zoom);
+
+    // for debugging
+    // cairo_rectangle(cr, snappedBounds.x * zoom, snappedBounds.y * zoom, snappedBounds.width * zoom,
+    // snappedBounds.height * zoom);
+
+    cairo_stroke_preserve(cr);
+    auto applied = GdkRGBA{selectionColor.red, selectionColor.green, selectionColor.blue, 0.3};
+    gdk_cairo_set_source_rgba(cr, &applied);
+    cairo_fill(cr);
+
+    ToolHandler* toolHandler = view->getXournal()->getControl()->getToolHandler();
+    if (toolHandler->getToolType() != TOOL_HAND) {
+        cairo_set_dash(cr, nullptr, 0, 0);
+        if (!this->preserveAspectRatio) {
+            // top
+            drawAnchorRect(cr, x + width / 2, y, zoom);
+            // bottom
+            drawAnchorRect(cr, x + width / 2, y + height, zoom);
+            // left
+            drawAnchorRect(cr, x, y + height / 2, zoom);
+            // right
+            drawAnchorRect(cr, x + width, y + height / 2, zoom);
+
+            if (supportRotation) {
+                // rotation handle
+                drawAnchorRotation(cr,
+                                   std::min(x, x + width) + std::abs(width) + (ROTATE_PADDING + this->btnWidth) / zoom,
+                                   y + height / 2, zoom);
+            }
+        }
+
+        // top left
+        drawAnchorRect(cr, x, y, zoom);
+        // top right
+        drawAnchorRect(cr, x + width, y, zoom);
+        // bottom left
+        drawAnchorRect(cr, x, y + height, zoom);
+        // bottom right
+        drawAnchorRect(cr, x + width, y + height, zoom);
+
+        drawDeleteRect(cr, std::min(x, x + width) - (DELETE_PADDING + this->btnWidth) / zoom, y, zoom);
+    }
+}
+
+void EditSelection::drawAnchorRotation(cairo_t* cr, double x, double y, double zoom) {
+    GdkRGBA selectionColor = view->getSelectionColor();
+    gdk_cairo_set_source_rgba(cr, &selectionColor);
+    cairo_rectangle(cr, x * zoom - (this->btnWidth / 2), y * zoom - (this->btnWidth / 2), this->btnWidth,
+                    this->btnWidth);
+    cairo_stroke_preserve(cr);
+    cairo_set_source_rgb(cr, 1, 0, 0);
+    cairo_fill(cr);
+}
+
+/**
+ * draws an idicator where you can scale the selection
+ */
+void EditSelection::drawAnchorRect(cairo_t* cr, double x, double y, double zoom) {
+    GdkRGBA selectionColor = view->getSelectionColor();
+    gdk_cairo_set_source_rgba(cr, &selectionColor);
+    cairo_rectangle(cr, x * zoom - (this->btnWidth / 2), y * zoom - (this->btnWidth / 2), this->btnWidth,
+                    this->btnWidth);
+    cairo_stroke_preserve(cr);
+    cairo_set_source_rgb(cr, 1, 1, 1);
+    cairo_fill(cr);
+}
+
+
+/**
+ * draws an idicator where you can delete the selection
+ */
+void EditSelection::drawDeleteRect(cairo_t* cr, double x, double y, double zoom) const {
+    cairo_set_source_rgb(cr, 0, 0, 0);
+    cairo_rectangle(cr, x * zoom - (this->btnWidth / 2), y * zoom - (this->btnWidth / 2), this->btnWidth,
+                    this->btnWidth);
+    cairo_stroke(cr);
+    cairo_set_source_rgb(cr, 1, 0, 0);
+    cairo_move_to(cr, x * zoom - (this->btnWidth / 2), y * zoom - (this->btnWidth / 2));
+    cairo_rel_move_to(cr, this->btnWidth, 0);
+    cairo_rel_line_to(cr, -this->btnWidth, this->btnWidth);
+    cairo_rel_move_to(cr, this->btnWidth, 0);
+    cairo_rel_line_to(cr, -this->btnWidth, -this->btnWidth);
+    cairo_stroke(cr);
+}
+
+
+auto EditSelection::getView() -> XojPageView* { return this->view; }
+
+void EditSelection::serialize(ObjectOutputStream& out) const {
+    out.writeObject("EditSelection");
+
+    out.writeDouble(this->x);
+    out.writeDouble(this->y);
+    out.writeDouble(this->width);
+    out.writeDouble(this->height);
+
+    out.writeDouble(this->snappedBounds.x);
+    out.writeDouble(this->snappedBounds.y);
+    out.writeDouble(this->snappedBounds.width);
+    out.writeDouble(this->snappedBounds.height);
+
+    out.writeDouble(this->rotation);
+
+    this->contents->serialize(out);
+    out.endObject();
+
+    out.writeInt(static_cast<int>(this->getInsertionOrder().size()));
+    for (const Element* e: this->getElementsView()) {
+        e->serialize(out);
+    }
+}
+
+void EditSelection::readSerialized(ObjectInputStream& in) {
+    in.readObject("EditSelection");
+    this->x = in.readDouble();
+    this->y = in.readDouble();
+    this->width = in.readDouble();
+    this->height = in.readDouble();
+
+    double xSnap = in.readDouble();
+    double ySnap = in.readDouble();
+    double wSnap = in.readDouble();
+    double hSnap = in.readDouble();
+    this->snappedBounds = Rectangle<double>{xSnap, ySnap, wSnap, hSnap};
+
+    this->rotation = in.readDouble();
+
+    this->contents =
+            std::make_unique<EditSelectionContents>(xoj::util::Rectangle<double>(), xoj::util::Rectangle<double>(),
+                                                    this->sourcePage, this->sourceLayer, this->view);
+    this->contents->readSerialized(in);
+
+    in.endObject();
+}
diff --git a/entry/src/main/cpp/src/core/control/tools/EditSelection.h b/entry/src/main/cpp/src/core/control/tools/EditSelection.h
new file mode 100644
index 0000000..0a1fb27
--- /dev/null
+++ b/entry/src/main/cpp/src/core/control/tools/EditSelection.h
@@ -0,0 +1,470 @@
+/*
+ * Xournal++
+ *
+ * A selection for editing, every selection (Rect, Lasso...) is
+ * converted to this one if the selection is finished
+ *
+ * @author Xournal++ Team
+ * https://github.com/xournalpp/xournalpp
+ *
+ * @license GNU GPLv2 or later
+ */
+
+#pragma once
+
+#include <array>
+#include <memory>  // for unique_ptr
+#include <string>
+#include <utility>  // for pair
+#include <vector>   // for vector
+
+#include <cairo.h>  // for cairo_t, cairo_matrix_t
+
+#include "control/ToolEnums.h"               // for ToolSize
+#include "model/Element.h"                   // for Element, Element::Index
+#include "model/ElementContainer.h"          // for ElementContainer
+#include "model/ElementInsertionPosition.h"  // for InsertionOrder
+#include "model/PageRef.h"                   // for PageRef
+#include "undo/UndoAction.h"                 // for UndoAction (ptr only)
+#include "util/Color.h"                      // for Color
+#include "util/PointerContainerView.h"       // for PointerContainerView
+#include "util/Rectangle.h"                  // for Rectangle
+#include "util/raii/GSourceURef.h"           // for GSourceURef
+#include "util/serializing/Serializable.h"   // for Serializable
+
+#include "CursorSelectionType.h"     // for CursorSelectionType, CURS...
+#include "SnapToGridInputHandler.h"  // for SnapToGridInputHandler
+
+class UndoRedoHandler;
+class Layer;
+class XojPageView;
+class Selection;
+class EditSelectionContents;
+class DeleteUndoAction;
+class LineStyle;
+class ObjectInputStream;
+class ObjectOutputStream;
+class XojFont;
+class Document;
+class EditSelection;
+
+namespace SelectionFactory {
+auto createFromFloatingElement(Control* ctrl, const PageRef& page, Layer* layer, XojPageView* view, ElementPtr e)
+        -> std::unique_ptr<EditSelection>;
+auto createFromFloatingElements(Control* ctrl, const PageRef& page, Layer* layer, XojPageView* view,
+                                InsertionOrder elts)  //
+        -> std::pair<std::unique_ptr<EditSelection>, Range>;
+auto createFromElementOnActiveLayer(Control* ctrl, const PageRef& page, XojPageView* view, const Element* e,
+                                    Element::Index pos = Element::InvalidIndex)  //
+        -> std::unique_ptr<EditSelection>;
+auto createFromElementsOnActiveLayer(Control* ctrl, const PageRef& page, XojPageView* view, InsertionOrderRef elts)
+        -> std::unique_ptr<EditSelection>;
+/**
+ * @brief Creates a new instance containing base->getElements() and *e. The content of *base is cleared but *base is not
+ * destroyed.
+ */
+auto addElementFromActiveLayer(Control* ctrl, EditSelection* base, const Element* e, Element::Index pos)
+        -> std::unique_ptr<EditSelection>;
+/**
+ * @brief Creates a new instance containing base->getElements() and the content of elts. The content of *base is cleared
+ * but *base is not destroyed.
+ */
+auto addElementsFromActiveLayer(Control* ctrl, EditSelection* base, const InsertionOrderRef& elts)
+        -> std::unique_ptr<EditSelection>;
+};  // namespace SelectionFactory
+
+class EditSelection: public ElementContainer, public Serializable {
+public:
+    EditSelection(Control* ctrl, InsertionOrder elts, const PageRef& page, Layer* layer, XojPageView* view,
+                  const Range& bounds, const Range& snappingBounds);
+
+    /// Construct an empty selection
+    EditSelection(Control* ctrl, const PageRef& page, Layer* layer, XojPageView* view);
+
+    ~EditSelection() override;
+
+public:
+    /**
+     * get the X coordinate relative to the provided view (getView())
+     * in document coordinates
+     */
+    double getXOnView() const;
+
+    /**
+     * Get the Y coordinate relative to the provided view (getView())
+     * in document coordinates
+     */
+    double getYOnView() const;
+
+    /**
+     * @return The original X coordinates of the provided view in document
+     * coordinates.
+     */
+    double getOriginalXOnView();
+
+    /**
+     * @return The original Y coordinates of the provided view in document
+     * coordinates.
+     */
+    double getOriginalYOnView();
+
+    /**
+     * Get the width in document coordinates (multiple with zoom)
+     */
+    double getWidth() const;
+
+    /**
+     * Get the height in document coordinates (multiple with zoom)
+     */
+    double getHeight() const;
+
+    /**
+     * Get the bounding rectangle in document coordinates (multiple with zoom)
+     */
+    xoj::util::Rectangle<double> getRect() const;
+
+    /**
+     * gets the minimal bounding box containing all elements of the selection used for e.g. grid snapping
+     */
+    xoj::util::Rectangle<double> getSnappedBounds() const;
+
+    /**
+     * get the original bounding rectangle in document coordinates
+     */
+    xoj::util::Rectangle<double> getOriginalBounds() const;
+
+    /**
+     * Get the rotation angle of the selection
+     */
+    double getRotation() const;
+
+    /**
+     * Get if the selection supports being rotated
+     */
+    bool isRotationSupported() const;
+
+    /**
+     * Get the source page (where the selection was done)
+     */
+    PageRef getSourcePage() const;
+
+    /**
+     * Get the source layer (form where the Elements come)
+     */
+    Layer* getSourceLayer() const;
+
+    /**
+     * Get the X coordinate in View coordinates (absolute)
+     */
+    int getXOnViewAbsolute() const;
+
+    /**
+     * Get the Y coordinate in View coordinates (absolute)
+     */
+    int getYOnViewAbsolute() const;
+
+    inline XojPageView* getView() const { return view; }
+
+public:
+    /**
+     * Sets the tool size for pen or eraser, returns an undo action
+     * (or nullptr if nothing is done)
+     */
+    UndoActionPtr setSize(ToolSize size, const double* thicknessPen, const double* thicknessHighlighter,
+                          const double* thicknessEraser);
+
+    /**
+     * Set the line style of all strokes, return an undo action
+     * (Or nullptr if nothing done)
+     */
+    UndoActionPtr setLineStyle(LineStyle style);
+
+    /**
+     * Set the color of all elements, return an undo action
+     * (Or nullptr if nothing done, e.g. because there is only an image)
+     */
+    UndoActionPtr setColor(Color color);
+
+    /**
+     * Sets the font of all containing text elements, return an undo action
+     * (or nullptr if there are no Text elements)
+     */
+    UndoActionPtr setFont(const XojFont& font);
+
+    /**
+     * Fills the undo item if the selection is deleted
+     * the selection is cleared after
+     */
+    void fillUndoItem(DeleteUndoAction* undo);
+
+    /**
+     * Fills the stroke, return an undo action
+     * (Or nullptr if nothing done, e.g. because there is only an image)
+     */
+    UndoActionPtr setFill(int alphaPen, int alphaHighligther);
+
+public:
+    /**
+     * Add an element to the this selection
+     * @param pos: specifies the index of the element from the source layer,
+     * in case we want to replace it back where it came from.
+     */
+    void addElement(ElementPtr e, Element::Index pos);
+
+    /**
+     * Returns all containing elements of this selection
+     */
+    auto getElementsView() const -> xoj::util::PointerContainerView<std::vector<Element*>>;
+
+    void forEachElement(std::function<void(const Element*)> f) const override;
+
+    /**
+     * Returns the insert order of this selection
+     */
+    auto getInsertionOrder() const -> InsertionOrder const&;
+
+    enum class OrderChange {
+        BringToFront,
+        BringForward,
+        SendBackward,
+        SendToBack,
+    };
+
+    static constexpr std::array<std::string_view, 4> orderChangeNames{"bringToFront", "bringForward", "sendBackward",
+                                                                      "sendToBack"};
+    static constexpr std::array<OrderChange, 4> allChanges = {OrderChange::BringToFront, OrderChange::BringForward,
+                                                              OrderChange::SendBackward, OrderChange::SendToBack};
+
+    static constexpr auto orderChangeToString(const OrderChange change) -> std::string_view {
+        return orderChangeNames.at(static_cast<size_t>(change));
+    }
+
+    /**
+     * Change the insert order of this selection.
+     */
+    auto rearrangeInsertionOrder(const OrderChange change) -> UndoActionPtr;
+
+    /**
+     * Finish the current movement
+     * (should be called in the mouse-button-released event handler)
+     */
+    void mouseUp();
+
+    /**
+     * Move the selection
+     */
+    void moveSelection(double dx, double dy, bool addMoveUndo = false);
+
+    /**
+     * Get the cursor type for the current position (if 0 then the default cursor should be used)
+     */
+    CursorSelectionType getSelectionTypeForPos(double x, double y, double zoom);
+
+    /**
+     * Paints the selection to cr, with the given zoom factor. The coordinates of cr
+     * should be relative to the provided view by getView() (use translateEvent())
+     */
+    void paint(cairo_t* cr, double zoom);
+
+    /**
+     * Gets the selection's bounding box in view coordinates. This takes document zoom
+     * and selection rotation into account.
+     */
+    auto getBoundingBoxInView() const -> xoj::util::Rectangle<double>;
+
+    /**
+     * If the selection is outside the visible area correct the coordinates
+     */
+    void ensureWithinVisibleArea();
+
+public:
+    /**
+     * Handles mouse input for moving and resizing, coordinates are relative to "view"
+     */
+    void mouseDown(CursorSelectionType type, double x, double y);
+
+    /**
+     * Handles mouse input for moving and resizing, coordinates are relative to "view"
+     */
+    void mouseMove(double x, double y, bool alt);
+
+    /**
+     * If the user is currently moving the selection.
+     */
+    bool isMoving() const;
+
+    /**
+     * If the user started pressing the delete button
+     */
+    bool isDeleting() const;
+
+    void copySelection();
+
+public:
+    XojPageView* getView();
+
+public:
+    // Serialize interface
+    void serialize(ObjectOutputStream& out) const override;
+    void readSerialized(ObjectInputStream& in) override;
+
+
+    /// Applies the transformation to the selected elements, empties the selection and return the modified elements
+    InsertionOrder makeMoveEffective();
+
+private:
+    /**
+     * Draws an indicator where you can scale the selection
+     */
+    void drawAnchorRect(cairo_t* cr, double x, double y, double zoom);
+
+    /**
+     * Draws an indicator where you can rotate the selection
+     */
+    void drawAnchorRotation(cairo_t* cr, double x, double y, double zoom);
+
+
+    /**
+     * Draws an indicator where you can delete the selection
+     */
+    void drawDeleteRect(cairo_t* cr, double x, double y, double zoom) const;
+
+
+    /**
+     * Finishes all pending changes, move the elements, scale the elements and add
+     * them to new layer if any or to the old if no new layer
+     */
+    void finalizeSelection();
+
+    /**
+     * Gets the PageView under the cursor
+     */
+    XojPageView* getPageViewUnderCursor();
+
+    /**
+     * Translate all coordinates which are relative to the current view to the new view,
+     * and set the attribute view to the new view
+     */
+    void translateToView(XojPageView* v);
+
+    /**
+     * Updates rotation matrix
+     */
+    void updateMatrix();
+
+    /**
+     * scales and shifts to update bounding boxes
+     */
+    void scaleShift(double fx, double fy, bool changeLeft, bool changeTop);
+
+    /**
+     * Set edge panning signal.
+     */
+    void setEdgePan(bool edgePan);
+
+    /**
+     * Whether the edge pan signal is set.
+     */
+    bool isEdgePanning() const;
+
+    static bool handleEdgePan(EditSelection* self);
+
+private:  // DATA
+    /**
+     * The position (and rotation) relative to the current view
+     */
+    double x{};
+    double y{};
+    double rotation = 0;
+
+    /**
+     * Use to translate to rotated selection
+     */
+    cairo_matrix_t cmatrix{};
+
+    /**
+     * The size, including the padding and frame
+     */
+    double width{};
+    double height{};
+
+    /**
+     * The size and dimensions for snapping
+     */
+    xoj::util::Rectangle<double> snappedBounds{};
+
+
+    /**
+     * Mouse coordinates for moving / resizing
+     */
+    CursorSelectionType mouseDownType = CURSOR_SELECTION_NONE;
+    double relMousePosX{};
+    double relMousePosY{};
+    double relMousePosRotX{};
+    double relMousePosRotY{};
+
+    /**
+     * If both scale axes should have the same scale factor, e.g. for Text
+     * (we can only set the font size for text)
+     */
+    bool preserveAspectRatio = false;
+
+    /**
+     * If mirrors are allowed e.g. for strokes
+     */
+    bool supportMirroring = true;
+
+    /**
+     * Support rotation
+     */
+    bool supportRotation = true;
+
+    /**
+     * Size of the editing handles
+     */
+    int btnWidth{8};
+
+    /**
+     * The source page (form where the Elements come)
+     */
+    PageRef sourcePage;
+
+    /**
+     * The source layer (form where the Elements come)
+     */
+    Layer* sourceLayer{};
+
+    /**
+     * The contents of the selection
+     */
+    std::unique_ptr<EditSelectionContents> contents;
+
+private:  // HANDLER
+    /**
+     * The page view for the anchor
+     */
+    XojPageView* view{};
+
+    /**
+     * Undo redo handler
+     */
+    UndoRedoHandler* undo{};
+
+    /**
+     * The handler for snapping points
+     */
+    SnapToGridInputHandler snappingHandler;
+
+    /**
+     * Edge pan timer
+     */
+    xoj::util::GSourceURef edgePanHandler;
+
+    /**
+     * Inhibit the next move event after edge panning finishes. This prevents
+     * the selection from teleporting if the page has changed during panning.
+     * Additionally, this reduces the amount of "jitter" resulting from moving
+     * the selection in mouseDown while edge panning.
+     */
+    bool edgePanInhibitNext = false;
+};
diff --git a/entry/src/main/cpp/src/core/control/tools/EditSelectionContents.cpp b/entry/src/main/cpp/src/core/control/tools/EditSelectionContents.cpp
new file mode 100644
index 0000000..12eb737
--- /dev/null
+++ b/entry/src/main/cpp/src/core/control/tools/EditSelectionContents.cpp
@@ -0,0 +1,582 @@
+#include "EditSelectionContents.h"
+
+#include <algorithm>  // for min, max, transform
+#include <cmath>      // for abs, isnan
+#include <iterator>   // for back_insert_iterator
+#include <limits>     // for numeric_limits
+#include <memory>     // for make_unique, __shar...
+#include <utility>
+
+#include <glib.h>  // for g_idle_add, g_sourc...
+
+#include "control/Control.h"                      // for Control
+#include "control/settings/Settings.h"            // for Settings
+#include "control/tools/CursorSelectionType.h"    // for CURSOR_SELECTION_TO...
+#include "gui/PageView.h"                         // for XojPageView
+#include "gui/XournalView.h"                      // for XournalView
+#include "model/Element.h"                        // for Element, Element::I...
+#include "model/Layer.h"                          // for Layer
+#include "model/LineStyle.h"                      // for LineStyle
+#include "model/Stroke.h"                         // for Stroke, StrokeTool...
+#include "model/Text.h"                           // for Text
+#include "model/XojPage.h"                        // for XojPage
+#include "undo/ColorUndoAction.h"                 // for ColorUndoAction
+#include "undo/DeleteUndoAction.h"                // for DeleteUndoAction
+#include "undo/FillUndoAction.h"                  // for FillUndoAction
+#include "undo/FontUndoAction.h"                  // for FontUndoAction
+#include "undo/InsertUndoAction.h"                // for InsertsUndoAction
+#include "undo/LineStyleUndoAction.h"             // for LineStyleUndoAction
+#include "undo/MoveUndoAction.h"                  // for MoveUndoAction
+#include "undo/RotateUndoAction.h"                // for RotateUndoAction
+#include "undo/ScaleUndoAction.h"                 // for ScaleUndoAction
+#include "undo/SizeUndoAction.h"                  // for SizeUndoAction
+#include "undo/UndoRedoHandler.h"                 // for UndoRedoHandler
+#include "util/Assert.h"                          // for xoj_assert
+#include "util/glib_casts.h"                      // for wrap_v
+#include "util/safe_casts.h"                      // for as_signed
+#include "util/serializing/ObjectInputStream.h"   // for ObjectInputStream
+#include "util/serializing/ObjectOutputStream.h"  // for ObjectOutputStream
+#include "view/ElementContainerView.h"            // for ElementContainerView
+#include "view/View.h"                            // for Context
+
+class XojFont;
+
+using std::vector;
+using xoj::util::Rectangle;
+
+EditSelectionContents::EditSelectionContents(Rectangle<double> bounds, Rectangle<double> snappedBounds,
+                                             const PageRef& sourcePage, Layer* sourceLayer, XojPageView* sourceView):
+        originalBounds(bounds),
+        lastBounds(bounds),
+        lastSnappedBounds(snappedBounds),
+        sourcePage(sourcePage),
+        sourceLayer(sourceLayer),
+        sourceView(sourceView) {
+
+    this->restoreLineWidth =
+            this->getSourceView()->getXournal()->getControl()->getSettings()->getRestoreLineWidthEnabled();
+}
+
+EditSelectionContents::~EditSelectionContents() {
+    if (this->rescaleId) {
+        g_source_remove(this->rescaleId);
+        this->rescaleId = 0;
+    }
+
+    deleteViewBuffer();
+}
+
+/**
+ * Add an element to the this selection
+ */
+void EditSelectionContents::addElement(ElementPtr e, Element::Index order) {
+    xoj_assert(this->selected.size() == this->insertionOrder.size());
+    this->selected.emplace_back(e.get());
+    this->insertionOrder.emplace(std::upper_bound(this->insertionOrder.begin(), this->insertionOrder.end(), order),  //
+                                 std::move(e), order);
+}
+
+void EditSelectionContents::replaceInsertionOrder(InsertionOrder newInsertionOrder) {
+    this->selected.clear();
+    this->selected.reserve(newInsertionOrder.size());
+    std::transform(begin(newInsertionOrder), end(newInsertionOrder), std::back_inserter(this->selected),
+                   [](auto const& e) { return e.e.get(); });
+    this->insertionOrder = std::move(newInsertionOrder);
+}
+
+auto EditSelectionContents::stealInsertionOrder() -> InsertionOrder { return std::move(this->insertionOrder); }
+
+/**
+ * Returns all containing elements of this selection
+ */
+auto EditSelectionContents::getElementsView() const -> xoj::util::PointerContainerView<std::vector<Element*>> {
+    return this->selected;
+}
+
+void EditSelectionContents::forEachElement(std::function<void(const Element*)> f) const {
+    for (auto const& e: this->selected) {
+        f(e);
+    }
+}
+
+/**
+ * Returns the insert order of this selection
+ */
+auto EditSelectionContents::getInsertionOrder() const -> const InsertionOrder& { return this->insertionOrder; }
+
+/**
+ * Sets the tool size for pen or eraser, returs an undo action
+ * (or nullptr if nothing is done)
+ */
+auto EditSelectionContents::setSize(ToolSize size, const double* thicknessPen, const double* thicknessHighlighter,
+                                    const double* thicknessEraser) -> UndoActionPtr {
+    auto undo = std::make_unique<SizeUndoAction>(this->sourcePage, this->sourceLayer);
+
+    bool found = false;
+
+    for (Element* e: this->selected) {
+        if (e->getType() == ELEMENT_STROKE) {
+            auto* s = dynamic_cast<Stroke*>(e);
+            StrokeTool tool = s->getToolType();
+
+            double originalWidth = s->getWidth();
+
+            size_t pointCount = s->getPointCount();
+            vector<double> originalPressure = SizeUndoAction::getPressure(s);
+
+            if (tool == StrokeTool::PEN) {
+                s->setWidth(thicknessPen[size]);
+            } else if (tool == StrokeTool::HIGHLIGHTER) {
+                s->setWidth(thicknessHighlighter[size]);
+            } else if (tool == StrokeTool::ERASER) {
+                s->setWidth(thicknessEraser[size]);
+            }
+
+            // scale the stroke
+            double factor = s->getWidth() / originalWidth;
+            s->scalePressure(factor);
+
+            // save the new pressure
+            vector<double> newPressure = SizeUndoAction::getPressure(s);
+
+            undo->addStroke(s, originalWidth, s->getWidth(), originalPressure, newPressure, pointCount);
+            found = true;
+        }
+    }
+
+    if (found) {
+        this->deleteViewBuffer();
+        this->sourceView->getXournal()->repaintSelection();
+
+        return undo;
+    }
+
+    return nullptr;
+}
+
+/**
+ * Fills the stroke, return an undo action
+ * (Or nullptr if nothing done, e.g. because there is only an image)
+ */
+auto EditSelectionContents::setFill(int alphaPen, int alphaHighligther) -> UndoActionPtr {
+    auto undo = std::make_unique<FillUndoAction>(this->sourcePage, this->sourceLayer);
+
+    bool found = false;
+
+    for (Element* e: this->selected) {
+        if (e->getType() == ELEMENT_STROKE) {
+            auto* s = dynamic_cast<Stroke*>(e);
+            StrokeTool tool = s->getToolType();
+            int newFill = 128;
+
+            if (tool == StrokeTool::PEN) {
+                newFill = alphaPen;
+            } else if (tool == StrokeTool::HIGHLIGHTER) {
+                newFill = alphaHighligther;
+            } else {
+                continue;
+            }
+
+            if (newFill == s->getFill()) {
+                continue;
+            }
+
+            bool originalFill = s->getFill();
+            s->setFill(newFill);
+
+            undo->addStroke(s, originalFill, newFill);
+            found = true;
+        }
+    }
+
+    if (found) {
+        this->deleteViewBuffer();
+        this->sourceView->getXournal()->repaintSelection();
+
+        return undo;
+    }
+
+    return nullptr;
+}
+
+/**
+ * Sets the font of all containing text elements, return an undo action
+ * (or nullptr if there are no Text elements)
+ */
+auto EditSelectionContents::setFont(const XojFont& font) -> UndoActionPtr {
+    double x1 = std::numeric_limits<double>::quiet_NaN();
+    double x2 = std::numeric_limits<double>::quiet_NaN();
+    double y1 = std::numeric_limits<double>::quiet_NaN();
+    double y2 = std::numeric_limits<double>::quiet_NaN();
+
+    auto undo = std::make_unique<FontUndoAction>(this->sourcePage, this->sourceLayer);
+
+    for (Element* e: this->selected) {
+        if (e->getType() == ELEMENT_TEXT) {
+            Text* t = dynamic_cast<Text*>(e);
+            undo->addStroke(t, t->getFont(), font);
+
+            if (std::isnan(x1)) {
+                x1 = t->getX();
+                y1 = t->getY();
+                x2 = t->getX() + t->getElementWidth();
+                y2 = t->getY() + t->getElementHeight();
+            } else {
+                // size with old font
+                x1 = std::min(x1, t->getX());
+                y1 = std::min(y1, t->getY());
+
+                x2 = std::max(x2, t->getX() + t->getElementWidth());
+                y2 = std::max(y2, t->getY() + t->getElementHeight());
+            }
+
+            t->setFont(font);
+
+            // size with new font
+            x1 = std::min(x1, t->getX());
+            y1 = std::min(y1, t->getY());
+
+            x2 = std::max(x2, t->getX() + t->getElementWidth());
+            y2 = std::max(y2, t->getY() + t->getElementHeight());
+        }
+    }
+
+    if (!std::isnan(x1)) {
+        this->deleteViewBuffer();
+        this->sourceView->getXournal()->repaintSelection();
+        return undo;
+    }
+
+    return nullptr;
+}
+
+/**
+ * Set the line style of all strokes, return an undo action
+ * (Or nullptr if nothing done)
+ */
+auto EditSelectionContents::setLineStyle(LineStyle style) -> UndoActionPtr {
+    auto undo = std::make_unique<LineStyleUndoAction>(this->sourcePage, this->sourceLayer);
+
+    bool found = false;
+
+    for (Element* e: this->selected) {
+        if (e->getType() == ELEMENT_STROKE) {
+            auto s = static_cast<Stroke*>(e);
+            auto lastLineStyle = s->getLineStyle();
+            s->setLineStyle(style);
+            undo->addStroke(s, lastLineStyle, s->getLineStyle());
+
+            found = true;
+        }
+    }
+
+    if (found) {
+        this->deleteViewBuffer();
+        this->sourceView->getXournal()->repaintSelection();
+
+        return undo;
+    }
+
+    return nullptr;
+}
+
+/**
+ * Set the color of all elements, return an undo action
+ * (Or nullptr if nothing done, e.g. because there is only an image)
+ */
+auto EditSelectionContents::setColor(Color color) -> UndoActionPtr {
+    auto undo = std::make_unique<ColorUndoAction>(this->sourcePage, this->sourceLayer);
+
+    bool found = false;
+
+    for (Element* e: this->selected) {
+        if (e->getType() == ELEMENT_TEXT || e->getType() == ELEMENT_STROKE) {
+            auto lastColor = e->getColor();
+            e->setColor(color);
+            undo->addStroke(e, lastColor, e->getColor());
+
+            found = true;
+        }
+    }
+
+    if (found) {
+        this->deleteViewBuffer();
+        this->sourceView->getXournal()->repaintSelection();
+
+        return undo;
+    }
+
+    return nullptr;
+}
+
+/**
+ * Fills the undo item if the selection is deleted
+ * the selection is cleared after
+ */
+void EditSelectionContents::fillUndoItem(DeleteUndoAction* undo) {
+    Layer* layer = this->sourceLayer;
+
+    for (auto& [e, pos]: this->insertionOrder) {
+        undo->addElement(layer, std::move(e), pos);
+    }
+
+    this->selected.clear();
+    this->insertionOrder.clear();
+}
+
+/**
+ * Callback to redrawing the buffer asynchron
+ */
+auto EditSelectionContents::repaintSelection(EditSelectionContents* selection) -> bool {
+    // delete the selection buffer, force a redraw
+    selection->deleteViewBuffer();
+    selection->sourceView->getXournal()->repaintSelection();
+    selection->rescaleId = 0;
+
+    return false;
+}
+
+/**
+ * Delete our internal View buffer,
+ * it will be recreated when the selection is painted next time
+ */
+void EditSelectionContents::deleteViewBuffer() {
+    if (this->crBuffer) {
+        cairo_surface_destroy(this->crBuffer);
+        this->crBuffer = nullptr;
+    }
+}
+
+InsertionOrder EditSelectionContents::makeMoveEffective(const xoj::util::Rectangle<double>& bounds,
+                                                        const xoj::util::Rectangle<double>& snappedBounds,
+                                                        bool preserveAspectRatio) {
+    double fx = bounds.width / this->originalBounds.width;
+    double fy = bounds.height / this->originalBounds.height;
+
+    if (preserveAspectRatio) {
+        double f = (fx + fy) / 2;
+        fx = f;
+        fy = f;
+    }
+    bool scale = (bounds.width != this->originalBounds.width || bounds.height != this->originalBounds.height);
+    bool rotate = (std::abs(this->rotation) > std::numeric_limits<double>::epsilon());
+
+    double mx = bounds.x - this->originalBounds.x;
+    double my = bounds.y - this->originalBounds.y;
+
+    bool move = mx != 0 || my != 0;
+
+    for (auto&& [e, _]: this->insertionOrder) {
+        if (move) {
+            e->move(mx, my);
+        }
+        if (scale) {
+            e->scale(bounds.x, bounds.y, fx, fy, 0, this->restoreLineWidth);
+        }
+        if (rotate) {
+            e->rotate(snappedBounds.x + this->lastSnappedBounds.width / 2,
+                      snappedBounds.y + this->lastSnappedBounds.height / 2, this->rotation);
+        }
+    }
+    this->selected.clear();
+    return std::move(this->insertionOrder);
+}
+
+auto EditSelectionContents::getOriginalX() const -> double { return this->originalBounds.x; }
+
+auto EditSelectionContents::getOriginalY() const -> double { return this->originalBounds.y; }
+
+auto EditSelectionContents::getOriginalBounds() const -> Rectangle<double> {
+    return Rectangle<double>{this->originalBounds};
+}
+
+auto EditSelectionContents::getSourceView() -> XojPageView* { return this->sourceView; }
+
+
+void EditSelectionContents::updateContent(Rectangle<double> bounds, Rectangle<double> snappedBounds, double rotation,
+                                          bool aspectRatio, Layer* layer, const PageRef& targetPage,
+                                          UndoRedoHandler* undo, CursorSelectionType type) {
+    double mx = snappedBounds.x - this->lastSnappedBounds.x;
+    double my = snappedBounds.y - this->lastSnappedBounds.y;
+    bool move = mx != 0 || my != 0;
+
+    this->rotation = rotation;
+
+    double fx = snappedBounds.width / this->lastSnappedBounds.width;
+    double fy = snappedBounds.height / this->lastSnappedBounds.height;
+
+    if (aspectRatio) {
+        double f = (fx + fy) / 2;
+        fx = f;
+        fy = f;
+    }
+
+    bool rotate = (std::abs(this->rotation - this->lastRotation) > std::numeric_limits<double>::epsilon());
+    bool scale = (snappedBounds.width != this->lastSnappedBounds.width ||
+                  snappedBounds.height != this->lastSnappedBounds.height);
+
+    if (type == CURSOR_SELECTION_MOVE && move) {
+        undo->addUndoAction(std::make_unique<MoveUndoAction>(this->sourceLayer, this->sourcePage, this->selected, mx,
+                                                             my, layer, targetPage));
+    } else if (type == CURSOR_SELECTION_ROTATE && rotate) {
+        undo->addUndoAction(std::make_unique<RotateUndoAction>(
+                this->sourcePage, &this->selected, snappedBounds.x + snappedBounds.width / 2,
+                snappedBounds.y + snappedBounds.height / 2, rotation - this->lastRotation));
+        this->rotation = 0;             // reset rotation for next usage
+        this->lastRotation = rotation;  // undo one rotation at a time.
+    }
+    if (scale) {
+        // The coordinates of the center of the scaling operation. They depend on the scaling operation performed
+        double px = this->lastSnappedBounds.x;
+        double py = this->lastSnappedBounds.y;
+
+        switch (type) {
+            case CURSOR_SELECTION_TOP_LEFT:
+                [[fallthrough]];
+            case CURSOR_SELECTION_BOTTOM_LEFT:
+                [[fallthrough]];
+            case CURSOR_SELECTION_LEFT:
+                px += this->lastSnappedBounds.width;
+                break;
+            default:
+                break;
+        }
+
+        switch (type) {
+            case CURSOR_SELECTION_TOP_LEFT:
+                [[fallthrough]];
+            case CURSOR_SELECTION_TOP_RIGHT:
+                [[fallthrough]];
+            case CURSOR_SELECTION_TOP:
+                py += this->lastSnappedBounds.height;
+                break;
+            default:
+                break;
+        }
+        // now px and py are the center of the scaling in the rotated coordinate system. We need to rotate them
+        double cx = this->lastSnappedBounds.x + this->lastSnappedBounds.width / 2;
+        double cy = this->lastSnappedBounds.y + this->lastSnappedBounds.height / 2;
+        cairo_matrix_t rotMatrix;
+        cairo_matrix_init_identity(&rotMatrix);
+        cairo_matrix_translate(&rotMatrix, cx, cy);
+        cairo_matrix_rotate(&rotMatrix, this->lastRotation);
+        cairo_matrix_translate(&rotMatrix, -cx, -cy);
+        cairo_matrix_transform_point(&rotMatrix, &px, &py);
+
+        undo->addUndoAction(std::make_unique<ScaleUndoAction>(this->sourcePage, &this->selected, px, py, fx, fy,
+                                                              this->lastRotation, restoreLineWidth));
+    }
+
+    this->lastBounds = bounds;
+    this->lastSnappedBounds = snappedBounds;
+
+    this->sourceLayer = layer;
+    this->sourcePage = targetPage;
+}
+
+/**
+ * paints the selection
+ */
+void EditSelectionContents::paint(cairo_t* cr, double x, double y, double rotation, double width, double height,
+                                  double zoom) {
+    double fx = width / this->originalBounds.width;
+    double fy = height / this->originalBounds.height;
+
+    if (this->relativeX == -9999999999) {
+        this->relativeX = x;
+        this->relativeY = y;
+    }
+
+    if (std::abs(rotation) > std::numeric_limits<double>::epsilon()) {
+        this->rotation = rotation;
+    }
+
+    if (this->crBuffer == nullptr) {
+        this->crBuffer = cairo_image_surface_create(CAIRO_FORMAT_ARGB32, static_cast<int>(std::abs(width) * zoom),
+                                                    static_cast<int>(std::abs(height) * zoom));
+        cairo_t* cr2 = cairo_create(this->crBuffer);
+
+        int dx = static_cast<int>(this->relativeX * zoom);
+        int dy = static_cast<int>(this->relativeY * zoom);
+
+        cairo_translate(cr2, fx < 0 ? -width * zoom : 0, fy < 0 ? -height * zoom : 0);
+        cairo_scale(cr2, fx, fy);
+        cairo_translate(cr2, -dx, -dy);
+        cairo_scale(cr2, zoom, zoom);
+
+        xoj::view::ElementContainerView view(this);
+        view.draw(xoj::view::Context::createDefault(cr2));
+
+        cairo_destroy(cr2);
+    }
+
+    cairo_save(cr);
+
+    int wImg = cairo_image_surface_get_width(this->crBuffer);
+    int hImg = cairo_image_surface_get_height(this->crBuffer);
+
+    int wTarget = static_cast<int>(std::abs(width) * zoom);
+    int hTarget = static_cast<int>(std::abs(height) * zoom);
+
+    double sx = static_cast<double>(wTarget) / wImg;
+    double sy = static_cast<double>(hTarget) / hImg;
+
+    if (wTarget != wImg || hTarget != hImg || std::abs(rotation) > std::numeric_limits<double>::epsilon()) {
+        if (!this->rescaleId) {
+            this->rescaleId = g_idle_add(xoj::util::wrap_v<repaintSelection>, this);
+        }
+        cairo_scale(cr, sx, sy);
+    }
+
+    double dx = static_cast<int>(std::min(x, x + width) * zoom / sx);
+    double dy = static_cast<int>(std::min(y, y + height) * zoom / sy);
+
+    cairo_set_source_surface(cr, this->crBuffer, dx, dy);
+    cairo_paint(cr);
+
+    cairo_restore(cr);
+}
+
+void EditSelectionContents::serialize(ObjectOutputStream& out) const {
+    out.writeObject("EditSelectionContents");
+
+    out.writeDouble(this->originalBounds.x);
+    out.writeDouble(this->originalBounds.y);
+    out.writeDouble(this->originalBounds.width);
+    out.writeDouble(this->originalBounds.height);
+
+    out.writeDouble(this->lastSnappedBounds.x);
+    out.writeDouble(this->lastSnappedBounds.y);
+    out.writeDouble(this->lastSnappedBounds.width);
+    out.writeDouble(this->lastSnappedBounds.height);
+
+    out.writeDouble(this->rotation);
+
+    out.writeDouble(this->relativeX);
+    out.writeDouble(this->relativeY);
+
+    out.endObject();
+}
+
+void EditSelectionContents::readSerialized(ObjectInputStream& in) {
+    in.readObject("EditSelectionContents");
+
+    double originalX = in.readDouble();
+    double originalY = in.readDouble();
+    double originalW = in.readDouble();
+    double originalH = in.readDouble();
+    this->originalBounds = Rectangle<double>{originalX, originalY, originalW, originalH};
+
+    double snappedX = in.readDouble();
+    double snappedY = in.readDouble();
+    double snappedW = in.readDouble();
+    double snappedH = in.readDouble();
+    this->lastSnappedBounds = Rectangle<double>{snappedX, snappedY, snappedW, snappedH};
+
+    this->rotation = in.readDouble();
+
+    this->relativeX = in.readDouble();
+    this->relativeY = in.readDouble();
+
+    in.endObject();
+}
diff --git a/entry/src/main/cpp/src/core/control/tools/EditSelectionContents.h b/entry/src/main/cpp/src/core/control/tools/EditSelectionContents.h
new file mode 100644
index 0000000..c1a53d2
--- /dev/null
+++ b/entry/src/main/cpp/src/core/control/tools/EditSelectionContents.h
@@ -0,0 +1,232 @@
+/*
+ * Xournal++
+ *
+ * The "Model" of a EditSelection
+ *
+ * @author Xournal++ Team
+ * https://github.com/xournalpp/xournalpp
+ *
+ * @license GNU GPLv2 or later
+ */
+
+#pragma once
+
+#include <memory>   // for unique_ptr
+#include <utility>  // for pair
+#include <vector>   // for vector
+
+#include <cairo.h>  // for cairo_surface_t, cairo_t
+
+#include "control/ToolEnums.h"               // for ToolSize
+#include "model/Element.h"                   // for Element::Index, Element
+#include "model/ElementContainer.h"          // for ElementContainer
+#include "model/ElementInsertionPosition.h"  // for InsertionOrder
+#include "model/PageRef.h"                   // for PageRef
+#include "undo/UndoAction.h"                 // for UndoAction (ptr only)
+#include "util/Color.h"                      // for Color
+#include "util/PointerContainerView.h"       // for PointerContainerView
+#include "util/Rectangle.h"                  // for Rectangle
+#include "util/serializing/Serializable.h"   // for Serializable
+
+#include "CursorSelectionType.h"  // for CursorSelectionType
+
+class UndoRedoHandler;
+class Layer;
+class XojPageView;
+class DeleteUndoAction;
+class LineStyle;
+class ObjectInputStream;
+class ObjectOutputStream;
+class XojFont;
+
+class EditSelectionContents: public ElementContainer, public Serializable {
+public:
+    EditSelectionContents(xoj::util::Rectangle<double> bounds, xoj::util::Rectangle<double> snappedBounds,
+                          const PageRef& sourcePage, Layer* sourceLayer, XojPageView* sourceView);
+    ~EditSelectionContents() override;
+
+public:
+    /**
+     * Sets the line style for all strokes, returns an undo action
+     * (or nullptr if nothing is done)
+     */
+    UndoActionPtr setLineStyle(LineStyle style);
+
+    /**
+     * Sets the tool size for pen or eraser, returns an undo action
+     * (or nullptr if nothing is done)
+     */
+    UndoActionPtr setSize(ToolSize size, const double* thicknessPen, const double* thicknessHighlighter,
+                          const double* thicknessEraser);
+
+    /**
+     * Set the color of all elements, return an undo action
+     * (Or nullptr if nothing done, e.g. because there is only an image)
+     */
+    UndoActionPtr setColor(Color color);
+
+    /**
+     * Sets the font of all containing text elements, return an undo action
+     * (or nullptr if there are no Text elements)
+     */
+    UndoActionPtr setFont(const XojFont& font);
+
+    /**
+     * Fills the undo item if the selection is deleted
+     * the selection is cleared after
+     */
+    void fillUndoItem(DeleteUndoAction* undo);
+
+    /**
+     * Fills the stroke, return an undo action
+     * (Or nullptr if nothing done, e.g. because there is only an image)
+     */
+    UndoActionPtr setFill(int alphaPen, int alphaHighligther);
+
+public:
+    /**
+     * Add an element to the this selection
+     * @param orderInSourceLayer: specifies the index of the element from the source layer,
+     * in case we want to replace it back where it came from.
+     */
+    void addElement(ElementPtr e, Element::Index order);
+
+    /**
+     * Returns all containing elements of this selection
+     */
+    auto getElementsView() const -> xoj::util::PointerContainerView<std::vector<Element*>>;
+
+    void forEachElement(std::function<void(const Element*)> f) const override;
+
+    /**
+     * Returns the insert order of this selection
+     */
+    auto getInsertionOrder() const -> const InsertionOrder&;
+
+    /** replaces all elements by a new vector of elements
+     * @param newElements: the elements which should replace the old elements
+     * */
+    void replaceInsertionOrder(InsertionOrder newInsertionOrder);
+
+    /**
+     * Returns InsertionOrder of this selection and clears it
+     */
+    auto stealInsertionOrder() -> InsertionOrder;
+
+public:
+    /**
+     * paints the selection
+     */
+    void paint(cairo_t* cr, double x, double y, double rotation, double width, double height, double zoom);
+
+    /// Applies the transformation to the selected elements, empties the selection and return the modified elements
+    InsertionOrder makeMoveEffective(const xoj::util::Rectangle<double>& bounds,
+                                     const xoj::util::Rectangle<double>& snappedBounds, bool preserveAspectRatio);
+
+    void updateContent(xoj::util::Rectangle<double> bounds, xoj::util::Rectangle<double> snappedBounds, double rotation,
+                       bool aspectRatio, Layer* layer, const PageRef& targetPage, UndoRedoHandler* undo,
+                       CursorSelectionType type);
+
+private:
+    /**
+     * Delete our internal View buffer,
+     * it will be recreated when the selection is painted next time
+     */
+    void deleteViewBuffer();
+
+    /**
+     * Callback to redrawing the buffer asynchrony
+     */
+    static auto repaintSelection(EditSelectionContents* selection) -> bool;
+
+public:
+    /**
+     * Gets the original view of the contents
+     */
+    XojPageView* getSourceView();
+
+
+    /**
+     * Gets the original X of the contents
+     */
+    double getOriginalX() const;
+
+    /**
+     * Gets the original Y of the contents
+     */
+    double getOriginalY() const;
+
+    /**
+     * Gets the complete original bounding box as rectangle
+     */
+    auto getOriginalBounds() const -> xoj::util::Rectangle<double>;
+
+public:
+    // Serialize interface
+    void serialize(ObjectOutputStream& out) const override;
+    void readSerialized(ObjectInputStream& in) override;
+
+private:
+    /**
+     * The original dimensions to calculate the zoom factor for rescaling the items and the offset for moving the
+     * selection
+     */
+    xoj::util::Rectangle<double> originalBounds;
+    xoj::util::Rectangle<double> lastBounds;
+    xoj::util::Rectangle<double> lastSnappedBounds;
+
+    /**
+     * The given rotation. Original rotation should always be zero (double)
+     */
+    double rotation = 0;
+    double lastRotation = 0;  // for undoing multiple rotations during one selection edit.
+
+    /**
+     * The offset to the original selection
+     */
+    double relativeX = -9999999999;
+    double relativeY = -9999999999;
+
+    /**
+     * The setting for whether line width is restored after resizing operation (checked at creation time)
+     */
+    bool restoreLineWidth;
+
+    /**
+     * The selected element (the only one which are handled by this instance)
+     */
+    std::vector<Element*> selected;
+
+    /**
+     * Mapping of elements in the selection to the indexes from the original selection layer.
+     * Defines a insert order over the selection.
+     *
+     * Invariant: the insert order must be sorted by index in ascending order.
+     */
+    InsertionOrder insertionOrder;
+
+    /**
+     * The rendered elements
+     */
+    cairo_surface_t* crBuffer = nullptr;
+
+    /**
+     * The source id for the rescaling task
+     */
+    guint rescaleId = 0;
+
+    /**
+     * Source Page for Undo operations
+     */
+    PageRef sourcePage;
+
+    /**
+     * Source Layer for Undo operations
+     */
+    Layer* sourceLayer;
+
+    /**
+     * Source View for Undo operations
+     */
+    XojPageView* sourceView;
+};
diff --git a/entry/src/main/cpp/src/core/control/tools/EllipseHandler.cpp b/entry/src/main/cpp/src/core/control/tools/EllipseHandler.cpp
new file mode 100644
index 0000000..035f101
--- /dev/null
+++ b/entry/src/main/cpp/src/core/control/tools/EllipseHandler.cpp
@@ -0,0 +1,106 @@
+#include "EllipseHandler.h"
+
+#include <algorithm>  // for max
+#include <cmath>      // for abs, pow, M_PI, cos
+
+#include "control/Control.h"                       // for Control
+#include "control/settings/Settings.h"             // for Settings
+#include "control/tools/BaseShapeHandler.h"        // for BaseShapeHandler
+#include "control/tools/SnapToGridInputHandler.h"  // for SnapToGridInputHan...
+#include "model/Point.h"                           // for Point
+#include "util/Assert.h"
+
+EllipseHandler::EllipseHandler(Control* control, const PageRef& page, bool flipShift, bool flipControl):
+        BaseShapeHandler(control, page, flipShift, flipControl) {}
+
+EllipseHandler::~EllipseHandler() = default;
+
+auto EllipseHandler::createShape(bool isAltDown, bool isShiftDown, bool isControlDown)
+        -> std::pair<std::vector<Point>, Range> {
+    /**
+     * Snap point to grid (if enabled - Alt key pressed will toggle)
+     */
+    Point c = snappingHandler.snapToGrid(this->currPoint, isAltDown);
+
+    double width = c.x - this->startPoint.x;
+    double height = c.y - this->startPoint.y;
+
+
+    this->modShift = isShiftDown;
+    this->modControl = isControlDown;
+
+    Settings* settings = control->getSettings();
+    if (settings->getDrawDirModsEnabled()) {
+        // change modifiers based on draw dir
+        this->modifyModifiersByDrawDir(width, height, true);
+    }
+
+    if (this->modShift) {
+        // make circle
+        width = (this->modControl) ? std::hypot(width, height) :
+                                     std::copysign(std::max(std::abs(width), std::abs(height)), width);
+        height = std::copysign(width, height);
+    }
+
+    double radiusX = 0;
+    double radiusY = 0;
+    double center_x = 0;
+    double center_y = 0;
+
+    if (!this->modControl) {
+        radiusX = 0.5 * width;
+        radiusY = 0.5 * height;
+        center_x = this->startPoint.x + radiusX;
+        center_y = this->startPoint.y + radiusY;
+    } else {
+        // control key down, draw centered at cursor
+        radiusX = width;
+        radiusY = height;
+        center_x = this->startPoint.x;
+        center_y = this->startPoint.y;
+    }
+
+    /*
+     * Set resolution depending on the radius (heuristic)
+     */
+    auto nbPtsPerQuadrant =
+            static_cast<unsigned int>(std::ceil(5 + 0.3 * (std::abs(radiusX) + std::abs(radiusY))));
+    const double stepAngle = M_PI_2 / nbPtsPerQuadrant;
+
+    std::pair<std::vector<Point>, Range> res;
+    std::vector<Point>& shape = res.first;
+
+    /*
+     * This call to reserve() makes the calls to std::transform() below safe.
+     * DO NOT REMOVE
+     * NB: the +1 is necessary to add a copy of the first point and close the ellipse.
+     */
+    shape.reserve(4 * nbPtsPerQuadrant + 1);
+
+    shape.emplace_back(center_x + radiusX, center_y);
+    for (unsigned int j = 1U; j < nbPtsPerQuadrant; j++) {
+        const double tgtAngle = stepAngle * j;
+        const double centerAngle = 0.25 * (std::atan2(std::abs(radiusY) * std::sin(tgtAngle), std::abs(radiusX) * std::cos(tgtAngle))) + 0.75 * tgtAngle;
+        double xp = center_x + radiusX * std::cos(centerAngle);
+        double yp = center_y + radiusY * std::sin(centerAngle);
+        shape.emplace_back(xp, yp);
+    }
+    shape.emplace_back(center_x, center_y + radiusY);
+
+    // The following std::transform() are only safe because no reallocations will happen (see reserve() above).
+    // Symmetry for second quadrant
+    xoj_assert(shape.capacity() >= 2 * shape.size() - 1);
+    std::transform(std::next(shape.rbegin()), shape.rend(), std::back_inserter(shape),
+                   [&](const Point& p) { return Point(2 * center_x - p.x, p.y); });
+
+    // Symmetry for the second half
+    xoj_assert(shape.capacity() >= 2 * shape.size() - 1);
+    std::transform(std::next(shape.rbegin()), shape.rend(), std::back_inserter(shape),
+                   [&](const Point& p) { return Point(p.x, 2 * center_y - p.y); });
+
+    Range rg(center_x + radiusX, center_y + radiusY);
+    rg.addPoint(center_x - radiusX, center_y - radiusY);
+    res.second = rg;
+
+    return res;
+}
diff --git a/entry/src/main/cpp/src/core/control/tools/EllipseHandler.h b/entry/src/main/cpp/src/core/control/tools/EllipseHandler.h
new file mode 100644
index 0000000..a83f9e6
--- /dev/null
+++ b/entry/src/main/cpp/src/core/control/tools/EllipseHandler.h
@@ -0,0 +1,31 @@
+/*
+ * Xournal++
+ *
+ * Handles input to draw ellipses
+ *
+ * @author Xournal++ Team
+ * https://github.com/xournalpp/xournalpp
+ *
+ * @license GNU GPLv2 or later
+ */
+
+#pragma once
+
+#include <vector>  // for vector
+
+#include "model/PageRef.h"  // for PageRef
+
+#include "BaseShapeHandler.h"  // for BaseShapeHandler
+
+class Point;
+class Control;
+
+class EllipseHandler: public BaseShapeHandler {
+public:
+    EllipseHandler(Control* control, const PageRef& page, bool flipShift = false, bool flipControl = false);
+    ~EllipseHandler() override;
+
+private:
+    auto createShape(bool isAltDown, bool isShiftDown, bool isControlDown)
+            -> std::pair<std::vector<Point>, Range> override;
+};
diff --git a/entry/src/main/cpp/src/core/control/tools/EraseHandler.cpp b/entry/src/main/cpp/src/core/control/tools/EraseHandler.cpp
new file mode 100644
index 0000000..75e8a3a
--- /dev/null
+++ b/entry/src/main/cpp/src/core/control/tools/EraseHandler.cpp
@@ -0,0 +1,145 @@
+#include "EraseHandler.h"
+
+#include <memory>   // for make_unique, unique_ptr
+#include <utility>  // for move
+#include <vector>   // for vector
+
+#include <gdk/gdk.h>  // for GdkRectangle
+#include <glib.h>     // for gint
+
+#include "control/ToolEnums.h"            // for ERASER_TYPE_DELETE_STROKE
+#include "control/ToolHandler.h"          // for ToolHandler
+#include "gui/LegacyRedrawable.h"         // for Redrawable
+#include "model/Document.h"               // for Document
+#include "model/Element.h"                // for Element, ELEMENT_STROKE
+#include "model/Layer.h"                  // for Layer
+#include "model/Stroke.h"                 // for Stroke
+#include "model/XojPage.h"                // for XojPage
+#include "model/eraser/ErasableStroke.h"  // for ErasableStroke
+#include "model/eraser/PaddedBox.h"       // for PaddedBox
+#include "undo/DeleteUndoAction.h"        // for DeleteUndoAction
+#include "undo/EraseUndoAction.h"         // for EraseUndoAction
+#include "undo/UndoRedoHandler.h"         // for UndoRedoHandler
+#include "util/Range.h"                   // for Range
+#include "util/SmallVector.h"             // for SmallVector
+
+EraseHandler::EraseHandler(UndoRedoHandler* undo, Document* doc, const PageRef& page, ToolHandler* handler,
+                           LegacyRedrawable* view):
+        page(page),
+        handler(handler),
+        view(view),
+        doc(doc),
+        undo(undo),
+        eraseDeleteUndoAction(nullptr),
+        eraseUndoAction(nullptr),
+        halfEraserSize(0) {}
+
+EraseHandler::~EraseHandler() {
+    if (this->eraseDeleteUndoAction) {
+        this->finalize();
+    }
+}
+
+/**
+ * Handle eraser event: "Delete Stroke" and "Standard", Whiteout is not handled here
+ */
+void EraseHandler::erase(double x, double y) {
+    this->halfEraserSize = this->handler->getThickness();
+    GdkRectangle eraserRect = {gint(x - halfEraserSize), gint(y - halfEraserSize), gint(halfEraserSize * 2),
+                               gint(halfEraserSize * 2)};
+
+    Range range(x, y);
+
+    Layer* l = page->getSelectedLayer();
+
+    for (Element* e: xoj::refElementContainer(l->getElements())) {
+        if (e->getType() == ELEMENT_STROKE && e->intersectsArea(&eraserRect)) {
+            eraseStroke(l, dynamic_cast<Stroke*>(e), x, y, range);
+        }
+    }
+
+    this->view->rerenderRange(range);
+}
+
+void EraseHandler::eraseStroke(Layer* l, Stroke* s, double x, double y, Range& range) {
+    ErasableStroke* erasable = s->getErasable();
+    if (!erasable) {
+        if (this->handler->getEraserType() == ERASER_TYPE_DELETE_STROKE) {
+            if (!s->intersects(x, y, halfEraserSize)) {
+                // The stroke does not intersect the eraser square
+                return;
+            }
+
+            // delete the entire stroke
+            this->doc->lock();
+            auto [stroke, pos] = l->removeElement(s);
+            this->doc->unlock();
+
+            if (pos == -1) {
+                return;
+            }
+            range.addPoint(s->getX(), s->getY());
+            range.addPoint(s->getX() + s->getElementWidth(), s->getY() + s->getElementHeight());
+
+            // removed the if statement - this prevents us from putting multiple elements into a
+            // stroke erase operation, but it also prevents the crashing and layer issues!
+            if (!this->eraseDeleteUndoAction) {
+                auto eraseDel = std::make_unique<DeleteUndoAction>(this->page, true);
+                // Todo check dangerous: this->eraseDeleteUndoAction could be a dangling reference
+                this->eraseDeleteUndoAction = eraseDel.get();
+                this->undo->addUndoAction(std::move(eraseDel));
+            }
+
+            this->eraseDeleteUndoAction->addElement(l, std::move(stroke), pos);
+        } else {  // Default eraser
+            auto pos = l->indexOf(s);
+            if (pos == -1) {
+                return;
+            }
+
+            const double paddingCoeff = PADDING_COEFFICIENT_CAP[s->getStrokeCapStyle()];
+            const PaddedBox paddedEraserBox{{x, y}, halfEraserSize, halfEraserSize + paddingCoeff * s->getWidth()};
+            auto intersectionParameters = s->intersectWithPaddedBox(paddedEraserBox);
+
+            if (intersectionParameters.empty()) {
+                // The stroke does not intersect the eraser square
+                return;
+            }
+
+            if (this->eraseUndoAction == nullptr) {
+                auto eraseUndo = std::make_unique<EraseUndoAction>(this->page);
+                // Todo check dangerous: this->eraseDeleteUndoAction could be a dangling reference
+                this->eraseUndoAction = eraseUndo.get();
+                this->undo->addUndoAction(std::move(eraseUndo));
+            }
+
+            doc->lock();
+            erasable = new ErasableStroke(*s);
+            s->setErasable(erasable);
+            doc->unlock();
+            this->eraseUndoAction->addOriginal(l, s, pos);
+            erasable->beginErasure(intersectionParameters, range);
+        }
+    } else {
+        /**
+         * This stroke has already been touched by the eraser
+         * (Necessarily the default eraser)
+         */
+        auto pos = l->indexOf(s);
+        if (pos == -1) {
+            return;
+        }
+        const double paddingCoeff = PADDING_COEFFICIENT_CAP[s->getStrokeCapStyle()];
+        const PaddedBox paddedEraserBox{{x, y}, halfEraserSize, halfEraserSize + paddingCoeff * s->getWidth()};
+        erasable->erase(paddedEraserBox, range);
+    }
+}
+
+void EraseHandler::finalize() {
+    if (this->eraseUndoAction) {
+        this->eraseUndoAction->finalize();
+        this->eraseUndoAction = nullptr;
+    } else if (this->eraseDeleteUndoAction) {
+        this->eraseDeleteUndoAction = nullptr;
+    }
+}
diff --git a/entry/src/main/cpp/src/core/control/tools/EraseHandler.h b/entry/src/main/cpp/src/core/control/tools/EraseHandler.h
new file mode 100644
index 0000000..c48c5c0
--- /dev/null
+++ b/entry/src/main/cpp/src/core/control/tools/EraseHandler.h
@@ -0,0 +1,58 @@
+/*
+ * Xournal++
+ *
+ * Handles the erase of stroke, in special split into different parts etc.
+ *
+ * @author Xournal++ Team
+ * https://github.com/xournalpp/xournalpp
+ *
+ * @license GNU GPLv2 or later
+ */
+
+#pragma once
+
+#include "model/PageRef.h"  // for PageRef
+
+class DeleteUndoAction;
+class Document;
+class EraseUndoAction;
+class Layer;
+class Range;
+class LegacyRedrawable;
+class Stroke;
+class ToolHandler;
+class UndoRedoHandler;
+
+class EraseHandler {
+public:
+    EraseHandler(UndoRedoHandler* undo, Document* doc, const PageRef& page, ToolHandler* handler,
+                 LegacyRedrawable* view);
+    virtual ~EraseHandler();
+
+public:
+    void erase(double x, double y);
+    void finalize();
+
+private:
+    void eraseStroke(Layer* l, Stroke* s, double x, double y, Range& range);
+
+private:
+    PageRef page;
+    ToolHandler* handler;
+    LegacyRedrawable* view;
+    Document* doc;
+    UndoRedoHandler* undo;
+
+    DeleteUndoAction* eraseDeleteUndoAction;
+    EraseUndoAction* eraseUndoAction;
+
+    double halfEraserSize;
+
+private:
+    /**
+     * Coefficient for adding padding to the erased sections of strokes.
+     * It depends on the stroke cap style ROUND, BUTT or SQUARE.
+     * The order must match the enum StrokeCapStyle in Stroke.h
+     */
+    static constexpr double PADDING_COEFFICIENT_CAP[] = {0.4, 0.01, 0.5};
+};
diff --git a/entry/src/main/cpp/src/core/control/tools/ImageHandler.cpp b/entry/src/main/cpp/src/core/control/tools/ImageHandler.cpp
new file mode 100644
index 0000000..beef9c6
--- /dev/null
+++ b/entry/src/main/cpp/src/core/control/tools/ImageHandler.cpp
@@ -0,0 +1,153 @@
+#include "ImageHandler.h"
+
+#include <algorithm>  // for min
+#include <fstream>
+#include <memory>  // for __shared_ptr_access, make...
+#include <sstream>
+#include <string>   // for string
+#include <utility>  // for operator==, pair
+
+#include <glib-object.h>  // for g_object_unref
+#include <glib.h>         // for g_error_free, g_free, GError
+
+#include "control/Control.h"              // for Control
+#include "control/tools/EditSelection.h"  // for EditSelection
+#include "gui/MainWindow.h"               // for MainWindow
+#include "gui/PageView.h"                 // for XojPageView
+#include "gui/XournalView.h"              // for XournalView
+#include "gui/dialog/XojOpenDlg.h"        // for showOpenImageDialog
+#include "model/Image.h"
+#include "model/Layer.h"            // for Layer
+#include "model/PageRef.h"          // for PageRef
+#include "model/XojPage.h"          // for XojPage
+#include "undo/InsertUndoAction.h"  // for InsertUndoAction
+#include "undo/UndoRedoHandler.h"   // for UndoRedoHandler
+#include "util/XojMsgBox.h"         // for XojMsgBox
+#include "util/i18n.h"              // for _
+#include "util/raii/GObjectSPtr.h"  // for GObjectSPtr.h
+
+ImageHandler::ImageHandler(Control* control): control(control) {}
+
+ImageHandler::~ImageHandler() = default;
+
+
+void ImageHandler::chooseAndCreateImage(std::function<void(std::unique_ptr<Image>)> callback) {
+    xoj::OpenDlg::showOpenImageDialog(control->getGtkWindow(), control->getSettings(),
+                                      [cb = std::move(callback), ctrl = control](fs::path p, bool) {
+                                          auto img = ImageHandler::createImageFromFile(p);
+
+                                          if (!img || img->getImageSize() == Image::NOSIZE) {
+                                              XojMsgBox::showErrorToUser(ctrl->getGtkWindow(),
+                                                                         _("Failed to load image"));
+                                              return;
+                                          }
+                                          cb(std::move(img));
+                                      });
+}
+
+auto ImageHandler::createImageFromFile(const fs::path& p) -> std::unique_ptr<Image> {
+
+    auto fileToString = [](const fs::path& p) {
+        // This is the faster file dump I could come up with. Faster by 20% than g_file_load_contents (with -O3)
+        std::ifstream stream(p, std::ios::binary);
+
+        auto pos = stream.tellg();
+        stream.seekg(0, std::ios_base::end);  // Go to the end
+        auto size = stream.tellg() - pos;     // Get the size
+        stream.seekg(pos);                    // Go back
+
+        std::string s(as_unsigned(size), 0);  // Allocate
+        stream.read(&s[0], size);             // Dump
+        return s;
+    };
+
+    auto img = std::make_unique<Image>();
+    try {
+        img->setImage(fileToString(p));
+    } catch (const std::ios_base::failure& e) {
+        std::stringstream msg;
+        msg << _("Error while opening image file: ") << p.string() << '\n'
+            << "Error code: " << e.code() << '\n'
+            << "Explanatory string: " << e.what();
+        XojMsgBox::showErrorToUser(nullptr, msg.str());
+        return nullptr;
+    }
+    // Render the image.
+    if (auto opt = img->renderBuffer(); opt.has_value()) {
+        // An error occurred
+        XojMsgBox::showErrorToUser(nullptr, opt.value());
+        return nullptr;
+    }
+
+    return img;
+}
+
+bool ImageHandler::addImageToDocument(std::unique_ptr<Image> img, PageRef page, Control* control, bool addUndoAction) {
+    Layer* layer = page->getSelectedLayer();
+
+    if (addUndoAction) {
+        control->getUndoRedoHandler()->addUndoAction(std::make_unique<InsertUndoAction>(page, layer, img.get()));
+    }
+
+    XournalView* xournal = control->getWindow()->getXournal();
+    auto pageNr = xournal->getCurrentPage();
+    auto* view = xournal->getViewFor(pageNr);
+
+    if (view->getPage() != page) {
+        g_warning("Active page changed while you selected the image. Aborting.");
+        return false;
+    }
+
+    auto sel = SelectionFactory::createFromFloatingElement(control, page, layer, view, std::move(img));
+    control->getWindow()->getXournal()->setSelection(sel.release());
+    return true;
+}
+
+void ImageHandler::automaticScaling(Image& img, PageRef page, int width, int height) {
+    double zoom = 1;
+    double x = img.getX();
+    double y = img.getY();
+
+    if (x + width > page->getWidth() || y + height > page->getHeight()) {
+        double const maxZoomX = (page->getWidth() - x) / width;
+        double const maxZoomY = (page->getHeight() - y) / height;
+        zoom = std::min(maxZoomX, maxZoomY);
+    }
+
+    img.setWidth(width * zoom);
+    img.setHeight(height * zoom);
+}
+
+void ImageHandler::automaticScaling(Image& img, PageRef page) {
+    auto [width, height] = img.getImageSize();
+    automaticScaling(img, page, width, height);
+}
+
+
+void ImageHandler::insertImageWithSize(PageRef page, const xoj::util::Rectangle<double>& space) {
+    chooseAndCreateImage([space, page, ctrl = control](std::unique_ptr<Image> img) {
+        xoj_assert(img);
+        img->setX(space.x);
+        img->setY(space.y);
+        auto [width, height] = img->getImageSize();
+
+        if (static_cast<int>(space.width) != 0 && static_cast<int>(space.height) != 0) {
+            // scale down
+            const double scaling = std::min(space.height / height, space.width / width);
+            img->setWidth(scaling * width);
+            img->setHeight(scaling * height);
+
+            // center
+            if (img->getElementHeight() < space.height) {
+                img->setY(img->getY() + ((space.height - img->getElementHeight()) * 0.5));
+            }
+            if (img->getElementWidth() < space.width) {
+                img->setX(img->getX() + ((space.width - img->getElementWidth()) * 0.5));
+            }
+        } else {
+            // zero space is selected, scale original image size down to fit on the page
+            automaticScaling(*img, page);
+        }
+        addImageToDocument(std::move(img), page, ctrl, true);
+    });
+}
diff --git a/entry/src/main/cpp/src/core/control/tools/ImageHandler.h b/entry/src/main/cpp/src/core/control/tools/ImageHandler.h
new file mode 100644
index 0000000..c215207
--- /dev/null
+++ b/entry/src/main/cpp/src/core/control/tools/ImageHandler.h
@@ -0,0 +1,52 @@
+/*
+ * Xournal++
+ *
+ * Image Tool handler
+ *
+ * @author Xournal++ Team
+ * https://github.com/xournalpp/xournalpp
+ *
+ * @license GNU GPLv2 or later
+ */
+
+#pragma once
+
+#include <functional>
+#include <memory>
+
+#include "model/PageRef.h"
+#include "util/Rectangle.h"
+
+#include "filesystem.h"
+
+class Control;
+class Image;
+
+class ImageHandler final {
+public:
+    ImageHandler(Control* control);
+    ~ImageHandler();
+
+public:
+    /**
+     * inserts an image scaled to the given size
+     */
+    void insertImageWithSize(PageRef page, const xoj::util::Rectangle<double>& space);
+
+    /// Creates the image from the given file
+    [[nodiscard]] static auto createImageFromFile(const fs::path& path) -> std::unique_ptr<Image>;
+
+    static bool addImageToDocument(std::unique_ptr<Image> img, PageRef page, Control* ctrl, bool addUndoAction);
+
+    /// applies (potentially adjusted) width/height to the image: scale down (only if necessary) the image so that it
+    /// then fits on the page
+    static void automaticScaling(Image& img, PageRef page, int width, int height);
+    /// Same as above, but width and height are inferred from the image file.
+    static void automaticScaling(Image& img, PageRef page);
+
+    /// lets the user choose an image file, creates the image and calls the callback
+    void chooseAndCreateImage(std::function<void(std::unique_ptr<Image>)> callback);
+
+private:
+    Control* control;
+};
diff --git a/entry/src/main/cpp/src/core/control/tools/ImageSizeSelection.cpp b/entry/src/main/cpp/src/core/control/tools/ImageSizeSelection.cpp
new file mode 100644
index 0000000..d16bde5
--- /dev/null
+++ b/entry/src/main/cpp/src/core/control/tools/ImageSizeSelection.cpp
@@ -0,0 +1,36 @@
+#include "ImageSizeSelection.h"
+
+#include "util/Rectangle.h"  // for Rectangle
+
+using namespace xoj::view;
+
+ImageSizeSelection::ImageSizeSelection(double x, double y):
+        startX(x),
+        startY(y),
+        endX(x),
+        endY(y),
+        viewPool(std::make_shared<xoj::util::DispatchPool<ImageSizeSelectionView>>()) {}
+
+void ImageSizeSelection::updatePosition(double x, double y) {
+    Range old(startX, startY);
+    old.addPoint(endX, endY);
+    old.addPoint(x, y);
+    this->endX = x;
+    this->endY = y;
+
+    this->viewPool->dispatch(xoj::view::ImageSizeSelectionView::FLAG_DIRTY_REGION, old);
+}
+
+auto ImageSizeSelection::getSelectedSpace() const -> xoj::util::Rectangle<double> {
+    const double width = this->startX < this->endX ? this->endX - this->startX : this->startX - this->endX;
+    const double height = this->startY < this->endY ? this->endY - this->startY : this->startY - this->endY;
+    const double x = this->startX < this->endX ? this->startX : this->endX;
+    const double y = this->startY < this->endY ? this->startY : this->endY;
+    return {x, y, width, height};
+}
+
+void ImageSizeSelection::finalize() {
+    Range box(startX, startY);
+    box.addPoint(endX, endY);
+    this->viewPool->dispatchAndClear(xoj::view::ImageSizeSelectionView::FINALIZATION_REQUEST, box);
+}
diff --git a/entry/src/main/cpp/src/core/control/tools/ImageSizeSelection.h b/entry/src/main/cpp/src/core/control/tools/ImageSizeSelection.h
new file mode 100644
index 0000000..0f80b76
--- /dev/null
+++ b/entry/src/main/cpp/src/core/control/tools/ImageSizeSelection.h
@@ -0,0 +1,42 @@
+/*
+ * Xournal++
+ *
+ * Select a size before inserting an image
+ *
+ * @author Xournal++ Team
+ * https://github.com/xournalpp/xournalpp
+ *
+ * @license GNU GPLv2 or later
+ */
+
+#pragma once
+
+#include "model/OverlayBase.h"                     // for OverlayBase
+#include "util/DispatchPool.h"                     // for Listener
+#include "util/Rectangle.h"                        // for Rectangle
+#include "view/overlays/ImageSizeSelectionView.h"  // for ImageSizeSelectionView
+
+using namespace xoj::view;
+
+class ImageSizeSelection: public OverlayBase {
+public:
+    ImageSizeSelection(double x, double y);
+
+    void updatePosition(double x, double y);
+
+    void finalize();
+
+    auto getSelectedSpace() const -> xoj::util::Rectangle<double>;
+
+    inline auto getViewPool() const -> const std::shared_ptr<xoj::util::DispatchPool<ImageSizeSelectionView>>& {
+        return viewPool;
+    }
+
+private:
+    double startX;
+    double startY;
+    double endX;
+    double endY;
+
+    std::shared_ptr<xoj::util::DispatchPool<ImageSizeSelectionView>> viewPool;
+};
diff --git a/entry/src/main/cpp/src/core/control/tools/InputHandler.cpp b/entry/src/main/cpp/src/core/control/tools/InputHandler.cpp
new file mode 100644
index 0000000..9998ee5
--- /dev/null
+++ b/entry/src/main/cpp/src/core/control/tools/InputHandler.cpp
@@ -0,0 +1,62 @@
+#include "InputHandler.h"
+
+#include <cmath>    // for hypot
+#include <cstddef>  // for size_t
+
+#include <glib.h>  // for g_get_monotonic_time
+
+#include "control/AudioController.h"  // for AudioController
+#include "control/Control.h"          // for Control
+#include "control/ToolEnums.h"        // for TOOL_ERASER, TOOL_HIGHLIGHTER
+#include "control/ToolHandler.h"      // for ToolHandler
+#include "model/Point.h"              // for Point, Point::NO_PRESSURE
+#include "model/Stroke.h"             // for Stroke, StrokeTool::ERASER, STR...
+#include "util/Color.h"               // for Color
+#include "util/safe_casts.h"          // for as_unsigned
+
+#include "filesystem.h"  // for path
+
+InputHandler::InputHandler(Control* control, const PageRef& page): control(control), page(page) {}
+
+InputHandler::~InputHandler() = default;
+
+auto InputHandler::getStroke() const -> Stroke* { return stroke.get(); }
+
+auto InputHandler::createStroke(Control* control) -> std::unique_ptr<Stroke> {
+    ToolHandler* h = control->getToolHandler();
+
+    auto s = std::make_unique<Stroke>();
+    s->setWidth(h->getThickness());
+    s->setColor(h->getColor());
+    s->setFill(h->getFill());
+    s->setLineStyle(h->getLineStyle());
+
+    if (h->getToolType() == TOOL_PEN) {
+        s->setToolType(StrokeTool::PEN);
+
+#ifdef ENABLE_AUDIO
+        if (auto* audioController = control->getAudioController(); audioController && audioController->isRecording()) {
+            fs::path audioFilename = audioController->getAudioFilename();
+            size_t sttime = audioController->getStartTime();
+            size_t milliseconds = (as_unsigned(g_get_monotonic_time() / 1000) - sttime);
+            s->setTimestamp(milliseconds);
+            s->setAudioFilename(audioFilename);
+        }
+#endif
+    } else if (h->getToolType() == TOOL_HIGHLIGHTER) {
+        s->setToolType(StrokeTool::HIGHLIGHTER);
+    } else if (h->getToolType() == TOOL_ERASER) {
+        s->setToolType(StrokeTool::ERASER);
+        s->setColor(Colors::white);
+    } else if (h->getToolType() == TOOL_LASER_POINTER_PEN) {
+        s->setToolType(StrokeTool::PEN);
+    } else if (h->getToolType() == TOOL_LASER_POINTER_HIGHLIGHTER) {
+        s->setToolType(StrokeTool::HIGHLIGHTER);
+    }
+
+    return s;
+}
+
+auto InputHandler::validMotion(Point p, Point q) -> bool {
+    return std::hypot(p.x - q.x, p.y - q.y) >= PIXEL_MOTION_THRESHOLD;
+}
diff --git a/entry/src/main/cpp/src/core/control/tools/InputHandler.h b/entry/src/main/cpp/src/core/control/tools/InputHandler.h
new file mode 100644
index 0000000..4f1f084
--- /dev/null
+++ b/entry/src/main/cpp/src/core/control/tools/InputHandler.h
@@ -0,0 +1,108 @@
+/*
+ * Xournal++
+ *
+ * Handles input and optimizes the stroke
+ *
+ * @author Xournal++ Team
+ * https://github.com/xournalpp/xournalpp
+ *
+ * @license GNU GPLv2 or later
+ */
+
+#pragma once
+
+#include <memory>  // for unique_ptr
+
+#include <gdk/gdk.h>  // for GdkEventKey
+
+#include "model/OverlayBase.h"
+#include "model/PageRef.h"  // for PageRef
+
+class Control;
+class Point;
+class Stroke;
+class PositionInputData;
+struct KeyEvent;
+
+namespace xoj::view {
+class OverlayView;
+class Repaintable;
+};  // namespace xoj::view
+
+/**
+ * @brief A base class to handle pointer input
+ *
+ * The InputHandler receives various events from a XojPageView
+ * and updates the XojPageView to display strokes being
+ * drawn
+ */
+class InputHandler: public OverlayBase {
+public:
+    InputHandler(Control* control, const PageRef& page);
+    virtual ~InputHandler();
+
+public:
+    /**
+     * This method is called from the XojPageView as soon
+     * as the pointer is moved while this InputHandler
+     * is active. It is used to update internal data
+     * structures and queue repaints of the XojPageView
+     * if necessary
+     */
+    virtual bool onMotionNotifyEvent(const PositionInputData& pos, double zoom) = 0;
+
+    /**
+     * This method is called from the XojPageView when a keypress is detected.
+     * It is used to update internal data structures and queue
+     * repaints of the XojPageView if necessary.
+     */
+    virtual bool onKeyPressEvent(const KeyEvent& event) = 0;
+    virtual bool onKeyReleaseEvent(const KeyEvent& event) = 0;
+
+    /**
+     * The current input device for stroken, do not react on other devices (linke mices)
+     * This method is called from the XojPageView as soon
+     * as the pointer is released.
+     */
+    virtual void onButtonReleaseEvent(const PositionInputData& pos, double zoom) = 0;
+
+    /**
+     * This method is called from the XojPageView as soon
+     * as the pointer is pressed.
+     */
+    virtual void onButtonPressEvent(const PositionInputData& pos, double zoom) = 0;
+
+    /**
+     * This method is called from the XojPageView as soon
+     * as the pointer is pressed a second time.
+     */
+    virtual void onButtonDoublePressEvent(const PositionInputData& pos, double zoom) = 0;
+
+    /**
+     * This method is called when an action taken by the pointer is canceled.
+     * It is used, for instance, to cancel a stroke drawn when a user starts
+     * to zoom on a touchscreen device.
+     */
+    virtual void onSequenceCancelEvent() = 0;
+
+    virtual std::unique_ptr<xoj::view::OverlayView> createView(xoj::view::Repaintable* parent) const = 0;
+
+    Stroke* getStroke() const;
+
+protected:
+    [[nodiscard]] static std::unique_ptr<Stroke> createStroke(Control* control);
+
+    static bool validMotion(Point p, Point q);
+
+    /**
+     * Smaller movements will be ignored.
+     * Expressed in page coordinates
+     */
+    static constexpr double PIXEL_MOTION_THRESHOLD = 0.3;
+
+protected:
+    Control* control;
+    PageRef page;
+
+    std::unique_ptr<Stroke> stroke;
+};
diff --git a/entry/src/main/cpp/src/core/control/tools/LaserPointerHandler.cpp b/entry/src/main/cpp/src/core/control/tools/LaserPointerHandler.cpp
new file mode 100644
index 0000000..547810e
--- /dev/null
+++ b/entry/src/main/cpp/src/core/control/tools/LaserPointerHandler.cpp
@@ -0,0 +1,99 @@
+#include "LaserPointerHandler.h"
+
+#include <control/Control.h>
+#include <control/settings/Settings.h>
+#include <gui/MainWindow.h>
+#include <gui/PageView.h>
+#include <gui/XournalView.h>
+
+#include "gui/inputdevices/PositionInputData.h"  // for PositionInputData
+#include "model/Stroke.h"
+#include "util/DispatchPool.h"
+#include "util/glib_casts.h"
+#include "view/overlays/LaserPointerView.h"
+
+#include "StrokeHandler.h"
+
+static constexpr int FADEOUT_STEP_DURATION = 50;  ///< in ms
+static constexpr uint8_t FADEOUT_ALPHA_STEP = 25;
+// The total fadeout duration will be  FADEOUT_STEP_DURATION * 255 / FADEOUT_ALPHA_STEP
+
+class TemporaryStrokeHandler: public StrokeHandler {
+public:
+    using StrokeHandler::finalizeStroke;
+    using StrokeHandler::StrokeHandler;
+};
+
+LaserPointerHandler::LaserPointerHandler(XojPageView* pageView, Control* control, const PageRef& page):
+        viewPool(std::make_shared<xoj::util::DispatchPool<xoj::view::LaserPointerView>>()),
+        ctrl(control),
+        page(page),
+        pageView(pageView),
+        fadeoutStartDelay(control->getSettings()->getLaserPointerFadeOutTime()),
+        hasFinishedStrokes(false) {}
+
+LaserPointerHandler::~LaserPointerHandler() = default;
+
+std::unique_ptr<xoj::view::OverlayView> LaserPointerHandler::createView(xoj::view::Repaintable* parent) const {
+    auto view = std::make_unique<xoj::view::LaserPointerView>(this, parent);
+    if (this->strokehandler) {
+        view->on(xoj::view::LaserPointerView::START_NEW_STROKE_REQUEST, this->strokehandler.get());
+    }
+    return view;
+}
+
+void LaserPointerHandler::onButtonPressEvent(const PositionInputData& pos, double zoom) {
+    this->strokehandler = std::make_unique<TemporaryStrokeHandler>(ctrl, page);
+    this->strokehandler->onButtonPressEvent(pos, zoom);
+    this->viewPool->dispatch(xoj::view::LaserPointerView::START_NEW_STROKE_REQUEST, strokehandler.get());
+
+    this->fadeoutTimer.cancel();
+    this->fadeoutAlpha = 255;
+}
+
+void LaserPointerHandler::onButtonReleaseEvent(const PositionInputData& pos, double zoom) {
+    if (!strokehandler) {
+        return;  // This could happen if the tool changed between button press and release
+    }
+    this->hasFinishedStrokes = true;
+    this->strokehandler->finalizeStroke(pos.pressure);
+    this->viewPool->dispatch(xoj::view::LaserPointerView::FINISH_STROKE_REQUEST,
+                             Range(this->strokehandler->getStroke()->boundingRect()));
+    this->strokehandler.reset();
+    this->fadeoutTimer =
+            g_timeout_add(this->fadeoutStartDelay, xoj::util::wrap_for_once_v<triggerFadeoutCallback>, this);
+}
+
+bool LaserPointerHandler::onMotionNotifyEvent(const PositionInputData& pos, double zoom) {
+    return this->strokehandler && this->strokehandler->onMotionNotifyEvent(pos, zoom);
+}
+
+void LaserPointerHandler::onSequenceCancelEvent() {
+    auto s = std::move(this->strokehandler);
+    if (s && s->getStroke()) {
+        Range rg(s->getStroke()->boundingRect());
+        this->viewPool->dispatch(xoj::view::LaserPointerView::INPUT_CANCELLATION_REQUEST, rg);
+    }
+    if (this->hasFinishedStrokes) {
+        this->fadeoutTimer =
+                g_timeout_add(this->fadeoutStartDelay, xoj::util::wrap_for_once_v<triggerFadeoutCallback>, this);
+    }
+}
+
+void LaserPointerHandler::triggerFadeoutCallback(LaserPointerHandler* self) {
+    self->fadeoutTimer.consume();
+    self->fadeoutTimer = g_timeout_add(FADEOUT_STEP_DURATION, xoj::util::wrap_v<fadeoutCallback>, self);
+}
+
+gboolean LaserPointerHandler::fadeoutCallback(LaserPointerHandler* self) {
+    if (self->fadeoutAlpha <= FADEOUT_ALPHA_STEP) {
+        self->fadeoutAlpha = 0;
+        self->viewPool->dispatchAndClear(xoj::view::LaserPointerView::FINALIZATION_REQUEST);
+        self->fadeoutTimer.consume();
+        self->pageView->deleteLaserPointerHandler();  // WARNING: deletes *self
+        return G_SOURCE_REMOVE;
+    }
+    self->fadeoutAlpha -= FADEOUT_ALPHA_STEP;
+    self->viewPool->dispatch(xoj::view::LaserPointerView::SET_ALPHA_REQUEST, self->fadeoutAlpha);
+    return G_SOURCE_CONTINUE;  // The timer will run again and call this callback once more (or be cancelled)
+}
diff --git a/entry/src/main/cpp/src/core/control/tools/LaserPointerHandler.h b/entry/src/main/cpp/src/core/control/tools/LaserPointerHandler.h
new file mode 100644
index 0000000..0fa0c31
--- /dev/null
+++ b/entry/src/main/cpp/src/core/control/tools/LaserPointerHandler.h
@@ -0,0 +1,71 @@
+/*
+ * Xournal++
+ *
+ * Handles a laser pointer that draws temporary strokes
+ *
+ * @author Xournal++ Team
+ * https://github.com/xournalpp/xournalpp
+ *
+ * @license GNU GPLv2 or later
+ */
+
+#pragma once
+
+#include <cstdint>
+#include <memory>  // for unique_ptr
+
+#include "model/OverlayBase.h"
+#include "model/PageRef.h"  // for PageRef
+#include "util/raii/GSourceURef.h"
+
+class Control;
+class PositionInputData;
+class TemporaryStrokeHandler;
+class XojPageView;
+
+namespace xoj::util {
+template <class T>
+class DispatchPool;
+};
+
+
+namespace xoj::view {
+class OverlayView;
+class Repaintable;
+class LaserPointerView;
+};  // namespace xoj::view
+
+class LaserPointerHandler: public OverlayBase {
+public:
+    LaserPointerHandler(XojPageView* pageView, Control* control, const PageRef& page);
+    ~LaserPointerHandler() override;
+
+    void onSequenceCancelEvent();
+    bool onMotionNotifyEvent(const PositionInputData& pos, double zoom);
+    void onButtonReleaseEvent(const PositionInputData& pos, double zoom);
+    void onButtonPressEvent(const PositionInputData& pos, double zoom);
+
+    auto createView(xoj::view::Repaintable* parent) const -> std::unique_ptr<xoj::view::OverlayView>;
+
+    inline auto getViewPool() const -> std::shared_ptr<xoj::util::DispatchPool<xoj::view::LaserPointerView>> {
+        return viewPool;
+    }
+
+private:
+    static void triggerFadeoutCallback(LaserPointerHandler* self);
+    static gboolean fadeoutCallback(LaserPointerHandler* self);
+
+private:
+    std::unique_ptr<TemporaryStrokeHandler> strokehandler;
+    std::shared_ptr<xoj::util::DispatchPool<xoj::view::LaserPointerView>> viewPool;
+
+    // Used only to pass on to (Temporary)StrokeHandler
+    Control* ctrl;
+    PageRef page;
+    XojPageView* pageView;
+
+    xoj::util::GSourceURef fadeoutTimer;
+    uint8_t fadeoutAlpha = 255;
+    const unsigned int fadeoutStartDelay;
+    bool hasFinishedStrokes;
+};
diff --git a/entry/src/main/cpp/src/core/control/tools/PdfElemSelection.cpp b/entry/src/main/cpp/src/core/control/tools/PdfElemSelection.cpp
new file mode 100644
index 0000000..b2849da
--- /dev/null
+++ b/entry/src/main/cpp/src/core/control/tools/PdfElemSelection.cpp
@@ -0,0 +1,139 @@
+#include "PdfElemSelection.h"
+
+#include <algorithm>  // for max, min
+#include <limits>   // for numeric_limits
+#include <memory>   // for __shared_ptr_access
+#include <utility>  // for move
+
+#include <cairo.h>    // for cairo_line_to, cairo_region_destroy
+#include <gdk/gdk.h>  // for GdkRGBA, gdk_cairo_set_source_rgba
+
+#include "control/Control.h"      // for Control
+#include "control/ToolHandler.h"  // for ToolHandler
+#include "gui/PageView.h"         // for XojPageView
+#include "gui/XournalView.h"      // for XournalView
+#include "model/Document.h"       // for Document
+#include "model/PageRef.h"        // for PageRef
+#include "model/XojPage.h"        // for XojPage
+#include "pdf/base/XojPdfPage.h"  // for XojPdfRectangle, XojPdfPageSelectio...
+#include "util/Assert.h"          // for xoj_assert
+#include "util/safe_casts.h"      // for strict_cast, as_signed, as_si...
+#include "view/overlays/PdfElementSelectionView.h"
+
+PdfElemSelection::PdfElemSelection(double x, double y, Control* control):
+        pdf(nullptr),
+        bounds({x, y, x, y}),
+        finalized(false),
+        viewPool(std::make_shared<xoj::util::DispatchPool<xoj::view::PdfElementSelectionView>>()) {
+
+    if (auto pNr = control->getCurrentPage()->getPdfPageNr(); pNr != npos) {
+        Document* doc = control->getDocument();
+        doc->lock_shared();
+        this->pdf = doc->getPdfPage(pNr);
+        doc->unlock_shared();
+
+        this->selectionPageNr = pNr;
+    }
+
+    this->toolType = control->getToolHandler()->getToolType();
+}
+
+PdfElemSelection::~PdfElemSelection() {
+    Range rg = getRegionBbox();
+    this->viewPool->dispatchAndClear(xoj::view::PdfElementSelectionView::CANCEL_SELECTION_REQUEST, rg);
+}
+
+auto PdfElemSelection::finalizeSelectionAndRepaint(XojPdfPageSelectionStyle style) -> bool {
+    Range rg = getRegionBbox();
+    bool result = this->finalizeSelection(style);
+    rg = rg.unite(getRegionBbox());
+    if (!rg.empty()) {
+        this->viewPool->dispatch(xoj::view::PdfElementSelectionView::FLAG_DIRTY_REGION_REQUEST, rg);
+    }
+    return result;
+}
+
+bool PdfElemSelection::finalizeSelection(XojPdfPageSelectionStyle style) {
+    this->finalized = true;
+
+    XojPdfPage::TextSelection selection = this->pdf->selectTextLines(this->bounds, style);
+    this->selectedTextRegion = std::move(selection.region);
+    this->selectedTextRects = std::move(selection.rects);
+    this->selectedText = this->pdf->selectText(this->bounds, style);
+    // Informs the windowing system of the selection -- i.e. for accessibility purposes
+    gtk_clipboard_set_text(gtk_clipboard_get(GDK_SELECTION_PRIMARY), this->selectedText.c_str(),
+                           strict_cast<gint>(this->selectedText.length()));
+    return !this->selectedTextRects.empty();
+}
+
+XojPdfPageSelectionStyle PdfElemSelection::selectionStyleForToolType(ToolType type) {
+    switch (type) {
+        case ToolType::TOOL_SELECT_PDF_TEXT_RECT:
+            return XojPdfPageSelectionStyle::Area;
+        default:
+            return XojPdfPageSelectionStyle::Linear;
+    }
+}
+
+Range PdfElemSelection::getRegionBbox() const {
+    if (this->selectedTextRegion && cairo_region_num_rectangles(this->selectedTextRegion.get()) > 0) {
+        cairo_rectangle_int_t bbox{};
+        cairo_region_get_extents(this->selectedTextRegion.get(), &bbox);
+        return Range(bbox.x, bbox.y, bbox.x + bbox.width, bbox.y + bbox.height);
+    }
+    return Range();  // empty range
+}
+
+void PdfElemSelection::currentPos(double x, double y, XojPdfPageSelectionStyle style) {
+    if (!this->pdf) {
+        return;
+    }
+
+    // Update the end position
+    this->bounds.x2 = x;
+    this->bounds.y2 = y;
+    Range rg = getRegionBbox();
+
+    // Repaint the selected text area
+    switch (style) {
+        case XojPdfPageSelectionStyle::Linear:
+        case XojPdfPageSelectionStyle::Word:
+        case XojPdfPageSelectionStyle::Line:
+            this->selectedTextRegion.reset(this->pdf->selectTextRegion(this->bounds, style), xoj::util::adopt);
+            break;
+        case XojPdfPageSelectionStyle::Area: {
+            cairo_rectangle_int_t rect;
+            rect.x = floor_cast<int>(std::min(bounds.x1, bounds.x2));
+            rect.width = ceil_cast<int>(std::max(bounds.x1, bounds.x2)) - rect.x;
+            rect.y = floor_cast<int>(std::min(bounds.y1, bounds.y2));
+            rect.height = ceil_cast<int>(std::max(bounds.y1, bounds.y2)) - rect.y;
+            this->selectedTextRegion.reset(cairo_region_create_rectangle(&rect), xoj::util::adopt);
+        } break;
+        default:
+            xoj_assert_message(false, "Unreachable");
+    }
+    xoj_assert(this->selectedTextRegion);
+
+    rg = rg.unite(getRegionBbox());
+    if (!rg.empty()) {
+        this->viewPool->dispatch(xoj::view::PdfElementSelectionView::FLAG_DIRTY_REGION_REQUEST, rg);
+    }
+}
+
+auto PdfElemSelection::contains(double x, double y) -> bool {
+    if (!this->selectedTextRegion) {
+        return false;
+    }
+
+    return cairo_region_contains_point(this->selectedTextRegion.get(), static_cast<int>(x), static_cast<int>(y));
+}
+
+auto PdfElemSelection::getSelectedTextRects() const -> const std::vector<XojPdfRectangle>& { return selectedTextRects; }
+
+auto PdfElemSelection::getSelectedText() const -> const std::string& { return this->selectedText; }
+
+auto PdfElemSelection::getSelectionPageNr() const -> size_t { return selectionPageNr; }
+
+auto PdfElemSelection::isFinalized() const -> bool { return this->finalized; }
+
+void PdfElemSelection::setToolType(ToolType tType) { this->toolType = tType; }
diff --git a/entry/src/main/cpp/src/core/control/tools/PdfElemSelection.h b/entry/src/main/cpp/src/core/control/tools/PdfElemSelection.h
new file mode 100644
index 0000000..e07a8a3
--- /dev/null
+++ b/entry/src/main/cpp/src/core/control/tools/PdfElemSelection.h
@@ -0,0 +1,109 @@
+/*
+ * Xournal++
+ *
+ * Tool for selecting PDF content
+ *
+ * @author Xournal++ Team
+ * https://github.com/xournalpp/xournalpp
+ *
+ * @license GNU GPLv2 or later
+ */
+#pragma once
+
+#include <cstddef>  // for size_t
+#include <string>   // for string
+#include <vector>   // for vector
+
+#include <cairo.h>  // for cairo_region_t, cairo_t
+
+#include "control/ToolEnums.h"  // for ToolType
+#include "model/OverlayBase.h"
+#include "pdf/base/XojPdfPage.h"  // for XojPdfPageSelectionStyle, XojPdfRec...
+#include "util/DispatchPool.h"
+#include "util/Util.h"                // for npos
+#include "util/raii/CairoWrappers.h"  // for CairoRegionSPtr
+
+class Range;
+class Control;
+
+namespace xoj::view {
+class PdfElementSelectionView;
+};
+
+/// Represents elements selected from a PDF page, such as text.
+class PdfElemSelection: public OverlayBase {
+public:
+    PdfElemSelection(double x, double y, Control* control);
+    PdfElemSelection& operator=(const PdfElemSelection&) = delete;
+    PdfElemSelection(const PdfElemSelection&) = delete;
+    PdfElemSelection& operator=(PdfElemSelection&&) = default;
+    PdfElemSelection(PdfElemSelection&&) = default;
+    virtual ~PdfElemSelection();
+
+public:
+    /// Calls finalizeSelection() and then repaints the page.
+    bool finalizeSelectionAndRepaint(XojPdfPageSelectionStyle style);
+
+    /// Sets the final selection bounds using the provided selection style.
+    /// Returns true iff there is text contained within the selection bounds.
+    bool finalizeSelection(XojPdfPageSelectionStyle style);
+
+    /// Update the (unfinalized) selection bounds with the given
+    /// style.
+    void currentPos(double x, double y, XojPdfPageSelectionStyle style);
+
+    /// If the selection is a rectangle, returns true iff the given point is
+    /// contained in the selection. Returns false on text selection.
+    bool contains(double x, double y);
+
+    const std::vector<XojPdfRectangle>& getSelectedTextRects() const;
+
+    /// Returns the text contained in the selection region.
+    const std::string& getSelectedText() const;
+
+    /// Returns true iff the final selections bounds are known.
+    bool isFinalized() const;
+
+    size_t getSelectionPageNr() const;
+    void setToolType(ToolType toolType);
+
+    const cairo_region_t* getSelectedRegion() const { return selectedTextRegion.get(); }
+
+    /// Returns the selection style corresponding to the given tool type.
+    static XojPdfPageSelectionStyle selectionStyleForToolType(ToolType type);
+
+    inline const std::shared_ptr<xoj::util::DispatchPool<xoj::view::PdfElementSelectionView>>& getViewPool() const {
+        return viewPool;
+    }
+
+private:
+    /// Assigns the selected text region to the current selection bounds.
+    void selectTextRegion(XojPdfPageSelectionStyle style);
+
+    Range getRegionBbox() const;
+
+    XojPdfPageSPtr pdf;
+
+    /// The rectangles corresponding to the lines of selected text.
+    std::vector<XojPdfRectangle> selectedTextRects;
+
+    /// The text content of the selection.
+    std::string selectedText;
+
+    /// The area containing the selected text. Used for rendering.
+    xoj::util::CairoRegionSPtr selectedTextRegion;
+
+    /// The PDF selection tool used for the selection.
+    ToolType toolType;
+
+    size_t selectionPageNr = npos;
+
+    /// The selection bounds. Note that this does not necessarily correspond to
+    /// a rectangle--it may also indicate start and end positions of a linear
+    /// text selection.
+    XojPdfRectangle bounds;
+
+    bool finalized;
+
+    std::shared_ptr<xoj::util::DispatchPool<xoj::view::PdfElementSelectionView>> viewPool;
+};
diff --git a/entry/src/main/cpp/src/core/control/tools/RectangleHandler.cpp b/entry/src/main/cpp/src/core/control/tools/RectangleHandler.cpp
new file mode 100644
index 0000000..a93193f
--- /dev/null
+++ b/entry/src/main/cpp/src/core/control/tools/RectangleHandler.cpp
@@ -0,0 +1,59 @@
+#include "RectangleHandler.h"
+
+#include <algorithm>  // for max
+
+#include "control/Control.h"                       // for Control
+#include "control/settings/Settings.h"             // for Settings
+#include "control/tools/BaseShapeHandler.h"        // for BaseShapeHandler
+#include "control/tools/SnapToGridInputHandler.h"  // for SnapToGridInputHan...
+#include "model/Point.h"                           // for Point
+
+
+RectangleHandler::RectangleHandler(Control* control, const PageRef& page, bool flipShift, bool flipControl):
+        BaseShapeHandler(control, page, flipShift, flipControl) {}
+
+RectangleHandler::~RectangleHandler() = default;
+
+auto RectangleHandler::createShape(bool isAltDown, bool isShiftDown, bool isControlDown)
+        -> std::pair<std::vector<Point>, Range> {
+    /**
+     * Snap point to grid (if enabled)
+     */
+    Point c = snappingHandler.snapToGrid(this->currPoint, isAltDown);
+
+    double width = c.x - this->startPoint.x;
+    double height = c.y - this->startPoint.y;
+
+
+    this->modShift = isShiftDown;
+    this->modControl = isControlDown;
+
+    Settings* settings = control->getSettings();
+    if (settings->getDrawDirModsEnabled()) {
+        // change modifiers based on draw dir
+        this->modifyModifiersByDrawDir(width, height, true);
+    }
+
+    if (this->modShift) {
+        // make square
+        int signW = width > 0 ? 1 : -1;
+        int signH = height > 0 ? 1 : -1;
+        width = std::max(width * signW, height * signH) * signW;
+        height = (width * signW) * signH;
+    }
+
+    Point p1;
+    if (!this->modControl) {
+        p1 = this->startPoint;
+    } else {
+        // Control is down - drawing from center
+        p1 = Point(this->startPoint.x - width, this->startPoint.y - height);
+    }
+
+    Point p2 = Point(this->startPoint.x + width, this->startPoint.y + height);
+
+    Range rg(p1.x, p1.y);
+    rg.addPoint(p2.x, p2.y);
+
+    return {{p1, {p1.x, p2.y}, p2, {p2.x, p1.y}, p1}, rg};
+}
diff --git a/entry/src/main/cpp/src/core/control/tools/RectangleHandler.h b/entry/src/main/cpp/src/core/control/tools/RectangleHandler.h
new file mode 100644
index 0000000..fd430d8
--- /dev/null
+++ b/entry/src/main/cpp/src/core/control/tools/RectangleHandler.h
@@ -0,0 +1,31 @@
+/*
+ * Xournal++
+ *
+ * Handles input to draw a rectangle
+ *
+ * @author Xournal++ Team
+ * https://github.com/xournalpp/xournalpp
+ *
+ * @license GNU GPLv2 or later
+ */
+
+#pragma once
+
+#include <vector>  // for vector
+
+#include "model/PageRef.h"  // for PageRef
+
+#include "BaseShapeHandler.h"  // for BaseShapeHandler
+
+class Point;
+class Control;
+
+class RectangleHandler: public BaseShapeHandler {
+public:
+    RectangleHandler(Control* control, const PageRef& page, bool flipShift = false, bool flipControl = false);
+    ~RectangleHandler() override;
+
+private:
+    auto createShape(bool isAltDown, bool isShiftDown, bool isControlDown)
+            -> std::pair<std::vector<Point>, Range> override;
+};
diff --git a/entry/src/main/cpp/src/core/control/tools/RulerHandler.cpp b/entry/src/main/cpp/src/core/control/tools/RulerHandler.cpp
new file mode 100644
index 0000000..56a7599
--- /dev/null
+++ b/entry/src/main/cpp/src/core/control/tools/RulerHandler.cpp
@@ -0,0 +1,19 @@
+#include "RulerHandler.h"
+
+#include "control/tools/BaseShapeHandler.h"        // for BaseShapeHandler
+#include "control/tools/SnapToGridInputHandler.h"  // for SnapToGridInputHan...
+#include "model/Point.h"                           // for Point
+
+class XournalView;
+
+RulerHandler::RulerHandler(Control* control, const PageRef& page): BaseShapeHandler(control, page) {}
+
+RulerHandler::~RulerHandler() = default;
+
+auto RulerHandler::createShape(bool isAltDown, bool isShiftDown, bool isControlDown)
+        -> std::pair<std::vector<Point>, Range> {
+    Point secondPoint = snappingHandler.snap(this->currPoint, this->startPoint, isAltDown);
+    Range rg(this->startPoint.x, this->startPoint.y);
+    rg.addPoint(secondPoint.x, secondPoint.y);
+    return {{this->startPoint, secondPoint}, rg};
+}
diff --git a/entry/src/main/cpp/src/core/control/tools/RulerHandler.h b/entry/src/main/cpp/src/core/control/tools/RulerHandler.h
new file mode 100644
index 0000000..2b47a98
--- /dev/null
+++ b/entry/src/main/cpp/src/core/control/tools/RulerHandler.h
@@ -0,0 +1,31 @@
+/*
+ * Xournal++
+ *
+ * Handles input of the ruler
+ *
+ * @author Xournal++ Team
+ * https://github.com/xournalpp/xournalpp
+ *
+ * @license GNU GPLv2 or later
+ */
+
+#pragma once
+
+#include <vector>
+
+#include "model/PageRef.h"  // for PageRef
+
+#include "BaseShapeHandler.h"  // for BaseShapeHandler
+
+class Point;
+class Control;
+
+class RulerHandler: public BaseShapeHandler {
+public:
+    RulerHandler(Control* control, const PageRef& page);
+    ~RulerHandler() override;
+
+private:
+    auto createShape(bool isAltDown, bool isShiftDown, bool isControlDown)
+            -> std::pair<std::vector<Point>, Range> override;
+};
diff --git a/entry/src/main/cpp/src/core/control/tools/Selector.cpp b/entry/src/main/cpp/src/core/control/tools/Selector.cpp
new file mode 100644
index 0000000..bc0de6f
--- /dev/null
+++ b/entry/src/main/cpp/src/core/control/tools/Selector.cpp
@@ -0,0 +1,199 @@
+#include "Selector.h"
+
+#include <algorithm>  // for max, min
+#include <cmath>      // for abs, NAN
+#include <memory>     // for __shared_ptr_access
+
+#include <gdk/gdk.h>  // for GdkRGBA, gdk_cairo_set_source_rgba
+
+#include "gui/LegacyRedrawable.h"  // for Redrawable
+#include "model/Document.h"        // for Document
+#include "model/Layer.h"           // for Layer
+#include "model/XojPage.h"         // for XojPage
+#include "util/safe_casts.h"       // for as_unsigned
+
+Selector::Selector(bool multiLayer):
+        multiLayer(multiLayer), viewPool(std::make_shared<xoj::util::DispatchPool<xoj::view::SelectorView>>()) {}
+
+Selector::~Selector() = default;
+
+auto Selector::finalize(PageRef page, bool disableMultilayer, Document* doc) -> size_t {
+    this->page = page;
+    size_t layerId = 0;
+
+    if (multiLayer && !disableMultilayer) {
+        std::shared_lock lock(*doc);
+        const auto layers = page->getLayersView();
+        for (auto it = layers.rbegin(); it != layers.rend(); it++) {
+            const Layer* l = *it;
+            if (!l->isVisible()) {
+                continue;
+            }
+            bool selectionOnLayer = false;
+            Element::Index pos = 0;
+            for (const auto& e: l->getElementsView()) {
+                if (e->isInSelection(this)) {
+                    this->selectedElements.emplace_back(e, pos);
+                    selectionOnLayer = true;
+                }
+                pos++;
+            }
+            if (selectionOnLayer) {
+                layerId = layers.size() - as_unsigned(std::distance(layers.rbegin(), it));
+                break;
+            }
+        }
+    } else {
+        std::shared_lock lock(*doc);
+        const Layer* l = page->getSelectedLayer();
+        Element::Index pos = 0;
+        for (const auto& e: l->getElementsView()) {
+            if (e->isInSelection(this)) {
+                this->selectedElements.emplace_back(e, pos);
+                layerId = page->getSelectedLayerId();
+            }
+            pos++;
+        }
+    }
+
+    this->viewPool->dispatchAndClear(xoj::view::SelectorView::DELETE_VIEWS_REQUEST, this->bbox);
+
+    return layerId;
+}
+
+auto Selector::isMultiLayerSelection() -> bool { return this->multiLayer; }
+
+auto Selector::releaseElements() -> InsertionOrderRef { return std::move(this->selectedElements); }
+
+//////////////////////////////////////////////////////////
+
+RectangularSelector::RectangularSelector(double x, double y, bool multiLayer):
+        Selector(multiLayer), sx(x), sy(y), ex(x), ey(y) {
+    bbox.addPoint(x, y);
+}
+
+RectangularSelector::~RectangularSelector() = default;
+
+auto RectangularSelector::contains(double x, double y) const -> bool { return bbox.contains(x, y); }
+
+void RectangularSelector::currentPos(double x, double y) {
+    bbox = Range(sx, sy);
+    bbox.addPoint(x, y);
+
+    Range rg = bbox;
+    rg.addPoint(ex, ey);  // in case the selection is shrinking
+
+    this->ex = x;
+    this->ey = y;
+
+    boundaryPoints = {{sx, sy}, {sx, ey}, {ex, ey}, {ex, sy}};
+
+    this->viewPool->dispatch(xoj::view::SelectorView::FLAG_DIRTY_REGION, rg);
+
+    this->maxDist = std::max({this->maxDist, x - this->sx, this->sx - x, y - this->sy, this->sy - y});
+}
+
+auto RectangularSelector::userTapped(double zoom) const -> bool { return this->maxDist < 10 / zoom; }
+
+auto RectangularSelector::getBoundary() const -> const std::vector<BoundaryPoint>& { return boundaryPoints; }
+
+//////////////////////////////////////////////////////////
+
+LassoSelector::LassoSelector(double x, double y, bool multiLayer): Selector(multiLayer) { currentPos(x, y); }
+
+void LassoSelector::currentPos(double x, double y) {
+    boundaryPoints.emplace_back(x, y);
+    bbox.addPoint(x, y);
+
+    // at least three points needed
+    if (boundaryPoints.size() >= 3) {
+        Range rg(x, y);
+        const BoundaryPoint& penultimatePoint = boundaryPoints[boundaryPoints.size() - 2];
+        rg.addPoint(penultimatePoint.x, penultimatePoint.y);
+        // rg contains the added segment
+        // add the first point to make sure the filling is painted correctly
+        rg.addPoint(boundaryPoints.front().x, boundaryPoints.front().y);
+
+        this->viewPool->dispatch(xoj::view::SelectorView::FLAG_DIRTY_REGION, rg);
+    }
+}
+
+auto LassoSelector::contains(double x, double y) const -> bool {
+    if (boundaryPoints.size() <= 2 || !this->bbox.contains(x, y)) {
+        return false;
+    }
+
+    int hits = 0;
+
+    const BoundaryPoint& last = boundaryPoints.back();
+
+    double lastx = last.x;
+    double lasty = last.y;
+    double curx = NAN, cury = NAN;
+
+    // Walk the edges of the polygon
+    for (auto pointIterator = boundaryPoints.begin(); pointIterator != boundaryPoints.end();
+         lastx = curx, lasty = cury, ++pointIterator) {
+        curx = pointIterator->x;
+        cury = pointIterator->y;
+
+        if (cury == lasty) {
+            continue;
+        }
+
+        int leftx = 0;
+        if (curx < lastx) {
+            if (x >= lastx) {
+                continue;
+            }
+            leftx = static_cast<int>(curx);
+        } else {
+            if (x >= curx) {
+                continue;
+            }
+            leftx = static_cast<int>(lastx);
+        }
+
+        double test1 = NAN, test2 = NAN;
+        if (cury < lasty) {
+            if (y < cury || y >= lasty) {
+                continue;
+            }
+            if (x < leftx) {
+                hits++;
+                continue;
+            }
+            test1 = x - curx;
+            test2 = y - cury;
+        } else {
+            if (y < lasty || y >= cury) {
+                continue;
+            }
+            if (x < leftx) {
+                hits++;
+                continue;
+            }
+            test1 = x - lastx;
+            test2 = y - lasty;
+        }
+
+        if (test1 < (test2 / (lasty - cury) * (lastx - curx))) {
+            hits++;
+        }
+    }
+
+    return (hits & 1) != 0;
+}
+
+auto LassoSelector::userTapped(double zoom) const -> bool {
+    double maxDist = 10 / zoom;
+    const BoundaryPoint& r0 = boundaryPoints.front();
+    for (const BoundaryPoint& p: boundaryPoints) {
+        if (std::abs(r0.x - p.x) > maxDist || std::abs(r0.y - p.y) > maxDist) {
+            return false;
+        }
+    }
+    return true;
+}
+
+auto LassoSelector::getBoundary() const -> const std::vector<BoundaryPoint>& { return boundaryPoints; }
diff --git a/entry/src/main/cpp/src/core/control/tools/Selector.h b/entry/src/main/cpp/src/core/control/tools/Selector.h
new file mode 100644
index 0000000..705ea2d
--- /dev/null
+++ b/entry/src/main/cpp/src/core/control/tools/Selector.h
@@ -0,0 +1,98 @@
+/*
+ * Xournal++
+ *
+ * A selection while you are selection, not for editing, only for selection
+ *
+ * @author Xournal++ Team
+ * https://github.com/xournalpp/xournalpp
+ *
+ * @license GNU GPLv2 or later
+ */
+
+#pragma once
+
+#include <vector>  // for vector
+
+#include "model/Element.h"  // for Element (ptr only), ShapeContainer
+#include "model/ElementInsertionPosition.h"
+#include "model/OverlayBase.h"
+#include "model/PageRef.h"  // for PageRef
+#include "util/DispatchPool.h"
+#include "util/Point.h"
+#include "util/Range.h"
+#include "view/overlays/SelectorView.h"
+
+class Document;
+
+class Selector: public ShapeContainer, public OverlayBase {
+public:
+    Selector(bool multiLayer);
+    ~Selector() override;
+
+    using BoundaryPoint = xoj::util::Point<double>;
+
+public:
+    /**
+     * @return layerId of selected objects, 0 if there is nothing in RectSelection
+     */
+    size_t finalize(PageRef page, bool disableMultilayer, Document* doc);
+
+    virtual void currentPos(double x, double y) = 0;
+    virtual bool userTapped(double zoom) const = 0;
+    virtual const std::vector<BoundaryPoint>& getBoundary() const = 0;
+
+    inline auto getViewPool() const -> const std::shared_ptr<xoj::util::DispatchPool<xoj::view::SelectorView>>& {
+        return viewPool;
+    }
+
+    auto isMultiLayerSelection() -> bool;
+    /**
+     * Get the selected elements and clears them (std::move)
+     */
+    auto releaseElements() -> InsertionOrderRef;
+
+private:
+protected:
+    std::vector<BoundaryPoint> boundaryPoints;
+
+    bool multiLayer;
+
+    InsertionOrderRef selectedElements;
+    PageRef page;
+
+    Range bbox;
+
+    std::shared_ptr<xoj::util::DispatchPool<xoj::view::SelectorView>> viewPool;
+
+    friend class EditSelection;
+};
+
+class RectangularSelector: public Selector {
+public:
+    RectangularSelector(double x, double y, bool multiLayer = false);
+    ~RectangularSelector() override;
+
+public:
+    void currentPos(double x, double y) override;
+    bool contains(double x, double y) const override;
+    bool userTapped(double zoom) const override;
+    const std::vector<BoundaryPoint>& getBoundary() const override;
+
+private:
+    double sx;
+    double sy;
+    double ex;
+    double ey;
+    double maxDist = 0;
+};
+
+class LassoSelector: public Selector {
+public:
+    LassoSelector(double x, double y, bool multiLayer = false);
+
+public:
+    void currentPos(double x, double y) override;
+    bool contains(double x, double y) const override;
+    bool userTapped(double zoom) const override;
+    const std::vector<BoundaryPoint>& getBoundary() const override;
+};
diff --git a/entry/src/main/cpp/src/core/control/tools/SnapToGridInputHandler.cpp b/entry/src/main/cpp/src/core/control/tools/SnapToGridInputHandler.cpp
new file mode 100644
index 0000000..2d78f50
--- /dev/null
+++ b/entry/src/main/cpp/src/core/control/tools/SnapToGridInputHandler.cpp
@@ -0,0 +1,154 @@
+#include "SnapToGridInputHandler.h"
+
+#include <cmath>  // for floor, sqrt
+
+#include "control/settings/Settings.h"
+#include "model/BackgroundConfig.h"  // for BackgroundConfig
+#include "model/Snapping.h"
+#include "model/XojPage.h"  // for XojPage
+
+using namespace background_config_strings;
+
+namespace {
+constexpr double DEFAULT_RASTER_SIZE = 14.17;  // 5mm
+constexpr double RULED_HEADER_SIZE = 80.0;
+}  // namespace
+
+SnapToGridInputHandler::SnapToGridInputHandler(const Settings* settings): settings(settings), currentPage(nullptr) {}
+
+void SnapToGridInputHandler::setPageRef(PageRef page) {
+    this->currentPage = page;
+    this->offsetsCached = false;
+}
+
+void SnapToGridInputHandler::ensureOffsetsCached() const {
+    if (!currentPage) {
+        cachedXOffset = 0.0;
+        cachedYOffset = 0.0;
+        offsetsCached = true;
+        return;
+    }
+    if (!offsetsCached) {
+        calculateGridOffsets(cachedXOffset, cachedYOffset, currentPage->getWidth(), currentPage->getHeight());
+        offsetsCached = true;
+    }
+}
+
+void SnapToGridInputHandler::calculateIsometricOffsets(const BackgroundConfig& config, double pageWidth,
+                                                       double pageHeight, double& xOffset, double& yOffset) const {
+    double triangleSize = DEFAULT_RASTER_SIZE;
+    config.loadValue(CFG_RASTER, triangleSize);
+
+    const double xStep = std::sqrt(3.0) / 2.0 * triangleSize;
+    const double yStep = triangleSize / 2.0;
+    const double isoMargin = triangleSize;
+
+    const int cols = static_cast<int>(std::floor((pageWidth - 2.0 * isoMargin) / xStep));
+    const int rows = static_cast<int>(std::floor((pageHeight - 2.0 * isoMargin) / yStep));
+
+    const double contentWidth = cols * xStep;
+    const double contentHeight = rows * yStep;
+
+    xOffset = (pageWidth - contentWidth) / 2.0;
+    yOffset = (pageHeight - contentHeight) / 2.0;
+}
+
+void SnapToGridInputHandler::calculateGridOffsets(double& xOffset, double& yOffset, double pageWidth,
+                                                  double pageHeight) const {
+    xOffset = 0.0;
+    yOffset = 0.0;
+    if (!currentPage) {
+        return;
+    }
+    const PageType bgType = currentPage->getBackgroundType();
+    const BackgroundConfig config(bgType.config);
+
+    switch (bgType.format) {
+        case PageTypeFormat::IsoDotted:
+        case PageTypeFormat::IsoGraph:
+            calculateIsometricOffsets(config, pageWidth, pageHeight, xOffset, yOffset);
+            break;
+        case PageTypeFormat::Ruled:
+        case PageTypeFormat::Lined:
+            yOffset = RULED_HEADER_SIZE;
+            break;
+        case PageTypeFormat::Graph:
+        case PageTypeFormat::Dotted:
+        case PageTypeFormat::Staves:
+        case PageTypeFormat::Plain:
+        case PageTypeFormat::Pdf:
+        case PageTypeFormat::Image:
+        default:
+            // Origin-based grid (offsets remain 0.0)
+            break;
+    }
+}
+
+bool SnapToGridInputHandler::isIsometricBackground(double& triangleSize) const {
+    if (!currentPage) {
+        return false;
+    }
+    const PageType bgType = currentPage->getBackgroundType();
+    if (bgType.format != PageTypeFormat::IsoDotted && bgType.format != PageTypeFormat::IsoGraph) {
+        return false;
+    }
+    const BackgroundConfig config(bgType.config);
+    triangleSize = DEFAULT_RASTER_SIZE;
+    config.loadValue(CFG_RASTER, triangleSize);
+    return true;
+}
+
+double SnapToGridInputHandler::snapVertically(double y, bool alt) const {
+    if (alt != settings->isSnapGrid()) {
+        ensureOffsetsCached();
+        return Snapping::snapVertically(y, settings->getSnapGridSize(), settings->getSnapGridTolerance(),
+                                        cachedYOffset);
+    }
+    return y;
+}
+
+double SnapToGridInputHandler::snapHorizontally(double x, bool alt) const {
+    if (alt != settings->isSnapGrid()) {
+        ensureOffsetsCached();
+        return Snapping::snapHorizontally(x, settings->getSnapGridSize(), settings->getSnapGridTolerance(),
+                                          cachedXOffset);
+    }
+    return x;
+}
+
+Point SnapToGridInputHandler::snapToGrid(Point const& pos, bool alt) const {
+    if (alt == settings->isSnapGrid()) {
+        return pos;
+    }
+    ensureOffsetsCached();
+
+    double triangleSize;
+    if (isIsometricBackground(triangleSize)) {
+        const double xStep = std::sqrt(3.0) / 2.0 * triangleSize;
+        const double yStep = triangleSize / 2.0;
+        return Snapping::snapToGrid(pos, xStep, yStep, settings->getSnapGridTolerance(), cachedXOffset, cachedYOffset);
+    }
+
+    const double gridSize = settings->getSnapGridSize();
+    return Snapping::snapToGrid(pos, gridSize, gridSize, settings->getSnapGridTolerance(), cachedXOffset,
+                                cachedYOffset);
+}
+
+double SnapToGridInputHandler::snapAngle(double radian, bool alt) const {
+    if (alt != settings->isSnapRotation()) {
+        return Snapping::snapAngle(radian, settings->getSnapRotationTolerance());
+    }
+    return radian;
+}
+
+Point SnapToGridInputHandler::snapRotation(Point const& pos, Point const& center, bool alt) const {
+    if (alt != settings->isSnapRotation()) {
+        return Snapping::snapRotation(pos, center, settings->getSnapRotationTolerance());
+    }
+    return pos;
+}
+
+Point SnapToGridInputHandler::snap(Point const& pos, Point const& center, bool alt) const {
+    Point rotationSnappedPoint{snapRotation(pos, center, alt)};
+    return snapToGrid(rotationSnappedPoint, alt);
+}
diff --git a/entry/src/main/cpp/src/core/control/tools/SnapToGridInputHandler.h b/entry/src/main/cpp/src/core/control/tools/SnapToGridInputHandler.h
new file mode 100644
index 0000000..adf0faa
--- /dev/null
+++ b/entry/src/main/cpp/src/core/control/tools/SnapToGridInputHandler.h
@@ -0,0 +1,115 @@
+/*
+ * Xournal++
+ *
+ * Snapping methods which take account of the settings
+ *
+ * @author Xournal++ Team
+ * https://github.com/xournalpp/xournalpp
+ *
+ * @license GNU GPLv2 or later
+ */
+#pragma once
+
+#include "model/PageRef.h"  // for PageRef
+#include "model/Point.h"
+
+class BackgroundConfig;
+class Settings;
+
+class SnapToGridInputHandler final {
+
+public:
+    SnapToGridInputHandler(const Settings* settings);
+
+    /**
+     * @brief Updates the page context for grid offset calculations
+     * @param page the current page (used to get background configuration)
+     */
+    void setPageRef(PageRef page);
+
+protected:
+    const Settings* settings;
+    PageRef currentPage;
+
+    // Cached offsets (computed once per page)
+    mutable double cachedXOffset = 0.0;
+    mutable double cachedYOffset = 0.0;
+    mutable bool offsetsCached = false;
+
+    /**
+     * @brief Ensure cached offsets are computed and up-to-date
+     */
+    void ensureOffsetsCached() const;
+
+    /**
+     * @brief Calculate grid offsets from the current page's background configuration
+     * @param xOffset output parameter for horizontal grid offset
+     * @param yOffset output parameter for vertical grid offset
+     * @param pageWidth page width
+     * @param pageHeight page height
+     */
+    void calculateGridOffsets(double& xOffset, double& yOffset, double pageWidth, double pageHeight) const;
+
+    /**
+     * @brief Calculate offsets for isometric backgrounds
+     */
+    void calculateIsometricOffsets(const BackgroundConfig& config, double pageWidth, double pageHeight, double& xOffset,
+                                   double& yOffset) const;
+
+    /**
+     * @brief Check if current page has an isometric background
+     * @param triangleSize output parameter for triangle size (if isometric)
+     * @return true if current page has isometric background
+     */
+    bool isIsometricBackground(double& triangleSize) const;
+
+public:
+    /**
+     * @brief If a value is near enough to the y-coordinate of a grid point, it returns the nearest y-coordinate of the
+     * grid point. Otherwise the original value itself.
+     * @param y the value
+     * @param alt indicates whether snapping mode is altered (via the Alt key)
+     */
+    [[nodiscard]] double snapVertically(double y, bool alt) const;
+
+    /**
+     * @brief If a value is near enough to the x-coordinate of a grid point, it returns the nearest x-coordinate of the
+     * grid point. Otherwise the original value itself.
+     * @param x the value
+     * @param alt indicates whether snapping mode is altered (via the Alt key)
+     */
+    [[nodiscard]] double snapHorizontally(double x, bool alt) const;
+
+    /**
+     * @brief If a points distance to the nearest grid point is under a certain tolerance, it returns the nearest
+     * grid point. Otherwise the original Point itself.
+     * @param pos the position
+     * @param alt indicates whether snapping mode is altered (via the Alt key)
+     */
+    [[nodiscard]] Point snapToGrid(Point const& pos, bool alt) const;
+
+    /**
+     * @brief if the angles distance to a multiple quarter of PI is under a certain tolerance, it returns the latter.
+     * Otherwise the original angle.
+     * @param radian the angle (in radian)
+     * @param alt indicates whether snapping mode is altered (via the Alt key)
+     */
+    [[nodiscard]] double snapAngle(double radian, bool alt) const;
+
+    /**
+     * @brief Snaps the angle between the horizontal axis and the line between the given point and center
+     * and returns the point rotated accordingly
+     * @param pos the coordinate of the point
+     * @param center the center of rotation
+     * @param alt indicates whether snapping mode is altered (via the Alt key)
+     */
+    [[nodiscard]] Point snapRotation(Point const& pos, Point const& center, bool alt) const;
+
+    /**
+     * @brief Does rotation snapping followed by snapping to grid
+     * @param pos the coordinate of the point
+     * @param center the center of rotation
+     * @param alt indicates whether snapping mode is altered (via the Alt key)
+     */
+    [[nodiscard]] Point snap(Point const& pos, Point const& center, bool alt) const;
+};
diff --git a/entry/src/main/cpp/src/core/control/tools/SplineHandler.cpp b/entry/src/main/cpp/src/core/control/tools/SplineHandler.cpp
new file mode 100644
index 0000000..673e125
--- /dev/null
+++ b/entry/src/main/cpp/src/core/control/tools/SplineHandler.cpp
@@ -0,0 +1,406 @@
+#include "SplineHandler.h"
+
+#include <algorithm>  // for max, max_element
+#include <cmath>      // for pow, M_PI, cos, sin
+#include <cstddef>    // for size_t
+#include <list>       // for list, operator!=
+#include <memory>     // for allocator_traits<>...
+#include <optional>   // for optional
+#include <utility>    // for move
+
+#include <gdk/gdkkeysyms.h>  // for GDK_KEY_Escape
+
+#include "control/Control.h"                       // for Control
+#include "control/layer/LayerController.h"         // for LayerController
+#include "control/tools/InputHandler.h"            // for InputHandler
+#include "control/tools/SnapToGridInputHandler.h"  // for SnapToGridInputHan...
+#include "control/zoom/ZoomControl.h"
+#include "gui/XournalppCursor.h"                 // for XournalppCursor
+#include "gui/inputdevices/InputEvents.h"        // for KeyEvent
+#include "gui/inputdevices/PositionInputData.h"  // for PositionInputData
+#include "model/Document.h"                      // for Document
+#include "model/Layer.h"                         // for Layer
+#include "model/SplineSegment.h"                 // for SplineSegment
+#include "model/Stroke.h"                        // for Stroke
+#include "model/XojPage.h"                       // for XojPage
+#include "undo/InsertUndoAction.h"               // for InsertUndoAction
+#include "undo/UndoRedoHandler.h"                // for UndoRedoHandler
+#include "util/Assert.h"                         // for xoj_assert
+#include "util/DispatchPool.h"
+#include "view/overlays/SplineToolView.h"
+
+SplineHandler::SplineHandler(Control* control, const PageRef& page):
+        InputHandler(control, page),
+        snappingHandler(control->getSettings()),
+        viewPool(std::make_shared<xoj::util::DispatchPool<xoj::view::SplineToolView>>()) {
+    snappingHandler.setPageRef(page);
+    this->control->getZoomControl()->addZoomListener(this);
+    this->knotsAttractionRadius = KNOTS_ATTRACTION_RADIUS_IN_PIXELS / this->control->getZoomControl()->getZoom();
+}
+
+SplineHandler::~SplineHandler() { this->control->getZoomControl()->removeZoomListener(this); }
+
+std::unique_ptr<xoj::view::OverlayView> SplineHandler::createView(xoj::view::Repaintable* parent) const {
+    return std::make_unique<xoj::view::SplineToolView>(this, parent);
+}
+
+constexpr double SHIFT_AMOUNT = 1.0;
+constexpr double ROTATE_AMOUNT = 5.0;
+constexpr double SCALE_AMOUNT = 1.05;
+constexpr double MAX_TANGENT_LENGTH = 2000.0;
+constexpr double MIN_TANGENT_LENGTH = 1.0;
+
+auto SplineHandler::onKeyPressEvent(const KeyEvent& event) -> bool {
+    if (!stroke) {
+        return false;
+    }
+
+    xoj_assert(!this->knots.empty() && this->knots.size() == this->tangents.size());
+    Range rg = this->computeLastSegmentRepaintRange();
+
+    switch (event.keyval) {
+        case GDK_KEY_BackSpace: {
+            if (this->knots.size() == 1) {
+                return true;
+            }
+            this->deleteLastKnotWithTangent();
+            xoj_assert(!this->knots.empty() && this->knots.size() == this->tangents.size());
+            const Point& p = this->knots.back();
+            const Point& t = this->tangents.back();
+            rg.addPoint(p.x - t.x, p.y - t.y);  // Ensure the tangent vector gets its color updated
+            break;
+        }
+        case GDK_KEY_Right: {
+            this->movePoint(SHIFT_AMOUNT, 0);
+            rg = rg.unite(this->computeLastSegmentRepaintRange());
+            break;
+        }
+        case GDK_KEY_Left: {
+            this->movePoint(-SHIFT_AMOUNT, 0);
+            rg = rg.unite(this->computeLastSegmentRepaintRange());
+            break;
+        }
+        case GDK_KEY_Up: {
+            this->movePoint(0, -SHIFT_AMOUNT);
+            rg = rg.unite(this->computeLastSegmentRepaintRange());
+            break;
+        }
+        case GDK_KEY_Down: {
+            this->movePoint(0, SHIFT_AMOUNT);
+            rg = rg.unite(this->computeLastSegmentRepaintRange());
+            break;
+        }
+        case GDK_KEY_r:
+        case GDK_KEY_R: {  // r like "rotate"
+            double angle = (event.keyval == GDK_KEY_R) ? -ROTATE_AMOUNT : ROTATE_AMOUNT;
+            double xOld = this->tangents.back().x;
+            double yOld = this->tangents.back().y;
+            double xNew = cos(angle * M_PI / 180) * xOld + sin(angle * M_PI / 180) * yOld;
+            double yNew = -sin(angle * M_PI / 180) * xOld + cos(angle * M_PI / 180) * yOld;
+            this->modifyLastTangent(Point(xNew, yNew));
+            rg = rg.unite(this->computeLastSegmentRepaintRange());
+            break;
+        }
+        case GDK_KEY_s:
+        case GDK_KEY_S: {  // s like "scale"
+            double xOld = this->tangents.back().x;
+            double yOld = this->tangents.back().y;
+            double length = 2 * sqrt(pow(xOld, 2) + pow(yOld, 2));
+            double factor = 1;
+            if (event.keyval == GDK_KEY_S) {
+                if (length >= MIN_TANGENT_LENGTH) {
+                    factor = 1 / SCALE_AMOUNT;
+                }
+            } else if (length <= MAX_TANGENT_LENGTH) {
+                factor = SCALE_AMOUNT;
+            }
+            double xNew = xOld * factor;
+            double yNew = yOld * factor;
+            this->modifyLastTangent(Point(xNew, yNew));
+            rg = rg.unite(this->computeLastSegmentRepaintRange());
+            break;
+        }
+        default:
+            return false;
+    }
+
+    this->viewPool->dispatch(xoj::view::SplineToolView::FLAG_DIRTY_REGION, rg);
+    return true;
+}
+
+bool SplineHandler::onKeyReleaseEvent(const KeyEvent& event) {
+    if (event.keyval == GDK_KEY_Escape) {
+        this->finalizeSpline();
+        return true;
+    }
+    return false;
+}
+
+auto SplineHandler::onMotionNotifyEvent(const PositionInputData& pos, double zoom) -> bool {
+    if (!stroke) {
+        return false;
+    }
+
+    xoj_assert(!this->knots.empty() && this->knots.size() == this->tangents.size());
+
+    Range rg = this->computeLastSegmentRepaintRange();
+    if (this->isButtonPressed) {
+        if (this->inFirstKnotAttractionZone) {
+            // The button was pressed within the attraction zone. Wait for unpress to confirm/deny spline finalization
+            return true;
+        }
+        Point newTangent = Point(pos.x / zoom - this->currPoint.x, pos.y / zoom - this->currPoint.y);
+        if (validMotion(newTangent, this->tangents.back())) {
+            this->modifyLastTangent(newTangent);
+        }
+    } else {
+        this->buttonDownPoint = Point(pos.x / zoom, pos.y / zoom);
+        bool nowInAttractionZone =
+                this->buttonDownPoint.lineLengthTo(this->knots.front()) < this->knotsAttractionRadius;
+        if (nowInAttractionZone) {
+            if (this->inFirstKnotAttractionZone) {
+                // No need to update anything while staying in the attraction zone
+                return true;
+            }
+        } else {
+            this->currPoint = snappingHandler.snap(this->buttonDownPoint, knots.back(), pos.isAltDown());
+        }
+        this->inFirstKnotAttractionZone = nowInAttractionZone;
+    }
+    rg = rg.unite(this->computeLastSegmentRepaintRange());
+
+    this->viewPool->dispatch(xoj::view::SplineToolView::FLAG_DIRTY_REGION, rg);
+    return true;
+}
+
+void SplineHandler::onSequenceCancelEvent() {
+    //  Touch screen sequence changed from normal to swipe/zoom/scroll sequence
+    isButtonPressed = false;
+    if (!stroke) {
+        return;
+    }
+
+    if (this->knots.size() <= 1) {
+        this->clearTinySpline();
+    } else {
+        auto rg = this->computeLastSegmentRepaintRange();
+        this->deleteLastKnotWithTangent();
+        this->viewPool->dispatch(xoj::view::SplineToolView::FLAG_DIRTY_REGION, rg);
+    }
+}
+
+void SplineHandler::onButtonReleaseEvent(const PositionInputData& pos, double zoom) {
+    this->isButtonPressed = false;
+    if (this->inFirstKnotAttractionZone) {
+        // The click began in the first knot's attraction zone
+        // Finalize the spline if we still are in this zone, cancel the sequence otherwise
+        const Point p(pos.x / zoom, pos.y / zoom);
+        double dist = p.lineLengthTo(this->knots.front());
+        if (dist < this->knotsAttractionRadius) {
+            finalizeSpline();
+        } else {
+            this->inFirstKnotAttractionZone = false;
+            onSequenceCancelEvent();
+        }
+    }
+}
+
+void SplineHandler::onButtonPressEvent(const PositionInputData& pos, double zoom) {
+    this->isButtonPressed = true;
+
+    if (!stroke) {
+        // This should only happen right after the SplineHandler's creation, before any views got attached
+        xoj_assert(this->viewPool->empty());
+
+        stroke = createStroke(this->control);
+        xoj_assert(this->knots.empty() && this->tangents.empty());
+        this->buttonDownPoint = Point(pos.x / zoom, pos.y / zoom);
+        this->currPoint = snappingHandler.snapToGrid(this->buttonDownPoint, pos.isAltDown());
+        this->addKnot(this->currPoint);
+    } else {
+        xoj_assert(!this->knots.empty());
+        this->buttonDownPoint = Point(pos.x / zoom, pos.y / zoom);
+        this->currPoint = snappingHandler.snap(this->buttonDownPoint, knots.back(), pos.isAltDown());
+        double dist = this->buttonDownPoint.lineLengthTo(this->knots.front());
+        if (dist < this->knotsAttractionRadius) {  // now the spline is closed and finalized
+            this->addKnotWithTangent(this->knots.front(), this->tangents.front());
+            this->inFirstKnotAttractionZone = true;
+            auto rg = this->computeLastSegmentRepaintRange();
+            this->viewPool->dispatch(xoj::view::SplineToolView::FLAG_DIRTY_REGION, rg);
+        } else if (validMotion(currPoint, this->knots.back())) {
+            this->addKnot(this->currPoint);
+            auto rg = this->computeLastSegmentRepaintRange();
+            this->viewPool->dispatch(xoj::view::SplineToolView::FLAG_DIRTY_REGION, rg);
+        }
+    }
+}
+
+void SplineHandler::onButtonDoublePressEvent(const PositionInputData&, double) { finalizeSpline(); }
+
+void SplineHandler::movePoint(double dx, double dy) {
+    // move last non dynamically changing point
+    if (!this->knots.empty()) {
+        this->knots.back().x += dx;
+        this->knots.back().y += dy;
+    }
+}
+
+void SplineHandler::clearTinySpline() {
+    auto rg = this->computeLastSegmentRepaintRange();
+    // Clearing the knots ensures the view will not draw anything (thus the repainting will erase everything)
+    this->knots.clear();
+    this->tangents.clear();
+    this->stroke.reset();
+    // Repaints and deletes the views
+    this->viewPool->dispatchAndClear(xoj::view::SplineToolView::FINALIZATION_REQUEST, rg);
+}
+
+void SplineHandler::finalizeSpline() {
+    xoj_assert(this->stroke);
+
+    auto optData = getData();
+    xoj_assert(optData);
+    auto& data = optData.value();
+
+    if (data.knots.size() < 2) {  // This is not a valid spline
+        clearTinySpline();
+        return;
+    }
+
+    stroke->setPointVector(linearizeSpline(data));
+    stroke->freeUnusedPointItems();
+
+    Layer* layer = page->getSelectedLayer();
+
+    UndoRedoHandler* undo = control->getUndoRedoHandler();
+    undo->addUndoAction(std::make_unique<InsertUndoAction>(page, layer, stroke.get()));
+
+    auto ptr = stroke.get();
+    Document* doc = control->getDocument();
+    doc->lock();
+    layer->addElement(std::move(stroke));
+    doc->unlock();
+    auto rg = this->computeTotalRepaintRange(data, ptr->getWidth());
+    this->viewPool->dispatchAndClear(xoj::view::SplineToolView::FINALIZATION_REQUEST, rg);
+
+    // Wait until this finishes before releasing `stroke`, so that PageView::elementChanged does not needlessly rerender
+    // the stroke
+    this->page->fireElementChanged(ptr);
+
+    control->getCursor()->updateCursor();
+}
+
+void SplineHandler::zoomChanged() {
+    this->knotsAttractionRadius = KNOTS_ATTRACTION_RADIUS_IN_PIXELS / this->control->getZoomControl()->getZoom();
+}
+
+void SplineHandler::addKnot(const Point& p) { addKnotWithTangent(p, Point(0, 0)); }
+
+void SplineHandler::addKnotWithTangent(const Point& p, const Point& t) {
+    this->knots.push_back(p);
+    this->tangents.push_back(t);
+}
+
+void SplineHandler::modifyLastTangent(const Point& t) {
+    xoj_assert(!this->tangents.empty());
+    this->tangents.back() = t;
+}
+
+void SplineHandler::deleteLastKnotWithTangent() {
+    xoj_assert(this->knots.size() > 1 && this->knots.size() == this->tangents.size());
+    this->knots.pop_back();
+    this->tangents.pop_back();
+}
+
+auto SplineHandler::computeTotalRepaintRange(const Data& data, double strokeWidth) const -> Range {
+    std::vector<double> xCoords = {};
+    std::vector<double> yCoords = {};
+    for (auto p: data.knots) {
+        xCoords.push_back(p.x);
+        yCoords.push_back(p.y);
+    }
+    for (size_t i = 0; i < data.knots.size(); i++) {
+        xCoords.push_back(data.knots[i].x + data.tangents[i].x);
+        xCoords.push_back(data.knots[i].x - data.tangents[i].x);
+        yCoords.push_back(data.knots[i].y + data.tangents[i].y);
+        yCoords.push_back(data.knots[i].y - data.tangents[i].y);
+    }
+    xCoords.push_back(data.currPoint.x);
+    yCoords.push_back(data.currPoint.y);
+
+    double minX = *std::min_element(xCoords.begin(), xCoords.end());
+    double maxX = *std::max_element(xCoords.begin(), xCoords.end());
+    double minY = *std::min_element(yCoords.begin(), yCoords.end());
+    double maxY = *std::max_element(yCoords.begin(), yCoords.end());
+
+    Range rg(minX, minY, maxX, maxY);
+    rg.addPadding(std::max(data.knotsAttractionRadius, strokeWidth));  // Circles around the knots and the spline width
+    return rg;
+}
+
+Range SplineHandler::computeLastSegmentRepaintRange() const {
+    xoj_assert(!this->knots.empty() && this->knots.size() == this->tangents.size());
+
+    Range rg(this->currPoint.x, this->currPoint.y);
+    const Point& p = this->knots.back();
+    const Point& t = this->tangents.back();
+    rg.addPoint(p.x + t.x, p.y + t.y);
+    rg.addPoint(p.x - t.x, p.y - t.y);
+    if (auto n = this->knots.size(); n > 1) {
+        const Point& q = this->knots[n - 2];
+        const Point& s = this->tangents[n - 2];
+        rg.addPoint(q.x + s.x, q.y + s.y);
+        rg.addPoint(q.x, q.y);  // Enough for the last segment.
+    }
+
+    // Ensure the range contains the spline (with its width) and the knots' circles
+    rg.addPadding(std::max(this->knotsAttractionRadius, this->stroke->getWidth()));
+
+    if (const Point& q = this->knots.front(); this->inFirstKnotAttractionZone) {
+        // Make sure the range contains the last spline segment in case the spline is closed.
+        // The last segment has a width fixed in pixels. The appropriate padding to account for this width will be added
+        // on the View side.
+        const double r = this->knotsAttractionRadius;
+        rg = rg.unite(Range(q.x - r, q.y - r, q.x + r, q.y + r));
+        const Point& s = this->tangents.front();
+        rg.addPoint(q.x - s.x, q.y - s.y);
+    } else if (this->stroke->getFill() != -1) {
+        // If the stroke is filled, we need to update the filling as well. Changes in the filling happen in the convex
+        // hull of the last segment and the first knot, so adding the first knot to the range is enough at this point.
+        rg.addPoint(q.x, q.y);
+    }
+    return rg;
+}
+
+auto SplineHandler::getViewPool() const -> const std::shared_ptr<xoj::util::DispatchPool<xoj::view::SplineToolView>>& {
+    return viewPool;
+}
+
+auto SplineHandler::getData() const -> std::optional<Data> {
+    if (this->knots.empty()) {
+        return std::nullopt;
+    }
+    return Data{this->knots, this->tangents, this->currPoint, this->knotsAttractionRadius,
+                this->inFirstKnotAttractionZone};
+}
+
+auto SplineHandler::linearizeSpline(const SplineHandler::Data& data) -> std::vector<Point> {
+    xoj_assert(!data.knots.empty() && data.knots.size() == data.tangents.size());
+
+    std::vector<Point> result;
+
+    auto itKnot1 = data.knots.begin();
+    auto itKnot2 = std::next(itKnot1);
+    auto itTgt1 = data.tangents.begin();
+    auto itTgt2 = std::next(itTgt1);
+    auto end = data.knots.end();
+    for (; itKnot2 != end; ++itKnot1, ++itKnot2, ++itTgt1, ++itTgt2) {
+        SplineSegment seg(*itKnot1, Point(itKnot1->x + itTgt1->x, itKnot1->y + itTgt1->y),
+                          Point(itKnot2->x - itTgt2->x, itKnot2->y - itTgt2->y), *itKnot2);
+        auto pts = seg.toPointSequence();
+        std::move(pts.begin(), pts.end(), std::back_inserter(result));
+    }
+    result.emplace_back(data.knots.back());
+
+    return result;
+}
diff --git a/entry/src/main/cpp/src/core/control/tools/SplineHandler.h b/entry/src/main/cpp/src/core/control/tools/SplineHandler.h
new file mode 100644
index 0000000..108c98e
--- /dev/null
+++ b/entry/src/main/cpp/src/core/control/tools/SplineHandler.h
@@ -0,0 +1,129 @@
+/*
+ * Xournal++
+ *
+ * Handles input to draw a spline consisting of linear and cubic spline segments
+ *
+ * @author Xournal++ Team
+ * https://github.com/xournalpp/xournalpp
+ *
+ * @license GNU GPLv2 or later
+ */
+
+#pragma once
+
+#include <memory>    // for unique_ptr
+#include <optional>  // for optional
+#include <vector>    // for vector
+
+#include <gdk/gdk.h>  // for GdkEventKey
+
+#include "control/zoom/ZoomListener.h"
+#include "model/PageRef.h"   // for PageRef
+#include "model/Point.h"     // for Point
+#include "util/Range.h"      // for Range
+
+#include "InputHandler.h"            // for InputHandler
+#include "SnapToGridInputHandler.h"  // for SnapToGridInputHandler
+
+class PositionInputData;
+class Control;
+
+namespace xoj::util {
+template <class T>
+class DispatchPool;
+};
+
+namespace xoj::view {
+class OverlayView;
+class Repaintable;
+class SplineToolView;
+};  // namespace xoj::view
+
+/**
+ * @brief Helper structure for communication with the views
+ */
+struct SplineHandlerData {
+    const std::vector<Point>& knots;
+    const std::vector<Point>& tangents;
+    const Point& currPoint;
+    double knotsAttractionRadius;
+    bool closedSpline;
+};
+
+/**
+ * @brief A class to handle splines
+ *
+ * Drawing of a spline is started by a ButtonPressEvent. Every ButtonPressEvent gives a new knot.
+ * Click-dragging will set the tangents. After a ButtonReleaseEvent the spline segment is dynamically
+ * drawn and finished after the next ButtonPressEvent.
+ * The spline is completed through a ButtonDoublePressEvent, the escape key or a
+ * ButtonPressEvent near the first knot. The latter event closes the spline.
+ *
+ * Splines segments can be linear or cubic (as in Inkscape). Where there is a nontrivial tangent,
+ * the join is smooth.
+ * The last knot and tangent can be modified using the keyboard.
+ */
+
+class SplineHandler: public InputHandler, public ZoomListener {
+public:
+    SplineHandler(Control* control, const PageRef& page);
+    ~SplineHandler() override;
+
+    std::unique_ptr<xoj::view::OverlayView> createView(xoj::view::Repaintable* parent) const override;
+
+    void onSequenceCancelEvent() override;
+    bool onMotionNotifyEvent(const PositionInputData& pos, double zoom) override;
+    void onButtonReleaseEvent(const PositionInputData& pos, double zoom) override;
+    void onButtonPressEvent(const PositionInputData& pos, double zoom) override;
+    void onButtonDoublePressEvent(const PositionInputData& pos, double zoom) override;
+    bool onKeyPressEvent(const KeyEvent& event) override;
+    bool onKeyReleaseEvent(const KeyEvent& event) override;
+
+    void finalizeSpline();
+
+    // ZoomListener interface
+    void zoomChanged() override;
+
+public:
+    const std::shared_ptr<xoj::util::DispatchPool<xoj::view::SplineToolView>>& getViewPool() const;
+
+    using Data = SplineHandlerData;
+    std::optional<Data> getData() const;
+
+    static auto linearizeSpline(const Data& data) -> std::vector<Point>;
+
+    Range computeTotalRepaintRange(const Data& data, double strokeWidth) const;
+
+    Range computeLastSegmentRepaintRange() const;
+
+private:
+    void addKnot(const Point& p);
+    void addKnotWithTangent(const Point& p, const Point& t);
+    void modifyLastTangent(const Point& t);
+    void deleteLastKnotWithTangent();
+    void movePoint(double dx, double dy);
+
+    /**
+     * @brief Clears out the spline and remove the views. Assumes the spline has at most 1 definitive knot
+     */
+    void clearTinySpline();
+
+private:
+    std::vector<Point> knots{};
+    std::vector<Point> tangents{};
+    Point currPoint;
+    Point buttonDownPoint;  // never snapped to grid
+    /**
+     * @brief Radius of the knots attractive radius for closing the spline.
+     *      Depends on the zoom level during input events
+     */
+    double knotsAttractionRadius;
+
+    bool isButtonPressed = false;
+    bool inFirstKnotAttractionZone = false;
+    SnapToGridInputHandler snappingHandler;
+
+    std::shared_ptr<xoj::util::DispatchPool<xoj::view::SplineToolView>> viewPool;
+
+    static constexpr double KNOTS_ATTRACTION_RADIUS_IN_PIXELS = 10.0;  // for circling the spline's knots
+};
diff --git a/entry/src/main/cpp/src/core/control/tools/StrokeHandler.cpp b/entry/src/main/cpp/src/core/control/tools/StrokeHandler.cpp
new file mode 100644
index 0000000..d84b1ca
--- /dev/null
+++ b/entry/src/main/cpp/src/core/control/tools/StrokeHandler.cpp
@@ -0,0 +1,301 @@
+#include "StrokeHandler.h"
+
+#include <algorithm>  // for max, min
+#include <cmath>      // for ceil, pow, abs
+#include <limits>     // for numeric_limits
+#include <memory>     // for unique_ptr, mak...
+#include <utility>    // for move
+#include <vector>     // for vector
+
+#include <gdk/gdk.h>  // for GdkEventKey
+
+#include "control/Control.h"                                // for Control
+#include "control/ToolEnums.h"                              // for DRAWING_TYPE_ST...
+#include "control/ToolHandler.h"                            // for ToolHandler
+#include "control/layer/LayerController.h"                  // for LayerController
+#include "control/settings/Settings.h"                      // for Settings
+#include "control/settings/SettingsEnums.h"                 // for EmptyLastPageAppendType
+#include "control/shaperecognizer/ShapeRecognizer.h"        // for ShapeRecognizer
+#include "control/tools/InputHandler.h"                     // for InputHandler::P...
+#include "control/tools/SnapToGridInputHandler.h"           // for SnapToGridInput...
+#include "gui/inputdevices/PositionInputData.h"             // for PositionInputData
+#include "model/Document.h"                                 // for Document
+#include "model/Element.h"
+#include "model/Layer.h"                                    // for Layer
+#include "model/LineStyle.h"                                // for LineStyle
+#include "model/Stroke.h"                                   // for Stroke, STROKE_...
+#include "model/XojPage.h"                                  // for XojPage
+#include "undo/InsertUndoAction.h"                          // for InsertUndoAction
+#include "undo/RecognizerUndoAction.h"                      // for RecognizerUndoA...
+#include "undo/UndoRedoHandler.h"                           // for UndoRedoHandler
+#include "util/Assert.h"                                    // for xoj_assert
+#include "util/DispatchPool.h"                              // for DispatchPool
+#include "util/Range.h"                                     // for Range
+#include "util/Rectangle.h"                                 // for Rectangle, util
+#include "view/overlays/StrokeToolFilledHighlighterView.h"  // for StrokeToolFilledHighlighterView
+#include "view/overlays/StrokeToolFilledView.h"             // for StrokeToolFilledView
+#include "view/overlays/StrokeToolView.h"                   // for StrokeToolView
+
+#include "StrokeStabilizer.h"  // for Base, get
+
+using xoj::util::Rectangle;
+
+StrokeHandler::StrokeHandler(Control* control, const PageRef& page):
+        InputHandler(control, page),
+        snappingHandler(control->getSettings()),
+        stabilizer(StrokeStabilizer::get(control->getSettings())),
+        viewPool(std::make_shared<xoj::util::DispatchPool<xoj::view::StrokeToolView>>()) {
+    snappingHandler.setPageRef(page);
+}
+
+StrokeHandler::~StrokeHandler() = default;
+
+auto StrokeHandler::onKeyPressEvent(const KeyEvent&) -> bool { return false; }
+auto StrokeHandler::onKeyReleaseEvent(const KeyEvent&) -> bool { return false; }
+
+auto StrokeHandler::onMotionNotifyEvent(const PositionInputData& pos, double zoom) -> bool {
+    if (!stroke) {
+        return false;
+    }
+
+    if (pos.pressure == 0) {
+        /**
+         * Some devices emit a move event with pressure 0 when lifting the stylus tip
+         * Ignore those events
+         */
+        return true;
+    }
+
+    stabilizer->processEvent(pos);
+    return true;
+}
+
+void StrokeHandler::paintTo(Point point) {
+    if (this->hasPressure && point.z > 0.0) {
+        point.z *= this->stroke->getWidth();
+    }
+
+    size_t pointCount = stroke->getPointCount();
+
+    if (pointCount > 0) {
+        Point endPoint = stroke->getPoint(pointCount - 1);
+        double distance = point.lineLengthTo(endPoint);
+        if (distance < PIXEL_MOTION_THRESHOLD) {  //(!validMotion(point, endPoint)) {
+            if (pointCount == 1 && this->hasPressure && endPoint.z < point.z) {
+                // Record the possible increase in pressure for the first point
+                this->stroke->setLastPressure(point.z);
+                this->viewPool->dispatch(xoj::view::StrokeToolView::THICKEN_FIRST_POINT_REQUEST, point.z);
+            }
+            return;
+        }
+        if (this->hasPressure) {
+            /**
+             * Both device and tool are pressure sensitive
+             */
+            if (const double widthDelta = point.z - endPoint.z;
+                - widthDelta > MAX_WIDTH_VARIATION || widthDelta > MAX_WIDTH_VARIATION) {
+                /**
+                 * If the width variation is to big, decompose into shorter segments.
+                 * Those segments can not be shorter than PIXEL_MOTION_THRESHOLD
+                 */
+                double nbSteps = std::min(std::ceil(std::abs(widthDelta) / MAX_WIDTH_VARIATION),
+                                          std::floor(distance / PIXEL_MOTION_THRESHOLD));
+                double stepLength = 1.0 / nbSteps;
+                Point increment((point.x - endPoint.x) * stepLength, (point.y - endPoint.y) * stepLength,
+                                widthDelta * stepLength);
+                endPoint.z += increment.z;
+
+                for (int i = 1; i < static_cast<int>(nbSteps); i++) {  // The last step is done below
+                    endPoint.x += increment.x;
+                    endPoint.y += increment.y;
+                    endPoint.z += increment.z;
+                    drawSegmentTo(endPoint);
+                }
+            }
+        }
+    }
+    drawSegmentTo(point);
+}
+
+void StrokeHandler::drawSegmentTo(const Point& point) {
+
+    this->stroke->addPoint(this->hasPressure ? point : Point(point.x, point.y));
+    this->viewPool->dispatch(xoj::view::StrokeToolView::ADD_POINT_REQUEST, this->stroke->getPointVector().back());
+    return;
+}
+
+void StrokeHandler::onSequenceCancelEvent() {
+    if (this->stroke) {
+        this->viewPool->dispatchAndClear(xoj::view::StrokeToolView::CANCELLATION_REQUEST,
+                                         Range(this->stroke->boundingRect()));
+        stroke.reset();
+    }
+}
+
+void StrokeHandler::finalizeStroke(double pressure) {
+    if (!stroke) {
+        return;
+    }
+
+    /**
+     * The stabilizer may have added a gap between the end of the stroke and the input device
+     * Fill this gap.
+     */
+    stabilizer->finalizeStroke();
+
+    // Backward compatibility and also easier to handle for me;-)
+    // I cannot draw a line with one point, to draw a visible line I need two points,
+    // twice the same Point is also OK
+    if (auto const& pv = stroke->getPointVector(); pv.size() == 1) {
+        const Point pt = pv.front();  // Make a copy, otherwise stroke->addPoint(pt); in UB
+        if (this->hasPressure) {
+            // Pressure inference provides a pressure value to the last event. Most devices set this value to 0.
+            const double newPressure = std::max(pt.z, pressure * this->stroke->getWidth());
+            this->stroke->setLastPressure(newPressure);
+            this->viewPool->dispatch(xoj::view::StrokeToolView::THICKEN_FIRST_POINT_REQUEST, newPressure);
+        }
+        stroke->addPoint(pt);
+    }
+
+    stroke->freeUnusedPointItems();
+}
+
+void StrokeHandler::onButtonReleaseEvent(const PositionInputData& pos, double zoom) {
+    if (!stroke) {
+        return;
+    }
+    finalizeStroke(pos.pressure);
+
+    Layer* layer = page->getSelectedLayer();
+
+    UndoRedoHandler* undo = control->getUndoRedoHandler();
+    undo->addUndoAction(std::make_unique<InsertUndoAction>(page, layer, stroke.get()));
+
+    Settings* settings = control->getSettings();
+    if (settings->getEmptyLastPageAppend() == EmptyLastPageAppendType::OnDrawOfLastPage) {
+        auto* doc = control->getDocument();
+        doc->lock_shared();
+        auto pdfPageCount = doc->getPdfPageCount();
+        auto lastPage = doc->getPageCount() - 1;
+        doc->unlock_shared();
+        if (pdfPageCount == 0) {
+            auto currentPage = control->getCurrentPageNo();
+            if (currentPage == lastPage) {
+                control->insertNewPage(currentPage + 1, true);
+            }
+        }
+    }
+
+    ToolHandler* h = control->getToolHandler();
+    if (h->getDrawingType() == DRAWING_TYPE_SHAPE_RECOGNIZER) {
+        ShapeRecognizer reco;
+
+        auto recognized = reco.recognizePatterns(stroke.get(), control->getSettings()->getStrokeRecognizerMinSize());
+
+        if (recognized) {
+            // strokeRecognizerDetected handles the repainting and the deletion of the views.
+            strokeRecognizerDetected(std::move(recognized), layer);
+            return;
+        }
+    }
+
+    auto ptr = stroke.get();
+    Document* doc = control->getDocument();
+    doc->lock();
+    layer->addElement(std::move(stroke));
+    doc->unlock();
+
+    // Blitt the stroke to the page's buffer and delete all views.
+    // Passing the empty Range() as no actual redrawing is necessary at this point
+    this->viewPool->dispatchAndClear(xoj::view::StrokeToolView::FINALIZATION_REQUEST, Range());
+
+    page->fireElementChanged(ptr);
+}
+
+void StrokeHandler::strokeRecognizerDetected(std::unique_ptr<Stroke> recognized, Layer* layer) {
+    recognized->setWidth(stroke->hasPressure() ? stroke->getAvgPressure() : stroke->getWidth());
+
+    // snapping
+    if (control->getSettings()->getSnapRecognizedShapesEnabled()) {
+        Rectangle<double> oldSnappedBounds = recognized->getSnappedBounds();
+        Point topLeft = Point(oldSnappedBounds.x, oldSnappedBounds.y);
+        Point topLeftSnapped = snappingHandler.snapToGrid(topLeft, false);
+
+        recognized->move(topLeftSnapped.x - topLeft.x, topLeftSnapped.y - topLeft.y);
+        Rectangle<double> snappedBounds = recognized->getSnappedBounds();
+        Point belowRight = Point(snappedBounds.x + snappedBounds.width, snappedBounds.y + snappedBounds.height);
+        Point belowRightSnapped = snappingHandler.snapToGrid(belowRight, false);
+
+        double fx = (std::abs(snappedBounds.width) > std::numeric_limits<double>::epsilon()) ?
+                            (belowRightSnapped.x - topLeftSnapped.x) / snappedBounds.width :
+                            1;
+        double fy = (std::abs(snappedBounds.height) > std::numeric_limits<double>::epsilon()) ?
+                            (belowRightSnapped.y - topLeftSnapped.y) / snappedBounds.height :
+                            1;
+        recognized->scale(topLeftSnapped.x, topLeftSnapped.y, fx, fy, 0, false);
+    }
+
+    UndoRedoHandler* undo = control->getUndoRedoHandler();
+    auto recognizedPtr = recognized.get();
+    auto strokePtr = stroke.get();
+    undo->addUndoAction(std::make_unique<RecognizerUndoAction>(page, layer, std::move(stroke), recognizedPtr));
+
+    Document* doc = control->getDocument();
+    doc->lock();
+    layer->addElement(std::move(recognized));
+    doc->unlock();
+
+    Range range(recognizedPtr->getX(), recognizedPtr->getY());
+    range.addPoint(recognizedPtr->getX() + recognizedPtr->getElementWidth(),
+                   recognizedPtr->getY() + recognizedPtr->getElementHeight());
+
+    range.addPoint(strokePtr->getX(), strokePtr->getY());
+    range.addPoint(strokePtr->getX() + strokePtr->getElementWidth(), strokePtr->getY() + strokePtr->getElementHeight());
+
+    this->viewPool->dispatch(xoj::view::StrokeToolView::STROKE_REPLACEMENT_REQUEST, *recognizedPtr);
+
+    // Blitt the new stroke to the page's buffer, delete all the views and refresh the area (so the recognized stroke
+    // gets displayed instead of the old one).
+    this->viewPool->dispatchAndClear(xoj::view::StrokeToolView::FINALIZATION_REQUEST, range);
+    page->fireElementChanged(recognizedPtr);
+}
+
+void StrokeHandler::onButtonPressEvent(const PositionInputData& pos, double zoom) {
+    xoj_assert(!stroke);
+
+    this->buttonDownPoint.x = pos.x / zoom;
+    this->buttonDownPoint.y = pos.y / zoom;
+
+    stroke = createStroke(this->control);
+
+    this->hasPressure = this->stroke->getToolType().isPressureSensitive() && pos.pressure != Point::NO_PRESSURE;
+
+    const double width = this->hasPressure ? pos.pressure * stroke->getWidth() : Point::NO_PRESSURE;
+    stroke->addPoint(Point(this->buttonDownPoint.x, this->buttonDownPoint.y, width));
+
+    stabilizer->initialize(this, zoom, pos);
+}
+
+void StrokeHandler::onButtonDoublePressEvent(const PositionInputData&, double) {
+    // nothing to do
+}
+
+auto StrokeHandler::createView(xoj::view::Repaintable* parent) const -> std::unique_ptr<xoj::view::OverlayView> {
+    xoj_assert(this->stroke);
+    const Stroke& s = *this->stroke;
+    if (s.getFill() != -1) {
+        if (s.getToolType() == StrokeTool::HIGHLIGHTER) {
+            // Filled highlighter requires to wipe the mask entirely at every iteration
+            // It has a dedicated view class.
+            return std::make_unique<xoj::view::StrokeToolFilledHighlighterView>(this, s, parent);
+        } else {
+            return std::make_unique<xoj::view::StrokeToolFilledView>(this, s, parent);
+        }
+    } else {
+        return std::make_unique<xoj::view::StrokeToolView>(this, s, parent);
+    }
+}
+
+auto StrokeHandler::getViewPool() const -> const std::shared_ptr<xoj::util::DispatchPool<xoj::view::StrokeToolView>>& {
+    return viewPool;
+}
diff --git a/entry/src/main/cpp/src/core/control/tools/StrokeHandler.h b/entry/src/main/cpp/src/core/control/tools/StrokeHandler.h
new file mode 100644
index 0000000..011437c
--- /dev/null
+++ b/entry/src/main/cpp/src/core/control/tools/StrokeHandler.h
@@ -0,0 +1,108 @@
+/*
+ * Xournal++
+ *
+ * Handles input of strokes
+ *
+ * @author Xournal++ Team
+ * https://github.com/xournalpp/xournalpp
+ *
+ * @license GNU GPLv2 or later
+ */
+
+#pragma once
+
+#include <memory>  // for unique_ptr
+
+#include <gdk/gdk.h>  // for GdkEventKey
+
+#include "model/PageRef.h"  // for PageRef
+#include "model/Point.h"    // for Point
+
+#include "InputHandler.h"            // for InputHandler
+#include "SnapToGridInputHandler.h"  // for SnapToGridInputHandler
+
+class Control;
+class Layer;
+class PositionInputData;
+class Stroke;
+
+namespace xoj::util {
+template <class T>
+class DispatchPool;
+};
+
+namespace xoj::view {
+class OverlayView;
+class Repaintable;
+class StrokeToolView;
+};  // namespace xoj::view
+
+namespace StrokeStabilizer {
+class Base;
+class Active;
+}  // namespace StrokeStabilizer
+
+/**
+ * @brief The stroke handler draws a stroke on a XojPageView
+ *
+ * The stroke is drawn using a cairo_surface_t* as a mask:
+ * As the pointer moves on the canvas single segments are
+ * drawn opaquely on the initially transparent masking
+ * surface. The surface is used to mask the stroke
+ * when drawing it to the XojPageView
+ */
+class StrokeHandler: public InputHandler {
+public:
+    StrokeHandler(Control* control, const PageRef& page);
+    ~StrokeHandler() override;
+
+    void onSequenceCancelEvent() override;
+    bool onMotionNotifyEvent(const PositionInputData& pos, double zoom) override;
+    void onButtonReleaseEvent(const PositionInputData& pos, double zoom) override;
+    void onButtonPressEvent(const PositionInputData& pos, double zoom) override;
+    void onButtonDoublePressEvent(const PositionInputData& pos, double zoom) override;
+    bool onKeyPressEvent(const KeyEvent& event) override;
+    bool onKeyReleaseEvent(const KeyEvent& event) override;
+
+    /**
+     * @brief Add a straight line to the stroke (if the movement is valid).
+     * The line may be subdivided into smaller segments if the pressure variation is too big.
+     * @param point The endpoint of the added line
+     */
+    void paintTo(Point point);
+
+    auto createView(xoj::view::Repaintable* parent) const -> std::unique_ptr<xoj::view::OverlayView> override;
+
+    const std::shared_ptr<xoj::util::DispatchPool<xoj::view::StrokeToolView>>& getViewPool() const;
+
+protected:
+    /**
+     * @brief Unconditionally add a segment to the stroke.
+     * Warning: it does not set the width properly nor test if the motion is valid. Use paintTo instead.
+     * @param point The endpoint of the added segment
+     */
+    void drawSegmentTo(const Point& point);
+
+    void strokeRecognizerDetected(std::unique_ptr<Stroke> recognized, Layer* layer);
+
+    /// Finalizes the stroke using the provided pressure as last point
+    void finalizeStroke(double pressure);
+
+protected:
+    Point buttonDownPoint;  // used for tapSelect and filtering - never snapped to grid.
+    SnapToGridInputHandler snappingHandler;
+
+    bool hasPressure;
+
+private:
+    /**
+     * @brief Pointer to the Stabilizer instance
+     */
+    std::unique_ptr<StrokeStabilizer::Base> stabilizer;
+
+    std::shared_ptr<xoj::util::DispatchPool<xoj::view::StrokeToolView>> viewPool;
+
+    friend class StrokeStabilizer::Active;
+
+    static constexpr double MAX_WIDTH_VARIATION = 0.3;
+};
diff --git a/entry/src/main/cpp/src/core/control/tools/StrokeStabilizer.cpp b/entry/src/main/cpp/src/core/control/tools/StrokeStabilizer.cpp
new file mode 100644
index 0000000..e4da2f1
--- /dev/null
+++ b/entry/src/main/cpp/src/core/control/tools/StrokeStabilizer.cpp
@@ -0,0 +1,405 @@
+#include "StrokeStabilizer.h"
+
+#include <algorithm>  // for min
+#include <cmath>      // for hypot, sqrt, abs, exp
+#include <iterator>   // for begin, end
+#include <limits>     // for numeric_limits
+#include <list>       // for list, operator!=
+#include <numeric>    // for accumulate
+#include <vector>     // for vector
+
+#include "control/settings/Settings.h"           // for Settings
+#include "control/tools/StrokeStabilizerEnum.h"  // for Preprocessor, Averag...
+#include "model/SplineSegment.h"                 // for SplineSegment
+#include "model/Stroke.h"                        // for Stroke
+
+/**
+ * StrokeStabilizer::get
+ */
+auto StrokeStabilizer::get(Settings* settings) -> std::unique_ptr<StrokeStabilizer::Base> {
+
+    AveragingMethod averagingMethod = settings->getStabilizerAveragingMethod();
+    Preprocessor preprocessor = settings->getStabilizerPreprocessor();
+
+    if (averagingMethod == AveragingMethod::ARITHMETIC) {
+        if (preprocessor == Preprocessor::DEADZONE) {
+            return std::make_unique<StrokeStabilizer::ArithmeticDeadzone>(
+                    settings->getStabilizerFinalizeStroke(), settings->getStabilizerBuffersize(),
+                    settings->getStabilizerDeadzoneRadius(), settings->getStabilizerCuspDetection());
+        }
+
+        if (preprocessor == Preprocessor::INERTIA) {
+            return std::make_unique<StrokeStabilizer::ArithmeticInertia>(
+                    settings->getStabilizerFinalizeStroke(), settings->getStabilizerBuffersize(),
+                    settings->getStabilizerDrag(), settings->getStabilizerMass());
+        }
+
+        return std::make_unique<StrokeStabilizer::Arithmetic>(settings->getStabilizerFinalizeStroke(),
+                                                              settings->getStabilizerBuffersize());
+    }
+
+    if (averagingMethod == AveragingMethod::VELOCITY_GAUSSIAN) {
+        if (preprocessor == Preprocessor::DEADZONE) {
+            return std::make_unique<StrokeStabilizer::VelocityGaussianDeadzone>(
+                    settings->getStabilizerFinalizeStroke(), settings->getStabilizerSigma(),
+                    settings->getStabilizerDeadzoneRadius(), settings->getStabilizerCuspDetection());
+        }
+
+        if (preprocessor == Preprocessor::INERTIA) {
+            return std::make_unique<StrokeStabilizer::VelocityGaussianInertia>(
+                    settings->getStabilizerFinalizeStroke(), settings->getStabilizerSigma(),
+                    settings->getStabilizerDrag(), settings->getStabilizerMass());
+        }
+
+        return std::make_unique<StrokeStabilizer::VelocityGaussian>(settings->getStabilizerFinalizeStroke(),
+                                                                    settings->getStabilizerSigma());
+    }
+
+    if (preprocessor == Preprocessor::DEADZONE) {
+        return std::make_unique<StrokeStabilizer::Deadzone>(settings->getStabilizerFinalizeStroke(),
+                                                            settings->getStabilizerDeadzoneRadius(),
+                                                            settings->getStabilizerCuspDetection());
+    }
+
+    if (preprocessor == Preprocessor::INERTIA) {
+        return std::make_unique<StrokeStabilizer::Inertia>(
+                settings->getStabilizerFinalizeStroke(), settings->getStabilizerDrag(), settings->getStabilizerMass());
+    }
+
+    /**
+     * Defaults to no stabilization
+     */
+    return std::make_unique<StrokeStabilizer::Base>();
+}
+
+/**
+ * StrokeStabilizer::Active
+ */
+void StrokeStabilizer::Active::finalizeStroke() {
+    if (finalize) {
+        rebalanceStrokePressures();
+        Event ev = getLastEvent();
+        quadraticSplineTo(ev);
+    }
+}
+
+void StrokeStabilizer::Active::quadraticSplineTo(const Event& ev) {
+    /**
+     * Using the last two points of the stroke, draw a spline quadratic segment to the coordinates of ev.
+     */
+    Stroke* stroke = strokeHandler->getStroke();
+    size_t pointCount = stroke->getPointCount();
+    if (pointCount <= 0) {
+        return;
+    }
+
+    if (pointCount == 1) {
+        /**
+         * Draw a line segment
+         */
+        drawEvent(ev);
+        return;
+    }
+
+    /**
+     * Draw a quadratic spline segment, with first tangent vector parallel to AB
+     */
+    Point B = stroke->getPoint(pointCount - 1);
+    const Point A = stroke->getPoint(pointCount - 2);
+
+    const bool usePressure = ev.pressure != Point::NO_PRESSURE && stroke->getToolType().isPressureSensitive();
+    const Point C(ev.x / zoom, ev.y / zoom, usePressure ? ev.pressure * stroke->getWidth() : Point::NO_PRESSURE);
+
+    MathVect2 vAB(A, B);
+    MathVect2 vBC(B, C);
+    const double squaredNormBC = vBC.dx * vBC.dx + vBC.dy * vBC.dy;
+    const double normBC = std::sqrt(squaredNormBC);
+    const double normAB = vAB.norm();
+
+    if (normBC < std::numeric_limits<double>::epsilon()) {
+        return;
+    }
+    if (normAB < std::numeric_limits<double>::epsilon()) {
+        g_warning("Last two points of stroke coincide. ");
+        drawEvent(ev);
+        return;
+    }
+
+    /**
+     * The first argument of std::min would give a symmetric quadratic spline segment.
+     * The std::min and its second argument ensure the spline segment stays reasonably close to its nodes
+     */
+    double distance = std::min(std::abs(squaredNormBC * normAB / (2 * MathVect2::scalarProduct(vAB, vBC))), normBC);
+
+    /**
+     * Rebalance the pressure values.
+     */
+    if (usePressure) {
+        double coeff = normBC / 2 + distance;  // Very rough estimation of the spline's length
+        B.z = (coeff * A.z + normAB * C.z) / (normAB + coeff);
+        stroke->setLastPressure(B.z);
+    }
+
+    // Quadratic control point
+    Point Q = B.lineTo(A, -distance);
+
+    /**
+     * The quadratic control point is converted into two cubic control points
+     */
+    Point fp = B.relativeLineTo(Q, 2.0 / 3.0);
+    Point sp = C.relativeLineTo(Q, 2.0 / 3.0);
+
+    SplineSegment spline(B, fp, sp, C);
+    /**
+     * TODO Add support for spline segments in Stroke and replace this point sequence by a single spline segment
+     */
+    std::list<Point> pointsToPaint = spline.toPointSequence(usePressure);
+
+    pointsToPaint.pop_front();  // Point B has already been painted
+
+    for (auto&& point: pointsToPaint) {
+        strokeHandler->drawSegmentTo(point);
+    }
+    strokeHandler->drawSegmentTo(C);
+}
+
+
+/**
+ * StrokeStabilizer::Deadzone
+ */
+void StrokeStabilizer::Deadzone::recordFirstEvent(const PositionInputData& pos) {
+    lastEvent = Event(pos);
+    lastPaintedEvent = lastEvent;
+}
+
+void StrokeStabilizer::Deadzone::processEvent(const PositionInputData& pos) {
+
+    /**
+     * Record the event for the stroke finisher
+     */
+    lastEvent = Event(pos);
+
+    MathVect2 movement = {lastEvent.x - lastPaintedEvent.x, lastEvent.y - lastPaintedEvent.y};
+    double ratio = deadzoneRadius / movement.norm();
+
+    if (ratio >= 1) {
+        /**
+         * The event occurred inside the deadzone. Invalidate it.
+         * Flush the contingent buffer for sharper change of directions
+         */
+        resetBuffer(lastPaintedEvent, pos.timestamp);
+        return;
+    }
+
+    if (cuspDetection && (MathVect2::scalarProduct(movement, lastLiveDirection) < 0)) {
+        /**
+         * lastLiveDirection != 0 and the angle between movement and lastLiveDirection is greater than 90°
+         * We have a clear change of direction. This is a cusp. Draw the entire cusp
+         */
+
+        /**
+         * Paint a segment from the stroke's last point to the tip of the cusp.
+         */
+        //         drawEvent(lastLiveEvent);
+        quadraticSplineTo(lastLiveEvent);
+
+        /**
+         * Paint the way back from the tip of the cusp
+         * To do so, we create an artificial point between lastEvent and lastLiveEvent
+         */
+        MathVect2 diff = {lastEvent.x - lastLiveEvent.x, lastEvent.y - lastLiveEvent.y};
+        double diffNorm = diff.norm();
+        double coeff = deadzoneRadius / diffNorm;
+
+        lastLiveDirection = coeff * diff;
+
+        lastPaintedEvent.x = lastEvent.x - lastLiveDirection.dx;
+        lastPaintedEvent.y = lastEvent.y - lastLiveDirection.dy;
+        lastPaintedEvent.pressure = coeff * lastLiveEvent.pressure + (1 - coeff) * lastEvent.pressure;
+
+        drawEvent(lastPaintedEvent);
+
+        lastLiveEvent = lastEvent;
+
+        resetBuffer(lastPaintedEvent, pos.timestamp);
+        return;
+    }
+
+    /**
+     * Normal behaviour. Adjust the event's coordinates according to the deadzoneRadius
+     */
+    lastLiveEvent = lastEvent;
+    lastLiveDirection = movement;
+
+    Event ev(lastEvent.x - ratio * movement.dx, lastEvent.y - ratio * movement.dy, lastEvent.pressure);
+
+    averageAndPaint(ev, pos.timestamp);
+}
+
+void StrokeStabilizer::Deadzone::rebalanceStrokePressures() {
+    Stroke* stroke = strokeHandler->getStroke();
+    size_t pointCount = stroke->getPointCount();
+    if (pointCount >= 3) {
+        /**
+         * Smoothen a little bit the pressure variations
+         */
+        stroke->setSecondToLastPressure((stroke->getPoint(pointCount - 2).z + stroke->getPoint(pointCount - 3).z) / 2);
+    }
+}
+
+
+/**
+ * StrokeStabilizer::Inertia
+ */
+void StrokeStabilizer::Inertia::recordFirstEvent(const PositionInputData& pos) {
+    lastEvent = Event(pos);
+    lastPaintedEvent = lastEvent;
+}
+
+void StrokeStabilizer::Inertia::processEvent(const PositionInputData& pos) {
+
+    /**
+     * Record the event for the stroke finisher
+     */
+    lastEvent = Event(pos);
+
+    /**
+     * Compute the acceleration due to the spring action
+     */
+    MathVect2 springAcceleration = {(lastEvent.x - lastPaintedEvent.x) / mass,
+                                    (lastEvent.y - lastPaintedEvent.y) / mass};
+
+    speed = oneMinusDrag * speed + springAcceleration;
+
+    Event ev(lastPaintedEvent.x + speed.dx, lastPaintedEvent.y + speed.dy, lastEvent.pressure);
+
+    averageAndPaint(ev, pos.timestamp);
+}
+
+void StrokeStabilizer::Inertia::rebalanceStrokePressures() {
+    Stroke* stroke = strokeHandler->getStroke();
+    size_t pointCount = stroke->getPointCount();
+    if (pointCount >= 3) {
+        /**
+         * Smoothen a little bit the pressure variations
+         */
+        stroke->setSecondToLastPressure((stroke->getPoint(pointCount - 2).z + stroke->getPoint(pointCount - 3).z) / 2);
+    }
+}
+
+
+/**
+ * StrokeStabilizer::Arithmetic
+ */
+void StrokeStabilizer::Arithmetic::recordFirstEvent(const PositionInputData& pos) {
+    eventBuffer.assign(Event(pos));  // Fill the buffer with copies of Event(pos)
+}
+
+void StrokeStabilizer::Arithmetic::averageAndPaint(const Event& ev, guint32 timestamp) {
+    /**
+     * Push the event and overwrite the oldest event in the buffer
+     */
+    eventBuffer.push_front(ev);
+
+    /**
+     * Average the coordinates using an arithmetic mean
+     */
+    Event sum = std::accumulate(begin(eventBuffer), end(eventBuffer), Event(0, 0, 0), [](auto&& lhs, auto&& rhs) {
+        return Event(lhs.x + rhs.x, lhs.y + rhs.y, lhs.pressure + rhs.pressure);
+    });
+
+    /**
+     * Rescale the averaged coordinates and draw
+     */
+    double d = static_cast<double>(eventBuffer.size());
+    sum.pressure /= d;
+    sum.x /= d;
+    sum.y /= d;
+    setLastPaintedEvent(sum);
+    drawEvent(sum);
+}
+
+auto StrokeStabilizer::Arithmetic::getLastEvent() -> Event { return eventBuffer.front(); }
+
+void StrokeStabilizer::Arithmetic::resetBuffer(Event& ev, guint32 timestamp) {
+    if (eventBuffer.back() != ev) {
+        eventBuffer.assign(ev);  // Replace the entire content of the buffer with copies of ev
+    }
+}
+
+/**
+ * StrokeStabilizer::VelocityGaussian
+ */
+void StrokeStabilizer::VelocityGaussian::recordFirstEvent(const PositionInputData& pos) {
+    eventBuffer.emplace_front(pos);
+    lastEventTimestamp = pos.timestamp;
+}
+
+void StrokeStabilizer::VelocityGaussian::averageAndPaint(const Event& ev, guint32 timestamp) {
+
+    /**
+     * Compute the velocity (if possible) and push the event to eventBuffer
+     */
+    if (eventBuffer.empty()) {
+        eventBuffer.emplace_front(ev);
+    } else {
+        /**
+         * Issue: timestamps are in ms. They are not precise enough. Different events can have the same timestamp.
+         */
+        VelocityEvent& last = eventBuffer.front();
+        guint32 timelaps = timestamp - lastEventTimestamp;
+        if (timelaps == 0) {
+            timelaps = 1;
+        }
+        eventBuffer.emplace_front(ev, std::hypot(ev.x - last.x, ev.y - last.y) / static_cast<double>(timelaps));
+    }
+    lastEventTimestamp = timestamp;
+
+    /**
+     * Average the coordinates using the gimp-like weights
+     */
+    Event weightedSum = {0, 0, 0};
+    double weight;
+    double sumOfWeights = 0;
+    double sumOfVelocities = 0;
+
+    auto it = eventBuffer.cbegin();
+    for (; it != eventBuffer.cend(); ++it) {
+        /**
+         * The first weight is always 1
+         */
+        weight = exp(-sumOfVelocities * sumOfVelocities / twoSigmaSquared);
+        if (weight < 0.01) {
+            break;
+        }
+        sumOfVelocities += (*it).velocity;
+        weightedSum.x += weight * (*it).x;
+        weightedSum.y += weight * (*it).y;
+        weightedSum.pressure += weight * (*it).pressure;
+        sumOfWeights += weight;
+    }
+    eventBuffer.erase(it, eventBuffer.cend());
+
+    weightedSum.x /= sumOfWeights;
+    weightedSum.y /= sumOfWeights;
+    weightedSum.pressure /= sumOfWeights;
+
+    setLastPaintedEvent(weightedSum);
+    drawEvent(weightedSum);
+}
+
+auto StrokeStabilizer::VelocityGaussian::getLastEvent() -> Event {
+    if (eventBuffer.empty()) {
+        g_warning("StrokeStabilizer::VelocityGaussian buffer empty. This should never be!");
+        return Event(0, 0, 0);
+    }
+    return eventBuffer.front();
+}
+
+void StrokeStabilizer::VelocityGaussian::resetBuffer(Event& ev, guint32 timestamp) {
+    if (eventBuffer.size() != 1 || lastEventTimestamp != timestamp || eventBuffer.front() != ev) {
+        eventBuffer.clear();
+        lastEventTimestamp = timestamp;
+        eventBuffer.emplace_front(ev);
+    }
+}
diff --git a/entry/src/main/cpp/src/core/control/tools/StrokeStabilizer.h b/entry/src/main/cpp/src/core/control/tools/StrokeStabilizer.h
new file mode 100644
index 0000000..e13c980
--- /dev/null
+++ b/entry/src/main/cpp/src/core/control/tools/StrokeStabilizer.h
@@ -0,0 +1,586 @@
+/*
+ * Xournal++
+ *
+ * Handles input of strokes
+ *
+ * @author Xournal++ Team
+ * https://github.com/xournalpp/xournalpp
+ *
+ * @license GNU GPLv2 or later
+ */
+#pragma once
+
+#include <cstddef>  // for size_t
+#include <deque>    // for deque
+#include <memory>   // for allocator, unique_ptr
+#include <string>   // for operator+, char_traits
+
+#include <glib.h>  // for guint32
+
+#include "control/tools/StrokeHandler.h"         // for StrokeHandler
+#include "gui/inputdevices/PositionInputData.h"  // for PositionInputData
+#include "model/MathVect.h"                      // for MathVect2
+#include "model/Point.h"                         // for Point
+#include "util/CircularBuffer.h"                 // for CircularBuffer
+
+class Settings;
+
+namespace StrokeStabilizer {
+
+/**
+ * @brief A structure containing the event's information relevant for the stabilizers
+ */
+struct Event {
+    Event() = default;
+    Event(double x, double y, double pressure): x(x), y(y), pressure(pressure) {}
+    Event(const PositionInputData& pos): x(pos.x), y(pos.y), pressure(pos.pressure) {}
+    bool operator!=(const Event& ev) { return (x != ev.x) || (y != ev.y) || (pressure != ev.pressure); }
+    double x{};
+    double y{};
+    double pressure{};
+};
+
+/**
+ * @brief Base stabilizer class. Also used as default (no stabilization).
+ */
+class Base {
+public:
+    Base() = default;
+    virtual ~Base() = default;
+
+    /**
+     * @brief Initialize the stabilizer
+     * @param sH Pointer to the StrokeHandler instance handling the stroke
+     * @param zoomValue The current zoom
+     * @param pos The position of the button down event starting the stroke
+     */
+    void initialize(StrokeHandler* sH, double zoomValue, const PositionInputData& pos) {
+        strokeHandler = sH;
+        zoom = zoomValue;
+        recordFirstEvent(pos);
+    }
+
+    /**
+     * @brief Compute stabilized coordinates for the event and paints the obtained point
+     * @param pos The MotionNotify event information
+     */
+    virtual void processEvent(const PositionInputData& pos) {
+        strokeHandler->paintTo(Point(pos.x / zoom, pos.y / zoom, pos.pressure));
+    }
+
+    /**
+     * @brief Fill the possible gap between the last painted point and the last event received by the stabilizer.
+     *
+     * Does nothing in the base class
+     */
+    virtual void finalizeStroke() {}
+
+    [[maybe_unused]] virtual auto getInfo() -> std::string { return "No stabilizer"; }
+
+protected:
+    /**
+     * @brief Upon initialization, record the first event for the stabilizer's benefits.
+     * @param pos The first event
+     *
+     * Does nothing in the base class
+     */
+    virtual inline void recordFirstEvent(const PositionInputData& pos){};
+
+    /**
+     * @brief Pointer to the StrokeHandler instance handling the stroke
+     */
+    StrokeHandler* strokeHandler;
+
+    /**
+     * @brief The zoom value to be applied on all painted points
+     */
+    double zoom;
+};
+
+/**
+ * @brief Abstract base class for active stabilizers
+ */
+class Active: public Base {
+public:
+    Active(bool finalize): finalize(finalize) {}
+    ~Active() override = default;
+
+    /**
+     * @brief Fill the possible gap between the last painted point and the last event received by the stabilizer.
+     * It does so by creating a quadraticSplineTo the last event's coordinates
+     */
+    void finalizeStroke() override;
+
+    /**
+     * @brief Compute stabilized coordinates for the event and paints the obtained point
+     * @param pos The MotionNotify event information
+     */
+    void processEvent(const PositionInputData& pos) override {
+        Event ev(pos);
+        averageAndPaint(ev, pos.timestamp);
+    }
+
+protected:
+    /**
+     * @brief Add a segment to the stroke ending at the parameters coordinates
+     * @param ev The event whose coordinates determine the stroke's new endpoint
+     */
+    inline void drawEvent(const Event& ev) { strokeHandler->paintTo(Point(ev.x / zoom, ev.y / zoom, ev.pressure)); }
+
+    /**
+     * @brief Record the event corresponding to last painted point
+     * @param ev The event corresponding to last painted point
+     *
+     * Does nothing in the base class.
+     */
+    virtual inline void setLastPaintedEvent(const Event& ev) {}
+
+    /**
+     * @brief For stabilizers with a buffer, clear the buffer and reinitialize it with the provided data
+     * @param ev New event to push to the buffer
+     * @param timestamp The timestamp of that event
+     *
+     * Does nothing in the base class
+     */
+    virtual inline void resetBuffer(Event& ev, guint32 timestamp) {}
+
+    /**
+     * @brief On stabilizers with a buffer, use it to average the input's position and paint the resulting point
+     * @param ev An event to add to the mix
+     * @param timestamp The event's timestamp
+     *
+     * In the base class, simply paint the point corresponding to the given event
+     */
+    virtual inline void averageAndPaint(const Event& ev, guint32 timestamp) {
+        setLastPaintedEvent(ev);
+        drawEvent(ev);
+    }
+
+    /**
+     * @brief Add a quadratic spline segment from the end of the stroke to the point corresponding to the parameters, so
+     * that the stroke is smooth at its former endpoint
+     * @param ev Event whose coordinates determine the stroke's new endpoint
+     */
+    void quadraticSplineTo(const Event& ev);
+
+private:
+    /**
+     * @brief Get the last event received by the stabilizer
+     * @return The last event
+     */
+    virtual inline Event getLastEvent() = 0;
+
+    /**
+     * @brief Tweak the stroke's pressure values upon finalizing the stroke
+     *
+     * Does nothing in the base class
+     */
+    virtual inline void rebalanceStrokePressures() {}
+
+    /**
+     * @brief Wether or not to finalize the stroke
+     */
+    bool finalize = true;
+};
+
+
+/*****************************
+ *       PREPROCESSORS       *
+ *****************************/
+
+/**
+ * @brief Class for deadzone stabilizer/preprocessor
+ */
+class Deadzone: virtual public Active {
+public:
+    Deadzone(bool finalize, double dzRadius, bool cuspDetection):
+            Active(finalize), deadzoneRadius(dzRadius), cuspDetection(cuspDetection) {}
+    ~Deadzone() override = default;
+
+    /**
+     * @brief Compute stabilized coordinates for the event and paints the obtained point
+     * @param pos The MotionNotify event information
+     */
+    void processEvent(const PositionInputData& pos) override;
+
+    [[maybe_unused]] auto getInfo() -> std::string override {
+        return "Deadzone stabilizer with deadzoneRadius = " + std::to_string(deadzoneRadius) +
+               ", cusp detection = " + (cuspDetection ? "on" : "off");
+    }
+
+protected:
+    /**
+     * @brief Upon initialization, record the first event for the stabilizer's benefits.
+     * @param pos The first event
+     */
+    void recordFirstEvent(const PositionInputData& pos) override;
+
+    /**
+     * @brief Record the event corresponding to last painted point
+     * @param ev The event corresponding to last painted point
+     */
+    inline void setLastPaintedEvent(const Event& ev) override { lastPaintedEvent = ev; }
+
+    /**
+     * @brief Get the last event received by the stabilizer
+     * @return The last event
+     */
+    inline Event getLastEvent() override { return lastEvent; }
+
+private:
+    /**
+     * @brief The deadzone radius
+     */
+    const double deadzoneRadius;
+
+    /**
+     * @brief Flag to turn on/off the cusp detection
+     */
+    const bool cuspDetection;
+
+    /**
+     * @brief The direction of the last event outside the deadzone
+     */
+    MathVect2 lastLiveDirection = {0, 0};
+
+    /**
+     * @brief The last event outside the deadzone
+     */
+    Event lastLiveEvent;
+
+    /**
+     * @brief The last (stabilized) painted point, center of the deadzone
+     */
+    Event lastPaintedEvent;
+
+    /**
+     * @brief The last event (anywhere), used by finishStroke
+     */
+    Event lastEvent;
+
+    /**
+     * @brief Tweak the stroke's pressure values upon finalizing the stroke
+     */
+    void rebalanceStrokePressures() override;
+};
+
+/**
+ * @brief Class for inertial preprocessor
+ *
+ * Principle: Assign a mass to the pencil tip and simulate a spring between the tip and the pointer device.
+ * Friction between the tip and the paper is added by using a drag coefficient.
+ *
+ * A too small drag can lead to unwanted oscillations
+ */
+class Inertia: virtual public Active {
+public:
+    Inertia(bool finalize, double drag, double mass):
+            Active(finalize), mass(mass), oneMinusDrag(1 - drag), speed{0.0, 0.0} {}
+    ~Inertia() override = default;
+
+    /**
+     * @brief Compute stabilized coordinates for the event and paints the obtained point
+     * @param pos The MotionNotify event information
+     */
+    void processEvent(const PositionInputData& pos) override;
+
+    [[maybe_unused]] auto getInfo() -> std::string override {
+        return "Inertia stabilizer with mass = " + std::to_string(mass) +
+               ", drag = " + std::to_string(1 - oneMinusDrag);
+    }
+
+protected:
+    /**
+     * @brief Upon initialization, record the first event for the stabilizer's benefits.
+     * @param pos The first event
+     */
+    void recordFirstEvent(const PositionInputData& pos) override;
+
+    /**
+     * @brief Record the event corresponding to last painted point
+     * @param ev The event corresponding to last painted point
+     */
+    inline void setLastPaintedEvent(const Event& ev) override { lastPaintedEvent = ev; }
+
+    /**
+     * @brief Get the last event received by the stabilizer
+     * @return The last event
+     */
+    inline Event getLastEvent() override { return lastEvent; }
+
+private:
+    /**
+     * @brief mass of the pen
+     */
+    const double mass;
+
+    /**
+     * @brief Friction coefficient
+     */
+    const double oneMinusDrag;
+
+    /**
+     * @brief Speed during the last step
+     */
+    MathVect2 speed;
+
+    /**
+     * @brief The last (stabilized) painted point, center of the deadzone
+     */
+    Event lastPaintedEvent;
+
+    /**
+     * @brief The last event (anywhere), used by finishStroke
+     */
+    Event lastEvent;
+
+    /**
+     * @brief Tweak the stroke's pressure values upon finalizing the stroke
+     */
+    void rebalanceStrokePressures() override;
+};
+
+
+/*****************************
+ *         AVERAGERS         *
+ *****************************/
+
+/**
+ * @brief Class for the Velocity-based Gaussian averaging stabilizer (a.k.a. Gimp-like)
+ */
+class VelocityGaussian: virtual public Active {
+public:
+    VelocityGaussian(bool finalize, double sigma): Active(finalize), twoSigmaSquared(2 * sigma * sigma) {}
+    ~VelocityGaussian() override = default;
+
+    [[maybe_unused]] auto getInfo() -> std::string override {
+        return "Velocity-based gaussian weight stabilizer with "
+               "2σ² = " +
+               std::to_string(twoSigmaSquared);
+    }
+
+protected:
+    /**
+     * @brief Upon initialization, record the first event for the stabilizer's benefits.
+     * @param pos The first event
+     */
+    void recordFirstEvent(const PositionInputData& pos) override;
+
+    /**
+     * @brief Use the buffer to average the input's position and paint the resulting point
+     * @param ev An event to add to the mix
+     * @param timestamp The event's timestamp
+     */
+    void averageAndPaint(const Event& ev, guint32 timestamp) override;
+
+    /**
+     * @brief For stabilizers with a buffer, clear the buffer and reinitialize it with the provided data
+     * @param ev New event to push to the buffer
+     * @param timestamp The timestamp of that event
+     */
+    void resetBuffer(Event& ev, guint32 timestamp) override;
+
+    /**
+     * @brief Structure containing the event's information relevant to the VelocityGaussian stabilizer
+     */
+    struct VelocityEvent: public Event {
+        VelocityEvent() = default;
+        VelocityEvent(double x, double y, double pressure, double velocity):
+                Event(x, y, pressure), velocity(velocity) {}
+        VelocityEvent(const PositionInputData& pos, double velocity = 0): Event(pos), velocity(velocity) {}
+        VelocityEvent(const Event& ev, double velocity = 0): Event(ev), velocity(velocity) {}
+        double velocity{};
+    };
+
+    /**
+     * @brief A queue containing the relevant information on the last events
+     * The beginning of the queue contains the most recent event
+     * The end of the queue contains the most ancient event stored
+     */
+    std::deque<VelocityEvent> eventBuffer;
+
+private:
+    /**
+     * @brief Get the last event received by the stabilizer
+     * @return The last event
+     */
+    Event getLastEvent() override;
+
+    /**
+     * @brief The Gaussian parameter
+     */
+    const double twoSigmaSquared;
+
+    /**
+     * @brief Timestamp of the last event received. Used to compute the velocity of the next event
+     */
+    guint32 lastEventTimestamp;
+};
+
+class Arithmetic: virtual public Active {
+public:
+    Arithmetic(bool finalize, size_t buffersize): Active(finalize), bufferLength(buffersize), eventBuffer(buffersize) {}
+    ~Arithmetic() override = default;
+
+    [[maybe_unused]] auto getInfo() -> std::string override {
+        return "Arithmetic stabilizer with bufferLength " + std::to_string(bufferLength);
+    }
+
+protected:
+    /**
+     * @brief Upon initialization, record the first event for the stabilizer's benefits.
+     * @param pos The first event
+     */
+    void recordFirstEvent(const PositionInputData& pos) override;
+
+    /**
+     * @brief Use the buffer to average the input's position and paint the resulting point
+     * @param ev An event to add to the mix
+     * @param timestamp The event's timestamp
+     */
+    void averageAndPaint(const Event& ev, guint32 timestamp) override;
+
+    /**
+     * @brief For stabilizers with a buffer, clear the buffer and reinitialize it with the provided data
+     * @param ev New event to push to the buffer
+     * @param timestamp The timestamp of that event
+     */
+    void resetBuffer(Event& ev, guint32 timestamp) override;
+
+    /**
+     * @brief The maximal length of the buffer
+     */
+    const size_t bufferLength;
+
+    /**
+     * @brief A circular buffer containing the relevant information on the last events
+     * The front of the buffer contains the most recent event
+     * The back of the buffer contains the most ancient event stored
+     */
+    CircularBuffer<Event> eventBuffer;
+
+private:
+    /**
+     * @brief Get the last event received by the stabilizer
+     * @return The last event received
+     */
+    Event getLastEvent() override;
+};
+
+
+/*****************************
+ *          HYBRIDS          *
+ *****************************/
+
+class ArithmeticDeadzone: public Arithmetic, public Deadzone {
+public:
+    ArithmeticDeadzone(bool finalize, size_t buffersize, double dzRadius, bool cuspDetection):
+            Active(finalize), Arithmetic(finalize, buffersize), Deadzone(finalize, dzRadius, cuspDetection) {}
+    ~ArithmeticDeadzone() override = default;
+
+    [[maybe_unused]] auto getInfo() -> std::string override {
+        return "Hybrid stabilizer:\n   * " + Arithmetic::getInfo() + "\n   * " + Deadzone::getInfo();
+    }
+
+private:
+    /**
+     * @brief Upon initialization, record the first event for the stabilizer's benefits.
+     * @param pos The first event
+     */
+    inline void recordFirstEvent(const PositionInputData& pos) override {
+        Arithmetic::recordFirstEvent(pos);
+        Deadzone::recordFirstEvent(pos);
+    }
+    /**
+     * @brief Get the last event received by the stabilizer
+     * @return The last event received
+     */
+    inline Event getLastEvent() override { return Deadzone::getLastEvent(); }
+};
+
+class ArithmeticInertia: public Arithmetic, public Inertia {
+public:
+    ArithmeticInertia(bool finalize, size_t buffersize, double drag, double mass):
+            Active(finalize), Arithmetic(finalize, buffersize), Inertia(finalize, drag, mass) {}
+    ~ArithmeticInertia() override = default;
+
+    [[maybe_unused]] auto getInfo() -> std::string override {
+        return "Hybrid stabilizer:\n   * " + Arithmetic::getInfo() + "\n   * " + Inertia::getInfo();
+    }
+
+private:
+    /**
+     * @brief Upon initialization, record the first event for the stabilizer's benefits.
+     * @param pos The first event
+     */
+    inline void recordFirstEvent(const PositionInputData& pos) override {
+        Arithmetic::recordFirstEvent(pos);
+        Inertia::recordFirstEvent(pos);
+    }
+    /**
+     * @brief Get the last event received by the stabilizer
+     * @return The last event received
+     */
+    inline Event getLastEvent() override { return Inertia::getLastEvent(); }
+};
+
+class VelocityGaussianDeadzone: public VelocityGaussian, public Deadzone {
+public:
+    VelocityGaussianDeadzone(bool finalize, double sigma, double dzRadius, bool cuspDetection):
+            Active(finalize), VelocityGaussian(finalize, sigma), Deadzone(finalize, dzRadius, cuspDetection) {}
+    ~VelocityGaussianDeadzone() override = default;
+
+    [[maybe_unused]] auto getInfo() -> std::string override {
+        return "Hybrid stabilizer:\n   * " + VelocityGaussian::getInfo() + "\n   * " + Deadzone::getInfo();
+    }
+
+private:
+    /**
+     * @brief Upon initialization, record the first event for the stabilizer's benefits.
+     * @param pos The first event
+     */
+    inline void recordFirstEvent(const PositionInputData& pos) override {
+        VelocityGaussian::recordFirstEvent(pos);
+        Deadzone::recordFirstEvent(pos);
+    }
+    /**
+     * @brief Get the last event received by the stabilizer
+     * @return The last event received
+     */
+    inline Event getLastEvent() override { return Deadzone::getLastEvent(); }
+};
+
+class VelocityGaussianInertia: public VelocityGaussian, public Inertia {
+public:
+    VelocityGaussianInertia(bool finalize, double sigma, double drag, double mass):
+            Active(finalize), VelocityGaussian(finalize, sigma), Inertia(finalize, drag, mass) {}
+    ~VelocityGaussianInertia() override = default;
+
+    [[maybe_unused]] auto getInfo() -> std::string override {
+        return "Hybrid stabilizer:\n   * " + VelocityGaussian::getInfo() + "\n   * " + Inertia::getInfo();
+    }
+
+private:
+    /**
+     * @brief Upon initialization, record the first event for the stabilizer's benefits.
+     * @param pos The first event
+     */
+    inline void recordFirstEvent(const PositionInputData& pos) override {
+        VelocityGaussian::recordFirstEvent(pos);
+        Inertia::recordFirstEvent(pos);
+    }
+    /**
+     * @brief Get the last event received by the stabilizer
+     * @return The last event received
+     */
+    inline Event getLastEvent() override { return Inertia::getLastEvent(); }
+};
+
+/**
+ * @brief Stabilizer factory: create a stabilizer of the right kind
+ * @param settings The Settings instance to read to determine what kind of stabilizer to create
+ * @return A unique point to the create stabilizer instance.
+ */
+std::unique_ptr<Base> get(Settings* settings);
+
+}  // namespace StrokeStabilizer
diff --git a/entry/src/main/cpp/src/core/control/tools/StrokeStabilizerEnum.h b/entry/src/main/cpp/src/core/control/tools/StrokeStabilizerEnum.h
new file mode 100644
index 0000000..a3f09b7
--- /dev/null
+++ b/entry/src/main/cpp/src/core/control/tools/StrokeStabilizerEnum.h
@@ -0,0 +1,27 @@
+/*
+ * Xournal++
+ *
+ * Enum available stabilizer
+ *
+ * @author Xournal++ Team
+ * https://github.com/xournalpp/xournalpp
+ *
+ * @license GNU GPLv2 or later
+ */
+
+#pragma once
+
+namespace StrokeStabilizer {
+
+enum class AveragingMethod { NONE, ARITHMETIC, VELOCITY_GAUSSIAN };
+
+constexpr bool isValid(AveragingMethod am) {
+    return am == AveragingMethod::NONE || am == AveragingMethod::ARITHMETIC || am == AveragingMethod::VELOCITY_GAUSSIAN;
+}
+
+enum class Preprocessor { NONE, DEADZONE, INERTIA };
+
+constexpr bool isValid(Preprocessor pp) {
+    return pp == Preprocessor::NONE || pp == Preprocessor::DEADZONE || pp == Preprocessor::INERTIA;
+}
+}  // namespace StrokeStabilizer
diff --git a/entry/src/main/cpp/src/core/control/tools/TextEditor.cpp b/entry/src/main/cpp/src/core/control/tools/TextEditor.cpp
new file mode 100644
index 0000000..ca5ea6c
--- /dev/null
+++ b/entry/src/main/cpp/src/core/control/tools/TextEditor.cpp
@@ -0,0 +1,1112 @@
+#include "TextEditor.h"
+
+#include <cstring>  // for strcmp, size_t
+#include <memory>   // for allocator, make_unique, __shared_p...
+#include <string>   // for std::string()
+#include <utility>  // for move
+
+#include <gdk/gdkkeysyms.h>  // for GDK_KEY_B, GDK_KEY_ISO_Enter, GDK_...
+#include <glib-object.h>     // for g_object_get, g_object_unref, G_CA...
+
+#include "control/AudioController.h"
+#include "control/Control.h"  // for Control
+#include "control/settings/Settings.h"
+#include "gui/XournalppCursor.h"  // for XournalppCursor
+#include "model/Document.h"       // for Document
+#include "model/Font.h"           // for XojFont
+#include "model/Text.h"           // for Text
+#include "model/XojPage.h"        // for XojPage
+#include "undo/DeleteUndoAction.h"
+#include "undo/InsertUndoAction.h"
+#include "undo/TextBoxUndoAction.h"
+#include "undo/UndoRedoHandler.h"  // for UndoRedoHandler
+#include "util/Assert.h"
+#include "util/DispatchPool.h"
+#include "util/Range.h"
+#include "util/glib_casts.h"  // for wrap_for_once_v
+#include "util/gtk4_helper.h"
+#include "util/raii/CStringWrapper.h"
+#include "util/safe_casts.h"  // for round_cast, as_unsigned
+#include "view/overlays/TextEditionView.h"
+
+#include "TextEditorKeyBindings.h"
+
+class UndoAction;
+
+/** GtkTextBuffer helper functions **/
+static auto getIteratorAtCursor(GtkTextBuffer* buffer) -> GtkTextIter {
+    GtkTextIter cursorIter = {nullptr};
+    gtk_text_buffer_get_iter_at_mark(buffer, &cursorIter, gtk_text_buffer_get_insert(buffer));
+    return cursorIter;
+}
+
+/**
+ * @brief Compute the byte offset of an iterator in the GtkTextBuffer
+ *
+ * NB: This is much faster than relying on g_utf8_offset_to_pointer
+ */
+static auto getByteOffsetOfIterator(GtkTextIter it) -> int {
+    // Bytes from beginning of line to iterator
+    int pos = gtk_text_iter_get_line_index(&it);
+    gtk_text_iter_set_line_index(&it, 0);
+    // Count bytes of previous lines
+    while (gtk_text_iter_backward_line(&it)) {
+        pos += gtk_text_iter_get_bytes_in_line(&it);
+    }
+    return pos;
+}
+
+static auto getByteOffsetOfCursor(GtkTextBuffer* buffer) -> int {
+    return getByteOffsetOfIterator(getIteratorAtCursor(buffer));
+}
+
+/**
+ * @brief Get an iterator at the prescribed byte index.
+ *
+ * NB: This is much faster than relying on g_utf8_pointer_to_offset for long texts
+ */
+static auto getIteratorAtByteOffset(GtkTextBuffer* buf, int byteIndex) {
+    xoj_assert(byteIndex >= 0);
+    GtkTextIter it = {nullptr};
+    gtk_text_buffer_get_start_iter(buf, &it);
+
+    // Fast forward to the beginning of the line containing our target destination
+    for (int linelength = gtk_text_iter_get_bytes_in_line(&it);
+         linelength <= byteIndex && gtk_text_iter_forward_line(&it);
+         byteIndex -= std::exchange(linelength, gtk_text_iter_get_bytes_in_line(&it))) {}
+
+    if (!gtk_text_iter_is_end(&it)) {
+        gtk_text_iter_set_line_index(&it, byteIndex);
+    }
+    // else { // byteIndex was either past-the-end or pointed to the end }
+
+    return it;
+}
+
+static auto cloneToCString(GtkTextBuffer* buf) {
+    GtkTextIter start, end;
+    gtk_text_buffer_get_bounds(buf, &start, &end);
+    return xoj::util::OwnedCString::assumeOwnership(gtk_text_iter_get_text(&start, &end));
+}
+
+/**
+ * @brief Clone the buffer's content
+ *
+ * This is pretty inefficient: the text gets copied twice
+ */
+static auto cloneToStdString(GtkTextBuffer* buf) -> std::string { return cloneToCString(buf).get(); }
+
+/**
+ * @brief Clone the buffer's content and insert a string into the clone
+ * This makes one less copy operation over using cloneToStdString followed by insert()
+ * (The text is copied "only" twice, and not three times)
+ */
+static auto cloneWithInsertToStdString(GtkTextBuffer* buf, std::string_view insertedStr) -> std::string {
+    GtkTextIter start, end;
+    gtk_text_buffer_get_bounds(buf, &start, &end);
+    GtkTextIter insertionPoint = getIteratorAtCursor(buf);
+
+    auto firstHalf = xoj::util::OwnedCString::assumeOwnership(gtk_text_iter_get_text(&start, &insertionPoint));
+    auto secondHalf = xoj::util::OwnedCString::assumeOwnership(gtk_text_iter_get_text(&insertionPoint, &end));
+
+    std::string_view str1(firstHalf);
+    std::string_view str2(secondHalf);
+
+    std::string res;
+    res.reserve(str1.length() + str2.length() + insertedStr.length());
+    res += str1;
+    res += insertedStr;
+    res += str2;
+
+    return res;
+}
+
+TextEditor::TextEditor(Control* control, const PageRef& page, GtkWidget* xournalWidget, double x, double y):
+        control(control),
+        page(page),
+        xournalWidget(xournalWidget),
+        imContext(gtk_im_multicontext_new(), xoj::util::adopt),
+        buffer(gtk_text_buffer_new(nullptr), xoj::util::adopt),
+        viewPool(std::make_shared<xoj::util::DispatchPool<xoj::view::TextEditionView>>()) {
+    // Informs the windowing system of the selection -- i.e. for accessibility purposes
+    gtk_text_buffer_add_selection_clipboard(buffer.get(), gtk_clipboard_get(GDK_SELECTION_PRIMARY));
+
+    this->initializeEditionAt(x, y);
+
+    g_signal_connect(this->buffer.get(), "paste-done", G_CALLBACK(bufferPasteDoneCallback), this);
+
+    {  // Get cursor blinking settings
+        GtkSettings* settings = gtk_widget_get_settings(this->xournalWidget);
+        g_object_get(settings, "gtk-cursor-blink", &this->cursorBlink, nullptr);
+        if (this->cursorBlink) {
+            int tmp = 0;
+            g_object_get(settings, "gtk-cursor-blink-time", &tmp, nullptr);
+            xoj_assert(tmp >= 0);
+            auto cursorBlinkingPeriod = static_cast<unsigned int>(tmp);
+            this->cursorBlinkingTimeOn = cursorBlinkingPeriod * CURSOR_ON_MULTIPLIER / CURSOR_DIVIDER;
+            this->cursorBlinkingTimeOff = cursorBlinkingPeriod - this->cursorBlinkingTimeOn;
+        }
+    }
+
+    gtk_im_context_set_client_widget(this->imContext.get(), this->xournalWidget);
+    gtk_im_context_focus_in(this->imContext.get());
+
+    g_signal_connect(this->imContext.get(), "commit", G_CALLBACK(iMCommitCallback), this);
+    g_signal_connect(this->imContext.get(), "preedit-changed", G_CALLBACK(iMPreeditChangedCallback), this);
+    g_signal_connect(this->imContext.get(), "retrieve-surrounding", G_CALLBACK(iMRetrieveSurroundingCallback), this);
+    g_signal_connect(this->imContext.get(), "delete-surrounding", G_CALLBACK(imDeleteSurroundingCallback), this);
+
+    if (this->originalTextElement) {
+        // If editing a preexisting text, put the cursor at the right location
+        this->mousePressed(x - textElement->getX(), y - textElement->getY());
+    } else if (this->cursorBlink) {
+        blinkCallback(this);
+    } else {
+        this->cursorVisible = true;
+    }
+}
+
+TextEditor::~TextEditor() {
+    gtk_im_context_focus_out(this->imContext.get());
+
+    this->xournalWidget = nullptr;
+    control->setCopyCutEnabled(false);
+
+    this->contentsChanged(true);
+
+    finalizeEdition();
+}
+
+auto TextEditor::getViewPool() const -> const std::shared_ptr<xoj::util::DispatchPool<xoj::view::TextEditionView>>& {
+    return viewPool;
+}
+
+auto TextEditor::getTextElement() const -> Text* { return this->textElement.get(); }
+
+bool TextEditor::bufferEmpty() const { return gtk_text_buffer_get_char_count(this->buffer.get()) == 0; }
+
+void TextEditor::replaceBufferContent(const std::string& text) {
+    gtk_text_buffer_set_text(this->buffer.get(), text.c_str(), -1);
+
+    GtkTextIter first = {nullptr};
+    gtk_text_buffer_get_iter_at_offset(this->buffer.get(), &first, 0);
+    gtk_text_buffer_place_cursor(this->buffer.get(), &first);
+    this->layoutStatus = LayoutStatus::NEEDS_COMPLETE_UPDATE;
+    this->cursorBox = computeCursorBox();
+}
+
+void TextEditor::setColor(Color color) {
+    this->textElement->setColor(color);
+    repaintEditor(false);
+}
+
+void TextEditor::setFont(XojFont font) {
+    this->textElement->setFont(font);
+    afterFontChange();
+}
+
+void TextEditor::afterFontChange() {
+    this->textElement->updatePangoFont(this->layout.get());
+    this->computeVirtualCursorPosition();
+    this->repaintEditor();
+}
+
+void TextEditor::iMCommitCallback(GtkIMContext* context, const gchar* str, TextEditor* te) {
+    gtk_text_buffer_begin_user_action(te->buffer.get());
+
+    bool hadSelection = gtk_text_buffer_get_has_selection(te->buffer.get());
+    if (hadSelection) {
+        gtk_text_buffer_delete_selection(te->buffer.get(), true, true);
+        te->control->setCopyCutEnabled(false);
+    }
+
+    if (!strcmp(str, "\n")) {
+        if (!gtk_text_buffer_insert_interactive_at_cursor(te->buffer.get(), "\n", 1, true)) {
+            gtk_widget_error_bell(te->xournalWidget);
+        } else {
+            te->contentsChanged(true);
+        }
+    } else {
+        if (!hadSelection && te->cursorOverwrite) {
+            auto insert = getIteratorAtCursor(te->buffer.get());
+            if (!gtk_text_iter_ends_line(&insert)) {
+                te->deleteFromCursor(GTK_DELETE_CHARS, 1);
+            }
+        }
+
+        if (!gtk_text_buffer_insert_interactive_at_cursor(te->buffer.get(), str, -1, true)) {
+            gtk_widget_error_bell(te->xournalWidget);
+        }
+    }
+
+    gtk_text_buffer_end_user_action(te->buffer.get());
+    te->contentsChanged();
+    te->repaintEditor();
+}
+
+void TextEditor::iMPreeditChangedCallback(GtkIMContext* context, TextEditor* te) {
+    xoj::util::OwnedCString str;
+    gint cursor_pos = 0;
+    GtkTextIter iter = getIteratorAtCursor(te->buffer.get());
+
+    {
+        PangoAttrList* attrs = nullptr;
+        gtk_im_context_get_preedit_string(context, str.contentReplacer(), &attrs, &cursor_pos);
+        if (attrs == nullptr) {
+            attrs = pango_attr_list_new();
+        }
+        te->preeditAttrList.reset(attrs, xoj::util::adopt);
+    }
+
+    if (str && str[0] && !gtk_text_iter_can_insert(&iter, true)) {
+        /*
+         * Keypress events are passed to input method even if cursor position is
+         * not editable; so beep here if it's multi-key input sequence, input
+         * method will be reset in key-press-event handler.
+         */
+        gtk_widget_error_bell(te->xournalWidget);
+        return;
+    }
+
+    te->preeditString = std::move(str);
+    te->preeditCursor = cursor_pos;
+    te->contentsChanged();
+    te->repaintEditor();
+}
+
+auto TextEditor::iMRetrieveSurroundingCallback(GtkIMContext* context, TextEditor* te) -> bool {
+    GtkTextIter start = getIteratorAtCursor(te->buffer.get());
+    GtkTextIter end = start;
+
+    gint pos = gtk_text_iter_get_line_index(&start);
+    gtk_text_iter_set_line_offset(&start, 0);
+    gtk_text_iter_forward_to_line_end(&end);
+
+    auto text = xoj::util::OwnedCString::assumeOwnership(gtk_text_iter_get_slice(&start, &end));
+    gtk_im_context_set_surrounding(context, text.get(), -1, pos);
+
+    return true;
+}
+
+auto TextEditor::imDeleteSurroundingCallback(GtkIMContext* context, gint offset, gint n_chars, TextEditor* te) -> bool {
+    GtkTextIter start = getIteratorAtCursor(te->buffer.get());
+    GtkTextIter end = start;
+
+    gtk_text_iter_forward_chars(&start, offset);
+    gtk_text_iter_forward_chars(&end, offset + n_chars);
+
+    gtk_text_buffer_delete_interactive(te->buffer.get(), &start, &end, true);
+
+    te->contentsChanged();
+    te->repaintEditor();
+
+    return true;
+}
+
+auto TextEditor::onKeyPressEvent(const KeyEvent& event) -> bool {
+
+    // IME needs to handle the input first so the candidate window works correctly
+    if (gtk_im_context_filter_keypress(this->imContext.get(), event.sourceEvent)) {
+        this->needImReset = true;
+
+        GtkTextIter iter = getIteratorAtCursor(this->buffer.get());
+        bool canInsert = gtk_text_iter_can_insert(&iter, true);
+
+        if (canInsert) {
+            control->getCursor()->setInvisible(true);
+        } else {
+            this->resetImContext();
+        }
+        return true;
+    }
+
+    return keyBindings.processEvent(this, event);
+}
+
+auto TextEditor::onKeyReleaseEvent(const KeyEvent& event) -> bool {
+    GtkTextIter iter = getIteratorAtCursor(this->buffer.get());
+
+    if (gtk_text_iter_can_insert(&iter, true) &&
+        gtk_im_context_filter_keypress(this->imContext.get(), event.sourceEvent)) {
+        this->needImReset = true;
+        return true;
+    }
+    return false;
+}
+
+void TextEditor::toggleOverwrite() {
+    this->cursorOverwrite = !this->cursorOverwrite;
+    repaintCursorAfterChange();
+}
+
+/**
+ * I know it's a bit rough and duplicated
+ * Improve that later on...
+ */
+void TextEditor::decreaseFontSize() {
+    XojFont& font = textElement->getFont();
+    if (double size = font.getSize(); size > 1) {
+        font.setSize(font.getSize() - 1);
+        afterFontChange();
+    }
+}
+
+void TextEditor::increaseFontSize() {
+    XojFont& font = textElement->getFont();
+    font.setSize(font.getSize() + 1);
+    afterFontChange();
+}
+
+void TextEditor::toggleBoldFace() {
+    // get the current/used font
+    XojFont& font = textElement->getFont();
+    std::string fontName = font.getName();
+
+    std::size_t found = fontName.find(" Bold");
+
+    // toggle bold
+    if (found == std::string::npos) {
+        fontName = fontName + " Bold";
+    } else {
+        fontName = fontName.erase(found, 5);
+    }
+
+    font.setName(fontName);
+    afterFontChange();
+}
+
+void TextEditor::selectAtCursor(TextEditor::SelectType ty) {
+    GtkTextIter startPos;
+    GtkTextIter endPos;
+    gtk_text_buffer_get_selection_bounds(this->buffer.get(), &startPos, &endPos);
+    const auto searchFlag = GTK_TEXT_SEARCH_TEXT_ONLY;  // To be used to find double newlines
+
+    switch (ty) {
+        case TextEditor::SelectType::WORD: {
+            auto currentPos = getIteratorAtCursor(this->buffer.get());
+            if (!gtk_text_iter_inside_word(&currentPos)) {
+                // Do nothing if cursor is over whitespace
+                return;
+            }
+
+            if (!gtk_text_iter_starts_word(&currentPos)) {
+                gtk_text_iter_backward_word_start(&startPos);
+            }
+            if (!gtk_text_iter_ends_word(&currentPos)) {
+                gtk_text_iter_forward_word_end(&endPos);
+            }
+            break;
+        }
+        case TextEditor::SelectType::PARAGRAPH:
+            // Note that a GTK "paragraph" is a line, so there's no nice one-liner.
+            // We define a paragraph as text separated by double newlines.
+            while (!gtk_text_iter_is_start(&startPos)) {
+                // There's no GTK function to go to line start, so do it manually.
+                while (!gtk_text_iter_starts_line(&startPos)) {
+                    if (!gtk_text_iter_backward_word_start(&startPos)) {
+                        break;
+                    }
+                }
+                // Check for paragraph start
+                GtkTextIter searchPos = startPos;
+                gtk_text_iter_backward_chars(&searchPos, 2);
+                if (gtk_text_iter_backward_search(&startPos, "\n\n", searchFlag, nullptr, nullptr, &searchPos)) {
+                    break;
+                }
+                gtk_text_iter_backward_line(&startPos);
+            }
+            while (!gtk_text_iter_ends_line(&endPos)) {
+                gtk_text_iter_forward_to_line_end(&endPos);
+                // Check for paragraph end
+                GtkTextIter searchPos = endPos;
+                gtk_text_iter_forward_chars(&searchPos, 2);
+                if (gtk_text_iter_forward_search(&endPos, "\n\n", searchFlag, nullptr, nullptr, &searchPos)) {
+                    break;
+                }
+                gtk_text_iter_forward_line(&endPos);
+            }
+            break;
+        case TextEditor::SelectType::ALL:
+            gtk_text_buffer_get_bounds(this->buffer.get(), &startPos, &endPos);
+            break;
+    }
+
+    gtk_text_buffer_select_range(this->buffer.get(), &startPos, &endPos);
+
+    control->setCopyCutEnabled(gtk_text_buffer_get_has_selection(this->buffer.get()));
+
+    // Selection highlighting is handled through Pango attributes
+    this->layoutStatus = LayoutStatus::NEEDS_ATTRIBUTES_UPDATE;
+    this->repaintEditor(false);
+}
+
+void TextEditor::moveCursor(GtkMovementStep step, int count, bool extendSelection) {
+    resetImContext();
+
+    // Not possible, but we have to handle the events, else the page gets scrolled
+    //	if (step == GTK_MOVEMENT_PAGES) {
+    //		if (!gtk_text_view_scroll_pages(text_view, count, extend_selection))
+    //			gtk_widget_error_bell(GTK_WIDGET (text_view));
+    //
+    //		gtk_text_view_check_cursor_blink(text_view);
+    //		gtk_text_view_pend_cursor_blink(text_view);
+    //		return;
+    //	} else if (step == GTK_MOVEMENT_HORIZONTAL_PAGES) {
+    //		if (!gtk_text_view_scroll_hpages(text_view, count, extend_selection))
+    //			gtk_widget_error_bell(GTK_WIDGET (text_view));
+    //
+    //		gtk_text_view_check_cursor_blink(text_view);
+    //		gtk_text_view_pend_cursor_blink(text_view);
+    //		return;
+    //	}
+
+    GtkTextIter insert = getIteratorAtCursor(this->buffer.get());
+    GtkTextIter newplace = insert;
+
+    bool updateVirtualCursor = true;
+
+    switch (step) {
+        case GTK_MOVEMENT_LOGICAL_POSITIONS:  // not used!?
+            gtk_text_iter_forward_visible_cursor_positions(&newplace, count);
+            break;
+        case GTK_MOVEMENT_VISUAL_POSITIONS:
+            if (count < 0) {
+                gtk_text_iter_backward_cursor_position(&newplace);
+            } else {
+                gtk_text_iter_forward_cursor_position(&newplace);
+            }
+            break;
+
+        case GTK_MOVEMENT_WORDS:
+            if (count < 0) {
+                gtk_text_iter_backward_visible_word_starts(&newplace, -count);
+            } else if (count > 0) {
+                if (!gtk_text_iter_forward_visible_word_ends(&newplace, count)) {
+                    gtk_text_iter_forward_to_line_end(&newplace);
+                }
+            }
+            break;
+
+        case GTK_MOVEMENT_DISPLAY_LINES:
+            updateVirtualCursor = false;
+            jumpALine(&newplace, count);
+            break;
+
+        case GTK_MOVEMENT_PARAGRAPHS:
+            if (count > 0) {
+                if (!gtk_text_iter_ends_line(&newplace)) {
+                    gtk_text_iter_forward_to_line_end(&newplace);
+                    --count;
+                }
+                gtk_text_iter_forward_visible_lines(&newplace, count);
+                gtk_text_iter_forward_to_line_end(&newplace);
+            } else if (count < 0) {
+                if (gtk_text_iter_get_line_offset(&newplace) > 0) {
+                    gtk_text_iter_set_line_offset(&newplace, 0);
+                }
+                gtk_text_iter_forward_visible_lines(&newplace, count);
+                gtk_text_iter_set_line_offset(&newplace, 0);
+            }
+            break;
+
+        case GTK_MOVEMENT_DISPLAY_LINE_ENDS:
+        case GTK_MOVEMENT_PARAGRAPH_ENDS:
+            if (count > 0) {
+                if (!gtk_text_iter_ends_line(&newplace)) {
+                    gtk_text_iter_forward_to_line_end(&newplace);
+                }
+            } else if (count < 0) {
+                gtk_text_iter_set_line_offset(&newplace, 0);
+            }
+            break;
+
+        case GTK_MOVEMENT_BUFFER_ENDS:
+            if (count > 0) {
+                gtk_text_buffer_get_end_iter(this->buffer.get(), &newplace);
+            } else if (count < 0) {
+                gtk_text_buffer_get_iter_at_offset(this->buffer.get(), &newplace, 0);
+            }
+            break;
+
+        default:
+            break;
+    }
+
+    // call moveCursorIterator() even if the cursor hasn't moved, since it cancels the selection
+    moveCursorIterator(&newplace, extendSelection);
+
+    if (updateVirtualCursor) {
+        computeVirtualCursorPosition();
+    }
+
+    if (gtk_text_iter_equal(&insert, &newplace)) {
+        gtk_widget_error_bell(this->xournalWidget);
+    }
+}
+
+void TextEditor::findPos(GtkTextIter* iter, double xPos, double yPos) const {
+    int index = 0;
+    int trailing = 0;
+    pango_layout_xy_to_index(this->getUpToDateLayout(), round_cast<int>(xPos * PANGO_SCALE),
+                             round_cast<int>(yPos * PANGO_SCALE), &index, &trailing);
+    /*
+     * trailing is non-zero iff the abscissa is past the middle of the grapheme.
+     * In this case, it contains the length of the grapheme in utf8 char count.
+     * This way, we put the cursor after the grapheme when clicking past the middle of the grapheme.
+     */
+    *iter = getIteratorAtByteOffset(this->buffer.get(), index);
+    gtk_text_iter_forward_chars(iter, trailing);
+}
+
+void TextEditor::updateTextElementContent() { this->textElement->setText(cloneToStdString(this->buffer.get())); }
+
+void TextEditor::contentsChanged(bool forceCreateUndoAction) {
+    // Todo: Reinstate text edition undo stack
+    this->layoutStatus = LayoutStatus::NEEDS_COMPLETE_UPDATE;
+    this->computeVirtualCursorPosition();
+}
+
+void TextEditor::markPos(double x, double y, bool extendSelection) {
+    GtkTextIter newplace = getIteratorAtCursor(this->buffer.get());
+
+    findPos(&newplace, x, y);
+
+    // call moveCursorIterator() even if the cursor hasn't moved, since it cancels the selection
+    moveCursorIterator(&newplace, extendSelection);
+    computeVirtualCursorPosition();
+}
+
+void TextEditor::mousePressed(double x, double y) {
+    this->mouseDown = true;
+    // Todo select if SHIFT is pressed
+    markPos(x, y, false);
+}
+
+void TextEditor::mouseMoved(double x, double y) {
+    if (this->mouseDown) {
+        markPos(x, y, true);
+    }
+}
+
+void TextEditor::mouseReleased() { this->mouseDown = false; }
+
+void TextEditor::jumpALine(GtkTextIter* textIter, int count) {
+    int cursorLine = gtk_text_iter_get_line(textIter);
+
+    if (cursorLine + count < 0) {
+        return;
+    }
+
+    PangoLayoutLine* line = pango_layout_get_line_readonly(this->layout.get(), cursorLine + count);
+    if (line == nullptr) {
+        return;
+    }
+
+    int index = 0;
+    int trailing = 0;
+    pango_layout_line_x_to_index(line, this->virtualCursorAbscissa, &index, &trailing);
+    /*
+     * trailing is non-zero iff the abscissa is past the middle of the grapheme.
+     * In this case, it contains the length of the grapheme in utf8 char count.
+     */
+    *textIter = getIteratorAtByteOffset(this->buffer.get(), index);
+    gtk_text_iter_forward_chars(textIter, trailing);
+}
+
+void TextEditor::computeVirtualCursorPosition() {
+    int offset = getByteOffsetOfCursor(this->buffer.get());
+
+    PangoRectangle rect = {0};
+    pango_layout_index_to_pos(this->getUpToDateLayout(), offset, &rect);
+    this->virtualCursorAbscissa = rect.x;
+}
+
+void TextEditor::moveCursorIterator(const GtkTextIter* newLocation, gboolean extendSelection) {
+    bool selectionChanged = true;
+    if (extendSelection) {
+        if (auto oldLoc = getIteratorAtCursor(this->buffer.get()); gtk_text_iter_equal(newLocation, &oldLoc)) {
+            // Nothing changed
+            return;
+        }
+        gtk_text_buffer_move_mark_by_name(this->buffer.get(), "insert", newLocation);
+        control->setCopyCutEnabled(gtk_text_buffer_get_has_selection(this->buffer.get()));
+    } else {
+        // if !extendSelection, we clear the selection even if the cursor does not move
+        selectionChanged = gtk_text_buffer_get_has_selection(this->buffer.get());
+        gtk_text_buffer_place_cursor(this->buffer.get(), newLocation);
+        control->setCopyCutEnabled(false);
+    }
+
+    if (this->cursorBlink) {
+        // Whenever the cursor moves, the blinking cycle restarts from the start (i.e. the cursor is first shown).
+        this->cursorVisible = false;  // Will be toggled to true by BlinkTimer::callback before the repaint
+        blinkCallback(this);
+    }
+
+    if (selectionChanged) {
+        // The selection background color is set through Pango attributes
+        this->layoutStatus = LayoutStatus::NEEDS_ATTRIBUTES_UPDATE;
+        // Repaint the entire box. Computing the exact area that was (un)selected would be better but complicated
+        this->repaintEditor(false);
+    } else {
+        repaintCursorAfterChange();
+    }
+}
+
+void TextEditor::updateCursorBox() {
+    this->cursorBox = computeCursorBox();
+
+    if (!viewPool->empty()) {
+        // Inform the IM of the cursor location (for word selection popup's location)
+        // We use the first view as the main view, as far as the IM is concerned
+        auto box = viewPool->front().toWindowCoordinates(xoj::util::Rectangle<double>(this->cursorBox));
+
+        GdkRectangle cursorRect;  // cursor position in window coordinates
+        cursorRect.x = static_cast<int>(box.x);
+        cursorRect.y = static_cast<int>(box.y);
+        cursorRect.height = static_cast<int>(box.height);
+        cursorRect.width = static_cast<int>(box.width);
+        gtk_im_context_set_cursor_location(this->imContext.get(), &cursorRect);
+    }
+}
+
+static auto whitespace(gunichar ch, gpointer user_data) -> gboolean { return (ch == ' ' || ch == '\t'); }
+
+static auto not_whitespace(gunichar ch, gpointer user_data) -> gboolean { return !whitespace(ch, user_data); }
+
+static auto find_whitepace_region(const GtkTextIter* center, GtkTextIter* start, GtkTextIter* end) -> gboolean {
+    *start = *center;
+    *end = *center;
+
+    if (gtk_text_iter_backward_find_char(start, not_whitespace, nullptr, nullptr)) {
+        gtk_text_iter_forward_char(start); /* we want the first whitespace... */
+    }
+    if (whitespace(gtk_text_iter_get_char(end), nullptr)) {
+        gtk_text_iter_forward_find_char(end, not_whitespace, nullptr, nullptr);
+    }
+
+    return !gtk_text_iter_equal(start, end);
+}
+
+void TextEditor::deleteFromCursor(GtkDeleteType type, int count) {
+
+    this->resetImContext();
+
+    if (type == GTK_DELETE_CHARS) {
+        // Char delete deletes the selection, if one exists
+        if (gtk_text_buffer_delete_selection(this->buffer.get(), true, true)) {
+            control->setCopyCutEnabled(false);
+            this->contentsChanged(true);
+            this->repaintEditor();
+            return;
+        }
+    }
+
+    GtkTextIter insert = getIteratorAtCursor(this->buffer.get());
+
+    GtkTextIter start = insert;
+    GtkTextIter end = insert;
+
+    switch (type) {
+        case GTK_DELETE_CHARS:
+            gtk_text_iter_forward_cursor_positions(&end, count);
+            break;
+
+        case GTK_DELETE_WORD_ENDS:
+            if (count > 0) {
+                gtk_text_iter_forward_word_ends(&end, count);
+            } else if (count < 0) {
+                gtk_text_iter_backward_word_starts(&start, 0 - count);
+            }
+            break;
+
+        case GTK_DELETE_WORDS:
+            break;
+
+        case GTK_DELETE_DISPLAY_LINE_ENDS:
+            break;
+
+        case GTK_DELETE_DISPLAY_LINES:
+            break;
+
+        case GTK_DELETE_PARAGRAPH_ENDS:
+            if (count > 0) {
+                /* If we're already at a newline, we need to
+                 * simply delete that newline, instead of
+                 * moving to the next one.
+                 */
+                if (gtk_text_iter_ends_line(&end)) {
+                    gtk_text_iter_forward_line(&end);
+                    --count;
+                }
+
+                while (count > 0) {
+                    if (!gtk_text_iter_forward_to_line_end(&end)) {
+                        break;
+                    }
+
+                    --count;
+                }
+            } else if (count < 0) {
+                if (gtk_text_iter_starts_line(&start)) {
+                    gtk_text_iter_backward_line(&start);
+                    if (!gtk_text_iter_ends_line(&end)) {
+                        gtk_text_iter_forward_to_line_end(&start);
+                    }
+                } else {
+                    gtk_text_iter_set_line_offset(&start, 0);
+                }
+                ++count;
+
+                gtk_text_iter_backward_lines(&start, -count);
+            }
+            break;
+
+        case GTK_DELETE_PARAGRAPHS:
+            if (count > 0) {
+                gtk_text_iter_set_line_offset(&start, 0);
+                gtk_text_iter_forward_to_line_end(&end);
+
+                /* Do the lines beyond the first. */
+                while (count > 1) {
+                    gtk_text_iter_forward_to_line_end(&end);
+                    --count;
+                }
+            }
+
+            break;
+
+        case GTK_DELETE_WHITESPACE: {
+            find_whitepace_region(&insert, &start, &end);
+        } break;
+
+        default:
+            break;
+    }
+
+    if (!gtk_text_iter_equal(&start, &end)) {
+        gtk_text_buffer_begin_user_action(this->buffer.get());
+
+        if (!gtk_text_buffer_delete_interactive(this->buffer.get(), &start, &end, true)) {
+            gtk_widget_error_bell(this->xournalWidget);
+        }
+
+        gtk_text_buffer_end_user_action(this->buffer.get());
+    } else {
+        gtk_widget_error_bell(this->xournalWidget);
+    }
+
+    this->contentsChanged();
+    this->repaintEditor();
+}
+
+void TextEditor::backspace() {
+
+    resetImContext();
+
+    // Backspace deletes the selection, if one exists
+    if (gtk_text_buffer_delete_selection(this->buffer.get(), true, true)) {
+        control->setCopyCutEnabled(false);
+        this->contentsChanged();
+        this->repaintEditor();
+        return;
+    }
+
+    GtkTextIter insert = getIteratorAtCursor(this->buffer.get());
+
+    if (gtk_text_buffer_backspace(this->buffer.get(), &insert, true, true)) {
+        this->contentsChanged();
+        this->repaintEditor();
+    } else {
+        gtk_widget_error_bell(this->xournalWidget);
+    }
+}
+
+void TextEditor::linebreak() {
+    this->resetImContext();
+    iMCommitCallback(nullptr, "\n", this);
+
+    control->getCursor()->setInvisible(true);
+}
+
+void TextEditor::tabulation() {
+    resetImContext();
+    Settings* settings = control->getSettings();
+    if (!settings->getUseSpacesAsTab()) {
+        iMCommitCallback(nullptr, "\t", this);
+    } else {
+        std::string indent(static_cast<size_t>(settings->getNumberOfSpacesForTab()), ' ');
+        iMCommitCallback(nullptr, indent.c_str(), this);
+    }
+
+    control->getCursor()->setInvisible(true);
+}
+
+
+void TextEditor::copyToClipboard() const {
+    auto* clipboard = gtk_widget_get_clipboard(this->xournalWidget);
+    gtk_text_buffer_copy_clipboard(this->buffer.get(), clipboard);
+}
+
+void TextEditor::cutToClipboard() {
+    auto* clipboard = gtk_widget_get_clipboard(this->xournalWidget);
+    gtk_text_buffer_cut_clipboard(this->buffer.get(), clipboard, true);
+
+    this->contentsChanged(true);
+    this->repaintEditor();
+}
+
+void TextEditor::pasteFromClipboard() {
+    auto* clipboard = gtk_widget_get_clipboard(this->xournalWidget);
+    gtk_text_buffer_paste_clipboard(this->buffer.get(), clipboard, nullptr, true);
+}
+
+void TextEditor::bufferPasteDoneCallback(GtkTextBuffer* buffer, GtkClipboard* clipboard, TextEditor* te) {
+    te->contentsChanged(true);
+    te->repaintEditor();
+}
+
+void TextEditor::resetImContext() {
+    if (this->needImReset) {
+        this->needImReset = false;
+        gtk_im_context_reset(this->imContext.get());
+    }
+}
+
+/*
+ * Blink!
+ */
+void TextEditor::blinkCallback(TextEditor* te) {
+    te->cursorVisible = !te->cursorVisible;
+    auto time = te->cursorVisible ? te->cursorBlinkingTimeOn : te->cursorBlinkingTimeOff;
+    te->blinkTimer = g_timeout_add(time, xoj::util::wrap_for_once_v<blinkCallback>, te);
+
+    Range dirtyRange = te->cursorBox;
+    dirtyRange.translate(te->textElement->getX(), te->textElement->getY());
+    te->viewPool->dispatch(xoj::view::TextEditionView::FLAG_DIRTY_REGION, dirtyRange);
+}
+
+void TextEditor::setTextToPangoLayout(PangoLayout* pl) const {
+    std::string_view preed(preeditString);
+
+    if (!preed.empty()) {
+        // When using an Input Method, we need to insert the preeditString into the text at the cursor location
+        std::string txt = cloneWithInsertToStdString(this->buffer.get(), preed);
+
+        int pos = getByteOffsetOfCursor(this->buffer.get());
+        xoj::util::PangoAttrListSPtr attrlist(pango_attr_list_new(), xoj::util::adopt);
+        pango_attr_list_splice(attrlist.get(), this->preeditAttrList.get(), pos, static_cast<int>(preed.length()));
+
+        pango_layout_set_attributes(pl, attrlist.get());
+
+        pango_layout_set_text(pl, txt.c_str(), static_cast<int>(txt.length()));
+    } else {
+        setSelectionAttributesToPangoLayout(pl);
+        pango_layout_set_text(pl, cloneToCString(this->buffer.get()).get(), -1);
+    }
+}
+
+Color TextEditor::getSelectionColor() const { return this->control->getSettings()->getSelectionColor(); }
+
+void TextEditor::setSelectionAttributesToPangoLayout(PangoLayout* pl) const {
+    xoj::util::PangoAttrListSPtr attrlist(pango_attr_list_new(), xoj::util::adopt);
+
+    GtkTextIter start;
+    GtkTextIter end;
+    bool hasSelection = gtk_text_buffer_get_selection_bounds(this->buffer.get(), &start, &end);
+
+    if (hasSelection) {
+        auto selectionColorU16 = Util::argb_to_ColorU16(this->getSelectionColor());
+        PangoAttribute* attrib =
+                pango_attr_background_new(selectionColorU16.red, selectionColorU16.green, selectionColorU16.blue);
+        attrib->start_index = static_cast<unsigned int>(getByteOffsetOfIterator(start));
+        attrib->end_index = static_cast<unsigned int>(getByteOffsetOfIterator(end));
+
+        pango_attr_list_insert(attrlist.get(), attrib);  // attrlist takes ownership of attrib
+    }
+
+    pango_layout_set_attributes(pl, attrlist.get());
+}
+
+auto TextEditor::computeBoundingBox() const -> Range {
+    /*
+     * NB: we cannot rely on Text::calcSize directly, since it would not take the size changes due to the IM
+     * preeditString into account.
+     */
+    int w = 0;
+    int h = 0;
+    pango_layout_get_size(getUpToDateLayout(), &w, &h);
+    double width = (static_cast<double>(w)) / PANGO_SCALE;
+    double height = (static_cast<double>(h)) / PANGO_SCALE;
+    double x = textElement->getX();
+    double y = textElement->getY();
+
+    // Warning: width can be negative (e.g. for languages written from right to left)
+    Range res(x, y);
+    res.addPoint(x + width, y + height);
+    return res;
+}
+
+auto TextEditor::getUpToDateLayout() const -> PangoLayout* {
+    switch (layoutStatus) {
+        case LayoutStatus::NEEDS_COMPLETE_UPDATE:
+            setTextToPangoLayout(this->layout.get());
+            break;
+        case LayoutStatus::NEEDS_ATTRIBUTES_UPDATE:
+            setSelectionAttributesToPangoLayout(this->layout.get());
+            break;
+        case LayoutStatus::UP_TO_DATE:
+            break;
+    }
+    layoutStatus = LayoutStatus::UP_TO_DATE;
+    return this->layout.get();
+}
+
+auto TextEditor::getCursorBox() const -> const Range& { return this->cursorBox; }
+
+auto TextEditor::getContentBoundingBox() const -> const Range& { return this->previousBoundingBox; }
+
+bool TextEditor::isCursorVisible() const { return cursorVisible; }
+
+auto TextEditor::computeCursorBox() const -> Range {
+    // Compute the bounding box of the active grapheme (i.e. the one just after the cursor)
+    int offset = getByteOffsetOfCursor(this->buffer.get());
+    if (this->preeditString && this->preeditCursor != 0) {
+        const gchar* preeditText = this->preeditString.get();
+        offset += static_cast<int>(g_utf8_offset_to_pointer(preeditText, preeditCursor) - preeditText);
+    }
+    PangoRectangle rect = {0};
+    pango_layout_index_to_pos(getUpToDateLayout(), offset, &rect);
+    const double ratio = 1.0 / PANGO_SCALE;
+
+    // Warning: rect.width could be negative (e.g. for languages written from right to left).
+    Range res(rect.x * ratio, rect.y * ratio);
+    res.addPoint((rect.x + (cursorOverwrite ? rect.width : 0.0)) * ratio, (rect.y + rect.height) * ratio);
+    return res;
+}
+
+void TextEditor::repaintEditor(bool sizeChanged) {
+    Range dirtyRange(this->previousBoundingBox);
+    if (sizeChanged) {
+        this->previousBoundingBox = this->computeBoundingBox();
+        dirtyRange = dirtyRange.unite(this->previousBoundingBox);
+    }
+    this->updateCursorBox();
+    this->viewPool->dispatch(xoj::view::TextEditionView::FLAG_DIRTY_REGION, dirtyRange);
+}
+
+void TextEditor::repaintCursorAfterChange() {
+    Range dirtyRange = this->cursorBox;
+    this->updateCursorBox();
+    dirtyRange = dirtyRange.unite(this->cursorBox);
+    dirtyRange.translate(this->textElement->getX(), this->textElement->getY());
+    this->viewPool->dispatch(xoj::view::TextEditionView::FLAG_DIRTY_REGION, dirtyRange);
+}
+
+void TextEditor::finalizeEdition() {
+
+    auto* doc = this->control->getDocument();
+    UndoRedoHandler* undo = this->control->getUndoRedoHandler();
+
+    this->control->setFontSelected(this->control->getSettings()->getFont());
+
+    if (this->bufferEmpty()) {
+        // Delete the edited element from layer
+        if (originalTextElement) {
+            auto eraseDeleteUndoAction = std::make_unique<DeleteUndoAction>(page, true);
+            doc->lock();
+            Layer* layer = this->page->getSelectedLayer();
+            auto [orig, elementIndex] = layer->removeElement(originalTextElement);
+            doc->unlock();
+            if (elementIndex != Element::InvalidIndex) [[likely]] {
+                eraseDeleteUndoAction->addElement(layer, std::move(orig), elementIndex);
+                undo->addUndoAction(std::move(eraseDeleteUndoAction));
+            }  // A warning has already been issued otherwise
+            originalTextElement = nullptr;
+        }
+        this->viewPool->dispatchAndClear(xoj::view::TextEditionView::FINALIZATION_REQUEST, this->previousBoundingBox);
+        return;
+    }
+
+    this->updateTextElementContent();
+    if (originalTextElement) {
+        // Modifying a preexisting element
+        this->viewPool->dispatchAndClear(xoj::view::TextEditionView::FINALIZATION_REQUEST, this->previousBoundingBox);
+
+        doc->lock();
+        Layer* layer = this->page->getSelectedLayer();
+        auto [orig, _] = layer->removeElement(this->originalTextElement);
+        auto ptr = this->textElement.get();
+        layer->addElement(std::move(this->textElement));
+        doc->unlock();
+
+        this->page->fireElementChanged(ptr);
+
+        if (orig) [[likely]] {
+            xoj_assert(orig.get() == this->originalTextElement);
+            this->originalTextElement->setInEditing(false);
+            undo->addUndoAction(std::make_unique<TextBoxUndoAction>(this->page, layer, ptr, std::move(orig)));
+        } else {
+            // A warning has already been issued
+            undo->addUndoAction(std::make_unique<InsertUndoAction>(this->page, layer, ptr));
+        }
+        originalTextElement = nullptr;
+    } else {
+        // Creating a new element
+        auto ptr = this->textElement.get();
+        doc->lock();
+        Layer* layer = this->page->getSelectedLayer();
+        layer->addElement(std::move(this->textElement));
+        doc->unlock();
+        this->viewPool->dispatchAndClear(xoj::view::TextEditionView::FINALIZATION_REQUEST, this->previousBoundingBox);
+        this->page->fireElementChanged(ptr);
+        undo->addUndoAction(std::make_unique<InsertUndoAction>(page, layer, ptr));
+    }
+}
+
+void TextEditor::initializeEditionAt(double x, double y) {
+    // Is there already a textfield?
+    Text* text = nullptr;
+
+    // Should we reverse this loop to select the most recent text rather than the oldest?
+    for (auto&& e: this->page->getSelectedLayer()->getElements()) {
+        if (e->getType() == ELEMENT_TEXT) {
+            GdkRectangle matchRect = {gint(x), gint(y), 1, 1};
+            if (e->intersectsArea(&matchRect)) {
+                text = dynamic_cast<Text*>(e.get());
+                break;
+            }
+        }
+    }
+
+    if (text == nullptr) {
+        ToolHandler* h = this->control->getToolHandler();
+        this->textElement = std::make_unique<Text>();
+        this->textElement->setColor(h->getColor());
+        this->textElement->setFont(control->getSettings()->getFont());
+        this->textElement->setX(x);
+        this->textElement->setY(y - this->textElement->getElementHeight() / 2);
+
+#ifdef ENABLE_AUDIO
+        if (auto audioController = control->getAudioController(); audioController && audioController->isRecording()) {
+            fs::path audioFilename = audioController->getAudioFilename();
+            size_t sttime = audioController->getStartTime();
+            size_t milliseconds = (as_unsigned(g_get_monotonic_time() / 1000) - sttime);
+            this->textElement->setTimestamp(milliseconds);
+            this->textElement->setAudioFilename(audioFilename);
+        }
+#endif
+        this->originalTextElement = nullptr;
+    } else {
+        this->control->setFontSelected(text->getFont());
+        this->originalTextElement = text;
+
+        this->textElement = text->cloneText();
+
+        text->setInEditing(true);
+        this->page->fireElementChanged(text);
+    }
+    this->layout = this->textElement->createPangoLayout();
+    this->previousBoundingBox = Range(this->textElement->boundingRect());
+    this->replaceBufferContent(this->textElement->getText());
+}
diff --git a/entry/src/main/cpp/src/core/control/tools/TextEditor.h b/entry/src/main/cpp/src/core/control/tools/TextEditor.h
new file mode 100644
index 0000000..ac03712
--- /dev/null
+++ b/entry/src/main/cpp/src/core/control/tools/TextEditor.h
@@ -0,0 +1,214 @@
+/*
+ * Xournal++
+ *
+ * Text editor gui (for Text Tool)
+ *
+ * @author Xournal++ Team
+ * https://github.com/xournalpp/xournalpp
+ *
+ * @license GNU GPLv2 or later
+ */
+
+#pragma once
+
+#include <string>  // for string
+
+#include <gdk/gdk.h>      // for GdkEventKey
+#include <glib.h>         // for gint, gboolean, gchar
+#include <gtk/gtk.h>      // for GtkIMContext, GtkTextIter, GtkWidget
+#include <pango/pango.h>  // for PangoAttrList, PangoLayout
+
+#include "model/OverlayBase.h"
+#include "model/PageRef.h"  // for PageRef
+#include "util/Color.h"     // for Color
+#include "util/Range.h"
+#include "util/raii/CStringWrapper.h"
+#include "util/raii/GObjectSPtr.h"
+#include "util/raii/GSourceURef.h"
+#include "util/raii/PangoSPtr.h"
+
+class Text;
+class XojFont;
+class Control;
+class TextEditorCallbacks;
+struct KeyEvent;
+
+namespace xoj::util {
+template <class T>
+class DispatchPool;
+};
+
+namespace xoj::view {
+class TextEditionView;
+};
+
+class TextEditor: public OverlayBase {
+public:
+    TextEditor(Control* control, const PageRef& page, GtkWidget* xournalWidget, double x, double y);
+    virtual ~TextEditor();
+
+    /** Represents the different kinds of text selection */
+    enum class SelectType { WORD, PARAGRAPH, ALL };
+
+    bool onKeyPressEvent(const KeyEvent& event);
+    bool onKeyReleaseEvent(const KeyEvent& event);
+    void mousePressed(double x, double y);
+    void mouseMoved(double x, double y);
+    void mouseReleased();
+
+    /**
+     * @brief Returns a pointer to the edited Text element.
+     * Warning: The content of the Text element does not need to be up to date with the buffer's content
+     * Use `updateTextElementContent` to sync them
+     */
+    Text* getTextElement() const;
+
+    bool bufferEmpty() const;
+
+    void setFont(XojFont font);
+    void setColor(Color color);
+
+    PangoLayout* getUpToDateLayout() const;
+
+    const std::shared_ptr<xoj::util::DispatchPool<xoj::view::TextEditionView>>& getViewPool() const;
+
+    Color getSelectionColor() const;
+
+    const Range& getCursorBox() const;
+    const Range& getContentBoundingBox() const;
+
+    bool isCursorVisible() const;
+
+    void deleteFromCursor(GtkDeleteType type, int count);
+    void copyToClipboard() const;
+    void cutToClipboard();
+    void pasteFromClipboard();
+    void selectAtCursor(TextEditor::SelectType ty);
+
+private:
+    void toggleOverwrite();
+    void toggleBoldFace();
+    void increaseFontSize();
+    void decreaseFontSize();
+    void moveCursor(GtkMovementStep step, int count, bool extendSelection);
+    void backspace();
+    void linebreak();
+    void tabulation();
+
+    void afterFontChange();
+    void replaceBufferContent(const std::string& text);
+
+    void finalizeEdition();
+    void initializeEditionAt(double x, double y);
+
+private:
+    /**
+     * @brief Add the text to the provided Pango layout.
+     * The added text contains both this->text, and the preedit string of the Input Method (this->preeditstring)
+     * This function also sets up the attributes of the preedit string (typically underlined)
+     */
+    void setTextToPangoLayout(PangoLayout* pl) const;
+
+    void setSelectionAttributesToPangoLayout(PangoLayout* pl) const;
+
+    Range computeBoundingBox() const;
+    void repaintEditor(bool sizeChanged = true);
+
+    /**
+     * @brief Compute the cursor's location
+     * @return The bounding box of the cursor, in TextBox coordinates (i.e relative to the text box upper left corner)
+     *          The bounding box is returned even if the cursor is currently not visible (blinking...)
+     * WARNING: The returned box may have width == 0 (if in insertion mode or at the end of a line). In this case, the
+     *          width of the displayed cursor should be decided by the view class (depending on zoom for instance)
+     */
+    Range computeCursorBox() const;
+
+    void repaintCursorAfterChange();
+    void resetImContext();
+
+    static void bufferPasteDoneCallback(GtkTextBuffer* buffer, GtkClipboard* clipboard, TextEditor* te);
+
+    static void iMCommitCallback(GtkIMContext* context, const gchar* str, TextEditor* te);
+    static void iMPreeditChangedCallback(GtkIMContext* context, TextEditor* te);
+    static bool iMRetrieveSurroundingCallback(GtkIMContext* context, TextEditor* te);
+    static bool imDeleteSurroundingCallback(GtkIMContext* context, gint offset, gint n_chars, TextEditor* te);
+
+    void moveCursorIterator(const GtkTextIter* newLocation, gboolean extendSelection);
+
+    void computeVirtualCursorPosition();
+    void jumpALine(GtkTextIter* textIter, int count);
+
+    void findPos(GtkTextIter* iter, double x, double y) const;
+    void markPos(double x, double y, bool extendSelection);
+
+    void contentsChanged(bool forceCreateUndoAction = false);
+    void updateCursorBox();
+
+    void updateTextElementContent();
+
+    static void blinkCallback(TextEditor* te);
+
+private:
+    Control* control;
+    PageRef page;
+
+    /**
+     * @brief Pointer to the main window's widget. Used for fetching settings and clipboards, and ringing the bell.
+     */
+    GtkWidget* xournalWidget;
+
+    /**
+     * @brief Text element under edition, clone of the original Text element (if any)
+     */
+    std::unique_ptr<Text> textElement;
+    Text* originalTextElement;
+
+    xoj::util::GObjectSPtr<GtkIMContext> imContext;
+    xoj::util::GObjectSPtr<GtkTextBuffer> buffer;
+    xoj::util::GObjectSPtr<PangoLayout> layout;
+
+    enum class LayoutStatus { UP_TO_DATE, NEEDS_ATTRIBUTES_UPDATE, NEEDS_COMPLETE_UPDATE };
+    mutable LayoutStatus layoutStatus;
+
+    // InputMethod preedit data
+    int preeditCursor;
+    xoj::util::PangoAttrListSPtr preeditAttrList;
+    xoj::util::OwnedCString preeditString;
+
+    /**
+     * @brief Tracks the bounding box of the editor from the last render.
+     *
+     * Because adding or deleting lines may cause the size of the bounding box to change,
+     * we need to repaint the union of the current and previous bboxes.
+     */
+    Range previousBoundingBox;
+    Range cursorBox;
+
+    std::shared_ptr<xoj::util::DispatchPool<xoj::view::TextEditionView>> viewPool;
+
+    /**
+     * @brief Coordinate of the virtual cursor, in Pango coordinates.
+     * (The virtual cursor is used when moving the cursor vertically (e.g. pressing up arrow), to get a good "vertical
+     * move" feeling, even if we pass by (say) an empty line)
+     */
+    int virtualCursorAbscissa = 0;
+
+    // cursor blinking timings. In millisecond.
+    unsigned int cursorBlinkingTimeOn = 0;
+    unsigned int cursorBlinkingTimeOff = 0;
+    xoj::util::GSourceURef blinkTimer;
+    bool cursorBlink = true;
+
+    bool needImReset = false;
+    bool mouseDown = false;
+    bool cursorOverwrite = false;
+    bool cursorVisible = false;
+
+    // In a blinking period, how much time is the cursor visible vs not visible
+    static constexpr unsigned int CURSOR_ON_MULTIPLIER = 2;
+    static constexpr unsigned int CURSOR_OFF_MULTIPLIER = 1;
+    static constexpr unsigned int CURSOR_DIVIDER = CURSOR_ON_MULTIPLIER + CURSOR_OFF_MULTIPLIER;
+
+    struct KeyBindings;
+    static const KeyBindings keyBindings;
+};
diff --git a/entry/src/main/cpp/src/core/control/tools/TextEditorKeyBindings.h b/entry/src/main/cpp/src/core/control/tools/TextEditorKeyBindings.h
new file mode 100644
index 0000000..2940921
--- /dev/null
+++ b/entry/src/main/cpp/src/core/control/tools/TextEditorKeyBindings.h
@@ -0,0 +1,150 @@
+/*
+ * Xournal++
+ *
+ * Key bindings for text editor event handling
+ *
+ * @author Xournal++ Team
+ * https://github.com/xournalpp/xournalpp
+ *
+ * @license GNU GPLv2 or later
+ */
+
+#pragma once
+
+#include <cstdint>
+#include <unordered_map>
+
+#include <gdk/gdkevents.h>
+#include <gdk/gdkkeysyms.h>
+
+#include "gui/inputdevices/InputEvents.h"
+#include "util/gdk4_helper.h"
+
+#include "TextEditor.h"
+
+struct PressedModifier {
+    constexpr explicit PressedModifier(GdkModifierType mod): mod(mod) {}
+    constexpr PressedModifier operator&(PressedModifier o) const {
+        return PressedModifier((GdkModifierType)(mod | o.mod));
+    }
+
+    GdkModifierType mod;
+};
+constexpr PressedModifier NONE{(GdkModifierType)0};
+constexpr PressedModifier CTRL(GDK_CONTROL_MASK);
+constexpr PressedModifier SHIFT(GDK_SHIFT_MASK);
+
+struct TextEditor::KeyBindings {
+    using hash_type = uint64_t;
+    using keyval_type = std::invoke_result_t<decltype(gdk_key_event_get_keyval), GdkEvent*>;
+    static_assert(std::is_same<keyval_type, guint>::value);
+    using mapped_type = void (*)(TextEditor*);
+    using value_type = std::pair<const hash_type, mapped_type>;
+    static_assert(sizeof(PressedModifier) + sizeof(keyval_type) == sizeof(hash_type));
+
+    KeyBindings(std::initializer_list<value_type> list): table(list) {}
+
+    static constexpr hash_type hash(PressedModifier mod, keyval_type keyval) {
+        return (static_cast<hash_type>(keyval) | (static_cast<hash_type>(mod.mod) << 32));
+    }
+
+    static hash_type hash(const KeyEvent& e) { return hash(PressedModifier(e.state), e.keyval); }
+    std::unordered_map<hash_type, mapped_type> table;
+
+    bool processEvent(TextEditor* te, const KeyEvent& e) const {
+        auto it = table.find(hash(e));
+        if (it == table.end()) {
+            return false;
+        }
+        it->second(te);
+        return true;
+    }
+};
+
+template <auto fun, auto... a>
+void wrap(TextEditor* te) {
+    (te->*fun)(a...);
+}
+
+#define move_binding(mod, key, mvt, dir)                                                                    \
+    {KeyBindings::hash(mod, GDK_KEY_##key), wrap<&TextEditor::moveCursor, mvt, dir, false>},                \
+            {KeyBindings::hash(mod & SHIFT, GDK_KEY_##key), wrap<&TextEditor::moveCursor, mvt, dir, true>}, \
+            {KeyBindings::hash(mod, GDK_KEY_KP_##key), wrap<&TextEditor::moveCursor, mvt, dir, false>}, {   \
+        KeyBindings::hash(mod& SHIFT, GDK_KEY_KP_##key), wrap<&TextEditor::moveCursor, mvt, dir, true>      \
+    }
+
+const TextEditor::KeyBindings TextEditor::keyBindings(
+        {move_binding(NONE, Right, GTK_MOVEMENT_VISUAL_POSITIONS, 1),
+         move_binding(NONE, Left, GTK_MOVEMENT_VISUAL_POSITIONS, -1),
+         move_binding(CTRL, Right, GTK_MOVEMENT_WORDS, 1),
+         move_binding(CTRL, Left, GTK_MOVEMENT_WORDS, -1),
+         move_binding(NONE, Up, GTK_MOVEMENT_DISPLAY_LINES, -1),
+         move_binding(NONE, Down, GTK_MOVEMENT_DISPLAY_LINES, 1),
+         move_binding(CTRL, Up, GTK_MOVEMENT_PARAGRAPHS, -1),
+         move_binding(CTRL, Down, GTK_MOVEMENT_PARAGRAPHS, 1),
+         move_binding(NONE, Home, GTK_MOVEMENT_DISPLAY_LINE_ENDS, -1),
+         move_binding(NONE, End, GTK_MOVEMENT_DISPLAY_LINE_ENDS, 1),
+         move_binding(CTRL, Home, GTK_MOVEMENT_BUFFER_ENDS, -1),
+         move_binding(CTRL, End, GTK_MOVEMENT_BUFFER_ENDS, 1),
+         move_binding(NONE, Page_Up, GTK_MOVEMENT_PAGES, -1),
+         move_binding(NONE, Page_Down, GTK_MOVEMENT_PAGES, 1),
+         move_binding(CTRL, Page_Up, GTK_MOVEMENT_HORIZONTAL_PAGES, -1),
+         move_binding(CTRL, Page_Down, GTK_MOVEMENT_HORIZONTAL_PAGES, 1),
+
+
+         {KeyBindings::hash(CTRL, GDK_KEY_a), wrap<&TextEditor::selectAtCursor, TextEditor::SelectType::ALL>},
+         {KeyBindings::hash(CTRL, GDK_KEY_slash), wrap<&TextEditor::selectAtCursor, TextEditor::SelectType::ALL>},
+
+         {KeyBindings::hash(NONE, GDK_KEY_Delete), wrap<&TextEditor::deleteFromCursor, GTK_DELETE_CHARS, 1>},
+         {KeyBindings::hash(NONE, GDK_KEY_KP_Delete), wrap<&TextEditor::deleteFromCursor, GTK_DELETE_CHARS, 1>},
+
+         {KeyBindings::hash(NONE, GDK_KEY_BackSpace), wrap<&TextEditor::backspace>},
+         {KeyBindings::hash(SHIFT, GDK_KEY_BackSpace), wrap<&TextEditor::backspace>},
+
+
+         {KeyBindings::hash(CTRL, GDK_KEY_Delete), wrap<&TextEditor::deleteFromCursor, GTK_DELETE_WORD_ENDS, 1>},
+         {KeyBindings::hash(CTRL, GDK_KEY_KP_Delete), wrap<&TextEditor::deleteFromCursor, GTK_DELETE_WORD_ENDS, 1>},
+         {KeyBindings::hash(CTRL, GDK_KEY_BackSpace), wrap<&TextEditor::deleteFromCursor, GTK_DELETE_WORD_ENDS, -1>},
+
+         {KeyBindings::hash(CTRL & SHIFT, GDK_KEY_Delete),
+          wrap<&TextEditor::deleteFromCursor, GTK_DELETE_PARAGRAPH_ENDS, 1>},
+         {KeyBindings::hash(CTRL & SHIFT, GDK_KEY_KP_Delete),
+          wrap<&TextEditor::deleteFromCursor, GTK_DELETE_PARAGRAPH_ENDS, 1>},
+         {KeyBindings::hash(CTRL & SHIFT, GDK_KEY_BackSpace),
+          wrap<&TextEditor::deleteFromCursor, GTK_DELETE_PARAGRAPH_ENDS, -1>},
+
+         {KeyBindings::hash(CTRL, GDK_KEY_x), wrap<&TextEditor::cutToClipboard>},
+         {KeyBindings::hash(NONE, GDK_KEY_Cut), wrap<&TextEditor::cutToClipboard>},
+         {KeyBindings::hash(SHIFT, GDK_KEY_Delete), wrap<&TextEditor::cutToClipboard>},
+
+         {KeyBindings::hash(CTRL, GDK_KEY_c), wrap<&TextEditor::copyToClipboard>},
+         {KeyBindings::hash(NONE, GDK_KEY_Copy), wrap<&TextEditor::copyToClipboard>},
+         {KeyBindings::hash(CTRL, GDK_KEY_Insert), wrap<&TextEditor::copyToClipboard>},
+
+         {KeyBindings::hash(CTRL, GDK_KEY_v), wrap<&TextEditor::pasteFromClipboard>},
+         {KeyBindings::hash(NONE, GDK_KEY_Paste), wrap<&TextEditor::pasteFromClipboard>},
+         {KeyBindings::hash(SHIFT, GDK_KEY_Insert), wrap<&TextEditor::pasteFromClipboard>},
+
+         {KeyBindings::hash(NONE, GDK_KEY_Insert), wrap<&TextEditor::toggleOverwrite>},
+         {KeyBindings::hash(NONE, GDK_KEY_KP_Insert), wrap<&TextEditor::toggleOverwrite>},
+
+         {KeyBindings::hash(CTRL, GDK_KEY_b), wrap<&TextEditor::toggleBoldFace>},
+         {KeyBindings::hash(CTRL, GDK_KEY_B), wrap<&TextEditor::toggleBoldFace>},
+
+         {KeyBindings::hash(CTRL, GDK_KEY_plus), wrap<&TextEditor::increaseFontSize>},
+         {KeyBindings::hash(CTRL, GDK_KEY_KP_Add), wrap<&TextEditor::increaseFontSize>},
+
+         {KeyBindings::hash(CTRL, GDK_KEY_minus), wrap<&TextEditor::decreaseFontSize>},
+         {KeyBindings::hash(CTRL, GDK_KEY_KP_Subtract), wrap<&TextEditor::decreaseFontSize>},
+
+         {KeyBindings::hash(NONE, GDK_KEY_Return), wrap<&TextEditor::linebreak>},
+         {KeyBindings::hash(NONE, GDK_KEY_ISO_Enter), wrap<&TextEditor::linebreak>},
+         {KeyBindings::hash(NONE, GDK_KEY_KP_Enter), wrap<&TextEditor::linebreak>},
+
+         {KeyBindings::hash(NONE, GDK_KEY_Tab), wrap<&TextEditor::tabulation>},
+         {KeyBindings::hash(NONE, GDK_KEY_KP_Tab), wrap<&TextEditor::tabulation>},
+         {KeyBindings::hash(NONE, GDK_KEY_ISO_Left_Tab), wrap<&TextEditor::tabulation>},
+         // Backwards tabulation (deindentation) is not implemented. Do as forward tabulation
+         {KeyBindings::hash(SHIFT, GDK_KEY_Tab), wrap<&TextEditor::tabulation>},
+         {KeyBindings::hash(SHIFT, GDK_KEY_KP_Tab), wrap<&TextEditor::tabulation>},
+         {KeyBindings::hash(SHIFT, GDK_KEY_ISO_Left_Tab), wrap<&TextEditor::tabulation>}});
diff --git a/entry/src/main/cpp/src/core/control/tools/VerticalToolHandler.cpp b/entry/src/main/cpp/src/core/control/tools/VerticalToolHandler.cpp
new file mode 100644
index 0000000..e6f3305
--- /dev/null
+++ b/entry/src/main/cpp/src/core/control/tools/VerticalToolHandler.cpp
@@ -0,0 +1,143 @@
+#include "VerticalToolHandler.h"
+
+#include <algorithm>  // for max, min, minmax
+#include <memory>     // for __shared_ptr_access
+
+#include <cairo.h>           // for cairo_fill, cairo_...
+#include <gdk/gdkkeysyms.h>  // for GDK_KEY_Control_L
+
+#include "control/Control.h"                       // for Control
+#include "control/tools/SnapToGridInputHandler.h"  // for SnapToGridInputHan...
+#include "gui/LegacyRedrawable.h"                  // for Redrawable
+#include "gui/inputdevices/InputEvents.h"          // for KeyEvent
+#include "model/Document.h"                        // for Document
+#include "model/Element.h"                         // for Element
+#include "model/Layer.h"                           // for Layer
+#include "model/XojPage.h"                         // for XojPage
+#include "undo/MoveUndoAction.h"                   // for MoveUndoAction
+#include "util/DispatchPool.h"
+#include "view/overlays/VerticalToolView.h"
+
+VerticalToolHandler::VerticalToolHandler(const PageRef& page, Control* control, double y, bool initiallyReverse):
+        page(page),
+        layer(this->page->getSelectedLayer()),
+        control(control),
+        spacingSide(initiallyReverse ? Side::Above : Side::Below),
+        snappingHandler(control->getSettings()),
+        viewPool(std::make_shared<xoj::util::DispatchPool<xoj::view::VerticalToolView>>()) {
+    snappingHandler.setPageRef(page);
+    double ySnapped = snappingHandler.snapVertically(y, false);
+    this->startY = ySnapped;
+    this->endY = ySnapped;
+
+    this->adoptElements(this->spacingSide);
+}
+
+VerticalToolHandler::~VerticalToolHandler() = default;
+
+void VerticalToolHandler::adoptElements(const Side side) {
+    this->spacingSide = side;
+
+    auto* doc = this->control->getDocument();
+    doc->lock();
+    // Return current elements back to page
+    for (auto&& e: this->elements) {
+        this->layer->addElement(std::move(e));
+    }
+    this->elements.clear();
+
+    // Add new elements based on position
+    for (const Element* e: this->layer->getElementsView().clone()) {
+        if ((side == Side::Below && e->getY() >= this->startY) ||
+            (side == Side::Above && e->getY() + e->getElementHeight() <= this->startY)) {
+            this->elements.push_back(this->layer->removeElement(e).e);
+        }
+    }
+    doc->unlock();
+
+    Range rg = this->ownedElementsOriginalBoundingBox;
+    this->ownedElementsOriginalBoundingBox = this->computeElementsBoundingBox();
+    rg = rg.unite(this->ownedElementsOriginalBoundingBox);
+    if (!rg.empty()) {
+        this->page->fireRangeChanged(rg);
+    }
+}
+
+void VerticalToolHandler::currentPos(double x, double y) {
+    double ySnapped = snappingHandler.snapVertically(y, false);
+    if (this->endY == ySnapped) {
+        return;
+    }
+    this->endY = ySnapped;
+    this->viewPool->dispatch(xoj::view::VerticalToolView::SET_VERTICAL_SHIFT_REQUEST, ySnapped);
+}
+
+bool VerticalToolHandler::onKeyPressEvent(const KeyEvent& event) {
+    if ((event.keyval == GDK_KEY_Control_L || event.keyval == GDK_KEY_Control_R) && this->spacingSide == Side::Below) {
+        this->adoptElements(Side::Above);
+        this->viewPool->dispatch(xoj::view::VerticalToolView::SWITCH_DIRECTION_REQUEST);
+        return true;
+    }
+    return false;
+}
+
+bool VerticalToolHandler::onKeyReleaseEvent(const KeyEvent& event) {
+    if ((event.keyval == GDK_KEY_Control_L || event.keyval == GDK_KEY_Control_R) && this->spacingSide == Side::Above) {
+        this->adoptElements(Side::Below);
+        this->viewPool->dispatch(xoj::view::VerticalToolView::SWITCH_DIRECTION_REQUEST);
+        return true;
+    }
+    return false;
+}
+
+auto VerticalToolHandler::refElements() const -> std::vector<Element*> {
+    auto result = std::vector<Element*>(this->elements.size());
+    std::transform(this->elements.begin(), this->elements.end(), result.begin(), [](auto const& e) { return e.get(); });
+    return result;
+}
+
+void VerticalToolHandler::forEachElement(std::function<void(const Element*)> f) const {
+    for (auto const& e: this->elements) {
+        f(e.get());
+    }
+}
+
+auto VerticalToolHandler::computeElementsBoundingBox() const -> Range {
+    Range rg;
+    for (auto const& e: this->elements) {
+        rg = rg.unite(Range(e->boundingRect()));
+    }
+    return rg;
+}
+
+auto VerticalToolHandler::finalize() -> std::unique_ptr<MoveUndoAction> {
+
+    // Erase the blue area indicating the shift
+    this->viewPool->dispatchAndClear(xoj::view::VerticalToolView::FINALIZATION_REQUEST);
+
+    if (this->elements.empty()) {
+        return nullptr;
+    }
+
+    const double dY = this->endY - this->startY;
+    auto undo = std::make_unique<MoveUndoAction>(this->layer, this->page, this->refElements(), 0, dY, this->layer,
+                                                 this->page);
+
+    for (auto&& e: this->elements) {
+        e->move(0, dY);
+        this->layer->addElement(std::move(e));
+    }
+    this->elements.clear();
+
+    this->ownedElementsOriginalBoundingBox.translate(0, dY);
+    page->fireRangeChanged(this->ownedElementsOriginalBoundingBox);
+
+    return undo;
+}
+
+double VerticalToolHandler::getPageWidth() const { return page->getWidth(); }
+
+auto VerticalToolHandler::createView(xoj::view::Repaintable* parent, ZoomControl* zoomControl,
+                                     const Settings* settings) const -> std::unique_ptr<xoj::view::OverlayView> {
+    return std::make_unique<xoj::view::VerticalToolView>(this, parent, zoomControl, settings);
+}
diff --git a/entry/src/main/cpp/src/core/control/tools/VerticalToolHandler.h b/entry/src/main/cpp/src/core/control/tools/VerticalToolHandler.h
new file mode 100644
index 0000000..997bfd5
--- /dev/null
+++ b/entry/src/main/cpp/src/core/control/tools/VerticalToolHandler.h
@@ -0,0 +1,135 @@
+/*
+ * Xournal++
+ *
+ * Vertical Space tool
+ *
+ * @author Xournal++ Team
+ * https://github.com/xournalpp/xournalpp
+ *
+ * @license GNU GPLv2 or later
+ */
+
+#pragma once
+
+#include <memory>    // for unique_ptr
+#include <vector>    // for vector
+
+#include <cairo.h>  // for cairo_surface_t, cairo_t
+
+#include "model/ElementContainer.h"  // for ElementContainer
+#include "model/OverlayBase.h"
+#include "model/PageRef.h"  // for PageRef
+#include "util/Range.h"
+
+#include "SnapToGridInputHandler.h"  // for SnapToGridInputHandler
+
+class Element;
+class Layer;
+class MoveUndoAction;
+class Control;
+class ZoomControl;
+struct KeyEvent;
+
+using ElementPtr = std::unique_ptr<Element>;
+
+namespace xoj::view {
+class OverlayView;
+class Repaintable;
+class VerticalToolView;
+};  // namespace xoj::view
+
+namespace xoj::util {
+template <class T>
+class DispatchPool;
+};  // namespace xoj::util
+
+/**
+ * Handler class for the Vertical Spacing tool.
+ */
+class VerticalToolHandler: public ElementContainer, public OverlayBase {
+public:
+    /**
+     * @param initiallyReverse Set this to true if the user has the reverse mode
+     * button (e.g., Ctrl) held down when a vertical selection is started.
+     */
+    VerticalToolHandler(const PageRef& page, Control* control, double y, bool initiallyReverse);
+    ~VerticalToolHandler() override;
+    VerticalToolHandler(VerticalToolHandler&) = delete;
+    VerticalToolHandler& operator=(VerticalToolHandler&) = delete;
+    VerticalToolHandler(VerticalToolHandler&&) = delete;
+    VerticalToolHandler&& operator=(VerticalToolHandler&&) = delete;
+
+    /** Update the tool state with the new spacing position */
+    void currentPos(double x, double y);
+
+    bool onKeyPressEvent(const KeyEvent& event);
+    bool onKeyReleaseEvent(const KeyEvent& event);
+
+    std::unique_ptr<MoveUndoAction> finalize();
+
+    void forEachElement(std::function<void(const Element*)> f) const override;
+
+    auto createView(xoj::view::Repaintable* parent, ZoomControl* zoomControl, const Settings* settings) const
+            -> std::unique_ptr<xoj::view::OverlayView>;
+
+    enum class Side {
+        /** elements above the reference line */
+        Above = -1,
+        /** elements below the reference line */
+        Below = 1,
+    };
+
+    inline double getStartY() const { return startY; }
+    inline double getEndY() const { return endY; }
+    inline Side getSide() const { return spacingSide; }
+    double getPageWidth() const;
+
+    inline auto getViewPool() const -> std::shared_ptr<xoj::util::DispatchPool<xoj::view::VerticalToolView>> {
+        return viewPool;
+    }
+
+private:
+    /**
+     * Returns a vector of pointers to the elements we have adopted
+     * This function copies the element ptrs into a new vector
+     */
+    auto refElements() const -> std::vector<Element*>;
+    /**
+     * Clear the currently moved elements, and then select all elements
+     * above/below startY (depending on the side) to use for the spacing.
+     * Lastly, redraw the elements to the buffer.
+     */
+    void adoptElements(Side side);
+
+    /**
+     * @brief Get the bounding range of the collection of elements we have adopted
+     * @return The returned range may be empty if no elements have been adopted
+     */
+    Range computeElementsBoundingBox() const;
+
+
+    PageRef page;
+    Layer* layer;
+    std::vector<ElementPtr> elements;
+    Control* control;
+    /**
+     * @brief Stores the smallest box containing all the adopted elements.
+     *     Used to only refresh the part of the screen that needs refreshing.
+     */
+    Range ownedElementsOriginalBoundingBox;
+
+    double startY;
+    double endY;
+
+    /**
+     * Indicates whether to move elements above or below the anchor line.
+     */
+    Side spacingSide;
+
+    /**
+     * The handler for snapping points
+     */
+    SnapToGridInputHandler snappingHandler;
+
+    std::shared_ptr<xoj::util::DispatchPool<xoj::view::VerticalToolView>> viewPool;
+};
diff --git a/entry/src/main/cpp/src/core/control/xml/Attribute.cpp b/entry/src/main/cpp/src/core/control/xml/Attribute.cpp
new file mode 100644
index 0000000..c7f110d
--- /dev/null
+++ b/entry/src/main/cpp/src/core/control/xml/Attribute.cpp
@@ -0,0 +1,9 @@
+#include "Attribute.h"
+
+#include <utility>
+
+XMLAttribute::XMLAttribute(std::string name): name(std::move(name)) {}
+
+XMLAttribute::~XMLAttribute() = default;
+
+auto XMLAttribute::getName() -> std::string { return name; }
diff --git a/entry/src/main/cpp/src/core/control/xml/Attribute.h b/entry/src/main/cpp/src/core/control/xml/Attribute.h
new file mode 100644
index 0000000..00c5fd9
--- /dev/null
+++ b/entry/src/main/cpp/src/core/control/xml/Attribute.h
@@ -0,0 +1,30 @@
+/*
+ * Xournal++
+ *
+ * XML Writer helper class
+ *
+ * @author Xournal++ Team
+ * https://github.com/xournalpp/xournalpp
+ *
+ * @license GNU GPLv2 or later
+ */
+
+#pragma once
+
+#include <string>  // for string
+
+class OutputStream;
+
+class XMLAttribute {
+public:
+    XMLAttribute(std::string name);
+    virtual ~XMLAttribute();
+
+public:
+    virtual void writeOut(OutputStream* out) = 0;
+
+    std::string getName();
+
+private:
+    std::string name;
+};
diff --git a/entry/src/main/cpp/src/core/control/xml/DoubleArrayAttribute.cpp b/entry/src/main/cpp/src/core/control/xml/DoubleArrayAttribute.cpp
new file mode 100644
index 0000000..ed364bc
--- /dev/null
+++ b/entry/src/main/cpp/src/core/control/xml/DoubleArrayAttribute.cpp
@@ -0,0 +1,32 @@
+#include "DoubleArrayAttribute.h"
+
+#include <algorithm>  // for for_each
+#include <iterator>   // for begin, end
+#include <string>     // for allocator, string
+#include <utility>    // for move
+
+#include <glib.h>  // for g_ascii_formatd, G_ASCII_DTOSTR_B...
+
+#include "control/xml/Attribute.h"  // for XMLAttribute
+#include "util/OutputStream.h"      // for OutputStream
+#include "util/Util.h"              // for PRECISION_FORMAT_STRING
+
+DoubleArrayAttribute::DoubleArrayAttribute(const char* name, std::vector<double>&& values):
+        XMLAttribute(name), values(std::move(values)) {}
+
+DoubleArrayAttribute::~DoubleArrayAttribute() = default;
+
+void DoubleArrayAttribute::writeOut(OutputStream* out) {
+    if (!this->values.empty()) {
+        char str[G_ASCII_DTOSTR_BUF_SIZE];
+        // g_ascii_ version uses C locale always.
+        g_ascii_formatd(str, G_ASCII_DTOSTR_BUF_SIZE, Util::PRECISION_FORMAT_STRING, this->values[0]);
+        out->write(str);
+
+        std::for_each(std::begin(this->values) + 1, std::end(this->values), [&](auto& x) {
+            g_ascii_formatd(str, G_ASCII_DTOSTR_BUF_SIZE, Util::PRECISION_FORMAT_STRING, x);
+            out->write(" ");
+            out->write(str);
+        });
+    }
+}
diff --git a/entry/src/main/cpp/src/core/control/xml/DoubleArrayAttribute.h b/entry/src/main/cpp/src/core/control/xml/DoubleArrayAttribute.h
new file mode 100644
index 0000000..5d49632
--- /dev/null
+++ b/entry/src/main/cpp/src/core/control/xml/DoubleArrayAttribute.h
@@ -0,0 +1,31 @@
+/*
+ * Xournal++
+ *
+ * XML Writer helper class
+ *
+ * @author Xournal++ Team
+ * https://github.com/xournalpp/xournalpp
+ *
+ * @license GNU GPLv2 or later
+ */
+
+#pragma once
+
+#include <vector>  // for vector
+
+#include "Attribute.h"  // for XMLAttribute
+
+class OutputStream;
+
+
+class DoubleArrayAttribute: public XMLAttribute {
+public:
+    DoubleArrayAttribute(const char* name, std::vector<double>&& values);
+    ~DoubleArrayAttribute() override;
+
+public:
+    void writeOut(OutputStream* out) override;
+
+private:
+    std::vector<double> values;
+};
diff --git a/entry/src/main/cpp/src/core/control/xml/DoubleAttribute.cpp b/entry/src/main/cpp/src/core/control/xml/DoubleAttribute.cpp
new file mode 100644
index 0000000..631222c
--- /dev/null
+++ b/entry/src/main/cpp/src/core/control/xml/DoubleAttribute.cpp
@@ -0,0 +1,20 @@
+#include "DoubleAttribute.h"
+
+#include <string>  // for allocator, string
+
+#include <glib.h>  // for g_ascii_formatd, G_ASCII_DTOSTR_B...
+
+#include "control/xml/Attribute.h"  // for XMLAttribute
+#include "util/OutputStream.h"      // for OutputStream
+#include "util/Util.h"              // for PRECISION_FORMAT_STRING
+
+DoubleAttribute::DoubleAttribute(const char* name, double value): XMLAttribute(name) { this->value = value; }
+
+DoubleAttribute::~DoubleAttribute() = default;
+
+void DoubleAttribute::writeOut(OutputStream* out) {
+    char str[G_ASCII_DTOSTR_BUF_SIZE];
+    // g_ascii_ version uses C locale always.
+    g_ascii_formatd(str, G_ASCII_DTOSTR_BUF_SIZE, Util::PRECISION_FORMAT_STRING, value);
+    out->write(str);
+}
diff --git a/entry/src/main/cpp/src/core/control/xml/DoubleAttribute.h b/entry/src/main/cpp/src/core/control/xml/DoubleAttribute.h
new file mode 100644
index 0000000..dfb49ca
--- /dev/null
+++ b/entry/src/main/cpp/src/core/control/xml/DoubleAttribute.h
@@ -0,0 +1,29 @@
+/*
+ * Xournal++
+ *
+ * XML Writer helper class
+ *
+ * @author Xournal++ Team
+ * https://github.com/xournalpp/xournalpp
+ *
+ * @license GNU GPLv2 or later
+ */
+
+#pragma once
+
+#include "Attribute.h"  // for XMLAttribute
+
+class OutputStream;
+
+
+class DoubleAttribute: public XMLAttribute {
+public:
+    DoubleAttribute(const char* name, double value);
+    ~DoubleAttribute() override;
+
+public:
+    void writeOut(OutputStream* out) override;
+
+private:
+    double value;
+};
diff --git a/entry/src/main/cpp/src/core/control/xml/IntAttribute.cpp b/entry/src/main/cpp/src/core/control/xml/IntAttribute.cpp
new file mode 100644
index 0000000..598df2d
--- /dev/null
+++ b/entry/src/main/cpp/src/core/control/xml/IntAttribute.cpp
@@ -0,0 +1,18 @@
+#include "IntAttribute.h"
+
+#include <string>  // for allocator, string
+
+#include <glib.h>  // for g_free, g_strdup_printf
+
+#include "control/xml/Attribute.h"  // for XMLAttribute
+#include "util/OutputStream.h"      // for OutputStream
+
+IntAttribute::IntAttribute(const char* name, int value): XMLAttribute(name) { this->value = value; }
+
+IntAttribute::~IntAttribute() = default;
+
+void IntAttribute::writeOut(OutputStream* out) {
+    char* str = g_strdup_printf("%i", value);
+    out->write(str);
+    g_free(str);
+}
diff --git a/entry/src/main/cpp/src/core/control/xml/IntAttribute.h b/entry/src/main/cpp/src/core/control/xml/IntAttribute.h
new file mode 100644
index 0000000..bf046bb
--- /dev/null
+++ b/entry/src/main/cpp/src/core/control/xml/IntAttribute.h
@@ -0,0 +1,28 @@
+/*
+ * Xournal++
+ *
+ * XML Writer helper class
+ *
+ * @author Xournal++ Team
+ * https://github.com/xournalpp/xournalpp
+ *
+ * @license GNU GPLv2 or later
+ */
+
+#pragma once
+
+#include "Attribute.h"  // for XMLAttribute
+
+class OutputStream;
+
+class IntAttribute: public XMLAttribute {
+public:
+    IntAttribute(const char* name, int value);
+    ~IntAttribute() override;
+
+public:
+    void writeOut(OutputStream* out) override;
+
+private:
+    int value;
+};
diff --git a/entry/src/main/cpp/src/core/control/xml/SizeTAttribute.cpp b/entry/src/main/cpp/src/core/control/xml/SizeTAttribute.cpp
new file mode 100644
index 0000000..7770412
--- /dev/null
+++ b/entry/src/main/cpp/src/core/control/xml/SizeTAttribute.cpp
@@ -0,0 +1,18 @@
+#include "SizeTAttribute.h"
+
+#include <string>  // for allocator, string
+
+#include <glib.h>  // for g_free, g_strdup_printf
+
+#include "control/xml/Attribute.h"  // for XMLAttribute
+#include "util/OutputStream.h"      // for OutputStream
+
+SizeTAttribute::SizeTAttribute(const char* name, size_t value): XMLAttribute(name) { this->value = value; }
+
+SizeTAttribute::~SizeTAttribute() = default;
+
+void SizeTAttribute::writeOut(OutputStream* out) {
+    char* str = g_strdup_printf("%zu", value);
+    out->write(str);
+    g_free(str);
+}
diff --git a/entry/src/main/cpp/src/core/control/xml/SizeTAttribute.h b/entry/src/main/cpp/src/core/control/xml/SizeTAttribute.h
new file mode 100644
index 0000000..eb06154
--- /dev/null
+++ b/entry/src/main/cpp/src/core/control/xml/SizeTAttribute.h
@@ -0,0 +1,30 @@
+/*
+ * Xournal++
+ *
+ * XML Writer helper class
+ *
+ * @author Xournal++ Team
+ * https://github.com/xournalpp/xournalpp
+ *
+ * @license GNU GPLv2 or later
+ */
+
+#pragma once
+
+#include <cstddef>  // for size_t
+
+#include "Attribute.h"  // for XMLAttribute
+
+class OutputStream;
+
+class SizeTAttribute: public XMLAttribute {
+public:
+    SizeTAttribute(const char* name, size_t value);
+    ~SizeTAttribute() override;
+
+public:
+    void writeOut(OutputStream* out) override;
+
+private:
+    size_t value;
+};
diff --git a/entry/src/main/cpp/src/core/control/xml/TextAttribute.cpp b/entry/src/main/cpp/src/core/control/xml/TextAttribute.cpp
new file mode 100644
index 0000000..378bb5f
--- /dev/null
+++ b/entry/src/main/cpp/src/core/control/xml/TextAttribute.cpp
@@ -0,0 +1,25 @@
+#include "TextAttribute.h"
+
+#include <utility>  // for move
+
+#include "control/xml/Attribute.h"  // for XMLAttribute
+#include "util/OutputStream.h"      // for OutputStream
+#include "util/StringUtils.h"       // for replace_pair, StringUtils
+
+TextAttribute::TextAttribute(std::string name, std::string value):
+        XMLAttribute(std::move(name)), value(std::move(value)) {}
+
+TextAttribute::~TextAttribute() = default;
+
+void TextAttribute::writeOut(OutputStream* out) {
+    std::string v = this->value;
+    StringUtils::replaceAllChars(v, {
+                                            replace_pair('&', "&amp;"),
+                                            replace_pair('\"', "&quot;"),
+                                            replace_pair('<', "&lt;"),
+                                            replace_pair('>', "&gt;"),
+                                            replace_pair('\n', "&#10;"),
+                                            replace_pair('\r', "&#13;"),
+                                    });
+    out->write(v);
+}
diff --git a/entry/src/main/cpp/src/core/control/xml/TextAttribute.h b/entry/src/main/cpp/src/core/control/xml/TextAttribute.h
new file mode 100644
index 0000000..dafabad
--- /dev/null
+++ b/entry/src/main/cpp/src/core/control/xml/TextAttribute.h
@@ -0,0 +1,30 @@
+/*
+ * Xournal++
+ *
+ * XML Writer helper class
+ *
+ * @author Xournal++ Team
+ * https://github.com/xournalpp/xournalpp
+ *
+ * @license GNU GPLv2 or later
+ */
+
+#pragma once
+
+#include <string>  // for string
+
+#include "Attribute.h"  // for XMLAttribute
+
+class OutputStream;
+
+class TextAttribute: public XMLAttribute {
+public:
+    TextAttribute(std::string name, std::string value);
+    ~TextAttribute() override;
+
+public:
+    void writeOut(OutputStream* out) override;
+
+private:
+    std::string value;
+};
diff --git a/entry/src/main/cpp/src/core/control/xml/XmlAudioNode.cpp b/entry/src/main/cpp/src/core/control/xml/XmlAudioNode.cpp
new file mode 100644
index 0000000..31f1d19
--- /dev/null
+++ b/entry/src/main/cpp/src/core/control/xml/XmlAudioNode.cpp
@@ -0,0 +1,13 @@
+#include "XmlAudioNode.h"
+
+#include <utility>  // for move
+
+#include "control/xml/XmlNode.h"  // for XmlNode
+
+XmlAudioNode::XmlAudioNode(const char* tag): XmlNode(tag), audioFilepath{} {}
+
+XmlAudioNode::~XmlAudioNode() = default;
+
+auto XmlAudioNode::getAudioFilepath() -> fs::path { return this->audioFilepath; }
+
+void XmlAudioNode::setAudioFilepath(fs::path filepath) { this->audioFilepath = std::move(filepath); }
diff --git a/entry/src/main/cpp/src/core/control/xml/XmlAudioNode.h b/entry/src/main/cpp/src/core/control/xml/XmlAudioNode.h
new file mode 100644
index 0000000..75ee2b5
--- /dev/null
+++ b/entry/src/main/cpp/src/core/control/xml/XmlAudioNode.h
@@ -0,0 +1,32 @@
+/*
+ * Xournal++
+ *
+ * [Header description]
+ *
+ * @author Xournal++ Team
+ * https://github.com/xournalpp/xournalpp
+ *
+ * @license GNU GPLv2 or later
+ */
+
+#pragma once
+
+#include "XmlNode.h"
+#include "filesystem.h"
+
+class XmlAudioNode: public XmlNode {
+public:
+    XmlAudioNode(const char* tag);
+    virtual ~XmlAudioNode();
+
+private:
+    XmlAudioNode(const XmlAudioNode& node);
+    void operator=(const XmlAudioNode& node);
+
+public:
+    [[maybe_unused]] fs::path getAudioFilepath();
+    [[maybe_unused]] void setAudioFilepath(fs::path filepath);
+
+private:
+    fs::path audioFilepath;
+};
diff --git a/entry/src/main/cpp/src/core/control/xml/XmlImageNode.cpp b/entry/src/main/cpp/src/core/control/xml/XmlImageNode.cpp
new file mode 100644
index 0000000..4e548d2
--- /dev/null
+++ b/entry/src/main/cpp/src/core/control/xml/XmlImageNode.cpp
@@ -0,0 +1,65 @@
+#include "XmlImageNode.h"
+
+#include <glib.h>  // for g_base64_encode, g_free, gchar, g_e...
+
+#include "control/xml/XmlNode.h"  // for XmlNode
+#include "util/OutputStream.h"    // for OutputStream
+
+XmlImageNode::XmlImageNode(const char* tag): XmlNode(tag) {
+    this->img = nullptr;
+    this->out = nullptr;
+    this->pos = 0;
+}
+
+XmlImageNode::~XmlImageNode() {
+    if (this->img) {
+        cairo_surface_destroy(this->img);
+    }
+}
+
+void XmlImageNode::setImage(cairo_surface_t* img) {
+    if (this->img) {
+        cairo_surface_destroy(this->img);
+    }
+    this->img = cairo_surface_reference(img);
+}
+
+auto XmlImageNode::pngWriteFunction(XmlImageNode* image, const unsigned char* data, unsigned int length)
+        -> cairo_status_t {
+    for (unsigned int i = 0; i < length; i++, image->pos++) {
+        if (image->pos == 30) {
+            gchar* base64_str = g_base64_encode(image->buffer, image->pos);
+            image->out->write(base64_str);
+            g_free(base64_str);
+            image->pos = 0;
+        }
+        image->buffer[image->pos] = data[i];
+    }
+
+    return CAIRO_STATUS_SUCCESS;
+}
+
+void XmlImageNode::writeOut(OutputStream* out) {
+    out->write("<");
+    out->write(tag);
+    writeAttributes(out);
+
+    out->write(">");
+
+    if (this->img == nullptr) {
+        g_error("XmlImageNode::writeOut(); this->img == nullptr");
+    } else {
+        this->out = out;
+        this->pos = 0;
+        cairo_surface_write_to_png_stream(this->img, reinterpret_cast<cairo_write_func_t>(&pngWriteFunction), this);
+        gchar* base64_str = g_base64_encode(this->buffer, this->pos);
+        out->write(base64_str);
+        g_free(base64_str);
+
+        this->out = nullptr;
+    }
+
+    out->write("</");
+    out->write(tag);
+    out->write(">\n");
+}
diff --git a/entry/src/main/cpp/src/core/control/xml/XmlImageNode.h b/entry/src/main/cpp/src/core/control/xml/XmlImageNode.h
new file mode 100644
index 0000000..ecf6b65
--- /dev/null
+++ b/entry/src/main/cpp/src/core/control/xml/XmlImageNode.h
@@ -0,0 +1,38 @@
+/*
+ * Xournal++
+ *
+ * XML Writer helper class
+ *
+ * @author Xournal++ Team
+ * https://github.com/xournalpp/xournalpp
+ *
+ * @license GNU GPLv2 or later
+ */
+
+#pragma once
+
+#include <cairo.h>  // for cairo_surface_t, cairo_status_t
+
+#include "XmlNode.h"  // for XmlNode
+
+class OutputStream;
+
+class XmlImageNode: public XmlNode {
+public:
+    XmlImageNode(const char* tag);
+    virtual ~XmlImageNode();
+
+public:
+    void setImage(cairo_surface_t* img);
+
+    static cairo_status_t pngWriteFunction(XmlImageNode* image, const unsigned char* data, unsigned int length);
+
+    void writeOut(OutputStream* out) override;
+
+private:
+    cairo_surface_t* img;
+
+    OutputStream* out;
+    unsigned int pos;
+    unsigned char buffer[30] = {0};
+};
diff --git a/entry/src/main/cpp/src/core/control/xml/XmlNode.cpp b/entry/src/main/cpp/src/core/control/xml/XmlNode.cpp
new file mode 100644
index 0000000..445f24d
--- /dev/null
+++ b/entry/src/main/cpp/src/core/control/xml/XmlNode.cpp
@@ -0,0 +1,95 @@
+#include "XmlNode.h"
+
+#include <utility>  // for move
+
+#include <glib.h>  // for g_free
+
+#include "control/jobs/ProgressListener.h"  // for ProgressListener
+#include "control/xml/Attribute.h"          // for XMLAttribute
+#include "util/OutputStream.h"              // for OutputStream
+
+#include "DoubleArrayAttribute.h"  // for DoubleArrayAttribute
+#include "DoubleAttribute.h"       // for DoubleAttribute
+#include "IntAttribute.h"          // for IntAttribute
+#include "SizeTAttribute.h"        // for SizeTAttribute
+#include "TextAttribute.h"         // for TextAttribute
+
+
+XmlNode::XmlNode(const char* tag): tag(tag) {}
+
+void XmlNode::setAttrib(const char* attrib, const char* value) {
+    if (value == nullptr) {
+        value = "";
+    }
+    putAttrib(new TextAttribute(attrib, value));
+}
+
+void XmlNode::setAttrib(const char* attrib, std::string value) {
+    putAttrib(new TextAttribute(attrib, std::move(value)));
+}
+
+void XmlNode::setAttrib(const char* attrib, double value) { putAttrib(new DoubleAttribute(attrib, value)); }
+
+void XmlNode::setAttrib(const char* attrib, int value) { putAttrib(new IntAttribute(attrib, value)); }
+
+void XmlNode::setAttrib(const char* attrib, size_t value) { putAttrib(new SizeTAttribute(attrib, value)); }
+
+/**
+ * The double array is now owned by XmlNode and automatically deleted!
+ */
+void XmlNode::setAttrib(const char* attrib, std::vector<double> values) {
+    putAttrib(new DoubleArrayAttribute(attrib, std::move(values)));
+}
+
+void XmlNode::writeOut(OutputStream* out, ProgressListener* listener) {
+    out->write("<");
+    out->write(tag);
+    writeAttributes(out);
+
+    if (children.empty()) {
+        out->write("/>\n");
+    } else {
+        out->write(">\n");
+
+        if (listener) {
+            listener->setMaximumState(children.size());
+        }
+
+        size_t i = 1;
+
+        for (auto& node: children) {
+            node->writeOut(out);
+            if (listener) {
+                listener->setCurrentState(i);
+            }
+            i++;
+        }
+
+        out->write("</");
+        out->write(tag);
+        out->write(">\n");
+    }
+}
+
+void XmlNode::addChild(XmlNode* node) { children.emplace_back(node); }
+
+void XmlNode::putAttrib(XMLAttribute* a) {
+    for (auto& attrib: attributes) {
+        if (attrib->getName() == a->getName()) {
+            attrib.reset(a);
+            return;
+        }
+    }
+
+    attributes.emplace_back(a);
+}
+
+void XmlNode::writeAttributes(OutputStream* out) {
+    for (auto& attrib: attributes) {
+        out->write(" ");
+        out->write(attrib->getName());
+        out->write("=\"");
+        attrib->writeOut(out);
+        out->write("\"");
+    }
+}
diff --git a/entry/src/main/cpp/src/core/control/xml/XmlNode.h b/entry/src/main/cpp/src/core/control/xml/XmlNode.h
new file mode 100644
index 0000000..1f84bd1
--- /dev/null
+++ b/entry/src/main/cpp/src/core/control/xml/XmlNode.h
@@ -0,0 +1,52 @@
+/*
+ * Xournal++
+ *
+ * XML Writer helper class
+ *
+ * @author Xournal++ Team
+ * https://github.com/xournalpp/xournalpp
+ *
+ * @license GNU GPLv2 or later
+ */
+
+#pragma once
+
+#include <cstddef>  // for size_t
+#include <memory>   // for unique_ptr
+#include <string>   // for string
+#include <vector>   // for vector
+
+#include "Attribute.h"  // for XMLAttribute
+
+class ProgressListener;
+class OutputStream;
+
+class XmlNode {
+public:
+    XmlNode(const char* tag);
+    virtual ~XmlNode() = default;
+
+public:
+    void setAttrib(const char* attrib, std::string value);
+    void setAttrib(const char* attrib, const char* value);
+    void setAttrib(const char* attrib, double value);
+    void setAttrib(const char* attrib, int value);
+    void setAttrib(const char* attrib, size_t value);
+    void setAttrib(const char* attrib, std::vector<double> values);
+
+    void writeOut(OutputStream* out, ProgressListener* _listener);
+
+    virtual void writeOut(OutputStream* out) { writeOut(out, nullptr); }
+
+    void addChild(XmlNode* node);
+
+protected:
+    void putAttrib(XMLAttribute* a);
+    void writeAttributes(OutputStream* out);
+
+protected:
+    std::vector<std::unique_ptr<XmlNode>> children{};
+    std::vector<std::unique_ptr<XMLAttribute>> attributes{};
+
+    std::string tag;
+};
diff --git a/entry/src/main/cpp/src/core/control/xml/XmlPointNode.cpp b/entry/src/main/cpp/src/core/control/xml/XmlPointNode.cpp
new file mode 100644
index 0000000..83fa83a
--- /dev/null
+++ b/entry/src/main/cpp/src/core/control/xml/XmlPointNode.cpp
@@ -0,0 +1,34 @@
+#include "XmlPointNode.h"
+
+#include <algorithm>  // for max
+#include <utility>    // for move
+
+#include "control/xml/XmlAudioNode.h"  // for XmlAudioNode
+#include "util/OutputStream.h"         // for OutputStream
+#include "util/Util.h"                 // for writeCoordinateString
+
+XmlPointNode::XmlPointNode(const char* tag): XmlAudioNode(tag) {}
+
+void XmlPointNode::setPoints(std::vector<Point> pts) { this->points = std::move(pts); }
+
+void XmlPointNode::writeOut(OutputStream* out) {
+    /** Write stroke and its attributes */
+    out->write("<");
+    out->write(tag);
+    writeAttributes(out);
+
+    out->write(">");
+
+    auto pointIter = points.begin();
+    Util::writeCoordinateString(out, pointIter->x, pointIter->y);
+    ++pointIter;
+    for (; pointIter != points.end(); ++pointIter) {
+        out->write(" ");
+
+        Util::writeCoordinateString(out, pointIter->x, pointIter->y);
+    }
+
+    out->write("</");
+    out->write(tag);
+    out->write(">\n");
+}
diff --git a/entry/src/main/cpp/src/core/control/xml/XmlPointNode.h b/entry/src/main/cpp/src/core/control/xml/XmlPointNode.h
new file mode 100644
index 0000000..0c0ee46
--- /dev/null
+++ b/entry/src/main/cpp/src/core/control/xml/XmlPointNode.h
@@ -0,0 +1,32 @@
+/*
+ * Xournal++
+ *
+ * XML Writer helper class
+ *
+ * @author Xournal++ Team
+ * https://github.com/xournalpp/xournalpp
+ *
+ * @license GNU GPLv2 or later
+ */
+
+#pragma once
+
+#include <vector>  // for vector
+
+#include "model/Point.h"  // for Point
+
+#include "XmlAudioNode.h"  // for XmlAudioNode
+
+class OutputStream;
+
+class XmlPointNode: public XmlAudioNode {
+public:
+    XmlPointNode(const char* tag);
+
+public:
+    void setPoints(std::vector<Point> points);
+    void writeOut(OutputStream* out) override;
+
+private:
+    std::vector<Point> points{};
+};
diff --git a/entry/src/main/cpp/src/core/control/xml/XmlTexNode.cpp b/entry/src/main/cpp/src/core/control/xml/XmlTexNode.cpp
new file mode 100644
index 0000000..53dbaa4
--- /dev/null
+++ b/entry/src/main/cpp/src/core/control/xml/XmlTexNode.cpp
@@ -0,0 +1,27 @@
+#include "XmlTexNode.h"
+
+#include <glib.h>  // for g_base64_encode, g_free, gchar, guchar
+
+#include "control/xml/XmlNode.h"  // for XmlNode
+#include "util/OutputStream.h"    // for OutputStream
+
+XmlTexNode::XmlTexNode(const char* tag, std::string&& binaryData): XmlNode(tag), binaryData(binaryData) {}
+
+XmlTexNode::~XmlTexNode() = default;
+
+void XmlTexNode::writeOut(OutputStream* out) {
+    out->write("<");
+    out->write(tag);
+    writeAttributes(out);
+
+    out->write(">");
+
+    gchar* base64_str =
+            g_base64_encode(reinterpret_cast<const guchar*>(this->binaryData.c_str()), this->binaryData.length());
+    out->write(base64_str);
+    g_free(base64_str);
+
+    out->write("</");
+    out->write(tag);
+    out->write(">\n");
+}
diff --git a/entry/src/main/cpp/src/core/control/xml/XmlTexNode.h b/entry/src/main/cpp/src/core/control/xml/XmlTexNode.h
new file mode 100644
index 0000000..21f8483
--- /dev/null
+++ b/entry/src/main/cpp/src/core/control/xml/XmlTexNode.h
@@ -0,0 +1,33 @@
+/*
+ * Xournal++
+ *
+ * XML Writer helper class
+ *
+ * @author Xournal++ Team
+ * https://github.com/xournalpp/xournalpp
+ *
+ * @license GNU GPLv2 or later
+ */
+
+#pragma once
+
+#include <string>  // for string
+
+#include "XmlNode.h"  // for XmlNode
+
+class OutputStream;
+
+class XmlTexNode: public XmlNode {
+public:
+    XmlTexNode(const char* tag, std::string&& binaryData);
+    virtual ~XmlTexNode();
+
+public:
+    void writeOut(OutputStream* out) override;
+
+private:
+    /**
+     * Binary .PNG or .PDF
+     */
+    std::string binaryData;
+};
diff --git a/entry/src/main/cpp/src/core/control/xml/XmlTextNode.cpp b/entry/src/main/cpp/src/core/control/xml/XmlTextNode.cpp
new file mode 100644
index 0000000..aa0ec76
--- /dev/null
+++ b/entry/src/main/cpp/src/core/control/xml/XmlTextNode.cpp
@@ -0,0 +1,30 @@
+#include "XmlTextNode.h"
+
+#include <utility>  // for move
+
+#include "control/xml/XmlAudioNode.h"  // for XmlAudioNode
+#include "util/OutputStream.h"         // for OutputStream
+#include "util/StringUtils.h"          // for replace_pair, StringUtils
+
+XmlTextNode::XmlTextNode(const char* tag, std::string text): XmlAudioNode(tag), text(std::move(text)) {}
+
+XmlTextNode::XmlTextNode(const char* tag): XmlAudioNode(tag) {}
+
+void XmlTextNode::setText(std::string text) { this->text = std::move(text); }
+
+void XmlTextNode::writeOut(OutputStream* out) {
+    out->write("<");
+    out->write(tag);
+    writeAttributes(out);
+
+    out->write(">");
+
+    std::string tmp(this->text);
+    StringUtils::replaceAllChars(tmp,
+                                 {replace_pair('&', "&amp;"), replace_pair('<', "&lt;"), replace_pair('>', "&gt;")});
+    out->write(tmp);
+
+    out->write("</");
+    out->write(tag);
+    out->write(">\n");
+}
diff --git a/entry/src/main/cpp/src/core/control/xml/XmlTextNode.h b/entry/src/main/cpp/src/core/control/xml/XmlTextNode.h
new file mode 100644
index 0000000..ba811a1
--- /dev/null
+++ b/entry/src/main/cpp/src/core/control/xml/XmlTextNode.h
@@ -0,0 +1,33 @@
+/*
+ * Xournal++
+ *
+ * XML Writer helper class
+ *
+ * @author Xournal++ Team
+ * https://github.com/xournalpp/xournalpp
+ *
+ * @license GNU GPLv2 or later
+ */
+
+#pragma once
+
+#include <string>  // for string
+
+#include "XmlAudioNode.h"  // for XmlAudioNode
+
+class OutputStream;
+
+class XmlTextNode: public XmlAudioNode {
+public:
+    XmlTextNode(const char* tag, std::string text);
+    explicit XmlTextNode(const char* tag);
+    ~XmlTextNode() override = default;
+
+public:
+    void setText(std::string text);
+
+    void writeOut(OutputStream* out) override;
+
+private:
+    std::string text;
+};
diff --git a/entry/src/main/cpp/src/core/control/xojfile/LoadHandler.cpp b/entry/src/main/cpp/src/core/control/xojfile/LoadHandler.cpp
new file mode 100644
index 0000000..18d032b
--- /dev/null
+++ b/entry/src/main/cpp/src/core/control/xojfile/LoadHandler.cpp
@@ -0,0 +1,1188 @@
+#include "LoadHandler.h"
+
+#include <algorithm>    // for copy
+#include <cmath>        // for isnan
+#include <cstdlib>      // for atoi, size_t
+#include <cstring>      // for strcmp, strlen
+#include <iterator>     // for back_inserter
+#include <memory>       // for __shared_ptr_access
+#include <regex>        // for regex_search, smatch
+#include <type_traits>  // for remove_reference<>::type
+#include <utility>      // for move
+
+#include <gio/gio.h>      // for g_file_get_path, g_fil...
+#include <glib-object.h>  // for g_object_unref
+
+#include "control/pagetype/PageTypeHandler.h"  // for PageTypeHandler
+#include "model/BackgroundImage.h"             // for BackgroundImage
+#include "model/Font.h"                        // for XojFont
+#include "model/Image.h"                       // for Image
+#include "model/Layer.h"                       // for Layer
+#include "model/PageType.h"                    // for PageType, PageTypeFormat
+#include "model/Point.h"                       // for Point
+#include "model/Stroke.h"                      // for Stroke, StrokeCapStyle
+#include "model/StrokeStyle.h"                 // for StrokeStyle
+#include "model/TexImage.h"                    // for TexImage
+#include "model/Text.h"                        // for Text
+#include "model/XojPage.h"                     // for XojPage
+#include "util/Assert.h"                       // for xoj_assert
+#include "util/GzUtil.h"                       // for GzUtil
+#include "util/LoopUtil.h"
+#include "util/PlaceholderString.h"  // for PlaceholderString
+#include "util/StringUtils.h"        // for char_cast
+#include "util/i18n.h"               // for _F, FC, FS, _
+#include "util/raii/GObjectSPtr.h"
+#include "util/safe_casts.h"  // for as_signed, as_unsigned
+#include "util/utf8_view.h"   // for utf8_view
+
+#include "LoadHandlerHelper.h"  // for getAttrib, getAttribDo...
+
+using std::string;
+
+#define error2(var, ...)                                                                \
+    if (var == nullptr) {                                                               \
+        var = g_error_new(G_MARKUP_ERROR, G_MARKUP_ERROR_INVALID_CONTENT, __VA_ARGS__); \
+    }
+
+#define error(...)                                                                        \
+    if (error == nullptr) {                                                               \
+        error = g_error_new(G_MARKUP_ERROR, G_MARKUP_ERROR_INVALID_CONTENT, __VA_ARGS__); \
+    }
+
+namespace {
+constexpr size_t MAX_VERSION_LENGTH = 50;
+constexpr size_t MAX_MIMETYPE_LENGTH = 25;
+}  // namespace
+
+LoadHandler::LoadHandler():
+        attachedPdfMissing(false),
+        pdfFilenameParsed(false),
+        pos(PARSER_POS_NOT_STARTED),
+        fileVersion(0),
+        minimalFileVersion(0),
+        zipFp(nullptr),
+        zipContentFile(nullptr),
+        gzFp(nullptr),
+        layer(nullptr),
+        stroke(nullptr),
+        text(nullptr),
+        image(nullptr),
+        teximage(nullptr),
+        attributeNames(nullptr),
+        attributeValues(nullptr),
+        elementName(nullptr),
+        loadedTimeStamp(0) {
+    this->error = nullptr;
+
+    initAttributes();
+}
+
+LoadHandler::~LoadHandler() {
+    if (this->audioFiles) {
+        g_hash_table_unref(this->audioFiles);
+    }
+}
+
+void LoadHandler::initAttributes() {
+    this->zipFp = nullptr;
+    this->zipContentFile = nullptr;
+    this->gzFp = nullptr;
+    this->isGzFile = false;
+    this->error = nullptr;
+    this->attributeNames = nullptr;
+    this->attributeValues = nullptr;
+    this->elementName = nullptr;
+    this->pdfFilenameParsed = false;
+    this->attachedPdfMissing = false;
+
+    this->page = nullptr;
+    this->layer = nullptr;
+    this->stroke = nullptr;
+    this->image = nullptr;
+    this->teximage = nullptr;
+    this->text = nullptr;
+    this->pages.clear();
+
+    if (this->audioFiles) {
+        g_hash_table_unref(this->audioFiles);
+    }
+    this->audioFiles = g_hash_table_new(g_str_hash, g_str_equal);
+}
+
+auto LoadHandler::getLastError() -> string { return this->lastError; }
+
+auto LoadHandler::isAttachedPdfMissing() const -> bool { return this->attachedPdfMissing; }
+
+auto LoadHandler::getMissingPdfFilename() const -> string { return this->pdfMissing; }
+
+auto LoadHandler::openFile(fs::path const& filepath) -> bool {
+    this->filepath = filepath;
+    int zipError = 0;
+    this->zipFp = zip_open(char_cast(filepath.u8string().c_str()), ZIP_RDONLY, &zipError);
+
+    // Check if the file is actually an old XOPP-File and open it
+    if (!this->zipFp && zipError == ZIP_ER_NOZIP) {
+        this->gzFp = GzUtil::openPath(filepath, "r");
+        this->isGzFile = true;
+    }
+
+    if (this->zipFp && !this->isGzFile) {
+        // Check the mimetype
+        zip_file_t* mimetypeFp = zip_fopen(this->zipFp, "mimetype", 0);
+        if (!mimetypeFp) {
+            this->lastError = zip_error_strerror(zip_get_error(zipFp));
+            this->lastError =
+                    FS(_F("The file is no valid .xopp file (Mimetype missing): \"{1}\"") % filepath.u8string());
+            return false;
+        }
+        char mimetype[MAX_MIMETYPE_LENGTH + 1] = {};
+        // read the mimetype and a few more bytes to make sure we do not only read a subset
+        zip_fread(mimetypeFp, mimetype, MAX_MIMETYPE_LENGTH);
+        if (!strcmp(mimetype, "application/xournal++")) {
+            zip_fclose(mimetypeFp);
+            this->lastError = FS(_F("The file is no valid .xopp file (Mimetype wrong): \"{1}\"") % filepath.u8string());
+            return false;
+        }
+        zip_fclose(mimetypeFp);
+
+        // Get the file version
+        zip_file_t* versionFp = zip_fopen(this->zipFp, "META-INF/version", 0);
+        if (!versionFp) {
+            this->lastError =
+                    FS(_F("The file is no valid .xopp file (Version missing): \"{1}\"") % filepath.u8string());
+            return false;
+        }
+        char versionString[MAX_VERSION_LENGTH + 1] = {};
+        zip_fread(versionFp, versionString, MAX_VERSION_LENGTH);
+        std::string versions(versionString);
+        std::regex versionRegex("current=(\\d+?)(?:\n|\r\n)min=(\\d+?)");
+        std::smatch match;
+        if (std::regex_search(versions, match, versionRegex)) {
+            this->fileVersion = std::stoi(match.str(1));
+            this->minimalFileVersion = std::stoi(match.str(2));
+        } else {
+            zip_fclose(versionFp);
+            this->lastError = FS(_F("The file is not a valid .xopp file (Version string corrupted): \"{1}\"") %
+                                 filepath.u8string());
+            return false;
+        }
+        zip_fclose(versionFp);
+
+        // open the main content file
+        this->zipContentFile = zip_fopen(this->zipFp, "content.xml", 0);
+        if (!this->zipContentFile) {
+            this->lastError = FS(_F("Failed to open content.xml in zip archive: \"{1}\"") %
+                                 zip_error_strerror(zip_get_error(zipFp)));
+            return false;
+        }
+    }
+
+    // Fail if neither utility could open the file
+    if (!this->zipFp && !this->gzFp) {
+        this->lastError = FS(_F("Could not open file: \"{1}\"") % filepath.u8string());
+        return false;
+    }
+    return true;
+}
+
+auto LoadHandler::closeFile() -> bool {
+    if (this->isGzFile) {
+        return static_cast<bool>(gzclose(this->gzFp));
+    }
+
+    xoj_assert(this->zipContentFile != nullptr);
+    zip_fclose(this->zipContentFile);
+    int zipError = zip_close(this->zipFp);
+    return zipError == 0;
+}
+
+auto LoadHandler::readContentFile(char* buffer, zip_uint64_t len) -> zip_int64_t {
+    if (this->isGzFile) {
+        if (gzeof(this->gzFp)) {
+            return -1;
+        }
+        return gzread(this->gzFp, buffer, static_cast<unsigned int>(len));
+    }
+
+    xoj_assert(this->zipContentFile != nullptr);
+    zip_int64_t lengthRead = zip_fread(this->zipContentFile, buffer, len);
+    if (lengthRead > 0) {
+        return lengthRead;
+    }
+
+    return -1;
+}
+
+auto LoadHandler::parseXml() -> bool {
+    xoj_assert(this->doc);
+    const GMarkupParser parser = {LoadHandler::parserStartElement, LoadHandler::parserEndElement,
+                                  LoadHandler::parserText, nullptr, nullptr};
+    this->error = nullptr;
+    gboolean valid = true;
+
+    this->pos = PARSER_POS_NOT_STARTED;
+    this->creator = "Unknown";
+    this->fileVersion = 1;
+
+    GMarkupParseContext* context =
+            g_markup_parse_context_new(&parser, static_cast<GMarkupParseFlags>(0), this, nullptr);
+
+    zip_int64_t len = 0;
+    do {
+        char buffer[1024];
+        len = readContentFile(buffer, sizeof(buffer));
+        if (len > 0) {
+            valid = g_markup_parse_context_parse(context, buffer, len, &error);
+        }
+
+        if (error) {
+            g_warning("LoadHandler::parseXml: %s\n", error->message);
+            valid = false;
+            break;
+        }
+    } while (len >= 0 && valid && !error);
+
+    if (valid) {
+        valid = g_markup_parse_context_end_parse(context, &error);
+    } else {
+        if (error != nullptr && error->message != nullptr) {
+            this->lastError = FS(_F("XML Parser error: {1}") % error->message);
+            g_error_free(error);
+        } else {
+            this->lastError = _("Unknown parser error");
+        }
+        g_warning("LoadHandler::parseXml: %s\n", this->lastError.c_str());
+    }
+
+    g_markup_parse_context_free(context);
+
+    // Add all parsed pages to the document
+    this->doc->addPages(pages.begin(), pages.end());
+
+    if (this->pos != PASER_POS_FINISHED && this->lastError.empty()) {
+        lastError = _("Document is not complete (maybe the end is cut off?)");
+        return false;
+    }
+    if (this->pos == PASER_POS_FINISHED && this->doc->getPageCount() == 0) {
+        lastError = _("Document is corrupted (no pages found in file)");
+        return false;
+    }
+
+    doc->setCreateBackupOnSave(true);
+
+    return valid;
+}
+
+void LoadHandler::parseStart() {
+    if (strcmp(elementName, "xournal") == 0) {
+        endRootTag = "xournal";
+
+        // Read the document version
+        const char* version = LoadHandlerHelper::getAttrib("version", true, this);
+        if (version) {
+            this->creator = "Xournal ";
+            this->creator += version;
+        }
+
+        const char* fileversion = LoadHandlerHelper::getAttrib("fileversion", true, this);
+        if (fileversion) {
+            this->fileVersion = atoi(fileversion);
+        }
+        const char* creator = LoadHandlerHelper::getAttrib("creator", true, this);
+        if (creator) {
+            this->creator = creator;
+        }
+
+        this->pos = PARSER_POS_STARTED;
+    } else if (strcmp(elementName, "MrWriter") == 0) {
+        endRootTag = "MrWriter";
+
+        // Read the document version
+        const char* version = LoadHandlerHelper::getAttrib("version", true, this);
+        if (version) {
+            this->creator = "MrWriter ";
+            this->creator += version;
+        }
+
+        // Document version 1:
+        // Handle it the same as a Xournal document, and don't allow to overwrite
+        this->fileVersion = 1;
+        this->pos = PARSER_POS_STARTED;
+    } else {
+        error("%s", FC(_F("Unexpected root tag: {1}") % elementName));
+    }
+}
+
+void LoadHandler::parseContents() {
+    if (strcmp(elementName, "page") == 0) {
+        this->pos = PARSER_POS_IN_PAGE;
+
+        double width = LoadHandlerHelper::getAttribDouble("width", this);
+        double height = LoadHandlerHelper::getAttribDouble("height", this);
+
+        this->page = std::make_unique<XojPage>(width, height, /*suppressLayer*/ true);
+
+        pages.push_back(this->page);
+    } else if (strcmp(elementName, "audio") == 0) {
+        this->parseAudio();
+    } else if (strcmp(elementName, "title") == 0) {
+        // Ignore this tag, it says nothing...
+    } else if (strcmp(elementName, "preview") == 0) {
+        // Ignore this tag, we don't need a preview
+    } else {
+        g_warning("%s", FC(_F("Unexpected tag in document: \"{1}\"") % elementName));
+    }
+}
+
+void LoadHandler::parseBgSolid() {
+    PageType bg;
+    const char* style = LoadHandlerHelper::getAttrib("style", false, this);
+    if (style != nullptr) {
+        bg.format = PageTypeHandler::getPageTypeFormatForString(style);
+    }
+
+    const char* config = LoadHandlerHelper::getAttrib("config", true, this);
+    if (config != nullptr) {
+        bg.config = config;
+    }
+
+    this->page->setBackgroundType(bg);
+
+    Color color = LoadHandlerHelper::parseBackgroundColor(this);
+    this->page->setBackgroundColor(color);
+
+    const char* name = LoadHandlerHelper::getAttrib("name", true, this);
+    if (name != nullptr) {
+        this->page->setBackgroundName(name);
+    }
+}
+
+void LoadHandler::parseBgPixmap() {
+    const char* domain = LoadHandlerHelper::getAttrib("domain", false, this);
+    const fs::path filepath = fs::path(xoj::util::utf8(LoadHandlerHelper::getAttrib("filename", false, this)));
+    // in case of a cloned background image, filename is a string representation of the page number from which the image
+    // is cloned
+
+    bool attach = !strcmp(domain, "attach");
+    if (!strcmp(domain, "absolute") || (attach && this->isGzFile)) {
+        fs::path fileToLoad;
+        if (attach) {
+            fileToLoad = this->filepath;
+            fileToLoad += ".";
+            fileToLoad += filepath;
+        } else {
+            if (filepath.is_relative()) {
+                fileToLoad = xournalFilepath.remove_filename() / filepath;
+            } else {
+                fileToLoad = filepath;
+            }
+        }
+
+        GError* error = nullptr;
+        BackgroundImage img;
+        img.loadFile(fileToLoad, &error);
+
+        if (error) {
+            error("%s",
+                  FC(_F("Could not read image: {1}. Error message: {2}") % fileToLoad.u8string() % error->message));
+            g_error_free(error);
+        }
+
+        img.setAttach(attach);
+        this->page->setBackgroundImage(img);
+    } else if (attach) {
+        // This is the new zip file attach domain
+        const auto readResult = readZipAttachment(filepath);  ///< Do not remove the const qualifier - see below
+        if (!readResult) {
+            return;
+        }
+        const std::string& imgData = *readResult;  ///< Do not remove the const qualifier - see below
+
+        /**
+         * To avoid an unecessary copy, the data is still managed by the std::unique_ptr<std::string> instance. The
+         * input stream assumes the data will not be modified: do not remove the const qualifier on readResult or
+         * imgData
+         */
+        xoj::util::GObjectSPtr<GInputStream> inputStream(
+                g_memory_input_stream_new_from_data(imgData.data(), static_cast<gssize>(imgData.size()), nullptr),
+                xoj::util::adopt);
+
+        GError* error = nullptr;
+        BackgroundImage img;
+        img.loadFile(inputStream.get(), filepath, &error);
+
+        g_input_stream_close(inputStream.get(), nullptr, nullptr);
+
+        if (error) {
+            error("%s", FC(_F("Could not read image: {1}. Error message: {2}") % filepath.u8string() % error->message));
+            g_error_free(error);
+        }
+
+        img.setAttach(attach);
+        this->page->setBackgroundImage(img);
+    } else if (!strcmp(domain, "clone")) {
+        gchar* endptr = nullptr;
+        auto const& filename = filepath.u8string();
+        auto nr = static_cast<size_t>(g_ascii_strtoull(char_cast(filename.c_str()), &endptr, 10));
+        if (endptr == char_cast(filename.c_str())) {
+            error("%s", FC(_F("Could not read page number for cloned background image: {1}.") % filepath.u8string()));
+        }
+        PageRef p = pages[nr];
+
+        if (p) {
+            this->page->setBackgroundImage(p->getBackgroundImage());
+        }
+    } else {
+        error("%s", FC(_F("Unknown pixmap::domain type: {1}") % domain));
+    }
+
+    this->page->setBackgroundType(PageType(PageTypeFormat::Image));
+}
+
+void LoadHandler::parseBgPdf() {
+    xoj_assert(this->doc);
+    int pageno = LoadHandlerHelper::getAttribInt("pageno", this);
+    bool attachToDocument = false;
+    fs::path pdfFilename;
+
+    this->page->setBackgroundPdfPageNr(as_unsigned(pageno) - 1);
+
+    if (!this->pdfFilenameParsed) {
+
+        const char* domain = LoadHandlerHelper::getAttrib("domain", false, this);
+        {
+            const auto* file = LoadHandlerHelper::getAttrib("filename", false, this);
+            if (file == nullptr) {
+                error("PDF Filename missing!");
+                return;
+            }
+            pdfFilename = fs::path(xoj::util::utf8(file));
+        }
+
+        if (!strcmp("absolute", domain)) {
+            // "absolute" just means path. For backward compatibility, it is hard to change the word.
+            if (pdfFilename.is_relative()) {
+                this->doc->setPathStorageMode(Util::PathStorageMode::AS_RELATIVE_PATH);
+                pdfFilename = xournalFilepath.remove_filename() / pdfFilename;
+            } else {
+                this->doc->setPathStorageMode(Util::PathStorageMode::AS_ABSOLUTE_PATH);
+            }
+        } else if (!strcmp("attach", domain)) {
+            attachToDocument = true;
+            // Handle old format separately
+            if (this->isGzFile) {
+                pdfFilename = (fs::path{xournalFilepath} += ".") += pdfFilename;
+            } else {
+                auto pdfBytes = readZipAttachment(pdfFilename);
+                if (!pdfBytes) {
+                    return;
+                }
+                doc->readPdf(pdfFilename, false, attachToDocument, std::move(pdfBytes));
+
+                if (!doc->getLastErrorMsg().empty()) {
+                    error("%s", FC(_F("Error reading PDF: {1}") % doc->getLastErrorMsg()));
+                }
+
+                this->pdfFilenameParsed = true;
+                return;
+            }
+        } else {
+            error("%s", FC(_F("Unknown domain type: {1}") % domain));
+            return;
+        }
+
+        this->pdfFilenameParsed = true;
+
+        if (fs::is_regular_file(pdfFilename)) {
+            doc->readPdf(pdfFilename, false, attachToDocument);
+            if (!doc->getLastErrorMsg().empty()) {
+                error("%s", FC(_F("Error reading PDF: {1}") % doc->getLastErrorMsg()));
+            }
+        } else {
+            doc->setPdfAttributes(pdfFilename, attachToDocument);
+            if (attachToDocument) {
+                this->attachedPdfMissing = true;
+            } else {
+                this->pdfMissing = char_cast(pdfFilename.u8string());
+            }
+        }
+    }
+}
+
+void LoadHandler::parsePage() {
+    if (!strcmp(elementName, "background")) {
+        const char* name = LoadHandlerHelper::getAttrib("name", true, this);
+        if (name != nullptr) {
+            this->page->setBackgroundName(name);
+        }
+
+        const char* type = LoadHandlerHelper::getAttrib("type", false, this);
+
+        if (strcmp("solid", type) == 0) {
+            parseBgSolid();
+        } else if (strcmp("pixmap", type) == 0) {
+            parseBgPixmap();
+        } else if (strcmp("pdf", type) == 0) {
+            parseBgPdf();
+        } else {
+            error("%s", FC(_F("Unknown background type: {1}") % type));
+        }
+    } else if (!strcmp(elementName, "layer")) {
+        this->pos = PARSER_POS_IN_LAYER;
+        this->layer = new Layer();
+
+        const char* name = LoadHandlerHelper::getAttrib("name", true, this);
+        if (name != nullptr) {
+            this->layer->setName(name);
+        }
+
+        this->page->addLayer(this->layer);
+    }
+}
+
+void LoadHandler::parseStroke() {
+    auto strokeOwn = std::make_unique<Stroke>();
+    this->stroke = strokeOwn.get();
+    this->layer->addElement(std::move(strokeOwn));
+
+    const char* width = LoadHandlerHelper::getAttrib("width", false, this);
+
+    char* endPtr = nullptr;
+    stroke->setWidth(g_ascii_strtod(width, &endPtr));
+    if (endPtr == width) {
+        error("%s", FC(_F("Error reading width of a stroke: {1}") % width));
+        return;
+    }
+
+    // MrWriter writes pressures as separate field
+    const char* pressure = LoadHandlerHelper::getAttrib("pressures", true, this);
+    if (pressure == nullptr) {
+        // Xournal / Xournal++ uses the width field
+        pressure = endPtr;
+    }
+
+    while (*pressure != 0) {
+        char* tmpptr = nullptr;
+        double val = g_ascii_strtod(pressure, &tmpptr);
+        if (tmpptr == pressure) {
+            break;
+        }
+        pressure = tmpptr;
+        this->pressureBuffer.push_back(val);
+    }
+
+    Color color{0U};
+    const char* sColor = LoadHandlerHelper::getAttrib("color", false, this);
+    if (!LoadHandlerHelper::parseColor(sColor, color, this)) {
+        return;
+    }
+    stroke->setColor(color);
+
+    /** read stroke timestamps (xopp fileformat) */
+    const auto* fn = LoadHandlerHelper::getAttrib("fn", true, this);
+    if (fn != nullptr && *fn != '\0') {
+        fs::path p(xoj::util::utf8(fn));
+        if (this->isGzFile) {
+            stroke->setAudioFilename(std::move(p));
+        } else {
+            auto tempFile = getTempFileForPath(p);
+            if (!tempFile.empty()) {
+                stroke->setAudioFilename(tempFile);
+            }
+        }
+    }
+
+
+    if (this->fileVersion < 4) {
+        int ts = 0;
+        if (LoadHandlerHelper::getAttribInt("ts", true, this, ts)) {
+            stroke->setTimestamp(as_unsigned(ts) * 1000);
+        }
+    } else {
+        size_t ts = 0;
+        if (LoadHandlerHelper::getAttribSizeT("ts", true, this, ts)) {
+            stroke->setTimestamp(ts);
+        }
+    }
+
+    int fill = -1;
+    if (LoadHandlerHelper::getAttribInt("fill", true, this, fill)) {
+        stroke->setFill(fill);
+    }
+
+    const char* capStyleStr = LoadHandlerHelper::getAttrib("capStyle", true, this);
+    if (capStyleStr != nullptr) {
+        if (strcmp("butt", capStyleStr) == 0) {
+            stroke->setStrokeCapStyle(StrokeCapStyle::BUTT);
+        } else if (strcmp("round", capStyleStr) == 0) {
+            stroke->setStrokeCapStyle(StrokeCapStyle::ROUND);
+        } else if (strcmp("square", capStyleStr) == 0) {
+            stroke->setStrokeCapStyle(StrokeCapStyle::SQUARE);
+        } else {
+            g_warning("%s", FC(_F("Unknown stroke cap type: \"{1}\", assuming round") % capStyleStr));
+        }
+    }
+
+    const char* style = LoadHandlerHelper::getAttrib("style", true, this);
+    if (style != nullptr) {
+        stroke->setLineStyle(StrokeStyle::parseStyle(style));
+    }
+
+    const char* tool = LoadHandlerHelper::getAttrib("tool", false, this);
+
+    if (strcmp("eraser", tool) == 0) {
+        stroke->setToolType(StrokeTool::ERASER);
+    } else if (strcmp("pen", tool) == 0) {
+        stroke->setToolType(StrokeTool::PEN);
+    } else if (strcmp("highlighter", tool) == 0) {
+        stroke->setToolType(StrokeTool::HIGHLIGHTER);
+    } else {
+        g_warning("%s", FC(_F("Unknown stroke type: \"{1}\", assuming pen") % tool));
+    }
+
+    /**
+     * For each stroke being read, set the timestamp value
+     * we've read just before.
+     * Afterwards, clean the read timestamp data.
+     */
+    if (!loadedFilename.empty()) {
+        this->stroke->setTimestamp(as_unsigned(loadedTimeStamp));
+        this->stroke->setAudioFilename(std::move(loadedFilename));
+        loadedTimeStamp = 0;
+    }
+}
+
+void LoadHandler::parseText() {
+    auto textOwn = std::make_unique<Text>();
+    this->text = textOwn.get();
+    this->layer->addElement(std::move(textOwn));
+
+    const char* sFont = LoadHandlerHelper::getAttrib("font", false, this);
+    double fontSize = LoadHandlerHelper::getAttribDouble("size", this);
+    double x = LoadHandlerHelper::getAttribDouble("x", this);
+    double y = LoadHandlerHelper::getAttribDouble("y", this);
+
+    this->text->setX(x);
+    this->text->setY(y);
+
+    XojFont& f = text->getFont();
+    f.setName(sFont);
+    f.setSize(fontSize);
+    const char* sColor = LoadHandlerHelper::getAttrib("color", false, this);
+    Color color{0U};
+    LoadHandlerHelper::parseColor(sColor, color, this);
+    text->setColor(color);
+
+    const auto* fn = LoadHandlerHelper::getAttrib("fn", true, this);
+    if (fn != nullptr && *fn != '\0') {
+        fs::path p(xoj::util::utf8(fn));
+        if (this->isGzFile) {
+            text->setAudioFilename(std::move(p));
+        } else {
+            auto tempFile = getTempFileForPath(p);
+            if (!tempFile.empty()) {
+                text->setAudioFilename(tempFile);
+            }
+        }
+    }
+
+    size_t ts = 0;
+    if (LoadHandlerHelper::getAttribSizeT("ts", true, this, ts)) {
+        text->setTimestamp(ts);
+    }
+}
+
+void LoadHandler::parseImage() {
+    double left = LoadHandlerHelper::getAttribDouble("left", this);
+    double top = LoadHandlerHelper::getAttribDouble("top", this);
+    double right = LoadHandlerHelper::getAttribDouble("right", this);
+    double bottom = LoadHandlerHelper::getAttribDouble("bottom", this);
+
+    xoj_assert(this->image == nullptr);
+    auto imageOwn = std::make_unique<Image>();
+    this->image = imageOwn.get();
+    this->layer->addElement(std::move(imageOwn));
+    this->image->setX(left);
+    this->image->setY(top);
+    this->image->setWidth(right - left);
+    this->image->setHeight(bottom - top);
+}
+
+void LoadHandler::parseTexImage() {
+    double left = LoadHandlerHelper::getAttribDouble("left", this);
+    double top = LoadHandlerHelper::getAttribDouble("top", this);
+    double right = LoadHandlerHelper::getAttribDouble("right", this);
+    double bottom = LoadHandlerHelper::getAttribDouble("bottom", this);
+
+    const char* imText = LoadHandlerHelper::getAttrib("text", false, this);
+    const char* compatibilityTest = LoadHandlerHelper::getAttrib("texlength", true, this);
+    auto imTextLen = strlen(imText);
+    if (compatibilityTest != nullptr) {
+        imTextLen = LoadHandlerHelper::getAttribSizeT("texlength", this);
+    }
+
+    auto teximageOwn = std::make_unique<TexImage>();
+    this->teximage = teximageOwn.get();
+    this->layer->addElement(std::move(teximageOwn));
+    this->teximage->setX(left);
+    this->teximage->setY(top);
+    this->teximage->setWidth(right - left);
+    this->teximage->setHeight(bottom - top);
+
+    this->teximage->setText(string(imText, imTextLen));
+}
+
+void LoadHandler::parseAttachment() {
+    if (this->pos != PARSER_POS_IN_IMAGE && this->pos != PARSER_POS_IN_TEXIMAGE) {
+        g_warning("Found attachment tag as child of a tag that should not have such a child (ignoring this tag)");
+        return;
+    }
+    fs::path path(xoj::util::utf8(LoadHandlerHelper::getAttrib("path", false, this)));
+
+    auto readResult = readZipAttachment(std::move(path));
+    if (!readResult) {
+        return;
+    }
+    std::string& imgData = *readResult;
+
+    switch (this->pos) {
+        case PARSER_POS_IN_IMAGE: {
+            this->image->setImage(std::move(imgData));
+            break;
+        }
+        case PARSER_POS_IN_TEXIMAGE: {
+            this->teximage->loadData(std::move(imgData), nullptr);
+            break;
+        }
+        default:
+            break;
+    }
+}
+
+void LoadHandler::parseLayer() {
+    /**
+     * read the timestamp before each stroke.
+     * Used for backwards compatibility
+     * against xoj files with timestamps)
+     **/
+    if (!strcmp(elementName, "timestamp")) {
+        loadedTimeStamp = LoadHandlerHelper::getAttribInt("ts", this);
+        loadedFilename = fs::path(xoj::util::utf8(LoadHandlerHelper::getAttrib("fn", false, this)));
+    }
+    if (!strcmp(elementName, "stroke"))  // start of a stroke
+    {
+        this->pos = PARSER_POS_IN_STROKE;
+        parseStroke();
+    } else if (!strcmp(elementName, "text"))  // start of a text item
+    {
+        this->pos = PARSER_POS_IN_TEXT;
+        parseText();
+    } else if (!strcmp(elementName, "image"))  // start of a image item
+    {
+        this->pos = PARSER_POS_IN_IMAGE;
+        parseImage();
+    } else if (!strcmp(elementName, "teximage"))  // start of a image item
+    {
+        this->pos = PARSER_POS_IN_TEXIMAGE;
+        parseTexImage();
+    }
+}
+
+/**
+ * Create a temporary file for the attached audio file.
+ * The OS should take care of removing the file.
+ */
+void LoadHandler::parseAudio() {
+    const char* filename = LoadHandlerHelper::getAttrib("fn", false, this);
+
+    GFileIOStream* fileStream = nullptr;
+    xoj::util::GObjectSPtr<GFile> tmpFile(g_file_new_tmp("xournal_audio_XXXXXX.tmp", &fileStream, nullptr),
+                                          xoj::util::adopt);
+    if (!tmpFile) {
+        g_warning("Unable to create temporary file for audio attachment.");
+        return;
+    }
+
+    GOutputStream* outputStream = g_io_stream_get_output_stream(G_IO_STREAM(fileStream));
+
+    zip_stat_t attachmentFileStat;
+    int statStatus = zip_stat(this->zipFp, filename, 0, &attachmentFileStat);
+    if (statStatus != 0) {
+        error("%s", FC(_F("Could not open attachment: {1}. Error message: {2}") % filename %
+                       zip_error_strerror(zip_get_error(this->zipFp))));
+        return;
+    }
+
+    gsize length = 0;
+    if (attachmentFileStat.valid & ZIP_STAT_SIZE) {
+        length = attachmentFileStat.size;
+    } else {
+        error("%s", FC(_F("Could not open attachment: {1}. Error message: No valid file size provided") % filename));
+        return;
+    }
+
+    zip_file_t* attachmentFile = zip_fopen(this->zipFp, filename, 0);
+
+    if (!attachmentFile) {
+        error("%s", FC(_F("Could not open attachment: {1}. Error message: {2}") % filename %
+                       zip_error_strerror(zip_get_error(this->zipFp))));
+        return;
+    }
+
+    gpointer data = g_malloc(1024);
+    zip_uint64_t readBytes = 0;
+    while (readBytes < length) {
+        zip_int64_t read = zip_fread(attachmentFile, data, 1024);
+        if (read == -1) {
+            g_free(data);
+            zip_fclose(attachmentFile);
+            error("%s", FC(_F("Could not open attachment: {1}. Error message: Could not read file") % filename));
+            return;
+        }
+
+        gboolean writeSuccessful =
+                g_output_stream_write_all(outputStream, data, static_cast<gsize>(read), nullptr, nullptr, nullptr);
+        if (!writeSuccessful) {
+            g_free(data);
+            zip_fclose(attachmentFile);
+            error("%s", FC(_F("Could not open attachment: {1}. Error message: Could not write file") % filename));
+            return;
+        }
+
+        readBytes += static_cast<zip_uint64_t>(read);
+    }
+    g_free(data);
+    zip_fclose(attachmentFile);
+
+    g_hash_table_insert(this->audioFiles, g_strdup(filename), g_file_get_path(tmpFile.get()));
+}
+
+void LoadHandler::parserStartElement(GMarkupParseContext* context, const gchar* elementName,
+                                     const gchar** attributeNames, const gchar** attributeValues, gpointer userdata,
+                                     GError** error) {
+    auto* handler = static_cast<LoadHandler*>(userdata);
+    // Return on error
+    if (*error) {
+        return;
+    }
+    handler->attributeNames = attributeNames;
+    handler->attributeValues = attributeValues;
+    handler->elementName = elementName;
+
+    if (handler->pos == PARSER_POS_NOT_STARTED) {
+        handler->parseStart();
+    } else if (handler->pos == PARSER_POS_STARTED) {
+        handler->parseContents();
+    } else if (handler->pos == PARSER_POS_IN_PAGE) {
+        handler->parsePage();
+    } else if (handler->pos == PARSER_POS_IN_LAYER) {
+        handler->parseLayer();
+    } else if (handler->pos == PARSER_POS_IN_IMAGE || handler->pos == PARSER_POS_IN_TEXIMAGE) {
+        // Handle the attachment node within the appropriate nodes
+        if (!strcmp(elementName, "attachment")) {
+            handler->parseAttachment();
+        }
+    }
+
+    handler->attributeNames = nullptr;
+    handler->attributeValues = nullptr;
+    handler->elementName = nullptr;
+}
+
+void LoadHandler::parserEndElement(GMarkupParseContext* context, const gchar* elementName, gpointer userdata,
+                                   GError** error) {
+    // Return on error
+    if (*error) {
+        return;
+    }
+
+    auto* handler = static_cast<LoadHandler*>(userdata);
+    if (handler->pos == PARSER_POS_STARTED && strcmp(elementName, handler->endRootTag) == 0) {
+        handler->pos = PASER_POS_FINISHED;
+    } else if (handler->pos == PARSER_POS_IN_PAGE && strcmp(elementName, "page") == 0) {
+        // handle unnecessary layer insertion in case of existing layers in file
+        if (handler->page->getLayerCount() == 0) {
+            handler->page->addLayer(new Layer());
+        }
+        handler->pos = PARSER_POS_STARTED;
+        handler->page = nullptr;
+    } else if (handler->pos == PARSER_POS_IN_LAYER && strcmp(elementName, "layer") == 0) {
+        handler->pos = PARSER_POS_IN_PAGE;
+        handler->layer = nullptr;
+    } else if (handler->pos == PARSER_POS_IN_LAYER && strcmp(elementName, "timestamp") == 0) {
+        /** Used for backwards compatibility against xoj files with timestamps) */
+        handler->pos = PARSER_POS_IN_LAYER;
+        handler->stroke = nullptr;
+    } else if (handler->pos == PARSER_POS_IN_STROKE && strcmp(elementName, "stroke") == 0) {
+        handler->pos = PARSER_POS_IN_LAYER;
+        handler->stroke = nullptr;
+    } else if (handler->pos == PARSER_POS_IN_TEXT && strcmp(elementName, "text") == 0) {
+        handler->pos = PARSER_POS_IN_LAYER;
+        handler->text = nullptr;
+    } else if (handler->pos == PARSER_POS_IN_IMAGE && strcmp(elementName, "image") == 0) {
+        xoj_assert_message(handler->image->getImage() != nullptr, "image can't be rendered");
+        handler->pos = PARSER_POS_IN_LAYER;
+        handler->image = nullptr;
+    } else if (handler->pos == PARSER_POS_IN_TEXIMAGE && strcmp(elementName, "teximage") == 0) {
+        handler->pos = PARSER_POS_IN_LAYER;
+        handler->teximage = nullptr;
+    }
+}
+
+void LoadHandler::fixNullPressureValues() {
+    /*
+     * Due to various bugs (see e.g. https://github.com/xournalpp/xournalpp/issues/3643), old files may contain strokes
+     * with non-positive pressure values.
+     *
+     * Those strokes thus fails the somewhat reasonable assumption that pressure values should be positive.
+     * The portions of stroke with non-positive pressure values are in any case invisible.
+     *
+     * This function fixes corrupted strokes by
+     *  1- removing every point with a non-positive pressure value.
+     *  2- if required, splitting the affected stroke into several strokes.
+     *  3- entirely deleting strokes without any valid pressure value
+     */
+    auto& pts = stroke->getPointVector();
+    if (pressureBuffer.size() >= pts.size()) {
+        // Too many pressure values. Drop the last ones
+        xoj_assert(pts.size() >= 2);  // An error has already been returned otherwise
+        pressureBuffer.resize(pts.size() - 1);
+    }
+
+    auto nextPositive = std::find_if(pressureBuffer.begin(), pressureBuffer.end(), [](double v) { return v > 0; });
+
+    std::vector<std::vector<Point>> strokePortions;
+    while (nextPositive != pressureBuffer.end()) {
+        auto nextNonPositive =
+                std::find_if(nextPositive, pressureBuffer.end(), [](double v) { return v <= 0 || std::isnan(v); });
+        size_t nValidPressureValues = static_cast<size_t>(std::distance(nextPositive, nextNonPositive));
+
+        std::vector<Point> ps;
+        ps.reserve(nValidPressureValues + 1);
+
+        std::transform(nextPositive, nextNonPositive,
+                       std::next(pts.begin(), std::distance(pressureBuffer.begin(), nextPositive)),
+                       std::back_inserter(ps), [](double v, const Point& p) { return Point(p.x, p.y, v); });
+
+        // pts.size() == pressureBuffer.size() + 1 so the following iterator is always dereferencable, even if
+        // nextNonPositive == pressureBuffer.end()
+        ps.emplace_back(*std::next(pts.begin(), std::distance(pressureBuffer.begin(), nextNonPositive)));
+
+        xoj_assert(ps.size() == nValidPressureValues + 1);
+        strokePortions.emplace_back(std::move(ps));
+
+        if (nextNonPositive == pressureBuffer.end()) {
+            break;
+        }
+        nextPositive = std::find_if(nextNonPositive, pressureBuffer.end(), [](double v) { return v > 0; });
+    }
+
+    if (strokePortions.empty()) {
+        // There was no valid pressure values! Delete the stroke entirely
+        g_warning("Found a stroke with only non-positive pressure values! Removing this invisible stroke.");
+        std::ignore = layer->removeElement(stroke);
+        stroke = nullptr;
+        return;
+    }
+
+    g_warning("Found a stroke with some non-positive pressure values. Removing the affected points.");
+    for_first_then_each(
+            strokePortions, [&](std::vector<Point>& points) { stroke->setPointVector(std::move(points)); },
+            [&](std::vector<Point>& points) {
+                auto strokeOwn = std::make_unique<Stroke>();
+                strokeOwn->applyStyleFrom(stroke);
+                strokeOwn->setPointVector(std::move(points));
+                stroke = strokeOwn.get();
+                layer->addElement(std::move(strokeOwn));
+            });
+}
+
+void LoadHandler::parserText(GMarkupParseContext* context, const gchar* text, gsize textLen, gpointer userdata,
+                             GError** error) {
+    // Return on error
+    if (*error) {
+        return;
+    }
+
+    auto* handler = static_cast<LoadHandler*>(userdata);
+    if (handler->pos == PARSER_POS_IN_STROKE) {
+        const char* ptr = text;
+        int n = 0;
+
+        bool xRead = false;
+        double x = 0;
+
+        while (textLen > 0) {
+            double tmp = g_ascii_strtod(text, const_cast<char**>(&ptr));
+            if (ptr == text) {
+                break;
+            }
+            textLen -= as_unsigned(ptr - text);
+            text = ptr;
+            n++;
+
+            if (!xRead) {
+                xRead = true;
+                x = tmp;
+            } else {
+                xRead = false;
+                handler->stroke->addPoint(Point(x, tmp));
+            }
+        }
+        handler->stroke->freeUnusedPointItems();
+
+        if (n < 4 || (n & 1)) {
+            error2(*error, "%s", FC(_F("Wrong count of points ({1})") % n));
+            return;
+        }
+
+        if (!handler->pressureBuffer.empty()) {
+            if (handler->pressureBuffer.size() + 1 >= handler->stroke->getPointCount()) {
+                auto firstNonPositive = std::find_if(handler->pressureBuffer.begin(), handler->pressureBuffer.end(),
+                                                     [](double v) { return v <= 0 || std::isnan(v); });
+                if (firstNonPositive != handler->pressureBuffer.end()) {
+                    // Warning: this may delete handler->stroke if no positive pressure values are provided
+                    // Do not dereference handler->stroke after that
+                    handler->fixNullPressureValues();
+                } else {
+                    handler->stroke->setPressure(handler->pressureBuffer);
+                }
+            } else {
+                g_warning("%s", FC(_F("xoj-File: {1}") % handler->filepath.u8string()));
+                g_warning("%s", FC(_F("Wrong number of pressure values, got {1}, expected {2}") %
+                                   handler->pressureBuffer.size() % (handler->stroke->getPointCount() - 1)));
+            }
+            handler->pressureBuffer.clear();
+        }
+    } else if (handler->pos == PARSER_POS_IN_TEXT) {
+        gchar* txt = g_strndup(text, textLen);
+        handler->text->setText(txt);
+        g_free(txt);
+    } else if (handler->pos == PARSER_POS_IN_IMAGE) {
+        handler->readImage(text, textLen);
+    } else if (handler->pos == PARSER_POS_IN_TEXIMAGE) {
+        handler->readTexImage(text, textLen);
+    }
+}
+
+auto LoadHandler::parseBase64(const gchar* base64, gsize length) -> string {
+    // We have to copy the string in order to null terminate it, sigh.
+    auto* base64data = static_cast<gchar*>(g_memdup(base64, static_cast<guint>(length) + 1));
+    base64data[length] = '\0';
+
+    gsize binaryBufferLen = 0;
+    guchar* binaryBuffer = g_base64_decode(base64data, &binaryBufferLen);
+    g_free(base64data);
+
+    string str = string(reinterpret_cast<char*>(binaryBuffer), binaryBufferLen);
+    g_free(binaryBuffer);
+
+    return str;
+}
+
+void LoadHandler::readImage(const gchar* base64string, gsize base64stringLen) {
+    xoj_assert(this->image != nullptr);
+    if (base64stringLen == 0 || (base64stringLen == 1 && base64string[0] == '\n') || this->image->hasData()) {
+        return;
+    }
+
+    this->image->setImage(parseBase64(const_cast<char*>(base64string), base64stringLen));
+}
+
+void LoadHandler::readTexImage(const gchar* base64string, gsize base64stringLen) {
+    if (base64stringLen == 1 && !strcmp(base64string, "\n")) {
+        return;
+    }
+
+    this->teximage->loadData(parseBase64(const_cast<char*>(base64string), base64stringLen));
+}
+
+auto LoadHandler::loadDocument(fs::path const& filepath) -> std::unique_ptr<Document> {
+    initAttributes();
+    this->doc = std::make_unique<Document>(&dHanlder);
+
+    if (!openFile(filepath)) {
+        this->doc.reset();
+        return nullptr;
+    }
+
+    xournalFilepath = filepath;
+
+    this->pdfFilenameParsed = false;
+
+    if (!parseXml()) {
+        closeFile();
+        this->doc.reset();
+        return nullptr;
+    }
+
+    if (fileVersion == 1) {
+        // This is a Xournal document, not a Xournal++
+        // Even if the new fileextension is .xopp, allow to
+        // overwrite .xoj files which are created by Xournal++
+        // Force the user to save is a bad idea, this will annoy the user
+        // Rename files is also not that user friendly.
+
+        doc->setFilepath("");
+    } else {
+        doc->setFilepath(filepath);
+    }
+
+    closeFile();
+
+    return std::move(this->doc);
+}
+
+auto LoadHandler::readZipAttachment(fs::path const& filename) -> std::unique_ptr<std::string> {
+    zip_stat_t attachmentFileStat;
+    const int statStatus = zip_stat(this->zipFp, char_cast(filename.u8string().c_str()), 0, &attachmentFileStat);
+    if (statStatus != 0) {
+        error("%s", FC(_F("Could not open attachment: {1}. Error message: {2}") % filename.u8string() %
+                       zip_error_strerror(zip_get_error(this->zipFp))));
+        return {};
+    }
+
+    if (!(attachmentFileStat.valid & ZIP_STAT_SIZE)) {
+        error("%s", FC(_F("Could not open attachment: {1}. Error message: No valid file size provided") %
+                       filename.u8string()));
+        return {};
+    }
+    const zip_uint64_t length = attachmentFileStat.size;
+
+    zip_file_t* attachmentFile = zip_fopen(this->zipFp, char_cast(filename.u8string().c_str()), 0);
+    if (!attachmentFile) {
+        error("%s", FC(_F("Could not open attachment: {1}. Error message: {2}") % filename.u8string() %
+                       zip_error_strerror(zip_get_error(this->zipFp))));
+        return {};
+    }
+
+    auto data = std::make_unique<std::string>(length, 0);
+    zip_uint64_t readBytes = 0;
+    while (readBytes < length) {
+        const zip_int64_t read = zip_fread(attachmentFile, data->data() + readBytes, length - readBytes);
+        if (read == -1) {
+            zip_fclose(attachmentFile);
+            error("%s", FC(_F("Could not open attachment: {1}. Error message: No valid file size provided") %
+                           filename.u8string()));
+            return {};
+        }
+
+        readBytes += static_cast<zip_uint64_t>(read);
+    }
+
+    zip_fclose(attachmentFile);
+
+    return data;
+}
+
+auto LoadHandler::getTempFileForPath(fs::path const& filename) -> fs::path {
+    gpointer tmpFilename = g_hash_table_lookup(this->audioFiles, filename.u8string().c_str());
+    if (tmpFilename) {
+        return fs::path(xoj::util::utf8(static_cast<char*>(tmpFilename)));
+    }
+
+    error("%s", FC(_F("Requested temporary file was not found for attachment {1}") % filename.u8string()));
+    return "";
+}
+
+auto LoadHandler::getFileVersion() const -> int { return this->fileVersion; }
diff --git a/entry/src/main/cpp/src/core/control/xojfile/LoadHandler.h b/entry/src/main/cpp/src/core/control/xojfile/LoadHandler.h
new file mode 100644
index 0000000..5aeb1ba
--- /dev/null
+++ b/entry/src/main/cpp/src/core/control/xojfile/LoadHandler.h
@@ -0,0 +1,176 @@
+/*
+ * Xournal++
+ *
+ * Loads a .xoj / .xopp document
+ *
+ * @author Xournal++ Team
+ * https://github.com/xournalpp/xournalpp
+ *
+ * @license GNU GPLv2 or later
+ */
+
+#pragma once
+
+#include <cstddef>   // for size_t
+#include <memory>    // for unique_ptr
+#include <optional>  // for optional
+#include <string>    // for string
+#include <vector>    // for vector
+
+#include <glib.h>     // for gchar, GError, gsize, GMarkupPars...
+#include <zip.h>      // for zip_file_t, zip_t
+#include <zipconf.h>  // for zip_int64_t, zip_uint64_t
+#include <zlib.h>     // for gzFile
+
+#include "model/Document.h"         // for Document
+#include "model/DocumentHandler.h"  // for DocumentHandler
+#include "model/PageRef.h"          // for PageRef
+#include "util/Color.h"             // for Color
+
+#include "LoadHandlerHelper.h"
+#include "filesystem.h"  // for path
+
+class Image;
+class Layer;
+class Stroke;
+class TexImage;
+class Text;
+
+
+enum ParserPosition {
+    PARSER_POS_NOT_STARTED = 1,  // Waiting for opening <xounal> tag
+    PARSER_POS_STARTED,          // Waiting for Metainfo or contents like <page>
+    PARSER_POS_IN_PAGE,          // Starting page tag read
+    PARSER_POS_IN_LAYER,         // Starting layer tag read
+    PARSER_POS_IN_STROKE,        // Starting layer tag read
+    PARSER_POS_IN_TEXT,          // Starting text tag read
+    PARSER_POS_IN_IMAGE,         // Starting image tag read
+    PARSER_POS_IN_TEXIMAGE,      // Starting latex tag read
+
+    PASER_POS_FINISHED  // Document is parsed
+};
+
+class LoadHandler {
+public:
+    LoadHandler();
+    virtual ~LoadHandler();
+
+public:
+    std::unique_ptr<Document> loadDocument(fs::path const& filepath);
+
+    std::string getLastError();
+    bool isAttachedPdfMissing() const;
+    std::string getMissingPdfFilename() const;
+
+    /** @return The version of the loaded file */
+    int getFileVersion() const;
+
+private:
+    void parseStart();
+    void parseContents();
+    void parsePage();
+    void parseLayer();
+    void parseAudio();
+
+    void parseStroke();
+    void parseText();
+    void parseImage();
+    void parseTexImage();
+
+private:
+    void initAttributes();
+
+    std::string readLine();
+    zip_int64_t readContentFile(char* buffer, zip_uint64_t len);
+    bool closeFile();
+    bool openFile(fs::path const& filepath);
+    bool parseXml();
+
+    void fixNullPressureValues();
+    static void parserText(GMarkupParseContext* context, const gchar* text, gsize textLen, gpointer userdata,
+                           GError** error);
+    static void parserEndElement(GMarkupParseContext* context, const gchar* elementName, gpointer userdata,
+                                 GError** error);
+    static void parserStartElement(GMarkupParseContext* context, const gchar* elementName, const gchar** attributeNames,
+                                   const gchar** attributeValues, gpointer userdata, GError** error);
+
+    const char* getAttrib(const char* name, bool optional = false);
+    double getAttribDouble(const char* name);
+    int getAttribInt(const char* name);
+
+    void parseBgSolid();
+    void parseBgPixmap();
+    void parseBgPdf();
+    void parseAttachment();
+
+    void readImage(const gchar* base64string, gsize base64stringLen);
+    void readTexImage(const gchar* base64string, gsize base64stringLen);
+
+private:
+    static std::string parseBase64(const gchar* base64, gsize length);
+
+    /**
+     * Returns the contents of the zip attachment with the given file name, or
+     * nullopt if there is no such file.
+     */
+    std::unique_ptr<std::string> readZipAttachment(fs::path const& filename);
+
+    fs::path getTempFileForPath(fs::path const& filename);
+
+private:
+    std::string lastError;
+    std::string pdfMissing;
+    bool attachedPdfMissing;
+
+    fs::path filepath;
+
+    bool pdfFilenameParsed;
+
+    ParserPosition pos;
+
+    std::string creator;
+    int fileVersion;
+    int minimalFileVersion;
+
+    zip_t* zipFp;
+    zip_file_t* zipContentFile;
+    gzFile gzFp;
+    bool isGzFile = false;
+
+    std::vector<double> pressureBuffer;
+
+    std::vector<PageRef> pages;
+    PageRef page;
+    Layer* layer;
+    Stroke* stroke;
+    Text* text;
+    Image* image;
+    TexImage* teximage;
+    GHashTable* audioFiles = nullptr;
+
+    const char* endRootTag = "xournal";
+
+    fs::path xournalFilepath;
+
+    GError* error;
+    const gchar** attributeNames;
+    const gchar** attributeValues;
+    const gchar* elementName;
+
+    int loadedTimeStamp;
+    fs::path loadedFilename;
+
+    DocumentHandler dHanlder;
+    std::unique_ptr<Document> doc;
+
+    friend Color LoadHandlerHelper::parseBackgroundColor(LoadHandler* loadHandler);
+    friend bool LoadHandlerHelper::parseColor(const char* text, Color& color, LoadHandler* loadHandler);
+
+    friend const char* LoadHandlerHelper::getAttrib(const char* name, bool optional, LoadHandler* loadHandler);
+    friend double LoadHandlerHelper::getAttribDouble(const char* name, LoadHandler* loadHandler);
+    friend int LoadHandlerHelper::getAttribInt(const char* name, LoadHandler* loadHandler);
+    friend bool LoadHandlerHelper::getAttribInt(const char* name, bool optional, LoadHandler* loadHandler, int& rValue);
+    friend size_t LoadHandlerHelper::getAttribSizeT(const char* name, LoadHandler* loadHandler);
+    friend bool LoadHandlerHelper::getAttribSizeT(const char* name, bool optional, LoadHandler* loadHandler,
+                                                  size_t& rValue);
+};
diff --git a/entry/src/main/cpp/src/core/control/xojfile/LoadHandlerHelper.cpp b/entry/src/main/cpp/src/core/control/xojfile/LoadHandlerHelper.cpp
new file mode 100644
index 0000000..84a5935
--- /dev/null
+++ b/entry/src/main/cpp/src/core/control/xojfile/LoadHandlerHelper.cpp
@@ -0,0 +1,211 @@
+/*
+ * Xournal++
+ *
+ * helper methods to load a .xoj / .xopp document
+ *
+ * @author Xournal Team
+ * http://xournal.sf.net
+ *
+ * @license GPL
+ */
+#include "LoadHandlerHelper.h"
+
+#include <cstdint>    // for uint32_t
+#include <cstdlib>    // for strtol, strtoull
+#include <cstring>    // for strcmp, size_t, strlen
+#include <string>     // for allocator, string
+
+#include <glib.h>  // for g_error_new, G_MARKUP_ERROR, G_M...
+
+#include "util/Color.h"
+#include "util/PlaceholderString.h"  // for PlaceholderString
+#include "util/i18n.h"               // for FC, _F, _
+
+#include "LoadHandler.h"  // for LoadHandler, getAttribInt, getAt...
+
+#define error(...)                                                                                     \
+    if (loadHandler->error == nullptr) {                                                               \
+        loadHandler->error = g_error_new(G_MARKUP_ERROR, G_MARKUP_ERROR_INVALID_CONTENT, __VA_ARGS__); \
+    }
+
+struct PredefinedColor {
+    const char* name;
+    const Color rgb;
+};
+
+constexpr PredefinedColor PREDEFINED_COLORS[] = {
+        {"black", Colors::black},
+        {"blue", Colors::xopp_royalblue},
+        {"red", Colors::red},
+        {"green", Colors::green},
+        {"gray", Colors::gray},
+        {"lightblue", Colors::xopp_deepskyblue},
+        {"lightgreen", Colors::lime},
+        {"magenta", Colors::magenta},
+        {"orange", Colors::xopp_darkorange},
+        {"yellow", Colors::yellow},
+        {"white", Colors::white}};
+
+auto LoadHandlerHelper::parseBackgroundColor(LoadHandler* loadHandler) -> Color {
+    const char* sColor = LoadHandlerHelper::getAttrib("color", false, loadHandler);
+
+    Color color = Colors::white;
+    if (strcmp("blue", sColor) == 0) {
+        color = Colors::xopp_paleturqoise;
+    } else if (strcmp("pink", sColor) == 0) {
+        color = Colors::xopp_pink;
+    } else if (strcmp("green", sColor) == 0) {
+        color = Colors::xopp_aquamarine;
+    } else if (strcmp("orange", sColor) == 0) {
+        color = Colors::xopp_lightsalmon;
+    } else if (strcmp("yellow", sColor) == 0) {
+        color = Colors::xopp_khaki;
+    } else {
+        LoadHandlerHelper::parseColor(sColor, color, loadHandler);
+    }
+
+    return color;
+}
+
+auto LoadHandlerHelper::parseColor(const char* text, Color& color, LoadHandler* loadHandler) -> bool {
+    if (text == nullptr) {
+        error("%s", _("Attribute color not set!"));
+        return false;
+    }
+
+    if (text[0] == '#') {
+        gchar* ptr = nullptr;
+        auto c = uint32_t(g_ascii_strtoull(&text[1], &ptr, 16));
+        if (ptr != text + strlen(text)) {
+            error("%s", FC(_F("Unknown color value \"{1}\"") % text));
+            return false;
+        }
+
+        color = c >> 8U;
+
+        return true;
+    }
+
+
+    for (auto& i: PREDEFINED_COLORS) {
+        if (!strcmp(text, i.name)) {
+            color = i.rgb;
+            return true;
+        }
+    }
+    error("%s", FC(_F("Color \"{1}\" unknown (not defined in default color list)!") % text));
+    return false;
+}
+
+
+auto LoadHandlerHelper::getAttrib(const char* name, bool optional, LoadHandler* loadHandler) -> const char* {
+    const char** aName = loadHandler->attributeNames;
+    const char** aValue = loadHandler->attributeValues;
+
+    while (*aName != nullptr) {
+        if (!strcmp(*aName, name)) {
+            return *aValue;
+        }
+        aName++;
+        aValue++;
+    }
+
+    if (!optional) {
+        g_warning("Parser: attribute %s not found!", name);
+    }
+    return nullptr;
+}
+
+auto LoadHandlerHelper::getAttribDouble(const char* name, LoadHandler* loadHandler) -> double {
+    const char* attrib = getAttrib(name, false, loadHandler);
+
+    if (attrib == nullptr) {
+        error("%s", FC(_F("Attribute \"{1}\" could not be parsed as double, the value is nullptr") % name));
+        return 0;
+    }
+
+    char* ptr = nullptr;
+    double val = g_ascii_strtod(attrib, &ptr);
+    if (ptr == attrib) {
+        error("%s", FC(_F("Attribute \"{1}\" could not be parsed as double, the value is \"{2}\"") % name % attrib));
+    }
+
+    return val;
+}
+
+auto LoadHandlerHelper::getAttribInt(const char* name, LoadHandler* loadHandler) -> int {
+    const char* attrib = getAttrib(name, false, loadHandler);
+
+    if (attrib == nullptr) {
+        error("%s", FC(_F("Attribute \"{1}\" could not be parsed as int, the value is nullptr") % name));
+        return 0;
+    }
+
+    char* ptr = nullptr;
+    int val = static_cast<int>(strtol(attrib, &ptr, 10));
+    if (ptr == attrib) {
+        error("%s", FC(_F("Attribute \"{1}\" could not be parsed as int, the value is \"{2}\"") % name % attrib));
+    }
+
+    return val;
+}
+
+auto LoadHandlerHelper::getAttribInt(const char* name, bool optional, LoadHandler* loadHandler, int& rValue) -> bool {
+    const char* attrib = getAttrib(name, optional, loadHandler);
+
+    if (attrib == nullptr) {
+        if (!optional) {
+            g_warning("Parser: attribute %s not found!", name);
+        }
+        return false;
+    }
+
+    char* ptr = nullptr;
+    int val = static_cast<int>(strtol(attrib, &ptr, 10));
+    if (ptr == attrib) {
+        error("%s", FC(_F("Attribute \"{1}\" could not be parsed as int, the value is \"{2}\"") % name % attrib));
+    }
+
+    rValue = val;
+
+    return true;
+}
+
+auto LoadHandlerHelper::getAttribSizeT(const char* name, LoadHandler* loadHandler) -> size_t {
+    const char* attrib = getAttrib(name, false, loadHandler);
+
+    if (attrib == nullptr) {
+        error("%s", FC(_F("Attribute \"{1}\" could not be parsed as size_t, the value is nullptr") % name));
+        return 0;
+    }
+
+    char* ptr = nullptr;
+    size_t val = g_ascii_strtoull(attrib, &ptr, 10);
+    if (ptr == attrib) {
+        error("%s", FC(_F("Attribute \"{1}\" could not be parsed as size_t, the value is \"{2}\"") % name % attrib));
+    }
+
+    return val;
+}
+
+auto LoadHandlerHelper::getAttribSizeT(const char* name, bool optional, LoadHandler* loadHandler, size_t& rValue)
+        -> bool {
+    const char* attrib = getAttrib(name, optional, loadHandler);
+
+    if (attrib == nullptr) {
+        if (!optional) {
+            g_warning("Parser: attribute %s not found!", name);
+        }
+        return false;
+    }
+
+    char* ptr = nullptr;
+    size_t val = strtoull(attrib, &ptr, 10);
+    if (ptr == attrib) {
+        error("%s", FC(_F("Attribute \"{1}\" could not be parsed as size_t, the value is \"{2}\"") % name % attrib));
+    }
+
+    rValue = val;
+
+    return true;
+}
diff --git a/entry/src/main/cpp/src/core/control/xojfile/LoadHandlerHelper.h b/entry/src/main/cpp/src/core/control/xojfile/LoadHandlerHelper.h
new file mode 100644
index 0000000..b7c1f67
--- /dev/null
+++ b/entry/src/main/cpp/src/core/control/xojfile/LoadHandlerHelper.h
@@ -0,0 +1,30 @@
+/*
+ * Xournal++
+ *
+ * helper methods to load a .xoj / .xopp document
+ *
+ * @author Xournal Team
+ * http://xournal.sf.net
+ *
+ * @license GPL
+ */
+
+#pragma once
+
+#include <cstddef>  // for size_t
+
+#include "util/Color.h"  // for Color
+
+class LoadHandler;
+
+namespace LoadHandlerHelper {
+Color parseBackgroundColor(LoadHandler* loadHandler);
+bool parseColor(const char* text, Color& color, LoadHandler* loadHandler);
+
+const char* getAttrib(const char* name, bool optional, LoadHandler* loadHandler);
+double getAttribDouble(const char* name, LoadHandler* loadHandler);
+int getAttribInt(const char* name, LoadHandler* loadHandler);
+bool getAttribInt(const char* name, bool optional, LoadHandler* loadHandler, int& rValue);
+size_t getAttribSizeT(const char* name, LoadHandler* loadHandler);
+bool getAttribSizeT(const char* name, bool optional, LoadHandler* loadHandler, size_t& rValue);
+};  // namespace LoadHandlerHelper
diff --git a/entry/src/main/cpp/src/core/control/xojfile/SaveHandler.cpp b/entry/src/main/cpp/src/core/control/xojfile/SaveHandler.cpp
new file mode 100644
index 0000000..d528bb1
--- /dev/null
+++ b/entry/src/main/cpp/src/core/control/xojfile/SaveHandler.cpp
@@ -0,0 +1,379 @@
+#include "SaveHandler.h"
+
+#include <cinttypes>   // for PRIx32
+#include <cstdint>     // for uint32_t
+#include <cstdio>      // for sprintf, size_t
+
+#include <cairo.h>                  // for cairo_surface_t
+#include <gdk-pixbuf/gdk-pixbuf.h>  // for gdk_pixbuf_save
+#include <glib.h>                   // for g_free, g_strdup_printf
+
+#include "control/pagetype/PageTypeHandler.h"  // for PageTypeHandler
+#include "control/xml/XmlAudioNode.h"          // for XmlAudioNode
+#include "control/xml/XmlImageNode.h"          // for XmlImageNode
+#include "control/xml/XmlNode.h"               // for XmlNode
+#include "control/xml/XmlPointNode.h"          // for XmlPointNode
+#include "control/xml/XmlTexNode.h"            // for XmlTexNode
+#include "control/xml/XmlTextNode.h"           // for XmlTextNode
+#include "model/AudioElement.h"                // for AudioElement
+#include "model/BackgroundImage.h"             // for BackgroundImage
+#include "model/Document.h"                    // for Document
+#include "model/Element.h"                     // for Element, ELEMENT_IMAGE
+#include "model/Font.h"                        // for XojFont
+#include "model/Image.h"                       // for Image
+#include "model/Layer.h"                       // for Layer
+#include "model/LineStyle.h"                   // for LineStyle
+#include "model/PageType.h"                    // for PageType
+#include "model/Point.h"                       // for Point
+#include "model/Stroke.h"                      // for Stroke, StrokeCapStyle
+#include "model/StrokeStyle.h"                 // for StrokeStyle
+#include "model/TexImage.h"                    // for TexImage
+#include "model/Text.h"                        // for Text
+#include "model/XojPage.h"                     // for XojPage
+#include "pdf/base/XojPdfDocument.h"           // for XojPdfDocument
+#include "util/OutputStream.h"                 // for GzOutputStream, Output...
+#include "util/PathUtil.h"                     // for clearExtensions, normalizeAssetPath
+#include "util/PlaceholderString.h"            // for PlaceholderString
+#include "util/i18n.h"                         // for FS, _F
+
+#include "config.h"  // for FILE_FORMAT_VERSION
+#include "filesystem.h"
+
+SaveHandler::SaveHandler() {
+    this->firstPdfPageVisited = false;
+    this->attachBgId = 1;
+}
+
+void SaveHandler::prepareSave(const Document* doc, const fs::path& target) {
+    if (this->root) {
+        // cleanup old data
+        backgroundImages.clear();
+    }
+
+    this->firstPdfPageVisited = false;
+    this->attachBgId = 1;
+
+    root.reset(new XmlNode("xournal"));
+
+    writeHeader();
+
+    auto preview = doc->getPreview();
+    if (preview) {
+        auto* image = new XmlImageNode("preview");
+        image->setImage(preview.get());
+        this->root->addChild(image);
+    }
+
+    for (size_t i = 0; i < doc->getPageCount(); i++) {
+        PageRef p = doc->getPage(i);
+        p->getBackgroundImage().clearSaveState();
+    }
+
+    for (size_t i = 0; i < doc->getPageCount(); i++) {
+        PageRef p = doc->getPage(i);
+        visitPage(root.get(), p, doc, static_cast<int>(i), target);
+    }
+}
+
+void SaveHandler::writeHeader() {
+    this->root->setAttrib("creator", PROJECT_STRING);
+    this->root->setAttrib("fileversion", FILE_FORMAT_VERSION);
+    this->root->addChild(new XmlTextNode("title", std::string{"Xournal++ document - see "} + PROJECT_HOMEPAGE_URL));
+}
+
+auto SaveHandler::getColorStr(Color c, unsigned char alpha) -> std::string {
+    char str[10];
+    sprintf(str, "#%08" PRIx32, uint32_t(c) << 8U | alpha);
+    std::string color(str);
+    return color;
+}
+
+void SaveHandler::writeTimestamp(XmlAudioNode* xmlAudioNode, const AudioElement* audioElement) {
+    if (!audioElement->getAudioFilename().empty()) {
+        /** set stroke timestamp value to the XmlPointNode */
+        xmlAudioNode->setAttrib("ts", audioElement->getTimestamp());
+        auto audioFilename = audioElement->getAudioFilename().generic_u8string();
+        auto casted = char_cast(audioFilename);
+        xmlAudioNode->setAttrib("fn", std::string{casted.begin(), casted.end()});
+    }
+}
+
+void SaveHandler::visitStroke(XmlPointNode* stroke, const Stroke* s) {
+    StrokeTool t = s->getToolType();
+
+    unsigned char alpha = 0xff;
+
+    if (t == StrokeTool::PEN) {
+        stroke->setAttrib("tool", "pen");
+        writeTimestamp(stroke, s);
+    } else if (t == StrokeTool::ERASER) {
+        stroke->setAttrib("tool", "eraser");
+    } else if (t == StrokeTool::HIGHLIGHTER) {
+        stroke->setAttrib("tool", "highlighter");
+        alpha = 0x7f;
+    } else {
+        g_warning("Unknown StrokeTool::Value");
+        stroke->setAttrib("tool", "pen");
+    }
+
+    stroke->setAttrib("color", getColorStr(s->getColor(), alpha).c_str());
+
+    const auto& pts = s->getPointVector();
+
+    stroke->setPoints(pts);
+
+    if (s->hasPressure()) {
+        std::vector<double> values;
+        values.reserve(pts.size() + 1);
+        values.emplace_back(s->getWidth());
+        std::transform(pts.begin(), pts.end() - 1, std::back_inserter(values), [](const Point& p) { return p.z; });
+        stroke->setAttrib("width", std::move(values));
+    } else {
+        stroke->setAttrib("width", s->getWidth());
+    }
+
+    visitStrokeExtended(stroke, s);
+}
+
+/**
+ * Export the fill attributes
+ */
+void SaveHandler::visitStrokeExtended(XmlPointNode* stroke, const Stroke* s) {
+    if (s->getFill() != -1) {
+        stroke->setAttrib("fill", s->getFill());
+    }
+
+    const StrokeCapStyle capStyle = s->getStrokeCapStyle();
+    if (capStyle == StrokeCapStyle::BUTT) {
+        stroke->setAttrib("capStyle", "butt");
+    } else if (capStyle == StrokeCapStyle::ROUND) {
+        stroke->setAttrib("capStyle", "round");
+    } else if (capStyle == StrokeCapStyle::SQUARE) {
+        stroke->setAttrib("capStyle", "square");
+    } else {
+        g_warning("Unknown stroke cap type: %i", capStyle);
+        stroke->setAttrib("capStyle", "round");
+    }
+
+    if (s->getLineStyle().hasDashes()) {
+        stroke->setAttrib("style", StrokeStyle::formatStyle(s->getLineStyle()));
+    }
+}
+
+void SaveHandler::visitLayer(XmlNode* page, const Layer* l) {
+    auto* layer = new XmlNode("layer");
+    page->addChild(layer);
+    if (l->hasName()) {
+        layer->setAttrib("name", l->getName().c_str());
+    }
+
+    for (const auto& e: l->getElementsView()) {
+        if (e->getType() == ELEMENT_STROKE) {
+            auto* s = dynamic_cast<const Stroke*>(e);
+            auto* stroke = new XmlPointNode("stroke");
+            layer->addChild(stroke);
+            visitStroke(stroke, s);
+        } else if (e->getType() == ELEMENT_TEXT) {
+            const Text* t = dynamic_cast<const Text*>(e);
+            if (t->getText().empty()) {
+                g_warning("Trying to save an empty Text element. Discarding it!");
+                continue;
+            }
+            auto* text = new XmlTextNode("text", t->getText());
+            layer->addChild(text);
+
+            const XojFont& f = t->getFont();
+
+            text->setAttrib("font", f.getName().c_str());
+            text->setAttrib("size", f.getSize());
+            text->setAttrib("x", t->getX());
+            text->setAttrib("y", t->getY());
+            text->setAttrib("color", getColorStr(t->getColor()).c_str());
+
+            writeTimestamp(text, t);
+        } else if (e->getType() == ELEMENT_IMAGE) {
+            auto* i = dynamic_cast<const Image*>(e);
+            auto* image = new XmlImageNode("image");
+            layer->addChild(image);
+
+            image->setImage(i->getImage());
+
+            image->setAttrib("left", i->getX());
+            image->setAttrib("top", i->getY());
+            image->setAttrib("right", i->getX() + i->getElementWidth());
+            image->setAttrib("bottom", i->getY() + i->getElementHeight());
+        } else if (e->getType() == ELEMENT_TEXIMAGE) {
+            auto* i = dynamic_cast<const TexImage*>(e);
+            auto* image = new XmlTexNode("teximage", std::string(i->getBinaryData()));
+            layer->addChild(image);
+
+            image->setAttrib("text", i->getText().c_str());
+            image->setAttrib("left", i->getX());
+            image->setAttrib("top", i->getY());
+            image->setAttrib("right", i->getX() + i->getElementWidth());
+            image->setAttrib("bottom", i->getY() + i->getElementHeight());
+        }
+    }
+}
+
+void SaveHandler::visitPage(XmlNode* root, ConstPageRef p, const Document* doc, int id, const fs::path& target) {
+    auto* page = new XmlNode("page");
+    root->addChild(page);
+    page->setAttrib("width", p->getWidth());
+    page->setAttrib("height", p->getHeight());
+
+    auto* background = new XmlNode("background");
+    page->addChild(background);
+
+    writeBackgroundName(background, p);
+
+    if (p->getBackgroundType().isPdfPage()) {
+        /**
+         * ATTENTION! The original xournal can only read the XML if the attributes are in the right order!
+         * DO NOT CHANGE THE ORDER OF THE ATTRIBUTES!
+         */
+
+        background->setAttrib("type", "pdf");
+        if (!firstPdfPageVisited) {
+            firstPdfPageVisited = true;
+
+            if (doc->isAttachPdf()) {
+                background->setAttrib("domain", "attach");
+                auto filepath = doc->getFilepath();
+                Util::clearExtensions(filepath);
+                filepath += ".xopp.bg.pdf";
+                background->setAttrib("filename", "bg.pdf");
+
+                GError* error = nullptr;
+                if (!exists(filepath)) {
+                    doc->getPdfDocument().save(filepath, &error);
+                }
+
+                if (error) {
+                    if (!this->errorMessage.empty()) {
+                        this->errorMessage += "\n";
+                    }
+                    this->errorMessage +=
+                            FS(_F("Could not write background \"{1}\", {2}") % filepath.u8string() % error->message);
+
+                    g_error_free(error);
+                }
+            } else {
+                // "absolute" just means path. For backward compatibility, it is hard to change the word
+                background->setAttrib("domain", "absolute");
+                auto normalizedPath = Util::normalizeAssetPath(doc->getPdfFilepath(), target.parent_path(),
+                                                               doc->getPathStorageMode());
+                background->setAttrib("filename", char_cast(normalizedPath.c_str()));
+            }
+        }
+        background->setAttrib("pageno", p->getPdfPageNr() + 1);
+    } else if (p->getBackgroundType().isImagePage()) {
+        background->setAttrib("type", "pixmap");
+
+        int cloneId = p->getBackgroundImage().getCloneId();
+        if (cloneId != -1) {
+            background->setAttrib("domain", "clone");
+            char* filename = g_strdup_printf("%i", cloneId);
+            background->setAttrib("filename", filename);
+            g_free(filename);
+        } else if (p->getBackgroundImage().isAttached() && p->getBackgroundImage().getPixbuf()) {
+            char* filename = g_strdup_printf("bg_%d.png", this->attachBgId++);
+            background->setAttrib("domain", "attach");
+            background->setAttrib("filename", filename);
+
+            // Store the changed info to update the document in updateDocumentInfo()
+            backgroundImages.emplace_back(ImageInfo{p->getBackgroundImage(), fs::path(filename), id});
+            g_free(filename);
+        } else {
+            // "absolute" just means path. For backward compatibility, it is hard to change the word
+            background->setAttrib("domain", "absolute");
+            auto normalizedPath = Util::normalizeAssetPath(p->getBackgroundImage().getFilepath(), target.parent_path(),
+                                                           doc->getPathStorageMode());
+            background->setAttrib("filename", char_cast(normalizedPath.c_str()));
+
+            // Store the changed info to update the document in updateDocumentInfo()
+            backgroundImages.emplace_back(ImageInfo{p->getBackgroundImage(), std::nullopt, id});
+        }
+    } else {
+        writeSolidBackground(background, p);
+    }
+
+    // no layer, but we need to write one layer, else the old Xournal cannot read the file
+    if (p->getLayerCount() == 0) {
+        auto* layer = new XmlNode("layer");
+        page->addChild(layer);
+    }
+
+    for (const Layer* l: p->getLayersView()) {
+        visitLayer(page, l);
+    }
+}
+
+void SaveHandler::writeSolidBackground(XmlNode* background, ConstPageRef p) {
+    background->setAttrib("type", "solid");
+    background->setAttrib("color", getColorStr(p->getBackgroundColor()));
+    background->setAttrib("style", PageTypeHandler::getStringForPageTypeFormat(p->getBackgroundType().format));
+
+    // Not compatible with Xournal, so the background needs
+    // to be changed to a basic one!
+    if (!p->getBackgroundType().config.empty()) {
+        background->setAttrib("config", p->getBackgroundType().config);
+    }
+}
+
+void SaveHandler::writeBackgroundName(XmlNode* background, ConstPageRef p) {
+    if (p->backgroundHasName()) {
+        background->setAttrib("name", p->getBackgroundName());
+    }
+}
+
+void SaveHandler::saveTo(const fs::path& filepath, ProgressListener* listener) {
+    GzOutputStream out(filepath);
+
+    if (!out.getLastError().empty()) {
+        this->errorMessage = out.getLastError();
+        return;
+    }
+
+    saveTo(&out, filepath, listener);
+
+    out.close();
+
+    if (this->errorMessage.empty()) {
+        this->errorMessage = out.getLastError();
+    }
+}
+
+void SaveHandler::saveTo(OutputStream* out, const fs::path& filepath, ProgressListener* listener) {
+    out->write("<?xml version=\"1.0\" standalone=\"no\"?>\n");
+    root->writeOut(out, listener);
+
+    for (const auto& info: backgroundImages) {
+        if (info.newPath) {
+            auto tmpfn = (fs::path(filepath) += ".") += info.newPath.value();
+            // Are we certain that does not modify the GdkPixbuf?
+            if (!gdk_pixbuf_save(const_cast<GdkPixbuf*>(info.image.getPixbuf()), Util::toGFilename(tmpfn).c_str(),
+                                 "png", nullptr, nullptr)) {
+                if (!this->errorMessage.empty()) {
+                    this->errorMessage += "\n";
+                }
+
+                this->errorMessage +=
+                        FS(_F("Could not write background \"{1}\". Continuing anyway.") % tmpfn.u8string());
+            }
+        }
+    }
+}
+
+void SaveHandler::updateDocumentInfo(Document* doc) {
+    for (auto& info: backgroundImages) {
+        if (info.newPath) {
+            info.image.setFilepath(std::move(info.newPath.value()));
+        }
+        info.image.setCloneId(info.newId);
+    }
+    backgroundImages.clear();
+}
+
+
+auto SaveHandler::getErrorMessage() -> const std::string& { return this->errorMessage; }
diff --git a/entry/src/main/cpp/src/core/control/xojfile/SaveHandler.h b/entry/src/main/cpp/src/core/control/xojfile/SaveHandler.h
new file mode 100644
index 0000000..a4da5c0
--- /dev/null
+++ b/entry/src/main/cpp/src/core/control/xojfile/SaveHandler.h
@@ -0,0 +1,85 @@
+/*
+ * Xournal++
+ *
+ * Saves a document
+ *
+ * @author Xournal++ Team
+ * https://github.com/xournalpp/xournalpp
+ *
+ * @license GNU GPLv2 or later
+ */
+
+#pragma once
+
+#include <memory>  // for unique_ptr
+#include <optional>
+#include <string>  // for string
+#include <vector>  // for vector
+
+#include "control/xml/XmlNode.h"    // for XmlNode
+#include "model/BackgroundImage.h"  // for BackgroundImage
+#include "model/PageRef.h"          // for PageRef
+#include "util/Color.h"             // for Color
+
+#include "filesystem.h"  // for path
+
+class XmlPointNode;
+class ProgressListener;
+class AudioElement;
+class Document;
+class Layer;
+class OutputStream;
+class Stroke;
+class XmlAudioNode;
+
+class SaveHandler {
+public:
+    SaveHandler();
+
+public:
+    /// Prepare an XML tree corresponding to the document - Needs read-only access to the Document
+    void prepareSave(const Document* doc, const fs::path& target);
+    /// Writes the XML to the given path. Does not access the Document instance
+    void saveTo(const fs::path& filepath, ProgressListener* listener = nullptr);
+    /**
+     * Writes the XML to the given stream. Does not access the Document instance with the following exception:
+     * attached background images are written to disk. This is safe as long as we do not modify the background images
+     * anywhere
+     */
+    void saveTo(OutputStream* out, const fs::path& filepath, ProgressListener* listener = nullptr);
+    /// Update document information. Requires write access to the Document.
+    void updateDocumentInfo(Document* doc);
+
+    const std::string& getErrorMessage();
+
+protected:
+    static std::string getColorStr(Color c, unsigned char alpha = 0xff);
+
+    virtual void visitPage(XmlNode* root, ConstPageRef p, const Document* doc, int id, const fs::path& target);
+    virtual void visitLayer(XmlNode* page, const Layer* l);
+    virtual void visitStroke(XmlPointNode* stroke, const Stroke* s);
+
+    /**
+     * Export the fill attributes
+     */
+    virtual void visitStrokeExtended(XmlPointNode* stroke, const Stroke* s);
+
+    virtual void writeHeader();
+    virtual void writeSolidBackground(XmlNode* background, ConstPageRef p);
+    virtual void writeTimestamp(XmlAudioNode* xmlAudioNode, const AudioElement* audioElement);
+    virtual void writeBackgroundName(XmlNode* background, ConstPageRef p);
+
+protected:
+    std::unique_ptr<XmlNode> root{};
+    bool firstPdfPageVisited;
+    int attachBgId;
+
+    std::string errorMessage;
+
+    struct ImageInfo {
+        BackgroundImage image;  ///< This is a wrapped shared pointer
+        std::optional<fs::path> newPath;
+        int newId;
+    };
+    std::vector<ImageInfo> backgroundImages{};
+};
diff --git a/entry/src/main/cpp/src/core/control/xojfile/XojExportHandler.cpp b/entry/src/main/cpp/src/core/control/xojfile/XojExportHandler.cpp
new file mode 100644
index 0000000..67c0881
--- /dev/null
+++ b/entry/src/main/cpp/src/core/control/xojfile/XojExportHandler.cpp
@@ -0,0 +1,61 @@
+#include "XojExportHandler.h"
+
+#include <memory>  // for unique_ptr, __shared_p...
+#include <string>  // for string, allocator, ope...
+
+#include "control/pagetype/PageTypeHandler.h"  // for PageTypeHandler
+#include "control/xml/XmlNode.h"               // for XmlNode
+#include "control/xml/XmlTextNode.h"           // for XmlTextNode
+#include "model/PageType.h"                    // for PageTypeFormat, PageType
+#include "model/XojPage.h"                     // for XojPage
+
+#include "config.h"  // for PROJECT_STRING, PROJEC...
+
+class AudioElement;
+class Stroke;
+class XmlAudioNode;
+class XmlPointNode;
+
+XojExportHandler::XojExportHandler() = default;
+
+XojExportHandler::~XojExportHandler() = default;
+
+/**
+ * Export the fill attributes
+ */
+void XojExportHandler::visitStrokeExtended(XmlPointNode* stroke, const Stroke* s) {
+    // Fill is not exported in .xoj
+    // Line style is also not supported
+}
+
+void XojExportHandler::writeHeader() {
+    this->root->setAttrib("creator", PROJECT_STRING);
+    // Keep this version on 2, as this is anyway not read by Xournal
+    this->root->setAttrib("fileversion", "2");
+    this->root->addChild(
+            new XmlTextNode("title", std::string{"Xournal document (Compatibility) - see "} + PROJECT_HOMEPAGE_URL));
+}
+
+void XojExportHandler::writeSolidBackground(XmlNode* background, ConstPageRef p) {
+    background->setAttrib("type", "solid");
+    background->setAttrib("color", getColorStr(p->getBackgroundColor()));
+
+    PageTypeFormat bgFormat = p->getBackgroundType().format;
+    std::string format;
+
+    format = PageTypeHandler::getStringForPageTypeFormat(bgFormat);
+    if (bgFormat != PageTypeFormat::Plain && bgFormat != PageTypeFormat::Ruled && bgFormat != PageTypeFormat::Lined &&
+        bgFormat != PageTypeFormat::Graph) {
+        format = "plain";
+    }
+
+    background->setAttrib("style", format);
+}
+
+void XojExportHandler::writeTimestamp(XmlAudioNode* xmlAudioNode, const AudioElement* audioElement) {
+    // Do nothing since timestamp are not supported by Xournal
+}
+
+void XojExportHandler::writeBackgroundName(XmlNode* background, ConstPageRef p) {
+    // Do nothing since background name is not supported by Xournal
+}
diff --git a/entry/src/main/cpp/src/core/control/xojfile/XojExportHandler.h b/entry/src/main/cpp/src/core/control/xojfile/XojExportHandler.h
new file mode 100644
index 0000000..61534e9
--- /dev/null
+++ b/entry/src/main/cpp/src/core/control/xojfile/XojExportHandler.h
@@ -0,0 +1,42 @@
+/*
+ * Xournal++
+ *
+ * Export a document for as .xoj compatible for Xournal,
+ * remove all additional features which break the compatibility
+ *
+ * @author Xournal++ Team
+ * https://github.com/xournalpp/xournalpp
+ *
+ * @license GNU GPLv2 or later
+ */
+
+#pragma once
+
+#include "model/PageRef.h"  // for PageRef
+
+#include "SaveHandler.h"  // for SaveHandler
+
+class AudioElement;
+class Stroke;
+class XmlAudioNode;
+class XmlNode;
+class XmlPointNode;
+
+
+class XojExportHandler: public SaveHandler {
+public:
+    XojExportHandler();
+    virtual ~XojExportHandler();
+
+protected:
+    /**
+     * Export the fill attributes
+     */
+    void visitStrokeExtended(XmlPointNode* stroke, const Stroke* s) override;
+    void writeHeader() override;
+    void writeSolidBackground(XmlNode* background, ConstPageRef p) override;
+    void writeTimestamp(XmlAudioNode* xmlAudioNode, const AudioElement* audioElement) override;
+    void writeBackgroundName(XmlNode* background, ConstPageRef p) override;
+
+private:
+};
diff --git a/entry/src/main/cpp/src/core/control/zoom/ZoomControl.cpp b/entry/src/main/cpp/src/core/control/zoom/ZoomControl.cpp
new file mode 100644
index 0000000..01859eb
--- /dev/null
+++ b/entry/src/main/cpp/src/core/control/zoom/ZoomControl.cpp
@@ -0,0 +1,422 @@
+#include "ZoomControl.h"
+
+#include <algorithm>  // for find, max
+
+#include <glib-object.h>  // for G_CALLBACK, g_signal_connect
+#include <glib.h>         // for g_warning, guint
+
+#include "control/Control.h"  // for Control
+#include "control/actions/ActionDatabase.h"
+#include "control/settings/Settings.h"  // for Settings
+#include "control/zoom/ZoomListener.h"  // for ZoomListener
+#include "gui/Layout.h"                 // for Layout
+#include "gui/MainWindow.h"
+#include "gui/PageView.h"               // for XojPageView
+#include "gui/XournalView.h"            // for XournalView
+#include "util/Assert.h"                // for xoj_assert
+#include "util/Util.h"                  // for execInUiThread
+#include "util/gdk4_helper.h"           // for gdk_event_get_modifier_state
+#include "util/glib_casts.h"            // for wrap_for_g_callback
+
+using xoj::util::Rectangle;
+
+auto onScrolledwindowMainScrollEvent(GtkWidget* widget, GdkEventScroll* event, ZoomControl* zoom) -> bool {
+    auto state =
+            gdk_event_get_modifier_state(reinterpret_cast<GdkEvent*>(event)) & gtk_accelerator_get_default_mod_mask();
+
+    // do not handle e.g. ALT + Scroll (e.g. Compiz use this shortcut for setting transparency...)
+    if (state & ~(GDK_CONTROL_MASK | GDK_SHIFT_MASK)) {
+        return true;
+    }
+
+    if (state & GDK_CONTROL_MASK) {
+        auto direction =
+                (event->direction == GDK_SCROLL_UP || (event->direction == GDK_SCROLL_SMOOTH && event->delta_y < 0)) ?
+                        ZOOM_IN :
+                        ZOOM_OUT;
+        // translate absolute window coordinates to the widget-local coordinates and start zooming
+        zoom->zoomScroll(direction, Util::toWidgetCoords(widget, xoj::util::Point{event->x_root, event->y_root}));
+        return true;
+    }
+
+    // TODO(unknown): Disabling scroll here is maybe a bit hacky find a better way
+    return zoom->isZoomPresentationMode();
+}
+
+auto onTouchpadPinchEvent(GtkWidget* widget, GdkEventTouchpadPinch* event, ZoomControl* zoom) -> bool {
+    if (event->type == GDK_TOUCHPAD_PINCH && event->n_fingers == 2) {
+        switch (event->phase) {
+            case GDK_TOUCHPAD_GESTURE_PHASE_BEGIN:
+                if (zoom->isZoomFitMode()) {
+                    zoom->setZoomFitMode(false);
+                }
+                // translate absolute window coordinates to the widget-local coordinates and start zooming
+                zoom->startZoomSequence(Util::toWidgetCoords(widget, xoj::util::Point{event->x_root, event->y_root}));
+                break;
+            case GDK_TOUCHPAD_GESTURE_PHASE_UPDATE:
+                zoom->zoomSequenceChange(event->scale, true);
+                break;
+            case GDK_TOUCHPAD_GESTURE_PHASE_END:
+                zoom->endZoomSequence();
+                break;
+            case GDK_TOUCHPAD_GESTURE_PHASE_CANCEL:
+                zoom->cancelZoomSequence();
+                break;
+        }
+        return true;
+    }
+    return false;
+}
+
+
+// Todo: try to connect this function with the "expose_event", it would be way cleaner and we dont need to align/layout
+//       the pages manually, but it only works with the top Widget (GtkWindow) for now this works "fine"
+//       see https://stackoverflow.com/questions/1060039/gtk-detecting-window-resize-from-the-user
+auto onWindowSizeChangedEvent(GtkWidget* widget, GdkEvent* event, ZoomControl* zoom) -> bool {
+    xoj_assert(widget != zoom->view->getWidget());
+    auto layout = zoom->view->getLayout();
+    // Todo (fabian): The following code is a hack.
+    //    Problem size-allocate:
+    //    when using the size-allocate signal, we cant use layout->recalculate() directly.
+    //    But using the xournal-widgets allocation is wrong, since the calculation is skipped already.
+    //    using size-allocate's allocation is wrong, since it is the alloc of the toplevel.
+    //    Problem expose-event:
+    //    when using the expose-event signal, the new Allocation is not known yet; calculation must be deferred.
+    //    (minimize / maximize wont work)
+    Util::execInUiThread([layout, zoom]() {
+        zoom->updateZoomPresentationValue();
+        zoom->updateZoomFitValue();
+        layout->recalculate();
+    });
+
+    GdkWindow* gdkWindow = gtk_widget_get_window(widget);
+    GdkDisplay* display = gdkWindow ? gdk_window_get_display(gdkWindow) : nullptr;
+    GdkMonitor* monitor = display ? gdk_display_get_monitor_at_window(display, gdkWindow) : nullptr;
+    if (monitor && monitor != zoom->lastMonitor) {
+        zoom->lastMonitor = monitor;
+        const char* monitorName = gdk_monitor_get_model(monitor);
+        g_debug("Window moved to monitor \"%s\"", monitorName);
+        zoom->control->getWindow()->setDPI();
+    }
+    return false;
+}
+
+auto ZoomControl::withZoomStep(ZoomDirection direction, double zoomStep) const -> double {
+    double multiplier = 1.0 + zoomStep;
+    double newZoom;
+
+    if (direction == ZOOM_IN) {
+        newZoom = this->zoom * multiplier;
+    } else {
+        newZoom = this->zoom / multiplier;
+    }
+
+    return newZoom;
+}
+
+void ZoomControl::zoomOneStep(ZoomDirection direction, xoj::util::Point<double> zoomCenter) {
+    if (this->zoomPresentationMode) {
+        return;
+    }
+    this->setZoomFitMode(false);
+
+    double newZoom = this->withZoomStep(direction, this->zoomStep);
+
+    startZoomSequence(zoomCenter);
+    this->zoomSequenceChange(newZoom, false);
+    endZoomSequence();
+}
+
+void ZoomControl::zoomOneStep(ZoomDirection direction) {
+    Rectangle rect = getVisibleRect();
+    zoomOneStep(direction, {rect.width / 2.0, rect.height / 2.0});
+}
+
+
+void ZoomControl::zoomScroll(ZoomDirection direction, xoj::util::Point<double> zoomCenter) {
+    if (this->zoomPresentationMode) {
+        return;
+    }
+
+    if (this->isZoomFitMode()) {
+        this->setZoomFitMode(false);
+    }
+
+    double newZoom = this->withZoomStep(direction, this->zoomStepScroll);
+    startZoomSequence(zoomCenter);
+    this->zoomSequenceChange(newZoom, false);
+    endZoomSequence();
+}
+
+void ZoomControl::startZoomSequence() {
+    Rectangle rect = getVisibleRect();
+    startZoomSequence({rect.width / 2.0, rect.height / 2.0});
+}
+
+void ZoomControl::startZoomSequence(xoj::util::Point<double> zoomCenter) {
+    // * set zoom center and zoom startlevel
+    this->zoomWidgetPos = zoomCenter;  // widget space coordinates of the zoomCenter!
+    this->zoomSequenceStart = this->zoom;
+
+    // * set unscaledPixels padding value
+    size_t currentPageIdx = this->view->getCurrentPage();
+
+
+    // Not everything changes size as we zoom in/out. The padding, for example,
+    // remains constant! (changed when page changes, but the error stays small enough)
+    Layout* layout = view->getLayout();
+    this->unscaledPixels = {static_cast<double>(layout->getPaddingLeftOfPage(currentPageIdx)),
+                            static_cast<double>(layout->getPaddingAbovePage(currentPageIdx))};
+
+    // * set initial scrollPosition value
+    auto const& rect = getVisibleRect();
+    auto const& view_pos = xoj::util::Point{rect.x, rect.y};
+
+    // Use this->zoomWidgetPos to zoom into a location other than the top-left (e.g. where
+    // the user pinched).
+    this->scrollPosition = (view_pos + this->zoomWidgetPos - this->unscaledPixels) / this->zoom;
+}
+
+void ZoomControl::zoomSequenceChange(double zoom, bool relative) {
+    if (relative) {
+        if (isZoomSequenceActive()) {
+            zoom *= zoomSequenceStart;
+        } else {
+            zoom *= this->zoom;
+        }
+    }
+
+    setZoom(zoom);
+}
+
+void ZoomControl::zoomSequenceChange(double zoom, bool relative, xoj::util::Point<double> scrollVector) {
+    if (relative) {
+        if (isZoomSequenceActive()) {
+            zoom *= zoomSequenceStart;
+        } else {
+            zoom *= this->zoom;
+        }
+    }
+
+    // scroll update
+    this->zoomWidgetPos += scrollVector;
+
+    setZoom(zoom);
+}
+
+void ZoomControl::endZoomSequence() {
+    scrollPosition = {-1, -1};
+    zoomSequenceStart = -1;
+}
+
+void ZoomControl::cancelZoomSequence() {
+    if (isZoomSequenceActive()) {
+        setZoom(zoomSequenceStart);
+        endZoomSequence();
+    }
+}
+
+auto ZoomControl::isZoomSequenceActive() const -> bool { return zoomSequenceStart != -1; }
+
+auto ZoomControl::getVisibleRect() -> Rectangle<double> { return view->getLayout()->getVisibleRect(); }
+
+auto ZoomControl::getScrollPositionAfterZoom() const -> xoj::util::Point<double> {
+    //  If we aren't in a zoomSequence, `unscaledPixels`, `scrollPosition`, and `zoomWidgetPos
+    // can't be used to determine the scroll position! Return now.
+    // NOTE: this case should never happen currently.
+    //       getScrollPositionAfterZoom is called from XournalView after setZoom() fired the ZoomListeners
+    if (!this->isZoomSequenceActive()) {
+        xoj_assert_message(false, "ZoomControl::getScrollPositionAfterZoom() was called outside of a zoom sequence.");
+        return {0, 0};
+    }
+
+    return this->scrollPosition * this->zoom - this->zoomWidgetPos + this->unscaledPixels;
+}
+
+void ZoomControl::addZoomListener(ZoomListener* l) { this->listener.emplace_back(l); }
+
+void ZoomControl::removeZoomListener(ZoomListener* l) {
+    if (auto it = std::find(this->listener.begin(), this->listener.end(), l); it != this->listener.end()) {
+        this->listener.erase(it);
+    }
+}
+
+void ZoomControl::initZoomHandler(GtkWidget* window, GtkWidget* widget, XournalView* v, Control* c) {
+    this->control = c;
+    this->view = v;
+    gtk_widget_add_events(widget, GDK_TOUCHPAD_GESTURE_MASK);
+    g_signal_connect(widget, "scroll-event", xoj::util::wrap_for_g_callback_v<onScrolledwindowMainScrollEvent>, this);
+    g_signal_connect(widget, "event", xoj::util::wrap_for_g_callback_v<onTouchpadPinchEvent>, this);
+    g_signal_connect(window, "configure-event", xoj::util::wrap_for_g_callback_v<onWindowSizeChangedEvent>, this);
+    registerListener(this->control);
+}
+
+void ZoomControl::fireZoomChanged() {
+    for (ZoomListener* z: this->listener) {
+        z->zoomChanged();
+    }
+}
+
+void ZoomControl::fireZoomRangeValueChanged() {
+    for (ZoomListener* z: this->listener) {
+        z->zoomRangeValuesChanged();
+    }
+}
+
+auto ZoomControl::getZoom() const -> double { return this->zoom; }
+
+auto ZoomControl::getZoomReal() const -> double { return this->zoom / this->zoom100Value; }
+
+void ZoomControl::setZoom(double zoomI) {
+    zoomI = std::clamp(zoomI, this->zoomMin, this->zoomMax);
+    if (this->zoom == zoomI) {
+        return;
+    }
+    this->zoom = zoomI;
+    this->control->getActionDatabase()->setActionState(Action::ZOOM, getZoomReal());
+    fireZoomChanged();
+}
+
+void ZoomControl::setZoom100Value(double zoom100Val) {
+    auto setWithRelZoom = [zoomOld = this->zoom100Value, zoom100Val](double& val) { val = val / zoomOld * zoom100Val; };
+    setWithRelZoom(this->zoomMax);
+    setWithRelZoom(this->zoomMin);
+    this->zoom100Value = zoom100Val;
+    fireZoomRangeValueChanged();
+}
+
+auto ZoomControl::updateZoomFitValue(size_t pageNo) -> bool {
+    if (pageNo == 0) {
+        pageNo = view->getCurrentPage();
+    }
+    XojPageView* page = view->getViewFor(pageNo);
+    if (!page) {  // no page
+        return false;
+    }
+
+    Rectangle widget_rect = getVisibleRect();
+    double zoom_fit_width = widget_rect.width / (page->getWidth() + 20.0);
+
+    this->zoomFitValue = std::clamp(zoom_fit_width, this->zoomMin, this->zoomMax);
+    fireZoomRangeValueChanged();
+    if (this->isZoomFitMode() && !this->zoomPresentationMode) {
+        this->zoomFit();
+    }
+    return true;
+}
+
+auto ZoomControl::getZoomFitValue() const -> double { return this->zoomFitValue; }
+
+auto ZoomControl::updateZoomPresentationValue(size_t pageNo) -> bool {
+    XojPageView* page = view->getViewFor(view->getCurrentPage());
+    if (!page) {
+        g_warning("Cannot update zoomPresentationValue yet. This should only happen on startup! ");
+        return true;
+    }
+
+    Rectangle widget_rect = getVisibleRect();
+    double zoom_fit_width = widget_rect.width / (page->getWidth() + 14.0);
+    double zoom_fit_height = widget_rect.height / (page->getHeight() + 14.0);
+    double zoom_presentation = zoom_fit_width < zoom_fit_height ? zoom_fit_width : zoom_fit_height;
+
+    this->zoomPresentationValue = std::clamp(zoom_presentation, this->zoomMin, this->zoomMax);
+    if (this->zoomPresentationMode) {
+        this->zoomPresentation();
+    }
+    return true;
+}
+
+auto ZoomControl::getZoom100Value() const -> double { return this->zoom100Value; }
+
+void ZoomControl::zoom100() {
+    if (this->zoomPresentationMode) {
+        return;
+    }
+
+    if (this->zoomFitMode) {
+        this->setZoomFitMode(false);
+    }
+
+    startZoomSequence();
+    this->zoomSequenceChange(this->zoom100Value, false);
+    endZoomSequence();
+}
+
+void ZoomControl::zoomFit() {
+    // TODO: properly fix the zoom fit infinite recursion
+    if (this->isZoomFittingNow) {
+        return;
+    }
+
+    this->isZoomFittingNow = true;
+    if (this->isZoomFitMode() && !this->zoomPresentationMode && this->zoom != this->zoomFitValue) {
+        startZoomSequence();
+        this->zoomSequenceChange(this->zoomFitValue, false);
+        endZoomSequence();
+    }
+    this->isZoomFittingNow = false;
+}
+
+void ZoomControl::zoomPresentation() {
+    if (this->zoomPresentationMode && this->zoom != this->zoomPresentationValue) {
+        startZoomSequence();
+        this->zoomSequenceChange(this->zoomPresentationValue, false);
+        endZoomSequence();
+    }
+}
+
+void ZoomControl::setZoomFitMode(bool isZoomFitMode) {
+    if (this->zoomFitMode != isZoomFitMode) {
+        this->zoomFitMode = isZoomFitMode;
+        this->control->getActionDatabase()->setActionState(Action::ZOOM_FIT, this->zoomFitMode);
+    }
+
+    if (this->isZoomFitMode()) {
+        zoomFit();
+    }
+}
+
+auto ZoomControl::isZoomFitMode() const -> bool {
+    // Todo(fabian): Remove this fix and make both modes possible in parallel, after fixing the infinite loop.
+    //  Explanation: First of all, zoomFit never worked with paired pages. Also, using both resulted in a stackoverflow
+    //               when different page sizes are used. This is caused by a logical loop.
+    //               We decided to deactivate it in PR#2821 & I#2770. instead of fixing it, to get release 1.1.0 ready.
+    //               Zoom presentation mode is also excluded, because it was never intended to work together.
+    //               It is also excluded everywhere else (duplicate code).
+    auto infiniteLoopFixup = !this->zoomPresentationMode && !this->control->getSettings()->isShowPairedPages();
+    return this->zoomFitMode && infiniteLoopFixup;
+}
+
+void ZoomControl::setZoomPresentationMode(bool isZoomPresentationMode) {
+    this->zoomPresentationMode = isZoomPresentationMode;
+
+    if (isZoomPresentationMode) {
+        zoomPresentation();
+    }
+}
+
+auto ZoomControl::isZoomPresentationMode() const -> bool { return this->zoomPresentationMode; }
+
+void ZoomControl::setZoomStep(double zoomStep) { this->zoomStep = zoomStep; }
+
+void ZoomControl::setZoomStepScroll(double zoomStep) { this->zoomStepScroll = zoomStep; }
+
+void ZoomControl::pageSizeChanged(size_t page) {
+    updateZoomPresentationValue(page);
+    updateZoomFitValue(page);
+}
+
+void ZoomControl::pageSelected(size_t page) {
+    // Todo (fabian): page selected should do nothing here, since Zoom Controls, which page is selected.
+    //                This results in a logical loop. See PR#2821 & I#2770
+    if (current_page != page) {
+        this->last_page = this->current_page;
+        this->current_page = page;
+    }
+
+    updateZoomPresentationValue(this->current_page);
+    if (view->isPageVisible(this->last_page, nullptr)) {
+        return;
+    }
+    updateZoomFitValue(this->current_page);
+}
diff --git a/entry/src/main/cpp/src/core/control/zoom/ZoomControl.h b/entry/src/main/cpp/src/core/control/zoom/ZoomControl.h
new file mode 100644
index 0000000..d69b167
--- /dev/null
+++ b/entry/src/main/cpp/src/core/control/zoom/ZoomControl.h
@@ -0,0 +1,265 @@
+/*
+ * Xournal++
+ *
+ * Controls the zoom level
+ *
+ * @author Xournal++ Team
+ * https://github.com/xournalpp/xournalpp
+ *
+ * @license GNU GPLv2 or later
+ */
+
+#pragma once
+
+#include <cstddef>  // for size_t
+#include <vector>   // for vector
+
+#include <gdk/gdk.h>  // for GdkEvent, GdkEventScroll, GdkEve...
+#include <gtk/gtk.h>  // for GtkWidget
+
+#include "model/DocumentListener.h"  // for DocumentListener
+#include "util/Point.h"              // for Point
+#include "util/Rectangle.h"          // for Rectangle
+
+constexpr auto DEFAULT_ZOOM_MAX{7};
+constexpr auto DEFAULT_ZOOM_MIN{0.3};
+constexpr auto DEFAULT_ZOOM_STEP{0.1};
+constexpr auto DEFAULT_ZOOM_STEP_SCROLL{0.01};
+
+enum ZoomDirection : bool { ZOOM_OUT = false, ZOOM_IN = true };
+
+class XournalView;
+class Control;
+class ZoomListener;
+
+class ZoomControl: public DocumentListener {
+public:
+    ZoomControl() = default;
+    ~ZoomControl() override = default;
+
+    /**
+     * Zoom one step
+     *
+     * @param direction direction to zoom in or out
+     * @param zoomCenter position of zoom focus
+     */
+    void zoomOneStep(ZoomDirection direction, xoj::util::Point<double> zoomCenter);
+    void zoomOneStep(ZoomDirection direction);
+
+    /**
+     * Zoom one step
+     *
+     * @param direction to zoom in or out
+     * @param zoomCenter position of zoom focus
+     */
+    void zoomScroll(ZoomDirection direction, xoj::util::Point<double> zoomCenter);
+
+    /**
+     * Zoom so that the page fits the current size of the window
+     */
+    void setZoomFitMode(bool isZoomFitMode);
+    bool isZoomFitMode() const;
+
+    /**
+     * Zoom so that the document completely fits the View.
+     */
+    void setZoomPresentationMode(bool isZoomPresentationMode);
+    bool isZoomPresentationMode() const;
+
+    /**
+     * Zoom so that the displayed page on the screen has the same size as the real size
+     * The dpi has to be set correctly
+     */
+    void zoom100();
+
+    /**
+     * @return zoom value depending zoom100Value
+     */
+    double getZoom() const;
+
+    /**
+     * @return real zoom value in percent
+     */
+    double getZoomReal() const;
+
+    /**
+     * Set the current zoom, does not preserve the current page position.
+     * Use startZoomSequence() / zoomSequnceChange() / endZoomSequence() to preserve position
+     * e.g. use zoomOneStep function
+     *
+     * @param zoomI zoom value depending zoom100Value
+     */
+    void setZoom(double zoomI);
+
+    /**
+     * Updates the when dpi is changed.
+     * updates zoomMax, zoomMin, zoomStepBig, zoomStepScroll
+     *
+     * @param zoom100Val zoom value depending zoom100Value
+     */
+    void setZoom100Value(double zoom100Val);
+
+    /**
+     * @return zoom value for zoom 100% depending zoom100Value
+     */
+    double getZoom100Value() const;
+
+    /**
+     * Updates when, the window size changes
+     * @param zoom zoom value depending zoom100Value
+     */
+    bool updateZoomFitValue(size_t pageNo = 0);
+
+    /**
+     * @return zoom value for zoom fit depending zoom100Value
+     */
+    double getZoomFitValue() const;
+
+    bool updateZoomPresentationValue(size_t pageNo = 0);
+
+    void addZoomListener(ZoomListener* listener);
+    void removeZoomListener(ZoomListener* listener);
+
+    void initZoomHandler(GtkWidget* window, GtkWidget* widget, XournalView* v, Control* c);
+
+    /**
+     * Call this before any zoom is done, it saves the current page and position
+     *
+     * @param zoomCenter position of zoom focus in widget pixel coordinates. That
+     * is, absolute coordinates (not scaling with the document) translated to the
+     * top left corner of the drawing area.
+     */
+    void startZoomSequence(xoj::util::Point<double> zoomCenter);
+
+    /**
+     * Call this before any zoom is done, it saves the current page and position
+     * zooms to the center of the visible rect
+     */
+    void startZoomSequence();
+
+    /**
+     * Change the zoom within a Zoom sequence (startZoomSequence() / endZoomSequence())
+     *
+     * @param zoom Zoom value
+     * @param relative If true, multiplies the current zoom value by `zoom`. Otherwise replaces it with `zoom`.
+     */
+    void zoomSequenceChange(double zoom, bool relative);
+
+    /**
+     * Change the zoom and zoomCenter within a Zoom sequence (startZoomSequence() / endZoomSequence())
+     * Used while touch pinch event
+     *
+     * @param zoom Current zoom value
+     * @param relative If the zoom is relative to the start value (for Gesture)
+     * @param scrollVector relative zoom center movement in pixels since last call
+     */
+    void zoomSequenceChange(double zoom, bool relative, xoj::util::Point<double> scrollVector);
+
+    /// Clear all stored data from startZoomSequence()
+    void endZoomSequence();
+
+    /// Revert and end the current zoom sequence
+    void cancelZoomSequence();
+
+    /// Check if we are between calls to `startZoomSequence()` and `endZoomSequence()`
+    bool isZoomSequenceActive() const;
+
+    /**
+     * Zoom to correct position on zooming.
+     * This function should only be called during a zoom sequence.
+     */
+    xoj::util::Point<double> getScrollPositionAfterZoom() const;
+
+    /// Get visible rect on xournal view, for Zoom Gesture
+    xoj::util::Rectangle<double> getVisibleRect();
+
+    void setZoomStep(double zoomStep);
+
+    void setZoomStepScroll(double zoomStep);
+
+protected:
+    void fireZoomChanged();
+    void fireZoomRangeValueChanged();
+
+    void pageSizeChanged(size_t page) override;
+    void pageSelected(size_t page) override;
+
+private:
+    void zoomFit();
+    void zoomPresentation();
+
+    /**
+     * Get this->zoom changed by a step in the given direction.
+     *
+     * @param direction Direction to change the zoom (step direction).
+     * @param stepSize Size of the step to take
+     * @return The new zoom if a step is taken in the given direction.
+     */
+    double withZoomStep(ZoomDirection direction, double stepSize) const;
+
+    friend bool onWindowSizeChangedEvent(GtkWidget* widget, GdkEvent* event, ZoomControl* zoom);
+    friend bool onScrolledwindowMainScrollEvent(GtkWidget* widget, GdkEventScroll* event, ZoomControl* zoom);
+    friend bool onTouchpadPinchEvent(GtkWidget* widget, GdkEventTouchpadPinch* event, ZoomControl* zoom);
+
+private:
+    XournalView* view = nullptr;
+    Control* control = nullptr;
+    std::vector<ZoomListener*> listener;
+
+    /**
+     * current Zoom value
+     * depends dpi (REAL_PERCENTAGE_VALUE * zoom100Value)
+     */
+    double zoom = 1.0;
+    bool zoomFitMode = false;
+    bool zoomPresentationMode = false;
+
+    /// Zoom value for 100% depends on the dpi
+    double zoom100Value = 1.0;
+    double zoomFitValue = 1.0;
+    double zoomPresentationValue = 1.0;
+
+    /// Base zoom on start, for relative zoom (Gesture)
+    double zoomSequenceStart = -1;
+
+    /// Zoom center position in widget coordinate space, will not be zoomed!
+    xoj::util::Point<double> zoomWidgetPos;
+
+    /// Scroll position (top left corner of view) to scale
+    xoj::util::Point<double> scrollPosition;
+
+    /// Size {x, y} of the pixels before the current page that
+    /// do not scale.
+    xoj::util::Point<double> unscaledPixels;
+
+    /**
+     * Zoomstep value for Ctrl - and Zoom In and Out Button
+     * depends on dpi (REAL_PERCENTAGE_VALUE * zoom100Value)
+     */
+    double zoomStep = DEFAULT_ZOOM_STEP;
+
+    /**
+     * Zoomstep value for Ctrl-Scroll zooming
+     * depends on dpi (REAL_PERCENTAGE_VALUE * zoom100Value)
+     */
+    double zoomStepScroll = DEFAULT_ZOOM_STEP_SCROLL;
+
+    /**
+     * Zoom maximal value
+     * depends on dpi (REAL_PERCENTAGE_VALUE * zoom100Value)
+     */
+    double zoomMax = DEFAULT_ZOOM_MAX;
+
+    /**
+     * Zoom mininmal value
+     * depends on dpi (REAL_PERCENTAGE_VALUE * zoom100Value)
+     */
+    double zoomMin = DEFAULT_ZOOM_MIN;
+
+    size_t current_page = static_cast<size_t>(-1);
+    size_t last_page = static_cast<size_t>(-1);
+    bool isZoomFittingNow = false;
+
+    /// The last monitor the window has been moved to -- used for setting dpi
+    GdkMonitor* lastMonitor = nullptr;
+};
diff --git a/entry/src/main/cpp/src/core/control/zoom/ZoomListener.cpp b/entry/src/main/cpp/src/core/control/zoom/ZoomListener.cpp
new file mode 100644
index 0000000..0cc820b
--- /dev/null
+++ b/entry/src/main/cpp/src/core/control/zoom/ZoomListener.cpp
@@ -0,0 +1,5 @@
+#include "ZoomListener.h"
+
+ZoomListener::~ZoomListener() = default;
+
+void ZoomListener::zoomRangeValuesChanged() {}
diff --git a/entry/src/main/cpp/src/core/control/zoom/ZoomListener.h b/entry/src/main/cpp/src/core/control/zoom/ZoomListener.h
new file mode 100644
index 0000000..e331da7
--- /dev/null
+++ b/entry/src/main/cpp/src/core/control/zoom/ZoomListener.h
@@ -0,0 +1,20 @@
+/*
+ * Xournal++
+ *
+ * Zoom change listener
+ *
+ * @author Xournal++ Team
+ * https://github.com/xournalpp/xournalpp
+ *
+ * @license GNU GPLv2 or later
+ */
+
+#pragma once
+
+class ZoomListener {
+public:
+    virtual void zoomChanged() = 0;
+    virtual void zoomRangeValuesChanged();
+
+    virtual ~ZoomListener();
+};
diff --git a/entry/src/main/cpp/src/core/enums/Action.enum.h b/entry/src/main/cpp/src/core/enums/Action.enum.h
new file mode 100644
index 0000000..b19d170
--- /dev/null
+++ b/entry/src/main/cpp/src/core/enums/Action.enum.h
@@ -0,0 +1,195 @@
+/*
+ * Xournal++
+ *
+ * Enum for all actions
+ *
+ * @author Xournal++ Team
+ * https://github.com/xournalpp/xournalpp
+ *
+ * @license GNU GPLv2 or later
+ */
+
+#pragma once
+
+#include <optional>
+#include <string>
+
+#include <glib.h>  // for g_warning
+
+#include "util/Assert.h"
+#include "util/StringUtils.h"
+#include "util/safe_casts.h"  // for to_underlying Todo(cpp20) remove
+
+/******************************************************************************
+*******************************************************************************
+
+RUN THE GENERATOR IF YOU CHANGE THIS FILE!
+
+php generateConvertNEW.php
+
+*******************************************************************************
+******************************************************************************/
+
+enum class Action : size_t {
+    // Menu file
+    NEW_FILE,
+    OPEN,
+    ANNOTATE_PDF,
+    SAVE,
+    SAVE_AS,
+    EXPORT_AS_PDF,
+    EXPORT_AS,
+    PRINT,
+    QUIT,
+
+    // Menu edit
+    ARRANGE_SELECTION_ORDER,
+    UNDO,
+    REDO,
+    CUT,
+    COPY,
+    PASTE,
+    SEARCH,
+    SELECT_ALL,
+    DELETE,
+    MOVE_SELECTION_LAYER_UP,
+    MOVE_SELECTION_LAYER_DOWN,
+    ROTATION_SNAPPING,
+    GRID_SNAPPING,
+    PREFERENCES,
+
+    // Menu View
+    PAIRED_PAGES_MODE,
+    PAIRED_PAGES_OFFSET,
+    PRESENTATION_MODE,
+    FULLSCREEN,
+    SHOW_SIDEBAR,
+    SHOW_TOOLBAR,
+    SET_LAYOUT_VERTICAL,
+    SET_LAYOUT_RIGHT_TO_LEFT,
+    SET_LAYOUT_BOTTOM_TO_TOP,
+    SET_COLUMNS_OR_ROWS,
+    MANAGE_TOOLBAR,
+    CUSTOMIZE_TOOLBAR,
+    SHOW_MENUBAR,
+    ZOOM_IN,
+    ZOOM_OUT,
+    ZOOM_100,
+    ZOOM_FIT,
+    ZOOM,  ///< Action whose state is the current zoom value
+
+    // Menu navigation
+    GOTO_FIRST,
+    GOTO_PREVIOUS,
+    GOTO_PAGE,
+    GOTO_NEXT,
+    GOTO_LAST,
+    GOTO_NEXT_ANNOTATED_PAGE,
+    GOTO_PREVIOUS_ANNOTATED_PAGE,
+
+    // Menu Journal
+    NEW_PAGE_BEFORE,
+    NEW_PAGE_AFTER,
+    NEW_PAGE_AT_END,
+    DUPLICATE_PAGE,
+    MOVE_PAGE_TOWARDS_BEGINNING,
+    MOVE_PAGE_TOWARDS_END,
+    APPEND_NEW_PDF_PAGES,
+    CONFIGURE_PAGE_TEMPLATE,
+    DELETE_PAGE,
+    PAPER_FORMAT,
+    PAPER_BACKGROUND_COLOR,
+
+    // Menu Tools
+    SELECT_TOOL,
+    SELECT_DEFAULT_TOOL,
+    TOOL_DRAW_SHAPE_RECOGNIZER,
+    TOOL_DRAW_RECTANGLE,
+    TOOL_DRAW_ELLIPSE,
+    TOOL_DRAW_ARROW,
+    TOOL_DRAW_DOUBLE_ARROW,
+    TOOL_DRAW_COORDINATE_SYSTEM,
+    TOOL_DRAW_LINE,
+    TOOL_DRAW_SPLINE,
+    SETSQUARE,
+    COMPASS,
+
+    TOOL_PEN_SIZE,
+    TOOL_PEN_LINE_STYLE,
+    TOOL_PEN_FILL,
+    TOOL_PEN_FILL_OPACITY,
+
+    TOOL_ERASER_SIZE,
+    TOOL_ERASER_TYPE,
+
+    TOOL_HIGHLIGHTER_SIZE,
+    TOOL_HIGHLIGHTER_FILL,
+    TOOL_HIGHLIGHTER_FILL_OPACITY,
+
+    TOOL_SELECT_PDF_TEXT_MARKER_OPACITY,
+
+    TOGGLE_TOUCH_DRAWING,
+
+    AUDIO_RECORD,
+    AUDIO_PAUSE_PLAYBACK,
+    AUDIO_STOP_PLAYBACK,
+    AUDIO_SEEK_FORWARDS,
+    AUDIO_SEEK_BACKWARDS,
+
+    SELECT_FONT,
+    FONT,  ///< Action whose state is the font's description
+    TEX,
+
+    // Plugin Menu
+    PLUGIN_MANAGER,
+
+    // Menu Help
+    HELP,
+    DEMO,
+    ABOUT,
+
+    // Generic tool config, for the toolbar
+    TOOL_SIZE,
+    TOOL_FILL,
+    TOOL_FILL_OPACITY,
+    TOOL_COLOR,    ///< Action whose state is the current color with alpha set to 0xff (in ARGB as a uint32_t)
+    SELECT_COLOR,  ///< Pops up a color chooser dialog
+
+    // Layer handling
+    LAYER_SHOW_ALL,
+    LAYER_HIDE_ALL,
+    LAYER_NEW_ABOVE_CURRENT,
+    LAYER_NEW_BELOW_CURRENT,
+    LAYER_COPY,
+    LAYER_MOVE_UP,
+    LAYER_MOVE_DOWN,
+    LAYER_DELETE,
+    LAYER_MERGE_DOWN,
+    LAYER_RENAME,
+    LAYER_GOTO_NEXT,
+    LAYER_GOTO_PREVIOUS,
+    LAYER_GOTO_TOP,
+    LAYER_ACTIVE,  ///< Action whose state is the current layer index
+
+    // Miscellaneous
+    POSITION_HIGHLIGHTING,
+
+    // Keep this last value
+    ENUMERATOR_COUNT
+};
+
+#include "generated/Action.NameMap.generated.h"
+
+constexpr auto Action_toString(Action value) -> const char* {
+    xoj_assert(value < Action::ENUMERATOR_COUNT);
+    return ACTION_NAMES[static_cast<size_t>(value)];
+}
+
+constexpr auto Action_fromString(const std::string_view value) -> std::optional<Action> {
+    for (size_t n = 0; n < xoj::to_underlying(Action::ENUMERATOR_COUNT); n++) {
+        if (value == ACTION_NAMES[n]) {
+            return static_cast<Action>(n);
+        }
+    }
+    return std::nullopt;
+}
diff --git a/entry/src/main/cpp/src/core/enums/generateConvert.php b/entry/src/main/cpp/src/core/enums/generateConvert.php
new file mode 100644
index 0000000..68283ee
--- /dev/null
+++ b/entry/src/main/cpp/src/core/enums/generateConvert.php
@@ -0,0 +1,104 @@
+<?php
+
+/**
+ * Generator to generate enum converter functions
+ *
+ * This script is written in PHP because it was easy.
+ * If there is a better / simpler solution let us know,
+ * over Pull Request or issues
+ */
+
+$dh = opendir('.');
+
+while (($file = readdir($dh)) !== false) {
+	if ($file[0] == '.') {
+		continue;
+	}
+
+	if ($file != 'Action.enum.h') {
+		continue;
+	}
+
+	generateEnum($file);
+	echo "== $file ==\n";
+}
+
+closedir($dh);
+
+function parseEnumFile($file) {
+	$inEnum = false;
+	$values = array();
+	foreach (file($file) as $line) {
+		$line = trim($line);
+
+		if (!$inEnum && substr($line, 0, 5) == 'enum ') {
+			$inEnum = true;
+			continue;
+		}
+		if (!$inEnum) {
+			continue;
+		}
+		if (substr($line, 0, 1) == '{') {
+			continue;
+		}
+		if (substr($line, 0, 2) == '};') {
+			$inEnum = false;
+			continue;
+		}
+		if ($line == '' || substr($line, 0, 2) == '//') {
+			continue;
+		}
+
+		$pos = strpos($line, "ENUMERATOR_COUNT");
+        if ($pos !== false) {
+            continue;
+        }
+
+		$pos = strpos($line, '=');
+		if ($pos !== false) {
+            print "ERROR: non contiguous enum!!\n";
+			$line = substr($line, 0, $pos);
+		}
+		$pos = strpos($line, ',');
+		if ($pos !== false) {
+			$line = substr($line, 0, $pos);
+		}
+
+		$line = trim($line);
+		$values[] = $line;
+	}
+
+	return $values;
+}
+
+function writeCppFile($output, $name, $values) {
+    $fp = fopen("$output", 'w');
+    $tab = "    "; // 4 tab space as specified in .clang_format
+
+    fwrite($fp, "// ** THIS FILE IS GENERATED **\n");
+    fwrite($fp, "// ** use generateConvert.php to update this file **\n");
+    fwrite($fp, "\n\n");
+
+    fwrite($fp, "#pragma once\n\n");
+
+    fwrite($fp, "constexpr const char* ACTION_NAMES[] = {  // $name to string conversion map");
+
+    foreach ($values as $v) {
+        $v = str_replace("_","-",$v);
+        fwrite($fp, "\n" . $tab . $tab . "\"". strtolower($v) . "\",");
+    }
+    fseek($fp,-1,SEEK_CUR);
+    fwrite($fp, "};\n");
+
+    fclose($fp);
+
+	print "Generated $output\n";
+}
+
+function generateEnum($file) {
+	$values = parseEnumFile($file);
+
+	$name = substr($file, 0, -7);
+	writeCppFile("generated/${name}.NameMap.generated.h", $name, $values);
+}
+
diff --git a/entry/src/main/cpp/src/core/enums/generated/Action.NameMap.generated.h b/entry/src/main/cpp/src/core/enums/generated/Action.NameMap.generated.h
new file mode 100644
index 0000000..0df2cbe
--- /dev/null
+++ b/entry/src/main/cpp/src/core/enums/generated/Action.NameMap.generated.h
@@ -0,0 +1,121 @@
+// ** THIS FILE IS GENERATED **
+// ** use generateConvert.php to update this file **
+
+
+#pragma once
+
+constexpr const char* ACTION_NAMES[] = {  // Action to string conversion map
+        "new-file",
+        "open",
+        "annotate-pdf",
+        "save",
+        "save-as",
+        "export-as-pdf",
+        "export-as",
+        "print",
+        "quit",
+        "arrange-selection-order",
+        "undo",
+        "redo",
+        "cut",
+        "copy",
+        "paste",
+        "search",
+        "select-all",
+        "delete",
+        "move-selection-layer-up",
+        "move-selection-layer-down",
+        "rotation-snapping",
+        "grid-snapping",
+        "preferences",
+        "paired-pages-mode",
+        "paired-pages-offset",
+        "presentation-mode",
+        "fullscreen",
+        "show-sidebar",
+        "show-toolbar",
+        "set-layout-vertical",
+        "set-layout-right-to-left",
+        "set-layout-bottom-to-top",
+        "set-columns-or-rows",
+        "manage-toolbar",
+        "customize-toolbar",
+        "show-menubar",
+        "zoom-in",
+        "zoom-out",
+        "zoom-100",
+        "zoom-fit",
+        "zoom",
+        "goto-first",
+        "goto-previous",
+        "goto-page",
+        "goto-next",
+        "goto-last",
+        "goto-next-annotated-page",
+        "goto-previous-annotated-page",
+        "new-page-before",
+        "new-page-after",
+        "new-page-at-end",
+        "duplicate-page",
+        "move-page-towards-beginning",
+        "move-page-towards-end",
+        "append-new-pdf-pages",
+        "configure-page-template",
+        "delete-page",
+        "paper-format",
+        "paper-background-color",
+        "select-tool",
+        "select-default-tool",
+        "tool-draw-shape-recognizer",
+        "tool-draw-rectangle",
+        "tool-draw-ellipse",
+        "tool-draw-arrow",
+        "tool-draw-double-arrow",
+        "tool-draw-coordinate-system",
+        "tool-draw-line",
+        "tool-draw-spline",
+        "setsquare",
+        "compass",
+        "tool-pen-size",
+        "tool-pen-line-style",
+        "tool-pen-fill",
+        "tool-pen-fill-opacity",
+        "tool-eraser-size",
+        "tool-eraser-type",
+        "tool-highlighter-size",
+        "tool-highlighter-fill",
+        "tool-highlighter-fill-opacity",
+        "tool-select-pdf-text-marker-opacity",
+        "toggle-touch-drawing",
+        "audio-record",
+        "audio-pause-playback",
+        "audio-stop-playback",
+        "audio-seek-forwards",
+        "audio-seek-backwards",
+        "select-font",
+        "font",
+        "tex",
+        "plugin-manager",
+        "help",
+        "demo",
+        "about",
+        "tool-size",
+        "tool-fill",
+        "tool-fill-opacity",
+        "tool-color",
+        "select-color",
+        "layer-show-all",
+        "layer-hide-all",
+        "layer-new-above-current",
+        "layer-new-below-current",
+        "layer-copy",
+        "layer-move-up",
+        "layer-move-down",
+        "layer-delete",
+        "layer-merge-down",
+        "layer-rename",
+        "layer-goto-next",
+        "layer-goto-previous",
+        "layer-goto-top",
+        "layer-active",
+        "position-highlighting"};
diff --git a/entry/src/main/cpp/src/core/gui/Builder.cpp b/entry/src/main/cpp/src/core/gui/Builder.cpp
new file mode 100644
index 0000000..990b342
--- /dev/null
+++ b/entry/src/main/cpp/src/core/gui/Builder.cpp
@@ -0,0 +1,10 @@
+#include "Builder.h"
+
+#include "util/StringUtils.h"
+
+#include "GladeSearchpath.h"  // for GladeSearchpath
+#include "filesystem.h"       // for path
+
+Builder::Builder(GladeSearchpath* gladeSearchPath, const std::string& uiFile):
+        builder(gtk_builder_new_from_file(char_cast(gladeSearchPath->findFile("", uiFile).u8string().c_str())),
+                xoj::util::adopt) {}
diff --git a/entry/src/main/cpp/src/core/gui/Builder.h b/entry/src/main/cpp/src/core/gui/Builder.h
new file mode 100644
index 0000000..271e973
--- /dev/null
+++ b/entry/src/main/cpp/src/core/gui/Builder.h
@@ -0,0 +1,42 @@
+/*
+ * Xournal++
+ *
+ * gtk_builder wrapper to parse ui files
+ *
+ * @author Xournal++ Team
+ * https://github.com/xournalpp/xournalpp
+ *
+ * @license GNU GPLv2 or later
+ */
+
+#pragma once
+
+#include <iostream>
+#include <string>
+
+#include <gtk/gtk.h>
+
+#include "util/Assert.h"
+#include "util/raii/GObjectSPtr.h"
+
+class GladeSearchpath;
+
+class Builder final {
+public:
+    Builder(GladeSearchpath* gladeSearchPath, const std::string& uiFile);
+
+    template <class GObjectType>
+    GObjectType* get(const std::string& name) {
+        GObjectType* res = static_cast<GObjectType*>(gtk_builder_get_object(builder.get(), name.c_str()));
+        xoj_assert_message(res, "ERROR: Builder::get: Could not find UI object: " + name + "\n");
+        return res;
+    }
+
+    inline GtkWidget* get(const std::string& name) { return GTK_WIDGET(get<GObject>(name)); }
+
+private:
+    /**
+     * The Glade resources
+     */
+    xoj::util::GObjectSPtr<GtkBuilder> builder;
+};
diff --git a/entry/src/main/cpp/src/core/gui/CreatePreviewImage.cpp b/entry/src/main/cpp/src/core/gui/CreatePreviewImage.cpp
new file mode 100644
index 0000000..319215f
--- /dev/null
+++ b/entry/src/main/cpp/src/core/gui/CreatePreviewImage.cpp
@@ -0,0 +1,39 @@
+#include "CreatePreviewImage.h"
+
+#include "model/PageType.h"  // for PageType
+#include "util/Color.h"      // for Color
+#include "util/raii/CairoWrappers.h"
+#include "util/raii/GObjectSPtr.h"
+#include "view/background/BackgroundView.h"  // for BackgroundView
+
+namespace xoj::helper {
+auto createPreviewImage(const PageType& pt) -> GtkWidget* {
+    const double zoom = 0.5;
+
+    xoj::util::CairoSurfaceSPtr surface(cairo_image_surface_create(CAIRO_FORMAT_ARGB32, PREVIEW_WIDTH, PREVIEW_HEIGHT),
+                                        xoj::util::adopt);
+    xoj::util::CairoSPtr crSPtr(cairo_create(surface.get()), xoj::util::adopt);
+    auto cr = crSPtr.get();
+
+    cairo_scale(cr, zoom, zoom);
+
+    auto bgView = xoj::view::BackgroundView::createRuled(PREVIEW_WIDTH / zoom, PREVIEW_HEIGHT / zoom, Colors::white, pt,
+                                                         1. / zoom);
+    bgView->draw(cr);
+
+    cairo_identity_matrix(cr);
+
+    cairo_set_line_width(cr, 2);
+    cairo_set_source_rgb(cr, 0.8, 0.8, 0.8);
+    cairo_move_to(cr, 0, 0);
+    cairo_line_to(cr, PREVIEW_WIDTH, 0);
+    cairo_line_to(cr, PREVIEW_WIDTH, PREVIEW_HEIGHT);
+    cairo_line_to(cr, 0, PREVIEW_HEIGHT);
+    cairo_line_to(cr, 0, 0);
+    cairo_stroke(cr);
+
+    xoj::util::GObjectSPtr<GdkPixbuf> pixbuf(
+            gdk_pixbuf_get_from_surface(surface.get(), 0, 0, PREVIEW_WIDTH, PREVIEW_HEIGHT), xoj::util::adopt);
+    return gtk_image_new_from_pixbuf(pixbuf.get());
+}
+};  // namespace xoj::helper
diff --git a/entry/src/main/cpp/src/core/gui/CreatePreviewImage.h b/entry/src/main/cpp/src/core/gui/CreatePreviewImage.h
new file mode 100644
index 0000000..705a67f
--- /dev/null
+++ b/entry/src/main/cpp/src/core/gui/CreatePreviewImage.h
@@ -0,0 +1,26 @@
+/*
+ * Xournal++
+ *
+ * Helper function
+ *
+ * @author Xournal++ Team
+ * https://github.com/xournalpp/xournalpp
+ *
+ * @license GNU GPLv2 or later
+ */
+
+#pragma once
+
+#include <gtk/gtk.h>  // for GtkWidget
+
+class PageType;
+
+namespace xoj::helper {
+constexpr auto PREVIEW_WIDTH = 100;
+constexpr auto PREVIEW_HEIGHT = 141;
+/**
+ * @brief Create a GtkImage containing a miniature of the given (standard) page type
+ *      The returned widget is a floating ref.
+ */
+auto createPreviewImage(const PageType& pt) -> GtkWidget*;
+};  // namespace xoj::helper
diff --git a/entry/src/main/cpp/src/core/gui/FloatingToolbox.cpp b/entry/src/main/cpp/src/core/gui/FloatingToolbox.cpp
new file mode 100644
index 0000000..9641693
--- /dev/null
+++ b/entry/src/main/cpp/src/core/gui/FloatingToolbox.cpp
@@ -0,0 +1,217 @@
+#include "FloatingToolbox.h"
+
+#include <algorithm>  // for max
+#include <memory>     // for allocator
+
+#include <gdk/gdk.h>      // for GdkRectangle, GDK_LEAVE_...
+#include <glib-object.h>  // for G_CALLBACK, g_signal_con...
+
+#include "control/Control.h"                 // for Control
+#include "control/ToolEnums.h"               // for TOOL_FLOATING_TOOLBOX
+#include "control/settings/ButtonConfig.h"   // for ButtonConfig
+#include "control/settings/Settings.h"       // for Settings
+#include "control/settings/SettingsEnums.h"  // for BUTTON_COUNT
+#include "util/glib_casts.h"
+
+#include "MainWindow.h"          // for MainWindow
+#include "ToolbarDefinitions.h"  // for ToolbarEntryDefintion
+
+
+FloatingToolbox::FloatingToolbox(MainWindow* theMainWindow, GtkOverlay* overlay) {
+    this->mainWindow = theMainWindow;
+    this->floatingToolbox = theMainWindow->get("floatingToolbox");
+    this->floatingToolboxX = 200;
+    this->floatingToolboxY = 200;
+    this->floatingToolboxState = recalcSize;
+
+    gtk_overlay_add_overlay(overlay, this->floatingToolbox);
+    gtk_overlay_set_overlay_pass_through(overlay, this->floatingToolbox, true);
+    gtk_widget_add_events(this->floatingToolbox, GDK_LEAVE_NOTIFY_MASK);
+    g_signal_connect(this->floatingToolbox, "leave-notify-event",
+                     xoj::util::wrap_for_g_callback_v<handleLeaveFloatingToolbox>, this);
+    // position overlay widgets
+    g_signal_connect(overlay, "get-child-position", xoj::util::wrap_for_g_callback_v<getOverlayPosition>, this);
+}
+
+
+FloatingToolbox::~FloatingToolbox() = default;
+
+
+void FloatingToolbox::show(int x, int y) {
+    this->floatingToolboxX = x;
+    this->floatingToolboxY = y;
+    this->show();
+}
+
+
+/****
+ * floatingToolboxActivated
+ *  True if the user has:
+ *    assigned a mouse or stylus button to bring up the floatingToolbox;
+ *    or enabled tapAction and Show FloatingToolbox( prefs->DrawingArea->ActionOnToolTap );
+ *    or put tools in the FloatingToolbox.
+ *
+ */
+auto FloatingToolbox::floatingToolboxActivated() -> bool {
+    Settings* settings = this->mainWindow->getControl()->getSettings();
+    ButtonConfig* cfg = nullptr;
+
+    // check if any buttons assigned to bring up toolbox
+    for (unsigned int id = 0; id < BUTTON_COUNT; id++) {
+        cfg = settings->getButtonConfig(id);
+
+        if (cfg->getAction() == TOOL_FLOATING_TOOLBOX) {
+            return true;  // return true
+        }
+    }
+
+    // check if user can show Floating Menu with tap.
+    if (settings->getDoActionOnStrokeFiltered() && settings->getStrokeFilterEnabled()) {
+        return true;  // return true
+    }
+
+    return this->hasWidgets();
+}
+
+
+auto FloatingToolbox::hasWidgets() -> bool {
+    for (int index = TBFloatFirst; index <= TBFloatLast; index++) {
+        GtkToolbar* toolbar1 = GTK_TOOLBAR(this->mainWindow->get(TOOLBAR_DEFINITIONS[index].guiName));
+        if (gtk_toolbar_get_n_items(toolbar1) > 0) {
+            return true;
+        }
+    }
+    return false;
+}
+
+
+void FloatingToolbox::showForConfiguration() {
+    if (this->floatingToolboxActivated())  // Do not show if not being used - at least while experimental.
+    {
+        GtkWidget* boxContents = this->mainWindow->get("boxContents");
+        gint wx = 0, wy = 0;
+        gtk_widget_translate_coordinates(boxContents, gtk_widget_get_toplevel(boxContents), 0, 0, &wx, &wy);
+        this->floatingToolboxX = wx + 40;  // when configuration state these are
+        this->floatingToolboxY = wy + 40;  // topleft coordinates( otherwise center).
+        this->floatingToolboxState = configuration;
+        this->show();
+    }
+}
+
+
+void FloatingToolbox::show() {
+    gtk_widget_show_all(this->floatingToolbox);
+    gtk_widget_set_visible(this->mainWindow->get("labelFloatingToolbox"), this->floatingToolboxState == configuration);
+    gtk_widget_set_visible(this->mainWindow->get("showIfEmpty"),
+                           this->floatingToolboxState != configuration && !hasWidgets());
+}
+
+
+void FloatingToolbox::hide() {
+    if (this->floatingToolboxState == configuration) {
+        this->floatingToolboxState = recalcSize;
+    }
+
+    gtk_widget_hide(this->floatingToolbox);
+}
+
+
+void FloatingToolbox::flagRecalculateSizeRequired() { this->floatingToolboxState = recalcSize; }
+
+
+/**
+ * getOverlayPosition - this is how we position the widget in the overlay under the mouse
+ *
+ * The requested location is communicated via the FloatingToolbox member variables:
+ * ->floatingToolbox,		so we can operate on the right widget
+ * ->floatingToolboxState,	are we configuring, resizing or just moving
+ * ->floatingToolboxX,		where to display
+ * ->floatingToolboxY.
+ *
+ */
+auto FloatingToolbox::getOverlayPosition(GtkOverlay* overlay, GtkWidget* widget, GdkRectangle* allocation,
+                                         FloatingToolbox* self) -> bool {
+    if (widget != self->floatingToolbox) {
+        return false;
+    }
+
+    gtk_widget_get_allocation(widget, allocation);
+
+    if (self->floatingToolboxState != noChange || allocation->height < 2) {
+        GtkRequisition natural;
+        gtk_widget_get_preferred_size(widget, nullptr, &natural);
+        allocation->width = natural.width;
+        allocation->height = natural.height;
+    }
+
+    // Get scrolled window for boundary clamping
+    GtkWidget* mainBox = self->mainWindow->get("mainBox");
+    GtkWidget* boxContents = self->mainWindow->get("boxContents");
+
+    GtkWidget* scrolledWindow = nullptr;
+    GList* children = gtk_container_get_children(GTK_CONTAINER(boxContents));
+    if (children != nullptr) {
+        scrolledWindow = GTK_WIDGET(children->data);
+        g_list_free(children);
+    }
+
+    if (scrolledWindow == nullptr) {
+        // Fallback: no clamping if scrolled window not found
+        allocation->x = self->floatingToolboxX - allocation->width / 2;
+        allocation->y = self->floatingToolboxY - allocation->height / 2;
+        self->floatingToolboxState = noChange;
+        return true;
+    }
+
+    // Get scrolled window position relative to mainBox
+    gint scrollX, scrollY;
+    gtk_widget_translate_coordinates(scrolledWindow, mainBox, 0, 0, &scrollX, &scrollY);
+
+    GtkAllocation scrollAllocation;
+    gtk_widget_get_allocation(scrolledWindow, &scrollAllocation);
+
+    switch (self->floatingToolboxState) {
+        case recalcSize:
+            [[fallthrough]];
+        case noChange: {
+            int centerX = self->floatingToolboxX - allocation->width / 2;
+            int centerY = self->floatingToolboxY - allocation->height / 2;
+
+            // Clamp to scrolled window bounds with margin
+            constexpr int margin = 10;
+            int minX = scrollX + margin;
+            int maxX = scrollX + scrollAllocation.width - allocation->width - margin;
+            int minY = scrollY + margin;
+            int maxY = scrollY + scrollAllocation.height - allocation->height - margin;
+
+            // Ensure valid clamp bounds when toolbox is larger than viewport
+            maxX = std::max(maxX, minX);
+            maxY = std::max(maxY, minY);
+
+            allocation->x = std::clamp(centerX, minX, maxX);
+            allocation->y = std::clamp(centerY, minY, maxY);
+            self->floatingToolboxState = noChange;
+            break;
+        }
+
+        case configuration:
+            allocation->x = self->floatingToolboxX;
+            allocation->y = self->floatingToolboxY;
+            allocation->width = std::max(allocation->width + 32, 50);
+            allocation->height = std::max(allocation->height, 50);
+            break;
+    }
+
+    return true;
+}
+
+
+bool FloatingToolbox::handleLeaveFloatingToolbox(GtkWidget* floatingToolbox, GdkEvent* event, FloatingToolbox* self) {
+    if (floatingToolbox == self->floatingToolbox) {
+        if (self->floatingToolboxState != configuration) {
+            self->hide();
+        }
+        return true;
+    }
+    return false;
+}
diff --git a/entry/src/main/cpp/src/core/gui/FloatingToolbox.h b/entry/src/main/cpp/src/core/gui/FloatingToolbox.h
new file mode 100644
index 0000000..82b21e4
--- /dev/null
+++ b/entry/src/main/cpp/src/core/gui/FloatingToolbox.h
@@ -0,0 +1,94 @@
+/*
+ * Xournal++
+ *
+ * The Floating Toolbox
+ *
+ * @author Xournal++ Team
+ * https://github.com/xournalpp/xournalpp
+ *
+ * @license GNU GPLv2 or later
+ */
+
+#pragma once
+
+
+#include <gdk/gdk.h>  // for GdkEvent, GdkRectangle
+#include <glib.h>     // for gboolean
+#include <gtk/gtk.h>  // for GtkWidget, GtkOverlay
+
+class MainWindow;
+
+enum FloatingToolBoxState { recalcSize = 0, configuration, noChange };
+
+/************************
+ * FloatingToolbox:
+ *  Uses a GtkOverlay to show a widget containing toolbars.
+ *  The getOverlayPosition callback is used to position the toolbox widget relative to the users input device.
+ *  The ui/main.glade file defines the floatingToolbox as a GtkRevealer widget - attempts to use another widget
+ *  had issues with leave-notify-event.
+ */
+
+class FloatingToolbox {
+public:
+    FloatingToolbox(MainWindow* theMainWindow, GtkOverlay* overlay);
+    virtual ~FloatingToolbox();
+
+public:
+    /**
+     *  show(x,y): Show Toolbox at centered at x,y relative to main window.
+     */
+    void show(int x, int y);
+
+    /**
+     * showForConfiguration
+     * i.e. appear in fixed position in top left, extra space and do not hide automatically.
+     */
+    void showForConfiguration();
+
+    void hide();
+
+    /**
+     * flagRecalculateSizeRequired(): trigger recalc size on next getOverlayPosition. Used when new toolbars loaded.
+     */
+    void flagRecalculateSizeRequired();
+
+private:
+    /**
+     * Callback for positioning overlayed floating menu
+     */
+    static bool getOverlayPosition(GtkOverlay* overlay, GtkWidget* widget, GdkRectangle* alloc, FloatingToolbox* self);
+
+    /**
+     * Callback to hide floating Toolbar when mouse leaves it
+     */
+    static bool handleLeaveFloatingToolbox(GtkWidget* floatingToolbox, GdkEvent* event, FloatingToolbox* self);
+
+    /**
+     * Show the Floating Toolbox
+     * ... but hide some labels depending on conditions.
+     */
+    void show();
+
+    /**
+     * check if user has assigned a button to activate, or has put tools in the FloatingToolbox.
+     */
+    bool floatingToolboxActivated();
+
+    /**
+     * Whether there are items in the toolbox.
+     * Note this includes non-tools such as spacers and separators.
+     */
+    bool hasWidgets();
+
+
+private:
+    MainWindow* mainWindow;
+    GtkWidget* floatingToolbox;
+
+    /**
+     * Communicating with getOverlayPosition callback
+     * */
+    int floatingToolboxX = 0;
+    int floatingToolboxY = 0;
+    FloatingToolBoxState floatingToolboxState = recalcSize;
+};
diff --git a/entry/src/main/cpp/src/core/gui/GladeGui.cpp b/entry/src/main/cpp/src/core/gui/GladeGui.cpp
new file mode 100644
index 0000000..c5ff9cd
--- /dev/null
+++ b/entry/src/main/cpp/src/core/gui/GladeGui.cpp
@@ -0,0 +1,57 @@
+#include "GladeGui.h"
+
+#include <cstdlib>  // for exit
+
+#include <glib-object.h>  // for g_object_unref
+#include <glib.h>         // for g_error_free, GError, g_warning
+
+#include "util/PlaceholderString.h"  // for PlaceholderString
+#include "util/StringUtils.h"        // for char_cast
+#include "util/XojMsgBox.h"          // for XojMsgBox
+#include "util/i18n.h"               // for FS, _F
+
+#include "GladeSearchpath.h"  // for GladeSearchpath
+#include "filesystem.h"       // for path
+
+GladeGui::GladeGui(GladeSearchpath* gladeSearchPath, const std::string& glade, const std::string& mainWnd) {
+    this->gladeSearchPath = gladeSearchPath;
+
+    auto filepath = this->gladeSearchPath->findFile("", glade);
+
+    GError* error = nullptr;
+    builder.reset(gtk_builder_new(), xoj::util::adopt);
+
+    if (!gtk_builder_add_from_file(builder.get(), char_cast(filepath.u8string().c_str()), &error)) {
+        std::string msg = FS(_F("Error loading glade file \"{1}\" (try to load \"{2}\")") % glade %
+                             char_cast(filepath.u8string()));
+
+        if (error != nullptr) {
+            msg += "\n";
+            msg += error->message;
+            g_error_free(error);
+        }
+        XojMsgBox::showErrorAndQuit(msg, -1);
+    }
+
+    this->window = get(mainWnd);
+}
+
+GladeGui::~GladeGui() {
+    if (!gtk_widget_get_parent(window)) {
+        gtk_widget_destroy(window);
+    }
+}
+
+auto GladeGui::get(const std::string& name) -> GtkWidget* {
+    GtkWidget* w = GTK_WIDGET(gtk_builder_get_object(builder.get(), name.c_str()));
+    if (w == nullptr) {
+        g_warning("GladeGui::get: Could not find glade Widget: \"%s\"", name.c_str());
+    }
+    return w;
+}
+
+auto GladeGui::getWindow() const -> GtkWidget* { return this->window; }
+
+auto GladeGui::getGladeSearchPath() const -> GladeSearchpath* { return this->gladeSearchPath; }
+
+auto GladeGui::getBuilder() const -> GtkBuilder* { return this->builder.get(); }
diff --git a/entry/src/main/cpp/src/core/gui/GladeGui.h b/entry/src/main/cpp/src/core/gui/GladeGui.h
new file mode 100644
index 0000000..224b30d
--- /dev/null
+++ b/entry/src/main/cpp/src/core/gui/GladeGui.h
@@ -0,0 +1,55 @@
+/*
+ * Xournal++
+ *
+ * Abstract GUI class, which loads the glade objects
+ *
+ * @author Xournal++ Team
+ * https://github.com/xournalpp/xournalpp
+ *
+ * @license GNU GPLv2 or later
+ */
+
+#pragma once
+
+#include <string>  // for string
+
+#include <gdk/gdk.h>  // for GdkWindow
+#include <gtk/gtk.h>  // for GtkWidget, GtkWindow, GtkBuilder
+
+#include "util/raii/GObjectSPtr.h"
+
+class GladeSearchpath;
+
+class GladeGui {
+public:
+    GladeGui(GladeSearchpath* gladeSearchPath, const std::string& glade, const std::string& mainWnd);
+    virtual ~GladeGui();
+
+    virtual void show(GtkWindow* parent) = 0;
+
+    GtkWidget* get(const std::string& name);
+
+    void setThemePath(std::string themePath);
+
+    GtkWidget* getWindow() const;
+    GladeSearchpath* getGladeSearchPath() const;
+
+    GtkBuilder* getBuilder() const;
+
+private:
+    /**
+     * The Glade resources
+     */
+    xoj::util::GObjectSPtr<GtkBuilder> builder;
+
+    /**
+     * Our search paths
+     */
+    GladeSearchpath* gladeSearchPath;
+
+protected:
+    /**
+     * This window
+     */
+    GtkWidget* window = nullptr;
+};
diff --git a/entry/src/main/cpp/src/core/gui/GladeSearchpath.cpp b/entry/src/main/cpp/src/core/gui/GladeSearchpath.cpp
new file mode 100644
index 0000000..ce12925
--- /dev/null
+++ b/entry/src/main/cpp/src/core/gui/GladeSearchpath.cpp
@@ -0,0 +1,52 @@
+/*
+ * Xournal++
+ *
+ * Search directory for icons and Glade files
+ *
+ * @author andreas
+ * https://github.com/xournalpp/xournalpp
+ *
+ * @license GNU GPLv2 or later
+ */
+
+#include "GladeSearchpath.h"
+
+GladeSearchpath::GladeSearchpath() = default;
+
+GladeSearchpath::~GladeSearchpath() { directories.clear(); }
+
+auto GladeSearchpath::findFile(fs::path const& subdir, fs::path const& file) const -> fs::path {
+    fs::path filepath;
+    if (subdir.empty()) {
+        filepath = file;
+    } else {
+        filepath = subdir / file;
+    }
+
+    // We step through each directory to find it.
+    for (const auto& dir: directories) {
+        auto pathname = dir / filepath;
+
+        if (fs::exists(pathname)) {
+            return pathname;
+        }
+    }
+
+    return fs::path{};
+}
+
+/**
+ * @return The first search path
+ */
+auto GladeSearchpath::getFirstSearchPath() const -> fs::path {
+    if (this->directories.empty()) {
+        return {};
+    }
+
+    return this->directories[0];
+}
+
+/**
+ * Use this function to set the directory containing installed pixmaps and Glade XML files.
+ */
+void GladeSearchpath::addSearchDirectory(fs::path const& directory) { this->directories.push_back(directory); }
diff --git a/entry/src/main/cpp/src/core/gui/GladeSearchpath.h b/entry/src/main/cpp/src/core/gui/GladeSearchpath.h
new file mode 100644
index 0000000..c4faa6c
--- /dev/null
+++ b/entry/src/main/cpp/src/core/gui/GladeSearchpath.h
@@ -0,0 +1,41 @@
+/*
+ * Xournal++
+ *
+ * Search directory for icons and Glade files
+ *
+ * @author andreas
+ * https://github.com/xournalpp/xournalpp
+ *
+ * @license GNU GPLv2 or later
+ */
+
+#pragma once
+
+#include <vector>  // for vector
+
+#include "filesystem.h"  // for path
+
+class GladeSearchpath {
+public:
+    GladeSearchpath();
+    virtual ~GladeSearchpath();
+
+public:
+    void addSearchDirectory(fs::path const& directory);
+
+    /**
+     * Searches for a path, return the path, an empty string if not found
+     */
+    fs::path findFile(fs::path const& subdir, fs::path const& file) const;
+
+    /**
+     * @return The first search path
+     */
+    fs::path getFirstSearchPath() const;
+
+private:
+    /**
+     * Search directory for icons and Glade files
+     */
+    std::vector<fs::path> directories;
+};
diff --git a/entry/src/main/cpp/src/core/gui/IconNameHelper.cpp b/entry/src/main/cpp/src/core/gui/IconNameHelper.cpp
new file mode 100644
index 0000000..eb5d919
--- /dev/null
+++ b/entry/src/main/cpp/src/core/gui/IconNameHelper.cpp
@@ -0,0 +1,15 @@
+#include "IconNameHelper.h"
+
+#include <gtk/gtk.h>  // for gtk_icon_theme_get_default
+
+#include "control/settings/Settings.h"  // for Settings
+
+IconNameHelper::IconNameHelper(Settings* settings): settings(settings) {}
+
+auto IconNameHelper::iconName(const char* icon) const -> std::string {
+    std::string xoppName = std::string("xopp-") + icon;
+    auto iconName = this->settings->areStockIconsUsed() && gtk_icon_theme_has_icon(gtk_icon_theme_get_default(), icon) ?
+                            std::string(icon) :
+                            xoppName;
+    return iconName;
+}
diff --git a/entry/src/main/cpp/src/core/gui/IconNameHelper.h b/entry/src/main/cpp/src/core/gui/IconNameHelper.h
new file mode 100644
index 0000000..bbc4c99
--- /dev/null
+++ b/entry/src/main/cpp/src/core/gui/IconNameHelper.h
@@ -0,0 +1,27 @@
+/*
+ * Xournal++
+ *
+ * Helper which allows to switch between Xournal++ icons and stock icons
+ *
+ * @author Xournal++ Team
+ * https://github.com/xournalpp/xournalpp
+ *
+ * @license GNU GPLv2 or later
+ */
+#pragma once
+
+#include <string>
+
+class Settings;
+
+class IconNameHelper final {
+
+public:
+    IconNameHelper(Settings* settings);
+
+protected:
+    const Settings* settings;
+
+public:
+    std::string iconName(const char* icon) const;
+};
diff --git a/entry/src/main/cpp/src/core/gui/Layout.cpp b/entry/src/main/cpp/src/core/gui/Layout.cpp
new file mode 100644
index 0000000..492fca7
--- /dev/null
+++ b/entry/src/main/cpp/src/core/gui/Layout.cpp
@@ -0,0 +1,432 @@
+#include "Layout.h"
+
+#include <algorithm>    // for max, lower_bound, transform
+#include <cmath>        // for abs
+#include <iterator>     // for begin, end, distance
+#include <numeric>      // for accumulate
+#include <optional>     // for optional
+#include <type_traits>  // for make_signed_t, remove_referen...
+
+#include <glib-object.h>  // for G_CALLBACK, g_signal_connect
+
+#include "control/Control.h"            // for Control
+#include "control/settings/Settings.h"  // for Settings
+#include "gui/LayoutMapper.h"           // for LayoutMapper, GridPosition
+#include "gui/PageView.h"               // for XojPageView
+#include "gui/scroll/ScrollHandling.h"  // for ScrollHandling
+#include "model/Document.h"             // for Document
+#include "util/Rectangle.h"             // for Rectangle
+#include "util/safe_casts.h"            // for strict_cast, as_signed, as_si...
+
+#include "XournalView.h"  // for XournalView
+
+using xoj::util::Rectangle;
+
+/**
+ * Padding outside the pages, including shadow
+ */
+constexpr auto const XOURNAL_PADDING = 10;
+
+/**
+ * Allowance for shadow between page pairs in paired page mode
+ */
+constexpr auto const XOURNAL_ROOM_FOR_SHADOW = 3;
+
+/**
+ * Padding between the pages
+ */
+constexpr auto const XOURNAL_PADDING_BETWEEN = 15;
+
+
+Layout::Layout(XournalView* view, ScrollHandling* scrollHandling): view(view), scrollHandling(scrollHandling) {
+    g_signal_connect(scrollHandling->getHorizontal(), "value-changed", G_CALLBACK(horizontalScrollChanged), this);
+    g_signal_connect(scrollHandling->getVertical(), "value-changed", G_CALLBACK(verticalScrollChanged), this);
+
+
+    lastScrollHorizontal = gtk_adjustment_get_value(scrollHandling->getHorizontal());
+    lastScrollVertical = gtk_adjustment_get_value(scrollHandling->getVertical());
+}
+
+void Layout::horizontalScrollChanged(GtkAdjustment* adjustment, Layout* layout) {
+    Layout::checkScroll(adjustment, layout->lastScrollHorizontal);
+    layout->updateVisibility();
+}
+
+void Layout::verticalScrollChanged(GtkAdjustment* adjustment, Layout* layout) {
+    Layout::checkScroll(adjustment, layout->lastScrollVertical);
+    layout->updateVisibility();
+
+    layout->maybeAddLastPage(layout);
+}
+
+void Layout::maybeAddLastPage(Layout* layout) {
+    auto* control = this->view->getControl();
+    auto* settings = control->getSettings();
+    if (settings->getEmptyLastPageAppend() == EmptyLastPageAppendType::OnScrollToEndOfLastPage) {
+        // If the layout is 5px away from the end of the last page
+        if (std::abs((layout->getMinimalHeight() - layout->getVisibleRect().y) - layout->getVisibleRect().height) < 5) {
+            auto* doc = control->getDocument();
+            doc->lock_shared();
+            auto pdfPageCount = doc->getPdfPageCount();
+            auto lastPage = doc->getPageCount() - 1;
+            doc->unlock_shared();
+            if (pdfPageCount == 0) {
+                auto currentPage = control->getCurrentPageNo();
+                if (currentPage == lastPage) {
+                    control->insertNewPage(currentPage + 1, true);
+                }
+            }
+        }
+    }
+}
+
+void Layout::checkScroll(GtkAdjustment* adjustment, double& lastScroll) {
+    lastScroll = gtk_adjustment_get_value(adjustment);
+}
+
+void Layout::updateVisibility() {
+    Rectangle visRect = getVisibleRect();
+
+    // step through every possible page position and update using p->setIsVisible()
+    // Using initial grid aprox speeds things up by a factor of 5.  See previous git check-in for specifics.
+    int x1 = 0;
+    int y1 = 0;
+
+    // Data to select page based on visibility
+    std::optional<size_t> mostPageNr;
+    double mostPagePercent = 0;
+
+    for (size_t row = 0; row < this->rowYStart.size(); ++row) {
+        auto y2 = as_signed_strict(this->rowYStart[row]);
+        for (size_t col = 0; col < this->colXStart.size(); ++col) {
+            auto x2 = as_signed_strict(this->colXStart[col]);
+            auto optionalPage = this->mapper.at({col, row});
+            if (optionalPage)  // a page exists at this grid location
+            {
+                auto& pageView = this->view->viewPages[*optionalPage];
+
+                // check if grid location is visible as an aprox for page visiblity:
+                if (!(visRect.x > x2 || visRect.x + visRect.width < x1)  // visrect not outside current row/col
+                    && !(visRect.y > y2 || visRect.y + visRect.height < y1)) {
+                    // now use exact check of page itself:
+                    // visrect not outside current page dimensions:
+                    auto const& pageRect = pageView->getRect();
+                    if (auto intersection = pageRect.intersects(visRect); intersection) {
+                        pageView->setIsVisible(true);
+                        // Set the selected page
+                        double percent = intersection->area() / pageRect.area();
+
+                        if (percent > mostPagePercent) {
+                            mostPageNr = *optionalPage;
+                            mostPagePercent = percent;
+                        }
+                    }
+                } else {
+                    pageView->setIsVisible(false);
+                }
+            }
+            x1 = x2;
+        }
+        y1 = y2;
+        x1 = 0;
+    }
+
+    if (mostPageNr) {
+        this->view->getControl()->firePageSelected(*mostPageNr);
+    }
+}
+
+auto Layout::getVisibleRect() -> Rectangle<double> {
+    return Rectangle(gtk_adjustment_get_value(scrollHandling->getHorizontal()),
+                     gtk_adjustment_get_value(scrollHandling->getVertical()),
+                     gtk_adjustment_get_page_size(scrollHandling->getHorizontal()),
+                     gtk_adjustment_get_page_size(scrollHandling->getVertical()));
+}
+
+/**
+ * adds the addend to base if the predicate is true
+ */
+
+[[maybe_unused]] constexpr auto sumIf = [](auto base, auto addend, bool predicate) {
+    if constexpr (std::is_signed_v<decltype(base)> || std::is_signed_v<decltype(addend)>) {
+        using RT = std::make_signed_t<decltype(base + addend)>;
+        if (predicate) {
+            return RT(base) + RT(addend);
+        }
+        return RT(base);
+    } else if constexpr (!(std::is_signed_v<decltype(base)> || std::is_signed_v<decltype(addend)>)) {
+        using RT = decltype(base + addend);
+        if (predicate) {
+            return RT(base) + RT(addend);
+        }
+        return RT(base);
+    }
+};
+void Layout::recalculate_int() const {
+    auto* settings = view->getControl()->getSettings();
+    auto len = view->viewPages.size();
+    mapper.configureFromSettings(len, settings);
+    auto colCount = mapper.getColumns();
+    auto rowCount = mapper.getRows();
+
+    pc.widthCols.assign(colCount, 0);
+    pc.heightRows.assign(rowCount, 0);
+
+    for (size_t pageIdx{}; pageIdx < len; ++pageIdx) {
+        auto const& raster_p = mapper.at(pageIdx);  // auto [c, r] raster = mapper.at();
+        auto const& c = raster_p.col;
+        auto const& r = raster_p.row;
+        auto& v = view->viewPages[pageIdx];
+        pc.widthCols[c] = std::max(pc.widthCols[c], v->getDisplayWidthDouble());
+        pc.heightRows[r] = std::max(pc.heightRows[r], v->getDisplayHeightDouble());
+    }
+
+    // add space around the entire page area to accommodate older Wacom tablets with limited sense area.
+    auto vPadding = 2 * XOURNAL_PADDING;
+    if (settings->getUnlimitedScrolling()) {
+        vPadding += 2 * static_cast<int>(gtk_adjustment_get_page_size(scrollHandling->getVertical()));
+    } else if (settings->getAddVerticalSpace()) {
+        vPadding += settings->getAddVerticalSpaceAmountAbove();
+        vPadding += settings->getAddVerticalSpaceAmountBelow();
+    }
+
+    auto hPadding = 2 * XOURNAL_PADDING;
+    if (settings->getUnlimitedScrolling()) {
+        hPadding += 2 * static_cast<int>(gtk_adjustment_get_page_size(scrollHandling->getHorizontal()));
+    } else if (settings->getAddHorizontalSpace()) {
+        hPadding += settings->getAddHorizontalSpaceAmountLeft();
+        hPadding += settings->getAddHorizontalSpaceAmountRight();
+    }
+
+    pc.minWidth = as_unsigned(hPadding + as_signed_strict((pc.widthCols.size() - 1) * XOURNAL_PADDING_BETWEEN));
+    pc.minHeight = as_unsigned(vPadding + as_signed_strict((pc.heightRows.size() - 1) * XOURNAL_PADDING_BETWEEN));
+
+    pc.minWidth = floor_cast<size_t>(std::accumulate(begin(pc.widthCols), end(pc.widthCols), double(pc.minWidth)));
+    pc.minHeight = floor_cast<size_t>(std::accumulate(begin(pc.heightRows), end(pc.heightRows), double(pc.minHeight)));
+    pc.valid = true;
+}
+
+void Layout::recalculate() {
+    pc.valid = false;
+    gtk_widget_queue_resize(view->getWidget());
+}
+
+void Layout::layoutPages(int width, int height) {
+    std::lock_guard g{pc.m};
+    if (!pc.valid) {
+        recalculate_int();
+    }
+    // Todo: remove, just a hack-hotfix
+    scrollHandling->setLayoutSize(std::max(width, strict_cast<int>(this->pc.minWidth)),
+                                  std::max(height, strict_cast<int>(this->pc.minHeight)));
+
+    size_t const len = this->view->viewPages.size();
+    Settings* settings = this->view->getControl()->getSettings();
+
+    // get from mapper (some may have changed to accommodate paired setting etc.)
+    bool const isPairedPages = this->mapper.isPairedPages();
+
+    auto const rows = this->pc.heightRows.size();
+    auto const columns = this->pc.widthCols.size();
+
+
+    // add space around the entire page area to accommodate older Wacom tablets with limited sense area.
+    auto v_padding = XOURNAL_PADDING;
+    if (settings->getUnlimitedScrolling()) {
+        v_padding += ceil_cast<int>(gtk_adjustment_get_page_size(scrollHandling->getVertical()));
+    } else if (settings->getAddVerticalSpace()) {
+        v_padding += settings->getAddVerticalSpaceAmountAbove();
+    }
+
+    auto h_padding = XOURNAL_PADDING;
+    if (settings->getUnlimitedScrolling()) {
+        h_padding += ceil_cast<int>(gtk_adjustment_get_page_size(scrollHandling->getHorizontal()));
+    } else if (settings->getAddHorizontalSpace()) {
+        h_padding += settings->getAddHorizontalSpaceAmountLeft();
+    }
+
+    auto const centeringXBorder = (width - as_signed(pc.minWidth)) / 2;
+    auto const centeringYBorder = (height - as_signed(pc.minHeight)) / 2;
+
+    using SBig = decltype(as_signed(h_padding * centeringXBorder));
+    auto const borderX = static_cast<double>(std::max<SBig>(h_padding, centeringXBorder));
+    auto const borderY = static_cast<double>(std::max<SBig>(v_padding, centeringYBorder));
+
+    // initialize here and x again in loop below.
+    auto x = borderX;
+    auto y = borderY;
+
+
+    // Iterate over ALL possible rows and columns.
+    // We don't know which page, if any,  is to be displayed in each row, column -  ask the mapper object!
+    // Then assign that page coordinates with center, left or right justify within row,column grid cell as required.
+    for (size_t r = 0; r < rows; r++) {
+        for (size_t c = 0; c < columns; c++) {
+            auto optionalPage = this->mapper.at({c, r});
+
+            if (optionalPage) {
+
+                auto& v = this->view->viewPages[*optionalPage];
+                v->setMappedRowCol(strict_cast<int>(r),
+                                   strict_cast<int>(c));  // store row and column for e.g. proper arrow key navigation
+                auto vDisplayWidth = v->getDisplayWidthDouble();
+                {
+                    auto paddingLeft = 0.0;
+                    auto paddingRight = 0.0;
+                    auto columnPadding = this->pc.widthCols[c] - vDisplayWidth;
+
+                    if (isPairedPages && len > 1) {
+                        // pair pages mode
+                        if (c % 2 == 0) {
+                            // align right
+                            paddingLeft = XOURNAL_PADDING_BETWEEN - XOURNAL_ROOM_FOR_SHADOW + columnPadding;
+                            paddingRight = XOURNAL_ROOM_FOR_SHADOW;
+                        } else {  // align left
+                            paddingLeft = XOURNAL_ROOM_FOR_SHADOW;
+                            paddingRight = XOURNAL_PADDING_BETWEEN - XOURNAL_ROOM_FOR_SHADOW + columnPadding;
+                        }
+                    } else {  // not paired page mode - center
+                        paddingLeft = XOURNAL_PADDING_BETWEEN / 2.0 + columnPadding / 2.0;  // center justify
+                        paddingRight = XOURNAL_PADDING_BETWEEN - paddingLeft + columnPadding;
+                    }
+
+                    x += paddingLeft;
+
+                    v->setX(floor_cast<int>(x));  // set the page position
+                    v->setY(floor_cast<int>(y));
+
+                    x += vDisplayWidth + paddingRight;
+                }
+            } else {
+                x += this->pc.widthCols[c] + XOURNAL_PADDING_BETWEEN;
+            }
+        }
+        x = borderX;
+        y += this->pc.heightRows[r] + XOURNAL_PADDING_BETWEEN;
+    }
+
+    this->colXStart.resize(this->pc.widthCols.size());
+    this->rowYStart.resize(this->pc.heightRows.size());
+
+
+    // accumulated - absolute pixel location for use by getViewAt() and updateVisibility()
+    auto totalWidth = borderX;
+    std::transform(
+            begin(this->pc.widthCols), end(this->pc.widthCols), begin(this->colXStart), [&totalWidth](auto&& widthCol) {
+                return strict_cast<std::remove_reference_t<decltype(widthCol)>>(totalWidth +=
+                                                                                widthCol + XOURNAL_PADDING_BETWEEN);
+            });
+    auto totalHeight = borderY;
+    std::transform(begin(this->pc.heightRows), end(this->pc.heightRows), begin(this->rowYStart),
+                   [&totalHeight](auto&& heightRow) {
+                       return strict_cast<std::remove_reference_t<decltype(heightRow)>>(
+                               (totalHeight += heightRow + XOURNAL_PADDING_BETWEEN));
+                   });
+}
+
+
+auto Layout::getPaddingAbovePage(size_t pageIndex) const -> int {
+    const Settings* settings = this->view->getControl()->getSettings();
+
+    // User-configured padding above all pages.
+    auto paddingAbove = XOURNAL_PADDING;
+    if (settings->getUnlimitedScrolling()) {
+        paddingAbove += ceil_cast<int>(gtk_adjustment_get_page_size(scrollHandling->getVertical()));
+    } else if (settings->getAddVerticalSpace()) {
+        paddingAbove += settings->getAddVerticalSpaceAmountAbove();
+    }
+
+    // (x, y) coordinate pair gives grid indices. This handles paired pages and different page layouts for us.
+    auto pageYLocation = strict_cast<int>(this->mapper.at(pageIndex).row);
+    return pageYLocation * XOURNAL_PADDING_BETWEEN + paddingAbove;
+}
+
+
+auto Layout::getPaddingLeftOfPage(size_t pageIndex) const -> int {
+    bool isPairedPages = this->mapper.isPairedPages();
+    const Settings* settings = this->view->getControl()->getSettings();
+
+    auto paddingBefore = XOURNAL_PADDING;
+    if (settings->getUnlimitedScrolling()) {
+        paddingBefore += ceil_cast<int>(gtk_adjustment_get_page_size(scrollHandling->getHorizontal()));
+    } else if (settings->getAddHorizontalSpace()) {
+        paddingBefore += settings->getAddHorizontalSpaceAmountLeft();
+    }
+
+    auto const pageXLocation = strict_cast<int>(this->mapper.at(pageIndex).col);
+
+    // No page pairing or we haven't rendered enough pages in the row for page pairing to have an effect,
+    if (!isPairedPages) {
+        return pageXLocation * XOURNAL_PADDING_BETWEEN + XOURNAL_PADDING_BETWEEN / 2 + paddingBefore;
+    } else {
+        auto columnPadding = XOURNAL_PADDING_BETWEEN + pageXLocation * XOURNAL_PADDING_BETWEEN;
+        if (pageXLocation % 2 == 0) {
+            return columnPadding - XOURNAL_ROOM_FOR_SHADOW + paddingBefore;
+        } else {
+            return columnPadding + XOURNAL_ROOM_FOR_SHADOW + paddingBefore;
+        }
+    }
+}
+
+void Layout::scrollRelative(double x, double y) {
+    if (this->view->getControl()->getSettings()->isPresentationMode()) {
+        return;
+    }
+
+    gtk_adjustment_set_value(scrollHandling->getHorizontal(),
+                             gtk_adjustment_get_value(scrollHandling->getHorizontal()) + x);
+    gtk_adjustment_set_value(scrollHandling->getVertical(),
+                             gtk_adjustment_get_value(scrollHandling->getVertical()) + y);
+}
+
+void Layout::scrollAbs(double x, double y) {
+    if (this->view->getControl()->getSettings()->isPresentationMode()) {
+        return;
+    }
+
+    gtk_adjustment_set_value(scrollHandling->getHorizontal(), x);
+    gtk_adjustment_set_value(scrollHandling->getVertical(), y);
+}
+
+
+void Layout::ensureRectIsVisible(int x, int y, int width, int height) {
+    gtk_adjustment_clamp_page(scrollHandling->getHorizontal(), x - 5, x + width + 10);
+    gtk_adjustment_clamp_page(scrollHandling->getVertical(), y - 5, y + height + 10);
+}
+
+
+auto Layout::getPageViewAt(int x, int y) -> XojPageView* {
+    // Binary Search:
+    auto rit = std::lower_bound(this->rowYStart.begin(), this->rowYStart.end(), y);
+    auto const foundRow = size_t(std::distance(this->rowYStart.begin(), rit));
+    auto cit = std::lower_bound(this->colXStart.begin(), this->colXStart.end(), x);
+    auto const foundCol = size_t(std::distance(this->colXStart.begin(), cit));
+
+    auto optionalPage = this->mapper.at({foundCol, foundRow});
+
+    if (optionalPage && this->view->viewPages[*optionalPage]->containsPoint(x, y, false)) {
+        return this->view->viewPages[*optionalPage].get();
+    }
+
+    return nullptr;
+}
+
+auto Layout::getPageIndexAtGridMap(size_t row, size_t col) -> std::optional<size_t> {
+    return this->mapper.at({col, row});  // watch out.. x,y --> c,r
+}
+
+auto Layout::getMinimalHeight() const -> int {
+    std::lock_guard g{pc.m};
+    if (!pc.valid) {
+        recalculate_int();
+    }
+    return strict_cast<int>(this->pc.minHeight);
+}
+
+auto Layout::getMinimalWidth() const -> int {
+    std::lock_guard g{pc.m};
+    if (!pc.valid) {
+        recalculate_int();
+    }
+    return strict_cast<int>(this->pc.minWidth);
+}
diff --git a/entry/src/main/cpp/src/core/gui/Layout.h b/entry/src/main/cpp/src/core/gui/Layout.h
new file mode 100644
index 0000000..8f5bdc9
--- /dev/null
+++ b/entry/src/main/cpp/src/core/gui/Layout.h
@@ -0,0 +1,175 @@
+/*
+ * Xournal++
+ *
+ * Handles the layout of the pages within a Xournal document
+ *
+ * @author Xournal++ Team
+ * https://github.com/xournalpp/xournalpp
+ *
+ * @license GNU GPLv2 or later
+ */
+
+#pragma once
+
+#include <cstddef>   // for size_t
+#include <mutex>     // for mutex
+#include <optional>  // for optional
+#include <vector>    // for vector
+
+#include <gtk/gtk.h>  // for GtkAdjustment
+
+#include "util/Rectangle.h"  // for Rectangle
+
+#include "LayoutMapper.h"  // for LayoutMapper
+
+class XojPageView;
+class XournalView;
+class ScrollHandling;
+
+
+/**
+ * @brief The Layout manager for the XournalWidget
+ *
+ * This class manages the layout of the XojPageView's contained
+ * in the XournalWidget
+ */
+class Layout final {
+public:
+    Layout(XournalView* view, ScrollHandling* scrollHandling);
+    struct PreCalculated {
+        std::mutex m;
+
+        // The width and height of all our pages
+        size_t minWidth = 0;
+        size_t minHeight = 0;
+        std::vector<double> widthCols;
+        std::vector<double> heightRows;
+        bool valid = false;
+    };
+
+public:
+    // Todo(Fabian): move to ScrollHandling also it must not depend on Layout
+    /**
+     * Increases the adjustments by the given amounts
+     */
+    void scrollRelative(double x, double y);
+
+    // Todo(Fabian): move to ScrollHandling also it must not depend on Layout
+    /**
+     * Changes the adjustments by absolute amounts (for pinch-to-zoom)
+     */
+    void scrollAbs(double x, double y);
+
+    // Todo(Fabian): move to XournalView
+    /**
+     * Changes the adjustments in such a way as to make sure that
+     * the given Rectangle is visible
+     *
+     * @remark If the given Rectangle won't fit into the scrolled window
+     *         then only its top left corner will be visible
+     */
+    void ensureRectIsVisible(int x, int y, int width, int height);
+
+    /**
+     * Returns the height of the entire Layout
+     */
+    int getMinimalHeight() const;
+
+    /**
+     * Returns the width of the entire Layout
+     */
+    int getMinimalWidth() const;
+
+    // Todo(Fabian): move to XournalView this must not depend on Layout directly
+    /**
+     * Returns the Rectangle which is currently visible
+     */
+    xoj::util::Rectangle<double> getVisibleRect();
+
+
+    /**
+     * recalculate and resize Layout
+     */
+    void recalculate();
+
+    /**
+     * Performs a layout of the XojPageView's managed in this Layout
+     * Sets out pages in a grid.
+     * Document pages are assigned to grid positions by the mapper object and may be ordered in a myriad of ways.
+     * ONLY call this on size allocation
+     */
+    void layoutPages(int width, int height);
+
+    // Todo(Fabian): move to View:
+    /**
+     * Updates the current XojPageView. The XojPageView is selected based on
+     * the percentage of the visible area of the XojPageView relative
+     * to its total area.
+     */
+    void updateVisibility();
+
+    /**
+     * Return the pageview containing co-ordinates.
+     */
+    XojPageView* getPageViewAt(int x, int y);
+
+    /**
+     * Return the page index found ( or std::nullopt if not found) at layout grid row,col
+     *
+     */
+    std::optional<size_t> getPageIndexAtGridMap(size_t row, size_t col);
+
+    /**
+     * @brief Get the total padding above the page at the given index.
+     *
+     *  The size of this padding does not scale with pages as the user zooms in and out.
+     * As such, it is often necessary to get _just_ this padding.
+     *
+     * @param pageIndex is the index of the XojPageView as returned by [getIndexAtGridMap]
+     * @return the sum of the padding between pages above the page with the given index
+     *         and any padding the user added vertically above all pages (i.e. in settings).
+     */
+    int getPaddingAbovePage(size_t pageIndex) const;
+
+    /**
+     * @brief Get the static padding added to the left of the current page.
+     *
+     *  This does not include padding added to center the page on the screen.
+     *
+     * @param pageIndex is the index of the XojPageView, as given by [getIndexAtGridMap]
+     * @return the sum of the padding between pages left of the page at [pageIndex] and
+     *         any horizontal padding the user decided to add (from settings)
+     */
+    int getPaddingLeftOfPage(size_t pageIndex) const;
+
+protected:
+    // Todo(Fabian): move to ScrollHandling also it must not depend on Layout
+    static void horizontalScrollChanged(GtkAdjustment* adjustment, Layout* layout);
+    static void verticalScrollChanged(GtkAdjustment* adjustment, Layout* layout);
+
+private:
+    void recalculate_int() const;
+
+    void maybeAddLastPage(Layout* layout);
+
+    // Todo(Fabian): move to ScrollHandling also it must not depend on Layout
+    static void checkScroll(GtkAdjustment* adjustment, double& lastScroll);
+
+private:
+    XournalView* view = nullptr;
+    ScrollHandling* scrollHandling = nullptr;
+
+    // Todo(Fabian): move to ScrollHandling also it must not depend on Layout
+    double lastScrollHorizontal = -1;
+    double lastScrollVertical = -1;
+
+    /**
+     * layoutPages invalidates the precalculation of recalculate
+     * this bool prevents that layotPages can be called without a previously call to recalculate
+     * Todo: we may want to remove the additional calculation in layoutPages, since we stored those values in
+     */
+    mutable LayoutMapper mapper;
+    mutable PreCalculated pc{};
+    mutable std::vector<unsigned> colXStart;
+    mutable std::vector<unsigned> rowYStart;
+};
diff --git a/entry/src/main/cpp/src/core/gui/LayoutMapper.cpp b/entry/src/main/cpp/src/core/gui/LayoutMapper.cpp
new file mode 100644
index 0000000..1fdcd44
--- /dev/null
+++ b/entry/src/main/cpp/src/core/gui/LayoutMapper.cpp
@@ -0,0 +1,177 @@
+#include "LayoutMapper.h"
+
+#include <algorithm>  // for max
+#include <map>        // for __alloc_traits<>::value_type
+
+#include "control/settings/Settings.h"  // for Settings
+
+constexpr auto calc_default_grid_pos = [](size_t page_nr, GridPosition grid_size,
+                                          LayoutSettings::Orientation orientation) {
+    return orientation == LayoutSettings::Orientation::Vertical ?
+                   GridPosition{page_nr / grid_size.row, page_nr % grid_size.row} :
+                   GridPosition{page_nr % grid_size.col, page_nr / grid_size.col};
+};
+
+constexpr auto map1 = [](LayoutSettings const& data, size_t page_nr) {
+    GridPosition grid_pos{};
+    auto new_nr = page_nr + static_cast<size_t>(data.offset);
+    if (data.showPairedPages) {
+        auto grid_size = GridPosition{data.cols / 2, data.rows};
+        grid_pos = calc_default_grid_pos(new_nr / 2, grid_size, data.orientation);
+        (grid_pos.col *= 2) += (new_nr % 2);
+    } else {
+        grid_pos = calc_default_grid_pos(new_nr, {data.cols, data.rows}, data.orientation);
+    }
+    decltype(grid_pos) grid_pos2 = {
+            (data.horizontalDir == LayoutSettings::HorizontalDirection::RightToLeft ? data.cols - 1 - grid_pos.col :
+                                                                                      grid_pos.col),
+            (data.verticalDir == LayoutSettings::VerticalDirection::BottomToTop ? data.rows - 1 - grid_pos.row :
+                                                                                  grid_pos.row)};
+    return grid_pos2;
+};
+
+constexpr auto map2 = [](LayoutSettings const& data, GridPosition pos) -> std::optional<size_t> {
+    auto isRightToLeft = [&]() { return data.horizontalDir == LayoutSettings::RightToLeft; };
+    auto isBottomToTop = [&]() { return data.verticalDir == LayoutSettings::BottomToTop; };
+    auto isVertical = [&]() { return data.orientation == LayoutSettings::Vertical; };
+
+    if (isRightToLeft()) {  // reverse x
+        pos.col = data.cols - 1 - pos.col;
+    }
+    if (isBottomToTop()) {  // reverse y
+        pos.row = data.rows - 1 - pos.row;
+    }
+    size_t res{};
+    if (isVertical()) {
+        if (data.showPairedPages) {
+            res = ((pos.row + data.rows * (pos.col / 2)) * 2) + pos.col % 2;
+        } else {
+            res = pos.row + data.rows * pos.col;
+        }
+    } else {  // Horizontal
+        res = pos.col + data.cols * pos.row;
+    }
+    res -= data.offset;
+    if (res >= data.actualPages) {
+        return {};
+    }
+    return res;
+};
+
+// Testers
+
+constexpr LayoutSettings my_data0{1, 91, 92, 1};
+constexpr LayoutSettings my_data1{91, 1, 90, 1};
+constexpr LayoutSettings my_data2{
+        6, 6, 35, 1, true, LayoutSettings::Vertical, LayoutSettings::RightToLeft, LayoutSettings::BottomToTop};
+constexpr GridPosition test_pos0{0, 3};
+constexpr GridPosition test_pos1{3, 0};
+constexpr GridPosition test_pos2{3, 3};
+
+static_assert(map1(my_data0, *map2(my_data0, test_pos0)) == test_pos0);
+static_assert(map1(my_data1, *map2(my_data1, test_pos1)) == test_pos1);
+static_assert(map1(my_data2, *map2(my_data2, test_pos2)) == test_pos2);
+
+template <typename T>
+constexpr auto hash(T&& data_, GridPosition const& pos) {
+    return pos.col + pos.row * data_.cols;
+}
+
+
+/**
+ * calculate
+ *
+ * Set mapper to LayoutType with number of pages and of fixed rows or columns
+ * @param data the data to be configured
+ * @param numRows Number of rows ( used if useRows )
+ * @param numCols  Number of columns ( used if !useRows )
+ * @param useRows  use pages/rows to recalculate cols else recalculate rows
+ * @param firstPageOffset  Pages to offset - usually one or zero in order to pair up properly
+ */
+
+void calculate(LayoutSettings& data, size_t numRows, size_t numCols, bool useRows, uint32_t firstPageOffset) {
+    if (useRows) {
+        data.rows = std::max<size_t>(1UL, numRows);
+
+        // using  + ( rows-1) to round up (int)pages/rows
+        data.cols = std::max<size_t>(1UL, (data.actualPages + firstPageOffset + (data.rows - 1)) / data.rows);
+        if (data.showPairedPages) {
+            data.cols += data.cols % 2;  // make even
+        }
+    } else {
+        data.cols = std::max<size_t>(1UL, numCols);
+        if (data.showPairedPages) {
+            data.cols += data.cols % 2;  // make even
+        }
+        data.rows = std::max<size_t>(1UL, (data.actualPages + firstPageOffset + (data.cols - 1)) / data.cols);
+    }
+
+
+    if (data.orientation == LayoutSettings::Vertical) {
+        // Vertical Layout
+        if (data.showPairedPages) {
+            data.offset = firstPageOffset % static_cast<uint32_t>(2 * data.rows);
+        } else {
+            data.offset = firstPageOffset % static_cast<uint32_t>(data.rows);
+        }
+    } else {
+        // Horizontal Layout
+        data.offset = firstPageOffset % static_cast<uint32_t>(data.cols);
+    }
+}
+
+void LayoutMapper::configureFromSettings(size_t numPages, Settings* settings) {
+    LayoutSettings data;
+    // get from user settings:
+    data.actualPages = numPages;
+    data.showPairedPages = settings->isShowPairedPages();
+    auto const& pairsOffset = data.showPairedPages ? static_cast<uint32_t>(settings->getPairsOffset()) : 0U;
+
+    auto const& isPresentationMode = settings->isPresentationMode();
+    auto const& fixRows = !isPresentationMode && settings->isViewFixedRows();
+    auto const& numCols = size_t(isPresentationMode ? 1 : settings->getViewColumns());
+    auto const& numRows = size_t(isPresentationMode ? 1 : settings->getViewRows());
+
+    // assemble bitflags for LayoutType
+    data.orientation = (isPresentationMode || settings->getViewLayoutVert()) ? LayoutSettings::Vertical :
+                                                                               LayoutSettings::Horizontal;
+    data.horizontalDir = settings->getViewLayoutR2L() ? LayoutSettings::RightToLeft : LayoutSettings::LeftToRight;
+    data.verticalDir = settings->getViewLayoutB2T() ? LayoutSettings::BottomToTop : LayoutSettings::TopToBottom;
+
+    calculate(data, numRows, numCols, fixRows, pairsOffset);
+    if (data == data_) {
+        return;
+    }
+    data_ = data;
+    precalculateMappers();
+}
+
+void LayoutMapper::precalculateMappers() {
+    this->pageToRaster.clear();
+    this->rasterToPage.clear();
+    this->pageToRaster.resize(data_.actualPages);
+    this->rasterToPage.resize(data_.rows * data_.cols, size_t(-1));
+
+    for (size_t i = 0; i != data_.actualPages; ++i) {
+        auto&& val = map1(data_, i);
+        this->pageToRaster[i] = val;
+        this->rasterToPage[hash(data_, val)] = i;
+    }
+}
+
+auto LayoutMapper::getColumns() const -> size_t { return data_.cols; }
+
+auto LayoutMapper::getRows() const -> size_t { return data_.rows; }
+
+auto LayoutMapper::isPairedPages() const -> bool { return data_.showPairedPages; }
+
+auto LayoutMapper::at(size_t page) const -> GridPosition { return pageToRaster.at(page); }
+
+auto LayoutMapper::at(GridPosition const& rasterXY) const -> std::optional<size_t> {
+    auto index = hash(data_, rasterXY);
+    if (index >= rasterToPage.size()) {
+        return std::nullopt;
+    }
+    auto val = rasterToPage[index];
+    return val >= data_.actualPages ? std::nullopt : std::optional<size_t>(val);  // Maybe optimize this
+}
diff --git a/entry/src/main/cpp/src/core/gui/LayoutMapper.h b/entry/src/main/cpp/src/core/gui/LayoutMapper.h
new file mode 100644
index 0000000..dc3eb6a
--- /dev/null
+++ b/entry/src/main/cpp/src/core/gui/LayoutMapper.h
@@ -0,0 +1,114 @@
+/*
+ * Xournal++
+ *
+ * A layout manager - map where( row,column) to which page( document index)
+ *
+ * @author Xournal++ Team
+ * https://github.com/xournalpp/xournalpp
+ *
+ * @license GNU GPLv2 or later
+ */
+
+#pragma once
+
+#include <cstddef>   // for size_t
+#include <cstdint>   // for uint32_t
+#include <optional>  // for optional
+#include <tuple>     // for operator==, tie, tuple
+#include <vector>    // for vector
+
+class Settings;
+
+struct GridPosition {
+    size_t col{};
+    size_t row{};
+
+    constexpr friend bool operator==(GridPosition const& lhs, GridPosition const& rhs) noexcept {
+        return lhs.col == rhs.col && lhs.row == rhs.row;
+    }
+};
+
+struct LayoutSettings {
+    /// @brief The Layout of the pages
+    enum Orientation : bool {
+        Horizontal = false,
+        Vertical = true,
+    };
+
+    /// Horizontal read direction
+    enum HorizontalDirection : bool {
+        LeftToRight = false,
+        RightToLeft = true,
+    };
+
+    /// Vertical read direction
+    enum VerticalDirection : bool {
+        TopToBottom = false,
+        BottomToTop = true,
+    };
+
+    size_t cols = 0;
+    size_t rows = 0;
+    size_t actualPages = 0;
+    uint32_t offset = 0;
+
+    bool showPairedPages = false;
+    Orientation orientation = Vertical;
+    HorizontalDirection horizontalDir = LeftToRight;
+    VerticalDirection verticalDir = TopToBottom;
+
+    constexpr friend auto operator==(LayoutSettings const& lhs, LayoutSettings const& rhs) {
+        auto tier = [](auto&& other) {
+            return std::tie(other.cols, other.rows, other.actualPages, other.offset, other.showPairedPages,
+                            other.orientation, other.horizontalDir, other.verticalDir);
+        };
+        return tier(lhs) == tier(rhs);
+    }
+};
+auto layoutSettings(Settings const*) -> LayoutSettings;
+
+/**
+ * @brief Layout asks this mapper what page ( if any ) should be at a given column,row.
+ */
+class LayoutMapper {
+public:
+    LayoutMapper() = default;
+
+    /**
+     * configureFromSettings
+     * Obtain user settings to determine arguments to configure().
+     *
+     * @param  pages  The number of pages in the document
+     * @param  settings  The Settings from which users settings are obtained
+     */
+
+    void configureFromSettings(size_t numPages, Settings* settings);
+
+    auto at(size_t) const -> GridPosition;
+    auto at(GridPosition const&) const -> std::optional<size_t>;
+
+    size_t getColumns() const;
+    size_t getRows() const;
+
+    bool isPairedPages() const;
+
+private:
+    void precalculateMappers();
+
+    /**
+     * Map page location to document index
+     *
+     * @param  x Row we are interested in
+     * @param  y Column we are interested in
+     *
+     * @return Page index to put at coordinates
+     */
+
+public:
+    LayoutSettings data_;
+
+    friend void calculate(LayoutSettings& data, size_t numRows, size_t numCols, bool useRows, uint32_t firstPageOffset);
+
+    std::vector<GridPosition> pageToRaster;
+    std::vector<size_t> rasterToPage;  // access with x*y_max+y+
+};
diff --git a/entry/src/main/cpp/src/core/gui/LegacyRedrawable.cpp b/entry/src/main/cpp/src/core/gui/LegacyRedrawable.cpp
new file mode 100644
index 0000000..1fadfc6
--- /dev/null
+++ b/entry/src/main/cpp/src/core/gui/LegacyRedrawable.cpp
@@ -0,0 +1,18 @@
+#include "LegacyRedrawable.h"
+
+#include "model/Element.h"  // for Element
+#include "util/Range.h"     // for Range
+
+void LegacyRedrawable::repaintElement(Element* e) const {
+    repaintArea(e->getX(), e->getY(), e->getElementWidth() + e->getX(), e->getElementHeight() + e->getY());
+}
+
+void LegacyRedrawable::repaintRect(double x, double y, double width, double height) const {
+    repaintArea(x, y, x + width, y + height);
+}
+
+void LegacyRedrawable::rerenderRange(const Range& r) { rerenderRect(r.getX(), r.getY(), r.getWidth(), r.getHeight()); }
+
+void LegacyRedrawable::rerenderElement(const Element* e) {
+    rerenderRect(e->getX(), e->getY(), e->getElementWidth(), e->getElementHeight());
+}
diff --git a/entry/src/main/cpp/src/core/gui/LegacyRedrawable.h b/entry/src/main/cpp/src/core/gui/LegacyRedrawable.h
new file mode 100644
index 0000000..6fc56cb
--- /dev/null
+++ b/entry/src/main/cpp/src/core/gui/LegacyRedrawable.h
@@ -0,0 +1,87 @@
+/*
+ * Xournal++
+ *
+ * Interface for GUI handling
+ *
+ * @author Xournal++ Team
+ * https://github.com/xournalpp/xournalpp
+ *
+ * @license GNU GPLv2 or later
+ */
+
+#pragma once
+
+#include <gdk/gdk.h>  // for GdkRGBA
+
+class Element;
+class Range;
+
+/*
+ * The (base) class Redrawable (now LegacyRedrawable) is deprecated. Use xoj::view::Repaintable instead.
+ *
+ * Reasons for the deprecation:
+ *
+ *  * It is basically used synonymously to XojPageView.
+ *  * More importantly, the coexistence of Redrawable::repaint... and Redrawable::rerender... is bothersome.
+ *    it is not clear (without diving in the code) what the difference should be.
+ *    (repaint = ask gtk to call us back to blitt the buffer, rerender = change the buffer's content)
+ *    The rerender... methods should not exist. The derived class should be told what happened (something changed),
+ *    and decide by itself if the buffer should be updated or not (if there is a buffer to begin with).
+ */
+class [[deprecated]] LegacyRedrawable {
+protected:
+    LegacyRedrawable() = default;
+
+public:
+    LegacyRedrawable(LegacyRedrawable&&) = default;
+    LegacyRedrawable(LegacyRedrawable const&) = default;
+    virtual ~LegacyRedrawable() = default;
+    LegacyRedrawable& operator=(LegacyRedrawable&&) = default;
+    LegacyRedrawable& operator=(LegacyRedrawable const&) = default;
+
+    /**
+     * Call this if you only need to repaint the view, this means the buffer will be painted again,
+     * and all selections, text editors etc. are drawn again, but the view buffer is not refreshed.
+     *
+     * for refreshing the view buffer (if you have changed the document) call rerender.
+     */
+    virtual void repaintArea(double x1, double y1, double x2, double y2) const = 0;
+    [[maybe_unused]] void repaintRect(double x, double y, double width, double height) const;
+    [[maybe_unused]] void repaintElement(Element* e) const;
+
+    /**
+     * Call this if you only need to redraw the view, this means the buffer will be painted again,
+     * and all selections, text editors etc. are drawn again, but the view buffer is not refreshed.
+     *
+     * for refreshing the view buffer (if you have changed the document) call rerender.
+     */
+    virtual void repaintPage() const = 0;
+
+    /**
+     * Rerender our buffer, then redraw the widget
+     * @param sizeChanged whether or not this rerendering is caused by the size of the page changing
+     */
+    virtual void rerenderPage(bool sizeChanged = false) = 0;
+
+    /**
+     * Call this if you add an element, remove an element etc.
+     */
+    void rerenderElement(const Element* e);
+    void rerenderRange(const Range& r);
+
+    /**
+     * This updated the view buffer and then rerender the the region, call this if you changed the document
+     */
+    virtual void rerenderRect(double x, double y, double width, double height) = 0;
+
+    /**
+     * Return the GTK selection color
+     */
+    virtual GdkRGBA getSelectionColor() = 0;
+
+
+    virtual void deleteViewBuffer() = 0;
+
+    virtual int getX() const = 0;
+    virtual int getY() const = 0;
+};
diff --git a/entry/src/main/cpp/src/core/gui/MainWindow.cpp b/entry/src/main/cpp/src/core/gui/MainWindow.cpp
new file mode 100644
index 0000000..37181cf
--- /dev/null
+++ b/entry/src/main/cpp/src/core/gui/MainWindow.cpp
@@ -0,0 +1,742 @@
+#include "MainWindow.h"
+
+#include <regex>
+
+#include <gdk-pixbuf/gdk-pixbuf.h>  // for gdk_pixbuf_new_fr...
+#include <gdk/gdk.h>                // for gdk_screen_get_de...
+#include <gio/gio.h>                // for g_cancellable_is_...
+#include <gtk/gtkcssprovider.h>     // for gtk_css_provider_...
+
+#include "control/AudioController.h"                    // for AudioController
+#include "control/Control.h"                            // for Control
+#include "control/DeviceListHelper.h"                   // for getSourceMapping
+#include "control/ScrollHandler.h"                      // for ScrollHandler
+#include "control/actions/ActionDatabase.h"             // for ActionDatabase
+#include "control/jobs/XournalScheduler.h"              // for XournalScheduler
+#include "control/layer/LayerController.h"              // for LayerController
+#include "control/settings/Settings.h"                  // for Settings
+#include "control/settings/SettingsEnums.h"             // for SCROLLBAR_HIDE_HO...
+#include "control/zoom/ZoomControl.h"                   // for ZoomControl
+#include "gui/FloatingToolbox.h"                        // for FloatingToolbox
+#include "gui/GladeGui.h"                               // for GladeGui
+#include "gui/PdfFloatingToolbox.h"                     // for PdfFloatingToolbox
+#include "gui/SearchBar.h"                              // for SearchBar
+#include "gui/inputdevices/InputEvents.h"               // for INPUT_DEVICE_TOUC...
+#include "gui/menus/menubar/Menubar.h"                  // for Menubar
+#include "gui/menus/menubar/ToolbarSelectionSubmenu.h"  // for ToolbarSelectionSubmenu
+#include "gui/scroll/ScrollHandling.h"                  // for ScrollHandling
+#include "gui/sidebar/Sidebar.h"                        // for Sidebar
+#include "gui/toolbarMenubar/ToolMenuHandler.h"         // for ToolMenuHandler
+#include "gui/toolbarMenubar/model/ToolbarData.h"       // for ToolbarData
+#include "gui/toolbarMenubar/model/ToolbarModel.h"      // for ToolbarModel
+#include "gui/widgets/SpinPageAdapter.h"                // for SpinPageAdapter
+#include "gui/widgets/XournalWidget.h"                  // for gtk_xournal_get_l...
+#include "util/GListView.h"                             // for GListView, GListV...
+#include "util/GtkUtil.h"                               // for getWidgetDPI
+#include "util/PathUtil.h"                              // for getConfigFile
+#include "util/StringUtils.h"                           // for char_cast
+#include "util/Util.h"                                  // for execInUiThread, npos
+#include "util/XojMsgBox.h"                             // for XojMsgBox
+#include "util/glib_casts.h"                            // for wrap_for_once_v
+#include "util/gtk4_helper.h"                           // for gtk_widget_get_width
+#include "util/i18n.h"                                  // for FS, _F
+#include "util/raii/CStringWrapper.h"                   // for OwnedCString
+
+#include "GladeSearchpath.h"     // for GladeSearchpath
+#include "ToolbarDefinitions.h"  // for TOOLBAR_DEFINITIO...
+#include "XournalView.h"         // for XournalView
+#include "config-dev.h"          // for TOOLBAR_CONFIG
+#include "filesystem.h"          // for path, exists
+
+#ifdef __APPLE__
+// the following header file contains a definition of struct Point that conflicts with model/Point.h
+#define Point Point_CF
+#include <CoreFoundation/CoreFoundation.h>
+#undef Point
+#endif
+
+using std::string;
+
+
+static void themeCallback(GObject*, GParamSpec*, gpointer data) { static_cast<MainWindow*>(data)->updateColorscheme(); }
+
+MainWindow::MainWindow(GladeSearchpath* gladeSearchPath, Control* control, GtkApplication* parent):
+        GladeGui(gladeSearchPath, "main.glade", "mainWindow"),
+        control(control),
+        toolbar(std::make_unique<ToolMenuHandler>(control, this)),
+        menubar(std::make_unique<Menubar>()) {
+    gtk_window_set_application(GTK_WINDOW(getWindow()), parent);
+
+    panedContainerWidget.reset(get("panelMainContents"), xoj::util::ref);
+    boxContainerWidget.reset(get("mainContentContainer"), xoj::util::ref);
+    mainContentWidget.reset(get("boxContents"), xoj::util::ref);
+    sidebarWidget.reset(get("sidebar"), xoj::util::ref);
+
+    loadMainCSS(gladeSearchPath, "xournalpp.css");
+
+    GtkOverlay* overlay = GTK_OVERLAY(get("mainOverlay"));
+    this->pdfFloatingToolBox = std::make_unique<PdfFloatingToolbox>(this, overlay);
+    this->floatingToolbox = std::make_unique<FloatingToolbox>(this, overlay);
+
+    for (size_t i = 0; i < TOOLBAR_DEFINITIONS_LEN; i++) {
+        this->toolbarWidgets[i].reset(get(TOOLBAR_DEFINITIONS[i].guiName), xoj::util::ref);
+    }
+
+    initXournalWidget();
+
+    setSidebarVisible(control->getSettings()->isSidebarVisible());
+
+    // Window handler
+    g_signal_connect(this->window, "delete-event", xoj::util::wrap_for_g_callback_v<deleteEventCallback>,
+                     this->control);
+#if GTK_MAJOR_VERSION == 3
+    g_signal_connect(this->window, "notify::is-maximized", xoj::util::wrap_for_g_callback_v<windowMaximizedCallback>,
+                     this);
+#else
+    g_signal_connect(this->window, "notify::maximized", xoj::util::wrap_for_g_callback_v<windowMaximizedCallback>,
+                     this);
+#endif
+
+    // "watch over" all key events
+    auto keyPropagate = +[](GtkWidget* w, GdkEvent* e, gpointer) {
+        return gtk_window_propagate_key_event(GTK_WINDOW(w), (GdkEventKey*)(e));
+    };
+    g_signal_connect(this->window, "key-press-event", G_CALLBACK(keyPropagate), nullptr);
+    g_signal_connect(this->window, "key-release-event", G_CALLBACK(keyPropagate), nullptr);
+
+    updateScrollbarSidebarPosition();
+
+    gtk_window_set_default_size(GTK_WINDOW(this->window), control->getSettings()->getMainWndWidth(),
+                                control->getSettings()->getMainWndHeight());
+
+    if (control->getSettings()->isMainWndMaximized()) {
+        gtk_window_maximize(GTK_WINDOW(this->window));
+    } else {
+        gtk_window_unmaximize(GTK_WINDOW(this->window));
+    }
+
+    Util::execInUiThread([=]() {
+        // Execute after the window is visible, else the check won't work
+        control->setShowMenubar(control->getSettings()->isMenubarVisible());
+    });
+
+    // Drag and Drop
+    g_signal_connect(this->window, "drag-data-received", G_CALLBACK(dragDataRecived), this);
+
+    gtk_drag_dest_set(this->window, GTK_DEST_DEFAULT_ALL, nullptr, 0, GDK_ACTION_COPY);
+    gtk_drag_dest_add_uri_targets(this->window);
+    gtk_drag_dest_add_image_targets(this->window);
+    gtk_drag_dest_add_text_targets(this->window);
+
+    g_signal_connect(gtk_widget_get_settings(this->window), "notify::gtk-theme-name", G_CALLBACK(themeCallback), this);
+    g_signal_connect(gtk_widget_get_settings(this->window), "notify::gtk-application-prefer-dark-theme",
+                     G_CALLBACK(themeCallback), this);
+
+    updateColorscheme();
+}
+
+void MainWindow::populate(GladeSearchpath* gladeSearchPath) {
+
+    toolbar->populate(gladeSearchPath);
+    menubar->populate(gladeSearchPath, this);
+
+    // need to create tool buttons registered in plugins, so they can be added to toolbars
+    control->registerPluginToolButtons(this->toolbar.get());
+
+    createToolbar();
+
+    setToolbarVisible(control->getSettings()->isToolbarVisible());
+}
+
+GMenuModel* MainWindow::getMenuModel() const { return menubar->getModel(); }
+
+MainWindow::~MainWindow() = default;
+
+struct ThemeProperties {
+    bool dark;
+    bool darkSuffix;
+    std::string rootname;  ///< Name without any putative -dark suffix
+};
+static ThemeProperties getThemeProperties(GtkWidget* w) {
+    xoj::util::OwnedCString name;
+    [[maybe_unused]] bool useEnv = false;
+    // Gtk prioritizes GTK_THEME over GtkSettings content
+    // cf https://gitlab.gnome.org/GNOME/gtk/blob/90d84a2af8b367bd5a5312b3fa3b67563462c0ef/gtk/gtksettings.c#L1567-L1622
+    if (auto* p = g_getenv("GTK_THEME")) {
+        *(name.contentReplacer()) = g_strdup(p);
+        useEnv = true;
+    } else {
+        g_object_get(gtk_widget_get_settings(w), "gtk-theme-name", name.contentReplacer(), nullptr);
+    }
+
+    // Try to figure out if the theme is dark or light
+    // Some themes handle their dark variant via "gtk-application-prefer-dark-theme" while other just append "-dark"
+    const std::regex nameparser("([a-zA-Z-]+?)([:-][dD]ark)?");
+    std::cmatch sm;
+    std::regex_match(name.get(), sm, nameparser);
+
+    ThemeProperties props;
+    if (sm.size() < 3) {
+        g_warning("Fails to extract theme root name from: \"%s\"", name.get());
+        props.rootname = name.get();
+        props.darkSuffix = false;
+    } else {
+        props.rootname = sm[1];
+        props.darkSuffix = sm[2].length() > 0;
+    }
+    gboolean dark = false;
+
+#ifdef __APPLE__
+    if (!useEnv) {
+        CFStringRef interfaceStyle =
+                (CFStringRef)CFPreferencesCopyAppValue(CFSTR("AppleInterfaceStyle"), kCFPreferencesCurrentApplication);
+        if (interfaceStyle) {
+            char buffer[128];
+            if (CFStringGetCString(interfaceStyle, buffer, sizeof(buffer), kCFStringEncodingUTF8)) {
+                std::string style = buffer;
+                if (auto pos = style.find("Dark"); pos != std::string::npos) {
+                    dark = true;
+                }
+            }
+        }
+    }
+#else
+    g_object_get(gtk_widget_get_settings(w), "gtk-application-prefer-dark-theme", &dark, nullptr);
+#endif
+
+    g_debug("Extracted theme info: Name = %s, rootname = %s, dark = %s", name.get(), props.rootname.c_str(),
+            dark ? "true" : "false");
+
+    props.dark = props.darkSuffix || dark;  // Some themes handle their dark variant via this setting
+
+    return props;
+}
+
+void MainWindow::updateColorscheme() {
+    g_signal_handlers_block_by_func(gtk_widget_get_settings(this->window),
+                                    reinterpret_cast<gpointer>(G_CALLBACK(themeCallback)), this);
+    auto variant = control->getSettings()->getThemeVariant();
+    if (variant == THEME_VARIANT_USE_SYSTEM) {
+        gtk_settings_reset_property(gtk_widget_get_settings(this->window), "gtk-application-prefer-dark-theme");
+        if (modifiedGtkSettingsTheme) {
+            // Some bug in Gtk makes an infinite loop despite us blocking the signals
+            gtk_settings_reset_property(gtk_widget_get_settings(this->window), "gtk-theme-name");
+            modifiedGtkSettingsTheme = false;
+        }
+    }
+    auto props = getThemeProperties(this->window);
+
+    this->darkMode = (props.dark && variant != THEME_VARIANT_FORCE_LIGHT) || variant == THEME_VARIANT_FORCE_DARK;
+
+    // Set up icons
+    {
+        const auto uiPath = this->getGladeSearchPath()->getFirstSearchPath();
+        const auto lightColorIcons = (uiPath / "iconsColor-light");
+        const auto darkColorIcons = (uiPath / "iconsColor-dark");
+        const auto lightLucideIcons = (uiPath / "iconsLucide-light");
+        const auto darkLucideIcons = (uiPath / "iconsLucide-dark");
+
+        // icon load order from lowest priority to highest priority
+        std::vector<fs::path> iconLoadOrder = {};
+        const auto chosenTheme = control->getSettings()->getIconTheme();
+        switch (chosenTheme) {
+            case ICON_THEME_COLOR:
+                iconLoadOrder = {darkLucideIcons, lightLucideIcons, darkColorIcons, lightColorIcons};
+                break;
+            case ICON_THEME_LUCIDE:
+                iconLoadOrder = {darkColorIcons, lightColorIcons, darkLucideIcons, lightLucideIcons};
+                break;
+            default:
+                g_message("Unknown icon theme!");
+        }
+
+        if (this->darkMode) {
+            for (size_t i = 0; 2 * i + 1 < iconLoadOrder.size(); ++i) {
+                std::swap(iconLoadOrder[2 * i], iconLoadOrder[2 * i + 1]);
+            }
+        }
+
+        for (auto& p: iconLoadOrder) {
+            gtk_icon_theme_prepend_search_path(gtk_icon_theme_get_default(), char_cast(p.u8string().c_str()));
+        }
+    }
+
+    GtkStyleContext* context = gtk_widget_get_style_context(GTK_WIDGET(this->window));
+
+    if (this->darkMode) {
+        gtk_style_context_add_class(context, "darkMode");
+        g_object_set(gtk_widget_get_settings(this->window), "gtk-application-prefer-dark-theme", true, nullptr);
+    } else {
+        gtk_style_context_remove_class(context, "darkMode");
+        g_object_set(gtk_widget_get_settings(this->window), "gtk-application-prefer-dark-theme", false, nullptr);
+        if (props.darkSuffix) {  // The active theme is all dark. Remove the trailing "-dark"
+            g_object_set(gtk_widget_get_settings(this->window), "gtk-theme-name", props.rootname.c_str(), nullptr);
+            modifiedGtkSettingsTheme = true;
+        }
+    }
+
+    {
+        gchar* name = nullptr;
+        g_object_get(gtk_widget_get_settings(this->window), "gtk-theme-name", &name, nullptr);
+        g_debug("Theme name: %s", name);
+        g_debug("Modified in GtkSettings: %s", modifiedGtkSettingsTheme ? "true" : "false");
+        g_free(name);
+        gboolean gtkdark = true;
+        g_object_get(gtk_widget_get_settings(this->window), "gtk-application-prefer-dark-theme", &gtkdark, nullptr);
+        g_debug("Theme variant: %s", gtkdark ? "dark" : "light");
+        g_debug("Icon theme: %s", iconThemeToString(control->getSettings()->getIconTheme()));
+    }
+    g_signal_handlers_unblock_by_func(gtk_widget_get_settings(this->window), reinterpret_cast<gpointer>(themeCallback),
+                                      this);
+}
+
+void MainWindow::initXournalWidget() {
+    winXournal = gtk_scrolled_window_new();
+
+    setGtkTouchscreenScrollingForDeviceMapping();
+
+    gtk_box_append(GTK_BOX(get("boxContents")), winXournal);
+
+    GtkWidget* vpXournal = gtk_viewport_new(nullptr, nullptr);
+
+    gtk_scrolled_window_set_child(GTK_SCROLLED_WINDOW(winXournal), vpXournal);
+
+    scrollHandling = std::make_unique<ScrollHandling>(GTK_SCROLLED_WINDOW(winXournal));
+
+    this->xournal = std::make_unique<XournalView>(vpXournal, control, scrollHandling.get());
+
+    control->getZoomControl()->initZoomHandler(this->window, winXournal, xournal.get(), control);
+    gtk_widget_show_all(winXournal);
+
+    scrollHandling->init(this->xournal->getWidget(), this->xournal->getLayout());
+}
+
+void MainWindow::setGtkTouchscreenScrollingForDeviceMapping() {
+    InputDeviceClass touchscreenClass =
+            DeviceListHelper::getSourceMapping(GDK_SOURCE_TOUCHSCREEN, this->getControl()->getSettings());
+
+    setGtkTouchscreenScrollingEnabled(touchscreenClass == INPUT_DEVICE_TOUCHSCREEN &&
+                                      !control->getSettings()->getTouchDrawingEnabled());
+}
+
+void MainWindow::setGtkTouchscreenScrollingEnabled(bool enabled) {
+    if (!control->getSettings()->getGtkTouchInertialScrollingEnabled()) {
+        enabled = false;
+    }
+    gtk_scrolled_window_set_kinetic_scrolling(GTK_SCROLLED_WINDOW(winXournal), enabled);
+}
+
+auto MainWindow::getLayout() const -> Layout* { return this->xournal->getLayout(); }
+
+auto MainWindow::getNegativeXournalWidgetPos() const -> xoj::util::Point<double> {
+    return Util::toWidgetCoords(this->winXournal, xoj::util::Point{0.0, 0.0});
+}
+
+auto cancellable_cancel(GCancellable* cancel) -> bool {
+    g_cancellable_cancel(cancel);
+
+    g_warning("Timeout... Cancel loading URL");
+
+    return false;
+}
+
+void MainWindow::dragDataRecived(GtkWidget* widget, GdkDragContext* dragContext, gint x, gint y, GtkSelectionData* data,
+                                 guint info, guint time, MainWindow* win) {
+    GtkWidget* source = gtk_drag_get_source_widget(dragContext);
+    if (source && widget == gtk_widget_get_toplevel(source)) {
+        gtk_drag_finish(dragContext, false, false, time);
+        return;
+    }
+
+    guchar* text = gtk_selection_data_get_text(data);
+    if (text) {
+        win->control->clipboardPasteText(reinterpret_cast<const char*>(text));
+
+        g_free(text);
+        gtk_drag_finish(dragContext, true, false, time);
+        return;
+    }
+
+    xoj::util::GObjectSPtr<GdkPixbuf> image(gtk_selection_data_get_pixbuf(data), xoj::util::adopt);
+    if (image) {
+        win->control->clipboardPasteImage(image.get());
+
+        gtk_drag_finish(dragContext, true, false, time);
+        return;
+    }
+
+    gchar** uris = gtk_selection_data_get_uris(data);
+    if (uris) {
+        for (int i = 0; uris[i] != nullptr && i < 3; i++) {
+            const char* uri = uris[i];
+
+            GCancellable* cancel = g_cancellable_new();
+            auto cancelTimeout = g_timeout_add(3000, xoj::util::wrap_for_once_v<cancellable_cancel>, cancel);
+
+            xoj::util::GObjectSPtr<GFile> file(g_file_new_for_uri(uri), xoj::util::adopt);
+            GError* err = nullptr;
+            GFileInputStream* in = g_file_read(file.get(), cancel, &err);
+            if (g_cancellable_is_cancelled(cancel)) {
+                continue;
+            }
+
+            if (err == nullptr) {
+                xoj::util::GObjectSPtr<GdkPixbuf> pixbuf(
+                        gdk_pixbuf_new_from_stream(G_INPUT_STREAM(in), cancel, nullptr), xoj::util::adopt);
+                if (g_cancellable_is_cancelled(cancel)) {
+                    continue;
+                }
+                g_input_stream_close(G_INPUT_STREAM(in), cancel, nullptr);
+                if (g_cancellable_is_cancelled(cancel)) {
+                    continue;
+                }
+
+                if (pixbuf) {
+                    win->control->clipboardPasteImage(pixbuf.get());
+                }
+            } else {
+                g_error_free(err);
+            }
+
+            if (!g_cancellable_is_cancelled(cancel)) {
+                g_source_remove(cancelTimeout);
+            }
+            g_object_unref(cancel);
+        }
+
+        gtk_drag_finish(dragContext, true, false, time);
+
+        g_strfreev(uris);
+    }
+
+    gtk_drag_finish(dragContext, false, false, time);
+}
+
+auto MainWindow::getControl() const -> Control* { return control; }
+
+void MainWindow::updateScrollbarSidebarPosition() {
+    // Part 1: update scrollbar position
+    if (winXournal != nullptr) {
+        GtkScrolledWindow* scrolledWindow = GTK_SCROLLED_WINDOW(winXournal);
+
+        ScrollbarHideType type = this->getControl()->getSettings()->getScrollbarHideType();
+
+        bool scrollbarOnLeft = control->getSettings()->isScrollbarOnLeft();
+        if (scrollbarOnLeft) {
+            gtk_scrolled_window_set_placement(scrolledWindow, GTK_CORNER_TOP_RIGHT);
+        } else {
+            gtk_scrolled_window_set_placement(scrolledWindow, GTK_CORNER_TOP_LEFT);
+        }
+
+        gtk_widget_set_visible(gtk_scrolled_window_get_hscrollbar(scrolledWindow), !(type & SCROLLBAR_HIDE_HORIZONTAL));
+        gtk_widget_set_visible(gtk_scrolled_window_get_vscrollbar(scrolledWindow), !(type & SCROLLBAR_HIDE_VERTICAL));
+
+        gtk_scrolled_window_set_overlay_scrolling(scrolledWindow,
+                                                  !control->getSettings()->isScrollbarFadeoutDisabled());
+    }
+
+    // Part 2: update sidebar position
+    GtkPaned* paned = GTK_PANED(this->panedContainerWidget.get());
+
+    // Allocation is reset when we switch up the contained elements. Fetch the
+    // width here in case we need it afterwards.
+    int contentWidth = gtk_widget_get_width(this->boxContainerWidget.get());
+
+    bool sidebarRight = control->getSettings()->isSidebarOnRight();
+    if (sidebarRight != (gtk_paned_get_child2(paned) == this->sidebarWidget.get())) {
+        // switch sidebar and main content
+        GtkWidget* sidebar = this->sidebarWidget.get();
+        GtkWidget* mainContent = this->sidebarVisible ? this->mainContentWidget.get() : nullptr;
+#if GTK_MAJOR_VERSION == 3
+        if (this->sidebarVisible) {
+            gtk_container_remove(GTK_CONTAINER(paned), sidebar);
+            gtk_container_remove(GTK_CONTAINER(paned), mainContent);
+
+            if (sidebarRight) {
+                gtk_paned_pack1(paned, mainContent, true, false);
+                gtk_paned_pack2(paned, sidebar, false, false);
+            } else {
+                gtk_paned_pack1(paned, sidebar, false, false);
+                gtk_paned_pack2(paned, mainContent, true, false);
+            }
+        } else {
+            // The sidebar is hidden. That means the paned widget only contains the
+            // sidebar while the main contents are shown alone in the box container.
+            gtk_container_remove(GTK_CONTAINER(paned), sidebar);
+
+            if (sidebarRight) {
+                gtk_paned_pack2(paned, sidebar, false, false);
+            } else {
+                gtk_paned_pack1(paned, sidebar, false, false);
+            }
+        }
+#else
+        gtk_paned_set_start_child(paned, nullptr);
+        gtk_paned_set_end_child(paned, nullptr);
+        if (sidebarRight) {
+            gtk_paned_set_start_child(paned, mainContent);
+            gtk_paned_set_resize_start_child(paned, true);
+            gtk_paned_set_shrink_start_child(paned, false);
+            gtk_paned_set_end_child(paned, sidebar);
+            gtk_paned_set_resize_end_child(paned, false);
+            gtk_paned_set_shrink_end_child(paned, false);
+        } else {
+            gtk_paned_set_end_child(paned, mainContent);
+            gtk_paned_set_resize_end_child(paned, true);
+            gtk_paned_set_shrink_end_child(paned, false);
+            gtk_paned_set_start_child(paned, sidebar);
+            gtk_paned_set_resize_start_child(paned, false);
+            gtk_paned_set_shrink_start_child(paned, false);
+        }
+#endif
+    }
+
+    if (this->sidebarVisible) {
+        updatePanedPosition(contentWidth);
+    }
+}
+
+auto MainWindow::deleteEventCallback(GtkWidget* widget, GdkEvent* event, Control* control) -> bool {
+    control->quit();
+
+    return true;
+}
+
+void MainWindow::setSidebarVisible(bool visible) {
+    if (!visible && (this->control->getSidebar() != nullptr)) {
+        this->control->getSidebar()->saveSize();
+    }
+
+    if (visible != this->sidebarVisible) {
+        // Due to a GTK bug, we can't just hide the sidebar widget in the GtkPaned.
+        // If we do this, we create a dead region where the pane separator was previously.
+        // In this region, we can't use the touchscreen to start horizontal strokes.
+        // As such:
+        if (!visible) {
+            // hide sidebar
+#if GTK_MAJOR_VERSION == 3
+            gtk_container_remove(GTK_CONTAINER(panedContainerWidget.get()), mainContentWidget.get());
+#else
+            if (control->getSettings()->isSidebarOnRight()) {
+                gtk_paned_set_start_child(GTK_PANED(panedContainerWidget.get()), nullptr);
+            } else {
+                gtk_paned_set_end_child(GTK_PANED(panedContainerWidget.get()), nullptr);
+            }
+#endif
+            gtk_box_remove(GTK_BOX(boxContainerWidget.get()), panedContainerWidget.get());
+            gtk_box_append(GTK_BOX(boxContainerWidget.get()), mainContentWidget.get());
+            this->sidebarVisible = false;
+        } else {
+            // show sidebar
+
+            // Allocation is reset when we switch up the contained elements. Fetch the
+            // width here in case we need it afterwards.
+            int contentWidth = gtk_widget_get_width(boxContainerWidget.get());
+
+            gtk_box_remove(GTK_BOX(boxContainerWidget.get()), mainContentWidget.get());
+
+#if GTK_MAJOR_VERSION == 3
+            if (control->getSettings()->isSidebarOnRight()) {
+                gtk_paned_pack1(GTK_PANED(panedContainerWidget.get()), mainContentWidget.get(), true, false);
+            } else {
+                gtk_paned_pack2(GTK_PANED(panedContainerWidget.get()), mainContentWidget.get(), true, false);
+            }
+#else
+            if (control->getSettings()->isSidebarOnRight()) {
+                gtk_paned_set_start_child(GTK_PANED(panedContainerWidget.get()), mainContentWidget.get());
+            } else {
+                gtk_paned_set_end_child(GTK_PANED(panedContainerWidget.get()), mainContentWidget.get());
+            }
+#endif
+
+            gtk_box_append(GTK_BOX(boxContainerWidget.get()), panedContainerWidget.get());
+            this->sidebarVisible = true;
+
+            updatePanedPosition(contentWidth);
+        }
+    }
+
+    gtk_widget_set_visible(sidebarWidget.get(), visible);
+}
+
+/**
+ * Invert the position of the paned widget and disconnect from the signal.
+ * @param handlerId should be the ID of the signal handler that should be disconnected.
+ */
+static void invertPanedPosition(GtkWidget* widget, GtkAllocation* allocation, gulong* handlerId) {
+    int newDividerPos = allocation->width - gtk_paned_get_position(GTK_PANED(widget));
+    gtk_paned_set_position(GTK_PANED(widget), newDividerPos);
+
+    // We only need to switch the position once, so disconnect the signal right away.
+    g_signal_handler_disconnect(widget, *handlerId);
+}
+
+void MainWindow::updatePanedPosition(int contentWidth) {
+    if (!this->control->getSettings()->isSidebarOnRight()) {
+        // Sidebar is on the left side.
+        gtk_paned_set_position(GTK_PANED(this->panedContainerWidget.get()),
+                               this->control->getSettings()->getSidebarWidth());
+    } else {
+        // Sidebar is on the right side.
+        if (contentWidth > 0) {
+            int dividerPos = contentWidth - this->control->getSettings()->getSidebarWidth();
+            gtk_paned_set_position(GTK_PANED(this->panedContainerWidget.get()), dividerPos);
+        } else {
+            // Allocation is unkown (window hasn't been shown yet). We have to wait for the signal.
+            // Set position as if the sidebar was on the left side, and let the signal handler
+            // simply invert the position when the allocation is known.
+            gtk_paned_set_position(GTK_PANED(this->panedContainerWidget.get()),
+                                   this->control->getSettings()->getSidebarWidth());
+            gulong* signal_id = new gulong{};
+            *signal_id = g_signal_connect_data(
+                    this->panedContainerWidget.get(), "size-allocate",
+                    xoj::util::wrap_for_g_callback_v<invertPanedPosition>, signal_id,
+                    [](gpointer d, GClosure*) { delete reinterpret_cast<gulong*>(d); }, GConnectFlags(0));
+        }
+    }
+}
+
+void MainWindow::setToolbarVisible(bool visible) {
+    Settings* settings = control->getSettings();
+
+    settings->setToolbarVisible(visible);
+    for (auto& w: this->toolbarWidgets) {
+        if (!visible || (gtk_toolbar_get_n_items(GTK_TOOLBAR(w.get())) != 0)) {
+            gtk_widget_set_visible(w.get(), visible);
+        }
+    }
+}
+
+void MainWindow::setMenubarVisible(bool visible) {
+    gtk_application_window_set_show_menubar(GTK_APPLICATION_WINDOW(this->getWindow()), visible);
+}
+
+void MainWindow::setMaximized(bool maximized) { this->maximized = maximized; }
+
+auto MainWindow::isMaximized() const -> bool { return this->maximized; }
+
+auto MainWindow::setFullscreen(bool enabled) const -> void {
+    if (enabled) {
+        gtk_window_fullscreen(GTK_WINDOW(this->getWindow()));
+    } else {
+        gtk_window_unfullscreen(GTK_WINDOW(this->getWindow()));
+    }
+}
+
+auto MainWindow::isDarkTheme() const -> bool { return this->darkMode; }
+
+auto MainWindow::getXournal() const -> XournalView* { return xournal.get(); }
+
+auto MainWindow::windowMaximizedCallback(GObject* window, GParamSpec*, MainWindow* win) -> void {
+    win->setMaximized(gtk_window_is_maximized(GTK_WINDOW(window)));
+}
+
+void MainWindow::toolbarSelected(const std::string& id) {
+    const auto& toolbars = toolbar->getModel()->getToolbars();
+    auto it = std::find_if(toolbars.begin(), toolbars.end(), [&](const auto& d) { return d->getId() == id; });
+    toolbarSelected(it == toolbars.end() ? nullptr : it->get());
+}
+
+void MainWindow::toolbarSelected(ToolbarData* d) {
+    if (!d || this->selectedToolbar == d) {
+        return;
+    }
+
+    Settings* settings = control->getSettings();
+    settings->setSelectedToolbar(d->getId());
+
+    this->clearToolbar();
+    this->loadToolbar(d);
+}
+
+auto MainWindow::clearToolbar() -> const ToolbarData* {
+    if (this->selectedToolbar != nullptr) {
+        for (size_t i = 0; i < TOOLBAR_DEFINITIONS_LEN; i++) {
+            ToolMenuHandler::unloadToolbar(this->toolbarWidgets[i].get());
+        }
+
+        this->toolbar->freeDynamicToolbarItems();
+    }
+    return std::exchange(this->selectedToolbar, nullptr);
+}
+
+void MainWindow::loadToolbar(ToolbarData* d) {
+    this->selectedToolbar = d;
+
+    for (size_t i = 0; i < TOOLBAR_DEFINITIONS_LEN; i++) {
+        this->toolbar->load(d, this->toolbarWidgets[i].get(), TOOLBAR_DEFINITIONS[i].propName,
+                            TOOLBAR_DEFINITIONS[i].horizontal);
+    }
+
+    this->floatingToolbox->flagRecalculateSizeRequired();
+}
+
+void MainWindow::reloadToolbars() {
+    ToolbarData* d = getSelectedToolbar();
+    this->clearToolbar();
+    this->toolbarSelected(d);
+}
+
+auto MainWindow::getSelectedToolbar() const -> ToolbarData* { return this->selectedToolbar; }
+
+auto MainWindow::getToolbarWidgets() const -> const ToolbarWidgetArray& { return toolbarWidgets; }
+
+auto MainWindow::getToolbarName(GtkToolbar* toolbar) const -> const char* {
+    for (size_t i = 0; i < TOOLBAR_DEFINITIONS_LEN; i++) {
+        if (static_cast<void*>(this->toolbarWidgets[i].get()) == static_cast<void*>(toolbar)) {
+            return TOOLBAR_DEFINITIONS[i].propName;
+        }
+    }
+
+    return "";
+}
+
+void MainWindow::setDynamicallyGeneratedSubmenuDisabled(bool disabled) { menubar->setDisabled(disabled); }
+
+void MainWindow::updateToolbarMenu() {
+    menubar->getToolbarSelectionSubmenu().update(toolbar.get(), this->selectedToolbar);
+}
+
+void MainWindow::createToolbar() {
+    toolbarSelected(control->getSettings()->getSelectedToolbar());
+
+    this->control->getScheduler()->unblockRerenderZoom();
+}
+
+void MainWindow::updatePageNumbers(size_t page, size_t pagecount, size_t pdfpage) {
+    toolbar->setPageInfo(page, pagecount, pdfpage);
+}
+
+auto MainWindow::getMenubar() const -> Menubar* { return menubar.get(); }
+
+void MainWindow::show(GtkWindow* parent) { gtk_widget_show(this->window); }
+
+void MainWindow::setUndoDescription(const string& description) { menubar->setUndoDescription(description); }
+
+void MainWindow::setRedoDescription(const string& description) { menubar->setRedoDescription(description); }
+
+auto MainWindow::getToolbarModel() const -> ToolbarModel* { return this->toolbar->getModel(); }
+
+auto MainWindow::getToolMenuHandler() const -> ToolMenuHandler* { return this->toolbar.get(); }
+
+void MainWindow::loadMainCSS(GladeSearchpath* gladeSearchPath, const gchar* cssFilename) {
+    auto filepath = gladeSearchPath->findFile("", cssFilename);
+    xoj::util::GObjectSPtr<GtkCssProvider> provider(gtk_css_provider_new(), xoj::util::adopt);
+    gtk_css_provider_load_from_path(provider.get(), char_cast(filepath.u8string().c_str()), nullptr);
+    gtk_style_context_add_provider_for_screen(gdk_screen_get_default(), GTK_STYLE_PROVIDER(provider.get()),
+                                              GTK_STYLE_PROVIDER_PRIORITY_APPLICATION);
+}
+
+PdfFloatingToolbox* MainWindow::getPdfToolbox() const { return this->pdfFloatingToolBox.get(); }
+
+FloatingToolbox* MainWindow::getFloatingToolbox() const { return this->floatingToolbox.get(); }
+
+void MainWindow::setDPI() const {
+    if (auto dpi = this->getControl()->getSettings()->getDisplayDpi(); dpi == -1) {
+        auto res = xoj::util::gtk::getWidgetDPI(this->window);
+        this->getControl()->getZoomControl()->setZoom100Value(res.value_or(Util::DPI_NORMALIZATION_FACTOR) /
+                                                              Util::DPI_NORMALIZATION_FACTOR);
+    } else {
+        this->getControl()->getZoomControl()->setZoom100Value(dpi / Util::DPI_NORMALIZATION_FACTOR);
+    }
+}
diff --git a/entry/src/main/cpp/src/core/gui/MainWindow.h b/entry/src/main/cpp/src/core/gui/MainWindow.h
new file mode 100644
index 0000000..6e5df4e
--- /dev/null
+++ b/entry/src/main/cpp/src/core/gui/MainWindow.h
@@ -0,0 +1,196 @@
+/*
+ * Xournal++
+ *
+ * The Main window
+ *
+ * @author Xournal++ Team
+ * https://github.com/xournalpp/xournalpp
+ *
+ * @license GNU GPLv2 or later
+ */
+
+#pragma once
+
+#include <array>    // for array
+#include <atomic>   // for atomic_bool
+#include <cstddef>  // for size_t
+#include <memory>   // for unique_ptr
+#include <string>   // for string
+
+#include <gdk/gdk.h>      // for GdkDragContext, GdkEvent
+#include <glib-object.h>  // for GClosure
+#include <glib.h>         // for gpointer, gboolean, gint
+#include <gtk/gtk.h>      // for GtkWidget, GtkCheckMenu...
+
+#include "util/Point.h"
+#include "util/raii/GObjectSPtr.h"
+
+#include "GladeGui.h"            // for GladeGui
+#include "ToolbarDefinitions.h"  // for TOOLBAR_DEFINITIONS_LEN
+
+class Control;
+class Layout;
+class SpinPageAdapter;
+class ScrollHandling;
+class ToolMenuHandler;
+class ToolbarData;
+class ToolbarModel;
+class XournalView;
+class PdfFloatingToolbox;
+class FloatingToolbox;
+class GladeSearchpath;
+
+class Menubar;
+
+typedef std::array<xoj::util::WidgetSPtr, TOOLBAR_DEFINITIONS_LEN> ToolbarWidgetArray;
+
+class MainWindow: public GladeGui {
+public:
+    MainWindow(GladeSearchpath* gladeSearchPath, Control* control, GtkApplication* parent);
+    ~MainWindow() override;
+
+    void populate(GladeSearchpath* gladeSearchPath);
+
+public:
+    GMenuModel* getMenuModel() const;
+
+    void show(GtkWindow* parent) override;
+
+    void toolbarSelected(const std::string& id);
+    void toolbarSelected(ToolbarData* d);
+    ToolbarData* getSelectedToolbar() const;
+
+private:
+    const ToolbarData* clearToolbar();
+    void loadToolbar(ToolbarData* d);
+
+public:
+    /**
+     * reloadToolbars reloads the currently selected toolbar
+     *
+     * This is especially useful when a change in the SettingsDialog should be reflected right away
+     */
+    void reloadToolbars();
+
+    void updatePageNumbers(size_t page, size_t pagecount, size_t pdfpage);
+
+    void setMaximized(bool maximized);
+    bool isMaximized() const;
+
+    void setFullscreen(bool enabled) const;
+
+    bool isDarkTheme() const;
+
+    XournalView* getXournal() const;
+
+    void setMenubarVisible(bool visible);
+    void setSidebarVisible(bool visible);
+    void setToolbarVisible(bool visible);
+
+    Control* getControl() const;
+
+    PdfFloatingToolbox* getPdfToolbox() const;
+    FloatingToolbox* getFloatingToolbox() const;
+
+    void updateScrollbarSidebarPosition();
+
+    void setUndoDescription(const std::string& description);
+    void setRedoDescription(const std::string& description);
+
+    ToolbarModel* getToolbarModel() const;
+    ToolMenuHandler* getToolMenuHandler() const;
+
+    void setDynamicallyGeneratedSubmenuDisabled(bool disabled);
+
+    void updateToolbarMenu();
+    void updateColorscheme();
+
+    const ToolbarWidgetArray& getToolbarWidgets() const;
+    const char* getToolbarName(GtkToolbar* toolbar) const;
+
+    Layout* getLayout() const;
+
+    [[maybe_unused]] Menubar* getMenubar() const;
+
+    /**
+     * Get the position of the top left corner of screen (X11) or the window (Wayland)
+     * relative to the Xournal Widget top left corner
+     *
+     * @see Util::toWidgetCoords()
+     */
+    xoj::util::Point<double> getNegativeXournalWidgetPos() const;
+
+    /**
+     * Disable kinetic scrolling if there is a touchscreen device that was manually mapped to another enabled input
+     * device class. This is required so the GtkScrolledWindow does not swallow all the events.
+     */
+    void setGtkTouchscreenScrollingForDeviceMapping();
+    void setGtkTouchscreenScrollingEnabled(bool enabled);
+
+    /// Infer the window's DPI from available monitor info and use it to set the default zoom value.
+    void setDPI() const;
+
+private:
+    void initXournalWidget();
+
+    void createToolbar();
+
+    /**
+     * Update the position of the separator in the paned container, adjusting it to the saved sidebar width.
+     * @param contentWidth should be the width of the paned container. The caller should retrieve the width
+     * of the container before any modifications to it, as that will reset its allocation.
+     */
+    void updatePanedPosition(int contentWidth);
+
+    /**
+     * Window close Button is pressed
+     */
+    static bool deleteEventCallback(GtkWidget* widget, GdkEvent* event, Control* control);
+
+    /**
+     * Window is maximized/minimized
+     */
+    static void windowMaximizedCallback(GObject* window, GParamSpec*, MainWindow* win);
+
+    /**
+     * Callback for drag & drop files
+     */
+    static void dragDataRecived(GtkWidget* widget, GdkDragContext* dragContext, gint x, gint y, GtkSelectionData* data,
+                                guint info, guint time, MainWindow* win);
+
+    /**
+     * Load Overall CSS file with custom icons, other styling and potentially, user changes
+     */
+    static void loadMainCSS(GladeSearchpath* gladeSearchPath, const gchar* cssFilename);
+
+private:
+    Control* control;
+
+    std::unique_ptr<XournalView> xournal;
+    GtkWidget* winXournal = nullptr;
+    std::unique_ptr<ScrollHandling> scrollHandling;
+
+    std::atomic_bool gtkTouchscreenScrollingEnabled{true};
+
+    std::unique_ptr<PdfFloatingToolbox> pdfFloatingToolBox;
+    std::unique_ptr<FloatingToolbox> floatingToolbox;
+
+    // Toolbars
+    std::unique_ptr<ToolMenuHandler> toolbar;
+    ToolbarData* selectedToolbar = nullptr;
+
+    std::unique_ptr<Menubar> menubar;
+
+    bool maximized = false;
+    bool darkMode = false;
+    bool modifiedGtkSettingsTheme = false;
+
+    ToolbarWidgetArray toolbarWidgets;
+
+    bool sidebarVisible = true;
+
+    xoj::util::WidgetSPtr boxContainerWidget;
+    xoj::util::WidgetSPtr panedContainerWidget;
+    xoj::util::WidgetSPtr mainContentWidget;
+    xoj::util::WidgetSPtr sidebarWidget;
+};
diff --git a/entry/src/main/cpp/src/core/gui/PagePreviewDecoration.cpp b/entry/src/main/cpp/src/core/gui/PagePreviewDecoration.cpp
new file mode 100644
index 0000000..06ce2d6
--- /dev/null
+++ b/entry/src/main/cpp/src/core/gui/PagePreviewDecoration.cpp
@@ -0,0 +1,129 @@
+#include "PagePreviewDecoration.h"
+
+#include <math.h>
+
+#include "control/Control.h"
+#include "control/settings/Settings.h"
+#include "gui/MainWindow.h"
+#include "util/raii/CairoWrappers.h"
+
+void PagePreviewDecoration::drawDecoration(cairo_t* cr, SidebarPreviewPageEntry* pageEntry, Control* control) {
+    switch (control->getSettings()->getSidebarNumberingStyle()) {
+        case SidebarNumberingStyle::NUMBER_BELOW_PREVIEW:
+            PagePreviewDecoration::drawPageNumberBelowPreview(cr, pageEntry, control);
+            break;
+        case SidebarNumberingStyle::NUMBER_WITH_CIRCULAR_BACKGROUND:
+            PagePreviewDecoration::drawPageNumberWithCircleBackground(cr, pageEntry, control);
+            break;
+        case SidebarNumberingStyle::NUMBER_WITH_SQUARE_BACKGROUND:
+            PagePreviewDecoration::drawPageNumberWithSquareBackground(cr, pageEntry, control);
+            break;
+        default:
+            break;
+    }
+}
+
+void PagePreviewDecoration::drawPageNumberBelowPreview(cairo_t* cr, SidebarPreviewPageEntry* pageEntry,
+                                                       Control* control) {
+    xoj::util::CairoSaveGuard saveGuard(cr);
+    cairo_text_extents_t extents;
+    std::string pageNumber = std::to_string(pageEntry->getIndex() + 1);
+    Color color = control->getWindow()->isDarkTheme() ? Colors::white : Colors::xopp_darkslategray;
+    if (pageEntry->isSelected()) {
+        color = control->getSettings()->getBorderColor();
+    }
+    Util::cairo_set_source_rgbi(cr, color);
+    cairo_select_font_face(cr, FONT_NAME, CAIRO_FONT_SLANT_NORMAL, CAIRO_FONT_WEIGHT_NORMAL);
+    cairo_set_font_size(cr, FONT_SIZE);
+    cairo_text_extents(cr, pageNumber.c_str(), &extents);
+    double x = pageEntry->getWidth() / 2 - (extents.width / 2 + extents.x_bearing);
+    double y = pageEntry->getHeight() - MARGIN_BOTTOM - (extents.height / 2 + extents.y_bearing);
+    cairo_move_to(cr, x, y);
+    cairo_show_text(cr, pageNumber.c_str());
+}
+
+void PagePreviewDecoration::drawPageNumberWithCircleBackground(cairo_t* cr, SidebarPreviewPageEntry* pageEntry,
+                                                               Control* control) {
+    xoj::util::CairoSaveGuard saveGuard(cr);
+    cairo_text_extents_t extents;
+    std::string pageNumber = std::to_string(pageEntry->getIndex() + 1);
+    cairo_select_font_face(cr, FONT_NAME, CAIRO_FONT_SLANT_NORMAL, CAIRO_FONT_WEIGHT_NORMAL);
+    cairo_set_font_size(cr, FONT_SIZE);
+    cairo_text_extents(cr, pageNumber.c_str(), &extents);
+
+    // Set the color for drawing the circle. This circle is required to provide good contrast for the page number.
+    if (pageEntry->isSelected()) {
+        Color color = control->getSettings()->getBorderColor();
+        Util::cairo_set_source_rgbi(cr, color, CIRCLE_LABEL_OPACITY);
+    } else {
+        Util::cairo_set_source_rgbi(cr, Colors::xopp_darkslategray, CIRCLE_LABEL_OPACITY);
+    }
+
+    // How many pixels to indent the circle center from the widget border
+    double indentRight = pageEntry->getWidth() * CIRCLE_INDENT_RIGHT;
+    double indentBottom = pageEntry->getHeight() * CIRCLE_INDENT_BOTTOM;
+
+    // Pixel position of circle center
+    double x = pageEntry->getWidth() - indentRight;
+    double y = pageEntry->getHeight() - indentBottom;
+
+    // Inner circle width depends on the actual text width
+    double addititionalWidth = std::max((extents.width - 2 * CIRCLE_RADIUS) + CIRCLE_TEXT_PADDING, 0.0);
+
+    // Draw an slightly transparent circle in the lower right corner of the preview
+    cairo_set_line_width(cr, LINE_WIDTH);
+    cairo_arc(cr, x - addititionalWidth, y, CIRCLE_RADIUS, M_PI * 0.5, M_PI * 1.5);
+    cairo_arc(cr, x, y, CIRCLE_RADIUS, M_PI * 1.5, M_PI * 0.5);
+    cairo_close_path(cr);
+    cairo_stroke_preserve(cr);
+    cairo_fill(cr);
+
+    // Draw the page number in the center of the previously drawn circle
+    cairo_move_to(cr, x - addititionalWidth / 2 - (extents.width / 2 + extents.x_bearing), y + CIRCLE_TEXT_Y);
+    Util::cairo_set_source_argb(cr, Colors::white);
+    cairo_show_text(cr, pageNumber.c_str());
+}
+
+void PagePreviewDecoration::drawPageNumberWithSquareBackground(cairo_t* cr, SidebarPreviewPageEntry* pageEntry,
+                                                               Control* control) {
+    xoj::util::CairoSaveGuard saveGuard(cr);
+    cairo_text_extents_t extents;
+    std::string pageNumber = std::to_string(pageEntry->getIndex() + 1);
+    cairo_select_font_face(cr, FONT_NAME, CAIRO_FONT_SLANT_NORMAL, CAIRO_FONT_WEIGHT_NORMAL);
+    cairo_set_font_size(cr, FONT_SIZE);
+    cairo_text_extents(cr, pageNumber.c_str(), &extents);
+
+    // Select the color for painting the square background
+    if (pageEntry->isSelected()) {
+        Util::cairo_set_source_rgbi(cr, control->getSettings()->getBorderColor());
+    } else {
+        Util::cairo_set_source_rgbi(cr, Colors::xopp_darkslategray);
+
+        // In case the page is not selected draw a border around the preview to match the selected
+        // See discussion: <https://github.com/xournalpp/xournalpp/issues/4624#issue-1557719574>
+        cairo_set_line_width(cr, PREVIEW_BORDER_LINE_WIDTH);
+        cairo_set_line_cap(cr, CAIRO_LINE_CAP_BUTT);
+        cairo_set_line_join(cr, CAIRO_LINE_JOIN_BEVEL);
+        cairo_rectangle(cr, PREVIEW_UPPER_LEFT, PREVIEW_UPPER_LEFT, pageEntry->getWidth() - PREVIEW_WIDTH_INDENT,
+                        pageEntry->getHeight() - PREVIEW_HEIGHT_INDENT);
+        cairo_stroke(cr);
+    }
+
+    // Calculate the rectangle width depending on the page index number of digits
+    double recWidth = std::max(extents.width + 8, SQUARE_SIZE);
+
+    // Calculate the position of the upper left corner of the square
+    double x = pageEntry->getWidth() - SQUARE_INDENT_RIGHT - recWidth;
+    double y = pageEntry->getHeight() - SQUARE_INDENT_BOTTOM - SQUARE_SIZE;
+
+    // Draw an square in the lower right corner
+    cairo_set_line_width(cr, LINE_WIDTH);
+    cairo_rectangle(cr, x, y, recWidth, SQUARE_SIZE);
+    cairo_stroke_preserve(cr);
+    cairo_fill(cr);
+
+    // Draw the page number in the center of the square
+    cairo_move_to(cr, x + recWidth / 2 - (extents.width / 2 + extents.x_bearing), y + SQUARE_TEXT_Y);
+    Util::cairo_set_source_argb(cr, Colors::white);
+    cairo_show_text(cr, pageNumber.c_str());
+}
diff --git a/entry/src/main/cpp/src/core/gui/PagePreviewDecoration.h b/entry/src/main/cpp/src/core/gui/PagePreviewDecoration.h
new file mode 100644
index 0000000..3b3bbaa
--- /dev/null
+++ b/entry/src/main/cpp/src/core/gui/PagePreviewDecoration.h
@@ -0,0 +1,70 @@
+/*
+ * Xournal++
+ *
+ * Settings Dialog
+ *
+ * @author Xournal++ Team
+ * https://github.com/xournalpp/xournalpp
+ *
+ * @license GNU GPLv2 or later
+ */
+
+#pragma once
+
+#include <cairo.h>  // for cairo_surface_t, cairo_t
+
+#include "sidebar/previews/page/SidebarPreviewPageEntry.h"
+
+class Control;
+
+class PagePreviewDecoration {
+public:
+    static void drawDecoration(cairo_t* cr, SidebarPreviewPageEntry* pageEntry, Control* control);
+
+private:
+    static void drawPageNumberBelowPreview(cairo_t* cr, SidebarPreviewPageEntry* pageEntry, Control* control);
+    static void drawPageNumberWithCircleBackground(cairo_t* cr, SidebarPreviewPageEntry* pageEntry, Control* control);
+    static void drawPageNumberWithSquareBackground(cairo_t* cr, SidebarPreviewPageEntry* pageEntry, Control* control);
+
+public:
+    /* For the style with the page numbers below the preview the widget height has to be extended by this amount */
+    static constexpr int MARGIN_BOTTOM = 20;
+
+private:
+    /* The font sized used for drawing the page number*/
+    static constexpr double FONT_SIZE = 16.0;
+
+    /* Line width for drawing the circle and the square background*/
+    static constexpr double LINE_WIDTH = 1.0;
+
+    /* Indention of the circle from the right border as percentage to the total widget width */
+    static constexpr double CIRCLE_INDENT_RIGHT = 0.28;
+    /* Indention of the circle from the bottom border as percentage to the total widget height */
+    static constexpr double CIRCLE_INDENT_BOTTOM = 0.2;
+    /* Transparency value for the circle background */
+    static constexpr double CIRCLE_LABEL_OPACITY = 0.6;
+    /* Circle radius in pixels */
+    static constexpr double CIRCLE_RADIUS = 11;
+    /* Vertical alignment of page number to circle center */
+    static constexpr double CIRCLE_TEXT_Y = 6;
+    /* Padding for the text in the circle */
+    static constexpr double CIRCLE_TEXT_PADDING = 8;
+
+    /* Height and minimum width of background square in pixels */
+    static constexpr double SQUARE_SIZE = 20;
+    /* Pixel-Distance form widgets right border to previews right border */
+    static constexpr double SQUARE_INDENT_RIGHT = 12;
+    /* Pixel-Distance from widgets bottom border to previews bottom border */
+    static constexpr double SQUARE_INDENT_BOTTOM = 12;
+    /* Vertical alignment of the page number in the square */
+    static constexpr double SQUARE_TEXT_Y = 16;
+    /* Padding for the text in the circle, to be applied on both sides*/
+    static constexpr double SQUARE_TEXT_PADDING = 4;
+
+    static constexpr double PREVIEW_BORDER_LINE_WIDTH = 2.0;
+    static constexpr double PREVIEW_UPPER_LEFT = 8.5;
+    static constexpr double PREVIEW_WIDTH_INDENT = 21;
+    static constexpr double PREVIEW_HEIGHT_INDENT = 21;
+
+    static constexpr char FONT_NAME[] = "Sans";
+};
diff --git a/entry/src/main/cpp/src/core/gui/PageView.cpp b/entry/src/main/cpp/src/core/gui/PageView.cpp
new file mode 100644
index 0000000..2754261
--- /dev/null
+++ b/entry/src/main/cpp/src/core/gui/PageView.cpp
@@ -0,0 +1,1205 @@
+#include "PageView.h"
+
+#include <algorithm>  // for max, find_if
+#include <cinttypes>  // for int64_t
+#include <cstdint>    // for int64_t
+#include <cstdlib>    // for size_t
+#include <iomanip>    // for operator<<, quoted
+#include <memory>     // for unique_ptr, make_...
+#include <optional>   // for optional
+#include <sstream>    // for operator<<, basic...
+#include <tuple>      // for tuple, tie
+#include <utility>    // for move
+
+#include <gdk/gdk.h>         // for GdkRectangle, Gdk...
+#include <gdk/gdkkeysyms.h>  // for GDK_KEY_Escape
+#include <glib-object.h>     // for G_CALLBACK, g_sig...
+#include <glib.h>            // for gint, g_free, g_g...
+#include <gtk/gtk.h>         // for GtkWidget, gtk_co...
+
+#include "control/AudioController.h"                // for AudioController
+#include "control/Control.h"                        // for Control
+#include "control/ScrollHandler.h"                  // for ScrollHandler
+#include "control/SearchControl.h"                  // for SearchControl
+#include "control/Tool.h"                           // for Tool
+#include "control/ToolEnums.h"                      // for DRAWING_TYPE_SPLINE
+#include "control/ToolHandler.h"                    // for ToolHandler
+#include "control/jobs/XournalScheduler.h"          // for XournalScheduler
+#include "control/layer/LayerController.h"          // for LayerControl
+#include "control/settings/Settings.h"              // for Settings
+#include "control/tools/ArrowHandler.h"             // for ArrowHandler
+#include "control/tools/CoordinateSystemHandler.h"  // for CoordinateSystemH...
+#include "control/tools/EditSelection.h"            // for EditSelection
+#include "control/tools/EllipseHandler.h"           // for EllipseHandler
+#include "control/tools/EraseHandler.h"             // for EraseHandler
+#include "control/tools/ImageHandler.h"             // for ImageHandler
+#include "control/tools/ImageSizeSelection.h"       // for ImageSizeSelection
+#include "control/tools/InputHandler.h"             // for InputHandler
+#include "control/tools/LaserPointerHandler.h"      // for LaserPointerHandler
+#include "control/tools/PdfElemSelection.h"         // for PdfElemSelection
+#include "control/tools/RectangleHandler.h"         // for RectangleHandler
+#include "control/tools/RulerHandler.h"             // for RulerHandler
+#include "control/tools/Selector.h"                 // for RectangularSelector
+#include "control/tools/SplineHandler.h"            // for SplineHandler
+#include "control/tools/StrokeHandler.h"            // for StrokeHandler
+#include "control/tools/TextEditor.h"               // for TextEditor, TextE...
+#include "control/tools/VerticalToolHandler.h"      // for VerticalToolHandler
+#include "gui/FloatingToolbox.h"                    // for FloatingToolbox
+#include "gui/MainWindow.h"                         // for MainWindow
+#include "gui/PdfFloatingToolbox.h"                 // for PdfFloatingToolbox
+#include "gui/SearchBar.h"                          // for SearchBar
+#include "gui/inputdevices/PositionInputData.h"     // for PositionInputData
+#include "model/Document.h"                         // for Document
+#include "model/Element.h"                          // for Element, ELEMENT_...
+#include "model/Layer.h"                            // for Layer, Layer::Index
+#include "model/LinkDestination.h"                  // for LinkDestination
+#include "model/PageRef.h"                          // for PageRef
+#include "model/Stroke.h"                           // for Stroke
+#include "model/TexImage.h"                         // for TexImage
+#include "model/Text.h"                             // for Text
+#include "model/XojPage.h"                          // for XojPage
+#include "pdf/base/XojPdfAction.h"                  // for XojPdfAction
+#include "pdf/base/XojPdfDocument.h"                // for XojPdfDocument
+#include "pdf/base/XojPdfPage.h"                    // for XojPdfRectangle
+#include "undo/DeleteUndoAction.h"                  // for DeleteUndoAction
+#include "undo/InsertUndoAction.h"                  // for InsertUndoAction
+#include "undo/MoveUndoAction.h"                    // for MoveUndoAction
+#include "undo/TextBoxUndoAction.h"                 // for TextBoxUndoAction
+#include "undo/UndoRedoHandler.h"                   // for UndoRedoHandler
+#include "util/Assert.h"                            // for xoj_assert
+#include "util/Color.h"                             // for rgb_to_GdkRGBA
+#include "util/Range.h"                             // for Range
+#include "util/Rectangle.h"                         // for Rectangle
+#include "util/Util.h"                              // for npos
+#include "util/XojMsgBox.h"                         // for XojMsgBox
+#include "util/gtk4_helper.h"                       // for gtk_box_append
+#include "util/i18n.h"                              // for _F, FC, FS, _
+#include "util/raii/CLibrariesSPtr.h"               // for adopt
+#include "util/safe_casts.h"                        // for ceil_cast, floor_cast, round_cast
+#include "util/serdesstream.h"                      // for serdes_stream
+#include "view/DebugShowRepaintBounds.h"            // for IF_DEBUG_REPAINT
+#include "view/overlays/OverlayView.h"              // for OverlayView, Tool...
+#include "view/overlays/PdfElementSelectionView.h"  // for PdfElementSelecti...
+#include "view/overlays/SearchResultView.h"         // for SearchResultView
+#include "view/overlays/SelectorView.h"             // for SelectionView
+#include "view/overlays/TextEditionView.h"          // for TextEditionView
+
+#include "PageViewFindObjectHelper.h"  // for SelectObject, Pla...
+#include "RepaintHandler.h"            // for RepaintHandler
+#include "XournalView.h"               // for XournalView
+#include "XournalppCursor.h"           // for XournalppCursor
+#include "filesystem.h"                // for path
+
+class OverlayBase;
+
+using std::string;
+using xoj::util::Rectangle;
+
+XojPageView::XojPageView(XournalView* xournal, const PageRef& page):
+        page(page),
+        xournal(xournal),
+        settings(xournal->getControl()->getSettings()),
+        eraser(std::make_unique<EraseHandler>(xournal->getControl()->getUndoRedoHandler(),
+                                              xournal->getControl()->getDocument(), this->page,
+                                              xournal->getControl()->getToolHandler(), this)),
+        oldtext(nullptr) {
+    this->registerToHandler(this->page);
+}
+
+XojPageView::~XojPageView() {
+    this->unregisterFromHandler();
+
+    this->xournal->getControl()->getScheduler()->removePage(this);
+
+    this->overlayViews.clear();
+    endText();
+    deleteViewBuffer();  // Ensures the mutex is locked during the buffer's destruction
+}
+
+void XojPageView::addOverlayView(std::unique_ptr<xoj::view::OverlayView> overlay) {
+    this->overlayViews.emplace_back(std::move(overlay));
+}
+
+void XojPageView::setIsVisible(bool visible) { this->visible = visible; }
+
+void XojPageView::deleteViewBuffer() {
+    std::lock_guard lock(this->drawingMutex);
+    this->buffer.reset();
+}
+
+auto XojPageView::containsPoint(int x, int y, bool local) const -> bool {
+    if (!local) {
+        bool leftOk = this->getX() <= x;
+        bool rightOk = x <= this->getX() + this->getDisplayWidth();
+        bool topOk = this->getY() <= y;
+        bool bottomOk = y <= this->getY() + this->getDisplayHeight();
+
+        return leftOk && rightOk && topOk && bottomOk;
+    }
+
+
+    return x >= 0 && y >= 0 && x <= this->getWidth() && y <= this->getHeight();
+}
+
+auto XojPageView::searchTextOnPage(const std::string& text, size_t index, size_t* occurrences,
+                                   XojPdfRectangle* matchRect) -> bool {
+    if (!this->search) {
+        if (text.empty()) {
+            return true;
+        }
+
+        auto pNr = this->page->getPdfPageNr();
+        XojPdfPageSPtr pdf = nullptr;
+        if (pNr != npos) {
+            Document* doc = xournal->getControl()->getDocument();
+
+            doc->lock_shared();
+            pdf = doc->getPdfPage(pNr);
+            doc->unlock_shared();
+        }
+        this->search = std::make_unique<SearchControl>(page, pdf);
+        this->overlayViews.emplace_back(std::make_unique<xoj::view::SearchResultView>(
+                this->search.get(), this, settings->getSelectionColor(), settings->getActiveSelectionColor()));
+    }
+
+    bool found = this->search->search(text, index, occurrences, matchRect);
+
+    repaintPage();
+
+    return found;
+}
+
+void XojPageView::endText() { this->textEditor.reset(); }
+
+void XojPageView::startText(double x, double y) {
+    this->xournal->endTextAllPages(this);
+    this->xournal->getControl()->getSearchBar()->showSearchBar(false);
+
+    if (this->textEditor != nullptr) {
+        const Text* text = this->textEditor->getTextElement();
+        GdkRectangle matchRect = {gint(x), gint(y), 1, 1};
+        if (!text->intersectsArea(&matchRect)) {
+            endText();
+        } else {
+            this->textEditor->mousePressed(x - text->getX(), y - text->getY());
+        }
+    }
+
+    if (this->textEditor == nullptr) {
+        this->textEditor = std::make_unique<TextEditor>(xournal->getControl(), page, xournal->getWidget(), x, y);
+        this->overlayViews.emplace_back(std::make_unique<xoj::view::TextEditionView>(this->textEditor.get(), this));
+    }
+}
+
+#ifndef NDEBUG
+// used in xoj_assert()
+[[maybe_unused]] static bool hasNoViewOf(const std::vector<std::unique_ptr<xoj::view::OverlayView>>& views,
+                                         const OverlayBase* o) {
+    return std::find_if(views.begin(), views.end(), [o](auto& v) { return v->isViewOf(o); }) == views.end();
+}
+#endif
+
+static void eraseViewsOf(std::vector<std::unique_ptr<xoj::view::OverlayView>>& views, const OverlayBase* o) {
+    views.erase(std::remove_if(views.begin(), views.end(), [o](auto& v) { return v->isViewOf(o); }), views.end());
+    xoj_assert(hasNoViewOf(views, o));
+}
+
+void XojPageView::endSpline() {
+    if (SplineHandler* h = dynamic_cast<SplineHandler*>(this->inputHandler.get()); h) {
+        h->finalizeSpline();
+        xoj_assert(hasNoViewOf(overlayViews, inputHandler.get()));
+        this->inputHandler.reset();
+    }
+}
+
+void XojPageView::deleteLaserPointerHandler() {
+    xoj_assert(hasNoViewOf(overlayViews, laserPointer.get()));
+    laserPointer.reset();
+}
+
+auto XojPageView::onButtonPressEvent(const PositionInputData& pos) -> bool {
+    if (currentSequenceDeviceId) {
+        // An input sequence is already under way from another device
+        return false;
+    }
+    currentSequenceDeviceId = pos.deviceId;
+
+    Control* control = xournal->getControl();
+
+    if (!this->selected) {
+        control->firePageSelected(this->page);
+    }
+
+    ToolHandler* h = control->getToolHandler();
+
+    double x = pos.x;
+    double y = pos.y;
+
+    if (x < 0 || y < 0) {
+        return false;
+    }
+
+    double zoom = xournal->getZoom();
+    x /= zoom;
+    y /= zoom;
+
+    XournalppCursor* cursor = xournal->getCursor();
+    cursor->setMouseDown(true);
+
+    if (((h->getToolType() == TOOL_PEN || h->getToolType() == TOOL_HIGHLIGHTER) &&
+         h->getDrawingType() != DRAWING_TYPE_SPLINE) ||
+        (h->getToolType() == TOOL_ERASER && h->getEraserType() == ERASER_TYPE_WHITEOUT)) {
+
+        if (this->inputHandler) {
+            /**
+             * Due to https://github.com/xournalpp/xournalpp/issues/4377
+             * some devices under some configurations can start an action while another one has already started
+             * This is a workaround to avoid mem leaks and segfaults
+             * This `if` statement can probably be replaced by an `assert` once #4377 is fixed
+             */
+            g_warning("InputHandler already exists upon XojPageView::onButtonPressEvent. Deleting it (and its views)");
+            eraseViewsOf(this->overlayViews, this->inputHandler.get());
+            this->inputHandler.reset();
+        }
+
+        Control* control = this->xournal->getControl();
+        switch (h->getDrawingType()) {
+            case DRAWING_TYPE_LINE:
+                this->inputHandler = std::make_unique<RulerHandler>(control, getPage());
+                break;
+            case DRAWING_TYPE_RECTANGLE:
+                this->inputHandler = std::make_unique<RectangleHandler>(control, getPage());
+                break;
+            case DRAWING_TYPE_ELLIPSE:
+                this->inputHandler = std::make_unique<EllipseHandler>(control, getPage());
+                break;
+            case DRAWING_TYPE_ARROW:
+                this->inputHandler = std::make_unique<ArrowHandler>(control, getPage(), false);
+                break;
+            case DRAWING_TYPE_DOUBLE_ARROW:
+                this->inputHandler = std::make_unique<ArrowHandler>(control, getPage(), true);
+                break;
+            case DRAWING_TYPE_COORDINATE_SYSTEM:
+                this->inputHandler = std::make_unique<CoordinateSystemHandler>(control, getPage());
+                break;
+            default:
+                this->inputHandler = std::make_unique<StrokeHandler>(control, getPage());
+        }
+        this->inputHandler->onButtonPressEvent(pos, zoom);
+        this->overlayViews.emplace_back(this->inputHandler->createView(this));
+
+    } else if ((h->getToolType() == TOOL_PEN || h->getToolType() == TOOL_HIGHLIGHTER) &&
+               h->getDrawingType() == DRAWING_TYPE_SPLINE) {
+        if (!this->inputHandler) {
+            this->inputHandler = std::make_unique<SplineHandler>(this->xournal->getControl(), getPage());
+            this->inputHandler->onButtonPressEvent(pos, zoom);
+            this->overlayViews.emplace_back(this->inputHandler->createView(this));
+        } else {
+            this->inputHandler->onButtonPressEvent(pos, zoom);
+        }
+    } else if (h->getToolType() == TOOL_ERASER) {
+        this->eraser->erase(x, y);
+        this->inEraser = true;
+    } else if (h->getToolType() == TOOL_LASER_POINTER_PEN || h->getToolType() == TOOL_LASER_POINTER_HIGHLIGHTER) {
+        if (!this->laserPointer) {
+            this->laserPointer = std::make_unique<LaserPointerHandler>(this, control, getPage());
+            this->laserPointer->onButtonPressEvent(pos, zoom);
+            this->overlayViews.emplace_back(this->laserPointer->createView(this));
+        } else {
+            this->laserPointer->onButtonPressEvent(pos, zoom);
+        }
+    } else if (h->getToolType() == TOOL_VERTICAL_SPACE) {
+        if (this->verticalSpace) {
+            control->getUndoRedoHandler()->addUndoAction(this->verticalSpace->finalize());
+            this->verticalSpace.reset();
+        }
+        auto* zoomControl = this->getXournal()->getControl()->getZoomControl();
+        this->verticalSpace = std::make_unique<VerticalToolHandler>(this->page, this->getXournal()->getControl(), y,
+                                                                    pos.isControlDown());
+        this->overlayViews.emplace_back(this->verticalSpace->createView(this, zoomControl, this->settings));
+    } else if (h->getToolType() == TOOL_SELECT_RECT || h->getToolType() == TOOL_SELECT_REGION ||
+               h->getToolType() == TOOL_SELECT_MULTILAYER_RECT || h->getToolType() == TOOL_SELECT_MULTILAYER_REGION ||
+               h->getToolType() == TOOL_PLAY_OBJECT || h->getToolType() == TOOL_SELECT_OBJECT ||
+               h->getToolType() == TOOL_SELECT_PDF_TEXT_LINEAR || h->getToolType() == TOOL_SELECT_PDF_TEXT_RECT) {
+        if (h->getToolType() == TOOL_SELECT_RECT) {
+            if (!selector) {
+                this->selector = std::make_unique<RectangularSelector>(x, y);
+                this->overlayViews.emplace_back(std::make_unique<xoj::view::SelectorView>(
+                        this->selector.get(), this, this->settings->getSelectionColor()));
+            } else {
+                xoj_assert_message(
+                        settings->getInputSystemTPCButtonEnabled(),
+                        "the selection has already been created by a stylus button press while the stylus was "
+                        "hovering!");
+            }
+        } else if (h->getToolType() == TOOL_SELECT_REGION) {
+            if (!selector) {
+                this->selector = std::make_unique<LassoSelector>(x, y);
+                this->overlayViews.emplace_back(std::make_unique<xoj::view::SelectorView>(
+                        this->selector.get(), this, this->settings->getSelectionColor()));
+            } else {
+                xoj_assert_message(
+                        settings->getInputSystemTPCButtonEnabled(),
+                        "the selection has already been created by a stylus button press while the stylus was "
+                        "hovering!");
+            }
+        } else if (h->getToolType() == TOOL_SELECT_MULTILAYER_RECT) {
+            if (!selector) {
+                this->selector = std::make_unique<RectangularSelector>(x, y, /*multiLayer*/ true);
+                this->overlayViews.emplace_back(std::make_unique<xoj::view::SelectorView>(
+                        this->selector.get(), this, this->settings->getSelectionColor()));
+            } else {
+                xoj_assert_message(
+                        settings->getInputSystemTPCButtonEnabled(),
+                        "the selection has already been created by a stylus button press while the stylus was "
+                        "hovering!");
+            }
+        } else if (h->getToolType() == TOOL_SELECT_MULTILAYER_REGION) {
+            if (!selector) {
+                this->selector = std::make_unique<LassoSelector>(x, y, /*multiLayer*/ true);
+                this->overlayViews.emplace_back(std::make_unique<xoj::view::SelectorView>(
+                        this->selector.get(), this, this->settings->getSelectionColor()));
+            } else {
+                xoj_assert_message(
+                        settings->getInputSystemTPCButtonEnabled(),
+                        "the selection has already been created by a stylus button press while the stylus was "
+                        "hovering!");
+            }
+        } else if (h->getToolType() == TOOL_SELECT_PDF_TEXT_LINEAR || h->getToolType() == TOOL_SELECT_PDF_TEXT_RECT) {
+            // so if we selected something && the pdf selection toolbox is hidden && we hit within the selection
+            // we could call the pdf floating toolbox again
+            auto* pdfToolbox = control->getWindow()->getPdfToolbox();
+
+            if (pdfToolbox->hasSelection()) {
+                bool isPdfToolboxHidden = pdfToolbox->isHidden();
+                bool keepOldSelection = isPdfToolboxHidden && pdfToolbox->getSelection()->contains(x, y);
+                if (!keepOldSelection) {
+                    pdfToolbox->userCancelSelection();
+                    repaintPage();
+                } else {
+                    showPdfToolbox(pos);
+                }
+            }
+
+            if (this->page->getPdfPageNr() != npos && !pdfToolbox->hasSelection()) {
+                pdfToolbox->selectionStyle = PdfElemSelection::selectionStyleForToolType(h->getToolType());
+                auto sel = pdfToolbox->newSelection(x, y);
+                this->overlayViews.emplace_back(
+                        std::make_unique<xoj::view::PdfElementSelectionView>(sel, this, settings->getSelectionColor()));
+            }
+        } else if (h->getToolType() == TOOL_SELECT_OBJECT) {
+            SelectObject select(this);
+            if (pos.isShiftDown() && xournal->getSelection()) {
+                select.atAggregate(x, y);
+            } else {
+                select.at(x, y);
+            }
+        } else if (h->getToolType() == TOOL_PLAY_OBJECT) {
+            PlayObject play(this);
+            play.at(x, y);
+            if (play.playbackStatus) {
+                auto& status = *play.playbackStatus;
+                if (!status.success) {
+                    string message = FS(_F("Unable to play audio recording {1}") % status.filename.u8string());
+                    XojMsgBox::showErrorToUser(this->xournal->getControl()->getGtkWindow(), message);
+                }
+            }
+        }
+    } else if (h->getToolType() == TOOL_TEXT) {
+        startText(x, y);
+    } else if (h->getToolType() == TOOL_IMAGE) {
+        // start selecting the size for the image
+        this->imageSizeSelection = std::make_unique<ImageSizeSelection>(x, y);
+        this->overlayViews.emplace_back(std::make_unique<xoj::view::ImageSizeSelectionView>(
+                this->imageSizeSelection.get(), this, settings->getSelectionColor()));
+    }
+
+    this->onButtonClickEvent(pos);
+
+    return true;
+}
+
+auto XojPageView::onButtonClickEvent(const PositionInputData& pos) -> bool {
+    Control* control = xournal->getControl();
+    double x = pos.x;
+    double y = pos.y;
+
+    if (x < 0 || y < 0) {
+        return false;
+    }
+
+    ToolHandler* h = control->getToolHandler();
+
+    if (h->getToolType() == TOOL_FLOATING_TOOLBOX) {
+        this->showFloatingToolbox(pos);
+    }
+
+    return true;
+}
+
+auto XojPageView::onButtonDoublePressEvent(const PositionInputData& pos) -> bool {
+    // This method assumes that it is called after onButtonPressEvent but before
+    // onButtonReleaseEvent
+    double zoom = this->xournal->getZoom();
+    double x = pos.x / zoom;
+    double y = pos.y / zoom;
+    if (x < 0 || y < 0) {
+        return false;
+    }
+
+    ToolHandler* toolHandler = this->xournal->getControl()->getToolHandler();
+    ToolType toolType = toolHandler->getToolType();
+    DrawingType drawingType = toolHandler->getDrawingType();
+
+    EditSelection* selection = xournal->getSelection();
+    bool hasNoModifiers = !pos.isShiftDown() && !pos.isControlDown();
+
+    if (hasNoModifiers && selection != nullptr) {
+        // Find a selected object under the cursor, if possible. The selection doesn't change the
+        // element coordinates until it is finalized, so we need to use position relative to the
+        // original coordinates of the selection.
+        double origx = x - (selection->getXOnView() - selection->getOriginalXOnView());
+        double origy = y - (selection->getYOnView() - selection->getOriginalYOnView());
+        auto elems = selection->getElementsView();
+        auto it = std::find_if(elems.begin(), elems.end(),
+                               [&](const Element* elem) { return elem->intersectsArea(origx - 5, origy - 5, 5, 5); });
+        if (it != elems.end()) {
+            // Enter editing mode on the selected object
+            const Element* object = *it;
+            ElementType elemType = object->getType();
+            if (elemType == ELEMENT_TEXT) {
+                this->xournal->clearSelection();
+                toolHandler->selectTool(TOOL_TEXT);
+                toolHandler->fireToolChanged();
+                // Simulate a button press; there's too many things that we
+                // could forget to do if we manually call startText
+                this->onButtonPressEvent(pos);
+            } else if (elemType == ELEMENT_TEXIMAGE) {
+                Control* control = this->xournal->getControl();
+                if (elems.size() > 1) {
+                    // Deselect the other elements
+                    this->xournal->clearSelection();
+                    auto sel = SelectionFactory::createFromElementOnActiveLayer(control, getPage(), this, object);
+                    this->xournal->setSelection(sel.release());
+                }
+                control->runLatex();
+            }
+        }
+    } else if (toolType == TOOL_TEXT) {
+        this->startText(x, y);
+        this->textEditor->selectAtCursor(TextEditor::SelectType::WORD);
+    } else if (toolType == TOOL_SELECT_PDF_TEXT_LINEAR || toolType == TOOL_SELECT_PDF_TEXT_RECT) {
+        auto* pdfToolbox = this->xournal->getControl()->getWindow()->getPdfToolbox();
+        if (auto* selection = pdfToolbox->getSelection()) {
+            pdfToolbox->selectionStyle = XojPdfPageSelectionStyle::Word;
+            selection->currentPos(x, y, pdfToolbox->selectionStyle);
+        }
+    } else if (drawingType == DRAWING_TYPE_SPLINE) {
+        if (this->inputHandler) {
+            this->inputHandler->onButtonDoublePressEvent(pos, zoom);
+            xoj_assert(hasNoViewOf(overlayViews, inputHandler.get()));
+            this->inputHandler.reset();
+        }
+    }
+
+    return true;
+}
+
+auto XojPageView::onButtonTriplePressEvent(const PositionInputData& pos) -> bool {
+    // This method assumes that it is called after onButtonDoubleEvent but before
+    // onButtonReleaseEvent
+    double zoom = this->xournal->getZoom();
+    double x = pos.x / zoom;
+    double y = pos.y / zoom;
+    if (x < 0 || y < 0) {
+        return false;
+    }
+
+    ToolHandler* toolHandler = this->xournal->getControl()->getToolHandler();
+    ToolType toolType = toolHandler->getToolType();
+
+    if (toolType == TOOL_TEXT) {
+        this->startText(x, y);
+        this->textEditor->selectAtCursor(TextEditor::SelectType::PARAGRAPH);
+    } else if (toolType == TOOL_SELECT_PDF_TEXT_LINEAR || toolType == TOOL_SELECT_PDF_TEXT_RECT) {
+        auto* pdfToolbox = this->xournal->getControl()->getWindow()->getPdfToolbox();
+        if (auto* selection = pdfToolbox->getSelection()) {
+            pdfToolbox->selectionStyle = XojPdfPageSelectionStyle::Line;
+            selection->currentPos(x, y, pdfToolbox->selectionStyle);
+        }
+    }
+    return true;
+}
+
+auto XojPageView::onMotionNotifyEvent(const PositionInputData& pos) -> bool {
+    if (currentSequenceDeviceId && currentSequenceDeviceId != pos.deviceId) {
+        // This motion event is not from the device which started the sequence: reject it
+        return false;
+    }
+
+    double zoom = xournal->getZoom();
+    double x = pos.x / zoom;
+    double y = pos.y / zoom;
+
+    ToolHandler* h = xournal->getControl()->getToolHandler();
+    auto* pdfToolbox = this->xournal->getControl()->getWindow()->getPdfToolbox();
+
+    if (this->inputHandler && this->inputHandler->onMotionNotifyEvent(pos, zoom)) {
+        // input handler used this event
+    } else if (this->imageSizeSelection) {
+        this->imageSizeSelection->updatePosition(x, y);
+    } else if (this->selector) {
+        this->selector->currentPos(x, y);
+    } else if (auto* selection = pdfToolbox->getSelection(); selection && !selection->isFinalized()) {
+        selection->currentPos(x, y, pdfToolbox->selectionStyle);
+    } else if (this->verticalSpace) {
+        this->verticalSpace->currentPos(x, y);
+    } else if (this->textEditor) {
+        XournalppCursor* cursor = getXournal()->getCursor();
+        cursor->setInvisible(false);
+
+        const Text* text = this->textEditor->getTextElement();
+        this->textEditor->mouseMoved(x - text->getX(), y - text->getY());
+    } else if (this->laserPointer && this->laserPointer->onMotionNotifyEvent(pos, zoom)) {
+        // used this event
+    } else if (h->getToolType() == TOOL_ERASER && h->getEraserType() != ERASER_TYPE_WHITEOUT && this->inEraser) {
+        this->eraser->erase(x, y);
+    }
+
+    return false;
+}
+
+void XojPageView::onSequenceCancelEvent(DeviceId deviceId) {
+    if (currentSequenceDeviceId != deviceId) {
+        // This motion event is not from the device which started the sequence: reject it
+        return;
+    }
+    currentSequenceDeviceId.reset();
+
+    if (this->inputHandler) {
+        this->inputHandler->onSequenceCancelEvent();
+
+        if (auto* h = dynamic_cast<SplineHandler*>(this->inputHandler.get()); h) {
+            // SplineHandler can survive a sequence cancellation
+            if (!h->getStroke()) {
+                xoj_assert(hasNoViewOf(overlayViews, inputHandler.get()));
+                this->inputHandler.reset();
+            }
+        } else {
+            xoj_assert(hasNoViewOf(overlayViews, inputHandler.get()));
+            this->inputHandler.reset();
+        }
+    } else if (this->laserPointer) {
+        this->laserPointer->onSequenceCancelEvent();
+    }
+}
+
+void XojPageView::onTapEvent(const PositionInputData& pos) {
+    if (this->inputHandler) {
+        /*
+         * We only want tap events to trigger special actions if no tool is currently under use
+         * (e.g. a spline is currently under edition)
+         * Feed the event to the InputHandler as a click
+         */
+        const double zoom = getZoom();
+        this->inputHandler->onButtonPressEvent(pos, zoom);
+        this->inputHandler->onButtonReleaseEvent(pos, zoom);
+        if (!this->inputHandler->getStroke()) {
+            // The InputHandler finalized its edition
+            xoj_assert(hasNoViewOf(overlayViews, inputHandler.get()));
+            this->inputHandler.reset();
+        }
+        return;
+    }
+
+    auto* settings = xournal->getControl()->getSettings();
+    bool doAction = settings->getDoActionOnStrokeFiltered();
+    if (settings->getTrySelectOnStrokeFiltered()) {
+        double zoom = xournal->getZoom();
+        SelectObject select(this);
+        if (pos.isShiftDown()) {
+            if (select.atAggregate(pos.x / zoom, pos.y / zoom)) {
+                doAction = false;  // selection made.. no action.
+            }
+        } else {
+            if (select.at(pos.x / zoom, pos.y / zoom)) {
+                doAction = false;  // selection made.. no action.
+            }
+        }
+    }
+
+    if (doAction)  // pop up a menu
+    {
+        this->showFloatingToolbox(pos);
+    }
+}
+
+auto XojPageView::showPdfToolbox(const PositionInputData& pos) -> void {
+    // Compute coords of the canvas relative to the application window origin.
+    gint wx = 0, wy = 0;
+    GtkWidget* widget = xournal->getWidget();
+    gtk_widget_translate_coordinates(widget, gtk_widget_get_toplevel(widget), 0, 0, &wx, &wy);
+
+    // Add the position of the current page view widget (relative to canvas origin)
+    // and add the input position (relative to the current page view widget).
+    wx += this->getX() + round_cast<gint>(pos.x);
+    wy += this->getY() + round_cast<gint>(pos.y);
+
+    auto* pdfToolbox = this->xournal->getControl()->getWindow()->getPdfToolbox();
+    pdfToolbox->show(wx, wy);
+}
+
+void XojPageView::deleteView(xoj::view::OverlayView* view) {
+    auto it = std::find_if(this->overlayViews.begin(), this->overlayViews.end(),
+                           [view](const auto& v) { return view == v.get(); });
+    if (it != this->overlayViews.end()) {
+        this->overlayViews.erase(it);
+    }
+}
+
+auto XojPageView::onButtonReleaseEvent(const PositionInputData& pos) -> bool {
+    if (currentSequenceDeviceId != pos.deviceId) {
+        // This event is not from the device which started the sequence: reject it
+        return false;
+    }
+    currentSequenceDeviceId.reset();
+
+    Control* control = xournal->getControl();
+
+    if (this->inputHandler) {
+        double zoom = xournal->getZoom();
+        this->inputHandler->onButtonReleaseEvent(pos, zoom);
+
+        ToolHandler* h = control->getToolHandler();
+        bool isDrawingTypeSpline = h->getDrawingType() == DRAWING_TYPE_SPLINE;
+        if (!isDrawingTypeSpline || !this->inputHandler->getStroke()) {  // The Spline Tool finalizes drawing manually
+            xoj_assert(hasNoViewOf(overlayViews, inputHandler.get()));
+            this->inputHandler.reset();
+        }
+    } else if (auto tt = control->getToolHandler()->getToolType();
+               this->laserPointer && (tt == TOOL_LASER_POINTER_PEN || tt == TOOL_LASER_POINTER_HIGHLIGHTER)) {
+        this->laserPointer->onButtonReleaseEvent(pos, xournal->getZoom());
+    }
+
+    if (this->inEraser) {
+        this->inEraser = false;
+        Document* doc = this->xournal->getControl()->getDocument();
+        doc->lock();
+        this->eraser->finalize();
+        doc->unlock();
+    }
+
+    if (this->verticalSpace) {
+        control->getUndoRedoHandler()->addUndoAction(this->verticalSpace->finalize());
+        this->verticalSpace.reset();
+    }
+
+    auto* pdfToolbox = control->getWindow()->getPdfToolbox();
+    if (auto* selection = pdfToolbox->getSelection()) {
+        if (!selection->isFinalized() && selection->finalizeSelectionAndRepaint(pdfToolbox->selectionStyle)) {
+            // Selection was created, so reposition the toolbox and display.
+            showPdfToolbox(pos);
+        }
+    }
+
+    ToolType toolType = control->getToolHandler()->getActiveTool()->getToolType();
+    if (xoj::tool::isPdfSelectionTool(toolType)) {
+        const double zoom = xournal->getZoom();
+        // Attempt PDF selection
+        auto& pdfDoc = this->xournal->getDocument()->getPdfDocument();
+        if (this->getPage()->getPdfPageNr() != npos) {
+            auto page = pdfDoc.getPage(this->getPage()->getPdfPageNr());
+
+            const double pageX = pos.x / zoom;
+            const double pageY = pos.y / zoom;
+
+            displayLinkPopover(page, pageX, pageY);
+        }
+    }
+
+    if (this->selector) {
+        const bool aggregate = pos.isShiftDown() && xournal->getSelection();
+        size_t layerOfFinalizedSel = this->selector->finalize(this->page, aggregate, control->getDocument());
+
+        if (layerOfFinalizedSel) {
+            xournal->setSelection([&]() {
+                if (aggregate) {
+                    // Aggregate selection
+                    auto sel = selector->releaseElements();
+                    return SelectionFactory::addElementsFromActiveLayer(control, xournal->getSelection(), sel);
+                } else {
+                    // if selection->multiLayer == true, the selected objects might be on another layer
+                    xournal->getControl()->getLayerController()->switchToLay(layerOfFinalizedSel);
+                    return SelectionFactory::createFromElementsOnActiveLayer(control, page, this,
+                                                                             selector->releaseElements());
+                }
+            }()
+                                          .release());
+        } else if (const double zoom = xournal->getZoom(); selector->userTapped(zoom)) {
+            if (aggregate) {
+                SelectObject(this).atAggregate(pos.x / zoom, pos.y / zoom);
+            } else {
+                SelectObject(this).at(pos.x / zoom, pos.y / zoom, this->selector->isMultiLayerSelection());
+            }
+        }
+        this->selector.reset();
+    } else if (this->textEditor) {
+        this->textEditor->mouseReleased();
+    }
+
+    if (this->imageSizeSelection) {
+        // size for image has been selected, now the image can be added
+        auto spaceForImage = this->imageSizeSelection->getSelectedSpace();
+        ImageHandler imgHandler(control);
+        imgHandler.insertImageWithSize(this->page, spaceForImage);
+
+        imageSizeSelection->finalize();
+        this->imageSizeSelection.reset();
+    }
+
+    return false;
+}
+
+auto XojPageView::onKeyPressEvent(const KeyEvent& event) -> bool {
+    if (this->textEditor) {
+        if (this->textEditor->onKeyPressEvent(event)) {
+            return true;
+        }
+    } else if (this->inputHandler) {
+        if (this->inputHandler->onKeyPressEvent(event)) {
+            return true;
+        }
+    } else if (this->verticalSpace) {
+        if (this->verticalSpace->onKeyPressEvent(event)) {
+            return true;
+        }
+    }
+
+    // Esc leaves text edition
+    if (event.keyval == GDK_KEY_Escape) {
+        if (this->textEditor) {
+            endText();
+            return true;
+        }
+
+        return false;
+    }
+
+    return false;
+}
+
+auto XojPageView::onKeyReleaseEvent(const KeyEvent& event) -> bool {
+    if (this->textEditor && this->textEditor->onKeyReleaseEvent(event)) {
+        return true;
+    }
+
+    if (this->inputHandler && this->inputHandler->onKeyReleaseEvent(event)) {
+        DrawingType drawingType = this->xournal->getControl()->getToolHandler()->getDrawingType();
+        if (drawingType == DRAWING_TYPE_SPLINE) {  // Spline drawing has been finalized
+            if (this->inputHandler) {
+                xoj_assert(hasNoViewOf(overlayViews, inputHandler.get()));
+                this->inputHandler.reset();
+            }
+        }
+
+        return true;
+    }
+
+    if (this->verticalSpace && this->verticalSpace->onKeyReleaseEvent(event)) {
+        return true;
+    }
+
+    return false;
+}
+
+void XojPageView::rerenderPage(bool sizeChanged) {
+    this->rerenderComplete = true;
+    this->sizeChanged = sizeChanged;
+    this->xournal->getControl()->getScheduler()->addRerenderPage(this);
+}
+
+void XojPageView::repaintPage() const { xournal->getRepaintHandler()->repaintPage(this); }
+
+void XojPageView::repaintArea(double x1, double y1, double x2, double y2) const {
+    double zoom = xournal->getZoom();
+    xournal->getRepaintHandler()->repaintPageArea(this, floor_cast<int>(x1 * zoom), floor_cast<int>(y1 * zoom),
+                                                  ceil_cast<int>(x2 * zoom), ceil_cast<int>(y2 * zoom));
+}
+
+void XojPageView::flagDirtyRegion(const Range& rg) const { repaintArea(rg.minX, rg.minY, rg.maxX, rg.maxY); }
+
+void XojPageView::drawAndDeleteToolView(xoj::view::ToolView* v, const Range& rg) {
+    if (v->isViewOf(this->inputHandler.get()) || v->isViewOf(this->verticalSpace.get()) ||
+        v->isViewOf(this->textEditor.get())) {
+        // Draw the inputHandler's view onto the page buffer.
+        std::lock_guard lock(this->drawingMutex);
+        if (auto cr = buffer.get(); cr) {
+            v->drawWithoutDrawingAids(cr);
+        } else {
+            rerenderPage();
+        }
+    }
+    this->deleteOverlayView(v, rg);
+}
+
+void XojPageView::deleteOverlayView(xoj::view::OverlayView* v, const Range& rg) {
+    this->deleteView(v);
+    if (!rg.empty()) {
+        xoj_assert(rg.isValid());
+        this->flagDirtyRegion(rg);
+    }
+}
+
+double XojPageView::getZoom() const { return xournal->getZoom(); }
+
+ZoomControl* XojPageView::getZoomControl() const { return this->getXournal()->getControl()->getZoomControl(); }
+
+Range XojPageView::getVisiblePart() const {
+    std::unique_ptr<xoj::util::Rectangle<double>> rect(xournal->getVisibleRect(this));
+    if (rect) {
+        return Range(*rect);
+    }
+    return Range();  // empty range
+}
+
+double XojPageView::getWidth() const { return page->getWidth(); }
+
+double XojPageView::getHeight() const { return page->getHeight(); }
+
+auto XojPageView::toWindowCoordinates(const xoj::util::Rectangle<double>& r) const -> xoj::util::Rectangle<double> {
+    double zoom = this->getZoom();
+    return {r.x * zoom + this->getX(), r.y * zoom + this->getY(), r.width * zoom, r.height * zoom};
+}
+
+void XojPageView::rerenderRect(double x, double y, double width, double height) {
+    if (this->rerenderComplete) {
+        return;
+    }
+
+    auto rect = Rectangle<double>{x, y, width, height};
+
+    this->repaintRectMutex.lock();
+
+    for (auto&& r: this->rerenderRects) {
+        // its faster to redraw only one rect than repaint twice the same area
+        // so loop through the rectangles to be redrawn, if new rectangle
+        // intersects any of them, replace it by the union with the new one
+        if (r.intersects(rect)) {
+            r.unite(rect);
+            this->repaintRectMutex.unlock();
+            return;
+        }
+    }
+
+    this->rerenderRects.push_back(rect);
+    this->repaintRectMutex.unlock();
+
+    this->xournal->getControl()->getScheduler()->addRerenderPage(this);
+}
+
+void XojPageView::setSelected(bool selected) {
+    this->selected = selected;
+
+    if (selected) {
+        this->xournal->requestFocus();
+        this->xournal->getRepaintHandler()->repaintPageBorder(this);
+    } else {
+        this->endSpline();
+    }
+}
+
+auto XojPageView::cut() -> bool {
+    if (this->textEditor) {
+        this->textEditor->cutToClipboard();
+        return true;
+    }
+    return false;
+}
+
+auto XojPageView::copy() -> bool {
+    if (this->textEditor) {
+        this->textEditor->copyToClipboard();
+        return true;
+    }
+    return false;
+}
+
+auto XojPageView::paste() -> bool {
+    if (this->textEditor) {
+        this->textEditor->pasteFromClipboard();
+        return true;
+    }
+    return false;
+}
+
+auto XojPageView::actionDelete() -> bool {
+    if (this->textEditor) {
+        this->textEditor->deleteFromCursor(GTK_DELETE_CHARS, 1);
+        return true;
+    }
+    return false;
+}
+
+void XojPageView::drawLoadingPage(cairo_t* cr) {
+    static const string txtLoading = _("Loading...");
+
+    cairo_set_source_rgb(cr, 1, 1, 1);
+    cairo_rectangle(cr, 0, 0, page->getWidth(), page->getHeight());
+    cairo_fill(cr);
+
+    cairo_set_source_rgb(cr, 0.5, 0.5, 0.5);
+    cairo_select_font_face(cr, "Sans", CAIRO_FONT_SLANT_NORMAL, CAIRO_FONT_WEIGHT_BOLD);
+    cairo_set_font_size(cr, 32.0);
+    cairo_text_extents_t ex;
+    cairo_text_extents(cr, txtLoading.c_str(), &ex);
+    cairo_move_to(cr, (page->getWidth() - ex.width) / 2 - ex.x_bearing,
+                  (page->getHeight() - ex.height) / 2 - ex.y_bearing);
+    cairo_text_path(cr, txtLoading.c_str());
+
+    rerenderPage();
+}
+
+bool XojPageView::displayLinkPopover(std::shared_ptr<XojPdfPage> page, double pageX, double pageY) {
+    // Search for selected link
+    const auto links = page->getLinks();
+
+    for (auto&& [rect, action]: links) {
+        std::shared_ptr<const LinkDestination> dest = action->getDestination();
+
+        if (!(rect.x1 <= pageX && pageX <= rect.x2 && rect.y1 <= pageY && pageY <= rect.y2)) {
+            continue;
+        }
+
+        GtkWidget* box = gtk_box_new(GTK_ORIENTATION_VERTICAL, 5);
+        GtkWidget* popover = makePopover(rect, box);
+
+        if (auto uriOpt = dest->getURI()) {
+            const std::string& uri = uriOpt.value();
+            char* uriLabel = g_markup_escape_text(uri.c_str(), -1);
+
+            auto labelMarkup = serdes_stream<std::stringstream>();
+            labelMarkup << "<a href=" << std::quoted(uri) << ">" << uriLabel << "</a>";
+
+            std::string linkMarkup = labelMarkup.str();
+
+            g_free(uriLabel);
+
+            GtkWidget* label = gtk_label_new(nullptr);
+            gtk_label_set_markup(GTK_LABEL(label), linkMarkup.c_str());
+            gtk_box_append(GTK_BOX(box), label);
+        } else {
+            size_t pdfPage = dest->getPdfPage();
+
+            Document* doc = xournal->getControl()->getDocument();
+            doc->lock_shared();
+            const size_t pageId = doc->findPdfPage(pdfPage);
+            doc->unlock_shared();
+
+            GtkWidget* button{};
+            if (pageId != npos) {
+                const auto pageNo = static_cast<int64_t>(pageId + 1);
+                button = gtk_button_new_with_label(FC(_F("Scroll to page {1}") % pageNo));
+            } else {
+                button = gtk_button_new_with_label(FC(_F("Add missing page")));
+            }
+            gtk_box_append(GTK_BOX(box), button);
+
+            using State = std::tuple<XojPageView*, std::shared_ptr<const LinkDestination>, GtkWidget*>;
+            g_signal_connect_data(GTK_BUTTON(button), "clicked", G_CALLBACK(+[](GtkButton* bt, gpointer state) {
+                                      XojPageView* self;
+                                      std::shared_ptr<const LinkDestination> dest;
+                                      GtkWidget* popover;
+                                      std::tie(self, dest, popover) = *static_cast<State*>(state);
+
+                                      self->getXournal()->getControl()->getScrollHandler()->scrollToLinkDest(*dest);
+                                      gtk_popover_popdown(GTK_POPOVER(popover));
+                                  }),
+                                  new State(this, dest, popover), xoj::util::closure_notify_cb<State>,
+                                  (GConnectFlags)0);
+        }
+
+        gtk_widget_show_all(popover);
+        gtk_popover_popup(GTK_POPOVER(popover));
+        return true;
+    }
+
+    return false;
+}
+
+GtkWidget* XojPageView::makePopover(const XojPdfRectangle& rect, GtkWidget* child) {
+    double zoom = xournal->getZoom();
+
+    GtkWidget* popover = gtk_popover_new(this->getXournal()->getWidget());
+    gtk_popover_set_child(GTK_POPOVER(popover), child);
+
+    auto x = floor_cast<int>(this->getX() + rect.x1 * zoom);
+    auto y = floor_cast<int>(this->getY() + rect.y1 * zoom);
+    auto w = ceil_cast<int>((rect.x2 - rect.x1) * zoom);
+    auto h = ceil_cast<int>((rect.y2 - rect.y1) * zoom);
+
+    GdkRectangle canvasRect{x, y, w, h};
+    gtk_popover_set_pointing_to(GTK_POPOVER(popover), &canvasRect);
+    gtk_popover_set_constrain_to(GTK_POPOVER(popover), GTK_POPOVER_CONSTRAINT_WINDOW);
+
+    return popover;
+}
+
+auto XojPageView::paintPage(cairo_t* cr, GdkRectangle* rect) -> bool {
+
+    double zoom = xournal->getZoom();
+    xoj::util::CairoSaveGuard saveGuard(cr);
+    cairo_scale(cr, zoom, zoom);
+
+    {
+        std::lock_guard lock(this->drawingMutex);  // Lock the mutex first
+        xoj::util::CairoSaveGuard saveGuard(cr);   // see comment at the end of the scope
+        if (!this->hasBuffer()) {
+            drawLoadingPage(cr);
+            return true;
+        }
+
+        if (this->buffer.getZoom() != zoom) {
+            rerenderPage();
+            cairo_pattern_set_filter(cairo_get_source(cr), CAIRO_FILTER_FAST);
+        }
+        this->buffer.paintTo(cr);
+    }  // Restore the state of cr and then release the mutex
+       // restoring the state of cr ensures this->buffer.surface is not longer referenced as the source in cr.
+
+    /**
+     * All the overlay painters below follow the assumption:
+     *  * The given cairo context is in page coordinates: no further scaling/offset is ever required.
+     *
+     * To anyone adding another painter here: please keep this assumption true
+     */
+    for (const auto& v: this->overlayViews) {
+        v->draw(cr);
+    }
+
+    return true;
+}
+
+/**
+ * GETTER / SETTER
+ */
+
+auto XojPageView::isSelected() const -> bool { return selected; }
+
+auto XojPageView::hasBuffer() const -> bool { return this->buffer.isInitialized(); }
+
+auto XojPageView::getSelectionColor() -> GdkRGBA { return Util::rgb_to_GdkRGBA(settings->getSelectionColor()); }
+
+auto XojPageView::getTextEditor() -> TextEditor* { return textEditor.get(); }
+
+auto XojPageView::getX() const -> int { return this->dispX; }
+
+void XojPageView::setX(int x) { this->dispX = x; }
+
+auto XojPageView::getY() const -> int { return this->dispY; }
+
+void XojPageView::setY(int y) { this->dispY = y; }
+
+void XojPageView::setMappedRowCol(int row, int col) {
+    this->mappedRow = row;
+    this->mappedCol = col;
+}
+
+
+auto XojPageView::getMappedRow() const -> int { return this->mappedRow; }
+
+
+auto XojPageView::getMappedCol() const -> int { return this->mappedCol; }
+
+
+auto XojPageView::getPage() const -> const PageRef { return page; }
+
+auto XojPageView::getXournal() const -> XournalView* { return this->xournal; }
+
+auto XojPageView::getDisplayWidth() const -> int {
+    return round_cast<int>(this->page->getWidth() * this->xournal->getZoom());
+}
+
+auto XojPageView::getDisplayHeight() const -> int {
+    return round_cast<int>(this->page->getHeight() * this->xournal->getZoom());
+}
+
+auto XojPageView::getDisplayWidthDouble() const -> double { return this->page->getWidth() * this->xournal->getZoom(); }
+
+auto XojPageView::getDisplayHeightDouble() const -> double {
+    return this->page->getHeight() * this->xournal->getZoom();
+}
+
+auto XojPageView::getSelectedTex() const -> const TexImage* {
+    EditSelection* theSelection = this->xournal->getSelection();
+    if (!theSelection) {
+        return nullptr;
+    }
+
+    for (const Element* e: theSelection->getElementsView()) {
+        if (e->getType() == ELEMENT_TEXIMAGE) {
+            return dynamic_cast<const TexImage*>(e);
+        }
+    }
+    return nullptr;
+}
+
+auto XojPageView::getSelectedText() const -> const Text* {
+    EditSelection* theSelection = this->xournal->getSelection();
+    if (!theSelection) {
+        return nullptr;
+    }
+
+    for (const Element* e: theSelection->getElementsView()) {
+        if (e->getType() == ELEMENT_TEXT) {
+            return dynamic_cast<const Text*>(e);
+        }
+    }
+    return nullptr;
+}
+
+auto XojPageView::getRect() const -> Rectangle<double> {
+    return Rectangle<double>(getX(), getY(), getDisplayWidth(), getDisplayHeight());
+}
+
+void XojPageView::rectChanged(Rectangle<double>& rect) { rerenderRect(rect.x, rect.y, rect.width, rect.height); }
+
+void XojPageView::rangeChanged(Range& range) { rerenderRange(range); }
+
+void XojPageView::pageChanged() { rerenderPage(); }
+
+void XojPageView::elementChanged(const Element* elem) {
+    /*
+     * The input handlers issue an elementChanged event when creating an element.
+     * There is however no need to redraw the element in this case: the element was already painted to the buffer via a
+     * call to drawAndDeleteToolView
+     * There are a couple of exceptions:
+     *  * if the added element is not on the top-most layer, a rerendering is required to draw it under the upper layers
+     *  * if the added element overflows out of the visible part of the page, the ToolView may not have drawn to the
+     *    page buffer the part outside the visible area. Rerendering as well
+     */
+    const bool noRerender = inputHandler && elem == inputHandler->getStroke() &&
+                            page->getSelectedLayerId() == page->getLayerCount() &&
+                            getVisiblePart().contains(elem->boundingRect());
+    if (!noRerender) {
+        rerenderElement(elem);
+    }
+}
+
+void XojPageView::elementsChanged(const std::vector<const Element*>& elements, const Range& range) {
+    if (!range.empty()) {
+        rerenderRange(range);
+    }
+}
+
+void XojPageView::showFloatingToolbox(const PositionInputData& pos) {
+    Control* control = xournal->getControl();
+
+    gint wx = 0, wy = 0;
+    GtkWidget* widget = xournal->getWidget();
+    gtk_widget_translate_coordinates(widget, gtk_widget_get_toplevel(widget), 0, 0, &wx, &wy);
+
+    wx += round_cast<int>(pos.x) + this->getX();
+    wy += round_cast<int>(pos.y) + this->getY();
+
+    control->getWindow()->getFloatingToolbox()->show(wx, wy);
+}
diff --git a/entry/src/main/cpp/src/core/gui/PageView.h b/entry/src/main/cpp/src/core/gui/PageView.h
new file mode 100644
index 0000000..0d2ce7f
--- /dev/null
+++ b/entry/src/main/cpp/src/core/gui/PageView.h
@@ -0,0 +1,323 @@
+/*
+ * Xournal++
+ *
+ * Displays a single page
+ *
+ * @author Xournal++ Team
+ * https://github.com/xournalpp/xournalpp
+ *
+ * @license GNU GPLv2 or later
+ */
+
+#pragma once
+
+#include <cstddef>  // for size_t
+#include <memory>   // for unique_ptr, shared_ptr
+#include <mutex>    // for mutex
+#include <string>   // for string
+#include <vector>   // for vector
+
+#include <cairo.h>    // for cairo_t
+#include <gdk/gdk.h>  // for GdkEventKey, GdkRGBA, GdkRectangle
+#include <gtk/gtk.h>  // for GtkWidget
+
+#include "gui/inputdevices/DeviceId.h"
+#include "gui/inputdevices/InputEvents.h"
+#include "model/PageListener.h"       // for PageListener
+#include "model/PageRef.h"            // for PageRef
+#include "util/Rectangle.h"           // for Rectangle
+#include "util/raii/CairoWrappers.h"  // for CairoSurfaceSPtr
+#include "view/Mask.h"                // for Mask
+#include "view/Repaintable.h"         // for Repaintable
+
+#include "Layout.h"            // for Layout
+#include "LegacyRedrawable.h"  // for LegacyRedrawable
+
+class EraseHandler;
+class ImageSizeSelection;
+class InputHandler;
+class LaserPointerHandler;
+class SearchControl;
+class Selector;
+class Settings;
+class Text;
+class TextEditor;
+class VerticalToolHandler;
+class XournalView;
+class Element;
+class PositionInputData;
+class Range;
+class TexImage;
+class XojPdfRectangle;
+class XojPdfPage;
+
+namespace xoj::view {
+class OverlayView;
+class ToolView;
+}  // namespace xoj::view
+
+class XojPageView: public LegacyRedrawable, public PageListener, public xoj::view::Repaintable {
+public:
+    XojPageView(XournalView* xournal, const PageRef& page);
+    ~XojPageView() override;
+
+public:
+    void addOverlayView(std::unique_ptr<xoj::view::OverlayView>);
+    void rerenderPage(bool sizeChanged = false) override;
+    void rerenderRect(double x, double y, double width, double height) override;
+
+    void repaintPage() const override;
+    void repaintArea(double x1, double y1, double x2, double y2) const override;
+
+    // Repaintable interface
+    void flagDirtyRegion(const Range& rg) const override;
+    /**
+     * @brief This draws the ToolView directly onto the buffer, deletes the view and repaints the given range
+     *      Used to avoid blinking when a tool finished editing an element
+     */
+    void drawAndDeleteToolView(xoj::view::ToolView* v, const Range& rg) override;
+    /**
+     * @brief Simply deletes an overlay and any trace of it on the display (provided the overlay is contained in the
+     * given range)
+     */
+    void deleteOverlayView(xoj::view::OverlayView* v, const Range& rg) override;
+
+    double getZoom() const override;
+    ZoomControl* getZoomControl() const override;
+    Range getVisiblePart() const override;
+
+    double getWidth() const override;
+    double getHeight() const override;
+    // End of Repaintable interface
+
+    xoj::util::Rectangle<double> toWindowCoordinates(const xoj::util::Rectangle<double>& r) const override;
+
+
+    void setSelected(bool selected);
+
+    void setIsVisible(bool visible);
+
+    bool isSelected() const;
+    inline bool isVisible() const { return visible; }
+
+    void endText();
+
+    void endSpline();
+
+    bool searchTextOnPage(const std::string& text, size_t index, size_t* occurrences, XojPdfRectangle* matchRect);
+
+    bool onKeyPressEvent(const KeyEvent& event);
+    bool onKeyReleaseEvent(const KeyEvent& event);
+
+    bool cut();
+    bool copy();
+    bool paste();
+
+    bool actionDelete();
+
+    void deleteViewBuffer() override;
+
+    /**
+     * Returns whether this PageView contains the
+     * given point on the display
+     */
+    bool containsPoint(int x, int y, bool local = false) const;
+
+    /**
+     * Returns Row assigned in current layout
+     */
+    int getMappedRow() const;
+
+    /**
+     * Returns Column assigned in current layout
+     */
+    int getMappedCol() const;
+
+    GdkRGBA getSelectionColor() override;
+    bool hasBuffer() const;
+
+    TextEditor* getTextEditor();
+
+    /**
+     * Returns a reference to the XojPage belonging to
+     * this PageView
+     */
+    const PageRef getPage() const;
+
+    XournalView* getXournal() const;
+
+    /**
+     * Returns the width of this XojPageView as displayed
+     * on the display taking into account the current zoom
+     */
+    int getDisplayWidth() const;
+    double getDisplayWidthDouble() const;
+    /**
+     * Returns the height of this XojPageView as displayed
+     * on the display taking into account the current zoom
+     */
+    int getDisplayHeight() const;
+    double getDisplayHeightDouble() const;
+
+    /**
+     * Returns the x coordinate of this XojPageView with
+     * respect to the display
+     */
+    int getX() const override;
+
+    /**
+     * Returns the y coordinate of this XojPageView with
+     * respect to the display
+     */
+    int getY() const override;
+
+    const TexImage* getSelectedTex() const;
+    const Text* getSelectedText() const;
+
+    xoj::util::Rectangle<double> getRect() const;
+
+public:  // event handler
+    bool onButtonPressEvent(const PositionInputData& pos);
+    bool onButtonReleaseEvent(const PositionInputData& pos);
+    bool onButtonDoublePressEvent(const PositionInputData& pos);
+    bool onButtonTriplePressEvent(const PositionInputData& pos);
+    bool onMotionNotifyEvent(const PositionInputData& pos);
+    void onSequenceCancelEvent(DeviceId id);
+    void onTapEvent(const PositionInputData& pos);
+
+    /**
+     * This event fires after onButtonPressEvent and also
+     * if no input sequence is actively running and a stylus button was pressed
+     */
+    bool onButtonClickEvent(const PositionInputData& pos);
+
+    /**
+     * This method actually repaints the XojPageView, triggering
+     * a rerender call if necessary
+     */
+    bool paintPage(cairo_t* cr, GdkRectangle* rect);
+
+    void deleteLaserPointerHandler();
+
+public:  // listener
+    void rectChanged(xoj::util::Rectangle<double>& rect) override;
+    void rangeChanged(Range& range) override;
+    void pageChanged() override;
+    void elementChanged(const Element* elem) override;
+    void elementsChanged(const std::vector<const Element*>& elements, const Range& range) override;
+
+private:
+    void startText(double x, double y);
+
+    void drawLoadingPage(cairo_t* cr);
+
+    /**
+     * @brief Make and display a popover dialog near the given location.
+     *
+     * @param rect specifies the location of the dialog.
+     * @param child is added to the dialog before displaying.
+     * @returns a pointer to the popover dialog.
+     */
+    GtkWidget* makePopover(const XojPdfRectangle& rect, GtkWidget* child);
+
+    /**
+     * @brief Display a popover with link-related actions, if one
+     *  is at a given location on the page.
+     *
+     * @param page is the current page
+     * @param targetX
+     * @param targetY the link must contain (targetX, targetY)
+     * @returns true iff a URI link exists near/at (targetX, targetY) => a popover was shown
+     */
+    bool displayLinkPopover(std::shared_ptr<XojPdfPage> page, double targetX, double targetY);
+
+    void setX(int x);
+    void setY(int y);
+
+    void setMappedRowCol(int row, int col);  // row, column assigned by mapper during layout.
+
+    /**
+     * Shows the floating toolbox at the location of an input event
+     */
+    void showFloatingToolbox(const PositionInputData& pos);
+
+    /**
+     * Shows the PDF toolbox at the location of an input event
+     */
+    void showPdfToolbox(const PositionInputData& pos);
+
+    void deleteView(xoj::view::OverlayView* v);
+
+private:
+    PageRef page;
+    XournalView* xournal = nullptr;
+    Settings* settings = nullptr;
+    std::unique_ptr<EraseHandler> eraser;
+    std::unique_ptr<InputHandler> inputHandler;
+
+    std::vector<std::unique_ptr<xoj::view::OverlayView>> overlayViews;
+
+    /**
+     * The selected (while selection)
+     */
+    std::unique_ptr<Selector> selector;
+
+    /**
+     * The text editor
+     */
+    std::unique_ptr<TextEditor> textEditor;
+
+    /**
+     * For image insertion with size (selects the size)
+     */
+    std::unique_ptr<ImageSizeSelection> imageSizeSelection;
+
+    std::unique_ptr<LaserPointerHandler> laserPointer;
+
+    /**
+     * For keeping old text changes to undo!
+     */
+    Text* oldtext;
+
+    bool visible = true;
+    bool selected = false;
+
+    xoj::view::Mask buffer;
+    std::mutex drawingMutex;
+
+    bool inEraser = false;
+
+    /**
+     * Vertical Space
+     */
+    std::unique_ptr<VerticalToolHandler> verticalSpace;
+
+    /**
+     * Search handling
+     */
+    std::unique_ptr<SearchControl> search;
+
+    std::mutex repaintRectMutex;
+    std::vector<xoj::util::Rectangle<double>> rerenderRects;
+    bool rerenderComplete = false;
+    bool sizeChanged = false;
+
+    int dispX{};  // position on display - set in Layout::layoutPages
+    int dispY{};
+
+
+    int mappedRow{};
+    int mappedCol{};
+
+    DeviceId currentSequenceDeviceId;
+
+
+    friend class RenderJob;
+    friend class InputHandler;
+    friend class BaseSelectObject;
+    friend class SelectObject;
+    friend class PlayObject;
+    friend class PdfFloatingToolbox;
+    // only function allowed to setX(), setY(), setMappedRowCol():
+    friend void Layout::layoutPages(int width, int height);
+};
diff --git a/entry/src/main/cpp/src/core/gui/PageViewFindObjectHelper.h b/entry/src/main/cpp/src/core/gui/PageViewFindObjectHelper.h
new file mode 100644
index 0000000..661abe4
--- /dev/null
+++ b/entry/src/main/cpp/src/core/gui/PageViewFindObjectHelper.h
@@ -0,0 +1,204 @@
+/*
+ * Xournal++
+ *
+ * Helper classes to find / select objects
+ *
+ * @author Xournal++ Team
+ * https://github.com/xournalpp/xournalpp
+ *
+ * @license GNU GPLv2 or later
+ */
+
+#pragma once
+
+// No include needed, this is included after PageView.h
+
+#include <limits>
+#include <mutex>
+#include <optional>
+
+#include "control/AudioController.h"
+#include "control/Control.h"
+#include "control/layer/LayerController.h"
+#include "control/settings/Settings.h"
+#include "control/tools/EditSelection.h"
+#include "gui/PageView.h"
+#include "model/Layer.h"
+#include "model/XojPage.h"
+#include "util/safe_casts.h"
+
+#include "XournalView.h"
+
+class BaseSelectObject {
+public:
+    BaseSelectObject(XojPageView* view): view(view) {}
+
+    virtual ~BaseSelectObject() = default;
+
+public:
+    bool findAt(double x, double y, bool multiLayer = false, bool clearSelection = true) {
+        this->x = x;
+        this->y = y;
+
+        Control* ctrl = this->view->getXournal()->getControl();
+
+        if (clearSelection) {
+            ctrl->clearSelection();
+        }
+
+        std::shared_lock lock(*ctrl->getDocument());
+        if (multiLayer) {
+            const auto& layers = this->view->getPage()->getLayers();
+            size_t layerNo = layers.size();
+            for (auto l = layers.rbegin(); l != layers.rend(); l++, layerNo--) {
+                if (checkLayer(*l)) {
+                    ctrl->getLayerController()->switchToLay(as_unsigned(std::distance(l, layers.rend())));
+                    return true;
+                }
+            }
+            return false;
+        } else {
+            Layer* layer = this->view->getPage()->getSelectedLayer();
+            return checkLayer(layer);
+        }
+    }
+
+protected:
+    virtual bool checkLayer(const Layer* l) = 0;
+
+protected:
+    XojPageView* view{};
+    double x{0};
+    double y{0};
+};
+
+class SelectObject: public BaseSelectObject {
+public:
+    SelectObject(XojPageView* view): BaseSelectObject(view), match(nullptr) {}
+
+    ~SelectObject() override = default;
+
+    bool at(double x, double y, bool multiLayer = false) {
+        findAt(x, y, multiLayer);
+
+        if (match) {
+            Control* ctrl = view->getXournal()->getControl();
+            auto sel = SelectionFactory::createFromElementOnActiveLayer(ctrl, view->getPage(), view, match, matchIndex);
+            view->xournal->setSelection(sel.release());
+            view->repaintPage();
+            return true;
+        }
+
+        return false;
+    }
+
+    bool atAggregate(double x, double y) {
+        EditSelection* previousSelection = view->getXournal()->getSelection();
+        xoj_assert(previousSelection);
+
+        findAt(x, y, false, false);
+        if (match) {
+            auto sel = SelectionFactory::addElementFromActiveLayer(view->getXournal()->getControl(), previousSelection,
+                                                                   match, matchIndex);
+            view->getXournal()->setSelection(sel.release());
+            view->repaintPage();
+
+            return true;
+        }
+        return false;
+    }
+
+    static constexpr double ACTION_RADIUS = 5.;
+
+    bool checkLayer(const Layer* l) override {
+        double minDistance = ACTION_RADIUS;
+        // Iterate starting from the front-most element
+        Element::Index pos = as_signed(l->getElementsView().size());
+        for (auto it = l->getElementsView().rbegin(); it < l->getElementsView().rend(); ++it) {
+            pos--;
+            // First perform a rough check to avoid expensive calls to Stroke::distanceTo()
+            if ((*it)->intersectsArea(x - minDistance, y - minDistance, 2. * minDistance, 2. * minDistance)) {
+                double d = (*it)->distanceTo(x, y);
+                if (d == 0.0) {
+                    this->match = *it;
+                    this->matchIndex = pos;
+                    return true;
+                }
+                if (d < minDistance) {
+                    this->match = *it;
+                    this->matchIndex = pos;
+                    minDistance = d;
+                    // Keep going, we may find something closer
+                }
+            }
+        }
+        return minDistance != ACTION_RADIUS;
+    }
+
+private:
+    const Element* match;
+    Element::Index matchIndex;
+};
+
+class PlayObject: public BaseSelectObject {
+public:
+    PlayObject(XojPageView* view): BaseSelectObject(view), playbackStatus() {}
+
+    ~PlayObject() override = default;
+
+    struct Status {
+        bool success;
+        fs::path filename;
+    };
+
+    std::optional<Status> playbackStatus;
+
+public:
+    bool at(double x, double y, bool multiLayer = false) { return findAt(x, y, multiLayer); }
+
+protected:
+    static constexpr double ACTION_RADIUS = 15.;
+
+    /// Plays every element of the layer that are closer than ACTION_RADIUS
+    bool checkLayer(const Layer* l) override {
+        bool found = false;
+        for (auto&& e: l->getElementsView()) {
+            if (auto* audio = dynamic_cast<const AudioElement*>(e); audio) {
+                // First perform a rough check to avoid expensive calls to Stroke::distanceTo()
+                if (audio->intersectsArea(x - ACTION_RADIUS, y - ACTION_RADIUS, 2. * ACTION_RADIUS,
+                                          2. * ACTION_RADIUS)) {
+                    double d = audio->distanceTo(x, y);
+                    if (d < ACTION_RADIUS) {
+                        found = playElement(audio) || found;
+                    }
+                }
+            }
+        }
+        return found;
+    }
+
+    bool playElement(const AudioElement* s) {
+#ifdef ENABLE_AUDIO
+        size_t ts = s->getTimestamp();
+
+        if (auto fn = s->getAudioFilename(); !fn.empty()) {
+            if (!fn.has_parent_path() || fs::weakly_canonical(fn.parent_path()) == "/") {
+                auto const& path = view->settings->getAudioFolder();
+                // Assume path exists
+                fn = path / fn;
+            }
+            auto* audioController = view->getXournal()->getControl()->getAudioController();
+            if (!audioController) {
+                g_warning("Audio has been disabled");
+                return false;
+            }
+            bool success = audioController->startPlayback(fn, (unsigned int)ts);
+            playbackStatus = {success, std::move(fn)};
+            return success;
+        }
+#else
+        g_warning("Audio support was disabled at compile time");
+#endif
+        return false;
+    }
+};
diff --git a/entry/src/main/cpp/src/core/gui/PaperFormatUtils.cpp b/entry/src/main/cpp/src/core/gui/PaperFormatUtils.cpp
new file mode 100644
index 0000000..637a573
--- /dev/null
+++ b/entry/src/main/cpp/src/core/gui/PaperFormatUtils.cpp
@@ -0,0 +1,57 @@
+#include "PaperFormatUtils.h"
+
+#include "util/GListView.h"
+#include "util/StringUtils.h"
+#include "util/raii/GObjectSPtr.h"
+
+using xoj::util::GtkPaperSizeUPtr;
+
+void PaperFormatUtils::loadDefaultPaperSizes(PaperFormatMenuOptionVector& paperSizes) {
+    GList* default_sizes = gtk_paper_size_get_paper_sizes(false);
+    for (auto& s: GListView<GtkPaperSize>(default_sizes)) {
+        std::string name = gtk_paper_size_get_name(&s);
+        if (name == GTK_PAPER_NAME_A3 || name == GTK_PAPER_NAME_A4 || name == GTK_PAPER_NAME_A5 ||
+            name == GTK_PAPER_NAME_LETTER || name == GTK_PAPER_NAME_LEGAL) {
+            paperSizes.emplace_back(GtkPaperSizeUPtr(&s));
+        } else {
+            gtk_paper_size_free(&s);
+        }
+    }
+    g_list_free(default_sizes);
+
+    // Name format: ftp://ftp.pwg.org/pub/pwg/candidates/cs-pwgmsn10-20020226-5101.1.pdf
+    paperSizes.emplace_back(GtkPaperSizeUPtr(gtk_paper_size_new("custom_16x9_320x180mm")));
+    paperSizes.emplace_back(GtkPaperSizeUPtr(gtk_paper_size_new("custom_4x3_320x240mm")));
+}
+void PaperFormatUtils::fillPaperFormatDropDown(const PaperFormatMenuOptionVector& menuOptions,
+                                               GtkComboBox* paperFormatComboBox) {
+    // Todo (gtk4) Use GtkDropDown instead and use another model accordingly
+    GtkCellRenderer* cell = gtk_cell_renderer_text_new();
+    gtk_cell_layout_pack_start(GTK_CELL_LAYOUT(paperFormatComboBox), cell, true);
+    gtk_cell_layout_set_attributes(GTK_CELL_LAYOUT(paperFormatComboBox), cell, "text", 0, nullptr);
+
+    GtkListStore* store = gtk_list_store_new(2, G_TYPE_STRING, G_TYPE_POINTER);
+    gtk_combo_box_set_model(GTK_COMBO_BOX(paperFormatComboBox), GTK_TREE_MODEL(store));
+    g_object_unref(store);  // store is now owned by paperFormatComboBox
+
+    for (auto& menuOption: menuOptions) {
+        GtkTreeIter iter;
+        gtk_list_store_append(store, &iter);
+
+        if (menuOption.index()) {
+            auto& size = std::get<GtkPaperSizeUPtr>(menuOption);
+
+            std::string displayName = gtk_paper_size_get_display_name(size.get());
+            if (StringUtils::startsWith(displayName, "custom_")) {
+                displayName = displayName.substr(7);
+            }
+            gtk_list_store_set(store, &iter, 0, displayName.c_str(), -1);
+            gtk_list_store_set(store, &iter, 1, size.get(), -1);
+        } else {
+            // When special non-GtkPaperSize option
+            const std::string_view displayName = std::get<std::string>(menuOption);
+            gtk_list_store_set(store, &iter, 0, displayName.data(), -1);
+            gtk_list_store_set(store, &iter, 1, nullptr, -1);
+        }
+    }
+}
diff --git a/entry/src/main/cpp/src/core/gui/PaperFormatUtils.h b/entry/src/main/cpp/src/core/gui/PaperFormatUtils.h
new file mode 100644
index 0000000..95b1c6b
--- /dev/null
+++ b/entry/src/main/cpp/src/core/gui/PaperFormatUtils.h
@@ -0,0 +1,42 @@
+/*
+ * Xournal++
+ *
+ * Paper format utilities
+ *
+ * @author Xournal++ Team
+ * https://github.com/xournalpp/xournalpp
+ *
+ * @license GNU GPLv2 or later
+ */
+
+#include <memory>
+#include <variant>
+#include <vector>
+
+#include <gtk/gtk.h>
+
+#include "util/raii/GtkPaperSizeUPtr.h"
+
+#pragma once
+
+namespace PaperFormatUtils {
+/**
+ * @brief A vector of menu options, either being a GtkPaperSize or the displayed name of the option.
+ * @details The variant facilitates adding options which can't be expressed as a GtkPaperSize (e.g. a custom option
+ *      or a copy current page format option)
+ */
+using PaperFormatMenuOptionVector = std::vector<std::variant<std::string, xoj::util::GtkPaperSizeUPtr>>;
+
+/**
+ * @brief Loads the default PaperSizes into the passed vector
+ * @param menuOptions The vector containg the menu options
+ */
+void loadDefaultPaperSizes(PaperFormatMenuOptionVector& menuOptions);
+
+/**
+ * @brief Adds the entries passed as vector of GtkPaperSize entries and/or special entries to the given combo box
+ * @param menuOptions The vector of menu options
+ * @param paperFormatComboBox A pointer to the combo box which should be configured as a paper format dropdown
+ */
+void fillPaperFormatDropDown(const PaperFormatMenuOptionVector& menuOptions, GtkComboBox* paperFormatComboBox);
+}  // namespace PaperFormatUtils
\ No newline at end of file
diff --git a/entry/src/main/cpp/src/core/gui/PdfFloatingToolbox.cpp b/entry/src/main/cpp/src/core/gui/PdfFloatingToolbox.cpp
new file mode 100644
index 0000000..7f589e7
--- /dev/null
+++ b/entry/src/main/cpp/src/core/gui/PdfFloatingToolbox.cpp
@@ -0,0 +1,239 @@
+#include "PdfFloatingToolbox.h"
+
+#include <algorithm>  // for max, min
+#include <cmath>      // for abs
+#include <cstddef>    // for size_t
+#include <memory>
+#include <string>   // for string
+#include <utility>  // for move
+#include <vector>   // for vector
+
+#include <glib-object.h>  // for G_CALLBACK, g_signal_connect
+#include <gtk/gtk.h>
+
+#include "control/Control.h"      // for Control
+#include "control/ToolEnums.h"    // for ToolType, TOOL_SELECT_PDF_TEXT_LI...
+#include "control/ToolHandler.h"  // for ToolHandler
+#include "control/tools/PdfElemSelection.h"
+#include "gui/PageView.h"           // for XojPageView
+#include "gui/XournalView.h"        // for XournalView
+#include "model/Document.h"         // for Document
+#include "model/Layer.h"            // for Layer
+#include "model/PageRef.h"          // for PageRef
+#include "model/Point.h"            // for Point
+#include "model/Stroke.h"           // for Stroke, BUTT, StrokeTool::HIGHLIG...
+#include "model/XojPage.h"          // for XojPage
+#include "undo/GroupUndoAction.h"   // for GroupUndoAction
+#include "undo/InsertUndoAction.h"  // for InsertUndoAction
+#include "undo/UndoAction.h"        // for UndoAction
+#include "undo/UndoRedoHandler.h"   // for UndoRedoHandler
+#include "util/Assert.h"            // for xoj_assert
+#include "util/gtk4_helper.h"       // for gtk_widget_get_clipboard
+
+#include "MainWindow.h"  // for MainWindow
+
+PdfFloatingToolbox::PdfFloatingToolbox(MainWindow* theMainWindow, GtkOverlay* overlay):
+        theMainWindow(theMainWindow), overlay(overlay, xoj::util::ref), position({0, 0}) {
+    this->floatingToolbox = theMainWindow->get("pdfFloatingToolbox");
+
+    gtk_overlay_add_overlay(overlay, this->floatingToolbox);
+    gtk_overlay_set_overlay_pass_through(overlay, this->floatingToolbox, true);
+
+    g_signal_connect(overlay, "get-child-position", G_CALLBACK(this->getOverlayPosition), this);
+
+    g_signal_connect(theMainWindow->get("pdfTbHighlight"), "clicked", G_CALLBACK(this->highlightCb), this);
+    g_signal_connect(theMainWindow->get("pdfTbCopyText"), "clicked", G_CALLBACK(this->copyTextCb), this);
+    g_signal_connect(theMainWindow->get("pdfTbUnderline"), "clicked", G_CALLBACK(this->underlineCb), this);
+    g_signal_connect(theMainWindow->get("pdfTbStrikethrough"), "clicked", G_CALLBACK(this->strikethroughCb), this);
+    g_signal_connect(theMainWindow->get("pdfTbChangeType"), "clicked", G_CALLBACK(this->switchSelectTypeCb), this);
+
+    this->clearSelection();
+    this->hide();
+}
+
+PdfFloatingToolbox::~PdfFloatingToolbox() = default;
+
+PdfElemSelection* PdfFloatingToolbox::getSelection() const { return this->pdfElemSelection.get(); }
+bool PdfFloatingToolbox::hasSelection() const { return this->getSelection() != nullptr; }
+
+void PdfFloatingToolbox::clearSelection() { this->pdfElemSelection.reset(); }
+
+auto PdfFloatingToolbox::newSelection(double x, double y) -> const PdfElemSelection* {
+    this->pdfElemSelection = std::make_unique<PdfElemSelection>(x, y, this->theMainWindow->getControl());
+    return this->pdfElemSelection.get();
+}
+
+void PdfFloatingToolbox::show(int x, int y) {
+    xoj_assert(this->getSelection());
+
+    // (x, y) are in the gtk window's coordinates.
+    // However, we actually show the toolbox in the overlay's coordinate system.
+    gtk_widget_translate_coordinates(gtk_widget_get_toplevel(this->floatingToolbox), GTK_WIDGET(overlay.get()), x, y,
+                                     &this->position.x, &this->position.y);
+    this->show();
+
+    // Record the color now: the active tool may change while the toolbox is up (e.g. if the tool is linked to a button)
+    this->color = theMainWindow->getXournal()->getControl()->getToolHandler()->getColor();
+}
+
+void PdfFloatingToolbox::hide() {
+    if (isHidden())
+        return;
+
+    gtk_widget_hide(this->floatingToolbox);
+}
+
+auto PdfFloatingToolbox::getOverlayPosition(GtkOverlay* overlay, GtkWidget* widget, GdkRectangle* allocation,
+                                            PdfFloatingToolbox* self) -> gboolean {
+    if (widget == self->floatingToolbox) {
+        // Get existing width and height
+        GtkRequisition natural;
+        gtk_widget_get_preferred_size(widget, nullptr, &natural);
+        allocation->width = natural.width;
+        allocation->height = natural.height;
+
+        // Make sure the "pdfFloatingToolbox" is fully displayed.
+        const int gap = 5;
+
+        // By default, we show the toolbox below and to the right of the selected text.
+        // If the toolbox will go out of the window, then we'll flip the corresponding directions.
+
+        GtkAllocation windowAlloc{};
+        gtk_widget_get_allocation(GTK_WIDGET(overlay), &windowAlloc);
+
+        bool rightOK = self->position.x + allocation->width + gap <= windowAlloc.width;
+        bool bottomOK = self->position.y + allocation->height + gap <= windowAlloc.height;
+
+        allocation->x = rightOK ? self->position.x + gap : self->position.x - allocation->width - gap;
+        allocation->y = bottomOK ? self->position.y + gap : self->position.y - allocation->height - gap;
+
+        return true;
+    }
+
+    return false;
+}
+
+void PdfFloatingToolbox::userCancelSelection() {
+    this->pdfElemSelection.reset();
+    this->hide();
+}
+
+void PdfFloatingToolbox::highlightCb(GtkButton* button, PdfFloatingToolbox* pft) {
+    int markerOpacity = pft->theMainWindow->getControl()->getToolHandler()->getSelectPDFTextMarkerOpacity();
+    pft->createStrokes(PdfMarkerStyle::POS_TEXT_MIDDLE, PdfMarkerStyle::WIDTH_TEXT_HEIGHT, markerOpacity);
+    pft->userCancelSelection();
+}
+
+void PdfFloatingToolbox::copyTextCb(GtkButton* button, PdfFloatingToolbox* pft) {
+    pft->copyTextToClipboard();
+    pft->userCancelSelection();
+}
+
+void PdfFloatingToolbox::underlineCb(GtkButton* button, PdfFloatingToolbox* pft) {
+    pft->createStrokes(PdfMarkerStyle::POS_TEXT_BOTTOM, PdfMarkerStyle::WIDTH_TEXT_LINE, 230);
+    pft->userCancelSelection();
+}
+
+void PdfFloatingToolbox::strikethroughCb(GtkButton* button, PdfFloatingToolbox* pft) {
+    pft->createStrokes(PdfMarkerStyle::POS_TEXT_MIDDLE, PdfMarkerStyle::WIDTH_TEXT_LINE, 230);
+    pft->userCancelSelection();
+}
+
+void PdfFloatingToolbox::show() {
+    gtk_widget_hide(this->floatingToolbox);  // force showing in new position
+    gtk_widget_show_all(this->floatingToolbox);
+}
+
+void PdfFloatingToolbox::copyTextToClipboard() {
+    GtkClipboard* clipboard = gtk_widget_get_clipboard(this->theMainWindow->getWindow());
+    if (const std::string& text = this->pdfElemSelection->getSelectedText(); !text.empty()) {
+        gtk_clipboard_set_text(clipboard, text.c_str(), -1);
+    }
+}
+
+void PdfFloatingToolbox::createStrokes(PdfMarkerStyle position, PdfMarkerStyle width, int markerOpacity) {
+    const size_t pdfPageNo = this->pdfElemSelection->getSelectionPageNr();
+    const size_t currentPage = theMainWindow->getXournal()->getCurrentPage();
+
+    // Get the PDF page that the current page corresponds to.
+    // It should be the same as the PDF page of the selection.
+    auto doc = this->theMainWindow->getControl()->getDocument();
+    doc->lock_shared();
+    const size_t pdfPageOfCurrentPage = doc->getPage(currentPage)->getPdfPageNr();
+    doc->unlock_shared();
+
+    if (pdfPageOfCurrentPage != pdfPageNo) {
+        // There's probably a bug that violates our assumptions, so no-op.
+        g_warning("The current page's PDF page is not the same as the PDF page of the selection!");
+        return;
+    }
+
+    const auto textRects = this->pdfElemSelection->getSelectedTextRects();
+    if (textRects.empty()) {
+        return;
+    }
+
+    auto* control = this->theMainWindow->getControl();
+    PageRef page = control->getCurrentPage();
+    Layer* layer = page->getSelectedLayer();
+
+    Range dirtyRange;
+    std::vector<ElementPtr> strokes;
+    for (XojPdfRectangle rect: textRects) {
+        const double topOfLine = std::min(rect.y1, rect.y2);
+        const double middleOfLine = (rect.y1 + rect.y2) / 2;
+        const double bottomOfLine = std::max(rect.y1, rect.y2);
+        const double rectWidth = std::abs(rect.y2 - rect.y1);
+
+        // the center line position of stroke
+        const double h = position == PdfMarkerStyle::POS_TEXT_BOTTOM ? bottomOfLine :
+                         position == PdfMarkerStyle::POS_TEXT_MIDDLE ? middleOfLine :
+                                                                       topOfLine;
+        // the width of stroke
+        const double w = width == PdfMarkerStyle::WIDTH_TEXT_LINE ? 1 : rectWidth;
+
+        auto stroke = std::make_unique<Stroke>();
+        stroke->setColor(this->color);
+        stroke->setFill(markerOpacity);
+        stroke->setToolType(StrokeTool::HIGHLIGHTER);
+        stroke->setWidth(w);
+        stroke->addPoint(Point(rect.x1, h, -1));
+        stroke->addPoint(Point(rect.x2, h, -1));
+        stroke->setStrokeCapStyle(StrokeCapStyle::BUTT);
+
+        dirtyRange.addPoint(rect.x1, h - 0.5 * w);
+        dirtyRange.addPoint(rect.x2, h + 0.5 * w);
+
+        strokes.push_back(std::move(stroke));
+    }
+
+    std::vector<const Element*> strokePtrs(strokes.size());
+    std::transform(strokes.begin(), strokes.end(), strokePtrs.begin(), [](auto& e) { return e.get(); });
+
+    doc->lock();
+    for (auto&& s: strokes) {
+        layer->addElement(std::move(s));
+    }
+    doc->unlock();
+    page->fireElementsChanged(strokePtrs, dirtyRange);
+
+    auto undoAct = std::make_unique<GroupUndoAction>();
+    for (auto* stroke: strokePtrs) {
+        undoAct->addAction(std::make_unique<InsertUndoAction>(page, layer, stroke));
+    }
+    control->getUndoRedoHandler()->addUndoAction(std::move(undoAct));
+}
+
+void PdfFloatingToolbox::switchSelectTypeCb(GtkButton* button, PdfFloatingToolbox* pft) {
+    ToolType type = pft->theMainWindow->getControl()->getToolHandler()->getToolType();
+
+    type = type == ToolType::TOOL_SELECT_PDF_TEXT_LINEAR ? ToolType::TOOL_SELECT_PDF_TEXT_RECT :
+                                                           ToolType::TOOL_SELECT_PDF_TEXT_LINEAR;
+
+    pft->theMainWindow->getControl()->selectTool(type);
+
+    pft->pdfElemSelection->setToolType(type);
+    pft->pdfElemSelection->finalizeSelection(PdfElemSelection::selectionStyleForToolType(type));
+}
+
+bool PdfFloatingToolbox::isHidden() const { return !gtk_widget_is_visible(this->floatingToolbox); }
diff --git a/entry/src/main/cpp/src/core/gui/PdfFloatingToolbox.h b/entry/src/main/cpp/src/core/gui/PdfFloatingToolbox.h
new file mode 100644
index 0000000..54b41c1
--- /dev/null
+++ b/entry/src/main/cpp/src/core/gui/PdfFloatingToolbox.h
@@ -0,0 +1,97 @@
+#pragma once
+
+#include <cstdint>  // for uint8_t
+#include <memory>   // for unique_ptr
+
+#include <gdk/gdk.h>  // for GdkRectangle
+#include <glib.h>     // for gboolean
+#include <gtk/gtk.h>  // for GtkButton, GtkOverlay
+
+#include "pdf/base/XojPdfPage.h"    // for XojPdfPageSelectionStyle
+#include "util/Color.h"             // for Color
+#include "util/raii/GObjectSPtr.h"  // for GObjectSPtr
+
+class MainWindow;
+class PdfElemSelection;
+
+enum class PdfMarkerStyle : uint8_t {
+    POS_TEXT_BOTTOM = 0,
+    POS_TEXT_MIDDLE,
+    POS_TEXT_TOP,
+
+    WIDTH_TEXT_LINE,
+    WIDTH_TEXT_HEIGHT
+};
+
+
+class PdfFloatingToolbox {
+public:
+    PdfFloatingToolbox(MainWindow* theMainWindow, GtkOverlay* overlay);
+    PdfFloatingToolbox& operator=(const PdfFloatingToolbox&) = delete;
+    PdfFloatingToolbox(const PdfFloatingToolbox&) = delete;
+    PdfFloatingToolbox& operator=(PdfFloatingToolbox&&) = delete;
+    PdfFloatingToolbox(PdfFloatingToolbox&&) = delete;
+    ~PdfFloatingToolbox();
+
+public:
+    /// Show the toolbox at the provided coordinates (relative to the application GTK window).
+    ///
+    /// Must have an active selection.
+    void show(int x, int y);
+
+    /// Hide the floating toolbox widget (keeping the current selection).
+    void hide();
+
+    /// Returns true if the toolbox is currently hidden.
+    bool isHidden() const;
+
+    /// Returns the selection, or nullptr if no PDF element is selected.
+    PdfElemSelection* getSelection() const;
+
+    /// Clears the current selection (without any visual effects).
+    void clearSelection();
+
+    /// Create a new selection (without any visual effects)
+    const PdfElemSelection* newSelection(double x, double y);
+
+    /// Returns true iff a PDF element is selected;
+    bool hasSelection() const;
+
+    /// Cancel the selection, rerender the page, and hide the toolbox.
+    void userCancelSelection();
+
+    /// Track selection style used for unfinalized selections
+    XojPdfPageSelectionStyle selectionStyle = XojPdfPageSelectionStyle::Linear;
+
+    /// Copy Selection to the Clipboard.
+    void copyTextToClipboard();
+
+private:
+    void show();
+
+    static gboolean getOverlayPosition(GtkOverlay* overlay, GtkWidget* widget, GdkRectangle* allocation,
+                                       PdfFloatingToolbox* self);
+
+    static void switchSelectTypeCb(GtkButton* button, PdfFloatingToolbox* pft);
+    static void strikethroughCb(GtkButton* button, PdfFloatingToolbox* pft);
+    static void underlineCb(GtkButton* button, PdfFloatingToolbox* pft);
+    static void copyTextCb(GtkButton* button, PdfFloatingToolbox* pft);
+    static void highlightCb(GtkButton* button, PdfFloatingToolbox* pft);
+
+    void createStrokes(PdfMarkerStyle position, PdfMarkerStyle width, int markerOpacity);
+
+private:
+    GtkWidget* floatingToolbox;
+    MainWindow* theMainWindow;
+    Color color;  ///< Used for strokes/highlighting
+
+    /// The overlay that the toolbox should be displayed in.
+    xoj::util::GObjectSPtr<GtkOverlay> overlay;
+
+    std::unique_ptr<PdfElemSelection> pdfElemSelection;
+
+    struct {
+        int x;
+        int y;
+    } position;
+};
diff --git a/entry/src/main/cpp/src/core/gui/PopoverFactory.h b/entry/src/main/cpp/src/core/gui/PopoverFactory.h
new file mode 100644
index 0000000..925130c
--- /dev/null
+++ b/entry/src/main/cpp/src/core/gui/PopoverFactory.h
@@ -0,0 +1,23 @@
+/*
+ * Xournal++
+ *
+ * Abstract class for creating popovers
+ *
+ * @author Xournal++ Team
+ * https://github.com/xournalpp/xournalpp
+ *
+ * @license GNU GPLv2 or later
+ */
+
+#pragma once
+
+#include <gtk/gtk.h>  // for GtkWidget
+
+class PopoverFactory {
+public:
+    PopoverFactory() = default;
+    virtual ~PopoverFactory() = default;
+
+    /// Creates a GtkPopover. The returned ref is floating
+    virtual GtkWidget* createPopover() const = 0;
+};
diff --git a/entry/src/main/cpp/src/core/gui/RepaintHandler.cpp b/entry/src/main/cpp/src/core/gui/RepaintHandler.cpp
new file mode 100644
index 0000000..2aa21da
--- /dev/null
+++ b/entry/src/main/cpp/src/core/gui/RepaintHandler.cpp
@@ -0,0 +1,29 @@
+#include "RepaintHandler.h"
+
+#include <gtk/gtk.h>  // for gtk_widget_queue_draw
+
+#include "gui/widgets/XournalWidget.h"  // for gtk_xournal_repaint_area
+
+#include "PageView.h"     // for XojPageView
+#include "XournalView.h"  // for XournalView
+
+RepaintHandler::RepaintHandler(XournalView* xournal): xournal(xournal) {}
+
+RepaintHandler::~RepaintHandler() { this->xournal = nullptr; }
+
+void RepaintHandler::repaintPage(const XojPageView* view) {
+    int x1 = view->getX();
+    int y1 = view->getY();
+    int x2 = x1 + view->getDisplayWidth();
+    int y2 = y1 + view->getDisplayHeight();
+
+    gtk_xournal_repaint_area(this->xournal->getWidget(), x1, y1, x2, y2);
+}
+
+void RepaintHandler::repaintPageArea(const XojPageView* view, int x1, int y1, int x2, int y2) {
+    int x = view->getX();
+    int y = view->getY();
+    gtk_xournal_repaint_area(this->xournal->getWidget(), x + x1, y + y1, x + x2, y + y2);
+}
+
+void RepaintHandler::repaintPageBorder(const XojPageView* view) { gtk_widget_queue_draw(this->xournal->getWidget()); }
diff --git a/entry/src/main/cpp/src/core/gui/RepaintHandler.h b/entry/src/main/cpp/src/core/gui/RepaintHandler.h
new file mode 100644
index 0000000..9f72e33
--- /dev/null
+++ b/entry/src/main/cpp/src/core/gui/RepaintHandler.h
@@ -0,0 +1,40 @@
+/*
+ * Xournal++
+ *
+ * Class for render and repaint pages
+ *
+ * @author Xournal++ Team
+ * https://github.com/xournalpp/xournalpp
+ *
+ * @license GNU GPLv2 or later
+ */
+
+#pragma once
+
+class XojPageView;
+class XournalView;
+
+class RepaintHandler {
+public:
+    RepaintHandler(XournalView* xournal);
+    virtual ~RepaintHandler();
+
+public:
+    /**
+     * Repaint a page
+     */
+    void repaintPage(const XojPageView* view);
+
+    /**
+     * Repaint a page area, coordinates are in view coordinates
+     */
+    void repaintPageArea(const XojPageView* view, int x1, int y1, int x2, int y2);
+
+    /**
+     * Repaints the page border (at least)
+     */
+    void repaintPageBorder(const XojPageView* view);
+
+private:
+    XournalView* xournal;
+};
diff --git a/entry/src/main/cpp/src/core/gui/SearchBar.cpp b/entry/src/main/cpp/src/core/gui/SearchBar.cpp
new file mode 100644
index 0000000..06099b8
--- /dev/null
+++ b/entry/src/main/cpp/src/core/gui/SearchBar.cpp
@@ -0,0 +1,198 @@
+#include "SearchBar.h"
+
+#include <string>  // for allocator, string
+
+#include <gdk/gdk.h>         // for GdkEventKey, GDK_SHIFT_MASK
+#include <gdk/gdkkeysyms.h>  // for GDK_KEY_Return
+#include <glib-object.h>     // for G_CALLBACK, g_signal_connect
+#include <glib.h>            // for g_free, g_strdup_printf
+
+#include "control/Control.h"           // for Control
+#include "control/ScrollHandler.h"     // for ScrollHandler
+#include "control/zoom/ZoomControl.h"  // for ZoomControl
+#include "gui/MainWindow.h"            // for MainWindow
+#include "model/Document.h"            // for Document
+#include "util/PlaceholderString.h"    // for PlaceholderString
+#include "util/i18n.h"                 // for _, FC, _F
+
+SearchBar::SearchBar(Control* control): control(control) {
+    MainWindow* win = control->getWindow();
+
+    GtkWidget* close = win->get("buttonCloseSearch");
+    g_signal_connect(close, "clicked", G_CALLBACK(buttonCloseSearchClicked), this);
+
+    GtkWidget* next = win->get("btSearchForward");
+    GtkWidget* previous = win->get("btSearchBack");
+    g_signal_connect(next, "clicked",
+                     G_CALLBACK(+[](GtkButton*, gpointer d) { static_cast<SearchBar*>(d)->searchNext(); }), this);
+    g_signal_connect(previous, "clicked",
+                     G_CALLBACK(+[](GtkButton*, gpointer d) { static_cast<SearchBar*>(d)->searchPrevious(); }), this);
+
+    GtkWidget* searchTextField = win->get("searchTextField");
+    g_signal_connect(searchTextField, "search-changed", G_CALLBACK(searchTextChangedCallback), this);
+    g_signal_connect(searchTextField, "stop-search",
+                     G_CALLBACK(+[](GtkSearchEntry*, gpointer d) { static_cast<SearchBar*>(d)->showSearchBar(false); }),
+                     this);
+    g_signal_connect(searchTextField, "next-match", G_CALLBACK(+[](GtkSearchEntry* e, gpointer d) {
+                         static_cast<SearchBar*>(d)->searchNext();
+                         // Grab focus again since searching will take away focus
+                         gtk_widget_grab_focus(GTK_WIDGET(e));
+                     }),
+                     this);
+    g_signal_connect(searchTextField, "previous-match", G_CALLBACK(+[](GtkSearchEntry* e, gpointer d) {
+                         static_cast<SearchBar*>(d)->searchPrevious();
+                         // Grab focus again since searching will take away focus
+                         gtk_widget_grab_focus(GTK_WIDGET(e));
+                     }),
+                     this);
+#if GTK_MAJOR_VERSION == 3
+    GtkBindingSet* bindingSet = gtk_binding_set_by_class(GTK_SEARCH_ENTRY_GET_CLASS(searchTextField));
+    gtk_binding_entry_add_signal(bindingSet, GDK_KEY_Return, GdkModifierType(0), "next-match", 0);
+    gtk_binding_entry_add_signal(bindingSet, GDK_KEY_Return, GDK_SHIFT_MASK, "previous-match", 0);
+#else
+    GtkEventController* ctrl = gtk_shortcut_controller_new();
+    gtk_shortcut_controller_add_shortcut(GTK_SHORTCUT_CONTROLLER(ctrl),
+                                         gtk_shortcut_new(gtk_keyval_trigger_new(GDK_KEY_Return, GdkModifierType(0)),
+                                                          gtk_signal_action_new("next-match")));
+    gtk_shortcut_controller_add_shortcut(GTK_SHORTCUT_CONTROLLER(ctrl),
+                                         gtk_shortcut_new(gtk_keyval_trigger_new(GDK_KEY_Return, GDK_SHIFT_MASK),
+                                                          gtk_signal_action_new("previous-match")));
+    gtk_widget_add_controller(searchTextField, ctrl);
+#endif
+
+    cssTextFild = gtk_css_provider_new();
+    gtk_style_context_add_provider(gtk_widget_get_style_context(win->get("searchTextField")),
+                                   GTK_STYLE_PROVIDER(cssTextFild), GTK_STYLE_PROVIDER_PRIORITY_APPLICATION);
+}
+
+SearchBar::~SearchBar() { this->control = nullptr; }
+
+auto SearchBar::searchTextonCurrentPage(const char* text, size_t index, size_t* occurrences, XojPdfRectangle* matchRect)
+        -> bool {
+    size_t p = control->getCurrentPageNo();
+    this->page = p;
+
+    return control->searchTextOnPage(text, p, index, occurrences, matchRect);
+}
+
+void SearchBar::search(const char* text) {
+    MainWindow* win = control->getWindow();
+    GtkWidget* lbSearchState = win->get("lbSearchState");
+
+    bool found = true;
+    this->indexInPage = 0;
+
+    if (*text != 0) {
+        found = searchTextonCurrentPage(text, 1, &this->occurrences, nullptr);
+        if (found) {
+            if (occurrences == 1) {
+                gtk_label_set_text(GTK_LABEL(lbSearchState), _("Text found once on this page"));
+            } else {
+                char* msg = g_strdup_printf(_("Text found %zu times on this page"), occurrences);
+                gtk_label_set_text(GTK_LABEL(lbSearchState), msg);
+                g_free(msg);
+            }
+        } else {
+            gtk_label_set_text(GTK_LABEL(lbSearchState), _("Text not found"));
+        }
+    } else {
+        searchTextonCurrentPage("", 1, nullptr, nullptr);
+        gtk_label_set_text(GTK_LABEL(lbSearchState), "");
+    }
+
+    if (found) {
+        gtk_css_provider_load_from_data(cssTextFild, "GtkSearchEntry {}", -1, nullptr);
+    } else {
+        gtk_css_provider_load_from_data(cssTextFild, "GtkSearchEntry { color: #ff0000; }", -1, nullptr);
+    }
+}
+
+void SearchBar::searchTextChangedCallback(GtkSearchEntry* entry, SearchBar* searchBar) {
+    const char* text = gtk_entry_get_text(GTK_ENTRY(entry));
+    searchBar->search(text);
+}
+
+void SearchBar::buttonCloseSearchClicked(GtkButton* button, SearchBar* searchBar) { searchBar->showSearchBar(false); }
+
+template <class Fun>
+void SearchBar::search(Fun next) {
+
+    MainWindow* win = control->getWindow();
+    GtkWidget* searchTextField = win->get("searchTextField");
+    const char* text = gtk_entry_get_text(GTK_ENTRY(searchTextField));
+    GtkWidget* lbSearchState = win->get("lbSearchState");
+    if (*text == 0) {
+        return;
+    }
+    const size_t originalPage = page;
+
+    XojPdfRectangle matchRect = XojPdfRectangle();
+    // Search backwards through the pages, wrapping around if needed.
+    for (;;) {
+        next(text);
+        const bool found = control->searchTextOnPage(text, page, indexInPage, &occurrences, &matchRect);
+
+        if (found) {
+            control->getScrollHandler()->scrollToPage(page, matchRect);
+            control->getScrollHandler();
+            gtk_label_set_text(GTK_LABEL(lbSearchState),
+                               (occurrences == 1 ? FC(_F("Text found once on page {1}") % (page + 1)) :
+                                                   FC(_F("Text found {1} times on page {2} ({3} of {1})") %
+                                                      occurrences % (page + 1) % indexInPage)));
+            return;
+        }
+        if (page == originalPage) {
+            gtk_label_set_text(GTK_LABEL(lbSearchState), _("Text not found, searched on all pages"));
+            return;
+        }
+    }
+}
+
+void SearchBar::searchNext() {
+    size_t pageCount = control->getDocument()->getPageCount();
+    search([&](const char* text) {
+        indexInPage++;
+        if (indexInPage > occurrences) {
+            control->searchTextOnPage(text, page, 1, &occurrences, nullptr);  // clear the active marker
+            page++;
+            if (page >= pageCount) {
+                page = 0;
+            }
+            indexInPage = 1;
+        }
+    });
+}
+
+void SearchBar::searchPrevious() {
+    size_t pageCount = control->getDocument()->getPageCount();
+    search([&](const char* text) {
+        indexInPage--;
+        if (indexInPage == 0 || indexInPage >= occurrences) {
+            control->searchTextOnPage(text, page, 1, &occurrences, nullptr);  // clear the active marker
+            page--;
+            if (page > pageCount) {
+                page = pageCount - 1;
+            }
+            control->searchTextOnPage(text, page, 1, &occurrences, nullptr);
+            indexInPage = occurrences;
+        }
+    });
+}
+
+void SearchBar::showSearchBar(bool show) {
+    MainWindow* win = control->getWindow();
+    GtkWidget* searchBar = win->get("searchBar");
+
+    if (show) {
+        GtkWidget* searchTextField = win->get("searchTextField");
+        gtk_widget_show_all(searchBar);
+        gtk_widget_grab_focus(searchTextField);
+        this->indexInPage = 0;
+    } else {
+        gtk_widget_hide(searchBar);
+        const size_t pageCount = control->getDocument()->getPageCount();
+        for (size_t i = pageCount - 1; i < pageCount; i--) {
+            control->searchTextOnPage("", i, 0, nullptr, nullptr);
+        }
+    }
+}
diff --git a/entry/src/main/cpp/src/core/gui/SearchBar.h b/entry/src/main/cpp/src/core/gui/SearchBar.h
new file mode 100644
index 0000000..c1cfc0b
--- /dev/null
+++ b/entry/src/main/cpp/src/core/gui/SearchBar.h
@@ -0,0 +1,65 @@
+/*
+ * Xournal++
+ *
+ * Handles the searchbar and search events
+ *
+ * @author Xournal++ Team
+ * https://github.com/xournalpp/xournalpp
+ *
+ * @license GNU GPLv2 or later
+ */
+
+#pragma once
+
+#include <gtk/gtk.h>             // for GtkButton, GtkEntry
+#include <gtk/gtkcssprovider.h>  // for GtkCssProvider
+
+class Control;
+class XojPdfRectangle;
+
+class SearchBar {
+public:
+    SearchBar(Control* control);
+    virtual ~SearchBar();
+
+    void showSearchBar(bool show);
+
+private:
+    static void buttonCloseSearchClicked(GtkButton* button, SearchBar* searchBar);
+    static void searchTextChangedCallback(GtkSearchEntry* entry, SearchBar* searchBar);
+
+    static void buttonNextSearchClicked(GtkButton* button, SearchBar* searchBar);
+    static void buttonPreviousSearchClicked(GtkButton* button, SearchBar* searchBar);
+
+    /**
+     * @brief Searches the entire document until a match is found, starting from `page = next(currentPage)` and
+     * iterating through the pages via page = next(page). The search stops after the first page with at least one match.
+     * All the match on that page are stored in XojPageView::search of the corresponding page. The current page is not
+     * search!
+     * @param next The parameter `next` must be convertible to size_t(size_t) and satisfy the following assertions
+     *              * Iterating from page = next(currentPage) by page = next(page) must reach page == currentPage at
+     * some point.
+     *              * If page is a valid page number, then so is next(page).
+     */
+    template <class Fun>
+    void search(Fun next);
+
+    /**
+     * @brief Named specialization of search(), where next(page) = (page + 1) % pageCount
+     */
+    void searchNext();
+    /**
+     * @brief Named specialization of search(), where next(page) = (page + pageCount - 1) % pageCount
+     */
+    void searchPrevious();
+
+    void search(const char* text);
+    bool searchTextonCurrentPage(const char* text, size_t index, size_t* occurrences, XojPdfRectangle* matchRect);
+
+private:
+    Control* control;
+    GtkCssProvider* cssTextFild;
+    size_t page = 0;
+    size_t indexInPage = 0;
+    size_t occurrences = 0;
+};
diff --git a/entry/src/main/cpp/src/core/gui/Shadow.cpp b/entry/src/main/cpp/src/core/gui/Shadow.cpp
new file mode 100644
index 0000000..7450bc3
--- /dev/null
+++ b/entry/src/main/cpp/src/core/gui/Shadow.cpp
@@ -0,0 +1,217 @@
+#include "Shadow.h"
+
+#include <cmath>
+
+#include "ShadowCode.c"
+
+Shadow* Shadow::instance = new Shadow();
+
+using u8ptr = const unsigned char*;
+
+Shadow::Shadow() {
+    const int sBrSize = shadowBottomRightSize;
+    const int sTlSize = shadowTopLeftSize;
+
+    this->edgeTopLeft = cairo_image_surface_create(CAIRO_FORMAT_ARGB32, sTlSize * 2, sTlSize * 2);
+    cairo_t* cr = cairo_create(this->edgeTopLeft);
+    drawShadowEdge(cr, 0, 0, sTlSize, sTlSize, reinterpret_cast<u8ptr>(shadowEdge1), 0, 0, 0);
+    cairo_destroy(cr);
+
+    this->edgeTopRight = cairo_image_surface_create(CAIRO_FORMAT_ARGB32, sBrSize * 2, sTlSize * 2);
+    cr = cairo_create(this->edgeTopRight);
+    drawShadowEdge(cr, 0, 0, sBrSize, sTlSize, reinterpret_cast<u8ptr>(shadowEdge2), 0, 0, 0);
+    cairo_destroy(cr);
+
+    this->edgeBottomRight = cairo_image_surface_create(CAIRO_FORMAT_ARGB32, sBrSize * 2, sBrSize * 2);
+    cr = cairo_create(this->edgeBottomRight);
+    drawShadowEdge(cr, 0, 0, sBrSize, sBrSize, reinterpret_cast<u8ptr>(shadowEdge3), 0, 0, 0);
+    cairo_destroy(cr);
+
+    this->edgeBottomLeft = cairo_image_surface_create(CAIRO_FORMAT_ARGB32, sTlSize * 2, sBrSize * 2);
+    cr = cairo_create(this->edgeBottomLeft);
+    drawShadowEdge(cr, 0, 0, sTlSize, sBrSize, reinterpret_cast<u8ptr>(shadowEdge4), 0, 0, 0);
+    cairo_destroy(cr);
+}
+
+Shadow::~Shadow() {
+    cairo_surface_destroy(this->edgeBottomLeft);
+    cairo_surface_destroy(this->edgeBottomRight);
+    cairo_surface_destroy(this->edgeTopLeft);
+    cairo_surface_destroy(this->edgeTopRight);
+    this->edgeBottomLeft = nullptr;
+    this->edgeBottomRight = nullptr;
+    this->edgeTopLeft = nullptr;
+    this->edgeTopRight = nullptr;
+
+    if (this->left) {
+        cairo_surface_destroy(this->left);
+    }
+    if (this->top) {
+        cairo_surface_destroy(this->top);
+    }
+    if (this->right) {
+        cairo_surface_destroy(this->right);
+    }
+    if (this->bottom) {
+        cairo_surface_destroy(this->bottom);
+    }
+
+    this->left = nullptr;
+    this->top = nullptr;
+    this->right = nullptr;
+    this->bottom = nullptr;
+}
+
+auto Shadow::getShadowBottomRightSize() -> int { return shadowBottomRightSize; }
+
+auto Shadow::getShadowTopLeftSize() -> int { return shadowTopLeftSize; }
+
+void Shadow::drawShadowEdge(cairo_t* cr, int x, int y, int width, int height, const unsigned char* edge, double r,
+                            double g, double b) {
+    int w = width * 2;
+    int h = height * 2;
+
+    for (int u = 0; u < h; u++) {
+        for (int i = 0; i < w; i++) {
+            double a = edge[u * w + i] / 255.0;
+            cairo_set_source_rgba(cr, r, g, b, a);
+
+            cairo_rectangle(cr, x + i, y + u, 1, 1);
+            cairo_fill(cr);
+        }
+    }
+}
+
+void Shadow::paintEdge(cairo_t* cr, cairo_surface_t* image, int x, int y, int width, int height) {
+    cairo_set_source_surface(cr, image, x - width, y - height);
+    cairo_rectangle(cr, x - width, y - height, width * 2, height * 2);
+    cairo_fill(cr);
+}
+
+static constexpr int PATTERN_LENGTH = 200;  ///< Why not?
+
+static void setPattern(cairo_t* cr, cairo_surface_t* patt, double offsetX, double offsetY) {
+    cairo_pattern_t* p = cairo_pattern_create_for_surface(patt);
+    cairo_pattern_set_extend(p, CAIRO_EXTEND_REPEAT);
+    cairo_matrix_t m;
+    cairo_matrix_init_translate(&m, -offsetX, -offsetY);
+    cairo_pattern_set_matrix(p, &m);
+    cairo_set_source(cr, p);
+    cairo_pattern_destroy(p);
+}
+
+void Shadow::drawShadowTop(cairo_t* cr, int x, int y, int width, double r, double g, double b) {
+
+    if (!this->top) {
+        this->top = cairo_image_surface_create(CAIRO_FORMAT_ARGB32, PATTERN_LENGTH, shadowTopLeftSize);
+        cairo_t* cr2 = cairo_create(this->top);
+
+        double a = NAN;
+
+        // draw shadow on top and left
+        for (int i = 0; i < shadowTopLeftSize; i++) {
+            a = shadowTopLeft[i] / 255.0;
+            cairo_set_source_rgba(cr2, r, g, b, a);
+
+            cairo_rectangle(cr2, 0, i, PATTERN_LENGTH, 1);
+            cairo_fill(cr2);
+        }
+
+        cairo_destroy(cr2);
+    }
+
+    setPattern(cr, this->top, x + shadowTopLeftSize, y - shadowTopLeftSize);
+    cairo_rectangle(cr, x + shadowTopLeftSize, y - shadowTopLeftSize, width - 2 * shadowTopLeftSize, shadowTopLeftSize);
+    cairo_fill(cr);
+}
+
+void Shadow::drawShadowLeft(cairo_t* cr, int x, int y, int height, double r, double g, double b) {
+    if (!this->left) {
+        this->left = cairo_image_surface_create(CAIRO_FORMAT_ARGB32, shadowTopLeftSize, PATTERN_LENGTH);
+        cairo_t* cr2 = cairo_create(this->left);
+
+        double a = NAN;
+
+        // draw shadow on top and left
+        for (int i = 0; i < shadowTopLeftSize; i++) {
+            a = shadowTopLeft[i] / 255.0;
+            cairo_set_source_rgba(cr2, r, g, b, a);
+
+            cairo_rectangle(cr2, i, 0, 1, PATTERN_LENGTH);
+            cairo_fill(cr2);
+        }
+
+        cairo_destroy(cr2);
+    }
+
+    setPattern(cr, this->left, x - shadowTopLeftSize, y + shadowTopLeftSize);
+    cairo_rectangle(cr, x - shadowTopLeftSize, y + shadowTopLeftSize, shadowTopLeftSize,
+                    height - 2 * shadowTopLeftSize);
+    cairo_fill(cr);
+}
+
+void Shadow::drawShadowRight(cairo_t* cr, int x, int y, int height, double r, double g, double b) {
+    if (!this->right) {
+        this->right = cairo_image_surface_create(CAIRO_FORMAT_ARGB32, shadowBottomRightSize, PATTERN_LENGTH);
+        cairo_t* cr2 = cairo_create(this->right);
+
+        double a = NAN;
+
+        // draw shadow on top and left
+        for (int i = 0; i < shadowBottomRightSize; i++) {
+            a = shadowBottomRight[i] / 255.0;
+            cairo_set_source_rgba(cr2, r, g, b, a);
+
+            cairo_rectangle(cr2, i, 0, 1, PATTERN_LENGTH);
+            cairo_fill(cr2);
+        }
+
+        cairo_destroy(cr2);
+    }
+
+    setPattern(cr, this->right, x, y + shadowBottomRightSize);
+    cairo_rectangle(cr, x, y + shadowBottomRightSize, shadowBottomRightSize, height - 2 * shadowBottomRightSize);
+    cairo_fill(cr);
+}
+
+void Shadow::drawShadowBottom(cairo_t* cr, int x, int y, int width, double r, double g, double b) {
+    if (!this->bottom) {
+        this->bottom = cairo_image_surface_create(CAIRO_FORMAT_ARGB32, PATTERN_LENGTH, shadowBottomRightSize);
+        cairo_t* cr2 = cairo_create(this->bottom);
+
+
+        // draw shadow on top and left
+        for (int i = 0; i < shadowBottomRightSize; i++) {
+            auto a = shadowBottomRight[i] / 255.0;
+            cairo_set_source_rgba(cr2, r, g, b, a);
+
+            cairo_rectangle(cr2, 0, i, PATTERN_LENGTH, 1);
+            cairo_fill(cr2);
+        }
+
+        cairo_destroy(cr2);
+    }
+
+    setPattern(cr, this->bottom, x + shadowBottomRightSize, y);
+    cairo_rectangle(cr, x + shadowBottomRightSize, y, width - 2 * shadowBottomRightSize, shadowBottomRightSize);
+    cairo_fill(cr);
+}
+
+void Shadow::drawShadowImpl(cairo_t* cr, int x, int y, int width, int height) {
+    const int sBrSize = shadowBottomRightSize;
+    const int sTlSize = shadowTopLeftSize;
+
+    drawShadowTop(cr, x, y, width - 3, 0, 0, 0);
+    drawShadowLeft(cr, x, y, height - 3, 0, 0, 0);
+    drawShadowRight(cr, x + width, y - 4, height + 5, 0, 0, 0);
+    drawShadowBottom(cr, x - 4, y + height, width + 5, 0, 0, 0);
+
+    paintEdge(cr, this->edgeTopLeft, x, y, sTlSize, sTlSize);
+    paintEdge(cr, this->edgeTopRight, x + width + 1, y, sBrSize, sTlSize);
+    paintEdge(cr, this->edgeBottomLeft, x, y + height + 1, sTlSize, sBrSize);
+    paintEdge(cr, this->edgeBottomRight, x + width + 1, y + height + 1, sBrSize, sBrSize);
+}
+
+void Shadow::drawShadow(cairo_t* cr, int x, int y, int width, int height) {
+    Shadow::instance->drawShadowImpl(cr, x, y, width, height);
+}
diff --git a/entry/src/main/cpp/src/core/gui/Shadow.h b/entry/src/main/cpp/src/core/gui/Shadow.h
new file mode 100644
index 0000000..29f8b25
--- /dev/null
+++ b/entry/src/main/cpp/src/core/gui/Shadow.h
@@ -0,0 +1,52 @@
+/*
+ * Xournal++
+ *
+ * Settings Dialog
+ *
+ * @author Xournal++ Team
+ * https://github.com/xournalpp/xournalpp
+ *
+ * @license GNU GPLv2 or later
+ */
+
+#pragma once
+
+#include <cairo.h>  // for cairo_surface_t, cairo_t
+
+class Shadow {
+private:
+    Shadow();
+    virtual ~Shadow();
+
+    static void drawShadowEdge(cairo_t* cr, int x, int y, int width, int height, const unsigned char* edge, double r,
+                               double g, double b);
+    void drawShadowImpl(cairo_t* cr, int x, int y, int width, int height);
+
+    static void paintEdge(cairo_t* cr, cairo_surface_t* image, int x, int y, int width, int height);
+
+    void drawShadowTop(cairo_t* cr, int x, int y, int width, double r, double g, double b);
+    void drawShadowLeft(cairo_t* cr, int x, int y, int height, double r, double g, double b);
+    void drawShadowRight(cairo_t* cr, int x, int y, int height, double r, double g, double b);
+    void drawShadowBottom(cairo_t* cr, int x, int y, int width, double r, double g, double b);
+
+public:
+    /**
+     * This is the public interface of this class
+     */
+    static void drawShadow(cairo_t* cr, int x, int y, int width, int height);
+    static int getShadowBottomRightSize();
+    static int getShadowTopLeftSize();
+
+private:
+    static Shadow* instance;
+
+    cairo_surface_t* edgeTopLeft = nullptr;
+    cairo_surface_t* edgeTopRight = nullptr;
+    cairo_surface_t* edgeBottomLeft = nullptr;
+    cairo_surface_t* edgeBottomRight = nullptr;
+
+    cairo_surface_t* top = nullptr;
+    cairo_surface_t* right = nullptr;
+    cairo_surface_t* bottom = nullptr;
+    cairo_surface_t* left = nullptr;
+};
diff --git a/entry/src/main/cpp/src/core/gui/ShadowCode.c b/entry/src/main/cpp/src/core/gui/ShadowCode.c
new file mode 100644
index 0000000..d923164
--- /dev/null
+++ b/entry/src/main/cpp/src/core/gui/ShadowCode.c
@@ -0,0 +1,99 @@
+///////////////////////////////////////////////
+// Auto-generated from image source
+const int shadowTopLeftSize = 8;
+const int shadowBottomRightSize = 12;
+const unsigned char shadowTopLeft[] = {0, 1, 3, 6, 12, 22, 36, 57};
+const unsigned char shadowBottomRight[] = {171, 142, 111, 82, 56, 37, 22, 12, 6, 3, 1, 0};
+const unsigned char shadowEdge1[16][16] = {
+        {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0},
+        {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1},
+        {0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 2, 2, 2, 3, 3, 3},
+        {0, 0, 0, 0, 0, 1, 1, 1, 2, 3, 3, 4, 5, 5, 5, 6},
+        {0, 0, 0, 0, 1, 1, 2, 3, 4, 5, 7, 8, 9, 10, 11, 11},
+        {0, 0, 0, 1, 1, 2, 3, 5, 7, 10, 12, 15, 17, 19, 20, 21},
+        {0, 0, 0, 1, 2, 3, 5, 8, 12, 16, 20, 24, 28, 31, 33, 34},
+        {0, 0, 1, 1, 3, 5, 8, 13, 18, 25, 32, 39, 44, 49, 52, 54},
+        {0, 0, 1, 2, 4, 7, 12, 18, 0, 0, 0, 0, 0, 0, 0, 0},
+        {0, 0, 1, 3, 5, 9, 16, 25, 0, 0, 0, 0, 0, 0, 0, 0},
+        {0, 1, 1, 3, 7, 12, 20, 32, 0, 0, 0, 0, 0, 0, 0, 0},
+        {0, 1, 2, 4, 8, 15, 25, 38, 0, 0, 0, 0, 0, 0, 0, 0},
+        {0, 1, 2, 5, 9, 17, 28, 44, 0, 0, 0, 0, 0, 0, 0, 0},
+        {0, 1, 2, 5, 10, 18, 31, 49, 0, 0, 0, 0, 0, 0, 0, 0},
+        {0, 1, 2, 5, 11, 20, 33, 52, 0, 0, 0, 0, 0, 0, 0, 0},
+        {0, 1, 2, 6, 11, 21, 35, 54, 0, 0, 0, 0, 0, 0, 0, 0},
+
+};
+const unsigned char shadowEdge2[16][24] = {
+        {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0},
+        {1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0},
+        {3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 2, 2, 2, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0},
+        {6, 6, 6, 6, 6, 6, 6, 6, 5, 5, 5, 4, 3, 3, 2, 1, 1, 1, 0, 0, 0, 0, 0, 0},
+        {12, 12, 12, 12, 12, 12, 12, 11, 11, 10, 9, 8, 7, 5, 4, 3, 2, 1, 1, 0, 0, 0, 0, 0},
+        {22, 22, 22, 22, 22, 22, 21, 21, 20, 19, 17, 15, 12, 10, 7, 5, 3, 2, 1, 1, 0, 0, 0, 0},
+        {36, 36, 36, 36, 36, 36, 35, 34, 33, 31, 28, 24, 20, 16, 12, 8, 5, 3, 2, 1, 0, 0, 0, 0},
+        {57, 57, 57, 57, 57, 56, 56, 54, 52, 49, 44, 39, 32, 25, 18, 13, 8, 5, 3, 1, 1, 0, 0, 0},
+        {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 55, 46, 36, 27, 18, 12, 7, 4, 2, 1, 0, 0, 0},
+        {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 76, 63, 49, 36, 25, 16, 10, 5, 3, 1, 0, 0, 0},
+        {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 97, 80, 63, 46, 32, 20, 12, 7, 3, 1, 1, 0, 0},
+        {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 116, 96, 76, 56, 38, 25, 15, 8, 4, 2, 1, 0, 0},
+        {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 134, 111, 87, 64, 44, 28, 17, 9, 5, 2, 1, 0, 0},
+        {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 147, 122, 96, 71, 49, 31, 19, 10, 5, 2, 1, 0, 0},
+        {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 158, 131, 102, 75, 52, 33, 20, 11, 5, 2, 1, 0, 0},
+        {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 164, 136, 107, 79, 54, 35, 21, 11, 6, 3, 1, 0, 0},
+
+};
+const unsigned char shadowEdge3[24][24] = {
+        {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 173, 143, 112, 83, 57, 37, 22, 12, 6, 3, 1, 0, 0},
+        {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 173, 143, 112, 83, 57, 37, 22, 12, 6, 3, 1, 0, 0},
+        {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 173, 143, 112, 83, 57, 37, 22, 12, 6, 3, 1, 0, 0},
+        {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 173, 143, 112, 83, 57, 37, 22, 12, 6, 3, 1, 0, 0},
+        {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 172, 142, 112, 82, 57, 36, 22, 12, 6, 3, 1, 0, 0},
+        {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 170, 141, 111, 82, 56, 36, 21, 12, 6, 3, 1, 0, 0},
+        {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 168, 140, 109, 81, 56, 36, 21, 12, 6, 3, 1, 0, 0},
+        {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 164, 136, 107, 79, 54, 35, 21, 11, 6, 3, 1, 0, 0},
+        {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 158, 131, 102, 75, 52, 33, 20, 11, 5, 2, 1, 0, 0},
+        {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 148, 123, 96, 71, 49, 31, 19, 10, 5, 2, 1, 0, 0},
+        {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 134, 111, 87, 64, 44, 28, 17, 9, 5, 2, 1, 0, 0},
+        {173, 173, 173, 173, 172, 171, 169, 165, 158, 148, 134, 117, 97, 76, 56, 39, 25, 15, 8, 4, 2, 1, 0, 0},
+        {143, 143, 143, 143, 142, 142, 140, 136, 131, 123, 111, 97, 80, 63, 46, 32, 20, 12, 7, 3, 1, 1, 0, 0},
+        {112, 112, 112, 112, 112, 111, 109, 107, 103, 96, 87, 76, 63, 49, 36, 25, 16, 10, 5, 3, 1, 0, 0, 0},
+        {83, 83, 83, 83, 83, 82, 81, 79, 76, 71, 65, 56, 47, 36, 27, 19, 12, 7, 4, 2, 1, 0, 0, 0},
+        {57, 57, 57, 57, 57, 56, 56, 54, 52, 49, 44, 39, 32, 25, 18, 13, 8, 5, 3, 1, 1, 0, 0, 0},
+        {37, 37, 37, 37, 37, 37, 36, 35, 34, 32, 29, 25, 21, 16, 12, 8, 5, 3, 2, 1, 0, 0, 0, 0},
+        {22, 22, 22, 22, 22, 22, 21, 21, 20, 19, 17, 15, 12, 10, 7, 5, 3, 2, 1, 1, 0, 0, 0, 0},
+        {12, 12, 12, 12, 12, 12, 12, 11, 11, 10, 9, 8, 7, 5, 4, 3, 2, 1, 1, 0, 0, 0, 0, 0},
+        {6, 6, 6, 6, 6, 6, 6, 6, 5, 5, 5, 4, 3, 3, 2, 1, 1, 1, 0, 0, 0, 0, 0, 0},
+        {3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 2, 2, 2, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0},
+        {1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0},
+        {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0},
+        {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0},
+
+};
+const unsigned char shadowEdge4[24][16] = {
+        {0, 1, 3, 6, 12, 22, 36, 57, 0, 0, 0, 0, 0, 0, 0, 0},
+        {0, 1, 3, 6, 12, 22, 36, 57, 0, 0, 0, 0, 0, 0, 0, 0},
+        {0, 1, 3, 6, 12, 22, 36, 57, 0, 0, 0, 0, 0, 0, 0, 0},
+        {0, 1, 3, 6, 12, 22, 36, 57, 0, 0, 0, 0, 0, 0, 0, 0},
+        {0, 1, 3, 6, 12, 22, 36, 57, 0, 0, 0, 0, 0, 0, 0, 0},
+        {0, 1, 3, 6, 12, 21, 36, 56, 0, 0, 0, 0, 0, 0, 0, 0},
+        {0, 1, 2, 6, 11, 21, 36, 55, 0, 0, 0, 0, 0, 0, 0, 0},
+        {0, 1, 2, 6, 11, 21, 35, 54, 0, 0, 0, 0, 0, 0, 0, 0},
+        {0, 1, 2, 5, 11, 20, 33, 52, 0, 0, 0, 0, 0, 0, 0, 0},
+        {0, 1, 2, 5, 10, 19, 31, 49, 0, 0, 0, 0, 0, 0, 0, 0},
+        {0, 1, 2, 5, 9, 17, 28, 44, 0, 0, 0, 0, 0, 0, 0, 0},
+        {0, 1, 2, 4, 8, 15, 25, 39, 56, 76, 97, 117, 134, 148, 158, 165},
+        {0, 1, 1, 3, 7, 12, 20, 32, 46, 63, 80, 97, 111, 123, 131, 136},
+        {0, 0, 1, 3, 5, 9, 16, 25, 36, 49, 63, 76, 87, 96, 102, 107},
+        {0, 0, 1, 2, 4, 7, 12, 18, 27, 36, 47, 56, 64, 71, 76, 79},
+        {0, 0, 1, 1, 3, 5, 8, 13, 18, 25, 32, 39, 44, 49, 52, 54},
+        {0, 0, 0, 1, 2, 3, 5, 8, 12, 16, 21, 25, 29, 32, 34, 35},
+        {0, 0, 0, 1, 1, 2, 3, 5, 7, 10, 12, 15, 17, 19, 20, 21},
+        {0, 0, 0, 0, 1, 1, 2, 3, 4, 5, 7, 8, 9, 10, 11, 11},
+        {0, 0, 0, 0, 0, 1, 1, 1, 2, 3, 3, 4, 5, 5, 5, 6},
+        {0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 2, 2, 2, 3, 3, 3},
+        {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1},
+        {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0},
+        {11, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0},
+
+};
+///////////////////////////////////////////////
diff --git a/entry/src/main/cpp/src/core/gui/ToolbarDefinitions.h b/entry/src/main/cpp/src/core/gui/ToolbarDefinitions.h
new file mode 100644
index 0000000..91e1051
--- /dev/null
+++ b/entry/src/main/cpp/src/core/gui/ToolbarDefinitions.h
@@ -0,0 +1,44 @@
+/*
+ * Xournal++
+ *
+ * The definitions for the possibel toolbars
+ *
+ * @author Xournal++ Team
+ * https://github.com/xournalpp/xournalpp
+ *
+ * @license GNU GPLv2 or later
+ */
+#pragma once
+
+typedef struct {
+    /**
+     * The name in the glade.xml file
+     */
+    const char* guiName;
+
+    /**
+     * The name in the .ini file
+     */
+    const char* propName;
+
+    /**
+     * if horizontal (true) or vertical (false)
+     */
+    bool horizontal;
+} ToolbarEntryDefintion;
+
+const static ToolbarEntryDefintion TOOLBAR_DEFINITIONS[] = {
+        {"tbTop1", "toolbarTop1", true},       {"tbTop2", "toolbarTop2", true},
+        {"tbLeft1", "toolbarLeft1", false},    {"tbLeft2", "toolbarLeft2", false},
+        {"tbRight1", "toolbarRight1", false},  {"tbRight2", "toolbarRight2", false},
+        {"tbBottom1", "toolbarBottom1", true}, {"tbBottom2", "toolbarBottom2", true},
+        {"tbFloat1", "toolbarFloat1", true},  // define this index below as TBFloatFirst
+        {"tbFloat2", "toolbarFloat2", true},   {"tbFloat3", "toolbarFloat3", true},
+        {"tbFloat4", "toolbarFloat4", true}  // define this index below as TBFloatLast
+};
+
+
+const static int TOOLBAR_DEFINITIONS_LEN = G_N_ELEMENTS(TOOLBAR_DEFINITIONS);
+
+#define TBFloatFirst 8
+#define TBFloatLast 11
diff --git a/entry/src/main/cpp/src/core/gui/ToolitemDragDrop.cpp b/entry/src/main/cpp/src/core/gui/ToolitemDragDrop.cpp
new file mode 100644
index 0000000..41a2108
--- /dev/null
+++ b/entry/src/main/cpp/src/core/gui/ToolitemDragDrop.cpp
@@ -0,0 +1,88 @@
+#include "ToolitemDragDrop.h"
+
+#include <glib-object.h>  // for g_object_...
+#include <glib.h>         // for g_malloc
+
+#include "gui/toolbarMenubar/AbstractToolItem.h"            // for AbstractT...
+#include "gui/toolbarMenubar/icon/ToolbarSeparatorImage.h"  // for getNewToo...
+
+struct NamedColor;
+
+const char* ATTACH_DRAG_DROP_DATA = "XOJ_DRAG_DROP_DATA";
+
+void ToolitemDragDrop::attachMetadata(GtkWidget* w, int id, AbstractToolItem* ait) {
+    ToolItemDragDropData* d = g_new(ToolItemDragDropData, 1);
+    d->identify = ToolItemDragDropData_Identify;
+    d->id = id;
+    d->item = ait;
+    d->type = TOOL_ITEM_ITEM;
+    d->paletteColorIndex = 0;
+
+    g_object_set_data_full(G_OBJECT(w), ATTACH_DRAG_DROP_DATA, d, static_cast<GDestroyNotify>(g_free));
+}
+
+auto ToolitemDragDrop::ToolItemDragDropData_new(AbstractToolItem* item) -> std::unique_ptr<ToolItemDragDropData> {
+    auto d = std::make_unique<ToolItemDragDropData>();
+    d->identify = ToolItemDragDropData_Identify;
+    d->id = -1;
+    d->item = item;
+    d->type = TOOL_ITEM_ITEM;
+    d->paletteColorIndex = 0;
+
+    return d;
+}
+
+void ToolitemDragDrop::attachMetadata(GtkWidget* w, int id, ToolItemType type) {
+    ToolItemDragDropData* d = g_new(ToolItemDragDropData, 1);
+    d->identify = ToolItemDragDropData_Identify;
+    d->id = id;
+    d->item = nullptr;
+    d->type = type;
+    d->paletteColorIndex = 0;
+
+    g_object_set_data_full(G_OBJECT(w), ATTACH_DRAG_DROP_DATA, d, static_cast<GDestroyNotify>(g_free));
+}
+
+void ToolitemDragDrop::attachMetadataColor(GtkWidget* w, int id, size_t paletteColorIndex, AbstractToolItem* item) {
+    ToolItemDragDropData* d = g_new(ToolItemDragDropData, 1);
+    d->identify = ToolItemDragDropData_Identify;
+    d->id = id;
+    d->item = item;
+    d->type = TOOL_ITEM_COLOR;
+    d->paletteColorIndex = paletteColorIndex;
+
+    g_object_set_data_full(G_OBJECT(w), ATTACH_DRAG_DROP_DATA, d, static_cast<GDestroyNotify>(g_free));
+}
+
+auto ToolitemDragDrop::getIcon(ToolItemDragDropData* data) -> GtkWidget* {
+    if (data->type == TOOL_ITEM_ITEM || data->type == TOOL_ITEM_COLOR) {
+        return data->item->getNewToolIcon();
+    }
+    if (data->type == TOOL_ITEM_SEPARATOR) {
+        return ToolbarSeparatorImage::newImage(SeparatorType::SEPARATOR);
+    }
+    if (data->type == TOOL_ITEM_SPACER) {
+        return ToolbarSeparatorImage::newImage(SeparatorType::SPACER);
+    }
+
+    g_warning("ToolitemDragDrop::getIcon unhandled type: %i\n", data->type);
+    return gtk_image_new();
+}
+
+auto ToolitemDragDrop::checkToolItemDragDropData(ToolItemDragDropData const* d) -> bool {
+    return d->identify == ToolItemDragDropData_Identify;
+}
+
+auto ToolitemDragDrop::metadataGetMetadata(GtkWidget* w) -> ToolItemDragDropData* {
+    void* ptr = g_object_get_data(G_OBJECT(w), ATTACH_DRAG_DROP_DATA);
+    if (ptr == nullptr) {
+        g_warning("ToolitemDragDrop::metadataGetMetadata Could not get Metadata %s from %s\n", ATTACH_DRAG_DROP_DATA,
+                  g_type_name(G_TYPE_FROM_INSTANCE(w)));
+        return nullptr;
+    }
+    if (!checkToolItemDragDropData(static_cast<ToolItemDragDropData const*>(ptr))) {
+        g_warning("ToolitemDragDrop::metadataGetMetadata data is not an instance of ToolItemDragDropData!");
+        return nullptr;
+    }
+    return static_cast<ToolItemDragDropData*>(ptr);
+}
diff --git a/entry/src/main/cpp/src/core/gui/ToolitemDragDrop.h b/entry/src/main/cpp/src/core/gui/ToolitemDragDrop.h
new file mode 100644
index 0000000..f56fc27
--- /dev/null
+++ b/entry/src/main/cpp/src/core/gui/ToolitemDragDrop.h
@@ -0,0 +1,57 @@
+/*
+ * Xournal++
+ *
+ * Helper for Toolbar Drag & Drop implementation
+ *
+ * @author Xournal++ Team
+ * https://github.com/xournalpp/xournalpp
+ *
+ * @license GNU GPLv2 or later
+ */
+
+#pragma once
+
+#include <memory>
+
+#include <gdk-pixbuf/gdk-pixbuf.h>  // for GdkPixbuf
+#include <gtk/gtk.h>                // for GtkWidget
+
+class AbstractToolItem;
+struct NamedColor;
+
+enum ToolItemType { TOOL_ITEM_SEPARATOR = 0, TOOL_ITEM_SPACER, TOOL_ITEM_ITEM, TOOL_ITEM_COLOR };
+
+#define ToolItemDragDropData_Identify 0xFA090201
+
+struct ToolItemDragDropData {
+    unsigned int identify;
+    ToolItemType type;
+    int id;
+    AbstractToolItem* item;
+    size_t paletteColorIndex;
+};
+
+class ToolitemDragDrop {
+private:
+    ToolitemDragDrop();
+    virtual ~ToolitemDragDrop();
+
+public:
+    static void attachMetadata(GtkWidget* w, int id, AbstractToolItem* ait);
+    static void attachMetadata(GtkWidget* w, int id, ToolItemType type);
+    static void attachMetadataColor(GtkWidget* w, int id, size_t paletteColorIndex, AbstractToolItem* item);
+
+public:
+    static std::unique_ptr<ToolItemDragDropData> ToolItemDragDropData_new(AbstractToolItem* item);
+    static bool checkToolItemDragDropData(ToolItemDragDropData const* d);
+
+    static ToolItemDragDropData* metadataGetMetadata(GtkWidget* w);
+
+    /**
+     * Returns: (transfer floating)
+     */
+    static GtkWidget* getIcon(ToolItemDragDropData* data);
+
+public:
+    static void removeFromToolbarForMove(GtkWidget* widget);
+};
diff --git a/entry/src/main/cpp/src/core/gui/XournalView.cpp b/entry/src/main/cpp/src/core/gui/XournalView.cpp
new file mode 100644
index 0000000..b953ff2
--- /dev/null
+++ b/entry/src/main/cpp/src/core/gui/XournalView.cpp
@@ -0,0 +1,861 @@
+#include "XournalView.h"
+
+#include <algorithm>  // for max, min
+#include <iterator>   // for begin
+#include <memory>     // for unique_ptr, make_unique
+#include <optional>   // for optional
+#include <unordered_set>
+
+#include <gdk/gdk.h>         // for GdkEventKey, GDK_SHIF...
+#include <gdk/gdkkeysyms.h>  // for GDK_KEY_Page_Down
+#include <glib-object.h>     // for g_object_ref_sink
+
+#include "control/Control.h"                     // for Control
+#include "control/PdfCache.h"                    // for PdfCache
+#include "control/ScrollHandler.h"               // for ScrollHandler
+#include "control/ToolHandler.h"                 // for ToolHandler
+#include "control/actions/ActionDatabase.h"      // for ActionDatabase
+#include "control/jobs/XournalScheduler.h"       // for XournalScheduler
+#include "control/settings/MetadataManager.h"    // for MetadataManager
+#include "control/settings/Settings.h"           // for Settings
+#include "control/tools/CursorSelectionType.h"   // for CURSOR_SELECTION_NONE
+#include "control/tools/EditSelection.h"         // for EditSelection
+#include "control/zoom/ZoomControl.h"            // for ZoomControl
+#include "gui/MainWindow.h"                      // for MainWindow
+#include "gui/PdfFloatingToolbox.h"              // for PdfFloatingToolbox
+#include "gui/inputdevices/GeometryToolInputHandler.h"  // for GeometryToolInputHandler
+#include "gui/inputdevices/HandRecognition.h"    // for HandRecognition
+#include "gui/inputdevices/InputContext.h"       // for InputContext
+#include "gui/toolbarMenubar/ColorToolItem.h"    // for ColorToolItem
+#include "gui/toolbarMenubar/ToolMenuHandler.h"  // for ToolMenuHandler
+#include "gui/widgets/XournalWidget.h"           // for gtk_xournal_get_layout
+#include "model/Document.h"                      // for Document
+#include "model/Element.h"                       // for Element, ELEMENT_STROKE
+#include "model/PageRef.h"                       // for PageRef
+#include "model/Stroke.h"                        // for Stroke, StrokeTool::E...
+#include "model/XojPage.h"                       // for XojPage
+#include "undo/DeleteUndoAction.h"               // for DeleteUndoAction
+#include "undo/UndoRedoHandler.h"                // for UndoRedoHandler
+#include "util/Assert.h"                         // for xoj_assert
+#include "util/Point.h"                          // for Point
+#include "util/Rectangle.h"                      // for Rectangle
+#include "util/Util.h"                           // for npos
+#include "util/glib_casts.h"                     // for wrap_v
+#include "util/gtk4_helper.h"                    // for gtk_scrolled_window_set_child
+#include "util/safe_casts.h"                     // for round_cast
+
+#include "Layout.h"           // for Layout
+#include "PageView.h"         // for XojPageView
+#include "RepaintHandler.h"   // for RepaintHandler
+#include "XournalppCursor.h"  // for XournalppCursor
+
+using xoj::util::Rectangle;
+
+constexpr int REGULAR_MOVE_AMOUNT = 3;
+constexpr int SMALL_MOVE_AMOUNT = 1;
+constexpr int LARGE_MOVE_AMOUNT = 10;
+
+std::pair<size_t, size_t> XournalView::preloadPageBounds(size_t page, size_t maxPage) {
+    const size_t preloadBefore = this->control->getSettings()->getPreloadPagesBefore();
+    const size_t preloadAfter = this->control->getSettings()->getPreloadPagesAfter();
+    const size_t lower = page > preloadBefore ? page - preloadBefore : 0;
+    const size_t upper = std::min(maxPage, page + preloadAfter + 1);
+    return {lower, upper};
+}
+
+XournalView::XournalView(GtkWidget* parent, Control* control, ScrollHandling* scrollHandling):
+        scrollHandling(scrollHandling), control(control) {
+    Document* doc = control->getDocument();
+    doc->lock_shared();
+    if (doc->getPdfPageCount() != 0) {
+        this->cache = std::make_unique<PdfCache>(doc->getPdfDocument(), control->getSettings());
+    }
+    doc->unlock_shared();
+
+    registerListener(control);
+
+    InputContext* inputContext = new InputContext(this, scrollHandling);
+    this->widget = gtk_xournal_new(this, inputContext);
+    g_object_ref_sink(this->widget);  // take ownership without increasing the ref count
+
+    gtk_container_add(GTK_CONTAINER(parent), this->widget);
+    gtk_widget_show(this->widget);
+
+
+    g_signal_connect(getWidget(), "realize", G_CALLBACK(+[](GtkWidget* widget, gpointer) {
+                         // Disable event compression
+                         if (gtk_widget_get_realized(widget)) {
+                             gdk_window_set_event_compression(gtk_widget_get_window(widget), false);
+                         } else {
+                             g_warning("could not disable event compression");
+                         }
+                     }),
+                     nullptr);
+
+    this->repaintHandler = std::make_unique<RepaintHandler>(this);
+
+    control->getZoomControl()->addZoomListener(this);
+
+    gtk_widget_set_can_default(this->widget, true);
+    gtk_widget_grab_default(this->widget);
+
+    gtk_widget_grab_focus(this->widget);
+
+    this->cleanupTimeout = g_timeout_add_seconds(5, xoj::util::wrap_v<clearMemoryTimer>, this);
+}
+
+XournalView::~XournalView() {
+    g_source_remove(this->cleanupTimeout);
+
+    gtk_widget_destroy(this->widget);
+    this->widget = nullptr;
+}
+
+
+auto XournalView::clearMemoryTimer(XournalView* widget) -> gboolean {
+    widget->cleanupBufferCache();
+    return G_SOURCE_CONTINUE;
+}
+
+auto XournalView::cleanupBufferCache() -> void {
+    const auto& [pagesLower, pagesUpper] = this->preloadPageBounds(this->currentPage, this->viewPages.size());
+    xoj_assert(pagesLower <= pagesUpper);
+
+    std::unordered_set<size_t> retainedPdfPages;
+
+    for (size_t i = 0; i < this->viewPages.size(); i++) {
+        auto&& page = this->viewPages[i];
+        const bool isPreload = pagesLower <= i && i < pagesUpper;
+        const bool shouldRetain = isPreload || page->isVisible();
+
+        if (shouldRetain) {
+            const size_t pdfPageNo = page->getPage()->getPdfPageNr();
+            if (pdfPageNo != npos) {
+                retainedPdfPages.insert(pdfPageNo);
+            }
+            continue;
+        } else if (page->hasBuffer()) {
+            page->deleteViewBuffer();
+        }
+    }
+
+    if (this->cache) {
+        this->cache->evictAllExcept(retainedPdfPages);
+    }
+}
+
+auto XournalView::getCurrentPage() const -> size_t { return currentPage; }
+
+const int scrollKeySize = 30;
+
+auto XournalView::onKeyPressEvent(const KeyEvent& event) -> bool {
+    size_t p = getCurrentPage();
+    if (p != npos && p < this->viewPages.size()) {
+        auto& v = this->viewPages[p];
+        if (v->onKeyPressEvent(event)) {
+            return true;
+        }
+    }
+
+    auto keyval = event.keyval;
+    auto state = event.state;
+    if (auto* tool = getControl()->getWindow()->getPdfToolbox(); tool->hasSelection()) {
+        if ((keyval == GDK_KEY_c && state == GDK_CONTROL_MASK) || keyval == GDK_KEY_Copy) {
+            // Shortcut to get selected PDF text.
+            tool->copyTextToClipboard();
+            return true;
+        }
+    }
+
+    if (auto* selection = getSelection(); selection) {
+        if (keyval == GDK_KEY_Escape) {
+            clearSelection();
+            return true;
+        }
+
+        int d = REGULAR_MOVE_AMOUNT;
+        if (state == GDK_MOD1_MASK) {
+            d = SMALL_MOVE_AMOUNT;
+        } else if (state == GDK_SHIFT_MASK) {
+            d = LARGE_MOVE_AMOUNT;
+        }
+
+        int xdir = 0;
+        int ydir = 0;
+        if (keyval == GDK_KEY_Left) {
+            xdir = -1;
+        } else if (keyval == GDK_KEY_Up) {
+            ydir = -1;
+        } else if (keyval == GDK_KEY_Right) {
+            xdir = 1;
+        } else if (keyval == GDK_KEY_Down) {
+            ydir = 1;
+        }
+        if (xdir != 0 || ydir != 0) {
+            selection->moveSelection(d * xdir, d * ydir, /*addMoveUndo=*/true);
+            selection->ensureWithinVisibleArea();
+            return true;
+        }
+    }
+
+    if (auto* geom = GTK_XOURNAL(widget)->input->getGeometryToolInputHandler(); geom && geom->keyPressed(event)) {
+        return true;
+    }
+
+    Layout* layout = this->getLayout();
+
+    if (!state) {
+        if (keyval == GDK_KEY_Page_Down || keyval == GDK_KEY_KP_Page_Down) {
+            control->getScrollHandler()->goToNextPage();
+            return true;
+        }
+        if (keyval == GDK_KEY_Page_Up || keyval == GDK_KEY_KP_Page_Up) {
+            control->getScrollHandler()->goToPreviousPage();
+            return true;
+        }
+    }
+
+    if (keyval == GDK_KEY_space) {
+        GtkAllocation alloc = {0};
+        gtk_widget_get_allocation(gtk_widget_get_parent(this->widget), &alloc);
+        int windowHeight = alloc.height - scrollKeySize;
+
+        if (!state) {
+            layout->scrollRelative(0, windowHeight);
+            return true;
+        }
+        if (state == GDK_SHIFT_MASK) {
+            layout->scrollRelative(0, -windowHeight);
+            return true;
+        }
+    }
+
+    // Numeric keypad always navigates by page
+    if (keyval == GDK_KEY_KP_Up) {
+        this->pageRelativeXY(0, -1);
+        return true;
+    }
+
+    if (keyval == GDK_KEY_KP_Down) {
+        this->pageRelativeXY(0, 1);
+        return true;
+    }
+
+    if (keyval == GDK_KEY_KP_Left) {
+        this->pageRelativeXY(-1, 0);
+        return true;
+    }
+
+    if (keyval == GDK_KEY_KP_Right) {
+        this->pageRelativeXY(1, 0);
+        return true;
+    }
+
+
+    if (keyval == GDK_KEY_Up || keyval == GDK_KEY_k || keyval == GDK_KEY_K) {
+        if (control->getSettings()->isPresentationMode()) {
+            control->getScrollHandler()->goToPreviousPage();
+            return true;
+        }
+
+        if (state == GDK_SHIFT_MASK) {
+            this->pageRelativeXY(0, -1);
+            return true;
+        }
+        if (!state) {
+            layout->scrollRelative(0, -scrollKeySize);
+            return true;
+        }
+    }
+
+    if (keyval == GDK_KEY_Down || keyval == GDK_KEY_j || keyval == GDK_KEY_J) {
+        if (control->getSettings()->isPresentationMode()) {
+            control->getScrollHandler()->goToNextPage();
+            return true;
+        }
+
+        if (state == GDK_SHIFT_MASK) {
+            this->pageRelativeXY(0, 1);
+            return true;
+        }
+        if (!state) {
+            layout->scrollRelative(0, scrollKeySize);
+            return true;
+        }
+    }
+
+    if (keyval == GDK_KEY_Left || keyval == GDK_KEY_h) {
+        if (state == GDK_SHIFT_MASK) {
+            this->pageRelativeXY(-1, 0);
+            return true;
+        }
+        if (!state) {
+            if (control->getSettings()->isPresentationMode()) {
+                control->getScrollHandler()->goToPreviousPage();
+            } else {
+                layout->scrollRelative(-scrollKeySize, 0);
+            }
+            return true;
+        }
+    }
+
+    if (keyval == GDK_KEY_Right || keyval == GDK_KEY_l) {
+        if (state == GDK_SHIFT_MASK) {
+            this->pageRelativeXY(1, 0);
+            return true;
+        }
+
+        if (!state) {
+            if (control->getSettings()->isPresentationMode()) {
+                control->getScrollHandler()->goToNextPage();
+            } else {
+                layout->scrollRelative(scrollKeySize, 0);
+            }
+            return true;
+        }
+    }
+
+    if (keyval == GDK_KEY_End || keyval == GDK_KEY_KP_End) {
+        control->getScrollHandler()->goToLastPage();
+        return true;
+    }
+
+    if (keyval == GDK_KEY_Home || keyval == GDK_KEY_KP_Home) {
+        control->getScrollHandler()->goToFirstPage();
+        return true;
+    }
+
+    // Switch color on number key
+    auto& colors = control->getWindow()->getToolMenuHandler()->getColorToolItems();
+    if (!state && (keyval >= GDK_KEY_0) && (keyval < GDK_KEY_0 + std::min((std::size_t)10, colors.size()))) {
+        std::size_t index = std::min(colors.size() - 1, (std::size_t)(9 + (keyval - GDK_KEY_0)) % 10);
+        const auto& colorToolItem = colors.at(index);
+        if (auto* db = control->getActionDatabase(); db->isActionEnabled(Action::TOOL_COLOR)) {
+            control->getActionDatabase()->fireChangeActionState(Action::TOOL_COLOR, colorToolItem->getColor());
+        }
+        return true;
+    }
+    return false;
+}
+
+auto XournalView::getRepaintHandler() const -> RepaintHandler* { return this->repaintHandler.get(); }
+
+auto XournalView::onKeyReleaseEvent(const KeyEvent& event) -> bool {
+    size_t p = getCurrentPage();
+    if (p != npos && p < this->viewPages.size()) {
+        auto& v = this->viewPages[p];
+        if (v->onKeyReleaseEvent(event)) {
+            return true;
+        }
+    }
+
+    return false;
+}
+
+void XournalView::onSettingsChanged() {
+    if (this->cache) {
+        this->cache->updateSettings(control->getSettings());
+    }
+}
+
+// send the focus back to the appropriate widget
+void XournalView::requestFocus() { gtk_widget_grab_focus(this->widget); }
+
+auto XournalView::searchTextOnPage(const std::string& text, size_t pageNumber, size_t index, size_t* occurrences,
+                                   XojPdfRectangle* matchRect) -> bool {
+    if (pageNumber == npos || pageNumber >= this->viewPages.size()) {
+        return false;
+    }
+    auto& v = this->viewPages[pageNumber];
+
+    return v->searchTextOnPage(text, index, occurrences, matchRect);
+}
+
+void XournalView::forceUpdatePagenumbers() {
+    size_t p = this->currentPage;
+    this->currentPage = npos;
+
+    control->firePageSelected(p);
+}
+
+auto XournalView::getViewFor(size_t pageNr) const -> XojPageView* {
+    if (pageNr == npos || pageNr >= this->viewPages.size()) {
+        return nullptr;
+    }
+    return this->viewPages[pageNr].get();
+}
+
+void XournalView::pageSelected(size_t page) {
+    if (this->currentPage == page && this->lastSelectedPage == page) {
+        return;
+    }
+
+    control->getWindow()->getPdfToolbox()->userCancelSelection();
+
+    if (this->lastSelectedPage != npos && this->lastSelectedPage < this->viewPages.size()) {
+        this->viewPages[this->lastSelectedPage]->setSelected(false);
+    }
+
+    endTextAllPages();
+
+    this->currentPage = page;
+
+    size_t pdfPage = npos;
+
+    if (page != npos && page < viewPages.size()) {
+        auto& vp = viewPages[page];
+        vp->setSelected(true);
+        lastSelectedPage = page;
+        pdfPage = vp->getPage()->getPdfPageNr();
+    }
+
+    control->updatePageNumbers(currentPage, pdfPage);
+
+    control->updateBackgroundSizeButton();
+    control->updatePageActions();
+
+    if (control->getSettings()->isEagerPageCleanup()) {
+        this->cleanupBufferCache();
+    }
+
+    // Load surrounding pages if they are not
+    const auto& [pagesLower, pagesUpper] = preloadPageBounds(page, this->viewPages.size());
+    xoj_assert(pagesLower <= pagesUpper);
+    for (size_t i = pagesLower; i < pagesUpper; i++) {
+        if (!this->viewPages[i]->hasBuffer()) {
+            this->viewPages[i]->rerenderPage();
+        }
+    }
+}
+
+auto XournalView::getControl() const -> Control* { return control; }
+
+void XournalView::scrollTo(size_t pageNo, XojPdfRectangle rect) {
+    double zoom = getZoom();
+    if (pageNo >= this->viewPages.size()) {
+        return;
+    }
+
+    auto& v = this->viewPages[pageNo];
+
+    // Make sure it is visible
+    Layout* layout = this->getLayout();
+
+    int x = v->getX() + round_cast<int>(rect.x1 * zoom);
+    int y = v->getY() + round_cast<int>(rect.y1 * zoom);
+    int width;
+    int height;
+    if (rect.x2 == -1 || rect.y2 == -1) {
+        width = v->getDisplayWidth();
+        height = v->getDisplayHeight();
+    } else {
+        width = round_cast<int>((rect.x2 - rect.x1) * zoom);
+        height = round_cast<int>((rect.y2 - rect.y1) * zoom);
+    }
+
+    layout->ensureRectIsVisible(x, y, width, height);
+
+    // Select the page
+    control->firePageSelected(pageNo);
+}
+
+
+void XournalView::pageRelativeXY(int offCol, int offRow) {
+    size_t currPage = getCurrentPage();
+
+    XojPageView* view = getViewFor(currPage);
+    int row = view->getMappedRow();
+    int col = view->getMappedCol();
+
+    Layout* layout = this->getLayout();
+    auto optionalPageIndex = layout->getPageIndexAtGridMap(as_unsigned(row + offRow), as_unsigned(col + offCol));
+    if (optionalPageIndex) {
+        this->scrollTo(*optionalPageIndex);
+    }
+}
+
+
+void XournalView::endTextAllPages(XojPageView* except) const {
+    for (auto& v: this->viewPages) {
+        if (except != v.get()) {
+            v->endText();
+        }
+    }
+}
+
+void XournalView::endSplineAllPages() const {
+    for (auto& v: this->viewPages) {
+        v->endSpline();
+    }
+}
+
+void XournalView::layerChanged(size_t page) {
+    if (page != npos && page < this->viewPages.size()) {
+        this->viewPages[page]->rerenderPage();
+    }
+}
+
+void XournalView::getPasteTarget(double& x, double& y) const {
+    size_t pageNo = getCurrentPage();
+    if (pageNo == npos) {
+        return;
+    }
+
+    Rectangle<double>* rect = getVisibleRect(pageNo);
+
+    if (rect) {
+        x = rect->x + rect->width / 2;
+        y = rect->y + rect->height / 2;
+        delete rect;
+    }
+}
+
+/**
+ * Return the rectangle which is visible on screen, in document cooordinates
+ *
+ * Or nullptr if the page is not visible
+ */
+auto XournalView::getVisibleRect(size_t page) const -> Rectangle<double>* {
+    if (page == npos || page >= this->viewPages.size()) {
+        return nullptr;
+    }
+    auto& p = this->viewPages[page];
+
+    return getVisibleRect(p.get());
+}
+
+auto XournalView::getVisibleRect(const XojPageView* redrawable) const -> Rectangle<double>* {
+    return gtk_xournal_get_visible_area(this->widget, redrawable);
+}
+
+void XournalView::recreatePdfCache() {
+    this->cache.reset();
+
+    Document* doc = control->getDocument();
+    doc->lock_shared();
+    if (doc->getPdfPageCount() != 0) {
+        this->cache = std::make_unique<PdfCache>(doc->getPdfDocument(), control->getSettings());
+    }
+    doc->unlock_shared();
+}
+
+/**
+ * @return Helper class for Touch specific fixes
+ */
+auto XournalView::getHandRecognition() const -> HandRecognition* {
+    return GTK_XOURNAL(widget)->input->getHandRecognition();
+}
+
+/**
+ * @return Scrollbars
+ */
+auto XournalView::getScrollHandling() const -> ScrollHandling* { return scrollHandling; }
+
+auto XournalView::getWidget() const -> GtkWidget* { return widget; }
+
+void XournalView::ensureRectIsVisible(int x, int y, int width, int height) {
+    Layout* layout = this->getLayout();
+    layout->ensureRectIsVisible(x, y, width, height);
+}
+
+void XournalView::zoomChanged() {
+
+    size_t currentPage = this->getCurrentPage();
+    XojPageView* view = getViewFor(currentPage);
+
+    ZoomControl* zoom = control->getZoomControl();
+
+    if (!view) {
+        return;
+    }
+
+    layoutPages();
+
+    if (zoom->isZoomPresentationMode()) {
+        scrollTo(currentPage);
+    } else if (zoom->isZoomSequenceActive()) {
+        auto pos = zoom->getScrollPositionAfterZoom();
+        Layout* layout = this->getLayout();
+        layout->scrollAbs(pos.x, pos.y);
+    }
+
+    // Updates the Eraser's cursor icon in order to make it as big as the erasing area
+    control->getCursor()->updateCursor();
+
+    // if we changed the zoom of the page, we should hide the pdf floating toolbox
+    // and if user clicked the selection again, the floating toolbox shows again
+    control->getWindow()->getPdfToolbox()->hide();
+
+    this->control->getScheduler()->blockRerenderZoom();
+}
+
+void XournalView::pageSizeChanged(size_t page) {
+    layoutPages();
+    if (page != npos && page < this->viewPages.size()) {
+        this->viewPages[page]->rerenderPage(/* sizeChanged */ true);
+    }
+}
+
+void XournalView::pageChanged(size_t page) {
+    if (page != npos && page < this->viewPages.size()) {
+        this->viewPages[page]->rerenderPage();
+    }
+}
+
+void XournalView::pageDeleted(size_t page) {
+    const size_t currentPageNo = control->getCurrentPageNo();
+
+    viewPages.erase(begin(viewPages) + static_cast<long>(page));
+
+    layoutPages();
+
+    if (currentPageNo > page) {
+        control->getScrollHandler()->scrollToPage(currentPageNo - 1);
+    } else {
+        control->getScrollHandler()->scrollToPage(currentPageNo);
+    }
+}
+
+auto XournalView::getTextEditor() const -> TextEditor* {
+    for (auto&& page: viewPages) {
+        if (page->getTextEditor()) {
+            return page->getTextEditor();
+        }
+    }
+
+    return nullptr;
+}
+
+auto XournalView::getCache() const -> PdfCache* { return this->cache.get(); }
+
+void XournalView::pageInserted(size_t page) {
+    Document* doc = control->getDocument();
+    doc->lock_shared();
+    auto pageView = std::make_unique<XojPageView>(this, doc->getPage(page));
+    doc->unlock_shared();
+
+    viewPages.insert(begin(viewPages) + as_signed(page), std::move(pageView));
+
+    layoutPages();
+    // check which pages are visible and select the most visible page
+    Layout* layout = this->getLayout();
+    layout->updateVisibility();
+}
+
+auto XournalView::getZoom() const -> double { return control->getZoomControl()->getZoom(); }
+
+auto XournalView::getDpiScaleFactor() const -> int { return gtk_widget_get_scale_factor(widget); }
+
+void XournalView::clearSelection() {
+    EditSelection* sel = GTK_XOURNAL(widget)->selection;
+    GTK_XOURNAL(widget)->selection = nullptr;
+    delete sel;
+
+    control->setClipboardHandlerSelection(getSelection());
+
+    getCursor()->setMouseSelectionType(CURSOR_SELECTION_NONE);
+    control->getToolHandler()->setSelectionEditTools(false, false, false, false);
+}
+
+void XournalView::deleteSelection(EditSelection* sel) {
+    if (sel == nullptr) {
+        sel = getSelection();
+    }
+
+    if (sel) {
+        auto undo = std::make_unique<DeleteUndoAction>(sel->getSourcePage(), false);
+        sel->fillUndoItem(undo.get());
+        control->getUndoRedoHandler()->addUndoAction(std::move(undo));
+
+        clearSelection();
+
+        repaintSelection(true);
+    }
+}
+
+void XournalView::setSelection(EditSelection* selection) {
+    clearSelection();
+    GTK_XOURNAL(this->widget)->selection = selection;
+
+    control->setClipboardHandlerSelection(getSelection());
+
+    bool canChangeSize = false;
+    bool canChangeColor = false;
+    bool canChangeFill = false;
+    bool canChangeLineStyle = false;
+
+    for (const Element* e: selection->getElementsView()) {
+        switch (e->getType()) {
+            case ELEMENT_TEXT:
+                canChangeColor = true;
+                continue;
+            case ELEMENT_STROKE: {
+                canChangeSize = true;
+
+                const auto* s = dynamic_cast<const Stroke*>(e);
+                if (s->getToolType() == StrokeTool::PEN) {
+                    // can change everything, leave loop with break
+                    canChangeColor = true;
+                    canChangeFill = true;
+                    canChangeLineStyle = true;
+                    break;
+                }
+                if (s->getToolType() == StrokeTool::HIGHLIGHTER) {
+                    canChangeColor = true;
+                    canChangeFill = true;
+                }
+                continue;
+            }
+            default:
+                continue;
+        }
+
+        // leave loop
+        break;
+    }
+
+    control->getToolHandler()->setSelectionEditTools(canChangeColor, canChangeSize, canChangeFill, canChangeLineStyle);
+
+    repaintSelection();
+}
+
+void XournalView::repaintSelection(bool evenWithoutSelection) {
+    if (evenWithoutSelection) {
+        gtk_widget_queue_draw(this->widget);
+        return;
+    }
+
+    EditSelection* selection = getSelection();
+    if (selection == nullptr) {
+        return;
+    }
+
+    // repaint always the whole widget
+    gtk_widget_queue_draw(this->widget);
+}
+
+void XournalView::layoutPages() {
+    Layout* layout = this->getLayout();
+    layout->recalculate();
+
+    // Todo (fabian): the following lines are conceptually wrong, the Layout::layoutPages function is meant to be
+    // called by an expose event, but removing it, will break "add page".
+    auto rectangle = layout->getVisibleRect();
+    layout->layoutPages(std::max<int>(layout->getMinimalWidth(), round_cast<int>(rectangle.width)),
+                        std::max<int>(layout->getMinimalHeight(), round_cast<int>(rectangle.height)));
+}
+
+auto XournalView::getDisplayHeight() const -> int {
+    GtkAllocation allocation = {0};
+    gtk_widget_get_allocation(this->widget, &allocation);
+    return allocation.height;
+}
+
+auto XournalView::getDisplayWidth() const -> int {
+    GtkAllocation allocation = {0};
+    gtk_widget_get_allocation(this->widget, &allocation);
+    return allocation.width;
+}
+
+auto XournalView::isPageVisible(size_t page, int* visibleHeight) const -> bool {
+    Rectangle<double>* rect = getVisibleRect(page);
+    if (rect) {
+        if (visibleHeight) {
+            *visibleHeight = round_cast<int>(rect->height);
+        }
+
+        delete rect;
+        return true;
+    }
+    if (visibleHeight) {
+        *visibleHeight = 0;
+    }
+
+    return false;
+}
+
+void XournalView::documentChanged(DocumentChangeType type) {
+    if (type != DOCUMENT_CHANGE_CLEARED && type != DOCUMENT_CHANGE_COMPLETE) {
+        return;
+    }
+
+    XournalScheduler* scheduler = this->control->getScheduler();
+    scheduler->lock();
+    scheduler->removeAllJobs();
+
+    clearSelection();
+
+    recreatePdfCache();
+
+    Document* doc = control->getDocument();
+    doc->lock_shared();
+
+    viewPages.clear();
+    size_t pagecount = doc->getPageCount();
+    viewPages.reserve(pagecount);
+    for (size_t i = 0; i < pagecount; i++) {
+        viewPages.emplace_back(std::make_unique<XojPageView>(this, doc->getPage(i)));
+    }
+
+    doc->unlock_shared();
+
+    layoutPages();
+    scrollTo(0);
+
+    scheduler->unlock();
+}
+
+auto XournalView::cut() -> bool {
+    size_t p = getCurrentPage();
+    if (p == npos || p >= viewPages.size()) {
+        return false;
+    }
+
+    auto& page = viewPages[p];
+    return page->cut();
+}
+
+auto XournalView::copy() -> bool {
+    size_t p = getCurrentPage();
+    if (p == npos || p >= viewPages.size()) {
+        return false;
+    }
+
+    auto& page = viewPages[p];
+    return page->copy();
+}
+
+auto XournalView::paste() -> bool {
+    size_t p = getCurrentPage();
+    if (p == npos || p >= viewPages.size()) {
+        return false;
+    }
+
+    auto& page = viewPages[p];
+    return page->paste();
+}
+
+auto XournalView::actionDelete() -> bool {
+    size_t p = getCurrentPage();
+    if (p == npos || p >= viewPages.size()) {
+        return false;
+    }
+
+    auto& page = viewPages[p];
+    return page->actionDelete();
+}
+
+auto XournalView::getDocument() const -> Document* { return control->getDocument(); }
+
+auto XournalView::getViewPages() const -> std::vector<std::unique_ptr<XojPageView>> const& { return viewPages; }
+
+auto XournalView::getCursor() const -> XournalppCursor* { return control->getCursor(); }
+
+auto XournalView::getSelection() const -> EditSelection* {
+    g_return_val_if_fail(this->widget != nullptr, nullptr);
+    g_return_val_if_fail(GTK_IS_XOURNAL(this->widget), nullptr);
+
+    return GTK_XOURNAL(this->widget)->selection;
+}
+
+auto XournalView::getLayout() const -> Layout* { return gtk_xournal_get_layout(getWidget()); }
diff --git a/entry/src/main/cpp/src/core/gui/XournalView.h b/entry/src/main/cpp/src/core/gui/XournalView.h
new file mode 100644
index 0000000..7973b5b
--- /dev/null
+++ b/entry/src/main/cpp/src/core/gui/XournalView.h
@@ -0,0 +1,195 @@
+/*
+ * Xournal++
+ *
+ * The widget which displays the PDF and the drawings
+ *
+ * @author Xournal++ Team
+ * https://github.com/xournalpp/xournalpp
+ *
+ * @license GNU GPLv2 or later
+ */
+
+#pragma once
+
+#include <cstddef>  // for size_t
+#include <limits>   // for numeric_limits
+#include <memory>   // for unique_ptr
+#include <string>   // for string
+#include <utility>  // for pair
+#include <vector>   // for vector
+
+#include <gdk/gdk.h>  // for GdkEventKey, GdkEventExpose
+#include <glib.h>     // for gboolean
+#include <gtk/gtk.h>  // for GtkWidget, GtkAllocation
+
+#include "control/zoom/ZoomListener.h"     // for ZoomListener
+#include "gui/inputdevices/InputEvents.h"  // for KeyEvent
+#include "model/DocumentChangeType.h"      // for DocumentChangeType
+#include "model/DocumentListener.h"        // for DocumentListener
+#include "pdf/base/XojPdfPage.h"           // for XojPdfRectangle
+#include "util/Util.h"                     // for npos
+
+class Control;
+class XournalppCursor;
+class Document;
+class EditSelection;
+class XojPageView;
+class XojPdfRectangle;
+class PdfCache;
+class RepaintHandler;
+class ScrollHandling;
+class TextEditor;
+class HandRecognition;
+class Layout;
+namespace xoj::util {
+template <class T>
+class Rectangle;
+}  // namespace xoj::util
+
+class XournalView: public DocumentListener, public ZoomListener {
+public:
+    XournalView(GtkWidget* parent, Control* control, ScrollHandling* scrollHandling);
+    ~XournalView() override;
+
+public:
+    // Recalculate the layout width and height amd layout the pages with the updated layout size
+    void layoutPages();
+
+    void scrollTo(size_t pageNo, XojPdfRectangle rect = {0, 0, -1, -1});
+
+    // Relative navigation in current layout:
+    void pageRelativeXY(int offCol, int offRow);
+
+    size_t getCurrentPage() const;
+
+    void clearSelection();
+
+    void layerChanged(size_t page);
+
+    void requestFocus();
+
+    void forceUpdatePagenumbers();
+
+    XojPageView* getViewFor(size_t pageNr) const;
+
+    bool searchTextOnPage(const std::string& text, size_t pageNumber, size_t index, size_t* occurrences,
+                          XojPdfRectangle* matchRect);
+
+    bool cut();
+    bool copy();
+    bool paste();
+
+    void getPasteTarget(double& x, double& y) const;
+
+    bool actionDelete();
+
+    void endTextAllPages(XojPageView* except = nullptr) const;
+
+    void endSplineAllPages() const;
+
+    int getDisplayWidth() const;
+    int getDisplayHeight() const;
+
+    bool isPageVisible(size_t page, int* visibleHeight) const;
+
+    void ensureRectIsVisible(int x, int y, int width, int height);
+
+    void setSelection(EditSelection* selection);
+    EditSelection* getSelection() const;
+    void deleteSelection(EditSelection* sel = nullptr);
+    void repaintSelection(bool evenWithoutSelection = false);
+
+    TextEditor* getTextEditor() const;
+    std::vector<std::unique_ptr<XojPageView>> const& getViewPages() const;
+
+    Control* getControl() const;
+    double getZoom() const;
+    int getDpiScaleFactor() const;
+    Document* getDocument() const;
+    PdfCache* getCache() const;
+    RepaintHandler* getRepaintHandler() const;
+    GtkWidget* getWidget() const;
+    XournalppCursor* getCursor() const;
+    Layout* getLayout() const;
+
+    xoj::util::Rectangle<double>* getVisibleRect(size_t page) const;
+    xoj::util::Rectangle<double>* getVisibleRect(const XojPageView* redrawable) const;
+
+    /**
+     * Recreate the PDF cache, for example after the underlying PDF file has changed
+     */
+    void recreatePdfCache();
+
+    /**
+     * A pen action was detected now, therefore ignore touch events
+     * for a short time
+     */
+    void penActionDetected();
+
+    /**
+     * @return Helper class for Touch specific fixes
+     */
+    HandRecognition* getHandRecognition() const;
+
+    /**
+     * @return Scrollbars
+     */
+    ScrollHandling* getScrollHandling() const;
+
+public:
+    // ZoomListener interface
+    void zoomChanged() override;
+
+public:
+    // DocumentListener interface
+    void pageSelected(size_t page) override;
+    void pageSizeChanged(size_t page) override;
+    void pageChanged(size_t page) override;
+    void pageInserted(size_t page) override;
+    void pageDeleted(size_t page) override;
+    void documentChanged(DocumentChangeType type) override;
+
+public:
+    bool onKeyPressEvent(const KeyEvent& event);
+    bool onKeyReleaseEvent(const KeyEvent& event);
+
+    void onSettingsChanged();
+
+private:
+    void fireZoomChanged();
+
+    std::pair<size_t, size_t> preloadPageBounds(size_t page, size_t maxPage);
+
+    static auto clearMemoryTimer(XournalView* widget) -> gboolean;
+
+    void cleanupBufferCache();
+
+private:
+    /**
+     * Scrollbars
+     */
+    ScrollHandling* scrollHandling = nullptr;
+
+    GtkWidget* widget = nullptr;
+
+    std::vector<std::unique_ptr<XojPageView>> viewPages;
+
+    Control* control = nullptr;
+
+    size_t currentPage = 0;
+    size_t lastSelectedPage = npos;
+
+    std::unique_ptr<PdfCache> cache;
+
+    /**
+     * Handler for rerendering pages / repainting pages
+     */
+    std::unique_ptr<RepaintHandler> repaintHandler;
+
+    /**
+     * Memory cleanup timeout
+     */
+    guint cleanupTimeout = std::numeric_limits<guint>::max();
+
+    friend class Layout;
+};
diff --git a/entry/src/main/cpp/src/core/gui/XournalppCursor.cpp b/entry/src/main/cpp/src/core/gui/XournalppCursor.cpp
new file mode 100644
index 0000000..dff44d9
--- /dev/null
+++ b/entry/src/main/cpp/src/core/gui/XournalppCursor.cpp
@@ -0,0 +1,648 @@
+#include "XournalppCursor.h"
+
+#include <cmath>             // for cos, sin, M_PI, NAN, fmod
+#include <cstdint>           // for uint32_t
+#include <initializer_list>  // for initializer_list
+
+#include <cairo.h>                  // for cairo_move_to, cairo_lin...
+#include <gdk-pixbuf/gdk-pixbuf.h>  // for GdkPixbuf
+#include <glib-object.h>            // for g_object_unref
+#include <gtk/gtk.h>                // for gtk_widget_get_window
+
+#include "control/Control.h"                 // for Control
+#include "control/ToolEnums.h"               // for TOOL_HAND, TOOL_PEN, TOO...
+#include "control/ToolHandler.h"             // for ToolHandler
+#include "control/settings/Settings.h"       // for Settings
+#include "control/settings/SettingsEnums.h"  // for STYLUS_CURSOR_BIG, STYLU...
+#include "control/zoom/ZoomControl.h"        // for ZoomControl
+#include "gui/MainWindow.h"                  // for MainWindow
+#include "util/Color.h"                      // for argb_to_GdkRGBA, rgb_to_...
+#include "util/safe_casts.h"                 // for ceil_cast
+
+#include "XournalView.h"  // for XournalView
+
+
+// NOTE:  Every cursor change must result in the setting of this->currentCursor to the new cursor type even for custom
+// cursors.
+// Custom cursors can also compare then set this->currentCursorFlavour to notice changes in colour or size etc. The
+// flavour calculation is specific to each cursor type and is calculated differently within each type.
+
+
+//  All the cursors we want to use. WARNING Make sure to set their css names in cssCursors[] below WARNING
+enum AVAILABLECURSORS {
+    CRSR_nullptr = 0,  // <--- Do Not Modify
+    CRSR_BUSY,
+    CRSR_MOVE,
+    CRSR_MOVING,
+    CRSR_GRAB,
+    CRSR_GRABBING,
+    CRSR_TOP_LEFT_CORNER,
+    CRSR_TOP_RIGHT_CORNER,
+    CRSR_BOTTOM_LEFT_CORNER,
+    CRSR_BOTTOM_RIGHT_CORNER,
+    CRSR_SB_H_DOUBLE_ARROW,
+    CRSR_EXCHANGE,
+    CRSR_PIRATE,
+    CRSR_SB_V_DOUBLE_ARROW,
+    CRSR_ARROW,
+    CRSR_BLANK_CURSOR,
+    CRSR_XTERM,
+    CRSR_DEFAULT,
+    CRSR_HAND2,
+    CRSR_TCROSS,
+    CRSR_PENORHIGHLIGHTER,
+    CRSR_ERASER,
+    CRSR_DRAWDIRNONE,       // drawdir* keep these consecutive and in order: none,shift,ctrl,shiftctrl
+    CRSR_DRAWDIRSHIFT,      // "
+    CRSR_DRAWDIRCTRL,       // "
+    CRSR_DRAWDIRSHIFTCTRL,  // "
+    CRSR_RESIZE,
+
+    CRSR_END_OF_CURSORS
+};
+
+
+struct cursorStruct {
+    const gchar* cssName;
+    const gchar* cssBackupName;
+};
+
+
+//  our enum mapped to css name and a place to store the cursor pointer.
+// Note: including enum as error check (for now?)
+cursorStruct cssCursors[CRSR_END_OF_CURSORS];
+
+
+XournalppCursor::XournalppCursor(Control* control): control(control) {
+    // clang-format off
+	// NOTE: Go ahead and use a fancy css cursor... but specify a common backup cursor.
+	cssCursors[CRSR_nullptr                ] = 	{"",""};
+	cssCursors[CRSR_BUSY                ] = 	{"wait", 		""					};
+	cssCursors[CRSR_MOVE                ] = 	{"all-scroll", 	""					};
+	cssCursors[CRSR_MOVING              ] = 	{"grabbing", 	""					};
+	cssCursors[CRSR_GRAB                ] = 	{"grab", 		""					};
+	cssCursors[CRSR_GRABBING            ] = 	{"grabbing", 	""					};
+	cssCursors[CRSR_TOP_LEFT_CORNER     ] = 	{"nw-resize", 	""					};
+	cssCursors[CRSR_TOP_RIGHT_CORNER    ] = 	{"ne-resize", 	""					};
+	cssCursors[CRSR_BOTTOM_LEFT_CORNER  ] = 	{"sw-resize", 	""					};
+	cssCursors[CRSR_BOTTOM_RIGHT_CORNER ] = 	{"se-resize", 	""					};
+	cssCursors[CRSR_SB_H_DOUBLE_ARROW   ] = 	{"ew-resize", 	""					};
+	cssCursors[CRSR_EXCHANGE            ] = 	{"exchange", 	"arrow"				};
+	cssCursors[CRSR_PIRATE              ] = 	{"pirate", 		"arrow" 			};
+	cssCursors[CRSR_SB_V_DOUBLE_ARROW   ] = 	{"ns-resize", 	""					};
+	cssCursors[CRSR_ARROW               ] = 	{"default", 	""					};
+	cssCursors[CRSR_BLANK_CURSOR        ] = 	{"none", 		""					};
+	cssCursors[CRSR_XTERM               ] = 	{"text", 		""					};
+	cssCursors[CRSR_DEFAULT             ] = 	{"default", 	""					};
+	cssCursors[CRSR_HAND2               ] = 	{"hand2", 		""					};
+	cssCursors[CRSR_TCROSS              ] = 	{"crosshair", 	""					};
+	cssCursors[CRSR_PENORHIGHLIGHTER    ] = 	{"",""};			// custom cursors - enum used only for check
+	cssCursors[CRSR_ERASER              ] = 	{"",""};			// "
+	cssCursors[CRSR_DRAWDIRNONE         ] = 	{"",""};			// "
+	cssCursors[CRSR_DRAWDIRSHIFT        ] = 	{"",""};			// "
+	cssCursors[CRSR_DRAWDIRCTRL         ] = 	{"",""};			// "
+	cssCursors[CRSR_DRAWDIRSHIFTCTRL    ] = 	{"",""};			// "
+    cssCursors[CRSR_RESIZE              ] =     {"",""};            // "
+};
+// clang-format on
+
+constexpr auto RESIZE_CURSOR_SIZE = 16;
+constexpr auto DELTA_ANGLE_ARROW_HEAD = M_PI / 6.0;
+constexpr auto LENGTH_ARROW_HEAD = 0.7;
+constexpr auto RESIZE_CURSOR_HASH_PRECISION = 1000;
+
+
+XournalppCursor::~XournalppCursor() = default;
+
+
+void XournalppCursor::setInputDeviceClass(InputDeviceClass device) { this->inputDevice = device; }
+
+
+// pen or hi-light cursor will be a DrawDir cursor instead
+void XournalppCursor::activateDrawDirCursor(bool enable, bool shift, bool ctrl) {
+    this->drawDirActive = enable;
+    this->drawDirShift = shift;
+    this->drawDirCtrl = ctrl;
+}
+
+
+void XournalppCursor::setMouseDown(bool mouseDown) {
+    if (this->mouseDown == mouseDown) {
+        return;
+    }
+
+    this->mouseDown = mouseDown;
+    ToolHandler* handler = control->getToolHandler();
+    ToolType type = handler->getToolType();
+
+    // Not always an update is needed
+    if (type == TOOL_HAND || type == TOOL_VERTICAL_SPACE || type == TOOL_ERASER) {
+        updateCursor();
+    }
+}
+
+
+void XournalppCursor::setMouseSelectionType(CursorSelectionType selectionType) {
+    if (this->selectionType == selectionType) {
+        return;
+    }
+    this->selectionType = selectionType;
+    updateCursor();
+}
+
+void XournalppCursor::setRotationAngle(double angle) { this->angle = angle; }
+void XournalppCursor::setMirror(bool mirror) { this->mirror = mirror; }
+
+/*This handles setting the busy cursor for the main window and calls
+ * updateCursor to set the busy cursor for the XournalWidget region.
+ */
+void XournalppCursor::setCursorBusy(bool busy) {
+    MainWindow* win = control->getWindow();
+    if (!win) {
+        return;
+    }
+
+    if (this->busy == busy) {
+        return;
+    }
+
+    this->busy = busy;
+
+    if (busy) {
+        GdkWindow* window = gtk_widget_get_window(win->getWindow());
+        xoj::util::GObjectSPtr<GdkCursor> cursor(
+                gdk_cursor_new_from_name(gdk_window_get_display(window), cssCursors[CRSR_BUSY].cssName),
+                xoj::util::adopt);
+        gdk_window_set_cursor(window, cursor.get());
+    } else {
+        if (gtk_widget_get_window(win->getWindow())) {
+            gdk_window_set_cursor(gtk_widget_get_window(win->getWindow()), nullptr);
+        }
+    }
+
+    updateCursor();
+}
+
+
+void XournalppCursor::setInsidePage(bool insidePage) {
+    if (this->insidePage == insidePage) {
+        return;
+    }
+
+    this->insidePage = insidePage;
+
+    updateCursor();
+}
+
+
+void XournalppCursor::setInvisible(bool invisible) {
+    if (this->invisible == invisible) {
+        return;
+    }
+
+    this->invisible = invisible;
+
+    updateCursor();
+}
+
+
+void XournalppCursor::updateCursor() {
+    MainWindow* win = control->getWindow();
+    if (!win) {
+        return;
+    }
+
+    XournalView* xournal = win->getXournal();
+    if (!xournal) {
+        return;
+    }
+
+    GdkCursor* cursor = nullptr;
+
+
+    if (this->busy) {
+        setCursor(CRSR_BUSY);
+    } else {
+        ToolHandler* handler = control->getToolHandler();
+        ToolType type = handler->getToolType();
+
+
+        if (type == TOOL_HAND) {
+            if (this->mouseDown) {
+                setCursor(CRSR_GRABBING);
+            } else {
+                setCursor(CRSR_GRAB);
+            }
+        } else if (!this->insidePage) {
+            setCursor(CRSR_DEFAULT);
+        } else if (this->selectionType) {
+            switch (this->selectionType) {
+                case CURSOR_SELECTION_MOVE:
+                    if (this->mouseDown) {
+                        setCursor(CRSR_MOVING);
+                    } else {
+                        setCursor(CRSR_MOVE);
+                    }
+                    break;
+                case CURSOR_SELECTION_TOP_LEFT:
+                    [[fallthrough]];
+                case CURSOR_SELECTION_BOTTOM_RIGHT:
+                    cursor = getResizeCursor(45);
+                    break;
+                case CURSOR_SELECTION_TOP_RIGHT:
+                    [[fallthrough]];
+                case CURSOR_SELECTION_BOTTOM_LEFT:
+                    cursor = getResizeCursor(135);
+                    break;
+                case CURSOR_SELECTION_LEFT:
+                    [[fallthrough]];
+                case CURSOR_SELECTION_RIGHT:
+                    cursor = getResizeCursor(180);
+                    break;
+                case CURSOR_SELECTION_TOP:
+                    [[fallthrough]];
+                case CURSOR_SELECTION_BOTTOM:
+                    cursor = getResizeCursor(90);
+                    break;
+                case CURSOR_SELECTION_ROTATE:
+                    setCursor(CRSR_EXCHANGE);
+                    break;
+                case CURSOR_SELECTION_DELETE:
+                    setCursor(CRSR_PIRATE);
+                    break;
+                default:
+                    break;
+            }
+        } else if (type == TOOL_PEN || type == TOOL_HIGHLIGHTER || type == TOOL_LASER_POINTER_PEN ||
+                   type == TOOL_LASER_POINTER_HIGHLIGHTER) {
+            if (this->inputDevice == INPUT_DEVICE_MOUSE && !this->mouseDown) {
+                // mouse and not pressed
+                setCursor(CRSR_ARROW);
+            } else {
+                if (type == TOOL_PEN || type == TOOL_LASER_POINTER_PEN) {
+                    cursor = getPenCursor();
+                } else  // must be:  if (type == TOOL_HIGHLIGHTER || type == TOOL_LASER_POINTER_HIGHLIGHTER)
+                {
+                    cursor = getHighlighterCursor();
+                }
+            }
+        } else if (type == TOOL_ERASER) {
+            EraserVisibility visibility = control->getSettings()->getEraserVisibility();
+            if ((this->inputDevice == INPUT_DEVICE_PEN || this->inputDevice == INPUT_DEVICE_ERASER) &&
+                (visibility == ERASER_VISIBILITY_NEVER || (visibility == ERASER_VISIBILITY_HOVER && this->mouseDown) ||
+                 (visibility == ERASER_VISIBILITY_TOUCH && !this->mouseDown))) {
+                setCursor(CRSR_BLANK_CURSOR);
+            } else {
+                cursor = getEraserCursor();
+            }
+        }
+
+        else if (type == TOOL_TEXT) {
+            if (this->invisible) {
+                setCursor(CRSR_BLANK_CURSOR);
+            } else {
+                setCursor(CRSR_XTERM);
+            }
+        } else if (type == TOOL_IMAGE) {
+            setCursor(CRSR_TCROSS);
+        } else if (type == TOOL_FLOATING_TOOLBOX) {
+            setCursor(CRSR_DEFAULT);
+        } else if (type == TOOL_VERTICAL_SPACE) {
+            setCursor(CRSR_SB_V_DOUBLE_ARROW);
+        } else if (type == TOOL_SELECT_OBJECT) {
+            setCursor(CRSR_DEFAULT);
+        } else if (type == TOOL_PLAY_OBJECT) {
+            setCursor(CRSR_HAND2);
+        } else if (type == TOOL_SELECT_PDF_TEXT_LINEAR) {
+            setCursor(CRSR_XTERM);
+        } else  // other selections are handled before anyway, because you can move a selection with every tool
+        {
+            setCursor(CRSR_TCROSS);
+        }
+    }
+
+    GdkWindow* window = gtk_widget_get_window(xournal->getWidget());
+    if (window) {
+        if (cursor != nullptr) {
+            gdk_window_set_cursor(window, cursor);
+        }
+        gtk_widget_set_sensitive(xournal->getWidget(), !this->busy);
+    }
+    // Performance removal!
+    // If this line is ever required, make sure this function is never called, when the cursor is not set.
+    // gdk_display_sync(gdk_display_get_default());
+
+    if (cursor != nullptr) {
+        g_object_unref(cursor);
+    }
+}
+
+auto XournalppCursor::getResizeCursor(double deltaAngle) -> GdkCursor* {
+    if (this->mirror) {
+        deltaAngle = -deltaAngle;
+    }
+    gulong flavour = static_cast<gulong>(RESIZE_CURSOR_HASH_PRECISION * fmod(angle + deltaAngle, 180.0));
+    if (CRSR_RESIZE == this->currentCursor && flavour == this->currentCursorFlavour) {
+        return nullptr;
+    }
+    this->currentCursor = CRSR_RESIZE;
+    this->currentCursorFlavour = flavour;
+
+    double a = (this->angle + deltaAngle) * M_PI / 180;
+    cairo_surface_t* crCursor = cairo_image_surface_create(CAIRO_FORMAT_ARGB32, RESIZE_CURSOR_SIZE, RESIZE_CURSOR_SIZE);
+    cairo_t* cr = cairo_create(crCursor);
+    cairo_set_source_rgba(cr, 0.1, 0.1, 0.1, 1);
+    cairo_translate(cr, RESIZE_CURSOR_SIZE / 2, RESIZE_CURSOR_SIZE / 2);
+    cairo_scale(cr, RESIZE_CURSOR_SIZE / 2, RESIZE_CURSOR_SIZE / 2);
+    cairo_set_line_width(cr, 0.2);
+    // draw double headed arrow rotated accordingly
+    cairo_move_to(cr, cos(a), sin(a));
+    cairo_line_to(cr, -cos(a), -sin(a));
+    cairo_stroke(cr);
+    // head and tail
+    for (auto s: {-1, 1}) {
+        cairo_move_to(cr, s * cos(a), s * sin(a));
+        cairo_rel_line_to(cr, s * cos(a + M_PI + DELTA_ANGLE_ARROW_HEAD) * LENGTH_ARROW_HEAD,
+                          s * sin(a + M_PI + DELTA_ANGLE_ARROW_HEAD) * LENGTH_ARROW_HEAD);
+        cairo_move_to(cr, s * cos(a), s * sin(a));
+        cairo_rel_line_to(cr, s * cos(a + M_PI - DELTA_ANGLE_ARROW_HEAD) * LENGTH_ARROW_HEAD,
+                          s * sin(a + M_PI - DELTA_ANGLE_ARROW_HEAD) * LENGTH_ARROW_HEAD);
+        cairo_stroke(cr);
+    }
+
+    cairo_destroy(cr);
+    GdkPixbuf* pixbuf = gdk_pixbuf_get_from_surface(crCursor, 0, 0, RESIZE_CURSOR_SIZE, RESIZE_CURSOR_SIZE);
+    cairo_surface_destroy(crCursor);
+    GdkCursor* cursor =
+            gdk_cursor_new_from_pixbuf(gtk_widget_get_display(control->getWindow()->getXournal()->getWidget()), pixbuf,
+                                       RESIZE_CURSOR_SIZE / 2, RESIZE_CURSOR_SIZE / 2);
+    g_object_unref(pixbuf);
+    return cursor;
+}
+
+auto XournalppCursor::getEraserCursor() -> GdkCursor* {
+
+    // Eraser's size follow a quadratic increment, so the cursor will do the same
+    double cursorSize = control->getToolHandler()->getThickness() * 2.0 * control->getZoomControl()->getZoom();
+    gulong flavour = static_cast<gulong>(64 * cursorSize);
+
+    if (CRSR_ERASER == this->currentCursor && flavour == this->currentCursorFlavour) {
+        return nullptr;  // cursor already set
+    }
+    this->currentCursor = CRSR_ERASER;
+    this->currentCursorFlavour = flavour;
+
+    cairo_surface_t* surface =
+            cairo_image_surface_create(CAIRO_FORMAT_ARGB32, ceil_cast<int>(cursorSize), ceil_cast<int>(cursorSize));
+    cairo_t* cr = cairo_create(surface);
+    cairo_rectangle(cr, 0, 0, cursorSize, cursorSize);
+    cairo_set_source_rgb(cr, 1, 1, 1);
+    cairo_fill(cr);
+    cairo_rectangle(cr, 0, 0, cursorSize, cursorSize);
+    cairo_set_source_rgb(cr, 0, 0, 0);
+    cairo_stroke(cr);
+    cairo_destroy(cr);
+    GdkCursor* cursor =
+            gdk_cursor_new_from_surface(gdk_display_get_default(), surface, cursorSize / 2.0, cursorSize / 2.0);
+    cairo_surface_destroy(surface);
+    return cursor;
+}
+
+
+auto XournalppCursor::getHighlighterCursor() -> GdkCursor* {
+    if (this->drawDirActive) {
+        return createCustomDrawDirCursor(48, this->drawDirShift, this->drawDirCtrl);
+    }
+
+    return createHighlighterOrPenCursor(120 / 255.0);
+}
+
+
+auto XournalppCursor::getPenCursor() -> GdkCursor* {
+    if ((control->getSettings()->getStylusCursorType() == STYLUS_CURSOR_NONE) &&
+        !control->getSettings()->isHighlightPosition()) {
+        setCursor(CRSR_BLANK_CURSOR);
+        return nullptr;
+    }
+    if (control->getSettings()->getStylusCursorType() == STYLUS_CURSOR_ARROW) {
+        setCursor(CRSR_ARROW);
+        return nullptr;
+    }
+    if ((control->getSettings()->getStylusCursorType() != STYLUS_CURSOR_NONE) && this->drawDirActive) {
+        return createCustomDrawDirCursor(48, this->drawDirShift, this->drawDirCtrl);
+    }
+
+    return createHighlighterOrPenCursor(1.0);
+}
+
+auto XournalppCursor::createHighlighterOrPenCursor(double alpha) -> GdkCursor* {
+    auto irgb = control->getToolHandler()->getColor();
+    if (const auto& params = control->getSettings()->getRecolorParameters(); params.recolorizeMainView) {
+        irgb = params.recolor.convertColor(irgb);
+    }
+    auto drgb = Util::rgb_to_GdkRGBA(irgb);
+    auto cursorType = control->getSettings()->getStylusCursorType();
+    auto cursor = (cursorType == STYLUS_CURSOR_NONE) ? CRSR_BLANK_CURSOR : CRSR_PENORHIGHLIGHTER;
+    bool bright = control->getSettings()->isHighlightPosition();
+    double cursorSize = std::min(90., control->getToolHandler()->getThickness() * control->getZoomControl()->getZoom());
+    int height = ceil_cast<int>(cursorSize);
+    int width = height;
+
+    // create a hash of variables so we notice if one changes despite being the same cursor type:
+    gulong flavour = (cursorType == STYLUS_CURSOR_DOT ? 1U : 0U) | (cursorType == STYLUS_CURSOR_BIG ? 2U : 0U) |
+                     (bright ? 4U : 0U) | static_cast<gulong>(64 * alpha) << 3U |
+                     static_cast<gulong>(cursorSize) << 10U | static_cast<gulong>(uint32_t(irgb)) << 15U;
+
+    if ((cursor == this->currentCursor) && (flavour == this->currentCursorFlavour)) {
+        return nullptr;
+    }
+    this->currentCursor = cursor;
+    this->currentCursorFlavour = flavour;
+
+    if ((cursorType == STYLUS_CURSOR_BIG) || bright) {
+        height = width = 90;
+    }
+
+    // We change the drawing method, now the center with the colored dot of the pen
+    // is at the center of the cairo surface, and when we load the cursor, we load it
+    // with the relative offset
+    int centerX = width / 2;
+    int centerY = height / 2;
+    cairo_surface_t* crCursor = cairo_image_surface_create(CAIRO_FORMAT_ARGB32, width, height);
+    cairo_t* cr = cairo_create(crCursor);
+
+    if (cursorType == STYLUS_CURSOR_BIG) {
+        // When using highlighter, paint the icon with the current color
+        if (alpha != 1.0) {
+            gdk_cairo_set_source_rgba(cr, &drgb);
+        } else {
+            cairo_set_source_rgb(cr, 1, 1, 1);
+        }
+        cairo_set_line_width(cr, 1.2);
+
+        // Starting point
+        cairo_move_to(cr, centerX + 2, centerY);
+        // Pencil cursor
+        cairo_line_to(cr, centerX + 2, centerY - 4);
+        cairo_line_to(cr, centerX + 15, centerY - 17.5);
+        cairo_line_to(cr, centerX + 19, centerY - 14);
+        cairo_line_to(cr, centerX + 6, centerY);
+
+        cairo_close_path(cr);
+        cairo_fill_preserve(cr);
+        cairo_set_source_rgb(cr, 0, 0, 0);
+        cairo_stroke(cr);
+
+        cairo_fill_preserve(cr);
+    }
+
+    if (bright) {
+        // Highlight cursor with a circle
+        auto&& color = Util::argb_to_GdkRGBA(control->getSettings()->getCursorHighlightColor());
+        gdk_cairo_set_source_rgba(cr, &color);
+        cairo_arc(cr, centerX, centerY, control->getSettings()->getCursorHighlightRadius(), 0, 2 * M_PI);
+        cairo_fill_preserve(cr);
+        auto&& borderColor = Util::argb_to_GdkRGBA(control->getSettings()->getCursorHighlightBorderColor());
+        gdk_cairo_set_source_rgba(cr, &borderColor);
+        cairo_set_line_width(cr, control->getSettings()->getCursorHighlightBorderWidth());
+        cairo_stroke(cr);
+    }
+
+    if (cursorType != STYLUS_CURSOR_NONE) {
+        auto drgbCopy = drgb;
+        drgbCopy.alpha = alpha;
+        gdk_cairo_set_source_rgba(cr, &drgbCopy);
+        cairo_arc(cr, centerX, centerY, cursorSize / 2., 0, 2. * M_PI);
+        cairo_fill(cr);
+    }
+
+    cairo_destroy(cr);
+    GdkPixbuf* pixbuf = gdk_pixbuf_get_from_surface(crCursor, 0, 0, width, height);
+    cairo_surface_destroy(crCursor);
+    GdkCursor* gdkCursor = gdk_cursor_new_from_pixbuf(
+            gtk_widget_get_display(control->getWindow()->getXournal()->getWidget()), pixbuf, centerX, centerY);
+    g_object_unref(pixbuf);
+    return gdkCursor;
+}
+
+
+void XournalppCursor::setCursor(guint cursorID) {
+    if (cursorID == this->currentCursor) {
+        return;
+    }
+
+    MainWindow* win = control->getWindow();
+    if (!win) {
+        return;
+    }
+
+    XournalView* xournal = win->getXournal();
+    if (!xournal) {
+        return;
+    }
+
+    GdkWindow* window = gtk_widget_get_window(xournal->getWidget());
+    if (!window) {
+        return;
+    }
+
+    GdkCursor* cursor = gdk_cursor_new_from_name(gdk_window_get_display(window), cssCursors[cursorID].cssName);
+    if (cursor == nullptr)  // failed to get a cursor, try backup cursor.
+    {
+        if (cursorID != CRSR_nullptr) {
+            cursor = gdk_cursor_new_from_name(gdk_window_get_display(window), cssCursors[cursorID].cssBackupName);
+
+            // Null cursor is ok but not wanted ... warn user
+            if (cursor == nullptr) {
+                if (CRSR_nullptr == this->currentCursor) {
+                    return;  // We've already been here
+                }
+                g_warning("CSS Cursor and backup not valid '%s', '%s'", cssCursors[cursorID].cssName,
+                          cssCursors[cursorID].cssBackupName);
+            }
+        }
+        cursorID = cursor == nullptr ? CRSR_nullptr : cursorID;
+    }
+
+    this->currentCursor = cursorID;
+    gdk_window_set_cursor(gtk_widget_get_window(xournal->getWidget()), cursor);
+    gdk_window_set_cursor(window, cursor);
+    if (cursor) {
+        g_object_unref(cursor);
+    }
+}
+
+
+auto XournalppCursor::createCustomDrawDirCursor(int size, bool shift, bool ctrl) -> GdkCursor* {
+    bool big = control->getSettings()->getStylusCursorType() == STYLUS_CURSOR_BIG;
+    bool bright = control->getSettings()->isHighlightPosition();
+
+    guint newCursorID = CRSR_DRAWDIRNONE + (shift ? 1 : 0) + (ctrl ? 2 : 0);
+    gulong flavour =
+            (big ? 1 : 0) | (bright ? 2 : 0) | static_cast<gulong>(size) << 2;  // hash of variables for comparison only
+
+    if (newCursorID == this->currentCursor && flavour == this->currentCursorFlavour) {
+        return nullptr;
+    }
+    this->currentCursor = newCursorID;
+    this->currentCursorFlavour = flavour;
+
+    int height = size;
+    int width = size;
+    int fontSize = 8;
+    if (big || bright) {
+        height = width = 60;
+        fontSize = 12;
+    }
+    int centerX = width - width / 4;
+    int centerY = height - height / 4;
+
+
+    cairo_surface_t* crCursor = cairo_image_surface_create(CAIRO_FORMAT_ARGB32, width, height);
+    cairo_t* cr = cairo_create(crCursor);
+    cairo_set_line_width(cr, 1.2);
+
+    // Starting point
+    cairo_move_to(cr, centerX, height / 2);
+    cairo_line_to(cr, centerX, height);
+    cairo_stroke(cr);
+
+    cairo_move_to(cr, width / 2, centerY);
+    cairo_line_to(cr, width, centerY);
+    cairo_stroke(cr);
+
+    if (ctrl) {
+        cairo_text_extents_t extents;
+        const char* utf8 = "CONTROL";
+        double x = NAN, y = NAN;
+        cairo_select_font_face(cr, "Sans", CAIRO_FONT_SLANT_NORMAL, CAIRO_FONT_WEIGHT_NORMAL);
+        cairo_set_font_size(cr, fontSize);
+        cairo_text_extents(cr, utf8, &extents);
+        x = 0;
+        y = extents.height;
+        cairo_move_to(cr, x, y);
+        cairo_show_text(cr, utf8);
+    }
+
+    if (shift) {
+        cairo_text_extents_t extents;
+        const char* utf8 = "SHIFT";
+        double x = NAN, y = NAN;
+        cairo_select_font_face(cr, "Sans", CAIRO_FONT_SLANT_NORMAL, CAIRO_FONT_WEIGHT_NORMAL);
+        cairo_set_font_size(cr, fontSize);
+        cairo_text_extents(cr, utf8, &extents);
+        x = 0;
+        y = extents.height * 2.5;
+        cairo_move_to(cr, x, y);
+        cairo_show_text(cr, utf8);
+    }
+
+    cairo_destroy(cr);
+    GdkPixbuf* pixbuf = gdk_pixbuf_get_from_surface(crCursor, 0, 0, width, height);
+    cairo_surface_destroy(crCursor);
+    GdkCursor* cursor = gdk_cursor_new_from_pixbuf(
+            gtk_widget_get_display(control->getWindow()->getXournal()->getWidget()), pixbuf, centerX, centerY);
+    g_object_unref(pixbuf);
+
+    return cursor;
+}
diff --git a/entry/src/main/cpp/src/core/gui/XournalppCursor.h b/entry/src/main/cpp/src/core/gui/XournalppCursor.h
new file mode 100644
index 0000000..4ce135c
--- /dev/null
+++ b/entry/src/main/cpp/src/core/gui/XournalppCursor.h
@@ -0,0 +1,76 @@
+/*
+ * Xournal++
+ *
+ * Handles the XournalppCursor
+ *
+ * @author Xournal++ Team
+ * https://github.com/xournalpp/xournalpp
+ *
+ * @license GNU GPLv2 or later
+ */
+
+#pragma once
+
+#include <gdk/gdk.h>  // for GdkCursor
+#include <glib.h>     // for guint, gulong
+
+#include "control/tools/CursorSelectionType.h"  // for CursorSelectionType
+#include "gui/inputdevices/InputEvents.h"       // for InputDeviceClass, INP...
+
+class Control;
+
+class XournalppCursor {
+public:
+    XournalppCursor(Control* control);
+    virtual ~XournalppCursor();
+
+    void setCursorBusy(bool busy);
+    void updateCursor();
+
+    void setMouseSelectionType(CursorSelectionType selectionType);
+
+    void setMouseDown(bool mouseDown);
+    void setInvisible(bool invisible);
+    void setInsidePage(bool insidePage);
+    void activateDrawDirCursor(bool enable, bool shift = false, bool ctrl = false);
+    void setInputDeviceClass(InputDeviceClass inputDevice);
+    void setRotationAngle(double angle);
+    void setMirror(bool mirror);
+
+private:
+    void setCursor(guint id);
+
+    GdkCursor* getPenCursor();
+
+    GdkCursor* getEraserCursor();
+    GdkCursor* getHighlighterCursor();
+    GdkCursor* getResizeCursor(double deltaAngle);
+
+    GdkCursor* createHighlighterOrPenCursor(double alpha);
+    GdkCursor* createCustomDrawDirCursor(int size, bool shift, bool ctrl);
+
+private:
+    InputDeviceClass inputDevice = INPUT_DEVICE_MOUSE;
+
+    Control* control = nullptr;
+    bool busy = false;
+    bool insidePage = false;
+    CursorSelectionType selectionType = CURSOR_SELECTION_NONE;
+
+    bool mouseDown = false;
+    bool invisible = false;
+
+    // One shot drawDir custom cursor -drawn instead of pen/stylus then cleared.
+    bool drawDirActive = false;
+    bool drawDirShift = false;
+    bool drawDirCtrl = false;
+
+    // avoid re-assigning same cursor
+    guint currentCursor = 0;        // enum AVAILABLECURSORS
+    gulong currentCursorFlavour{};  // for different flavours of a cursor (i.e. drawdir, pen and highlighter custom
+                                    // cursors)
+
+    // for resizing rotated/mirrored selections
+    double angle = 0;
+    bool mirror = false;
+};
diff --git a/entry/src/main/cpp/src/core/gui/dialog/AboutDialog.cpp b/entry/src/main/cpp/src/core/gui/dialog/AboutDialog.cpp
new file mode 100644
index 0000000..4c3fd1f
--- /dev/null
+++ b/entry/src/main/cpp/src/core/gui/dialog/AboutDialog.cpp
@@ -0,0 +1,76 @@
+#include "AboutDialog.h"
+
+#include <gtk/gtk.h>
+
+#include "gui/Builder.h"
+#include "util/PlaceholderString.h"  // for PlaceholderString
+#include "util/gtk4_helper.h"        // for gtk_box_append
+#include "util/i18n.h"               // for _
+
+#include "config-git.h"  // for GIT_COMMIT_ID
+#include "config.h"      // for PROJECT_VERSION
+
+class GladeSearchpath;
+
+constexpr auto UI_FILE = "about.glade";
+constexpr auto UI_DIALOG_NAME = "aboutDialog";
+constexpr auto GIT_REPO = "https://github.com/xournalpp/xournalpp";
+constexpr auto WEBSITE = "https://xournalpp.github.io";
+constexpr auto AUTHORS_LINK = "https://raw.githubusercontent.com/xournalpp/xournalpp/master/AUTHORS";
+constexpr auto LICENCE_LINK = "https://raw.githubusercontent.com/xournalpp/xournalpp/master/LICENSE";
+
+static GtkWindow* constructWindow(GladeSearchpath* gladeSearchPath) {
+    Builder builder(gladeSearchPath, UI_FILE);
+    GtkWindow* window = GTK_WINDOW(builder.get(UI_DIALOG_NAME));
+
+    auto insertPropertyKey = [](GtkGrid* grid, std::string&& str, gint top) {
+        auto widget = gtk_label_new(nullptr);
+        gtk_label_set_markup(GTK_LABEL(widget), str.insert(0, "<b>").append("</b>").c_str());
+        gtk_widget_set_halign(widget, GtkAlign::GTK_ALIGN_START);
+        gtk_grid_attach(grid, widget, 0, top, 1, 1);
+    };
+
+    auto insertPropertyValue = [](GtkGrid* grid, std::string const& str, gint top) {
+        auto widget = gtk_label_new(str.c_str());
+        gtk_widget_set_halign(widget, GtkAlign::GTK_ALIGN_START);
+        gtk_grid_attach(grid, widget, 1, top, 1, 1);
+    };
+
+    auto infoGrid = GTK_GRID(builder.get("versionInfoGrid"));
+
+    insertPropertyKey(infoGrid, _("Version"), 0);
+    insertPropertyValue(infoGrid, PROJECT_VERSION, 0);
+
+    insertPropertyKey(infoGrid, _("Built on"), 1);
+    insertPropertyValue(infoGrid, __DATE__ ", " __TIME__, 1);
+
+    insertPropertyKey(infoGrid, _("GTK Version"), 2);
+    auto gtkVersion =
+            FS(FORMAT_STR("{1}.{2}.{3}") % gtk_get_major_version() % gtk_get_minor_version() % gtk_get_micro_version());
+    insertPropertyValue(infoGrid, gtkVersion, 2);
+
+    auto const gitCommitId = std::string{GIT_COMMIT_ID};
+    if (!gitCommitId.empty()) {
+        insertPropertyKey(infoGrid, _("Git commit"), 3);
+        insertPropertyValue(infoGrid, gitCommitId.c_str(), 3);
+    }
+
+    gtk_box_append(GTK_BOX(builder.get("vboxRepo")), gtk_link_button_new(GIT_REPO));
+    gtk_box_append(GTK_BOX(builder.get("vboxWebsite")), gtk_link_button_new(WEBSITE));
+    gtk_box_append(GTK_BOX(builder.get("vboxCommunity")),
+                   gtk_link_button_new_with_label(AUTHORS_LINK, _("See the full list of contributors")));
+    gtk_box_append(GTK_BOX(builder.get("vboxLicense")),
+                   gtk_link_button_new_with_label(LICENCE_LINK, _("GNU GPLv2 or later")));
+
+    g_signal_connect_swapped(GTK_BUTTON(builder.get("closebutton")), "clicked", G_CALLBACK(gtk_window_close), window);
+
+#if GTK_MAJOR_VERSION == 3
+    // Widgets are visible by default in gtk4
+    gtk_widget_show_all(builder.get("dialog-main-box"));
+#endif
+    return window;
+}
+
+xoj::popup::AboutDialog::AboutDialog(GladeSearchpath* gladeSearchPath): window(constructWindow(gladeSearchPath)) {}
+
+xoj::popup::AboutDialog::~AboutDialog() = default;
diff --git a/entry/src/main/cpp/src/core/gui/dialog/AboutDialog.h b/entry/src/main/cpp/src/core/gui/dialog/AboutDialog.h
new file mode 100644
index 0000000..c8e2883
--- /dev/null
+++ b/entry/src/main/cpp/src/core/gui/dialog/AboutDialog.h
@@ -0,0 +1,29 @@
+/*
+ * Xournal++
+ *
+ * The about dialog
+ *
+ * @author Xournal++ Team
+ * https://github.com/xournalpp/xournalpp
+ *
+ * @license GNU GPLv2 or later
+ */
+
+#pragma once
+
+#include "util/raii/GtkWindowUPtr.h"
+
+class GladeSearchpath;
+
+namespace xoj::popup {
+class AboutDialog {
+public:
+    AboutDialog(GladeSearchpath* gladeSearchPath);
+    ~AboutDialog();
+
+    inline GtkWindow* getWindow() const { return window.get(); }
+
+private:
+    xoj::util::GtkWindowUPtr window;
+};
+};  // namespace xoj::popup
diff --git a/entry/src/main/cpp/src/core/gui/dialog/AbstractLatexDialog.cpp b/entry/src/main/cpp/src/core/gui/dialog/AbstractLatexDialog.cpp
new file mode 100644
index 0000000..c5ea987
--- /dev/null
+++ b/entry/src/main/cpp/src/core/gui/dialog/AbstractLatexDialog.cpp
@@ -0,0 +1,106 @@
+#include "gui/dialog/AbstractLatexDialog.h"
+
+#include <algorithm>  // for max, min
+#include <memory>
+
+#include "control/LatexController.h"
+#include "model/TexImage.h"
+#include "util/Range.h"
+
+// Default background color of the preview.
+const Color DEFAULT_PREVIEW_BACKGROUND = Colors::white;
+
+AbstractLatexDialog::AbstractLatexDialog(std::unique_ptr<LatexController> ctrl):
+        texCtrl{std::move(ctrl)}, previewBackgroundColor{DEFAULT_PREVIEW_BACKGROUND} {
+    texCtrl->dlg = this;
+}
+
+AbstractLatexDialog::~AbstractLatexDialog() { texCtrl->dlg = nullptr; };
+
+void AbstractLatexDialog::setCompilationStatus(bool isTexValid, bool isCompilationDone,
+                                               const std::string& compilationOutput) {
+    gtk_widget_set_sensitive(GTK_WIDGET(btOk), isTexValid && isCompilationDone);
+
+    // Show error warning only if LaTeX is invalid.
+    gtk_widget_set_opacity(GTK_WIDGET(texErrorLabel), isTexValid ? 0 : 1);
+
+    // Update the output pane.
+    gtk_text_buffer_set_text(compilationOutputTextBuffer, compilationOutput.c_str(), -1);
+}
+
+void AbstractLatexDialog::setTempRender(PopplerDocument* pdf) {
+    if (poppler_document_get_n_pages(pdf) < 1) {
+        return;
+    }
+
+    this->previewPdfPage.reset(poppler_document_get_page(pdf, 0), xoj::util::adopt);
+    this->previewMask.reset();
+
+    // Queue rendering the changed preview.
+    gtk_widget_queue_draw(GTK_WIDGET(this->previewDrawingArea));
+}
+
+void AbstractLatexDialog::setPreviewBackgroundColor(Color newColor) { this->previewBackgroundColor = newColor; }
+
+void AbstractLatexDialog::previewDrawFunc(GtkDrawingArea*, cairo_t* cr, int width, int height,
+                                          AbstractLatexDialog* self) {
+
+    // If we have nothing to render, do nothing!
+    if (!self->previewPdfPage) {
+        return;
+    }
+
+    Range pageRange(0, 0, 0, 0);
+    poppler_page_get_size(self->previewPdfPage.get(), &pageRange.maxX, &pageRange.maxY);
+
+    const double zoom =
+            std::min(static_cast<double>(width) / pageRange.maxX, static_cast<double>(height) / pageRange.maxY);
+
+
+    if (!self->previewMask.isInitialized() || self->previewMask.getZoom() < zoom) {
+        // Need to rerender the preview
+        self->previewMask = xoj::view::Mask(gtk_widget_get_scale_factor(GTK_WIDGET(self->previewDrawingArea)),
+                                            pageRange, zoom, CAIRO_CONTENT_COLOR_ALPHA);
+        poppler_page_render(self->previewPdfPage.get(), self->previewMask.get());
+    }
+
+
+    Util::cairo_set_source_rgbi(cr, self->previewBackgroundColor);
+    cairo_paint(cr);
+
+    // Center the rendering
+    const double extraHorizontalSpace = std::max(0.0, width - pageRange.maxX * zoom);
+    const double extraVerticalSpace = std::max(0.0, height - pageRange.maxY * zoom);
+    cairo_translate(cr, 0.5 * extraHorizontalSpace, 0.5 * extraVerticalSpace);
+    cairo_scale(cr, zoom, zoom);
+    self->previewMask.paintTo(cr);
+}
+
+void AbstractLatexDialog::populateStandardWidgetsFromBuilder(Builder& builder) {
+    previewDrawingArea = GTK_DRAWING_AREA(builder.get("texImage"));
+    btOk = GTK_BUTTON(builder.get("btOk"));
+    btCancel = GTK_BUTTON(builder.get("btCancel"));
+    texErrorLabel = GTK_LABEL(builder.get("texErrorLabel"));
+    compilationOutputTextBuffer = gtk_text_view_get_buffer(GTK_TEXT_VIEW(builder.get("texCommandOutputText")));
+}
+
+void AbstractLatexDialog::connectStandardSignals() {
+    g_signal_connect(btCancel, "clicked", G_CALLBACK(+[](GtkButton*, gpointer d) {
+                         auto* self = static_cast<AbstractLatexDialog*>(d);
+                         self->texCtrl->cancelEditing();
+                         gtk_window_close(self->window.get());
+                     }),
+                     this);
+    g_signal_connect(btOk, "clicked", G_CALLBACK(+[](GtkButton*, gpointer d) {
+                         auto* self = static_cast<AbstractLatexDialog*>(d);
+                         self->texCtrl->insertTexImage();
+                         gtk_window_close(self->window.get());
+                     }),
+                     this);
+
+    gtk_drawing_area_set_draw_func(this->previewDrawingArea, GtkDrawingAreaDrawFunc(previewDrawFunc), this, nullptr);
+    if (texCtrl->temporaryRender) {
+        // Use preexisting pdf
+        setTempRender(texCtrl->temporaryRender->getPdf());
+    }
+}
diff --git a/entry/src/main/cpp/src/core/gui/dialog/AbstractLatexDialog.h b/entry/src/main/cpp/src/core/gui/dialog/AbstractLatexDialog.h
new file mode 100644
index 0000000..6540ea4
--- /dev/null
+++ b/entry/src/main/cpp/src/core/gui/dialog/AbstractLatexDialog.h
@@ -0,0 +1,93 @@
+/*
+ * Xournal++
+ *
+ * Latex implementation
+ *
+ * @author Xournal++ Team
+ * https://github.com/xournalpp/xournalpp
+ *
+ * @license GNU GPLv2 or later
+ */
+#pragma once
+
+#include <memory>  // for unique_ptr
+
+#include <poppler.h>  // for PopplerDocument
+
+#include "gui/Builder.h"              // for Builder
+#include "util/Color.h"               // for Color
+#include "util/raii/GObjectSPtr.h"    // for GObjectSPtr
+#include "util/raii/GtkWindowUPtr.h"  // for GtkWindowUPtr
+#include "view/Mask.h"                // for Mask
+
+class LatexController;
+
+class AbstractLatexDialog {
+public:
+    AbstractLatexDialog() = delete;
+    AbstractLatexDialog(const AbstractLatexDialog& other) = delete;
+    AbstractLatexDialog& operator=(const AbstractLatexDialog& other) = delete;
+    AbstractLatexDialog(std::unique_ptr<LatexController> texCtrl);
+    virtual ~AbstractLatexDialog();
+
+public:
+    virtual void setCompilationStatus(bool isTexValid, bool isCompilationDone, const std::string& compilationOutput);
+
+    virtual std::string getBufferContents() = 0;
+
+    /**
+     * Set temporary Tex render and queue a re-draw.
+     * @param pdf PDF document with rendered TeX.
+     */
+    void setTempRender(PopplerDocument* pdf);
+
+    /**
+     * Set TeX preview background color to the given color.
+     * @param color New preview background color.
+     */
+    void setPreviewBackgroundColor(Color color);
+
+    inline GtkWindow* getWindow() const { return window.get(); }
+
+protected:
+    /**
+     * @brief Preview DrawingArea draw function
+     */
+    static void previewDrawFunc(GtkDrawingArea* drawing_area, cairo_t* cr, int width, int height,
+                                AbstractLatexDialog* self);
+
+    /**
+     * @brief populate the widgets stored in AbstractLatexDialog from the given builder with their
+     * standard names.
+     */
+    void populateStandardWidgetsFromBuilder(Builder& builder);
+
+    /**
+     * Connect the cancel button to cancelEditing, the Ok button to insertTexImage as well as the
+     * draw handler for the preview area.
+     */
+    void connectStandardSignals();
+
+protected:
+    std::unique_ptr<LatexController> texCtrl;
+    xoj::util::GtkWindowUPtr window;
+    GtkButton* btOk;
+    GtkButton* btCancel;
+
+    // Preview
+    GtkDrawingArea* previewDrawingArea;
+    xoj::view::Mask previewMask;
+
+    /**
+     * Source page from which we render the preview.
+     */
+    xoj::util::GObjectSPtr<PopplerPage> previewPdfPage;
+
+    GtkLabel* texErrorLabel;
+    GtkTextBuffer* compilationOutputTextBuffer;
+
+    /**
+     * Background color for the LaTeX preview.
+     */
+    Color previewBackgroundColor;
+};
diff --git a/entry/src/main/cpp/src/core/gui/dialog/ButtonConfigGui.cpp b/entry/src/main/cpp/src/core/gui/dialog/ButtonConfigGui.cpp
new file mode 100644
index 0000000..cb0524c
--- /dev/null
+++ b/entry/src/main/cpp/src/core/gui/dialog/ButtonConfigGui.cpp
@@ -0,0 +1,284 @@
+#include "ButtonConfigGui.h"
+
+#include <memory>   // for allocator, allocator_trai...
+#include <utility>  // for pair
+
+#include <gdk-pixbuf/gdk-pixbuf.h>  // for GDK_TYPE_PIXBUF, GdkPixbuf
+#include <gdk/gdk.h>                // for GdkRGBA
+#include <glib-object.h>            // for g_value_get_int, GValue
+
+#include "control/DeviceListHelper.h"       // for InputDevice, getDeviceList
+#include "control/settings/ButtonConfig.h"  // for ButtonConfig
+#include "control/settings/Settings.h"      // for Settings
+#include "gui/Builder.h"
+#include "util/Color.h"  // for GdkRGBA_to_argb, rgb_to_G...
+#include "util/gtk4_helper.h"
+#include "util/i18n.h"  // for _
+
+class GladeSearchpath;
+
+constexpr auto UI_FILE = "settingsButtonConfig.glade";
+constexpr auto UI_WIDGET_NAME = "mainBox";
+
+ButtonConfigGui::ToolSizeIndexMap ButtonConfigGui::toolSizeIndexMap = {{0, TOOL_SIZE_NONE},  {1, TOOL_SIZE_VERY_FINE},
+                                                                       {2, TOOL_SIZE_FINE},  {3, TOOL_SIZE_MEDIUM},
+                                                                       {4, TOOL_SIZE_THICK}, {5, TOOL_SIZE_VERY_THICK}};
+
+std::string ButtonConfigGui::toolSizeToLabel(ToolSize size) {
+    switch (size) {
+        case TOOL_SIZE_NONE:
+            return _("Thickness - don't change");
+        case TOOL_SIZE_VERY_FINE:
+            return _("Very thin");
+        case TOOL_SIZE_FINE:
+            return _("Thin");
+        case TOOL_SIZE_MEDIUM:
+            return _("Medium");
+        case TOOL_SIZE_THICK:
+            return _("Thick");
+        case TOOL_SIZE_VERY_THICK:
+            return _("Very thick");
+        default:
+            return "";
+    }
+}
+
+ButtonConfigGui::ButtonConfigGui(GladeSearchpath* gladeSearchPath, GtkBox* box, Settings* settings, unsigned int button,
+                                 bool withDevice):
+        settings(settings), button(button), withDevice(withDevice), iconNameHelper(settings) {
+    Builder builder(gladeSearchPath, UI_FILE);
+
+    gtk_box_append(box, builder.get(UI_WIDGET_NAME));  // box takes ownership of it all!
+
+    this->cbDevice = builder.get("labelDevice");
+    this->cbDisableDrawing = builder.get("cbDisableDrawing");
+
+    if (withDevice) {
+        gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(this->cbDevice), _("No device"));
+
+        this->deviceList = DeviceListHelper::getDeviceList(this->settings, true);
+        for (InputDevice const& dev: this->deviceList) {
+            std::string txt = dev.getName() + " (" + dev.getType() + ")";
+            gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(this->cbDevice), txt.c_str());
+        }
+    } else {
+        gtk_widget_hide(builder.get("lbDevice"));
+        gtk_widget_hide(this->cbDevice);
+        gtk_widget_hide(this->cbDisableDrawing);
+    }
+
+    GtkListStore* typeModel = gtk_list_store_new(3, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_INT);
+
+    auto addTypeCB = [&](const char* icon, const char* name, ToolType action) {
+        GtkTreeIter iter;
+        gtk_list_store_append(typeModel, &iter);
+        gtk_list_store_set(typeModel, &iter, 0, iconNameHelper.iconName(icon).c_str(), 1, name, 2, action, -1);
+    };
+
+    addTypeCB("transparent", _("Tool - don't change"), TOOL_NONE);
+    addTypeCB("tool-pencil", _("Pen"), TOOL_PEN);
+    addTypeCB("tool-eraser", _("Eraser"), TOOL_ERASER);
+    addTypeCB("tool-highlighter", _("Highlighter"), TOOL_HIGHLIGHTER);
+    addTypeCB("tool-text", _("Text"), TOOL_TEXT);
+    addTypeCB("tool-image", _("Insert image"), TOOL_IMAGE);
+    addTypeCB("laser-pointer", _("Laser Pointer - Pen"), TOOL_LASER_POINTER_PEN);
+    addTypeCB("laser-pointer", _("Laser Pointer - Highlighter"), TOOL_LASER_POINTER_HIGHLIGHTER);
+    addTypeCB("spacer", _("Vertical space"), TOOL_VERTICAL_SPACE);
+    addTypeCB("select-lasso", _("Select region"), TOOL_SELECT_REGION);
+    addTypeCB("select-rect", _("Select rectangle"), TOOL_SELECT_RECT);
+    addTypeCB("select-multilayer-lasso", _("Select multi layer region"), TOOL_SELECT_MULTILAYER_REGION);
+    addTypeCB("select-multilayer-rect", _("Select multi layer rect"), TOOL_SELECT_MULTILAYER_RECT);
+    addTypeCB("hand", _("Hand"), TOOL_HAND);
+    addTypeCB("floating-toolbox", _("Floating Toolbox (experimental)"), TOOL_FLOATING_TOOLBOX);
+    addTypeCB("select-pdf-text-ht", _("Select Text from pdf"), TOOL_SELECT_PDF_TEXT_LINEAR);
+    addTypeCB("select-pdf-text-area", _("Select Area Text from pdf"), TOOL_SELECT_PDF_TEXT_RECT);
+
+    this->cbTool = builder.get("cbTool");
+    gtk_combo_box_set_model(GTK_COMBO_BOX(this->cbTool), GTK_TREE_MODEL(typeModel));
+    g_signal_connect(cbTool, "changed", G_CALLBACK(&cbSelectCallback), this);
+
+    GtkCellRenderer* renderer = gtk_cell_renderer_pixbuf_new();
+    gtk_cell_layout_pack_start(GTK_CELL_LAYOUT(this->cbTool), renderer, false);
+    gtk_cell_layout_set_attributes(GTK_CELL_LAYOUT(this->cbTool), renderer, "icon-name", 0, nullptr);
+
+    renderer = gtk_cell_renderer_text_new();
+    gtk_cell_layout_pack_start(GTK_CELL_LAYOUT(this->cbTool), renderer, true);
+    gtk_cell_layout_set_attributes(GTK_CELL_LAYOUT(this->cbTool), renderer, "text", 1, nullptr);
+
+    this->cbThickness = builder.get("cbThickness");
+    for (auto const& size: toolSizeIndexMap) {
+        gtk_combo_box_text_insert_text(GTK_COMBO_BOX_TEXT(cbThickness), size.first,
+                                       toolSizeToLabel(size.second).c_str());
+    }
+    gtk_combo_box_set_active(GTK_COMBO_BOX(cbThickness), 0);
+
+    this->colorButton = builder.get("colorButton");
+
+    this->cbDrawingType = builder.get("cbDrawingType");
+    // DRAWING_TYPE_DONT_CHANGE
+    gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(this->cbDrawingType), _("Drawing Type - don't change"));
+    // DRAWING_TYPE_DEFAULT
+    gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(this->cbDrawingType), _("Normal drawing"));
+    // DRAWING_TYPE_RULER
+    gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(this->cbDrawingType), _("Draw Line"));
+    // DRAWING_TYPE_RECTANGLE
+    gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(this->cbDrawingType), _("Draw Rectangle"));
+    // DRAWING_TYPE_ELLIPSE
+    gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(this->cbDrawingType), _("Draw Ellipse"));
+    // DRAWING_TYPE_ARROW
+    gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(this->cbDrawingType), _("Draw Arrow"));
+    // DRAWING_TYPE_DOUBLE_ARROW
+    gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(this->cbDrawingType), _("Draw Double Arrow"));
+    // DRAWING_TYPE_COORDINATE_SYSTEM
+    gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(this->cbDrawingType), _("Draw Coordinate System"));
+    // DRAWING_TYPE_STROKE_RECOGNIZER
+    gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(this->cbDrawingType), _("Shape Recognizer"));
+    // DRAWING_TYPE_SPLINE
+    gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(this->cbDrawingType), _("Draw Spline"));
+
+
+    // Values in glade GUI!
+    this->cbEraserType = builder.get("cbEraserType");
+
+    // Possible values are defined in the .glade file
+    this->cbStrokeType = builder.get("cbStrokeType");
+
+    loadSettings();
+}
+
+void ButtonConfigGui::loadSettings() {
+    ButtonConfig* cfg = settings->getButtonConfig(button);
+
+    GtkTreeModel* model = gtk_combo_box_get_model(GTK_COMBO_BOX(cbTool));
+    GtkTreeIter iter;
+
+    if (!gtk_tree_model_get_iter_first(model, &iter)) {
+        return;
+    }
+
+    GValue value = {0};
+    int i = 0;
+
+    gtk_combo_box_set_active(GTK_COMBO_BOX(cbTool), 0);
+
+    do {
+        gtk_tree_model_get_value(model, &iter, 2, &value);
+
+        int action = g_value_get_int(&value);
+
+        if (action == cfg->action) {
+            gtk_combo_box_set_active(GTK_COMBO_BOX(cbTool), i);
+            break;
+        }
+
+        i++;
+        g_value_unset(&value);
+    } while (gtk_tree_model_iter_next(model, &iter));
+
+    // select thickness in combo box
+    gtk_combo_box_set_active(GTK_COMBO_BOX(cbThickness), 0);
+    for (auto const& size: toolSizeIndexMap) {
+        if (size.second == cfg->size) {
+            gtk_combo_box_set_active(GTK_COMBO_BOX(cbThickness), size.first);
+        }
+    }
+
+    GdkRGBA color = Util::rgb_to_GdkRGBA(cfg->color);
+    gtk_color_chooser_set_rgba(GTK_COLOR_CHOOSER(colorButton), &color);
+
+    gtk_combo_box_set_active(GTK_COMBO_BOX(this->cbDrawingType), cfg->drawingType);
+
+    if (cfg->eraserMode == ERASER_TYPE_DEFAULT) {
+        gtk_combo_box_set_active(GTK_COMBO_BOX(cbEraserType), 1);
+    } else if (cfg->eraserMode == ERASER_TYPE_WHITEOUT) {
+        gtk_combo_box_set_active(GTK_COMBO_BOX(cbEraserType), 2);
+    } else if (cfg->eraserMode == ERASER_TYPE_DELETE_STROKE) {
+        gtk_combo_box_set_active(GTK_COMBO_BOX(cbEraserType), 3);
+    } else {
+        gtk_combo_box_set_active(GTK_COMBO_BOX(cbEraserType), 0);
+    }
+
+    gtk_combo_box_set_active(GTK_COMBO_BOX(cbStrokeType), cfg->strokeType);
+
+    if (withDevice) {
+        gtk_combo_box_set_active(GTK_COMBO_BOX(cbDevice), 0);
+
+        int i = 1;
+        for (InputDevice const& dev: this->deviceList) {
+            if (cfg->device == dev.getName()) {
+                gtk_combo_box_set_active(GTK_COMBO_BOX(cbDevice), i);
+                break;
+            }
+
+            ++i;
+        }
+
+        gtk_check_button_set_active(GTK_CHECK_BUTTON(cbDisableDrawing), cfg->disableDrawing);
+    }
+}
+
+void ButtonConfigGui::saveSettings() {
+    GtkTreeIter iter;
+    gtk_combo_box_get_active_iter(GTK_COMBO_BOX(cbTool), &iter);
+
+    GValue value = {0};
+    GtkTreeModel* model = gtk_combo_box_get_model(GTK_COMBO_BOX(cbTool));
+    gtk_tree_model_get_value(model, &iter, 2, &value);
+
+    auto action = static_cast<ToolType>(g_value_get_int(&value));
+    ButtonConfig* cfg = settings->getButtonConfig(button);
+    cfg->action = action;
+
+    int thickness = gtk_combo_box_get_active(GTK_COMBO_BOX(cbThickness));
+    if (toolSizeIndexMap.count(thickness) == 0) {
+        cfg->size = TOOL_SIZE_NONE;
+    } else {
+        cfg->size = toolSizeIndexMap[thickness];
+    }
+
+    GdkRGBA color;
+    gtk_color_chooser_get_rgba(GTK_COLOR_CHOOSER(colorButton), &color);
+    cfg->color = Util::GdkRGBA_to_argb(color);
+
+    cfg->drawingType = static_cast<DrawingType>(gtk_combo_box_get_active(GTK_COMBO_BOX(this->cbDrawingType)));
+
+    int eraserMode = gtk_combo_box_get_active(GTK_COMBO_BOX(this->cbEraserType));
+
+    if (eraserMode == 1) {
+        cfg->eraserMode = ERASER_TYPE_DEFAULT;
+    } else if (eraserMode == 2) {
+        cfg->eraserMode = ERASER_TYPE_WHITEOUT;
+    } else if (eraserMode == 3) {
+        cfg->eraserMode = ERASER_TYPE_DELETE_STROKE;
+    } else {
+        cfg->eraserMode = ERASER_TYPE_NONE;
+    }
+
+    cfg->strokeType = static_cast<StrokeType>(gtk_combo_box_get_active(GTK_COMBO_BOX(this->cbStrokeType)));
+
+    if (this->withDevice) {
+        size_t dev = static_cast<size_t>(gtk_combo_box_get_active(GTK_COMBO_BOX(cbDevice)) - 1);
+        cfg->device = (dev < 0 || this->deviceList.size() <= dev) ? "" : this->deviceList[dev].getName();
+        cfg->disableDrawing = gtk_check_button_get_active(GTK_CHECK_BUTTON(cbDisableDrawing));
+    }
+
+    settings->customSettingsChanged();
+}
+
+void ButtonConfigGui::cbSelectCallback(GtkComboBox*, ButtonConfigGui* gui) { gui->enableDisableTools(); }
+
+void ButtonConfigGui::enableDisableTools() {
+    GtkTreeIter iter;
+    gtk_combo_box_get_active_iter(GTK_COMBO_BOX(cbTool), &iter);
+    GtkTreeModel* model = gtk_combo_box_get_model(GTK_COMBO_BOX(cbTool));
+
+    GValue value = {0};
+    gtk_tree_model_get_value(model, &iter, 2, &value);
+    auto action = static_cast<ToolType>(g_value_get_int(&value));
+
+    gtk_widget_set_visible(cbThickness, action != TOOL_NONE && xoj::tool::hasCapability(action, TOOL_CAP_SIZE));
+    gtk_widget_set_visible(colorButton, action != TOOL_NONE && xoj::tool::hasCapability(action, TOOL_CAP_COLOR));
+    gtk_widget_set_visible(cbDrawingType, action != TOOL_NONE && xoj::tool::hasCapability(action, TOOL_CAP_RECTANGLE));
+    gtk_widget_set_visible(cbEraserType, action == TOOL_ERASER);
+    gtk_widget_set_visible(cbStrokeType, action == TOOL_PEN);
+}
diff --git a/entry/src/main/cpp/src/core/gui/dialog/ButtonConfigGui.h b/entry/src/main/cpp/src/core/gui/dialog/ButtonConfigGui.h
new file mode 100644
index 0000000..22ffefa
--- /dev/null
+++ b/entry/src/main/cpp/src/core/gui/dialog/ButtonConfigGui.h
@@ -0,0 +1,62 @@
+/*
+ * Xournal++
+ *
+ * The configuration for a button in the Settings Dialog
+ *
+ * @author Xournal++ Team
+ * https://github.com/xournalpp/xournalpp
+ *
+ * @license GNU GPLv2 or later
+ */
+
+#pragma once
+
+#include <map>     // for map, map<>::value_compare
+#include <string>  // for string
+#include <vector>  // for vector
+
+#include <gtk/gtk.h>  // for GtkWidget, GtkComboBox, GtkWindow
+
+#include "control/DeviceListHelper.h"  // for InputDevice
+#include "control/ToolEnums.h"         // for ToolSize
+#include "gui/IconNameHelper.h"        // for IconNameHelper
+
+class Settings;
+class GladeSearchpath;
+
+class ButtonConfigGui {
+public:
+    ButtonConfigGui(GladeSearchpath* gladeSearchPath, GtkBox* box, Settings* settings, unsigned int button,
+                    bool withDevice);
+
+public:
+    void loadSettings();
+    void saveSettings();
+
+private:
+    static void cbSelectCallback(GtkComboBox* widget, ButtonConfigGui* gui);
+    void enableDisableTools();
+    std::string toolSizeToLabel(ToolSize size);
+
+private:
+    Settings* settings;
+
+    GtkWidget* cbDevice;
+    GtkWidget* cbDisableDrawing;
+
+    GtkWidget* cbTool;
+    GtkWidget* cbThickness;
+    GtkWidget* colorButton;
+    GtkWidget* cbEraserType;
+    GtkWidget* cbDrawingType;
+    GtkWidget* cbStrokeType;
+
+    std::vector<InputDevice> deviceList;
+
+    unsigned int button = 0;
+    bool withDevice = false;
+
+    typedef std::map<int, ToolSize> ToolSizeIndexMap;
+    static ToolSizeIndexMap toolSizeIndexMap;
+    IconNameHelper iconNameHelper;
+};
diff --git a/entry/src/main/cpp/src/core/gui/dialog/DeviceClassConfigGui.cpp b/entry/src/main/cpp/src/core/gui/dialog/DeviceClassConfigGui.cpp
new file mode 100644
index 0000000..a7ca12c
--- /dev/null
+++ b/entry/src/main/cpp/src/core/gui/dialog/DeviceClassConfigGui.cpp
@@ -0,0 +1,61 @@
+#include "DeviceClassConfigGui.h"
+
+#include <string>  // for allocator, char_traits
+
+#include <glib.h>  // for g_ascii_strtoll, g_strdu...
+
+#include "control/DeviceListHelper.h"        // for InputDevice
+#include "control/settings/Settings.h"       // for Settings
+#include "control/settings/SettingsEnums.h"  // for InputDeviceTypeOption
+#include "gui/Builder.h"                     // for Builder
+#include "util/Assert.h"                     // for xoj_assert
+#include "util/gtk4_helper.h"                // for gtk_box_append
+
+class GladeSearchpath;
+
+constexpr auto UI_FILE = "settingsDeviceClassConfig.glade";
+constexpr auto UI_WIDGET_NAME = "deviceClassBox";
+
+DeviceClassConfigGui::DeviceClassConfigGui(GladeSearchpath* gladeSearchPath, GtkBox* box, Settings* settings,
+                                           bool showApplyBtn):
+        settings(settings) {
+    Builder builder(gladeSearchPath, UI_FILE);
+    gtk_box_append(box, builder.get(UI_WIDGET_NAME));  // box takes ownership of it all!
+
+    this->labelDevice = builder.get("labelDevice");
+    this->cbDeviceClass = builder.get("cbDeviceClass");
+    auto* applyBtn = builder.get("btnApply");
+
+    gtk_widget_set_visible(applyBtn, showApplyBtn);
+    if (showApplyBtn) {
+        g_signal_connect(applyBtn, "clicked", G_CALLBACK(+[](GtkButton*, gpointer d) {
+                             static_cast<DeviceClassConfigGui*>(d)->saveSettings();
+                         }),
+                         this);
+    }
+}
+
+DeviceClassConfigGui::~DeviceClassConfigGui() = default;
+
+void DeviceClassConfigGui::setDevice(const InputDevice& d) {
+    this->device = d;
+    gtk_label_set_text(GTK_LABEL(this->labelDevice), (device.getName() + " (" + device.getType() + ")").c_str());
+
+    loadSettings();
+}
+
+void DeviceClassConfigGui::loadSettings() {
+    // Get device class of device if available or
+    InputDeviceTypeOption deviceType =
+            this->settings->getDeviceClassForDevice(this->device.getName(), this->device.getSource());
+    // Use the ID of each option in case the combo box options get rearranged in the future
+    gtk_combo_box_set_active_id(GTK_COMBO_BOX(this->cbDeviceClass),
+                                std::to_string(static_cast<int>(deviceType)).c_str());
+}
+
+void DeviceClassConfigGui::saveSettings() {
+    const gchar* deviceClassId = gtk_combo_box_get_active_id(GTK_COMBO_BOX(this->cbDeviceClass));
+    xoj_assert(deviceClassId != nullptr);
+    auto deviceClass = static_cast<InputDeviceTypeOption>(g_ascii_strtoll(deviceClassId, nullptr, 10));
+    this->settings->setDeviceClassForDevice(this->device.getName(), this->device.getSource(), deviceClass);
+}
diff --git a/entry/src/main/cpp/src/core/gui/dialog/DeviceClassConfigGui.h b/entry/src/main/cpp/src/core/gui/dialog/DeviceClassConfigGui.h
new file mode 100644
index 0000000..571c6e9
--- /dev/null
+++ b/entry/src/main/cpp/src/core/gui/dialog/DeviceClassConfigGui.h
@@ -0,0 +1,42 @@
+/*
+ * Xournal++
+ *
+ * The configuration for a button in the Settings Dialog
+ *
+ * @author Xournal++ Team
+ * https://github.com/xournalpp/xournalpp
+ *
+ * @license GNU GPLv2 or later
+ */
+
+#pragma once
+
+#include <gtk/gtk.h>  // for GtkWidget, GtkComboBox, GtkWindow
+
+#include "control/DeviceListHelper.h"  // for InputDevice
+
+class Settings;
+class GladeSearchpath;
+
+class DeviceClassConfigGui {
+public:
+    DeviceClassConfigGui(GladeSearchpath* gladeSearchPath, GtkBox* box, Settings* settings, bool showApplyBtn = false);
+    ~DeviceClassConfigGui();
+
+public:
+    void loadSettings();
+    void saveSettings();
+
+    /// Set the device represented by the entry.
+    /// Please call saveSettings() beforehand if the settings of the previous device need to be saved.
+    void setDevice(const InputDevice& device);
+
+    inline bool representsDevice(const InputDevice& dev) const { return dev == device; }
+
+private:
+    Settings* settings;
+    InputDevice device;
+
+    GtkWidget* labelDevice;
+    GtkWidget* cbDeviceClass;
+};
diff --git a/entry/src/main/cpp/src/core/gui/dialog/DeviceListDialog.cpp b/entry/src/main/cpp/src/core/gui/dialog/DeviceListDialog.cpp
new file mode 100644
index 0000000..6ea0354
--- /dev/null
+++ b/entry/src/main/cpp/src/core/gui/dialog/DeviceListDialog.cpp
@@ -0,0 +1,39 @@
+#include "DeviceListDialog.h"
+
+#include "control/settings/Settings.h"
+#include "gui/Builder.h"
+#include "util/gtk4_helper.h"  // for gtk_box_append, ...
+
+#include "DeviceClassConfigGui.h"
+
+constexpr auto UI_FILE_NAME = "deviceList.glade";
+constexpr auto UI_MAIN_ID = "deviceListDialog";
+constexpr auto UI_CONTENT_BOX = "contentBox";
+
+DeviceListDialog::DeviceListDialog(GladeSearchpath* gladeSearchPath, Settings* settings): settings(settings) {
+
+    Builder builder(gladeSearchPath, UI_FILE_NAME);
+    window.reset(GTK_WINDOW(builder.get(UI_MAIN_ID)));
+
+    auto deviceList = DeviceListHelper::getDeviceList(settings);
+    auto* box = GTK_BOX(builder.get(UI_CONTENT_BOX));
+    for (const InputDevice& inputDevice: deviceList) {
+        auto& entry = this->deviceClassConfigs.emplace_back(gladeSearchPath, box, settings);
+        entry.setDevice(inputDevice);
+    }
+
+    g_signal_connect_swapped(builder.get("btCancel"), "clicked", G_CALLBACK(gtk_window_close), this->window.get());
+    g_signal_connect_swapped(builder.get("btOk"), "clicked", G_CALLBACK(+[](DeviceListDialog* self) {
+                                 self->saveSettings();
+                                 gtk_window_close(self->window.get());
+                             }),
+                             this);
+}
+
+void DeviceListDialog::saveSettings() {
+    this->settings->transactionStart();
+    for (auto& deviceClassConfigGui: this->deviceClassConfigs) {
+        deviceClassConfigGui.saveSettings();
+    }
+    this->settings->transactionEnd();
+}
diff --git a/entry/src/main/cpp/src/core/gui/dialog/DeviceListDialog.h b/entry/src/main/cpp/src/core/gui/dialog/DeviceListDialog.h
new file mode 100644
index 0000000..fcb15d6
--- /dev/null
+++ b/entry/src/main/cpp/src/core/gui/dialog/DeviceListDialog.h
@@ -0,0 +1,37 @@
+/*
+ * Xournal++
+ *
+ * Dialog listing known devices
+ *
+ * @author Xournal++ Team
+ * https://github.com/xournalpp/xournalpp
+ *
+ * @license GNU GPLv2 or later
+ */
+
+#pragma once
+
+#include <vector>  // for vector
+
+#include "util/raii/GtkWindowUPtr.h"
+
+class Settings;
+class GladeSearchpath;
+class DeviceClassConfigGui;
+
+class DeviceListDialog {
+public:
+    DeviceListDialog(GladeSearchpath* gladeSearchPath, Settings* settings);
+
+public:
+    inline GtkWindow* getWindow() const { return window.get(); }
+
+private:
+    void saveSettings();
+
+private:
+    Settings* settings;
+    std::vector<DeviceClassConfigGui> deviceClassConfigs;
+
+    xoj::util::GtkWindowUPtr window;
+};
diff --git a/entry/src/main/cpp/src/core/gui/dialog/DeviceTestingArea.cpp b/entry/src/main/cpp/src/core/gui/dialog/DeviceTestingArea.cpp
new file mode 100644
index 0000000..8633be9
--- /dev/null
+++ b/entry/src/main/cpp/src/core/gui/dialog/DeviceTestingArea.cpp
@@ -0,0 +1,425 @@
+#include "DeviceTestingArea.h"
+
+#include <bitset>
+#include <sstream>
+
+#include <config-git.h>
+#include <config.h>
+#include <zip.h>
+
+#include "control/settings/Settings.h"
+#include "gui/Builder.h"
+#include "gui/dialog/XojSaveDlg.h"
+#include "gui/inputdevices/InputContext.h"
+#include "gui/inputdevices/InputEvents.h"
+#include "gui/inputdevices/PrintEvent.h"
+#include "model/Point.h"
+#include "util/CircularBuffer.h"
+#include "util/EnumIndexedArray.h"
+#include "util/PathUtil.h"
+#include "util/PopupWindowWrapper.h"
+#include "util/VersionInfo.h"
+#include "util/glib_casts.h"
+#include "util/gtk4_helper.h"  // for gtk_box_append, ...
+#include "util/i18n.h"
+#include "util/raii/GtkWindowUPtr.h"
+
+#include "DeviceClassConfigGui.h"
+#include "DeviceListDialog.h"
+#include "filesystem.h"
+
+constexpr auto UI_FILE_NAME = "deviceTestingArea.glade";
+constexpr auto UI_MAIN_ID = "mainBox";
+
+static constexpr double PRESSURE_FACTOR = 20;
+static constexpr size_t CONTACT_BUTTON_INDEX = 1;  ///< Corresponds to button == 1 in GdkEvent
+static constexpr double PRESSURELESS_INDICATOR_HALF_SIZE = 3;
+
+static constexpr size_t MAX_NB_BUTTONS = 4;
+static constexpr std::bitset<MAX_NB_BUTTONS> CONSIDERED_FOR_TIP_EMULATION(0b1100);
+static constexpr std::bitset<MAX_NB_BUTTONS> MOUSE_BUTTONS_MASK(0b1110);
+
+static constexpr unsigned int IN_USE_RESET_DELAY = 100;  ///< in ms
+
+struct Ev {
+    Point point;
+    std::bitset<MAX_NB_BUTTONS> pressedButtons;
+    DeviceTestingArea::HandlerType type;
+};
+
+
+enum class DevCategory : size_t {
+    MOUSE = 0,
+    STYLUS = 1,
+    ERASER = 2,
+    TOUCHSCREEN = 3,
+    ENUMERATOR_COUNT = 4  ///< Used as bound
+};  /// Used as indices for buttonsStatus
+
+struct DeviceTestingArea::Data {
+    CircularBuffer<Ev> lastEvs{20};
+    EnumIndexedArray<std::bitset<MAX_NB_BUTTONS>, DevCategory> buttonsStatus;
+    size_t nbTouchSequences;
+    std::stringstream log;            ///< all the events as received (after conversion) by the handlers
+    std::stringstream ellipsizedLog;  ///< Same as log, but sequences of MOTION_EVENT's are ellipsized
+    std::stringstream allGdkEvents;   ///< all the events, as emitted by GDK
+    size_t nbOfConsecutiveMotionEvents = 0;
+    GdkDevice* lastMotionDevice = nullptr;
+    guint32 timeReference = 0;  ///< timestamp of DeviceTestingArea's creation
+};
+
+static void draw(GtkDrawingArea*, cairo_t* cr, int width, int height, gpointer lastEvs) {
+    cairo_set_source_rgb(cr, 1., 1., 1.);
+    cairo_paint(cr);
+    cairo_set_source_rgb(cr, 0., 0., 0.);
+    cairo_set_line_width(cr, 2);
+
+    // Draw a frame - using CSS seems not to work for GtkDrawingArea's
+    cairo_set_line_cap(cr, CAIRO_LINE_CAP_SQUARE);
+    cairo_line_to(cr, 0., 0.);
+    cairo_line_to(cr, width, 0.);
+    cairo_line_to(cr, width, height);
+    cairo_line_to(cr, 0., height);
+    cairo_close_path(cr);
+    cairo_stroke(cr);
+
+    cairo_set_line_cap(cr, CAIRO_LINE_CAP_ROUND);
+
+    for (auto&& e: *static_cast<CircularBuffer<Ev>*>(lastEvs)) {
+        if (e.pressedButtons[CONTACT_BUTTON_INDEX] ||
+            (e.type == DeviceTestingArea::MOUSE && (e.pressedButtons & MOUSE_BUTTONS_MASK).any())) {
+            // Contact
+            if (e.point.z == Point::NO_PRESSURE) {
+                cairo_set_source_rgb(cr, 1., 0., 0.);
+                cairo_move_to(cr, e.point.x, e.point.y);
+                cairo_rel_move_to(cr, -PRESSURELESS_INDICATOR_HALF_SIZE, -PRESSURELESS_INDICATOR_HALF_SIZE);
+                cairo_rel_line_to(cr, 2 * PRESSURELESS_INDICATOR_HALF_SIZE, 2 * PRESSURELESS_INDICATOR_HALF_SIZE);
+                cairo_rel_move_to(cr, -2 * PRESSURELESS_INDICATOR_HALF_SIZE, 0);
+                cairo_rel_line_to(cr, 2 * PRESSURELESS_INDICATOR_HALF_SIZE, -2 * PRESSURELESS_INDICATOR_HALF_SIZE);
+            } else {
+                cairo_set_source_rgb(cr, .4, 1., 0.);
+                cairo_arc(cr, e.point.x, e.point.y, PRESSURE_FACTOR * e.point.z, 0, 2. * M_PI);
+            }
+        } else {
+            // No contact: hovering
+            cairo_set_source_rgb(cr, .5, .5, .5);
+            cairo_move_to(cr, e.point.x, e.point.y);
+            cairo_rel_line_to(cr, 0, 0);
+        }
+        cairo_stroke(cr);
+    }
+}
+
+static void saveLog(const std::stringstream& fullLog, const std::stringstream& ellipsizedLog,
+                    const std::stringstream& gdkeventslog, GtkWidget* parent, Settings* settings) {
+
+    auto pathValidation = [](fs::path& p, const char* filterName) {
+        Util::clearExtensions(p, ".zip");
+        p += ".zip";
+        return true;
+    };
+
+    auto callback = [fullLog = fullLog.str(), ellipsizedLog = ellipsizedLog.str(), gdkeventslog = gdkeventslog.str(),
+                     settings = settings->getSettingsFile()](std::optional<fs::path> p) {
+        if (p && !p->empty()) {
+            int errorCode = 0;
+            auto* zip = zip_open(char_cast(p->u8string().c_str()), ZIP_CREATE | ZIP_TRUNCATE, &errorCode);
+            if (!zip) {
+                // TODO handle error
+                // errorCode contains the error
+                return;
+            }
+            auto addSource = [&](const char* name, zip_source_t* source) {
+                if (!source) {
+                    // TODO handle error
+                    // zip_strerror(zip) returns the error string
+                } else if (zip_file_add(zip, name, source, ZIP_FL_ENC_UTF_8) < 0) {
+                    // TODO handler error
+                    // zip_strerror(zip) returns the error string
+                    zip_source_free(source);
+                }
+            };
+            addSource("ellipsized-logs.txt", zip_source_buffer(zip, ellipsizedLog.data(), ellipsizedLog.length(), 0));
+            addSource("full-logs.txt", zip_source_buffer(zip, fullLog.data(), fullLog.length(), 0));
+            addSource("input-gdk_events.txt", zip_source_buffer(zip, gdkeventslog.data(), gdkeventslog.length(), 0));
+#ifdef ZIP_LENGTH_TO_END  // Only introduced in libzip 1.10.1 - ubuntu 22 has v1.7.3
+            addSource("settings.xml",
+                      zip_source_file(zip, char_cast(settings.u8string().c_str()), 0, ZIP_LENGTH_TO_END));
+#else
+            addSource("settings.xml", zip_source_file(zip, char_cast(settings.u8string().c_str()), 0, -1));
+#endif
+            auto version = xoj::util::getVersionInfo();
+            addSource("version.txt", zip_source_buffer(zip, version.data(), version.length(), 0));
+
+            errorCode = zip_close(zip);
+            if (errorCode) {
+                // TODO handle error
+            }
+        }
+    };
+
+    auto popup = xoj::popup::PopupWindowWrapper<xoj::SaveExportDialog>(
+            nullptr, fs::path(), _("Export Logs"), _("Export"), std::move(pathValidation), std::move(callback));
+
+    auto* fc = GTK_FILE_CHOOSER(popup.getPopup()->getWindow());
+
+    GtkFileFilter* filter = gtk_file_filter_new();
+    gtk_file_filter_set_name(filter, "ZIP archive");
+    gtk_file_filter_add_mime_type(filter, "application/zip");
+    gtk_file_chooser_add_filter(fc, filter);
+
+    popup.show(GTK_WINDOW(gtk_widget_get_ancestor(parent, GTK_TYPE_WINDOW)));
+}
+
+DeviceTestingArea::DeviceTestingArea(GladeSearchpath* gladeSearchPath, GtkBox* parent, Settings* settings):
+        settings(settings),
+        gladeSearchPath(gladeSearchPath),
+        emulateTipContactOnButtonPress(settings->getInputSystemTPCButtonEnabled()),
+        inputContext(std::make_unique<InputContext>(settings, *this)),
+        ancestorScrolledWindow(gtk_widget_get_ancestor(GTK_WIDGET(parent), GTK_TYPE_SCROLLED_WINDOW), xoj::util::ref),
+        data(std::make_unique<Data>()) {
+    data->log << std::setprecision(6);
+    data->log.imbue(std::locale::classic());
+    data->allGdkEvents << std::setprecision(6);
+    data->allGdkEvents.imbue(std::locale::classic());
+    data->ellipsizedLog << std::setprecision(6);
+    data->ellipsizedLog.imbue(std::locale::classic());
+
+    data->timeReference = strict_cast<guint32>(as_unsigned(g_get_monotonic_time()) / 1000);
+
+    Builder builder(gladeSearchPath, UI_FILE_NAME);
+    gtk_box_append(parent, builder.get(UI_MAIN_ID));
+
+    struct D {
+        std::stringstream* log;
+        GtkTextBuffer* view;
+    };
+    g_signal_connect_data(builder.get("logpopover"), "show", G_CALLBACK(+[](GtkWidget*, gpointer d) {
+                              auto* dd = static_cast<D*>(d);
+                              gtk_text_buffer_set_text(dd->view, dd->log->str().c_str(), -1);
+                          }),
+                          new D{&data->ellipsizedLog, GTK_TEXT_BUFFER(builder.get<GObject>("logbuffer"))},
+                          xoj::util::closure_notify_cb<D>, GConnectFlags(0));
+
+    auto* cbEmulateTipContactOnButtonPress = builder.get("cbEmulateTipContactOnButtonPress");
+    gtk_check_button_set_active(GTK_CHECK_BUTTON(cbEmulateTipContactOnButtonPress), emulateTipContactOnButtonPress);
+    g_signal_connect(cbEmulateTipContactOnButtonPress, "toggled",
+                     G_CALLBACK(+[]
+#if GTK_MAJOR_VERSION == 3
+                                (GtkToggleButton* btn, gpointer d) {
+                                    static_cast<DeviceTestingArea*>(d)->emulateTipContactOnButtonPress =
+                                            gtk_toggle_button_get_active(btn);
+                                }),
+#else
+                             (GtkCheckButton* btn, gpointer d) {
+                                 static_cast<DeviceTestingArea*>(d)->emulateTipContactOnButtonPress =
+                                         gtk_check_button_get_active(btn);
+                             }),
+#endif
+                     this);
+
+    g_signal_connect(builder.get("btnExportLogs"), "clicked", G_CALLBACK(+[](GtkButton* btn, gpointer d) {
+                         auto* self = static_cast<DeviceTestingArea*>(d);
+                         saveLog(self->data->log, self->data->ellipsizedLog, self->data->allGdkEvents, GTK_WIDGET(btn),
+                                 self->settings);
+                     }),
+                     this);
+
+    g_signal_connect(builder.get("btnAllDevices"), "clicked", G_CALLBACK(+[](GtkButton* btn, gpointer d) {
+                         auto* self = static_cast<DeviceTestingArea*>(d);
+                         auto dlg = xoj::popup::PopupWindowWrapper<DeviceListDialog>(self->gladeSearchPath,
+                                                                                     self->settings);
+                         dlg.show(GTK_WINDOW(gtk_widget_get_ancestor(GTK_WIDGET(btn), GTK_TYPE_WINDOW)));
+                     }),
+                     this);
+
+
+    lastDeviceClassConfig = std::make_unique<DeviceClassConfigGui>(
+            gladeSearchPath, GTK_BOX(builder.get("boxLastDevice")), settings, true);
+    drawingArea.reset(builder.get("testArea"), xoj::util::ref);
+
+    mouseIndicators[0].reset(builder.get("mouse-in-use"), xoj::util::ref);
+    mouseIndicators[GDK_BUTTON_PRIMARY].reset(builder.get("mouse-left"), xoj::util::ref);
+    mouseIndicators[GDK_BUTTON_MIDDLE].reset(builder.get("mouse-middle"), xoj::util::ref);
+    mouseIndicators[GDK_BUTTON_SECONDARY].reset(builder.get("mouse-right"), xoj::util::ref);
+    stylusIndicators[0].reset(builder.get("stylus-hover"), xoj::util::ref);
+    stylusIndicators[1].reset(builder.get("stylus-tip"), xoj::util::ref);
+    stylusIndicators[2].reset(builder.get("stylus-1"), xoj::util::ref);
+    stylusIndicators[3].reset(builder.get("stylus-2"), xoj::util::ref);
+    eraserIndicators[0].reset(builder.get("eraser-hover"), xoj::util::ref);
+    eraserIndicators[1].reset(builder.get("eraser-tip"), xoj::util::ref);
+    touchIndicators[0].reset(builder.get("touch-1"), xoj::util::ref);
+    touchIndicators[1].reset(builder.get("touch-2"), xoj::util::ref);
+    touchIndicators[2].reset(builder.get("touch-3"), xoj::util::ref);
+    touchIndicators[3].reset(builder.get("touch-4"), xoj::util::ref);
+    touchIndicators[4].reset(builder.get("touch-5"), xoj::util::ref);
+
+    inputContext->connect(drawingArea.get(), /* connectKeyboardHandler */ false, [data = data.get()](GdkEvent* e) {
+        xoj::input::printGdkEvent(data->allGdkEvents, e, data->timeReference);
+    });
+
+    gtk_drawing_area_set_draw_func(GTK_DRAWING_AREA(drawingArea.get()), draw, &data->lastEvs, nullptr);
+}
+
+DeviceTestingArea::~DeviceTestingArea() = default;
+
+
+static constexpr const char* handlerTypeToString[] = {"MOUSE", "STYLUS", "TOUCH"};
+
+
+bool DeviceTestingArea::handle(const InputEvent& e, HandlerType handlerType) {
+    if (e.deviceClass == INPUT_DEVICE_TOUCHSCREEN) {
+        /*
+         * kinetic scrolling will capture touch event if the sequence looks like a scroll.
+         * We do not want to scroll when testing touch devices in the testing area, so we disable it
+         */
+        if (e.type == ENTER_EVENT) {
+            gtk_scrolled_window_set_kinetic_scrolling(GTK_SCROLLED_WINDOW(ancestorScrolledWindow.get()), false);
+        } else if (e.type == LEAVE_EVENT) {
+            gtk_scrolled_window_set_kinetic_scrolling(GTK_SCROLLED_WINDOW(ancestorScrolledWindow.get()), true);
+        }
+    }
+    data->log << "Handler " << handlerTypeToString[handlerType] << " received:\n";
+    xoj::input::printEvent(data->log, e, data->timeReference);
+
+    if (e.type != MOTION_EVENT || e.device != data->lastMotionDevice) {
+        if (data->nbOfConsecutiveMotionEvents > 1) {
+            data->ellipsizedLog << "   ⦙\n  " << data->nbOfConsecutiveMotionEvents - 1
+                                << " motion events omitted\n   ⦙\n";
+        }
+        if (e.type == MOTION_EVENT) {
+            data->nbOfConsecutiveMotionEvents = 1;
+            data->lastMotionDevice = e.device;
+        } else {
+            data->nbOfConsecutiveMotionEvents = 0;
+            data->lastMotionDevice = nullptr;
+        }
+        data->ellipsizedLog << "Handler " << handlerTypeToString[handlerType] << " received:\n";
+        xoj::input::printEvent(data->ellipsizedLog, e, data->timeReference);
+    } else {
+        if (data->nbOfConsecutiveMotionEvents == 0) {
+            data->ellipsizedLog << "Handler " << handlerTypeToString[handlerType] << " received:\n";
+            xoj::input::printEvent(data->ellipsizedLog, e, data->timeReference);
+            data->lastMotionDevice = e.device;
+        }
+        data->nbOfConsecutiveMotionEvents++;
+    }
+
+    auto queueEvent = [&]() {
+        auto category = [&]() {
+            switch (e.deviceClass) {
+                case INPUT_DEVICE_MOUSE:
+                    return DevCategory::MOUSE;
+                case INPUT_DEVICE_PEN:
+                    return DevCategory::STYLUS;
+                case INPUT_DEVICE_ERASER:
+                    return DevCategory::ERASER;
+                case INPUT_DEVICE_TOUCHSCREEN:
+                    return DevCategory::TOUCHSCREEN;
+                default:
+                    return DevCategory::MOUSE;
+            }
+        }();
+        data->lastEvs.push_front(
+                Ev{Point(e.relative.x, e.relative.y, e.pressure), data->buttonsStatus[category], handlerType});
+        gtk_widget_queue_draw(drawingArea.get());
+    };
+
+    // The mouse rarely issues LEAVE_EVENT. We turn off the "in-use" indicator after a short time of inactivity
+    auto resetInUseTimer = [](xoj::util::GSourceURef& timer, GtkWidget* indicator) {
+        if (!timer) {
+            gtk_widget_add_css_class(indicator, "pressed");
+        }
+        struct cbData {
+            GtkWidget* indicator;
+            xoj::util::GSourceURef* timer;
+        };
+        timer = g_timeout_add_full(
+                G_PRIORITY_DEFAULT, IN_USE_RESET_DELAY,
+                +[](gpointer d) {
+                    auto* data = static_cast<cbData*>(d);
+                    gtk_widget_remove_css_class(data->indicator, "pressed");
+                    data->timer->consume();
+                    return G_SOURCE_REMOVE;
+                },
+                new cbData{indicator, &timer}, xoj::util::destroy_cb<cbData>);
+    };
+
+    if (e.type == BUTTON_PRESS_EVENT) {
+        lastDeviceClassConfig->setDevice(InputDevice(e.device));
+        if (handlerType == MOUSE && e.button < mouseIndicators.size()) {
+            data->buttonsStatus[DevCategory::MOUSE].set(e.button);
+            gtk_widget_add_css_class(mouseIndicators[e.button].get(), "pressed");
+            resetInUseTimer(mouseInUseTimer, mouseIndicators[0].get());
+        } else if (handlerType == STYLUS) {
+            if (e.deviceClass == INPUT_DEVICE_PEN && e.button < stylusIndicators.size()) {
+                data->buttonsStatus[DevCategory::STYLUS].set(e.button);
+                gtk_widget_add_css_class(stylusIndicators[e.button].get(), "pressed");
+                resetInUseTimer(stylusInUseTimer, stylusIndicators[0].get());
+                if (e.button != CONTACT_BUTTON_INDEX && emulateTipContactOnButtonPress &&
+                    CONSIDERED_FOR_TIP_EMULATION[e.button]) {
+                    data->buttonsStatus[DevCategory::STYLUS].set(CONTACT_BUTTON_INDEX);
+                    gtk_widget_add_css_class(stylusIndicators[CONTACT_BUTTON_INDEX].get(), "pressed");
+                }
+            } else if (e.deviceClass == INPUT_DEVICE_ERASER && e.button < eraserIndicators.size()) {
+                data->buttonsStatus[DevCategory::ERASER].set(e.button);
+                gtk_widget_add_css_class(eraserIndicators[e.button].get(), "pressed");
+                resetInUseTimer(eraserInUseTimer, eraserIndicators[0].get());
+            }
+        } else if (handlerType == TOUCH) {
+            data->nbTouchSequences++;
+            if (data->nbTouchSequences <= 5) {
+                gtk_widget_add_css_class(touchIndicators[data->nbTouchSequences - 1].get(), "pressed");
+            }
+            data->buttonsStatus[DevCategory::TOUCHSCREEN].set(CONTACT_BUTTON_INDEX);
+        }
+        queueEvent();
+    } else if (e.type == BUTTON_RELEASE_EVENT) {
+        if (handlerType == MOUSE && e.button < mouseIndicators.size()) {
+            data->buttonsStatus[DevCategory::MOUSE].reset(e.button);
+            gtk_widget_remove_css_class(mouseIndicators[e.button].get(), "pressed");
+            resetInUseTimer(mouseInUseTimer, mouseIndicators[0].get());
+        } else if (handlerType == TOUCH) {
+            if (data->nbTouchSequences == 0) {
+                data->log << "ERROR: Terminating more touch sequences than had been started" << std::endl;
+            } else if (data->nbTouchSequences <= 5) {
+                gtk_widget_remove_css_class(touchIndicators[data->nbTouchSequences - 1].get(), "pressed");
+                if (--data->nbTouchSequences == 0) {
+                    data->buttonsStatus[DevCategory::TOUCHSCREEN].reset(0);
+                }
+            }
+        } else {
+            if (e.deviceClass == INPUT_DEVICE_PEN && e.button < stylusIndicators.size()) {
+                data->buttonsStatus[DevCategory::STYLUS].reset(e.button);
+                gtk_widget_remove_css_class(stylusIndicators[e.button].get(), "pressed");
+                resetInUseTimer(stylusInUseTimer, stylusIndicators[0].get());
+                if (e.button != CONTACT_BUTTON_INDEX && emulateTipContactOnButtonPress) {
+                    data->buttonsStatus[DevCategory::STYLUS].reset(CONTACT_BUTTON_INDEX);
+                    gtk_widget_remove_css_class(stylusIndicators[CONTACT_BUTTON_INDEX].get(), "pressed");
+                }
+            } else if (e.deviceClass == INPUT_DEVICE_ERASER && e.button < eraserIndicators.size()) {
+                data->buttonsStatus[DevCategory::ERASER].reset(e.button);
+                gtk_widget_remove_css_class(eraserIndicators[e.button].get(), "pressed");
+                resetInUseTimer(eraserInUseTimer, eraserIndicators[0].get());
+            }
+        }
+        queueEvent();
+    } else if (e.type == MOTION_EVENT) {
+        if (handlerType == MOUSE) {
+            resetInUseTimer(mouseInUseTimer, mouseIndicators[0].get());
+        } else if (handlerType == STYLUS) {
+            if (e.deviceClass == INPUT_DEVICE_PEN) {
+                resetInUseTimer(stylusInUseTimer, stylusIndicators[0].get());
+            } else {
+                resetInUseTimer(eraserInUseTimer, eraserIndicators[0].get());
+            }
+        }
+        queueEvent();
+    }
+    return true;
+}
+
+void DeviceTestingArea::saveSettings() const {
+    this->settings->setInputSystemTPCButtonEnabled(this->emulateTipContactOnButtonPress);
+    this->lastDeviceClassConfig->saveSettings();
+}
diff --git a/entry/src/main/cpp/src/core/gui/dialog/DeviceTestingArea.h b/entry/src/main/cpp/src/core/gui/dialog/DeviceTestingArea.h
new file mode 100644
index 0000000..de8b6b7
--- /dev/null
+++ b/entry/src/main/cpp/src/core/gui/dialog/DeviceTestingArea.h
@@ -0,0 +1,82 @@
+/*
+ * Xournal++
+ *
+ * An area to test input devices
+ *
+ * @author Xournal++ Team
+ * https://github.com/xournalpp/xournalpp
+ *
+ * @license GNU GPLv2 or later
+ */
+
+#pragma once
+
+#include <array>
+#include <memory>
+#include <vector>
+
+#include <gtk/gtk.h>  // for GtkWidget, ...
+
+#include "util/raii/GObjectSPtr.h"
+#include "util/raii/GSourceURef.h"
+
+class Settings;
+class InputContext;
+struct InputEvent;
+class DeviceClassConfigGui;
+class GladeSearchpath;
+
+class DeviceTestingArea {
+public:
+    DeviceTestingArea(GladeSearchpath* path, GtkBox* parent, Settings* settings);
+    ~DeviceTestingArea();
+
+    enum HandlerType { MOUSE = 0, STYLUS = 1, TOUCH = 2 };
+    bool handle(const InputEvent& e, HandlerType t);
+
+    void saveSettings() const;
+
+private:
+    Settings* settings;
+    GladeSearchpath* gladeSearchPath;
+
+    bool emulateTipContactOnButtonPress;
+
+    std::unique_ptr<InputContext> inputContext;
+    xoj::util::WidgetSPtr drawingArea;
+
+    /// Indicators for button status
+    std::array<xoj::util::WidgetSPtr, 4> mouseIndicators;   ///< 0 = in use, 1 = left, 2 = middle, 3 = right
+    std::array<xoj::util::WidgetSPtr, 4> stylusIndicators;  ///< 0 = in use, 1 = tip, 2 = button-1, 3 = button-2
+    std::array<xoj::util::WidgetSPtr, 2> eraserIndicators;  ///< 0 = in use, 1 = tip
+    std::array<xoj::util::WidgetSPtr, 5> touchIndicators;
+
+    /// Mouse "in use" timer: the mouse stays in use 100ms after its last event
+    xoj::util::GSourceURef mouseInUseTimer;
+    xoj::util::GSourceURef stylusInUseTimer;
+    xoj::util::GSourceURef eraserInUseTimer;
+
+    /// Used to disable kinetic scrolling in order to properly test touchscreens
+    xoj::util::WidgetSPtr ancestorScrolledWindow;
+
+    /// Show and edit the configuration of the last device used
+    std::unique_ptr<DeviceClassConfigGui> lastDeviceClassConfig;
+
+    struct Data;
+    std::unique_ptr<Data> data;
+};
+
+
+template <typename Handler>
+class TestingHandler: public Handler {
+public:
+    explicit TestingHandler(InputContext* context, DeviceTestingArea::HandlerType t, DeviceTestingArea& testing):
+            Handler(context), deviceType(t), testing(testing) {}
+    ~TestingHandler() = default;
+
+    bool handleImpl(const InputEvent& e) override { return testing.handle(e, deviceType); }
+
+private:
+    const DeviceTestingArea::HandlerType deviceType;
+    DeviceTestingArea& testing;
+};
diff --git a/entry/src/main/cpp/src/core/gui/dialog/ExportDialog.cpp b/entry/src/main/cpp/src/core/gui/dialog/ExportDialog.cpp
new file mode 100644
index 0000000..b7268fd
--- /dev/null
+++ b/entry/src/main/cpp/src/core/gui/dialog/ExportDialog.cpp
@@ -0,0 +1,192 @@
+#include "ExportDialog.h"
+
+#include <algorithm>  // for max
+#include <stdexcept>  // for invalid_argument
+#include <string>     // for string, to_string, operator+
+#include <vector>     // for allocator
+
+#include <glib-object.h>  // for G_CALLBACK, g_signal_connect
+
+#include "gui/Builder.h"
+#include "util/ElementRange.h"  // for parse, PageRangeVector
+#include "util/gtk4_helper.h"
+
+class GladeSearchpath;
+
+constexpr auto UI_FILE = "exportSettings.glade";
+constexpr auto UI_DIALOG_NAME = "exportDialog";
+
+using namespace xoj::popup;
+
+ExportDialog::ExportDialog(GladeSearchpath* gladeSearchPath, ExportGraphicsFormat format, size_t currentPage,
+                           size_t pageCount, bool hasPdfBackground,
+                           std::function<void(const ExportDialog&)> callbackFun):
+        currentPage(currentPage), pageCount(pageCount), builder(gladeSearchPath, UI_FILE), callbackFun(callbackFun) {
+    window.reset(GTK_WINDOW(builder.get(UI_DIALOG_NAME)));
+
+    gtk_label_set_text(GTK_LABEL(builder.get("lbAllPagesInfo")), ("1 - " + std::to_string(pageCount)).c_str());
+    gtk_label_set_text(GTK_LABEL(builder.get("lbCurrentPage")), std::to_string(currentPage).c_str());
+
+#if GTK_MAJOR_VERSION == 3
+    // Widgets are visible by default in gtk4
+    gtk_widget_show_all(builder.get("dialog-main-box"));
+#endif
+
+    auto removeQualitySetting = [&builder = this->builder]() {
+        gtk_widget_hide(builder.get("lbQuality"));
+        gtk_widget_hide(builder.get("boxQuality"));
+        gtk_widget_hide(builder.get("cbQuality"));
+    };
+
+    if (format == EXPORT_GRAPHICS_PDF) {
+        removeQualitySetting();
+        auto* cbt = GTK_COMBO_BOX_TEXT(builder.get("cbtPdfExportBackend"));
+        for (auto&& [id, name]: ExportBackend::getPrettyNamesOfAvailableBackends()) {
+            gtk_combo_box_text_append(cbt, id, name);
+        }
+        gtk_combo_box_set_active_id(GTK_COMBO_BOX(cbt), ExportBackend::DEFAULT_ID_STRING);
+        if (!hasPdfBackground) {
+            // No need for backend selection if no pdf background is present.
+            gtk_widget_set_sensitive(builder.get("boxPdfBackend"), false);
+        }
+    } else if (format == EXPORT_GRAPHICS_PNG) {
+        gtk_widget_hide(builder.get("cbProgressiveMode"));
+        gtk_widget_hide(builder.get("boxPdfBackend"));
+    } else {  // (format == EXPORT_GRAPHICS_SVG)
+        removeQualitySetting();
+        gtk_widget_hide(builder.get("cbProgressiveMode"));
+        gtk_widget_hide(builder.get("boxPdfBackend"));
+    }
+
+    // rdRangePages toggled signal handler
+    //
+    // Sets and unsets the sensitivity of the text form, OK button and
+    // displays an error when the text form is selected and contains
+    // invalid user data. The error goes away when the text form is de-selected.
+    auto toggledHandler = G_CALLBACK(+[](GtkCheckButton* button, ExportDialog* self) {
+        auto active = gtk_check_button_get_active(button);
+        auto btOk = self->builder.get("btOk");
+        auto txtPages = self->builder.get("txtPages");
+        gtk_widget_set_sensitive(txtPages, active);
+        if (active) {
+            const std::string text_form(gtk_editable_get_text(GTK_EDITABLE(txtPages)));
+            try {
+                ElementRange::parse(text_form, self->pageCount);
+                gtk_widget_remove_css_class(txtPages, "error");
+                gtk_widget_set_sensitive(btOk, true);
+            } catch (const std::invalid_argument&) {
+                gtk_widget_add_css_class(txtPages, "error");
+                gtk_widget_set_sensitive(btOk, false);
+            }
+        } else {
+            gtk_widget_remove_css_class(txtPages, "error");
+            gtk_widget_set_sensitive(btOk, true);
+        }
+    });
+    // txtPages changed signal handler
+    //
+    // Displays an error when the user inputs invalid page ranges in the text form,
+    // and sets the sensitivity of the OK button to FALSE. These actions are
+    // reversed when the text form contains a valid page range.
+    auto changedHandler = G_CALLBACK(+[](GtkEditable* txtPages, ExportDialog* self) {
+        const std::string text_form(gtk_editable_get_text(txtPages));
+        auto btOk = self->builder.get("btOk");
+        try {
+            ElementRange::parse(text_form, self->pageCount);
+            gtk_widget_remove_css_class(GTK_WIDGET(txtPages), "error");
+            gtk_widget_set_sensitive(btOk, true);
+        } catch (const std::invalid_argument& e) {
+            gtk_widget_add_css_class(GTK_WIDGET(txtPages), "error");
+            gtk_widget_set_sensitive(btOk, false);
+        }
+    });
+
+    g_signal_connect(builder.get("rdRangePages"), "toggled", toggledHandler, this);
+    g_signal_connect(builder.get("cbQuality"), "changed", G_CALLBACK(ExportDialog::selectQualityCriterion), this);
+    g_signal_connect(builder.get("txtPages"), "changed", changedHandler, this);
+
+
+    g_signal_connect_swapped(builder.get("btCancel"), "clicked", G_CALLBACK(gtk_window_close), this->window.get());
+    g_signal_connect_swapped(builder.get("btOk"), "clicked", G_CALLBACK(ExportDialog::onSuccessCallback), this);
+
+    /**
+     * By calling this->callbackFun() here, we make sure that `control->unblock()` is run even if the user clicks on
+     * the close-window button.
+     *
+     * The callback returns `false` so that the PopupWindowManager callback deleting `this` gets called as well.
+     */
+#if GTK_MAJOR_VERSION == 3
+    g_signal_connect_swapped(window.get(), "delete-event", G_CALLBACK(+[](ExportDialog* self) {
+                                 self->callbackFun(*self);
+                                 return false;
+                             }),
+                             this);
+#else
+    g_signal_connect_swapped(window.get(), "close-request", G_CALLBACK(+[](ExportDialog* self) {
+                                 self->callbackFun(*self);
+                                 return false;
+                             }),
+                             this);
+#endif
+}
+
+ExportDialog::~ExportDialog() = default;
+
+void ExportDialog::selectQualityCriterion(GtkComboBox* comboBox, ExportDialog* self) {
+    int activeCriterion = gtk_combo_box_get_active(comboBox);
+    switch (activeCriterion) {
+        case EXPORT_QUALITY_DPI:
+            gtk_label_set_text(GTK_LABEL(self->builder.get("lbQualityUnit")), "dpi");
+            gtk_spin_button_set_adjustment(GTK_SPIN_BUTTON(self->builder.get("sbQualityValue")),
+                                           GTK_ADJUSTMENT(self->builder.get<GObject>("adjustmentDpi")));
+            break;
+        case EXPORT_QUALITY_WIDTH:
+        case EXPORT_QUALITY_HEIGHT:
+            gtk_label_set_text(GTK_LABEL(self->builder.get("lbQualityUnit")), "px");
+            gtk_spin_button_set_adjustment(GTK_SPIN_BUTTON(self->builder.get("sbQualityValue")),
+                                           GTK_ADJUSTMENT(self->builder.get<GObject>("adjustmentHeightWidth")));
+            break;
+    }
+}
+
+void ExportDialog::onSuccessCallback(ExportDialog* self) {
+    self->confirmed = true;
+    self->progressiveMode = gtk_check_button_get_active(GTK_CHECK_BUTTON(self->builder.get("cbProgressiveMode")));
+    self->backgroundType = static_cast<ExportBackgroundType>(
+            gtk_combo_box_get_active(GTK_COMBO_BOX(self->builder.get("cbBackgroundType"))));
+    self->pageRanges = [self]() {
+        GtkWidget* rdRangeCurrent = self->builder.get("rdRangeCurrent");
+        GtkWidget* rdRangePages = self->builder.get("rdRangePages");
+
+        if (gtk_check_button_get_active(GTK_CHECK_BUTTON(rdRangePages))) {
+            return ElementRange::parse(gtk_editable_get_text(GTK_EDITABLE(self->builder.get("txtPages"))),
+                                       self->pageCount);
+        }
+        if (gtk_check_button_get_active(GTK_CHECK_BUTTON(rdRangeCurrent))) {
+            PageRangeVector range;
+            range.emplace_back(self->currentPage - 1, self->currentPage - 1);
+            return range;
+        }
+
+        PageRangeVector range;
+        range.emplace_back(0, self->pageCount - 1);
+        return range;
+    }();
+    self->pdfExportBackend = ExportBackend::fromString(
+            gtk_combo_box_get_active_id(GTK_COMBO_BOX(self->builder.get("cbtPdfExportBackend"))));
+    self->qualityParameter = RasterImageQualityParameter(
+            static_cast<ExportQualityCriterion>(
+                    gtk_combo_box_get_active(GTK_COMBO_BOX(self->builder.get("cbQuality")))),
+            gtk_spin_button_get_value_as_int(GTK_SPIN_BUTTON(self->builder.get("sbQualityValue"))));
+    gtk_window_close(self->window.get());
+}
+
+auto ExportDialog::getPngQualityParameter() const -> RasterImageQualityParameter { return qualityParameter; }
+
+auto ExportDialog::isConfirmed() const -> bool { return this->confirmed; }
+
+auto ExportDialog::progressiveModeSelected() const -> bool { return this->progressiveMode; }
+
+auto ExportDialog::getBackgroundType() const -> ExportBackgroundType { return backgroundType; }
+
+auto ExportDialog::getRange() const -> const PageRangeVector& { return pageRanges; }
diff --git a/entry/src/main/cpp/src/core/gui/dialog/ExportDialog.h b/entry/src/main/cpp/src/core/gui/dialog/ExportDialog.h
new file mode 100644
index 0000000..78fe879
--- /dev/null
+++ b/entry/src/main/cpp/src/core/gui/dialog/ExportDialog.h
@@ -0,0 +1,76 @@
+/*
+ * Xournal++
+ *
+ * Dialog with export settings
+ *
+ * @author Xournal++ Team
+ * https://github.com/xournalpp/xournalpp
+ *
+ * @license GNU GPLv2 or later
+ */
+
+#pragma once
+
+#include <cstddef>  // for size_t
+#include <functional>
+
+#include <gtk/gtk.h>  // for GtkComboBox, GtkWindow
+
+#include "control/jobs/BaseExportJob.h"  // for ExportBackgroundType
+#include "control/jobs/ImageExport.h"    // for RasterImageQualityParameter
+#include "gui/Builder.h"
+#include "pdf/base/PdfExportBackend.h"
+#include "util/ElementRange.h"  // for PageRangeVector
+#include "util/raii/GtkWindowUPtr.h"
+
+class GladeSearchpath;
+
+namespace xoj::popup {
+class ExportDialog {
+public:
+    ExportDialog(GladeSearchpath* gladeSearchPath, ExportGraphicsFormat format, size_t currentPage, size_t pageCount,
+                 bool hasPdfBackground, std::function<void(const ExportDialog&)> callbackFun);
+    ~ExportDialog();
+
+public:
+    bool isConfirmed() const;
+    const PageRangeVector& getRange() const;
+    bool progressiveModeSelected() const;
+    ExportBackgroundType getBackgroundType() const;
+    inline ExportBackend getPdfExportBackend() const { return pdfExportBackend; }
+
+    /**
+     * @brief Reads the quality parameter from the dialog
+     *
+     * @return The selected quality parameter
+     */
+    RasterImageQualityParameter getPngQualityParameter() const;
+
+    inline GtkWindow* getWindow() const { return window.get(); }
+
+private:
+    /**
+     * @brief Handler for changes in combobox cbQuality
+     */
+    static void selectQualityCriterion(GtkComboBox* comboBox, ExportDialog* self);
+
+    static void onSuccessCallback(ExportDialog* self);
+
+private:
+    xoj::util::GtkWindowUPtr window;
+
+    size_t currentPage = 0;
+    size_t pageCount = 0;
+
+    bool confirmed = false;
+    bool progressiveMode;
+    ExportBackgroundType backgroundType;
+    ExportBackend pdfExportBackend;
+    RasterImageQualityParameter qualityParameter;
+    PageRangeVector pageRanges;
+
+    Builder builder;
+
+    std::function<void(const ExportDialog&)> callbackFun;
+};
+};  // namespace xoj::popup
diff --git a/entry/src/main/cpp/src/core/gui/dialog/ExtEdLatexDialog.cpp b/entry/src/main/cpp/src/core/gui/dialog/ExtEdLatexDialog.cpp
new file mode 100644
index 0000000..d27c5a5
--- /dev/null
+++ b/entry/src/main/cpp/src/core/gui/dialog/ExtEdLatexDialog.cpp
@@ -0,0 +1,192 @@
+#include "ExtEdLatexDialog.h"
+
+#include <fstream>  // for ofstream
+#include <system_error>
+
+#include <gio/gio.h>      // for g_subprocess*
+#include <glib-object.h>  // for g_object_unref, g_clear_object
+#include <glib.h>
+#include <gtk/gtk.h>  // for gtk_widget_set_sensitive
+
+#include "control/Control.h"
+#include "control/LatexController.h"
+#include "control/settings/LatexSettings.h"
+#include "gui/Builder.h"
+#include "gui/GladeSearchpath.h"
+#include "util/PathUtil.h"         // for readString
+#include "util/XojMsgBox.h"        // for XojMsgBox
+#include "util/i18n.h"             // for FS, _, _F, N_
+#include "util/raii/GLibGuards.h"  // for GErrorGuard, GStrvGuard
+
+#include "AbstractLatexDialog.h"
+
+constexpr auto UI_FILE_NAME = "extEdTexDialog.glade";
+constexpr auto UI_DIALOG_ID = "extEdTexDialog";
+
+ExtEdLatexDialog::ExtEdLatexDialog(GladeSearchpath* gladeSearchPath, std::unique_ptr<LatexController> ctrl):
+        AbstractLatexDialog(std::move(ctrl)) {
+    Builder builder(gladeSearchPath, UI_FILE_NAME);
+    window.reset(GTK_WINDOW(builder.get(UI_DIALOG_ID)));
+    populateStandardWidgetsFromBuilder(builder);
+    btContEdit = GTK_BUTTON(builder.get("btContEdit"));
+    connectStandardSignals();
+
+    tempf = texCtrl->texTmpDir / "edit.";
+
+    // Append file extension.
+    tempf += texCtrl->settings.temporaryFileExt;
+
+    // Write initial content
+    std::ofstream os{tempf};
+    if (!texCtrl->initialTex.empty()) {
+        os << texCtrl->initialTex;
+    } else {
+        os << texCtrl->settings.defaultText;
+    }
+    os.close();
+
+    g_signal_connect(getWindow(), "show", G_CALLBACK(+[](GtkWidget*, gpointer d) {
+                         auto self = static_cast<ExtEdLatexDialog*>(d);
+                         if (!self->texCtrl->temporaryRender) {
+                             // Trigger an asynchronous compilation if we are not using a preexisting TexImage
+                             // Keep this after popup.show() so that if an error message is to be displayed (e.g.
+                             // missing Tex executable), it'll appear on top of the LatexDialog.
+                             LatexController::handleTexChanged(self->texCtrl.get());
+                         }
+
+                         self->openEditor();
+                     }),
+                     this);
+    g_signal_connect(btContEdit, "clicked", G_CALLBACK(+[](GtkButton*, gpointer d) {
+                         auto* self = static_cast<ExtEdLatexDialog*>(d);
+                         self->openEditor();
+                     }),
+                     this);
+}
+
+ExtEdLatexDialog::~ExtEdLatexDialog() {
+    try {
+        fs::remove(tempf);
+    } catch (const std::system_error& e) {
+        g_warning("Failed to remove LaTeX edit file: %s", e.what());
+    }
+    if (editorCancellable) {
+        g_cancellable_cancel(editorCancellable);
+        g_object_unref(editorCancellable);
+    }
+};
+
+void ExtEdLatexDialog::setCompilationStatus(bool isTexValid, bool isCompilationDone,
+                                            const std::string& compilationOutput) {
+    if (texCtrl->settings.externalEditorAutoConfirm && !editorCancellable && isTexValid && isCompilationDone) {
+        texCtrl->insertTexImage();
+        gtk_window_close(getWindow());
+        return;
+    }
+
+    AbstractLatexDialog::setCompilationStatus(isTexValid, isCompilationDone, compilationOutput);
+};
+
+void ExtEdLatexDialog::openEditor() {
+    if (editorCancellable) {
+        return;
+    }
+
+    xoj::util::GErrorGuard err{};
+    xoj::util::GStrvGuard argv{};
+
+    std::string editorCmd = texCtrl->settings.externalEditorCmd;
+    if (editorCmd.empty()) {
+        auto maybeEditor = g_getenv("EDITOR");
+        if (!maybeEditor) {
+            XojMsgBox::showErrorToUser(
+                    getWindow(),
+                    "No external editor configured and no $EDITOR environment variable set. Please configure an "
+                    "external editor command or disable the external editor functionality to use a built-in one.");
+            return;
+        }
+        editorCmd = maybeEditor;
+    }
+    editorCmd += " '";
+    editorCmd += char_cast(tempf.u8string());
+    editorCmd += "'";
+
+    if (!g_shell_parse_argv(editorCmd.c_str(), nullptr, xoj::util::out_ptr(argv), xoj::util::out_ptr(err))) {
+        XojMsgBox::showErrorToUser(getWindow(), FS(_F("Failed to parse external editor command: {1}") % err->message));
+        return;
+    }
+
+    xoj::util::GObjectSPtr<GSubprocessLauncher> launcher(g_subprocess_launcher_new(G_SUBPROCESS_FLAGS_NONE),
+                                                         xoj::util::adopt);
+
+    Color textColor = texCtrl->control->getToolHandler()->getTool(TOOL_TEXT).getColor();
+    std::string colorStr = Util::rgb_to_hex_string(textColor).substr(1);
+
+    g_subprocess_launcher_setenv(launcher.get(), "XPP_TEXT_COLOR", colorStr.c_str(), TRUE);
+
+    xoj::util::GObjectSPtr<GSubprocess> process(
+            g_subprocess_launcher_spawnv(launcher.get(), argv.get(), xoj::util::out_ptr(err)), xoj::util::adopt);
+
+    if (err) {
+        XojMsgBox::showErrorToUser(getWindow(), FS(_F("Could not spawn editor: {1}") % err->message));
+        return;
+    }
+
+    gtk_widget_set_sensitive(GTK_WIDGET(btContEdit), false);
+
+    editorCancellable = g_cancellable_new();
+    g_subprocess_wait_async(process.get(), editorCancellable, reinterpret_cast<GAsyncReadyCallback>(editorWaitCallback),
+                            this);
+}
+
+void ExtEdLatexDialog::editorWaitCallback(GObject* processObj, GAsyncResult* res, ExtEdLatexDialog* self) {
+    auto process = G_SUBPROCESS(processObj);
+
+    xoj::util::GErrorGuard err;
+    if (!g_subprocess_wait_finish(process, res, xoj::util::out_ptr(err))) {
+        // If we cancelled the operation, that's because the user closed the popup while the editor was still open. We
+        // must not interact with self now, because that's likely already been destroyed. We kill the editor and then
+        // return.
+        if (g_error_matches(err.get(), G_IO_ERROR, G_IO_ERROR_CANCELLED)) {
+#ifdef G_OS_UNIX
+            g_subprocess_send_signal(process, SIGTERM);
+#else
+            // The g_subprocess_send_signal API is unavailable on non-unix platforms, so we use the cross-platform
+            // g_subprocess_force_exit function. We don't use it on supported platforms so we can send a "nicer" exit
+            // signal if available, as g_subprocess_force_exit sends SIGKILL on Unices.
+            g_subprocess_force_exit(process);
+#endif
+            return;
+        }
+
+        XojMsgBox::showErrorToUser(self->getWindow(), FS(_F("Could not wait for editor: {1}") % err->message));
+        return;
+    }
+
+    g_clear_object(&self->editorCancellable);
+    gtk_widget_set_sensitive(GTK_WIDGET(self->btContEdit), true);
+
+    auto status = g_subprocess_get_status(process);
+    if (status != 0) {
+        XojMsgBox::showErrorToUser(self->getWindow(), FS(_F("Editor exited with bad status {1}") % status));
+        return;
+    }
+
+    auto content = self->getBufferContents();
+
+    self->texCtrl->triggerImageUpdate(content);
+}
+
+std::string ExtEdLatexDialog::getBufferContents() {
+    auto content = Util::readString(tempf);
+    if (!content) {
+        return std::string();
+    }
+
+    // Remove a possible trailing newline
+    if (!content->empty() && content->back() == '\n') {
+        content->pop_back();
+    }
+
+    return *content;
+}
diff --git a/entry/src/main/cpp/src/core/gui/dialog/ExtEdLatexDialog.h b/entry/src/main/cpp/src/core/gui/dialog/ExtEdLatexDialog.h
new file mode 100644
index 0000000..734db10
--- /dev/null
+++ b/entry/src/main/cpp/src/core/gui/dialog/ExtEdLatexDialog.h
@@ -0,0 +1,48 @@
+/*
+ * Xournal++
+ *
+ * Latex dialog for an external editor
+ *
+ * @author Xournal++ Team
+ * https://github.com/xournalpp/xournalpp
+ *
+ * @license GNU GPLv2 or later
+ */
+#pragma once
+
+#include <glib.h>     // for gpointer
+#include <gtk/gtk.h>  // for GtkWidget
+
+#include "gui/GladeSearchpath.h"
+#include "gui/dialog/AbstractLatexDialog.h"
+
+class LatexController;
+
+class ExtEdLatexDialog final: public AbstractLatexDialog {
+public:
+    ExtEdLatexDialog() = delete;
+    ExtEdLatexDialog(const ExtEdLatexDialog& other) = delete;
+    ExtEdLatexDialog& operator=(const ExtEdLatexDialog& other) = delete;
+    ExtEdLatexDialog(GladeSearchpath* gladeSearchPath, std::unique_ptr<LatexController> texCtrl);
+    ~ExtEdLatexDialog() override;
+
+    std::string getBufferContents() override;
+
+private:
+    void setCompilationStatus(bool isTexValid, bool isCompilationDone, const std::string& compilationOutput) override;
+
+    /**
+     * @brief a callback for the editor exiting
+     */
+    static void editorWaitCallback(GObject* processObj, GAsyncResult* res, ExtEdLatexDialog* self);
+
+    /**
+     * @brief Open the editor or do nothing if it's already open.
+     */
+    void openEditor();
+
+private:
+    GtkButton* btContEdit;
+    fs::path tempf;
+    GCancellable* editorCancellable = nullptr;
+};
diff --git a/entry/src/main/cpp/src/core/gui/dialog/FileChooserFiltersHelper.cpp b/entry/src/main/cpp/src/core/gui/dialog/FileChooserFiltersHelper.cpp
new file mode 100644
index 0000000..1492791
--- /dev/null
+++ b/entry/src/main/cpp/src/core/gui/dialog/FileChooserFiltersHelper.cpp
@@ -0,0 +1,44 @@
+#include "FileChooserFiltersHelper.h"
+
+#include "util/i18n.h"
+
+namespace xoj {
+static void addMimeTypeFilter(GtkFileChooser* fc, const char* name, const char* mime) {
+    GtkFileFilter* filterPdf = gtk_file_filter_new();
+    gtk_file_filter_set_name(filterPdf, name);
+    gtk_file_filter_add_mime_type(filterPdf, mime);
+    gtk_file_chooser_add_filter(fc, filterPdf);
+}
+
+void addFilterAllFiles(GtkFileChooser* fc) {
+    GtkFileFilter* filterAll = gtk_file_filter_new();
+    gtk_file_filter_set_name(filterAll, _("All files"));
+    gtk_file_filter_add_pattern(filterAll, "*");
+    gtk_file_chooser_add_filter(fc, filterAll);
+}
+
+void addFilterSupported(GtkFileChooser* fc) {
+    GtkFileFilter* filterSupported = gtk_file_filter_new();
+    gtk_file_filter_set_name(filterSupported, _("Supported files"));
+    gtk_file_filter_add_mime_type(filterSupported, "application/x-xojpp");
+    gtk_file_filter_add_mime_type(filterSupported, "application/x-xopp");
+    gtk_file_filter_add_mime_type(filterSupported, "application/x-xopt");
+    gtk_file_filter_add_mime_type(filterSupported, "application/pdf");
+    gtk_file_filter_add_pattern(filterSupported, "*.moj");  // MrWriter
+    gtk_file_chooser_add_filter(fc, filterSupported);
+}
+
+void addFilterPdf(GtkFileChooser* fc) { addMimeTypeFilter(fc, _("PDF files"), "application/pdf"); }
+void addFilterXoj(GtkFileChooser* fc) { addMimeTypeFilter(fc, _("Xournal files"), "application/x-xojpp"); }
+void addFilterXopp(GtkFileChooser* fc) { addMimeTypeFilter(fc, _("Xournal++ files"), "application/x-xopp"); }
+void addFilterXopt(GtkFileChooser* fc) { addMimeTypeFilter(fc, _("Xournal++ template"), "application/x-xopt"); }
+void addFilterSvg(GtkFileChooser* fc) { addMimeTypeFilter(fc, _("SVG graphics"), "image/svg+xml"); }
+void addFilterPng(GtkFileChooser* fc) { addMimeTypeFilter(fc, _("PNG graphics"), "image/png"); }
+
+void addFilterImages(GtkFileChooser* fc) {
+    GtkFileFilter* filter = gtk_file_filter_new();
+    gtk_file_filter_set_name(filter, _("Image files"));
+    gtk_file_filter_add_pixbuf_formats(filter);
+    gtk_file_chooser_add_filter(fc, filter);
+}
+};  // namespace xoj
diff --git a/entry/src/main/cpp/src/core/gui/dialog/FileChooserFiltersHelper.h b/entry/src/main/cpp/src/core/gui/dialog/FileChooserFiltersHelper.h
new file mode 100644
index 0000000..024ddfd
--- /dev/null
+++ b/entry/src/main/cpp/src/core/gui/dialog/FileChooserFiltersHelper.h
@@ -0,0 +1,26 @@
+/*
+ * Xournal++
+ *
+ * Helper functions to add filters to GtkFileChooserDialogs
+ *
+ * @author Xournal++ Team
+ * https://github.com/xournalpp/xournalpp
+ *
+ * @license GNU GPLv2 or later
+ */
+
+#pragma once
+
+#include <gtk/gtk.h>
+
+namespace xoj {
+void addFilterAllFiles(GtkFileChooser* fc);
+void addFilterSupported(GtkFileChooser* fc);
+void addFilterPdf(GtkFileChooser* fc);
+void addFilterXoj(GtkFileChooser* fc);
+void addFilterXopp(GtkFileChooser* fc);
+void addFilterXopt(GtkFileChooser* fc);
+void addFilterSvg(GtkFileChooser* fc);
+void addFilterPng(GtkFileChooser* fc);
+void addFilterImages(GtkFileChooser* fc);  ///< All images supported by GdkPixbuf
+};  // namespace xoj
diff --git a/entry/src/main/cpp/src/core/gui/dialog/FormatDialog.cpp b/entry/src/main/cpp/src/core/gui/dialog/FormatDialog.cpp
new file mode 100644
index 0000000..2e9adcf
--- /dev/null
+++ b/entry/src/main/cpp/src/core/gui/dialog/FormatDialog.cpp
@@ -0,0 +1,216 @@
+#include "FormatDialog.h"
+
+#include <string>  // for operator==, string, basic_string
+
+#include <glib-object.h>  // for G_CALLBACK, g_signal_connect
+#include <glib.h>         // for g_list_free, GList
+
+#include "control/settings/Settings.h"  // for Settings
+#include "gui/PaperFormatUtils.h"       // for PaperFormatUtils
+#include "model/FormatDefinitions.h"    // for FormatUnits, XOJ_UNITS, XOJ_U...
+#include "util/GListView.h"             // for GListView, GListView<>::GList...
+#include "util/StringUtils.h"           // for StringUtils
+#include "util/i18n.h"                  // for _
+
+class GladeSearchpath;
+
+constexpr auto UI_FILE = "pageFormat.glade";
+constexpr auto UI_DIALOG_NAME = "pageFormatDialog";
+
+using namespace xoj::popup;
+using xoj::util::GtkPaperSizeUPtr;
+
+FormatDialog::FormatDialog(GladeSearchpath* gladeSearchPath, Settings* settings, double width, double height,
+                           std::function<void(double, double)> callback):
+        settings(settings),
+        selectedScale(settings->getSizeUnitIndex()),
+        scale(XOJ_UNITS[selectedScale].scale),
+        origWidth(width),
+        origHeight(height),
+        callbackFun(callback) {
+
+    Builder builder(gladeSearchPath, UI_FILE);
+    window.reset(GTK_WINDOW(builder.get(UI_DIALOG_NAME)));
+
+    paperTemplatesCombo = GTK_COMBO_BOX(builder.get("cbTemplate"));
+    landscapeButton = GTK_TOGGLE_BUTTON(builder.get("btLandscape"));
+    portraitButton = GTK_TOGGLE_BUTTON(builder.get("btPortrait"));
+    widthSpin = GTK_SPIN_BUTTON(builder.get("spinWidth"));
+    heightSpin = GTK_SPIN_BUTTON(builder.get("spinHeight"));
+
+    GtkWidget* cbUnit = builder.get("cbUnit");
+
+    for (int i = 0; i < XOJ_UNIT_COUNT; i++) {
+        gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(cbUnit), XOJ_UNITS[i].name);
+    }
+    gtk_combo_box_set_active(GTK_COMBO_BOX(cbUnit), this->selectedScale);
+
+
+    PaperFormatUtils::loadDefaultPaperSizes(paperSizes);
+    paperSizes.emplace_back(_("Custom"));
+    PaperFormatUtils::fillPaperFormatDropDown(paperSizes, paperTemplatesCombo);
+    paperSizes.pop_back();  // Remove the custom option to prevent it from being matched in the
+                            // spinValueChangedCb function, as its presence would lead to errors
+
+    reset(this);
+
+    g_signal_connect(landscapeButton, "toggled", G_CALLBACK(landscapeSelectedCb), this);
+    g_signal_connect(portraitButton, "toggled", G_CALLBACK(portraitSelectedCb), this);
+    g_signal_connect(paperTemplatesCombo, "changed", G_CALLBACK(cbFormatChangedCb), this);
+    g_signal_connect(cbUnit, "changed", G_CALLBACK(cbUnitChanged), this);
+
+    g_signal_connect_swapped(widthSpin, "value-changed", G_CALLBACK(spinValueChangedCb), this);
+    g_signal_connect_swapped(heightSpin, "value-changed", G_CALLBACK(spinValueChangedCb), this);
+
+    g_signal_connect_swapped(builder.get("btReset"), "clicked", G_CALLBACK(reset), this);
+
+    g_signal_connect_swapped(builder.get("btCancel"), "clicked", G_CALLBACK(gtk_window_close), this->window.get());
+    g_signal_connect_swapped(builder.get("btOk"), "clicked", G_CALLBACK(+[](FormatDialog* self) {
+                                 self->settings->setSizeUnitIndex(self->selectedScale);
+                                 self->callbackFun(gtk_spin_button_get_value(self->widthSpin) * self->scale,
+                                                   gtk_spin_button_get_value(self->heightSpin) * self->scale);
+                                 gtk_window_close(self->window.get());
+                             }),
+                             this);
+}
+
+void FormatDialog::setOrientation(Orientation orientation) {
+    if (this->orientation == orientation) {
+        return;
+    }
+    this->orientation = orientation;
+
+    gtk_toggle_button_set_active(portraitButton, orientation == ORIENTATION_PORTRAIT);
+    gtk_toggle_button_set_active(landscapeButton, orientation == ORIENTATION_LANDSCAPE);
+}
+
+void FormatDialog::spinValueChangedCb(FormatDialog* dlg) {
+    if (dlg->ignoreSpinChange) {
+        return;
+    }
+
+    double width = gtk_spin_button_get_value(dlg->widthSpin) * dlg->scale;
+    double height = gtk_spin_button_get_value(dlg->heightSpin) * dlg->scale;
+
+    if (width < height) {
+        dlg->setOrientation(ORIENTATION_PORTRAIT);
+    } else if (width > height) {
+        dlg->setOrientation(ORIENTATION_LANDSCAPE);
+    } else {
+        dlg->setOrientation(ORIENTATION_NOT_DEFINED);
+    }
+
+    int i = 0;
+    for (auto& size: dlg->paperSizes) {
+        xoj_assert(std::holds_alternative<GtkPaperSizeUPtr>(size));
+        double w = gtk_paper_size_get_width(std::get<GtkPaperSizeUPtr>(size).get(), GTK_UNIT_POINTS);
+        double h = gtk_paper_size_get_height(std::get<GtkPaperSizeUPtr>(size).get(), GTK_UNIT_POINTS);
+
+        if ((static_cast<int>(w - width) == 0 && static_cast<int>(h - height) == 0) ||
+            (static_cast<int>(h - width) == 0 && static_cast<int>(w - height) == 0)) {
+            break;
+        }
+        i++;
+    }
+
+    gtk_combo_box_set_active(dlg->paperTemplatesCombo, i);
+}
+
+void FormatDialog::cbUnitChanged(GtkComboBox* widget, FormatDialog* dlg) {
+    int selectd = gtk_combo_box_get_active(widget);
+    if (dlg->selectedScale == selectd) {
+        return;
+    }
+
+    double width = gtk_spin_button_get_value(dlg->widthSpin) * dlg->scale;
+    double height = gtk_spin_button_get_value(dlg->heightSpin) * dlg->scale;
+
+    dlg->selectedScale = selectd;
+    dlg->scale = XOJ_UNITS[dlg->selectedScale].scale;
+
+    dlg->setSpinValues(width / dlg->scale, height / dlg->scale);
+}
+
+void FormatDialog::cbFormatChangedCb(GtkComboBox* widget, FormatDialog* dlg) {
+    GtkTreeIter iter;
+
+    if (!gtk_combo_box_get_active_iter(widget, &iter)) {
+        return;
+    }
+    GtkTreeModel* model = gtk_combo_box_get_model(widget);
+
+    GValue value = {0};
+    gtk_tree_model_get_value(model, &iter, 1, &value);
+
+    if (!G_VALUE_HOLDS_POINTER(&value)) {
+        return;
+    }
+    auto* s = static_cast<GtkPaperSize*>(g_value_get_pointer(&value));
+
+    if (s == nullptr) {
+        return;
+    }
+
+    double width = gtk_paper_size_get_width(s, GTK_UNIT_POINTS) / dlg->scale;
+    double height = gtk_paper_size_get_height(s, GTK_UNIT_POINTS) / dlg->scale;
+
+    if (dlg->orientation == ORIENTATION_LANDSCAPE) {
+        if (width < height) {
+            std::swap(width, height);
+        }
+    } else {
+        if (width > height) {
+            std::swap(width, height);
+        }
+
+        dlg->setOrientation(ORIENTATION_PORTRAIT);
+    }
+
+    dlg->setSpinValues(width, height);
+}
+
+void FormatDialog::portraitSelectedCb(GtkToggleButton* bt, FormatDialog* dlg) {
+    bool activated = gtk_toggle_button_get_active(bt);
+
+    if (activated) {
+        gtk_toggle_button_set_active(dlg->landscapeButton, false);
+        dlg->orientation = ORIENTATION_PORTRAIT;
+
+        double width = gtk_spin_button_get_value(dlg->widthSpin);
+        double height = gtk_spin_button_get_value(dlg->heightSpin);
+
+        if (width > height) {
+            // Exchange width and height
+            dlg->setSpinValues(height, width);
+        }
+    }
+}
+
+void FormatDialog::landscapeSelectedCb(GtkToggleButton* bt, FormatDialog* dlg) {
+    bool activated = gtk_toggle_button_get_active(bt);
+
+    if (activated) {
+        gtk_toggle_button_set_active(dlg->portraitButton, false);
+        dlg->orientation = ORIENTATION_LANDSCAPE;
+
+        double width = gtk_spin_button_get_value(dlg->widthSpin);
+        double height = gtk_spin_button_get_value(dlg->heightSpin);
+
+        if (width < height) {
+            // Exchange width and height
+            dlg->setSpinValues(height, width);
+        }
+    }
+}
+
+void FormatDialog::reset(FormatDialog* self) {
+    self->setSpinValues(self->origWidth / self->scale, self->origHeight / self->scale);
+    spinValueChangedCb(self);
+}
+
+void FormatDialog::setSpinValues(double width, double height) {
+    ignoreSpinChange = true;
+    gtk_spin_button_set_value(widthSpin, width);
+    gtk_spin_button_set_value(heightSpin, height);
+    ignoreSpinChange = false;
+}
diff --git a/entry/src/main/cpp/src/core/gui/dialog/FormatDialog.h b/entry/src/main/cpp/src/core/gui/dialog/FormatDialog.h
new file mode 100644
index 0000000..44fe5ba
--- /dev/null
+++ b/entry/src/main/cpp/src/core/gui/dialog/FormatDialog.h
@@ -0,0 +1,72 @@
+/*
+ * Xournal++
+ *
+ * The page format dialog
+ *
+ * @author Xournal++ Team
+ * https://github.com/xournalpp/xournalpp
+ *
+ * @license GNU GPLv2 or later
+ */
+
+#pragma once
+
+#include <functional>
+#include <memory>  // for unique_ptr
+#include <vector>  // for vector
+
+#include <gtk/gtk.h>  // for gtk_paper_size_free, GtkComboBox, GtkToggl...
+
+#include "gui/Builder.h"
+#include "gui/PaperFormatUtils.h"  // for PaperFormatMenuOptionVector
+#include "util/raii/GtkWindowUPtr.h"
+
+class GladeSearchpath;
+class Settings;
+
+namespace xoj::popup {
+class FormatDialog {
+public:
+    FormatDialog(GladeSearchpath* gladeSearchPath, Settings* settings, double width, double height,
+                 std::function<void(double w, double h)> callback);
+
+    inline GtkWindow* getWindow() const { return window.get(); }
+
+private:
+    enum Orientation { ORIENTATION_NOT_DEFINED, ORIENTATION_LANDSCAPE, ORIENTATION_PORTRAIT };
+
+    void setOrientation(Orientation orientation);
+    void setSpinValues(double width, double heigth);
+
+    static void portraitSelectedCb(GtkToggleButton* bt, FormatDialog* dlg);
+    static void landscapeSelectedCb(GtkToggleButton* bt, FormatDialog* dlg);
+    static void cbFormatChangedCb(GtkComboBox* widget, FormatDialog* dlg);
+    static void cbUnitChanged(GtkComboBox* widget, FormatDialog* dlg);
+    static void spinValueChangedCb(FormatDialog* dlg);
+    static void reset(FormatDialog* self);
+
+private:
+    Settings* settings = nullptr;
+
+    PaperFormatUtils::PaperFormatMenuOptionVector paperSizes;
+
+    Orientation orientation = ORIENTATION_NOT_DEFINED;
+    int selectedScale = 0;
+    double scale = 0;
+
+    double origWidth = 0;
+    double origHeight = 0;
+
+    bool ignoreSpinChange = false;
+
+
+    GtkComboBox* paperTemplatesCombo;
+    GtkSpinButton* widthSpin;
+    GtkSpinButton* heightSpin;
+    GtkToggleButton* landscapeButton;
+    GtkToggleButton* portraitButton;
+
+    xoj::util::GtkWindowUPtr window;
+    std::function<void(double w, double h)> callbackFun;
+};
+};  // namespace xoj::popup
diff --git a/entry/src/main/cpp/src/core/gui/dialog/GotoDialog.cpp b/entry/src/main/cpp/src/core/gui/dialog/GotoDialog.cpp
new file mode 100644
index 0000000..4b7da17
--- /dev/null
+++ b/entry/src/main/cpp/src/core/gui/dialog/GotoDialog.cpp
@@ -0,0 +1,34 @@
+#include "GotoDialog.h"
+
+#include <memory>  // for allocator
+
+#include "gui/Builder.h"
+
+
+class GladeSearchpath;
+
+constexpr auto UI_FILE = "goto.glade";
+constexpr auto UI_DIALOG_NAME = "gotoDialog";
+
+using namespace xoj::popup;
+
+GotoDialog::GotoDialog(GladeSearchpath* gladeSearchPath, size_t initialPage, size_t maxPage,
+                       std::function<void(size_t)> callback):
+        callback(callback) {
+    Builder builder(gladeSearchPath, UI_FILE);
+    this->window.reset(GTK_WINDOW(builder.get(UI_DIALOG_NAME)));
+    this->spinButton = GTK_SPIN_BUTTON(builder.get("spinPage"));
+    gtk_spin_button_set_range(this->spinButton, 1, static_cast<double>(maxPage));
+    gtk_spin_button_set_value(this->spinButton, static_cast<double>(initialPage + 1));
+    gtk_editable_select_region(GTK_EDITABLE(this->spinButton), 0, -1);  // Select the entire content
+
+    auto onSuccessCallback = G_CALLBACK(+[](GotoDialog* self) {
+        self->callback(static_cast<size_t>(gtk_spin_button_get_value(GTK_SPIN_BUTTON(self->spinButton))));
+        gtk_window_close(self->window.get());
+    });
+
+    g_signal_connect_swapped(builder.get("btCancel"), "clicked", G_CALLBACK(gtk_window_close), this->window.get());
+    g_signal_connect_swapped(builder.get("btOk"), "clicked", onSuccessCallback, this);
+}
+
+GotoDialog::~GotoDialog() = default;
diff --git a/entry/src/main/cpp/src/core/gui/dialog/GotoDialog.h b/entry/src/main/cpp/src/core/gui/dialog/GotoDialog.h
new file mode 100644
index 0000000..b984317
--- /dev/null
+++ b/entry/src/main/cpp/src/core/gui/dialog/GotoDialog.h
@@ -0,0 +1,38 @@
+/*
+ * Xournal++
+ *
+ * Goto-Page dialog
+ *
+ * @author Xournal++ Team
+ * https://github.com/xournalpp/xournalpp
+ *
+ * @license GNU GPLv2 or later
+ */
+
+#pragma once
+
+#include <functional>
+
+#include <gtk/gtk.h>
+
+#include "util/raii/GtkWindowUPtr.h"
+
+class GladeSearchpath;
+
+namespace xoj::popup {
+class GotoDialog {
+public:
+    GotoDialog(GladeSearchpath* gladeSearchPath, size_t initialPage, size_t maxPage,
+               std::function<void(size_t)> callback);
+    ~GotoDialog();
+
+public:
+    inline GtkWindow* getWindow() const { return window.get(); }
+
+private:
+    xoj::util::GtkWindowUPtr window;
+    GtkSpinButton* spinButton = nullptr;
+
+    std::function<void(size_t)> callback;
+};
+};  // namespace xoj::popup
diff --git a/entry/src/main/cpp/src/core/gui/dialog/IntEdLatexDialog.cpp b/entry/src/main/cpp/src/core/gui/dialog/IntEdLatexDialog.cpp
new file mode 100644
index 0000000..da170d3
--- /dev/null
+++ b/entry/src/main/cpp/src/core/gui/dialog/IntEdLatexDialog.cpp
@@ -0,0 +1,184 @@
+/*
+ * Xournal++
+ *
+ * Latex implementation
+ *
+ * @author W Brenna
+ * http://wbrenna.ca
+ *
+ * https://github.com/xournalpp/xournalpp
+ *
+ * @license GNU GPLv2 or later
+ */
+
+#include "IntEdLatexDialog.h"
+
+#include <sstream>  // for operator<<, basic_ostream
+#include <utility>  // for move
+
+#include <glib.h>              // for g_free, gpointer, guint
+#include <poppler-document.h>  // for poppler_document_get_n_p...
+#include <poppler-page.h>      // for poppler_page_get_size
+
+#include "AbstractLatexDialog.h"
+#include "config-features.h"
+
+#ifdef ENABLE_GTK_SOURCEVIEW
+#include <gtksourceview/gtksource.h>  // for GTK_SOURCE_VIEW, gtk_sou...
+#endif
+
+#include "control/LatexController.h"
+#include "control/settings/LatexSettings.h"  // for LatexSettings
+#include "gui/Builder.h"
+#include "model/Font.h"        // for XojFont
+#include "util/StringUtils.h"  // for replace_pair, StringUtils
+#include "util/raii/CStringWrapper.h"
+
+class GladeSearchpath;
+
+constexpr auto UI_FILE_NAME = "intEdTexDialog.glade";
+constexpr auto UI_DIALOG_ID = "intEdTexDialog";
+
+constexpr auto TEX_BOX_WIDGET_NAME = "texBox";
+
+IntEdLatexDialog::IntEdLatexDialog(GladeSearchpath* gladeSearchPath, std::unique_ptr<LatexController> ctrl):
+        AbstractLatexDialog(std::move(ctrl)), cssProvider(gtk_css_provider_new(), xoj::util::adopt) {
+
+    Builder builder(gladeSearchPath, UI_FILE_NAME);
+    window.reset(GTK_WINDOW(builder.get(UI_DIALOG_ID)));
+
+    populateStandardWidgetsFromBuilder(builder);
+
+#ifdef ENABLE_GTK_SOURCEVIEW
+    this->texBox = gtk_source_view_new();
+#else
+    this->texBox = gtk_text_view_new();
+#endif
+
+    gtk_widget_set_name(this->texBox, TEX_BOX_WIDGET_NAME);
+    gtk_text_view_set_editable(GTK_TEXT_VIEW(this->texBox), true);
+
+    this->textBuffer = gtk_text_view_get_buffer(GTK_TEXT_VIEW(this->texBox));
+    const auto& settings = texCtrl->settings;
+    if (texCtrl->initialTex.empty()) {
+        gtk_text_buffer_set_text(this->textBuffer, settings.defaultText.c_str(), -1);
+        // Preselect the default
+        GtkTextIter start, end;
+        gtk_text_buffer_get_bounds(this->textBuffer, &start, &end);
+        gtk_text_buffer_select_range(this->textBuffer, &start, &end);
+    } else {
+        gtk_text_buffer_set_text(this->textBuffer, texCtrl->initialTex.c_str(), -1);
+    }
+
+#if GTK_MAJOR_VERSION == 3
+    // Widgets are visible by default in gtk4
+    gtk_widget_show_all(GTK_WIDGET(texBox));
+#endif
+
+    gtk_scrolled_window_set_child(GTK_SCROLLED_WINDOW(builder.get("texBoxContainer")), this->texBox);
+
+
+#ifdef ENABLE_GTK_SOURCEVIEW
+    // We own neither the languageManager, the styleSchemeManager, nor the sourceLanguage.
+    // Do not attempt to free them.
+    GtkSourceStyleSchemeManager* styleSchemeManager = gtk_source_style_scheme_manager_get_default();
+    GtkSourceLanguageManager* lm = gtk_source_language_manager_get_default();
+
+    // Select the TeX highlighting scheme
+    GtkSourceLanguage* lang = gtk_source_language_manager_guess_language(lm, "file.tex", nullptr);
+    std::string styleSchemeId = settings.sourceViewThemeId;
+    GtkSourceStyleScheme* styleScheme =
+            gtk_source_style_scheme_manager_get_scheme(styleSchemeManager, styleSchemeId.c_str());
+
+    if (settings.sourceViewSyntaxHighlight) {
+        gtk_source_buffer_set_language(GTK_SOURCE_BUFFER(this->textBuffer), lang);
+    }
+
+    gtk_source_view_set_auto_indent(GTK_SOURCE_VIEW(this->texBox), settings.sourceViewAutoIndent);
+    gtk_source_view_set_indent_on_tab(GTK_SOURCE_VIEW(this->texBox), settings.sourceViewAutoIndent);
+
+    gtk_source_view_set_show_line_numbers(GTK_SOURCE_VIEW(this->texBox), settings.sourceViewShowLineNumbers);
+
+    if (styleScheme) {
+        gtk_source_buffer_set_style_scheme(GTK_SOURCE_BUFFER(this->textBuffer), styleScheme);
+    }
+#endif
+
+    // Enable/disable word-wrap.
+    GtkWrapMode texBoxWrapMode = GTK_WRAP_NONE;
+    if (settings.editorWordWrap) {
+        texBoxWrapMode = GTK_WRAP_WORD_CHAR;
+    }
+
+    gtk_text_view_set_wrap_mode(GTK_TEXT_VIEW(this->texBox), texBoxWrapMode);
+
+    std::stringstream texBoxCssBuilder;
+    if (settings.useCustomEditorFont) {
+        std::string fontName = settings.editorFont.getName();
+
+        // Escape "'" and "\" characters in the fontName
+        StringUtils::replaceAllChars(fontName, {replace_pair('\\', "\\\\")});
+        StringUtils::replaceAllChars(fontName, {replace_pair('\'', "\\'")});
+
+        texBoxCssBuilder << "#" << TEX_BOX_WIDGET_NAME << " {";
+        texBoxCssBuilder << "  font-size: " << settings.editorFont.getSize() << "pt;";
+        texBoxCssBuilder << "  font-family: '" << fontName << "';";
+        texBoxCssBuilder << " } ";
+
+        gtk_css_provider_load_from_data(this->cssProvider.get(), texBoxCssBuilder.str().c_str(), -1, nullptr);
+
+        // Apply the CSS to both the texBox and the drawing area.
+        gtk_style_context_add_provider(gtk_widget_get_style_context(GTK_WIDGET(this->previewDrawingArea)),
+                                       GTK_STYLE_PROVIDER(this->cssProvider.get()),
+                                       GTK_STYLE_PROVIDER_PRIORITY_APPLICATION);
+        gtk_style_context_add_provider(gtk_widget_get_style_context(GTK_WIDGET(this->texBox)),
+                                       GTK_STYLE_PROVIDER(this->cssProvider.get()),
+                                       GTK_STYLE_PROVIDER_PRIORITY_APPLICATION);
+    }
+
+    connectStandardSignals();
+
+    /*
+     * Connect handleTexChanged() to the text buffer containing the latex code, to trigger rebuilds upon code changes.
+     */
+    g_signal_connect(this->getTextBuffer(), "changed", G_CALLBACK(+[](GtkTextBuffer*, gpointer ctrl) {
+                         LatexController::handleTexChanged(static_cast<LatexController*>(ctrl));
+                     }),
+                     texCtrl.get());
+
+    g_signal_connect(this->getWindow(), "delete-event", G_CALLBACK(+[](GtkWidget*, GdkEvent*, gpointer d) -> gboolean {
+                         auto self = static_cast<IntEdLatexDialog*>(d);
+                         /**
+                          * dlg->getTextBuffer() may survive the dialog. When copying all of its content, the
+                          * clipboard owns a ref to the GtkTextBuffer. We must disconnect the signal to avoid
+                          * dereferencing `self` after its destruction
+                          */
+                         g_signal_handlers_disconnect_by_data(self->getTextBuffer(), self->texCtrl.get());
+                         return false;  // Let the callback from PopupWindowWrapper delete the dialog
+                     }),
+                     this);
+
+    g_signal_connect(this->getWindow(), "show", G_CALLBACK(+[](GtkWidget*, gpointer d) {
+                         auto texCtrl = static_cast<LatexController*>(d);
+                         if (!texCtrl->temporaryRender) {
+                             // Trigger an asynchronous compilation if we are not using a preexisting TexImage
+                             // Keep this after popup.show() so that if an error message is to be displayed (e.g.
+                             // missing Tex executable), it'll appear on top of the LatexDialog.
+                             LatexController::handleTexChanged(texCtrl);
+                         }
+                     }),
+                     texCtrl.get());
+}
+
+IntEdLatexDialog::~IntEdLatexDialog() = default;
+
+
+auto IntEdLatexDialog::getTextBuffer() -> GtkTextBuffer* { return this->textBuffer; }
+
+auto IntEdLatexDialog::getBufferContents() -> std::string {
+    GtkTextIter start, end;
+    gtk_text_buffer_get_bounds(this->textBuffer, &start, &end);
+    auto content =
+            xoj::util::OwnedCString::assumeOwnership(gtk_text_buffer_get_text(this->textBuffer, &start, &end, false));
+    return content.get();
+}
diff --git a/entry/src/main/cpp/src/core/gui/dialog/IntEdLatexDialog.h b/entry/src/main/cpp/src/core/gui/dialog/IntEdLatexDialog.h
new file mode 100644
index 0000000..d8fec4e
--- /dev/null
+++ b/entry/src/main/cpp/src/core/gui/dialog/IntEdLatexDialog.h
@@ -0,0 +1,55 @@
+/*
+ * Xournal++
+ *
+ * Latex dialog for the internal editor
+ *
+ * @author Xournal++ Team
+ * https://github.com/xournalpp/xournalpp
+ *
+ * @license GNU GPLv2 or later
+ */
+
+#pragma once
+
+#include <string>  // for string
+
+#include <cairo.h>               // for cairo_t
+#include <gtk/gtk.h>             // for GtkWidget, GtkTextBuffer, GtkWindow
+#include <gtk/gtkcssprovider.h>  // for GtkCssProvider
+#include <poppler.h>             // for PopplerDocument, PopplerPage
+
+#include "util/raii/GObjectSPtr.h"
+
+#include "AbstractLatexDialog.h"
+
+class LatexController;
+class LatexSettings;
+class GladeSearchpath;
+
+class IntEdLatexDialog final: public AbstractLatexDialog {
+public:
+    IntEdLatexDialog() = delete;
+    IntEdLatexDialog(const IntEdLatexDialog& other) = delete;
+    IntEdLatexDialog& operator=(const IntEdLatexDialog& other) = delete;
+    IntEdLatexDialog(GladeSearchpath* gladeSearchPath, std::unique_ptr<LatexController> texCtrl);
+    virtual ~IntEdLatexDialog();
+
+public:
+    // Necessary for the controller in order to connect the 'text-changed'
+    // signal handler
+    GtkTextBuffer* getTextBuffer();
+    std::string getBufferContents() override;
+
+private:
+    // Text field
+    xoj::util::GObjectSPtr<GtkCssProvider> cssProvider;  ///< For tex code display font and size
+    GtkWidget* texBox;
+    GtkTextBuffer* textBuffer;
+
+    /**
+     * The final LaTeX string to save once the dialog is closed.
+     */
+    std::string finalLatex;
+
+    std::function<void()> callback;
+};
diff --git a/entry/src/main/cpp/src/core/gui/dialog/LanguageConfigGui.cpp b/entry/src/main/cpp/src/core/gui/dialog/LanguageConfigGui.cpp
new file mode 100644
index 0000000..e08f905
--- /dev/null
+++ b/entry/src/main/cpp/src/core/gui/dialog/LanguageConfigGui.cpp
@@ -0,0 +1,88 @@
+#include "LanguageConfigGui.h"
+
+#include <algorithm>  // for find, lower_bound, sort
+#include <cstdlib>    // for setenv
+#include <memory>     // for allocator, __alloc_traits<>::...
+
+#include <glib-object.h>  // for G_TYPE_STRING
+#include <glib.h>         // for g_warning, gint
+
+#include "control/settings/Settings.h"  // for Settings
+#include "util/PathUtil.h"              // for getGettextFilepath, getLocale...
+#include "util/StringUtils.h"           // for StringUtils
+#include "util/XojMsgBox.h"             // for XojMsgBox
+#include "util/i18n.h"                  // for _
+#include "util/safe_casts.h"            // for as_unsigned
+
+#include "config.h"      // for GETTEXT_PACKAGE
+#include "filesystem.h"  // for directory_iterator, operator/
+
+LanguageConfigGui::LanguageConfigGui(GtkBox* parent, Settings* settings):
+        comboBox(gtk_combo_box_text_new(), xoj::util::adopt), settings(settings) {
+    gtk_box_append(parent, comboBox.get());
+#if GTK_MAJOR_VERSION == 3
+    gtk_widget_show_all(comboBox.get());
+#endif
+
+    // Fetch available locales
+    try {
+        fs::path baseLocaleDir = Util::getGettextFilepath(Util::getLocalePath());
+        for (auto const& d: fs::directory_iterator(baseLocaleDir)) {
+            if (auto mofile = (d.path() / "LC_MESSAGES" / GETTEXT_PACKAGE) += ".mo"; fs::exists(mofile)) {
+                auto u8path = d.path().filename().u8string();
+                auto casted = char_cast(u8path);
+                availableLocales.emplace_back(casted.begin(), casted.end());
+            }
+        }
+    } catch (const fs::filesystem_error& e) {
+        g_warning("Failed to fetch available locales:\n%s", e.what());
+    }
+    std::sort(availableLocales.begin(), availableLocales.end());
+
+    // No pot file for English
+    if (auto enPos = std::lower_bound(availableLocales.begin(), availableLocales.end(), "en");
+        enPos != availableLocales.end() && !StringUtils::startsWith(*enPos, "en")) {
+        availableLocales.insert(enPos, "en");
+    }
+
+    // Default
+    availableLocales.insert(availableLocales.begin(), _("System Default"));
+
+    auto gtkAvailableLocales = gtk_list_store_new(1, G_TYPE_STRING);
+    for (auto const& i: availableLocales) {
+        GtkTreeIter iter;
+        gtk_list_store_append(gtkAvailableLocales, &iter);
+        gtk_list_store_set(gtkAvailableLocales, &iter, 0, i.c_str(), -1);
+    }
+    gtk_combo_box_set_model(GTK_COMBO_BOX(comboBox.get()), GTK_TREE_MODEL(gtkAvailableLocales));
+
+
+    // Set the current locale if previously selected
+    auto prefPos = [&]() {
+        if (auto preferred = settings->getPreferredLocale(); !preferred.empty()) {
+            if (auto &&endi = availableLocales.end(), prefPos = std::find(availableLocales.begin(), endi, preferred);
+                prefPos != endi) {
+                return prefPos;
+            }
+            XojMsgBox::showErrorToUser(nullptr, _("Previously selected language not available anymore!"));
+        }
+        // Use system default
+        return availableLocales.begin();
+    }();
+    gtk_combo_box_set_active(GTK_COMBO_BOX(comboBox.get()),
+                             static_cast<gint>(std::distance(availableLocales.begin(), prefPos)));
+}
+
+
+void LanguageConfigGui::saveSettings() {
+    gint pos = gtk_combo_box_get_active(GTK_COMBO_BOX(comboBox.get()));
+    auto pref = (pos == 0) ? "" : availableLocales[as_unsigned(pos)];
+
+    settings->setPreferredLocale(pref);
+    settings->customSettingsChanged();
+#ifdef _WIN32
+    _putenv_s("LANGUAGE", this->settings->getPreferredLocale().c_str());
+#else
+    setenv("LANGUAGE", this->settings->getPreferredLocale().c_str(), 1);
+#endif
+}
diff --git a/entry/src/main/cpp/src/core/gui/dialog/LanguageConfigGui.h b/entry/src/main/cpp/src/core/gui/dialog/LanguageConfigGui.h
new file mode 100644
index 0000000..4d12b22
--- /dev/null
+++ b/entry/src/main/cpp/src/core/gui/dialog/LanguageConfigGui.h
@@ -0,0 +1,37 @@
+/*
+ * Xournal++
+ *
+ * The configuration for a language in the Settings Dialog
+ *
+ * @author Xournal++ Team
+ * https://github.com/xournalpp/xournalpp
+ *
+ * @license GNU GPLv2 or later
+ */
+
+#pragma once
+
+#include <string>  // for string, basic_string
+#include <vector>  // for vector
+
+#include <gtk/gtk.h>  // for GtkWidget, GtkBox
+
+#include "util/raii/GObjectSPtr.h"
+
+class Settings;
+class GladeSearchpath;
+
+class LanguageConfigGui {
+public:
+    LanguageConfigGui(GtkBox* parent, Settings* settings);
+
+public:
+    void saveSettings();
+
+private:
+    std::vector<std::string> availableLocales;
+
+    xoj::util::WidgetSPtr comboBox;
+
+    Settings* settings;
+};
diff --git a/entry/src/main/cpp/src/core/gui/dialog/LatexSettingsPanel.cpp b/entry/src/main/cpp/src/core/gui/dialog/LatexSettingsPanel.cpp
new file mode 100644
index 0000000..4cea5d3
--- /dev/null
+++ b/entry/src/main/cpp/src/core/gui/dialog/LatexSettingsPanel.cpp
@@ -0,0 +1,205 @@
+#include "LatexSettingsPanel.h"
+
+#include <fstream>   // for ifstream, basic_istream
+#include <iterator>  // for istreambuf_iterator, ope...
+#include <string>    // for allocator, string
+#include <variant>   // for get_if
+
+#include <gio/gio.h>      // for GSubprocess, g_subproces...
+#include <glib-object.h>  // for g_object_unref, g_object...
+#include <glib.h>         // for g_error_free, GError
+
+#include "config-features.h"  // for ENABLE_GTK_SOURCEVIEW
+#ifdef ENABLE_GTK_SOURCEVIEW
+#include <gtksourceview/gtksource.h>  // for gtk_source_style_scheme_...
+#endif
+
+#include "control/latex/LatexGenerator.h"    // for LatexGenerator::GenError
+#include "control/settings/LatexSettings.h"  // for LatexSettings
+#include "gui/Builder.h"
+#include "model/Font.h"              // for XojFont
+#include "util/Color.h"              // for Color
+#include "util/PathUtil.h"           // for fromGFile, getTmpDir...
+#include "util/PlaceholderString.h"  // for PlaceholderString
+#include "util/XojMsgBox.h"
+#include "util/gtk4_helper.h"
+#include "util/i18n.h"  // for FS, _F, _
+#include "util/raii/CStringWrapper.h"
+
+#include "filesystem.h"  // for path, is_regular_file
+
+class GladeSearchpath;
+
+constexpr auto UI_FILE = "latexSettings.glade";
+constexpr auto UI_PANEL_NAME = "latexSettingsPanel";
+
+LatexSettingsPanel::LatexSettingsPanel(GladeSearchpath* gladeSearchPath):
+        builder(gladeSearchPath, UI_FILE),
+        panel(GTK_SCROLLED_WINDOW(builder.get(UI_PANEL_NAME))),
+        cbAutoDepCheck(GTK_CHECK_BUTTON(builder.get("latexSettingsRunCheck"))),
+        // Todo(gtk4): replace this GtkFileChooserButton (by what?)
+        globalTemplateChooser(GTK_FILE_CHOOSER(builder.get("latexSettingsTemplateFile"))),
+        cbUseSystemFont(GTK_CHECK_BUTTON(builder.get("cbUseSystemFont"))) {
+
+    g_signal_connect_swapped(builder.get("latexSettingsTestBtn"), "clicked",
+                             G_CALLBACK(+[](LatexSettingsPanel* self) { self->checkDeps(); }), this);
+    g_signal_connect_swapped(this->cbUseSystemFont, "toggled",
+                             G_CALLBACK(+[](LatexSettingsPanel* self) { self->updateWidgetSensitivity(); }), this);
+    g_signal_connect_swapped(builder.get("cbUseExternalEditor"), "toggled",
+                             G_CALLBACK(+[](LatexSettingsPanel* self) { self->updateWidgetSensitivity(); }), this);
+
+#ifdef ENABLE_GTK_SOURCEVIEW
+    GtkBox* themeSelectionBox = GTK_BOX(builder.get("bxThemeSelectionContainer"));
+    this->sourceViewThemeSelector = gtk_source_style_scheme_chooser_button_new();
+    gtk_box_append(themeSelectionBox, sourceViewThemeSelector);
+
+    gtk_label_set_text(GTK_LABEL(builder.get("lbSourceviewSettingsDescription")), _("LaTeX editor theme:"));
+
+#if GTK_MAJOR_VERSION == 3
+    // Widgets are visible by default in gtk4
+    gtk_widget_show(sourceViewThemeSelector);
+#endif
+#else
+    this->sourceViewThemeSelector = nullptr;
+
+    gtk_label_set_text(GTK_LABEL(builder.get("lbSourceviewSettingsDescription")),
+                       _("GtkSourceView was disabled when building Xournal++! "
+                         "Some options will not be available."));
+#endif
+}
+
+void LatexSettingsPanel::load(const LatexSettings& settings) {
+    gtk_check_button_set_active(this->cbAutoDepCheck, settings.autoCheckDependencies);
+    gtk_editable_set_text(GTK_EDITABLE(builder.get("latexDefaultEntry")), settings.defaultText.c_str());
+    if (!settings.globalTemplatePath.empty()) {
+        gtk_file_chooser_set_file(this->globalTemplateChooser, Util::toGFile(settings.globalTemplatePath).get(),
+                                  nullptr);
+    }
+    gtk_editable_set_text(GTK_EDITABLE(builder.get("latexSettingsGenCmd")), settings.genCmd.c_str());
+
+
+#ifdef ENABLE_GTK_SOURCEVIEW
+    std::string themeId = settings.sourceViewThemeId;
+    GtkSourceStyleSchemeManager* themeManager = gtk_source_style_scheme_manager_get_default();
+    GtkSourceStyleScheme* theme = gtk_source_style_scheme_manager_get_scheme(themeManager, themeId.c_str());
+
+    if (theme) {
+        gtk_source_style_scheme_chooser_set_style_scheme(GTK_SOURCE_STYLE_SCHEME_CHOOSER(this->sourceViewThemeSelector),
+                                                         theme);
+    }
+#endif
+
+    gtk_check_button_set_active(GTK_CHECK_BUTTON(builder.get("cbShowLineNumbers")), settings.sourceViewShowLineNumbers);
+    gtk_check_button_set_active(GTK_CHECK_BUTTON(builder.get("cbAutoIndent")), settings.sourceViewAutoIndent);
+    gtk_check_button_set_active(GTK_CHECK_BUTTON(builder.get("cbSyntaxHighlight")), settings.sourceViewSyntaxHighlight);
+
+    // Editor font
+    std::string editorFontDescription{settings.editorFont.asString()};
+    gtk_font_chooser_set_font(GTK_FONT_CHOOSER(builder.get("selBtnEditorFont")), editorFontDescription.c_str());
+
+    // Should we use the custom editor font?
+    gtk_check_button_set_active(this->cbUseSystemFont, !settings.useCustomEditorFont);
+
+    // Editor word wrap.
+    gtk_check_button_set_active(GTK_CHECK_BUTTON(builder.get("cbWordWrap")), settings.editorWordWrap);
+
+    // External editor
+    gtk_check_button_set_active(GTK_CHECK_BUTTON(builder.get("cbUseExternalEditor")), settings.useExternalEditor);
+    gtk_check_button_set_active(GTK_CHECK_BUTTON(builder.get("cbExternalEditorAutoConfirm")),
+                                settings.externalEditorAutoConfirm);
+    gtk_editable_set_text(GTK_EDITABLE(builder.get("latexExternalEditorCmd")), settings.externalEditorCmd.c_str());
+    gtk_editable_set_text(GTK_EDITABLE(builder.get("latexTemporaryFileExt")), settings.temporaryFileExt.c_str());
+
+    this->updateWidgetSensitivity();
+}
+
+void LatexSettingsPanel::save(LatexSettings& settings) {
+    settings.autoCheckDependencies = gtk_check_button_get_active(this->cbAutoDepCheck);
+    settings.defaultText = gtk_editable_get_text(GTK_EDITABLE(builder.get("latexDefaultEntry")));
+    settings.globalTemplatePath = Util::fromGFile(
+            xoj::util::GObjectSPtr<GFile>(gtk_file_chooser_get_file(this->globalTemplateChooser), xoj::util::adopt)
+                    .get());
+    settings.genCmd = gtk_editable_get_text(GTK_EDITABLE(builder.get("latexSettingsGenCmd")));
+
+#ifdef ENABLE_GTK_SOURCEVIEW
+    GtkSourceStyleScheme* theme = gtk_source_style_scheme_chooser_get_style_scheme(
+            GTK_SOURCE_STYLE_SCHEME_CHOOSER(this->sourceViewThemeSelector));
+    settings.sourceViewThemeId = gtk_source_style_scheme_get_id(theme);
+#endif
+
+    settings.sourceViewShowLineNumbers =
+            gtk_check_button_get_active(GTK_CHECK_BUTTON(builder.get("cbShowLineNumbers")));
+    settings.sourceViewAutoIndent = gtk_check_button_get_active(GTK_CHECK_BUTTON(builder.get("cbAutoIndent")));
+    settings.sourceViewSyntaxHighlight =
+            gtk_check_button_get_active(GTK_CHECK_BUTTON(builder.get("cbSyntaxHighlight")));
+
+    GtkFontChooser* fontSelector = GTK_FONT_CHOOSER(builder.get("selBtnEditorFont"));
+    settings.editorFont = xoj::util::OwnedCString::assumeOwnership(gtk_font_chooser_get_font(fontSelector)).get();
+    settings.useCustomEditorFont = !gtk_check_button_get_active(this->cbUseSystemFont);
+    settings.editorWordWrap = gtk_check_button_get_active(GTK_CHECK_BUTTON(builder.get("cbWordWrap")));
+
+    settings.useExternalEditor = gtk_check_button_get_active(GTK_CHECK_BUTTON(builder.get("cbUseExternalEditor")));
+    settings.externalEditorAutoConfirm =
+            gtk_check_button_get_active(GTK_CHECK_BUTTON(builder.get("cbExternalEditorAutoConfirm")));
+    settings.externalEditorCmd = gtk_editable_get_text(GTK_EDITABLE(builder.get("latexExternalEditorCmd")));
+    settings.temporaryFileExt = gtk_editable_get_text(GTK_EDITABLE(builder.get("latexTemporaryFileExt")));
+}
+
+void LatexSettingsPanel::checkDeps() {
+    LatexSettings settings;
+    this->save(settings);
+    std::string msg;
+    bool fail = false;
+
+    if (fs::is_regular_file(settings.globalTemplatePath)) {
+        // Assume the file is encoded as UTF-8 (open in binary mode to avoid surprises)
+        std::ifstream is(settings.globalTemplatePath, std::ios_base::binary);
+        if (!is.is_open()) {
+            msg = FS(_F("Unable to open global template file at {1}. Does it exist?") %
+                     settings.globalTemplatePath.u8string());
+            fail = true;
+        } else {
+            std::string templ(std::istreambuf_iterator<char>(is), {});
+            std::string sample = LatexGenerator::templateSub(settings.defaultText, templ, Colors::black);
+            auto const& tmpDir = Util::getTmpDirSubfolder("tex");
+            auto result = LatexGenerator(settings).asyncRun(tmpDir, sample);
+            if (auto* proc = std::get_if<GSubprocess*>(&result)) {
+                GError* err = nullptr;
+                if (g_subprocess_wait_check(*proc, nullptr, &err)) {
+                    msg = _("Sample LaTeX file generated successfully.");
+                } else {
+                    msg = FS(_F("Error: {1}. Please check the contents of {2}") % err->message % tmpDir.u8string());
+                    g_error_free(err);
+                    fail = true;
+                }
+                g_object_unref(*proc);
+            } else if (auto* err = std::get_if<LatexGenerator::GenError>(&result)) {
+                msg = err->message;
+                fail = true;
+            }
+        }
+    } else {
+        msg = FS(_F("Error: {1} is not a regular file. Please check your LaTeX template file settings. ") %
+                 settings.globalTemplatePath.u8string());
+        fail = true;
+    }
+
+    GtkWindow* win = GTK_WINDOW(gtk_widget_get_toplevel(GTK_WIDGET(panel)));
+    XojMsgBox::showMessageToUser(win, msg, fail ? GTK_MESSAGE_ERROR : GTK_MESSAGE_INFO);
+}
+
+void LatexSettingsPanel::updateWidgetSensitivity() {
+    bool useSystemFont = gtk_check_button_get_active(this->cbUseSystemFont);
+
+    // Only select a custom font if we're not using the system's.
+    gtk_widget_set_sensitive(builder.get("boxCustomFontOptions"), !useSystemFont);
+
+#ifndef ENABLE_GTK_SOURCEVIEW
+    gtk_widget_set_sensitive(builder.get("bxGtkSourceviewSettings"), false);
+#endif
+
+    auto useExternalEditor = gtk_check_button_get_active(GTK_CHECK_BUTTON(builder.get("cbUseExternalEditor")));
+    gtk_widget_set_sensitive(builder.get("cbExternalEditorAutoConfirm"), useExternalEditor);
+    gtk_widget_set_sensitive(builder.get("latexExternalEditorCmd"), useExternalEditor);
+    gtk_widget_set_sensitive(builder.get("latexTemporaryFileExt"), useExternalEditor);
+}
diff --git a/entry/src/main/cpp/src/core/gui/dialog/LatexSettingsPanel.h b/entry/src/main/cpp/src/core/gui/dialog/LatexSettingsPanel.h
new file mode 100644
index 0000000..61c32bb
--- /dev/null
+++ b/entry/src/main/cpp/src/core/gui/dialog/LatexSettingsPanel.h
@@ -0,0 +1,50 @@
+/*
+ * Xournal++
+ *
+ * Latex settings panel
+ *
+ * @author Xournal++ Team
+ * https://github.com/xournalpp/xournalpp
+ *
+ * @license GNU GPLv2 or later
+ */
+
+#pragma once
+
+#include <gtk/gtk.h>  // for GtkToggleButton, GtkFileChooser, GtkWidget
+
+#include "gui/Builder.h"
+
+class GladeSearchpath;
+class LatexSettings;
+
+class LatexSettingsPanel {
+public:
+    explicit LatexSettingsPanel(GladeSearchpath*);
+    LatexSettingsPanel(const LatexSettingsPanel&) = delete;
+    LatexSettingsPanel& operator=(const LatexSettingsPanel&) = delete;
+    LatexSettingsPanel(const LatexSettingsPanel&&) = delete;
+    LatexSettingsPanel& operator=(const LatexSettingsPanel&&) = delete;
+
+    void load(const LatexSettings& settings);
+    void save(LatexSettings& settings);
+
+    inline GtkWidget* getPanel() const { return GTK_WIDGET(panel); }
+
+private:
+    void checkDeps();
+
+    /**
+     * @brief Update whether options accept input ("grayed-out" or not)
+     *    based on the current panel state.
+     */
+    void updateWidgetSensitivity();
+
+    Builder builder;
+    GtkScrolledWindow* panel;
+
+    GtkCheckButton* cbAutoDepCheck;
+    GtkFileChooser* globalTemplateChooser;
+    GtkWidget* sourceViewThemeSelector;
+    GtkCheckButton* cbUseSystemFont;
+};
diff --git a/entry/src/main/cpp/src/core/gui/dialog/PageTemplateDialog.cpp b/entry/src/main/cpp/src/core/gui/dialog/PageTemplateDialog.cpp
new file mode 100644
index 0000000..eedad86
--- /dev/null
+++ b/entry/src/main/cpp/src/core/gui/dialog/PageTemplateDialog.cpp
@@ -0,0 +1,224 @@
+#include "PageTemplateDialog.h"
+
+#include <cstdio>    // for sprintf
+#include <ctime>     // for localtime, strftime, time
+#include <fstream>   // for ofstream, basic_ostream
+#include <memory>    // for allocator, unique_ptr
+#include <optional>  // for optional
+#include <string>    // for string, operator<<
+
+#include <gdk/gdk.h>      // for GdkRGBA
+#include <glib-object.h>  // for G_CALLBACK, g_signal_c...
+
+#include "control/pagetype/PageTypeHandler.h"  // for PageTypeInfo, PageType...
+#include "control/settings/Settings.h"         // for Settings
+#include "gui/Builder.h"                       // for Builder
+#include "gui/dialog/XojOpenDlg.h"             // for XojOpenDlg
+#include "gui/menus/popoverMenus/PageTypeSelectionPopoverGridOnly.h"
+#include "gui/toolbarMenubar/ToolMenuHandler.h"
+#include "model/FormatDefinitions.h"  // for FormatUnits, XOJ_UNITS
+#include "model/PageType.h"           // for PageType
+#include "util/Color.h"               // for GdkRGBA_to_argb, rgb_t...
+#include "util/PathUtil.h"            // for fromGFile, readString
+#include "util/PopupWindowWrapper.h"  // for PopupWindowWrapper
+#include "util/XojMsgBox.h"           // for XojMsgBox
+#include "util/i18n.h"                // for _
+#include "util/serdesstream.h"        // for serdes_stream
+
+#include "FormatDialog.h"  // for FormatDialog
+#include "filesystem.h"    // for path
+
+class GladeSearchpath;
+
+constexpr auto UI_FILE = "pageTemplate.glade";
+constexpr auto UI_DIALOG_NAME = "templateDialog";
+
+using namespace xoj::popup;
+
+PageTemplateDialog::PageTemplateDialog(GladeSearchpath* gladeSearchPath, Settings* settings, ToolMenuHandler* toolmenu,
+                                       PageTypeHandler* types):
+        gladeSearchPath(gladeSearchPath), settings(settings), toolMenuHandler(toolmenu), types(types) {
+    model.parse(settings->getPageTemplate());
+
+    Builder builder(gladeSearchPath, UI_FILE);
+    window.reset(GTK_WINDOW(builder.get(UI_DIALOG_NAME)));
+
+    // Needs to be initialized after this->window
+    pageTypeSelectionMenu = std::make_unique<PageTypeSelectionPopoverGridOnly>(types, settings, this);
+    gtk_menu_button_set_popup(GTK_MENU_BUTTON(builder.get("btBackgroundDropdown")),
+                              pageTypeSelectionMenu->getPopover());
+
+    pageSizeLabel = GTK_LABEL(builder.get("lbPageSize"));
+    backgroundTypeLabel = GTK_LABEL(builder.get("lbBackgroundType"));
+    backgroundColorChooser = GTK_COLOR_CHOOSER(builder.get("cbBackgroundButton"));
+    copyLastPageButton = GTK_TOGGLE_BUTTON(builder.get("cbCopyLastPage"));
+    copyLastPageSizeButton = GTK_TOGGLE_BUTTON(builder.get("cbCopyLastPageSize"));
+
+
+    g_signal_connect_swapped(builder.get("btChangePaperSize"), "clicked",
+                             G_CALLBACK(+[](PageTemplateDialog* self) { self->showPageSizeDialog(); }), this);
+
+    g_signal_connect_swapped(builder.get("btLoad"), "clicked",
+                             G_CALLBACK(+[](PageTemplateDialog* self) { self->loadFromFile(); }), this);
+
+    g_signal_connect_swapped(builder.get("btSave"), "clicked",
+                             G_CALLBACK(+[](PageTemplateDialog* self) { self->saveToFile(); }), this);
+
+    g_signal_connect_swapped(builder.get("btCancel"), "clicked", G_CALLBACK(gtk_window_close), this->getWindow());
+    g_signal_connect_swapped(builder.get("btOk"), "clicked", G_CALLBACK(+[](PageTemplateDialog* self) {
+                                 self->saveToModel();
+                                 self->settings->setPageTemplate(self->model.toString());
+                                 self->toolMenuHandler->setDefaultNewPageType(self->model.getPageInsertType());
+                                 self->toolMenuHandler->setDefaultNewPaperSize(
+                                         self->model.isCopyLastPageSize() ? std::nullopt :
+                                                                            std::optional(PaperSize(self->model)));
+                                 gtk_window_close(self->getWindow());
+                             }),
+                             this);
+
+    updateDataFromModel();
+}
+
+PageTemplateDialog::~PageTemplateDialog() = default;
+
+void PageTemplateDialog::updateDataFromModel() {
+    GdkRGBA color = Util::rgb_to_GdkRGBA(model.getBackgroundColor());
+    gtk_color_chooser_set_rgba(backgroundColorChooser, &color);
+
+    updatePageSize();
+
+    pageTypeSelectionMenu->setSelectedPT(model.getBackgroundType());
+    changeCurrentPageBackground(types->getInfoOn(model.getBackgroundType()));
+
+    gtk_toggle_button_set_active(copyLastPageButton, model.isCopyLastPageSettings());
+    gtk_toggle_button_set_active(copyLastPageSizeButton, model.isCopyLastPageSize());
+}
+
+void PageTemplateDialog::changeCurrentPageBackground(const PageTypeInfo* info) {
+    model.setBackgroundType(info->page);
+
+    gtk_label_set_text(backgroundTypeLabel, info->name.c_str());
+}
+
+void PageTemplateDialog::saveToModel() {
+    model.setCopyLastPageSettings(gtk_toggle_button_get_active(copyLastPageButton));
+    model.setCopyLastPageSize(gtk_toggle_button_get_active(copyLastPageSizeButton));
+
+    GdkRGBA color;
+    gtk_color_chooser_get_rgba(backgroundColorChooser, &color);
+    model.setBackgroundColor(Util::GdkRGBA_to_argb(color));
+}
+
+void PageTemplateDialog::saveToFile() {
+    saveToModel();
+
+    GtkWidget* dialog =
+            gtk_file_chooser_dialog_new(_("Save File"), this->getWindow(), GTK_FILE_CHOOSER_ACTION_SAVE, _("_Cancel"),
+                                        GTK_RESPONSE_CANCEL, _("_Save"), GTK_RESPONSE_OK, nullptr);
+
+    GtkFileFilter* filterXoj = gtk_file_filter_new();
+    gtk_file_filter_set_name(filterXoj, _("Xournal++ template"));
+    gtk_file_filter_add_mime_type(filterXoj, "application/x-xopt");
+    gtk_file_chooser_add_filter(GTK_FILE_CHOOSER(dialog), filterXoj);
+
+    if (!settings->getLastSavePath().empty()) {
+        gtk_file_chooser_set_current_folder(GTK_FILE_CHOOSER(dialog), Util::toGFile(settings->getLastSavePath()).get(),
+                                            nullptr);
+    }
+
+    time_t curtime = time(nullptr);
+    char stime[128];
+    strftime(stime, sizeof(stime), "%F-Template-%H-%M.xopt", localtime(&curtime));
+    fs::path saveFilename = stime;  // There may be an issue here, if the C and C++ locales do not use the same encoding
+
+    gtk_file_chooser_set_current_name(GTK_FILE_CHOOSER(dialog), Util::toGFilename(saveFilename).c_str());
+
+    class FileDlg final {
+    public:
+        FileDlg(GtkDialog* dialog, PageTemplateDialog* parent): window(GTK_WINDOW(dialog)), parent(parent) {
+            this->signalId = g_signal_connect(
+                    dialog, "response", G_CALLBACK((+[](GtkDialog* dialog, int response, gpointer data) {
+                        FileDlg* self = static_cast<FileDlg*>(data);
+                        if (response == GTK_RESPONSE_OK) {
+                            auto file = Util::fromGFile(
+                                    xoj::util::GObjectSPtr<GFile>(gtk_file_chooser_get_file(GTK_FILE_CHOOSER(dialog)),
+                                                                  xoj::util::adopt)
+                                            .get());
+
+                            auto saveTemplate = [self, dialog](const fs::path& file) {
+                                // Closing the window causes another "response" signal, which we want to ignore
+                                g_signal_handler_disconnect(dialog, self->signalId);
+                                gtk_window_close(GTK_WINDOW(dialog));
+                                self->parent->settings->setLastSavePath(file.parent_path());
+
+                                auto out = serdes_stream<std::ofstream>(file);
+                                out << self->parent->model.toString();
+                            };
+                            XojMsgBox::replaceFileQuestion(GTK_WINDOW(dialog), std::move(file),
+                                                           std::move(saveTemplate));
+                        } else {
+                            // Closing the window causes another "response" signal, which we want to ignore
+                            g_signal_handler_disconnect(dialog, self->signalId);
+                            gtk_window_close(GTK_WINDOW(dialog));  // Deletes self, don't do anything after this
+                        }
+                    })),
+                    this);
+        }
+        ~FileDlg() = default;
+
+        inline GtkWindow* getWindow() const { return window.get(); }
+
+    private:
+        xoj::util::GtkWindowUPtr window;
+        PageTemplateDialog* parent;
+        gulong signalId;
+    };
+
+    auto popup = xoj::popup::PopupWindowWrapper<FileDlg>(GTK_DIALOG(dialog), this);
+    popup.show(GTK_WINDOW(this->getWindow()));
+}
+
+void PageTemplateDialog::loadFromFile() {
+    xoj::OpenDlg::showOpenTemplateDialog(this->getWindow(), settings, [this](fs::path path) {
+        auto contents = Util::readString(path);
+        if (!contents.has_value()) {
+            return;
+        }
+        model.parse(*contents);
+
+        updateDataFromModel();
+    });
+}
+
+void PageTemplateDialog::updatePageSize() {
+    const FormatUnits* formatUnit = &XOJ_UNITS[settings->getSizeUnitIndex()];
+
+    char buffer[64];
+    sprintf(buffer, "%0.2lf", model.getPageWidth() / formatUnit->scale);
+    std::string pageSize = buffer;
+    pageSize += formatUnit->name;
+    pageSize += " x ";
+
+    sprintf(buffer, "%0.2lf", model.getPageHeight() / formatUnit->scale);
+    pageSize += buffer;
+    pageSize += formatUnit->name;
+
+    gtk_label_set_text(pageSizeLabel, pageSize.c_str());
+}
+
+void PageTemplateDialog::showPageSizeDialog() {
+    auto popup = xoj::popup::PopupWindowWrapper<xoj::popup::FormatDialog>(gladeSearchPath, settings,
+                                                                          model.getPageWidth(), model.getPageHeight(),
+                                                                          [dlg = this](double width, double height) {
+                                                                              dlg->model.setPageWidth(width);
+                                                                              dlg->model.setPageHeight(height);
+
+                                                                              dlg->updatePageSize();
+                                                                          });
+    popup.show(this->getWindow());
+}
+
+/**
+ * The dialog was confirmed / saved
+ */
+auto PageTemplateDialog::isSaved() const -> bool { return saved; }
diff --git a/entry/src/main/cpp/src/core/gui/dialog/PageTemplateDialog.h b/entry/src/main/cpp/src/core/gui/dialog/PageTemplateDialog.h
new file mode 100644
index 0000000..7958fa5
--- /dev/null
+++ b/entry/src/main/cpp/src/core/gui/dialog/PageTemplateDialog.h
@@ -0,0 +1,80 @@
+/*
+ * Xournal++
+ *
+ * Dialog to configure page template for new pages
+ *
+ * @author Xournal++ Team
+ * https://github.com/xournalpp/xournalpp
+ *
+ * @license GNU GPLv2 or later
+ */
+
+#pragma once
+
+#include <memory>  // for unique_ptr
+
+#include "control/settings/PageTemplateSettings.h"  // for PageTemplateSettings
+#include "util/raii/GtkWindowUPtr.h"
+
+class PageTypeHandler;
+class PageTypeInfo;
+class GladeSearchpath;
+class Settings;
+class ToolMenuHandler;
+class PageTypeSelectionPopoverGridOnly;
+
+namespace xoj::popup {
+class PageTemplateDialog final {
+public:
+    PageTemplateDialog(GladeSearchpath* gladeSearchPath, Settings* settings, ToolMenuHandler* toolmenu,
+                       PageTypeHandler* types);
+    PageTemplateDialog(PageTemplateDialog&) = delete;
+    PageTemplateDialog(PageTemplateDialog&&) = delete;
+    PageTemplateDialog& operator=(PageTemplateDialog&) = delete;
+    PageTemplateDialog&& operator=(PageTemplateDialog&&) = delete;
+    ~PageTemplateDialog();
+
+public:
+    /**
+     * The dialog was confirmed / saved
+     */
+    bool isSaved() const;
+
+    void changeCurrentPageBackground(const PageTypeInfo* info);
+
+    inline GtkWindow* getWindow() const { return window.get(); }
+
+private:
+    void showPageSizeDialog();
+    void updatePageSize();
+    void saveToFile();
+    void loadFromFile();
+    void updateDataFromModel();
+    void saveToModel();
+
+private:
+    GladeSearchpath* gladeSearchPath;  // For opening subdialogs as needed
+    xoj::util::GtkWindowUPtr window;
+
+    Settings* settings;
+    ToolMenuHandler* toolMenuHandler;
+    PageTypeHandler* types;
+
+    PageTemplateSettings model;
+
+    std::unique_ptr<PageTypeSelectionPopoverGridOnly> pageTypeSelectionMenu;
+
+    /**
+     * The dialog was confirmed / saved
+     */
+    bool saved = false;
+
+private:
+    // Sub-widgets, owned by this->window
+    GtkLabel* pageSizeLabel;
+    GtkLabel* backgroundTypeLabel;
+    GtkColorChooser* backgroundColorChooser;
+    GtkToggleButton* copyLastPageButton;
+    GtkToggleButton* copyLastPageSizeButton;
+};
+};  // namespace xoj::popup
diff --git a/entry/src/main/cpp/src/core/gui/dialog/PluginDialog.cpp b/entry/src/main/cpp/src/core/gui/dialog/PluginDialog.cpp
new file mode 100644
index 0000000..5e8e5fc
--- /dev/null
+++ b/entry/src/main/cpp/src/core/gui/dialog/PluginDialog.cpp
@@ -0,0 +1,48 @@
+#include "PluginDialog.h"
+
+#ifdef ENABLE_PLUGINS
+
+#include <algorithm>
+#include <string>  // for string
+
+#include "control/settings/Settings.h"     // for Settings
+#include "gui/Builder.h"
+#include "gui/dialog/PluginDialogEntry.h"  // for PluginDialogEntry
+#include "plugin/PluginController.h"       // for PluginController
+
+class GladeSearchpath;
+class Plugin;
+
+constexpr auto UI_FILE = "plugin.glade";
+constexpr auto UI_DIALOG_NAME = "pluginDialog";
+
+PluginDialog::PluginDialog(GladeSearchpath* gladeSearchPath, Settings* settings,
+                           const std::vector<std::unique_ptr<Plugin>>& pluginList):
+        settings(settings) {
+    Builder builder(gladeSearchPath, UI_FILE);
+    window.reset(GTK_WINDOW(builder.get(UI_DIALOG_NAME)));
+
+    GtkBox* pluginBox = GTK_BOX(builder.get("pluginBox"));
+    std::transform(pluginList.begin(), pluginList.end(), std::back_inserter(this->plugins),
+                   [&](auto& p) { return std::make_unique<PluginDialogEntry>(p.get(), gladeSearchPath, pluginBox); });
+
+    g_signal_connect_swapped(builder.get("btCancel"), "clicked", G_CALLBACK(gtk_window_close), this->window.get());
+    g_signal_connect_swapped(builder.get("btOk"), "clicked", G_CALLBACK(+[](PluginDialog* self) {
+                                 self->saveSettings();
+                                 gtk_window_close(self->window.get());
+                             }),
+                             this);
+}
+
+void PluginDialog::saveSettings() {
+    std::string pluginEnabled;
+    std::string pluginDisabled;
+
+    // Save plugin settings
+    for (auto&& bcg: this->plugins) { bcg->saveSettings(pluginEnabled, pluginDisabled); }
+
+    settings->setPluginEnabled(pluginEnabled);
+    settings->setPluginDisabled(pluginDisabled);
+}
+
+#endif
diff --git a/entry/src/main/cpp/src/core/gui/dialog/PluginDialog.h b/entry/src/main/cpp/src/core/gui/dialog/PluginDialog.h
new file mode 100644
index 0000000..fa02358
--- /dev/null
+++ b/entry/src/main/cpp/src/core/gui/dialog/PluginDialog.h
@@ -0,0 +1,48 @@
+/*
+ * Xournal++
+ *
+ * Plugin manage dialog
+ *
+ * @author Xournal++ Team
+ * https://github.com/xournalpp/xournalpp
+ *
+ * @license GNU GPLv2 or later
+ */
+
+#pragma once
+
+#include "config-features.h"
+
+#ifdef ENABLE_PLUGINS
+
+#include <memory>  // for unique_ptr
+#include <vector>  // for vector
+
+#include "util/raii/GtkWindowUPtr.h"
+
+#include "PluginDialogEntry.h"  // for PluginDialogEntry
+
+class Plugin;
+class PluginController;
+class Settings;
+class GladeSearchpath;
+
+class PluginDialog {
+public:
+    PluginDialog(GladeSearchpath* gladeSearchPath, Settings* settings,
+                 const std::vector<std::unique_ptr<Plugin>>& plugins);
+
+public:
+    inline GtkWindow* getWindow() const { return window.get(); }
+
+private:
+    void saveSettings();
+
+private:
+    Settings* settings;
+
+    std::vector<std::unique_ptr<PluginDialogEntry>> plugins;
+    xoj::util::GtkWindowUPtr window;
+};
+
+#endif
diff --git a/entry/src/main/cpp/src/core/gui/dialog/PluginDialogEntry.cpp b/entry/src/main/cpp/src/core/gui/dialog/PluginDialogEntry.cpp
new file mode 100644
index 0000000..4cdb35d
--- /dev/null
+++ b/entry/src/main/cpp/src/core/gui/dialog/PluginDialogEntry.cpp
@@ -0,0 +1,52 @@
+#include "PluginDialogEntry.h"
+
+#ifdef ENABLE_PLUGINS
+
+#include "gui/Builder.h"
+#include "plugin/Plugin.h"
+#include "util/gtk4_helper.h"
+#include "util/i18n.h"
+
+#include "filesystem.h"  // for path
+
+class GladeSearchpath;
+
+constexpr auto UI_FILE = "pluginEntry.glade";
+constexpr auto UI_WIDGET_NAME = "pluginMainBox";
+
+PluginDialogEntry::PluginDialogEntry(Plugin* plugin, GladeSearchpath* gladeSearchPath, GtkBox* box): plugin(plugin) {
+    Builder builder(gladeSearchPath, UI_FILE);
+    gtk_box_append(box, builder.get(UI_WIDGET_NAME));
+    stateButton = GTK_CHECK_BUTTON(builder.get("cbEnabled"));
+
+    gtk_label_set_text(GTK_LABEL(builder.get("pluginName")), plugin->getName().c_str());
+    gtk_label_set_text(GTK_LABEL(builder.get("lbAuthor")), plugin->getAuthor().c_str());
+    gtk_label_set_text(GTK_LABEL(builder.get("lbVersion")), plugin->getVersion().c_str());
+    gtk_label_set_text(GTK_LABEL(builder.get("lbDescription")), plugin->getDescription().c_str());
+    gtk_label_set_text(GTK_LABEL(builder.get("lbPath")), char_cast(plugin->getPath().u8string().c_str()));
+    gtk_label_set_text(GTK_LABEL(builder.get("lbDefaultText")),
+                       plugin->isDefaultEnabled() ? _("default enabled") : _("default disabled"));
+    gtk_check_button_set_active(stateButton, plugin->isEnabled());
+}
+
+void PluginDialogEntry::saveSettings(std::string& pluginEnabled, std::string& pluginDisabled) {
+    bool state = gtk_check_button_get_active(stateButton);
+
+    if (state == plugin->isDefaultEnabled()) {
+        return;
+    }
+
+    if (state) {
+        if (!pluginEnabled.empty()) {
+            pluginEnabled += ",";
+        }
+        pluginEnabled.append(char_cast(plugin->getPath().u8string()));
+    } else {
+        if (!pluginDisabled.empty()) {
+            pluginDisabled += ",";
+        }
+        pluginDisabled.append(char_cast(plugin->getPath().u8string()));
+    }
+}
+
+#endif
diff --git a/entry/src/main/cpp/src/core/gui/dialog/PluginDialogEntry.h b/entry/src/main/cpp/src/core/gui/dialog/PluginDialogEntry.h
new file mode 100644
index 0000000..3f163ce
--- /dev/null
+++ b/entry/src/main/cpp/src/core/gui/dialog/PluginDialogEntry.h
@@ -0,0 +1,40 @@
+/*
+ * Xournal++
+ *
+ * Configuration of a single plugin
+ *
+ * @author Xournal++ Team
+ * https://github.com/xournalpp/xournalpp
+ *
+ * @license GNU GPLv2 or later
+ */
+
+#pragma once
+
+#include "config-features.h"
+
+#ifdef ENABLE_PLUGINS
+#include <string>  // for string
+
+#include <gtk/gtk.h>
+
+class Plugin;
+class GladeSearchpath;
+
+class PluginDialogEntry {
+public:
+    PluginDialogEntry(Plugin* plugin, GladeSearchpath* gladeSearchPath, GtkBox* box);
+
+public:
+    void saveSettings(std::string& pluginEnabled, std::string& pluginDisabled);
+
+
+private:
+    /**
+     * Plugin instance
+     */
+    Plugin* plugin;
+
+    GtkCheckButton* stateButton;
+};
+#endif
diff --git a/entry/src/main/cpp/src/core/gui/dialog/RenameLayerDialog.cpp b/entry/src/main/cpp/src/core/gui/dialog/RenameLayerDialog.cpp
new file mode 100644
index 0000000..7e6696d
--- /dev/null
+++ b/entry/src/main/cpp/src/core/gui/dialog/RenameLayerDialog.cpp
@@ -0,0 +1,40 @@
+#include "RenameLayerDialog.h"
+
+#include <memory>  // for allocator, make_unique
+#include <string>  // for string
+
+#include <glib-object.h>  // for G_CALLBACK, g_signal_connect
+
+#include "control/layer/LayerController.h"  // for LayerController
+#include "gui/Builder.h"
+#include "undo/LayerRenameUndoAction.h"  // for LayerRenameUndoAction
+#include "undo/UndoRedoHandler.h"        // for UndoRedoHandler
+#include "util/gtk4_helper.h"
+
+class GladeSearchpath;
+class Layer;
+
+constexpr auto UI_FILE = "renameLayerDialog.glade";
+constexpr auto UI_DIALOG_NAME = "renameLayerDialog";
+
+RenameLayerDialog::RenameLayerDialog(GladeSearchpath* gladeSearchPath, UndoRedoHandler* undo, LayerController* lc,
+                                     Layer* l):
+        lc(lc), undo(undo), l(l) {
+    Builder builder(gladeSearchPath, UI_FILE);
+    window.reset(GTK_WINDOW(builder.get(UI_DIALOG_NAME)));
+    layerNameEntry = GTK_ENTRY(builder.get("layerNameEntry"));
+
+    gtk_editable_set_text(GTK_EDITABLE(layerNameEntry), lc->getCurrentLayerName().c_str());
+
+    g_signal_connect_swapped(builder.get("btCancel"), "clicked", G_CALLBACK(gtk_window_close), this->window.get());
+    g_signal_connect_swapped(builder.get("btOk"), "clicked", G_CALLBACK(+[](RenameLayerDialog* self) {
+                                 std::string newName = gtk_editable_get_text(GTK_EDITABLE(self->layerNameEntry));
+
+                                 self->undo->addUndoAction(std::make_unique<LayerRenameUndoAction>(
+                                         self->lc, self->l, newName, self->lc->getCurrentLayerName()));
+
+                                 self->lc->setCurrentLayerName(newName);
+                                 gtk_window_close(self->window.get());
+                             }),
+                             this);
+}
diff --git a/entry/src/main/cpp/src/core/gui/dialog/RenameLayerDialog.h b/entry/src/main/cpp/src/core/gui/dialog/RenameLayerDialog.h
new file mode 100644
index 0000000..843f5ed
--- /dev/null
+++ b/entry/src/main/cpp/src/core/gui/dialog/RenameLayerDialog.h
@@ -0,0 +1,36 @@
+/*
+ * Xournal++
+ *
+ * The rename layer dialog
+ *
+ * @author Xournal++ Team
+ * https://github.com/xournalpp/xournalpp
+ *
+ * @license GNU GPLv2 or later
+ */
+
+#pragma once
+
+#include <gtk/gtk.h>
+
+#include "util/raii/GtkWindowUPtr.h"
+
+class GladeSearchpath;
+class Layer;
+class LayerController;
+class UndoRedoHandler;
+
+class RenameLayerDialog {
+public:
+    RenameLayerDialog(GladeSearchpath* gladeSearchPath, UndoRedoHandler* undo, LayerController* lc, Layer* l);
+
+    inline GtkWindow* getWindow() const { return window.get(); }
+
+private:
+    LayerController* lc;
+    UndoRedoHandler* undo;
+    Layer* l;
+
+    xoj::util::GtkWindowUPtr window;
+    GtkEntry* layerNameEntry;
+};
diff --git a/entry/src/main/cpp/src/core/gui/dialog/SelectBackgroundColorDialog.cpp b/entry/src/main/cpp/src/core/gui/dialog/SelectBackgroundColorDialog.cpp
new file mode 100644
index 0000000..c439989
--- /dev/null
+++ b/entry/src/main/cpp/src/core/gui/dialog/SelectBackgroundColorDialog.cpp
@@ -0,0 +1,119 @@
+#include "SelectBackgroundColorDialog.h"
+
+#include <cstdint>    // for uint32_t
+#include <string>     // for allocator
+
+#include <glib.h>  // for g_free, g_strdup_printf
+
+#include "control/Control.h"            // for Control
+#include "control/settings/Settings.h"  // for SElement, Settings
+#include "util/Color.h"
+#include "util/i18n.h"                  // for _
+#include "util/safe_casts.h"            // for as_unsigned
+
+static inline std::array<GdkRGBA, 9> background1 = {
+        Util::rgb_to_GdkRGBA(Colors::xopp_lightpink),  //
+        Util::rgb_to_GdkRGBA(Colors::xopp_bisque),  //
+        Util::rgb_to_GdkRGBA(Colors::xopp_lemonchifon),  //
+        Util::rgb_to_GdkRGBA(Colors::xopp_palegoldenrod),  //
+        Util::rgb_to_GdkRGBA(Colors::xopp_lavender),  //
+        Util::rgb_to_GdkRGBA(Colors::xopp_gainsboro03),  //
+        Util::rgb_to_GdkRGBA(Colors::xopp_antiquewhite),  //
+        Util::rgb_to_GdkRGBA(Colors::xopp_gainsboro),  //
+        Util::rgb_to_GdkRGBA(Colors::xopp_snow)   //
+};
+
+static inline std::array<GdkRGBA, 6> backgroundXournal = {
+        Util::rgb_to_GdkRGBA(Colors::white),  //
+        Util::rgb_to_GdkRGBA(Colors::xopp_paleturqoise),  //
+        Util::rgb_to_GdkRGBA(Colors::xopp_aquamarine),  //
+        Util::rgb_to_GdkRGBA(Colors::xopp_pink),  //
+        Util::rgb_to_GdkRGBA(Colors::xopp_lightsalmon),  //
+        Util::rgb_to_GdkRGBA(Colors::xopp_khaki)   //
+};
+
+SelectBackgroundColorDialog::SelectBackgroundColorDialog(Control* control, std::function<void(Color)> callback):
+        control(control), callback(callback) {
+    lastBackgroundColors.fill(Util::rgb_to_GdkRGBA(Colors::white));
+    Settings* settings = control->getSettings();
+    SElement& el = settings->getCustomElement("lastUsedPageBgColor");
+
+    int count = 0;
+    el.getInt("count", count);
+
+    auto index = 0ULL;
+
+    for (int i = 0; i < count && index < LAST_BACKGROUND_COLOR_COUNT; i++) {
+        int iColor{};
+        char* settingName = g_strdup_printf("color%02i", i);
+        bool read = el.getInt(settingName, iColor);
+        g_free(settingName);
+
+        if (!read) {
+            continue;
+        }
+
+        lastBackgroundColors[index] = Util::rgb_to_GdkRGBA(Color(as_unsigned(iColor)));
+
+        ++index;
+    }
+
+
+    window.reset(GTK_WINDOW(gtk_color_chooser_dialog_new(_("Select background color"), nullptr)));
+    GtkColorChooser* chooser = GTK_COLOR_CHOOSER(window.get());
+    gtk_color_chooser_set_use_alpha(chooser, false);
+
+    gtk_color_chooser_add_palette(chooser, GTK_ORIENTATION_HORIZONTAL, 9, background1.size(), background1.data());
+
+    gtk_color_chooser_add_palette(chooser, GTK_ORIENTATION_HORIZONTAL, 9, backgroundXournal.size(),
+                                  backgroundXournal.data());
+
+    // Last used colors (only by background, the general last used are shared with the
+    // pen and highlighter etc.)
+    gtk_color_chooser_add_palette(chooser, GTK_ORIENTATION_HORIZONTAL, 9, static_cast<int>(lastBackgroundColors.size()),
+                                  lastBackgroundColors.data());
+
+    g_signal_connect(window.get(), "response",
+                     G_CALLBACK(+[](GtkColorChooser*, int response, SelectBackgroundColorDialog* self) {
+                         if (response == GTK_RESPONSE_DELETE_EVENT) {
+                             // Ignore DELETE_EVENT, as this is caught by the PopupWindowWrapper
+                             return;
+                         }
+                         if (response == GTK_RESPONSE_OK) {
+                             GdkRGBA color;
+                             gtk_color_chooser_get_rgba(GTK_COLOR_CHOOSER(self->window.get()), &color);
+                             self->storeLastUsedValuesInSettings(color);
+                             self->callback(Util::GdkRGBA_to_argb(color));
+                         }
+                         gtk_window_close(self->window.get());
+                     }),
+                     this);
+}
+
+void SelectBackgroundColorDialog::storeLastUsedValuesInSettings(GdkRGBA color) {
+    for (auto& lastBackgroundColor: lastBackgroundColors) {
+        if (gdk_rgba_equal(&lastBackgroundColor, &color)) {
+            // The new color is already in the list, do not save
+            return;
+        }
+    }
+
+    Settings* settings = control->getSettings();
+    SElement& el = settings->getCustomElement("lastUsedPageBgColor");
+
+    // Move all colors one step back
+    for (size_t i = LAST_BACKGROUND_COLOR_COUNT - 1; i > 0; i--) {
+        lastBackgroundColors[i] = lastBackgroundColors[i - 1];
+    }
+
+    lastBackgroundColors[0] = color;
+
+    el.setInt("count", LAST_BACKGROUND_COLOR_COUNT);
+    for (size_t i = 0; i < LAST_BACKGROUND_COLOR_COUNT; i++) {
+        char* settingName = g_strdup_printf("color%02zu", i);
+        el.setIntHex(settingName, int(uint32_t(Util::GdkRGBA_to_argb(lastBackgroundColors[i]))));
+        g_free(settingName);
+    }
+
+    settings->customSettingsChanged();
+}
diff --git a/entry/src/main/cpp/src/core/gui/dialog/SelectBackgroundColorDialog.h b/entry/src/main/cpp/src/core/gui/dialog/SelectBackgroundColorDialog.h
new file mode 100644
index 0000000..fbbf332
--- /dev/null
+++ b/entry/src/main/cpp/src/core/gui/dialog/SelectBackgroundColorDialog.h
@@ -0,0 +1,50 @@
+/*
+ * Xournal++
+ *
+ * Dialog for selecting a background color
+ *
+ * @author Xournal++ Team
+ * https://github.com/xournalpp/xournalpp
+ *
+ * @license GNU GPLv2 or later
+ */
+
+#pragma once
+
+#include <array>     // for array
+#include <functional>
+
+#include <gdk/gdk.h>  // for GdkRGBA
+#include <gtk/gtk.h>  // for GtkWindow
+
+#include "util/Color.h"
+#include "util/raii/GtkWindowUPtr.h"
+
+class Control;
+
+/**
+ * Count of last background colors
+ */
+const int LAST_BACKGROUND_COLOR_COUNT = 9;
+
+
+class SelectBackgroundColorDialog {
+public:
+    SelectBackgroundColorDialog(Control* control, std::function<void(Color)> callback);
+
+    inline GtkWindow* getWindow() const { return window.get(); }
+
+private:
+    void storeLastUsedValuesInSettings(GdkRGBA color);
+
+private:
+    Control* control{nullptr};
+
+    /**
+     * Last used background colors (stored in settings)
+     */
+    std::array<GdkRGBA, LAST_BACKGROUND_COLOR_COUNT> lastBackgroundColors{};
+
+    xoj::util::GtkWindowUPtr window;
+    std::function<void(Color)> callback;
+};
diff --git a/entry/src/main/cpp/src/core/gui/dialog/SelectOpacityDialog.cpp b/entry/src/main/cpp/src/core/gui/dialog/SelectOpacityDialog.cpp
new file mode 100644
index 0000000..8736381
--- /dev/null
+++ b/entry/src/main/cpp/src/core/gui/dialog/SelectOpacityDialog.cpp
@@ -0,0 +1,121 @@
+#include "SelectOpacityDialog.h"
+
+#include <cairo.h>        // for cairo_set_operator, cairo_rectangle, cairo_...
+#include <glib-object.h>  // for G_CALLBACK, g_signal_connect
+#include <glib.h>         // for gdouble
+
+#include "gui/Builder.h"
+#include "util/Stacktrace.h"
+#include "util/i18n.h"
+#include "util/raii/CairoWrappers.h"
+#include "util/raii/GObjectSPtr.h"
+#include "util/safe_casts.h"  // for round_cast
+
+class GladeSearchpath;
+
+constexpr auto UI_FILE = "selectOpacity.glade";
+constexpr auto UI_DIALOG_NAME = "selectOpacityDialog";
+
+static int percentToByte(double percent) { return round_cast<int>(percent * 2.55); }
+static double byteToPercent(int byte) { return byte / 2.55; }
+
+static inline void buildLabel(Builder& builder, OpacityFeature opacityFeature) {
+    // Used to set the label of the dialog in the form of:
+    // <b>{toolOptionsDesc}</b>\n
+    // Select opacity for: {opacityFeatureDesc}
+    std::string toolOptionsDesc;
+    std::string selectOpacityFor = _("Select opacity for: ");
+    std::string opacityFeatureDesc;
+
+    switch (opacityFeature) {
+        case OPACITY_FILL_HIGHLIGHTER:
+            toolOptionsDesc = _("Highlighter Options");
+            opacityFeatureDesc = _("Fill color");
+            break;
+        case OPACITY_FILL_PEN:
+            toolOptionsDesc = _("Pen Options");
+            opacityFeatureDesc = _("Fill color");
+            break;
+        case OPACITY_SELECT_PDF_TEXT_MARKER:
+            toolOptionsDesc = _("PDF Text Options");
+            opacityFeatureDesc = _("PDF Text Marker");
+            break;
+        default:
+            g_warning("No opacityFeature description set for '%s'", opacityFeatureToString(opacityFeature).data());
+            Stacktrace::printStacktrace();
+            break;
+    }
+    gtk_label_set_label(GTK_LABEL(builder.get("label1")),
+                        FC(_F("<b>{1}</b>\n{2}{3}") % toolOptionsDesc % selectOpacityFor % opacityFeatureDesc));
+}
+
+xoj::popup::SelectOpacityDialog::SelectOpacityDialog(GladeSearchpath* gladeSearchPath, int alpha,
+                                                     OpacityFeature feature,
+                                                     std::function<void(int, OpacityFeature)> callback):
+        opacityFeature(feature), callback(callback) {
+    Builder builder(gladeSearchPath, UI_FILE);
+    this->window.reset(GTK_WINDOW(builder.get(UI_DIALOG_NAME)));
+
+    buildLabel(builder, opacityFeature);
+    previewImage = GTK_IMAGE(builder.get("imgPreview"));
+    alphaRange = GTK_RANGE(builder.get("scaleAlpha"));
+
+    gtk_range_set_value(alphaRange, byteToPercent(alpha));
+
+    setPreviewImage(alpha);
+
+
+    g_signal_connect(alphaRange, "value-changed", G_CALLBACK(+[](GtkRange* range, gpointer self) {
+                         static_cast<SelectOpacityDialog*>(self)->setPreviewImage(
+                                 percentToByte(round_cast<int>(gtk_range_get_value(range))));
+                     }),
+                     this);
+
+    g_signal_connect_swapped(builder.get("btCancel"), "clicked", G_CALLBACK(gtk_window_close), this->window.get());
+    g_signal_connect(builder.get("btOk"), "clicked", G_CALLBACK(+[](GtkButton*, SelectOpacityDialog* self) {
+                         self->callback(percentToByte(gtk_range_get_value(self->alphaRange)), self->opacityFeature);
+                         gtk_window_close(self->window.get());
+                     }),
+                     this);
+
+#if GTK_MAJOR_VERSION == 3
+    // Widgets are visible by default in gtk4
+    gtk_widget_show_all(builder.get("dialog-main-box"));
+#endif
+}
+
+xoj::popup::SelectOpacityDialog::~SelectOpacityDialog() = default;
+
+const int PREVIEW_WIDTH = 70;
+const int PREVIEW_HEIGTH = 50;
+const int PREVIEW_BORDER = 10;
+
+void xoj::popup::SelectOpacityDialog::setPreviewImage(int alpha) {
+    xoj::util::CairoSurfaceSPtr surface(cairo_image_surface_create(CAIRO_FORMAT_ARGB32, PREVIEW_WIDTH, PREVIEW_HEIGTH),
+                                        xoj::util::adopt);
+    xoj::util::CairoSPtr cairo(cairo_create(surface.get()), xoj::util::adopt);
+    cairo_t* cr = cairo.get();
+
+    cairo_set_operator(cr, CAIRO_OPERATOR_SOURCE);
+    cairo_set_source_rgb(cr, 255, 255, 255);
+    cairo_paint(cr);
+
+    cairo_set_operator(cr, CAIRO_OPERATOR_OVER);
+    cairo_set_source_rgba(cr, 0, 0x80 / 255.0, 0, alpha / 255.0);
+    cairo_rectangle(cr, PREVIEW_BORDER, PREVIEW_BORDER, PREVIEW_WIDTH - PREVIEW_BORDER * 2,
+                    PREVIEW_HEIGTH - PREVIEW_BORDER * 2);
+    cairo_fill(cr);
+
+    if (opacityFeature == OPACITY_FILL_PEN) {
+        cairo_set_line_width(cr, 5);
+        cairo_set_operator(cr, CAIRO_OPERATOR_SOURCE);
+        cairo_set_source_rgb(cr, 0, 0x80 / 255.0, 0);
+        cairo_rectangle(cr, PREVIEW_BORDER, PREVIEW_BORDER, PREVIEW_WIDTH - PREVIEW_BORDER * 2,
+                        PREVIEW_HEIGTH - PREVIEW_BORDER * 2);
+        cairo_stroke(cr);
+    }
+
+    xoj::util::GObjectSPtr<GdkPixbuf> pixbuf(
+            gdk_pixbuf_get_from_surface(surface.get(), 0, 0, PREVIEW_WIDTH, PREVIEW_HEIGTH), xoj::util::adopt);
+    gtk_image_set_from_pixbuf(previewImage, pixbuf.get());
+}
diff --git a/entry/src/main/cpp/src/core/gui/dialog/SelectOpacityDialog.h b/entry/src/main/cpp/src/core/gui/dialog/SelectOpacityDialog.h
new file mode 100644
index 0000000..13080dc
--- /dev/null
+++ b/entry/src/main/cpp/src/core/gui/dialog/SelectOpacityDialog.h
@@ -0,0 +1,41 @@
+/*
+ * Xournal++
+ *
+ * The about dialog
+ *
+ * @author Xournal++ Team
+ * https://github.com/xournalpp/xournalpp
+ *
+ * @license GNU GPLv2 or later
+ */
+
+#pragma once
+
+#include <functional>
+
+#include "control/ToolEnums.h"
+#include "util/raii/GtkWindowUPtr.h"
+
+class GladeSearchpath;
+
+namespace xoj::popup {
+class SelectOpacityDialog {
+public:
+    SelectOpacityDialog(GladeSearchpath* gladeSearchPath, int alpha, OpacityFeature type,
+                        std::function<void(int, OpacityFeature)> callback);
+    ~SelectOpacityDialog();
+
+    inline GtkWindow* getWindow() const { return window.get(); }
+
+private:
+    void setPreviewImage(int alpha);
+
+private:
+    xoj::util::GtkWindowUPtr window;
+    GtkImage* previewImage;
+    GtkRange* alphaRange;
+
+    OpacityFeature opacityFeature;
+    std::function<void(int, OpacityFeature)> callback;
+};
+};  // namespace xoj::popup
diff --git a/entry/src/main/cpp/src/core/gui/dialog/SettingsDialog.cpp b/entry/src/main/cpp/src/core/gui/dialog/SettingsDialog.cpp
new file mode 100644
index 0000000..7279648
--- /dev/null
+++ b/entry/src/main/cpp/src/core/gui/dialog/SettingsDialog.cpp
@@ -0,0 +1,1104 @@
+#include "SettingsDialog.h"
+
+#include <algorithm>    // for max
+#include <cstddef>      // for NULL, size_t
+#include <type_traits>  // for __underlying_type_im...
+
+#include <gdk/gdk.h>      // for GdkRGBA, GdkRectangle
+#include <glib-object.h>  // for G_CALLBACK, g_signal...
+
+#include "control/AudioController.h"             // for AudioController
+#include "control/Control.h"                     // for Control
+#include "control/settings/Settings.h"           // for Settings, SElement
+#include "control/settings/SettingsEnums.h"      // for STYLUS_CURSOR_ARROW
+#include "control/tools/StrokeStabilizerEnum.h"  // for AveragingMethod, Pre...
+#include "gui/CreatePreviewImage.h"              // for createPreviewImage
+#include "gui/MainWindow.h"                      // for MainWindow
+#include "gui/XournalView.h"                     // for XournalView
+#include "gui/toolbarMenubar/ToolMenuHandler.h"  // for ToolMenuHandler
+#include "gui/toolbarMenubar/icon/ColorIcon.h"
+#include "gui/toolbarMenubar/model/ColorPalette.h"  // for Palette
+#include "gui/widgets/ZoomCallib.h"                 // for zoomcallib_new, zoom...
+#include "model/PageType.h"                         // for PageType
+#include "util/Color.h"                             // for GdkRGBA_to_argb, rgb...
+#include "util/GtkUtil.h"                           // for getWidgetDPI
+#include "util/PathUtil.h"                          // for fromGFile, toGFilename
+#include "util/Util.h"                              // for systemWithMessage
+#include "util/gtk4_helper.h"                       //
+#include "util/i18n.h"                              // for _
+#include "util/raii/CairoWrappers.h"                // for CairoSurfaceSPtr
+#include "util/safe_casts.h"                        // for round_cast
+#include "util/utf8_view.h"                         // for utf8
+
+#include "ButtonConfigGui.h"       // for ButtonConfigGui
+#include "DeviceTestingArea.h"     // for DeviceTestingArea
+#include "LanguageConfigGui.h"     // for LanguageConfigGui
+#include "LatexSettingsPanel.h"    // for LatexSettingsPanel
+#include "filesystem.h"            // for is_directory
+
+class GladeSearchpath;
+
+using std::string;
+using std::vector;
+
+constexpr auto UI_FILE = "settings.glade";
+constexpr auto UI_DIALOG_NAME = "settingsDialog";
+
+SettingsDialog::SettingsDialog(GladeSearchpath* gladeSearchPath, Settings* settings, Control* control,
+                               const std::vector<fs::path>& paletteDirectories, std::function<void()> callback):
+        settings(settings),
+        control(control),
+        callib(zoomcallib_new()),
+        builder(gladeSearchPath, UI_FILE),
+        window(GTK_WINDOW(builder.get(UI_DIALOG_NAME))),
+        languageConfig(GTK_BOX(builder.get("hboxLanguageSelect")), settings),
+        latexPanel(gladeSearchPath),
+        paletteTab(gladeSearchPath, paletteDirectories),
+        callback(callback) {
+
+    gtk_box_append(GTK_BOX(builder.get("zoomVBox")), callib);
+    gtk_widget_show(callib);
+
+    GtkWidget* preview = xoj::helper::createPreviewImage(PageType{PageTypeFormat::Lined});
+    gtk_box_append(GTK_BOX(builder.get("pagePreviewImage")), preview);
+    gtk_widget_show(preview);
+
+    initMouseButtonEvents(gladeSearchPath);
+
+    GtkBox* container = GTK_BOX(builder.get("hboxInputDeviceClasses"));
+    deviceTestingArea = std::make_unique<DeviceTestingArea>(gladeSearchPath, container, this->settings);
+
+    gtk_box_append(GTK_BOX(builder.get("latexTabBox")), this->latexPanel.getPanel());
+    gtk_box_append(GTK_BOX(builder.get("paletteTabBox")), this->paletteTab.getPanel());
+
+    g_signal_connect(GTK_RANGE(builder.get("zoomCallibSlider")), "value-changed",
+                     G_CALLBACK(+[](GtkRange* range, gpointer self) {
+                         static_cast<SettingsDialog*>(self)->setDpi(round_cast<int>(gtk_range_get_value(range)));
+                     }),
+                     this);
+
+    g_signal_connect_swapped(builder.get("cbEnablePressureInference"), "toggled",
+                             G_CALLBACK(+[](SettingsDialog* self) { self->updatePressureSensitivityOptions(); }), this);
+
+    g_signal_connect_swapped(builder.get("cbSettingPresureSensitivity"), "toggled",
+                             G_CALLBACK(+[](SettingsDialog* self) { self->updatePressureSensitivityOptions(); }), this);
+
+    g_signal_connect_swapped(
+            builder.get("cbAutosave"), "toggled",
+            G_CALLBACK(+[](SettingsDialog* self) { self->enableWithCheckbox("cbAutosave", "boxAutosave"); }), this);
+
+    g_signal_connect_swapped(builder.get("cbIgnoreFirstStylusEvents"), "toggled", G_CALLBACK(+[](SettingsDialog* self) {
+                                 self->enableWithCheckbox("cbIgnoreFirstStylusEvents", "spNumIgnoredStylusEvents");
+                             }),
+                             this);
+
+
+    g_signal_connect_swapped(builder.get("btTestEnable"), "clicked", G_CALLBACK(+[](SettingsDialog* self) {
+                                 Util::systemWithMessage(gtk_editable_get_text(
+                                         GTK_EDITABLE(self->builder.get("txtEnableTouchCommand"))));
+                             }),
+                             this);
+
+    g_signal_connect_swapped(builder.get("btTestDisable"), "clicked", G_CALLBACK(+[](SettingsDialog* self) {
+                                 Util::systemWithMessage(gtk_editable_get_text(
+                                         GTK_EDITABLE(self->builder.get("txtDisableTouchCommand"))));
+                             }),
+                             this);
+
+    g_signal_connect_swapped(builder.get("cbAddVerticalSpace"), "toggled", G_CALLBACK(+[](SettingsDialog* self) {
+                                 self->enableWithCheckbox("cbAddVerticalSpace", "spAddVerticalSpaceAbove");
+                                 self->enableWithCheckbox("cbAddVerticalSpace", "spAddVerticalSpaceBelow");
+                             }),
+                             this);
+
+    g_signal_connect_swapped(builder.get("cbAddHorizontalSpace"), "toggled", G_CALLBACK(+[](SettingsDialog* self) {
+                                 self->enableWithCheckbox("cbAddHorizontalSpace", "spAddHorizontalSpaceLeft");
+                                 self->enableWithCheckbox("cbAddHorizontalSpace", "spAddHorizontalSpaceRight");
+                             }),
+                             this);
+
+    g_signal_connect_swapped(builder.get("cbUnlimitedScrolling"), "toggled", G_CALLBACK(+[](SettingsDialog* self) {
+                                 self->disableWithCheckbox("cbUnlimitedScrolling", "cbAddHorizontalSpace");
+                                 self->disableWithCheckbox("cbUnlimitedScrolling", "cbAddVerticalSpace");
+                                 self->enableWithEnabledCheckbox("cbAddHorizontalSpace", "spAddHorizontalSpaceLeft");
+                                 self->enableWithEnabledCheckbox("cbAddVerticalSpace", "spAddVerticalSpaceAbove");
+                                 self->enableWithEnabledCheckbox("cbAddHorizontalSpace", "spAddHorizontalSpaceRight");
+                                 self->enableWithEnabledCheckbox("cbAddVerticalSpace", "spAddVerticalSpaceBelow");
+                             }),
+                             this);
+
+    g_signal_connect_swapped(builder.get("cbDrawDirModsEnabled"), "toggled", G_CALLBACK(+[](SettingsDialog* self) {
+                                 self->enableWithCheckbox("cbDrawDirModsEnabled", "spDrawDirModsRadius");
+                             }),
+                             this);
+
+    g_signal_connect_swapped(builder.get("cbStrokeFilterEnabled"), "toggled", G_CALLBACK(+[](SettingsDialog* self) {
+                                 self->enableWithCheckbox("cbStrokeFilterEnabled", "spStrokeIgnoreTime");
+                                 self->enableWithCheckbox("cbStrokeFilterEnabled", "spStrokeIgnoreLength");
+                                 self->enableWithCheckbox("cbStrokeFilterEnabled", "spStrokeSuccessiveTime");
+                                 self->enableWithCheckbox("cbStrokeFilterEnabled", "cbDoActionOnStrokeFiltered");
+                                 self->enableWithCheckbox("cbStrokeFilterEnabled", "cbTrySelectOnStrokeFiltered");
+                             }),
+                             this);
+
+    g_signal_connect_swapped(builder.get("cbDisableAudio"), "toggled", G_CALLBACK(+[](SettingsDialog* self) {
+                                 self->disableWithCheckbox("cbDisableAudio", "sidAudio1");
+                                 self->disableWithCheckbox("cbDisableAudio", "sidAudio2");
+                                 self->disableWithCheckbox("cbDisableAudio", "sidAudio3");
+                                 self->disableWithCheckbox("cbDisableAudio", "sidAudio4");
+                                 self->disableWithCheckbox("cbDisableAudio", "sidAudioLbl");
+                             }),
+                             this);
+
+    g_signal_connect_swapped(builder.get("cbDisableTouchOnPenNear"), "toggled", G_CALLBACK(+[](SettingsDialog* self) {
+                                 self->enableWithCheckbox("cbDisableTouchOnPenNear", "boxInternalHandRecognition");
+                             }),
+                             this);
+
+    g_signal_connect_swapped(builder.get("cbTouchDisableMethod"), "changed",
+                             G_CALLBACK(+[](SettingsDialog* self) { self->customHandRecognitionToggled(); }), this);
+
+    g_signal_connect_swapped(builder.get("cbEnableZoomGestures"), "toggled", G_CALLBACK(+[](SettingsDialog* self) {
+                                 self->enableWithCheckbox("cbEnableZoomGestures", "gdStartZoomAtSetting");
+                             }),
+                             this);
+
+    g_signal_connect_swapped(builder.get("cbStylusCursorType"), "changed",
+                             G_CALLBACK(+[](SettingsDialog* self) { self->customStylusIconTypeChanged(); }), this);
+
+    g_signal_connect(GTK_COMBO_BOX(builder.get("cbStabilizerAveragingMethods")), "changed",
+                     G_CALLBACK(+[](GtkComboBox* comboBox, gpointer self) {
+                         static_cast<SettingsDialog*>(self)->showStabilizerAvMethodOptions(
+                                 static_cast<StrokeStabilizer::AveragingMethod>(gtk_combo_box_get_active(comboBox)));
+                     }),
+                     this);
+
+    g_signal_connect(GTK_COMBO_BOX(builder.get("cbStabilizerPreprocessors")), "changed",
+                     G_CALLBACK(+[](GtkComboBox* comboBox, gpointer self) {
+                         static_cast<SettingsDialog*>(self)->showStabilizerPreprocessorOptions(
+                                 static_cast<StrokeStabilizer::Preprocessor>(gtk_combo_box_get_active(comboBox)));
+                     }),
+                     this);
+
+    g_signal_connect_swapped(builder.get("btOk"), "clicked", G_CALLBACK(+[](SettingsDialog* self) {
+                                 self->save();
+                                 self->callback();
+                                 gtk_window_close(self->window.get());
+                             }),
+                             this);
+    g_signal_connect_swapped(builder.get("btCancel"), "clicked", G_CALLBACK(gtk_window_close), window.get());
+
+    g_signal_connect(builder.get("cbUseSpacesAsTab"), "toggled",
+                     G_CALLBACK(+[](GtkCheckButton* checkBox, SettingsDialog* self) {
+                         self->enableWithCheckbox("cbUseSpacesAsTab", "numberOfSpacesContainer");
+                     }),
+                     this);
+
+    load();
+}
+
+SettingsDialog::~SettingsDialog() = default;
+
+void SettingsDialog::initMouseButtonEvents(GladeSearchpath* gladeSearchPath) {
+    auto emplaceButton = [gladeSearchPath, &btns = buttonConfigs, settings = settings, &bld = builder](
+                                 const char* hbox, Button button, bool withDevice = false) {
+        btns.emplace_back(std::make_unique<ButtonConfigGui>(gladeSearchPath, GTK_BOX(bld.get(hbox)), settings, button,
+                                                            withDevice));
+    };
+
+    emplaceButton("hboxLeftMouse", BUTTON_MOUSE_LEFT);
+    emplaceButton("hboxMiddleMouse", BUTTON_MOUSE_MIDDLE);
+    emplaceButton("hboxRightMouse", BUTTON_MOUSE_RIGHT);
+    emplaceButton("hboxEraser", BUTTON_ERASER);
+    emplaceButton("hboxTouch", BUTTON_TOUCH, true);
+    emplaceButton("hboxPenButton1", BUTTON_STYLUS_ONE);
+    emplaceButton("hboxPenButton2", BUTTON_STYLUS_TWO);
+    emplaceButton("hboxDefaultTool", BUTTON_DEFAULT);
+}
+
+void SettingsDialog::setDpi(int dpi) {
+    if (this->dpi == dpi) {
+        return;
+    }
+
+    this->dpi = dpi;
+    zoomcallib_set_val(ZOOM_CALLIB(callib), dpi);
+}
+
+void SettingsDialog::loadCheckbox(const char* name, bool value) {
+    gtk_check_button_set_active(GTK_CHECK_BUTTON(builder.get(name)), value);
+}
+
+auto SettingsDialog::getCheckbox(const char* name) -> bool {
+    return gtk_check_button_get_active(GTK_CHECK_BUTTON(builder.get(name)));
+}
+
+void SettingsDialog::loadSlider(const char* name, double value) {
+    GtkRange* range = GTK_RANGE(builder.get(name));
+    gtk_range_set_value(range, value);
+}
+
+auto SettingsDialog::getSlider(const char* name) -> double {
+    GtkRange* range = GTK_RANGE(builder.get(name));
+    return gtk_range_get_value(range);
+}
+
+/**
+ * Checkbox was toggled, enable / disable it
+ */
+void SettingsDialog::enableWithCheckbox(const string& checkboxId, const string& widgetId) {
+    bool enabled = gtk_check_button_get_active(GTK_CHECK_BUTTON(builder.get(checkboxId)));
+    gtk_widget_set_sensitive(builder.get(widgetId), enabled);
+}
+
+void SettingsDialog::disableWithCheckbox(const string& checkboxId, const string& widgetId) {
+    bool enabled = gtk_check_button_get_active(GTK_CHECK_BUTTON(builder.get(checkboxId)));
+    gtk_widget_set_sensitive(builder.get(widgetId), !enabled);
+}
+
+/**
+ * similar to enableWithCheckbox, but also disables widget if the checkbox is disabled
+ */
+void SettingsDialog::enableWithEnabledCheckbox(const string& checkboxId, const string& widgetId) {
+    GtkWidget* checkboxWidget = builder.get(checkboxId);
+    bool const enabled =
+            gtk_widget_get_sensitive(checkboxWidget) && gtk_check_button_get_active(GTK_CHECK_BUTTON(checkboxWidget));
+    gtk_widget_set_sensitive(builder.get(widgetId), enabled);
+}
+
+void SettingsDialog::updatePressureSensitivityOptions() {
+    GtkWidget* sensitivityOptionsFrame = builder.get("framePressureSensitivityScale");
+    bool havePressureInput = getCheckbox("cbSettingPresureSensitivity") || getCheckbox("cbEnablePressureInference");
+
+    if (!havePressureInput) {
+        gtk_widget_set_tooltip_text(sensitivityOptionsFrame,
+                                    _("Enable pressure sensitivity or pressure inference to change this setting!"));
+    } else {
+
+        gtk_widget_set_tooltip_text(sensitivityOptionsFrame,
+                                    _("Filter input pressure. Multiply the pressure by the pressure multiplier."
+                                      " If less than the minimum, use the minimum pressure."));
+    }
+    gtk_widget_set_sensitive(sensitivityOptionsFrame, havePressureInput);
+}
+
+void SettingsDialog::customHandRecognitionToggled() {
+    GtkWidget* cbTouchDisableMethod = builder.get("cbTouchDisableMethod");
+    int touchMethod = gtk_combo_box_get_active(GTK_COMBO_BOX(cbTouchDisableMethod));
+    gtk_widget_set_sensitive(builder.get("boxCustomTouchDisableSettings"), touchMethod == 2);
+}
+
+void SettingsDialog::customStylusIconTypeChanged() {
+    GtkWidget* cbStylusCursorType = builder.get("cbStylusCursorType");
+    int stylusCursorType = gtk_combo_box_get_active(GTK_COMBO_BOX(cbStylusCursorType));
+    bool showCursorHighlightOptions =
+            (stylusCursorType != STYLUS_CURSOR_NONE && stylusCursorType != STYLUS_CURSOR_ARROW);
+    gtk_widget_set_sensitive(builder.get("highlightCursorGrid"), showCursorHighlightOptions);
+}
+
+void SettingsDialog::showStabilizerAvMethodOptions(StrokeStabilizer::AveragingMethod method) {
+    bool showArithmetic = method == StrokeStabilizer::AveragingMethod::ARITHMETIC;
+    gtk_widget_set_visible(builder.get("lbStabilizerBuffersize"), showArithmetic);
+    gtk_widget_set_visible(builder.get("sbStabilizerBuffersize"), showArithmetic);
+
+    bool showSigma = method == StrokeStabilizer::AveragingMethod::VELOCITY_GAUSSIAN;
+    gtk_widget_set_visible(builder.get("lbStabilizerSigma"), showSigma);
+    gtk_widget_set_visible(builder.get("sbStabilizerSigma"), showSigma);
+
+    bool preprocessorOn = static_cast<StrokeStabilizer::Preprocessor>(gtk_combo_box_get_active(GTK_COMBO_BOX(
+                                  builder.get("cbStabilizerPreprocessors")))) != StrokeStabilizer::Preprocessor::NONE;
+    bool sensitive = showSigma || showArithmetic || preprocessorOn;
+    gtk_widget_set_sensitive(builder.get("cbStabilizerEnableFinalizeStroke"), sensitive);
+}
+
+void SettingsDialog::showStabilizerPreprocessorOptions(StrokeStabilizer::Preprocessor preprocessor) {
+    bool showDeadzone = preprocessor == StrokeStabilizer::Preprocessor::DEADZONE;
+    gtk_widget_set_visible(builder.get("lbStabilizerDeadzoneRadius"), showDeadzone);
+    gtk_widget_set_visible(builder.get("sbStabilizerDeadzoneRadius"), showDeadzone);
+    gtk_widget_set_visible(builder.get("cbStabilizerEnableCuspDetection"), showDeadzone);
+
+    bool showInertia = preprocessor == StrokeStabilizer::Preprocessor::INERTIA;
+    gtk_widget_set_visible(builder.get("lbStabilizerDrag"), showInertia);
+    gtk_widget_set_visible(builder.get("sbStabilizerDrag"), showInertia);
+    gtk_widget_set_visible(builder.get("lbStabilizerMass"), showInertia);
+    gtk_widget_set_visible(builder.get("sbStabilizerMass"), showInertia);
+
+    bool averagingOn = static_cast<StrokeStabilizer::AveragingMethod>(
+                               gtk_combo_box_get_active(GTK_COMBO_BOX(builder.get("cbStabilizerAveragingMethods")))) !=
+                       StrokeStabilizer::AveragingMethod::NONE;
+    bool sensitive = showDeadzone || showInertia || averagingOn;
+    gtk_widget_set_sensitive(builder.get("cbStabilizerEnableFinalizeStroke"), sensitive);
+}
+
+void SettingsDialog::load() {
+    loadCheckbox("cbSettingPresureSensitivity", settings->isPressureSensitivity());
+    loadCheckbox("cbEnableZoomGestures", settings->isZoomGesturesEnabled());
+    loadCheckbox("cbShowSidebarRight", settings->isSidebarOnRight());
+    loadCheckbox("cbShowScrollbarLeft", settings->isScrollbarOnLeft());
+    loadCheckbox("cbAutoloadMostRecent", settings->isAutoloadMostRecent());
+    loadCheckbox("cbAutoloadXoj", settings->isAutoloadPdfXoj());
+    loadCheckbox("cbAutosave", settings->isAutosaveEnabled());
+    loadCheckbox("cbAddVerticalSpace", settings->getAddVerticalSpace());
+    loadCheckbox("cbAddHorizontalSpace", settings->getAddHorizontalSpace());
+    loadCheckbox("cbUnlimitedScrolling", settings->getUnlimitedScrolling());
+    loadCheckbox("cbDrawDirModsEnabled", settings->getDrawDirModsEnabled());
+    loadCheckbox("cbStrokeFilterEnabled", settings->getStrokeFilterEnabled());
+    loadCheckbox("cbDoActionOnStrokeFiltered", settings->getDoActionOnStrokeFiltered());
+    loadCheckbox("cbTrySelectOnStrokeFiltered", settings->getTrySelectOnStrokeFiltered());
+    loadCheckbox("cbSnapRecognizedShapesEnabled", settings->getSnapRecognizedShapesEnabled());
+    loadCheckbox("cbRestoreLineWidthEnabled", settings->getRestoreLineWidthEnabled());
+    loadCheckbox("cbStockIcons", settings->areStockIconsUsed());
+    loadCheckbox("cbHideHorizontalScrollbar", settings->getScrollbarHideType() & SCROLLBAR_HIDE_HORIZONTAL);
+    loadCheckbox("cbHideVerticalScrollbar", settings->getScrollbarHideType() & SCROLLBAR_HIDE_VERTICAL);
+    loadCheckbox("cbDisableScrollbarFadeout", settings->isScrollbarFadeoutDisabled());
+    loadCheckbox("cbDisableAudio", settings->isAudioDisabled());
+    loadCheckbox("cbEnablePressureInference", settings->isPressureGuessingEnabled());
+    loadCheckbox("cbTouchDrawing", settings->getTouchDrawingEnabled());
+    loadCheckbox("cbDisableGtkInertialScroll", !settings->getGtkTouchInertialScrollingEnabled());
+    const bool ignoreStylusEventsEnabled = settings->getIgnoredStylusEvents() != 0;  // 0 means disabled, >0 enabled
+    loadCheckbox("cbIgnoreFirstStylusEvents", ignoreStylusEventsEnabled);
+    loadCheckbox("cbInputSystemDrawOutsideWindow", settings->getInputSystemDrawOutsideWindowEnabled());
+
+    /**
+     * Tab size related settings
+     */
+    loadCheckbox("cbUseSpacesAsTab", settings->getUseSpacesAsTab());
+    GtkSpinButton* sbNumberOfSpacesForTab = GTK_SPIN_BUTTON(builder.get("sbNumberOfSpacesForTab"));
+    gtk_spin_button_set_value(sbNumberOfSpacesForTab, settings->getNumberOfSpacesForTab());
+    gtk_widget_set_sensitive(GTK_WIDGET(builder.get("numberOfSpacesContainer")), settings->getUseSpacesAsTab());
+
+    // Laser pointer
+    gtk_spin_button_set_value(GTK_SPIN_BUTTON(builder.get("sbLaserFadeOutTime")),
+                              settings->getLaserPointerFadeOutTime());
+
+    /**
+     * Stabilizer related settings
+     */
+    loadCheckbox("cbStabilizerEnableCuspDetection", settings->getStabilizerCuspDetection());
+    loadCheckbox("cbStabilizerEnableFinalizeStroke", settings->getStabilizerFinalizeStroke());
+
+    GtkWidget* sbStabilizerBuffersize = builder.get("sbStabilizerBuffersize");
+    gtk_spin_button_set_value(GTK_SPIN_BUTTON(sbStabilizerBuffersize),
+                              static_cast<double>(settings->getStabilizerBuffersize()));
+    GtkWidget* sbStabilizerDeadzoneRadius = builder.get("sbStabilizerDeadzoneRadius");
+    gtk_spin_button_set_value(GTK_SPIN_BUTTON(sbStabilizerDeadzoneRadius), settings->getStabilizerDeadzoneRadius());
+    GtkWidget* sbStabilizerDrag = builder.get("sbStabilizerDrag");
+    gtk_spin_button_set_value(GTK_SPIN_BUTTON(sbStabilizerDrag), settings->getStabilizerDrag());
+    GtkWidget* sbStabilizerMass = builder.get("sbStabilizerMass");
+    gtk_spin_button_set_value(GTK_SPIN_BUTTON(sbStabilizerMass), settings->getStabilizerMass());
+    GtkWidget* sbStabilizerSigma = builder.get("sbStabilizerSigma");
+    gtk_spin_button_set_value(GTK_SPIN_BUTTON(sbStabilizerSigma), settings->getStabilizerSigma());
+
+    GtkComboBox* cbStabilizerAveragingMethods = GTK_COMBO_BOX(builder.get("cbStabilizerAveragingMethods"));
+    gtk_combo_box_set_active(cbStabilizerAveragingMethods, static_cast<int>(settings->getStabilizerAveragingMethod()));
+    showStabilizerAvMethodOptions(settings->getStabilizerAveragingMethod());
+    GtkComboBox* cbStabilizerPreprocessors = GTK_COMBO_BOX(builder.get("cbStabilizerPreprocessors"));
+    gtk_combo_box_set_active(cbStabilizerPreprocessors, static_cast<int>(settings->getStabilizerPreprocessor()));
+    showStabilizerPreprocessorOptions(settings->getStabilizerPreprocessor());
+    /***********/
+
+    GtkComboBox* cbSidebarNumberingStyle = GTK_COMBO_BOX(builder.get("cbSidebarPageNumberStyle"));
+    gtk_combo_box_set_active(cbSidebarNumberingStyle, static_cast<int>(settings->getSidebarNumberingStyle()));
+
+    GtkWidget* txtDefaultSaveName = builder.get("txtDefaultSaveName");
+    gtk_editable_set_text(GTK_EDITABLE(txtDefaultSaveName), char_cast(settings->getDefaultSaveName().c_str()));
+
+    GtkWidget* txtDefaultPdfName = builder.get("txtDefaultPdfName");
+    gtk_editable_set_text(GTK_EDITABLE(txtDefaultPdfName), char_cast(settings->getDefaultPdfExportName().c_str()));
+
+    GtkWidget* spAutosaveTimeout = builder.get("spAutosaveTimeout");
+    gtk_spin_button_set_value(GTK_SPIN_BUTTON(spAutosaveTimeout), settings->getAutosaveTimeout());
+
+    GtkWidget* spNumIgnoredStylusEvents = builder.get("spNumIgnoredStylusEvents");
+    if (!ignoreStylusEventsEnabled) {  // The spinButton's value should be >= 1
+        gtk_spin_button_set_value(GTK_SPIN_BUTTON(spNumIgnoredStylusEvents), 1);
+    } else {
+        gtk_spin_button_set_value(GTK_SPIN_BUTTON(spNumIgnoredStylusEvents), settings->getIgnoredStylusEvents());
+    }
+
+    GtkWidget* spPairsOffset = builder.get("spPairsOffset");
+    gtk_spin_button_set_value(GTK_SPIN_BUTTON(spPairsOffset), settings->getPairsOffset());
+
+    EmptyLastPageAppendType append = settings->getEmptyLastPageAppend();
+    loadCheckbox("rdLastPageAppendOnDrawOfLastPage", append == EmptyLastPageAppendType::OnDrawOfLastPage);
+    loadCheckbox("rdLastPageAppendOnScrollToEndOfLastPage", append == EmptyLastPageAppendType::OnScrollToEndOfLastPage);
+    loadCheckbox("rdLastPageAppendDisabled", append == EmptyLastPageAppendType::Disabled);
+
+    GtkWidget* spSnapRotationTolerance = builder.get("spSnapRotationTolerance");
+    gtk_spin_button_set_value(GTK_SPIN_BUTTON(spSnapRotationTolerance), settings->getSnapRotationTolerance());
+
+    GtkWidget* spSnapGridTolerance = builder.get("spSnapGridTolerance");
+    gtk_spin_button_set_value(GTK_SPIN_BUTTON(spSnapGridTolerance), settings->getSnapGridTolerance());
+
+    GtkWidget* spSnapGridSize = builder.get("spSnapGridSize");
+    gtk_spin_button_set_value(GTK_SPIN_BUTTON(spSnapGridSize), settings->getSnapGridSize() / DEFAULT_GRID_SIZE);
+
+    GtkWidget* spStrokeRecognizerMinSize = builder.get("spStrokeRecognizerMinSize");
+    gtk_spin_button_set_value(GTK_SPIN_BUTTON(spStrokeRecognizerMinSize), settings->getStrokeRecognizerMinSize());
+
+    gtk_spin_button_set_value(GTK_SPIN_BUTTON(builder.get("edgePanSpeed")), settings->getEdgePanSpeed());
+    gtk_spin_button_set_value(GTK_SPIN_BUTTON(builder.get("edgePanMaxMult")), settings->getEdgePanMaxMult());
+
+    GtkWidget* spZoomStep = builder.get("spZoomStep");
+    gtk_spin_button_set_value(GTK_SPIN_BUTTON(spZoomStep), settings->getZoomStep());
+
+    GtkWidget* spZoomStepScroll = builder.get("spZoomStepScroll");
+    gtk_spin_button_set_value(GTK_SPIN_BUTTON(spZoomStepScroll), settings->getZoomStepScroll());
+
+    GtkWidget* spAddHorizontalSpaceRight = builder.get("spAddHorizontalSpaceRight");
+    gtk_spin_button_set_value(GTK_SPIN_BUTTON(spAddHorizontalSpaceRight), settings->getAddHorizontalSpaceAmountRight());
+
+    GtkWidget* spAddVerticalSpaceAbove = builder.get("spAddVerticalSpaceAbove");
+    gtk_spin_button_set_value(GTK_SPIN_BUTTON(spAddVerticalSpaceAbove), settings->getAddVerticalSpaceAmountAbove());
+
+    GtkWidget* spAddHorizontalSpaceLeft = builder.get("spAddHorizontalSpaceLeft");
+    gtk_spin_button_set_value(GTK_SPIN_BUTTON(spAddHorizontalSpaceLeft), settings->getAddHorizontalSpaceAmountLeft());
+
+    GtkWidget* spAddVerticalSpaceBelow = builder.get("spAddVerticalSpaceBelow");
+    gtk_spin_button_set_value(GTK_SPIN_BUTTON(spAddVerticalSpaceBelow), settings->getAddVerticalSpaceAmountBelow());
+
+    GtkWidget* spDrawDirModsRadius = builder.get("spDrawDirModsRadius");
+    gtk_spin_button_set_value(GTK_SPIN_BUTTON(spDrawDirModsRadius), settings->getDrawDirModsRadius());
+
+    GtkWidget* spReRenderThreshold = builder.get("spReRenderThreshold");
+    gtk_spin_button_set_value(GTK_SPIN_BUTTON(spReRenderThreshold), settings->getPDFPageRerenderThreshold());
+
+    GtkWidget* spTouchZoomStartThreshold = builder.get("spTouchZoomStartThreshold");
+    gtk_spin_button_set_value(GTK_SPIN_BUTTON(spTouchZoomStartThreshold), settings->getTouchZoomStartThreshold());
+
+    {
+        int time = 0;
+        double length = 0;
+        int successive = 0;
+        settings->getStrokeFilter(&time, &length, &successive);
+
+        GtkWidget* spStrokeIgnoreTime = builder.get("spStrokeIgnoreTime");
+        gtk_spin_button_set_value(GTK_SPIN_BUTTON(spStrokeIgnoreTime), time);
+        GtkWidget* spStrokeIgnoreLength = builder.get("spStrokeIgnoreLength");
+        gtk_spin_button_set_value(GTK_SPIN_BUTTON(spStrokeIgnoreLength), length);
+        GtkWidget* spStrokeSuccessiveTime = builder.get("spStrokeSuccessiveTime");
+        gtk_spin_button_set_value(GTK_SPIN_BUTTON(spStrokeSuccessiveTime), successive);
+    }
+
+
+    auto* zoomCallibAutomaticCb = GTK_CHECK_BUTTON(builder.get("zoomCallibAutomaticCb"));
+    auto* zoomCallibSlider = GTK_RANGE(builder.get("zoomCallibSlider"));
+
+    g_signal_connect_object(
+            zoomCallibAutomaticCb, "notify::active", G_CALLBACK(+[](GObject* btn, GParamSpec*, gpointer slider) {
+                bool active = gtk_check_button_get_active(GTK_CHECK_BUTTON(btn));
+                gtk_widget_set_sensitive(GTK_WIDGET(slider), !active);
+                if (active) {
+                    auto dpi = xoj::util::gtk::getWidgetDPI(GTK_WIDGET(slider));
+                    gtk_range_set_value(GTK_RANGE(slider), dpi.value_or(Util::DPI_NORMALIZATION_FACTOR));
+                }
+            }),
+            zoomCallibSlider, GConnectFlags(0));
+
+    if (auto dpi = settings->getDisplayDpi(); dpi == -1) {
+        gtk_check_button_set_active(GTK_CHECK_BUTTON(builder.get("zoomCallibAutomaticCb")), true);
+        g_signal_connect(zoomCallibSlider, "realize", G_CALLBACK(+[](GtkWidget* slider, gpointer) {
+                             auto dpi = xoj::util::gtk::getWidgetDPI(slider);
+                             gtk_range_set_value(GTK_RANGE(slider), dpi.value_or(Util::DPI_NORMALIZATION_FACTOR));
+                         }),
+                         nullptr);
+        this->setDpi(72);
+    } else {
+        gtk_check_button_set_active(GTK_CHECK_BUTTON(builder.get("zoomCallibAutomaticCb")), false);
+        this->setDpi(dpi);
+    }
+    gtk_range_set_value(zoomCallibSlider, this->dpi);
+
+
+    loadSlider("scaleMinimumPressure", settings->getMinimumPressure());
+    loadSlider("scalePressureMultiplier", settings->getPressureMultiplier());
+
+    GdkRGBA color = Util::rgb_to_GdkRGBA(settings->getBorderColor());
+    gtk_color_chooser_set_rgba(GTK_COLOR_CHOOSER(builder.get("colorBorder")), &color);
+    color = Util::rgb_to_GdkRGBA(settings->getBackgroundColor());
+    gtk_color_chooser_set_rgba(GTK_COLOR_CHOOSER(builder.get("colorBackground")), &color);
+    color = Util::rgb_to_GdkRGBA(settings->getSelectionColor());
+    gtk_color_chooser_set_rgba(GTK_COLOR_CHOOSER(builder.get("colorSelection")), &color);
+    color = Util::rgb_to_GdkRGBA(settings->getActiveSelectionColor());
+    gtk_color_chooser_set_rgba(GTK_COLOR_CHOOSER(builder.get("colorSelectionActive")), &color);
+
+    {
+        const auto& recolor = settings->getRecolorParameters();
+        loadCheckbox("cbRecolorDrawingArea", recolor.recolorizeMainView);
+        loadCheckbox("cbRecolorPreviewSidebar", recolor.recolorizeSidebarMiniatures);
+        color = Util::argb_to_GdkRGBA(recolor.recolor.getLight());
+        gtk_color_chooser_set_rgba(GTK_COLOR_CHOOSER(builder.get("recolorLight")), &color);
+        color = Util::argb_to_GdkRGBA(recolor.recolor.getDark());
+        gtk_color_chooser_set_rgba(GTK_COLOR_CHOOSER(builder.get("recolorDark")), &color);
+    }
+
+    loadCheckbox("cbHighlightPosition", settings->isHighlightPosition());
+    color = Util::argb_to_GdkRGBA(settings->getCursorHighlightColor());
+    gtk_color_chooser_set_rgba(GTK_COLOR_CHOOSER(builder.get("cursorHighlightColor")), &color);
+    color = Util::argb_to_GdkRGBA(settings->getCursorHighlightBorderColor());
+    gtk_color_chooser_set_rgba(GTK_COLOR_CHOOSER(builder.get("cursorHighlightBorderColor")), &color);
+    gtk_spin_button_set_value(GTK_SPIN_BUTTON(builder.get("cursorHighlightRadius")),
+                              settings->getCursorHighlightRadius());
+    gtk_spin_button_set_value(GTK_SPIN_BUTTON(builder.get("cursorHighlightBorderWidth")),
+                              settings->getCursorHighlightBorderWidth());
+
+    switch (settings->getStylusCursorType()) {
+        case STYLUS_CURSOR_NONE:
+            gtk_combo_box_set_active(GTK_COMBO_BOX(builder.get("cbStylusCursorType")), 0);
+            break;
+        case STYLUS_CURSOR_BIG:
+            gtk_combo_box_set_active(GTK_COMBO_BOX(builder.get("cbStylusCursorType")), 2);
+            break;
+        case STYLUS_CURSOR_ARROW:
+            gtk_combo_box_set_active(GTK_COMBO_BOX(builder.get("cbStylusCursorType")), 3);
+            break;
+        case STYLUS_CURSOR_DOT:
+        default:
+            gtk_combo_box_set_active(GTK_COMBO_BOX(builder.get("cbStylusCursorType")), 1);
+            break;
+    }
+
+    switch (settings->getEraserVisibility()) {
+        case ERASER_VISIBILITY_NEVER:
+            gtk_combo_box_set_active(GTK_COMBO_BOX(builder.get("cbEraserVisibility")), 0);
+            break;
+        case ERASER_VISIBILITY_HOVER:
+            gtk_combo_box_set_active(GTK_COMBO_BOX(builder.get("cbEraserVisibility")), 2);
+            break;
+        case ERASER_VISIBILITY_TOUCH:
+            gtk_combo_box_set_active(GTK_COMBO_BOX(builder.get("cbEraserVisibility")), 3);
+            break;
+        case ERASER_VISIBILITY_ALWAYS:
+        default:
+            gtk_combo_box_set_active(GTK_COMBO_BOX(builder.get("cbEraserVisibility")), 1);
+            break;
+    }
+
+    switch (settings->getIconTheme()) {
+        case ICON_THEME_LUCIDE:
+            gtk_combo_box_set_active(GTK_COMBO_BOX(builder.get("cbIconTheme")), 1);
+            break;
+        case ICON_THEME_COLOR:
+        default:
+            gtk_combo_box_set_active(GTK_COMBO_BOX(builder.get("cbIconTheme")), 0);
+            break;
+    }
+
+    switch (settings->getThemeVariant()) {
+        case THEME_VARIANT_FORCE_LIGHT:
+            gtk_combo_box_set_active(GTK_COMBO_BOX(builder.get("cbThemeVariant")), 1);
+            break;
+        case THEME_VARIANT_FORCE_DARK:
+            gtk_combo_box_set_active(GTK_COMBO_BOX(builder.get("cbThemeVariant")), 2);
+            break;
+        case THEME_VARIANT_USE_SYSTEM:
+        default:
+            gtk_combo_box_set_active(GTK_COMBO_BOX(builder.get("cbThemeVariant")), 0);
+            break;
+    }
+
+    auto viewMode = settings->getViewModes().at(PresetViewModeIds::VIEW_MODE_FULLSCREEN);
+    bool showFullscreenMenubar = viewMode.showMenubar;
+    bool showFullscreenToolbar = viewMode.showToolbar;
+    bool showFullscreenSidebar = viewMode.showSidebar;
+    viewMode = settings->getViewModes().at(PresetViewModeIds::VIEW_MODE_PRESENTATION);
+    bool showPresentationMenubar = viewMode.showMenubar;
+    bool showPresentationToolbar = viewMode.showToolbar;
+    bool showPresentationSidebar = viewMode.showSidebar;
+    bool goPresentationFullscreen = viewMode.goFullscreen;
+
+    loadCheckbox("cbShowFullscreenMenubar", showFullscreenMenubar);
+    loadCheckbox("cbShowFullscreenToolbar", showFullscreenToolbar);
+    loadCheckbox("cbShowFullscreenSidebar", showFullscreenSidebar);
+    loadCheckbox("cbShowPresentationMenubar", showPresentationMenubar);
+    loadCheckbox("cbShowPresentationToolbar", showPresentationToolbar);
+    loadCheckbox("cbShowPresentationSidebar", showPresentationSidebar);
+    loadCheckbox("cbPresentationGoFullscreen", goPresentationFullscreen);
+    loadCheckbox("cbHideMenubarStartup", settings->isMenubarVisible());
+    loadCheckbox("cbShowFilepathInTitlebar", settings->isFilepathInTitlebarShown());
+    loadCheckbox("cbShowPageNumberInTitlebar", settings->isPageNumberInTitlebarShown());
+
+    gtk_spin_button_set_value(GTK_SPIN_BUTTON(builder.get("preloadPagesBefore")),
+                              static_cast<double>(settings->getPreloadPagesBefore()));
+    gtk_spin_button_set_value(GTK_SPIN_BUTTON(builder.get("preloadPagesAfter")),
+                              static_cast<double>(settings->getPreloadPagesAfter()));
+    loadCheckbox("cbEagerPageCleanup", settings->isEagerPageCleanup());
+
+    disableWithCheckbox("cbUnlimitedScrolling", "cbAddVerticalSpace");
+    disableWithCheckbox("cbUnlimitedScrolling", "cbAddHorizontalSpace");
+
+    enableWithCheckbox("cbAutosave", "boxAutosave");
+    enableWithCheckbox("cbIgnoreFirstStylusEvents", "spNumIgnoredStylusEvents");
+    enableWithEnabledCheckbox("cbAddVerticalSpace", "spAddVerticalSpaceAbove");
+    enableWithEnabledCheckbox("cbAddHorizontalSpace", "spAddHorizontalSpaceRight");
+    enableWithEnabledCheckbox("cbAddVerticalSpace", "spAddVerticalSpaceBelow");
+    enableWithEnabledCheckbox("cbAddHorizontalSpace", "spAddHorizontalSpaceLeft");
+    enableWithCheckbox("cbDrawDirModsEnabled", "spDrawDirModsRadius");
+    enableWithCheckbox("cbStrokeFilterEnabled", "spStrokeIgnoreTime");
+    enableWithCheckbox("cbStrokeFilterEnabled", "spStrokeIgnoreLength");
+    enableWithCheckbox("cbStrokeFilterEnabled", "spStrokeSuccessiveTime");
+    enableWithCheckbox("cbStrokeFilterEnabled", "cbDoActionOnStrokeFiltered");
+    enableWithCheckbox("cbStrokeFilterEnabled", "cbTrySelectOnStrokeFiltered");
+    enableWithCheckbox("cbEnableZoomGestures", "gdStartZoomAtSetting");
+    enableWithCheckbox("cbDisableTouchOnPenNear", "boxInternalHandRecognition");
+    customHandRecognitionToggled();
+    customStylusIconTypeChanged();
+    updatePressureSensitivityOptions();
+
+
+    SElement& touch = settings->getCustomElement("touch");
+    bool disablePen = false;
+    touch.getBool("disableTouch", disablePen);
+    loadCheckbox("cbDisableTouchOnPenNear", disablePen);
+
+    string disableMethod;
+    touch.getString("method", disableMethod);
+    int methodId = 0;
+    if (disableMethod == "X11") {
+        methodId = 1;
+    } else if (disableMethod == "custom") {
+        methodId = 2;
+    }
+
+    gtk_combo_box_set_active(GTK_COMBO_BOX(builder.get("cbTouchDisableMethod")), methodId);
+
+    string cmd;
+    touch.getString("cmdEnable", cmd);
+    gtk_editable_set_text(GTK_EDITABLE(builder.get("txtEnableTouchCommand")), cmd.c_str());
+
+    cmd = "";
+    touch.getString("cmdDisable", cmd);
+    gtk_editable_set_text(GTK_EDITABLE(builder.get("txtDisableTouchCommand")), cmd.c_str());
+
+    int timeoutMs = 1000;
+    touch.getInt("timeout", timeoutMs);
+    gtk_spin_button_set_value(GTK_SPIN_BUTTON(builder.get("spTouchDisableTimeout")), timeoutMs / 1000.0);
+
+#ifdef ENABLE_AUDIO
+    gtk_file_chooser_set_current_folder(GTK_FILE_CHOOSER(builder.get("fcAudioPath")),
+                                        Util::toGFilename(settings->getAudioFolder()).c_str());
+    if (this->control->getAudioController()) {
+        this->audioInputDevices = this->control->getAudioController()->getInputDevices();
+        gtk_combo_box_text_append(GTK_COMBO_BOX_TEXT(builder.get("cbAudioInputDevice")), "", "System default");
+        gtk_combo_box_set_active(GTK_COMBO_BOX(builder.get("cbAudioInputDevice")), 0);
+        for (auto& audioInputDevice: this->audioInputDevices) {
+            gtk_combo_box_text_append(GTK_COMBO_BOX_TEXT(builder.get("cbAudioInputDevice")), "",
+                                      audioInputDevice.getDeviceName().c_str());
+        }
+        for (size_t i = 0; i < this->audioInputDevices.size(); i++) {
+            if (this->audioInputDevices[i].getSelected()) {
+                gtk_combo_box_set_active(GTK_COMBO_BOX(builder.get("cbAudioInputDevice")), static_cast<gint>(i + 1));
+            }
+        }
+
+        this->audioOutputDevices = this->control->getAudioController()->getOutputDevices();
+        gtk_combo_box_text_append(GTK_COMBO_BOX_TEXT(builder.get("cbAudioOutputDevice")), "", "System default");
+        gtk_combo_box_set_active(GTK_COMBO_BOX(builder.get("cbAudioOutputDevice")), 0);
+        for (auto& audioOutputDevice: this->audioOutputDevices) {
+            gtk_combo_box_text_append(GTK_COMBO_BOX_TEXT(builder.get("cbAudioOutputDevice")), "",
+                                      audioOutputDevice.getDeviceName().c_str());
+        }
+        for (size_t i = 0; i < this->audioOutputDevices.size(); i++) {
+            if (this->audioOutputDevices[i].getSelected()) {
+                gtk_combo_box_set_active(GTK_COMBO_BOX(builder.get("cbAudioOutputDevice")), static_cast<gint>(i + 1));
+            }
+        }
+
+        switch (static_cast<int>(settings->getAudioSampleRate())) {
+            case 16000:
+                gtk_combo_box_set_active(GTK_COMBO_BOX(builder.get("cbAudioSampleRate")), 0);
+                break;
+            case 96000:
+                gtk_combo_box_set_active(GTK_COMBO_BOX(builder.get("cbAudioSampleRate")), 2);
+                break;
+            case 192000:
+                gtk_combo_box_set_active(GTK_COMBO_BOX(builder.get("cbAudioSampleRate")), 3);
+                break;
+            case 44100:
+            default:
+                gtk_combo_box_set_active(GTK_COMBO_BOX(builder.get("cbAudioSampleRate")), 1);
+                break;
+        }
+
+        gtk_spin_button_set_value(GTK_SPIN_BUTTON(builder.get("spAudioGain")), settings->getAudioGain());
+        gtk_spin_button_set_value(GTK_SPIN_BUTTON(builder.get("spDefaultSeekTime")), settings->getDefaultSeekTime());
+    }
+#else
+    gtk_widget_destroy(builder.get("audioRecordingTabBox"));
+#endif
+
+    this->latexPanel.load(settings->latexSettings);
+    paletteTab.renderPaletteTab(this->control->getPalette().getFilePath());
+}
+
+void SettingsDialog::save() {
+    settings->transactionStart();
+
+    settings->setPressureSensitivity(getCheckbox("cbSettingPresureSensitivity"));
+    settings->setMinimumPressure(getSlider("scaleMinimumPressure"));
+    settings->setPressureMultiplier(getSlider("scalePressureMultiplier"));
+    settings->setZoomGesturesEnabled(getCheckbox("cbEnableZoomGestures"));
+    settings->setSidebarOnRight(getCheckbox("cbShowSidebarRight"));
+    settings->setScrollbarOnLeft(getCheckbox("cbShowScrollbarLeft"));
+    settings->setAutoloadMostRecent(getCheckbox("cbAutoloadMostRecent"));
+    settings->setAutoloadPdfXoj(getCheckbox("cbAutoloadXoj"));
+    settings->setAutosaveEnabled(getCheckbox("cbAutosave"));
+    settings->setAddVerticalSpace(getCheckbox("cbAddVerticalSpace"));
+    settings->setAddHorizontalSpace(getCheckbox("cbAddHorizontalSpace"));
+    settings->setUnlimitedScrolling(getCheckbox("cbUnlimitedScrolling"));
+    settings->setDrawDirModsEnabled(getCheckbox("cbDrawDirModsEnabled"));
+    settings->setStrokeFilterEnabled(getCheckbox("cbStrokeFilterEnabled"));
+    settings->setDoActionOnStrokeFiltered(getCheckbox("cbDoActionOnStrokeFiltered"));
+    settings->setTrySelectOnStrokeFiltered(getCheckbox("cbTrySelectOnStrokeFiltered"));
+    settings->setSnapRecognizedShapesEnabled(getCheckbox("cbSnapRecognizedShapesEnabled"));
+    settings->setRestoreLineWidthEnabled(getCheckbox("cbRestoreLineWidthEnabled"));
+    settings->setAreStockIconsUsed(getCheckbox("cbStockIcons"));
+    settings->setPressureGuessingEnabled(getCheckbox("cbEnablePressureInference"));
+    settings->setTouchDrawingEnabled(getCheckbox("cbTouchDrawing"));
+    settings->setGtkTouchInertialScrollingEnabled(!getCheckbox("cbDisableGtkInertialScroll"));
+    settings->setInputSystemDrawOutsideWindowEnabled(getCheckbox("cbInputSystemDrawOutsideWindow"));
+    settings->setScrollbarFadeoutDisabled(getCheckbox("cbDisableScrollbarFadeout"));
+    settings->setAudioDisabled(getCheckbox("cbDisableAudio"));
+
+    /**
+     * Tab size relate settings
+     */
+    settings->setUseSpacesAsTab(getCheckbox("cbUseSpacesAsTab"));
+    settings->setNumberOfSpacesForTab(static_cast<unsigned int>(
+            gtk_spin_button_get_value_as_int(GTK_SPIN_BUTTON(builder.get("sbNumberOfSpacesForTab")))));
+
+    settings->setLaserPointerFadeOutTime(static_cast<unsigned int>(
+            gtk_spin_button_get_value_as_int(GTK_SPIN_BUTTON(builder.get("sbLaserFadeOutTime")))));
+
+    /**
+     * Stabilizer related settings
+     */
+    settings->setStabilizerAveragingMethod(static_cast<StrokeStabilizer::AveragingMethod>(
+            gtk_combo_box_get_active(GTK_COMBO_BOX(builder.get("cbStabilizerAveragingMethods")))));
+    settings->setStabilizerPreprocessor(static_cast<StrokeStabilizer::Preprocessor>(
+            gtk_combo_box_get_active(GTK_COMBO_BOX(builder.get("cbStabilizerPreprocessors")))));
+    settings->setStabilizerBuffersize(static_cast<size_t>(
+            gtk_spin_button_get_value_as_int(GTK_SPIN_BUTTON(builder.get("sbStabilizerBuffersize")))));
+    settings->setStabilizerDeadzoneRadius(
+            gtk_spin_button_get_value(GTK_SPIN_BUTTON(builder.get("sbStabilizerDeadzoneRadius"))));
+    settings->setStabilizerDrag(gtk_spin_button_get_value(GTK_SPIN_BUTTON(builder.get("sbStabilizerDrag"))));
+    settings->setStabilizerMass(gtk_spin_button_get_value(GTK_SPIN_BUTTON(builder.get("sbStabilizerMass"))));
+    settings->setStabilizerSigma(gtk_spin_button_get_value(GTK_SPIN_BUTTON(builder.get("sbStabilizerSigma"))));
+    settings->setStabilizerCuspDetection(getCheckbox("cbStabilizerEnableCuspDetection"));
+    settings->setStabilizerFinalizeStroke(getCheckbox("cbStabilizerEnableFinalizeStroke"));
+
+    settings->setSidebarNumberingStyle(static_cast<SidebarNumberingStyle>(
+            gtk_combo_box_get_active(GTK_COMBO_BOX(builder.get("cbSidebarPageNumberStyle")))));
+
+    auto scrollbarHideType =
+            static_cast<std::make_unsigned<std::underlying_type<ScrollbarHideType>::type>::type>(SCROLLBAR_HIDE_NONE);
+    if (getCheckbox("cbHideHorizontalScrollbar")) {
+        scrollbarHideType |= SCROLLBAR_HIDE_HORIZONTAL;
+    }
+    if (getCheckbox("cbHideVerticalScrollbar")) {
+        scrollbarHideType |= SCROLLBAR_HIDE_VERTICAL;
+    }
+    settings->setScrollbarHideType(static_cast<ScrollbarHideType>(scrollbarHideType));
+
+    GdkRGBA color;
+    gtk_color_chooser_get_rgba(GTK_COLOR_CHOOSER(builder.get("colorBorder")), &color);
+    settings->setBorderColor(Util::GdkRGBA_to_argb(color));
+
+    gtk_color_chooser_get_rgba(GTK_COLOR_CHOOSER(builder.get("colorBackground")), &color);
+    settings->setBackgroundColor(Util::GdkRGBA_to_argb(color));
+
+    gtk_color_chooser_get_rgba(GTK_COLOR_CHOOSER(builder.get("colorSelection")), &color);
+    settings->setSelectionColor(Util::GdkRGBA_to_argb(color));
+
+    gtk_color_chooser_get_rgba(GTK_COLOR_CHOOSER(builder.get("colorSelectionActive")), &color);
+    settings->setActiveSelectionColor(Util::GdkRGBA_to_argb(color));
+
+    {
+        GdkRGBA color2;
+        gtk_color_chooser_get_rgba(GTK_COLOR_CHOOSER(builder.get("recolorLight")), &color);
+        gtk_color_chooser_get_rgba(GTK_COLOR_CHOOSER(builder.get("recolorDark")), &color2);
+
+        settings->setRecolorParameters({getCheckbox("cbRecolorDrawingArea"), getCheckbox("cbRecolorPreviewSidebar"),
+                                        Recolor(Util::GdkRGBA_to_argb(color), Util::GdkRGBA_to_argb(color2))});
+    }
+
+    settings->setHighlightPosition(getCheckbox("cbHighlightPosition"));
+    gtk_color_chooser_get_rgba(GTK_COLOR_CHOOSER(builder.get("cursorHighlightColor")), &color);
+    settings->setCursorHighlightColor(Util::GdkRGBA_to_argb(color));
+    gtk_color_chooser_get_rgba(GTK_COLOR_CHOOSER(builder.get("cursorHighlightBorderColor")), &color);
+    settings->setCursorHighlightBorderColor(Util::GdkRGBA_to_argb(color));
+    GtkWidget* spCursorHighlightRadius = builder.get("cursorHighlightRadius");
+    settings->setCursorHighlightRadius(gtk_spin_button_get_value(GTK_SPIN_BUTTON(spCursorHighlightRadius)));
+    GtkWidget* spCursorHighlightBorderWidth = builder.get("cursorHighlightBorderWidth");
+    settings->setCursorHighlightBorderWidth(gtk_spin_button_get_value(GTK_SPIN_BUTTON(spCursorHighlightBorderWidth)));
+
+    switch (gtk_combo_box_get_active(GTK_COMBO_BOX(builder.get("cbStylusCursorType")))) {
+        case 0:
+            settings->setStylusCursorType(STYLUS_CURSOR_NONE);
+            break;
+        case 2:
+            settings->setStylusCursorType(STYLUS_CURSOR_BIG);
+            break;
+        case 3:
+            settings->setStylusCursorType(STYLUS_CURSOR_ARROW);
+            break;
+        case 1:
+        default:
+            settings->setStylusCursorType(STYLUS_CURSOR_DOT);
+            break;
+    }
+
+    switch (gtk_combo_box_get_active(GTK_COMBO_BOX(builder.get("cbEraserVisibility")))) {
+        case 0:
+            settings->setEraserVisibility(ERASER_VISIBILITY_NEVER);
+            break;
+        case 2:
+            settings->setEraserVisibility(ERASER_VISIBILITY_HOVER);
+            break;
+        case 3:
+            settings->setEraserVisibility(ERASER_VISIBILITY_TOUCH);
+            break;
+        case 1:
+        default:
+            settings->setEraserVisibility(ERASER_VISIBILITY_ALWAYS);
+            break;
+    }
+
+    switch (gtk_combo_box_get_active(GTK_COMBO_BOX(builder.get("cbIconTheme")))) {
+        case 1:
+            settings->setIconTheme(ICON_THEME_LUCIDE);
+            break;
+        case 0:
+        default:
+            settings->setIconTheme(ICON_THEME_COLOR);
+            break;
+    }
+
+    switch (gtk_combo_box_get_active(GTK_COMBO_BOX(builder.get("cbThemeVariant")))) {
+        case 1:
+            settings->setThemeVariant(THEME_VARIANT_FORCE_LIGHT);
+            break;
+        case 2:
+            settings->setThemeVariant(THEME_VARIANT_FORCE_DARK);
+            break;
+        case 0:
+        default:
+            settings->setThemeVariant(THEME_VARIANT_USE_SYSTEM);
+            break;
+    }
+
+    ViewMode viewModeFullscreen;
+    viewModeFullscreen.goFullscreen = true;
+    viewModeFullscreen.showMenubar = getCheckbox("cbShowFullscreenMenubar");
+    viewModeFullscreen.showToolbar = getCheckbox("cbShowFullscreenToolbar");
+    viewModeFullscreen.showSidebar = getCheckbox("cbShowFullscreenSidebar");
+    settings->setViewMode(PresetViewModeIds::VIEW_MODE_FULLSCREEN, viewModeFullscreen);
+
+    ViewMode viewModePresentation;
+    viewModePresentation.showMenubar = getCheckbox("cbShowPresentationMenubar");
+    viewModePresentation.showToolbar = getCheckbox("cbShowPresentationToolbar");
+    viewModePresentation.showSidebar = getCheckbox("cbShowPresentationSidebar");
+    viewModePresentation.goFullscreen = getCheckbox("cbPresentationGoFullscreen");
+    settings->setViewMode(PresetViewModeIds::VIEW_MODE_PRESENTATION, viewModePresentation);
+
+    settings->setMenubarVisible(getCheckbox("cbHideMenubarStartup"));
+    settings->setFilepathInTitlebarShown(getCheckbox("cbShowFilepathInTitlebar"));
+    settings->setPageNumberInTitlebarShown(getCheckbox("cbShowPageNumberInTitlebar"));
+
+    constexpr auto spinAsUint = [&](GtkSpinButton* btn) {
+        int v = gtk_spin_button_get_value_as_int(btn);
+        return v < 0 ? 0U : static_cast<unsigned int>(v);
+    };
+    unsigned int preloadPagesBefore = spinAsUint(GTK_SPIN_BUTTON(builder.get("preloadPagesBefore")));
+    unsigned int preloadPagesAfter = spinAsUint(GTK_SPIN_BUTTON(builder.get("preloadPagesAfter")));
+    settings->setPreloadPagesAfter(preloadPagesAfter);
+    settings->setPreloadPagesBefore(preloadPagesBefore);
+    settings->setEagerPageCleanup(getCheckbox("cbEagerPageCleanup"));
+
+    settings->setDefaultSaveName(
+            xoj::util::utf8(gtk_editable_get_text(GTK_EDITABLE(builder.get("txtDefaultSaveName")))).str());
+    settings->setDefaultPdfExportName(
+            xoj::util::utf8(gtk_editable_get_text(GTK_EDITABLE(builder.get("txtDefaultPdfName")))).str());
+
+    GtkWidget* spAutosaveTimeout = builder.get("spAutosaveTimeout");
+    int autosaveTimeout = static_cast<int>(gtk_spin_button_get_value(GTK_SPIN_BUTTON(spAutosaveTimeout)));
+    settings->setAutosaveTimeout(autosaveTimeout);
+
+    if (getCheckbox("cbIgnoreFirstStylusEvents")) {
+        GtkWidget* spNumIgnoredStylusEvents = builder.get("spNumIgnoredStylusEvents");
+        int numIgnoredStylusEvents =
+                static_cast<int>(gtk_spin_button_get_value(GTK_SPIN_BUTTON(spNumIgnoredStylusEvents)));
+        settings->setIgnoredStylusEvents(numIgnoredStylusEvents);
+    } else {
+        settings->setIgnoredStylusEvents(0);  // This means nothing will be ignored
+    }
+
+    GtkWidget* spPairsOffset = builder.get("spPairsOffset");
+    int numPairsOffset = static_cast<int>(gtk_spin_button_get_value(GTK_SPIN_BUTTON(spPairsOffset)));
+    settings->setPairsOffset(numPairsOffset);
+
+    if (getCheckbox("rdLastPageAppendDisabled")) {
+        settings->setEmptyLastPageAppend(EmptyLastPageAppendType::Disabled);
+    } else if (getCheckbox("rdLastPageAppendOnDrawOfLastPage")) {
+        settings->setEmptyLastPageAppend(EmptyLastPageAppendType::OnDrawOfLastPage);
+    } else if (getCheckbox("rdLastPageAppendOnScrollToEndOfLastPage")) {
+        settings->setEmptyLastPageAppend(EmptyLastPageAppendType::OnScrollToEndOfLastPage);
+    } else {
+        settings->setEmptyLastPageAppend(EmptyLastPageAppendType::Disabled);
+    }
+
+    settings->setEdgePanSpeed(gtk_spin_button_get_value(GTK_SPIN_BUTTON(builder.get("edgePanSpeed"))));
+    settings->setEdgePanMaxMult(gtk_spin_button_get_value(GTK_SPIN_BUTTON(builder.get("edgePanMaxMult"))));
+
+    GtkWidget* spZoomStep = builder.get("spZoomStep");
+    double zoomStep = gtk_spin_button_get_value(GTK_SPIN_BUTTON(spZoomStep));
+    settings->setZoomStep(zoomStep);
+
+    GtkWidget* spZoomStepScroll = builder.get("spZoomStepScroll");
+    double zoomStepScroll = gtk_spin_button_get_value(GTK_SPIN_BUTTON(spZoomStepScroll));
+    settings->setZoomStepScroll(zoomStepScroll);
+
+
+    GtkWidget* spAddHorizontalSpaceRight = builder.get("spAddHorizontalSpaceRight");
+    const int addHorizontalSpaceAmountRight =
+            static_cast<int>(gtk_spin_button_get_value(GTK_SPIN_BUTTON(spAddHorizontalSpaceRight)));
+    settings->setAddHorizontalSpaceAmountRight(addHorizontalSpaceAmountRight);
+
+    GtkWidget* spAddVerticalSpaceAbove = builder.get("spAddVerticalSpaceAbove");
+    const int addVerticalSpaceAmountAbove =
+            static_cast<int>(gtk_spin_button_get_value(GTK_SPIN_BUTTON(spAddVerticalSpaceAbove)));
+    settings->setAddVerticalSpaceAmountAbove(addVerticalSpaceAmountAbove);
+
+    GtkWidget* spAddHorizontalSpaceLeft = builder.get("spAddHorizontalSpaceLeft");
+    const int addHorizontalSpaceAmountLeft =
+            static_cast<int>(gtk_spin_button_get_value(GTK_SPIN_BUTTON(spAddHorizontalSpaceLeft)));
+    settings->setAddHorizontalSpaceAmountLeft(addHorizontalSpaceAmountLeft);
+
+    GtkWidget* spAddVerticalSpaceBelow = builder.get("spAddVerticalSpaceBelow");
+    const int addVerticalSpaceAmountBelow =
+            static_cast<int>(gtk_spin_button_get_value(GTK_SPIN_BUTTON(spAddVerticalSpaceBelow)));
+    settings->setAddVerticalSpaceAmountBelow(addVerticalSpaceAmountBelow);
+
+
+    GtkWidget* spDrawDirModsRadius = builder.get("spDrawDirModsRadius");
+    int drawDirModsRadius = static_cast<int>(gtk_spin_button_get_value(GTK_SPIN_BUTTON(spDrawDirModsRadius)));
+    settings->setDrawDirModsRadius(drawDirModsRadius);
+
+    GtkWidget* spStrokeIgnoreTime = builder.get("spStrokeIgnoreTime");
+    int strokeIgnoreTime = static_cast<int>(gtk_spin_button_get_value(GTK_SPIN_BUTTON(spStrokeIgnoreTime)));
+    GtkWidget* spStrokeIgnoreLength = builder.get("spStrokeIgnoreLength");
+    double strokeIgnoreLength = gtk_spin_button_get_value(GTK_SPIN_BUTTON(spStrokeIgnoreLength));
+    GtkWidget* spStrokeSuccessiveTime = builder.get("spStrokeSuccessiveTime");
+    int strokeSuccessiveTime = static_cast<int>(gtk_spin_button_get_value(GTK_SPIN_BUTTON(spStrokeSuccessiveTime)));
+    settings->setStrokeFilter(strokeIgnoreTime, strokeIgnoreLength, strokeSuccessiveTime);
+
+    GtkWidget* spTouchZoomStartThreshold = builder.get("spTouchZoomStartThreshold");
+    double zoomStartThreshold = gtk_spin_button_get_value(GTK_SPIN_BUTTON(spTouchZoomStartThreshold));
+    settings->setTouchZoomStartThreshold(zoomStartThreshold);
+
+    GtkWidget* spReRenderThreshold = builder.get("spReRenderThreshold");
+    double rerenderThreshold = gtk_spin_button_get_value(GTK_SPIN_BUTTON(spReRenderThreshold));
+    settings->setPDFPageRerenderThreshold(rerenderThreshold);
+
+    settings->setDisplayDpi(gtk_check_button_get_active(GTK_CHECK_BUTTON(builder.get("zoomCallibAutomaticCb"))) ? -1 :
+                                                                                                                  dpi);
+
+    for (auto&& bcg: this->buttonConfigs) {
+        bcg->saveSettings();
+    }
+
+    languageConfig.saveSettings();
+
+    SElement& touch = settings->getCustomElement("touch");
+    touch.setBool("disableTouch", getCheckbox("cbDisableTouchOnPenNear"));
+    int touchMethod = gtk_combo_box_get_active(GTK_COMBO_BOX(builder.get("cbTouchDisableMethod")));
+
+    switch (touchMethod) {
+        case 1:
+            touch.setString("method", "X11");
+            break;
+        case 2:
+            touch.setString("method", "custom");
+            break;
+        case 0:
+        default:
+            touch.setString("method", "auto");
+    }
+    touch.setString("cmdEnable", gtk_editable_get_text(GTK_EDITABLE(builder.get("txtEnableTouchCommand"))));
+    touch.setString("cmdDisable", gtk_editable_get_text(GTK_EDITABLE(builder.get("txtDisableTouchCommand"))));
+
+    touch.setInt(
+            "timeout",
+            static_cast<int>(gtk_spin_button_get_value(GTK_SPIN_BUTTON(builder.get("spTouchDisableTimeout"))) * 1000));
+
+    settings->setSnapRotationTolerance(
+            static_cast<double>(gtk_spin_button_get_value(GTK_SPIN_BUTTON(builder.get("spSnapRotationTolerance")))));
+    settings->setSnapGridTolerance(
+            static_cast<double>(gtk_spin_button_get_value(GTK_SPIN_BUTTON(builder.get("spSnapGridTolerance")))));
+    settings->setSnapGridSize(static_cast<double>(
+            gtk_spin_button_get_value(GTK_SPIN_BUTTON(builder.get("spSnapGridSize"))) * DEFAULT_GRID_SIZE));
+
+    settings->setStrokeRecognizerMinSize(
+            static_cast<double>(gtk_spin_button_get_value(GTK_SPIN_BUTTON(builder.get("spStrokeRecognizerMinSize")))));
+
+#ifdef ENABLE_AUDIO
+    auto file = gtk_file_chooser_get_file(GTK_FILE_CHOOSER(builder.get("fcAudioPath")));
+    auto path = Util::fromGFile(file);
+    g_object_unref(file);
+    if (fs::is_directory(path)) {
+        settings->setAudioFolder(path);
+    }
+
+    size_t selectedInputDeviceIndex =
+            static_cast<size_t>(gtk_combo_box_get_active(GTK_COMBO_BOX(builder.get("cbAudioInputDevice"))));
+    if (selectedInputDeviceIndex == 0) {
+        settings->setAudioInputDevice(Settings::AUDIO_INPUT_SYSTEM_DEFAULT);
+    } else if (selectedInputDeviceIndex - 1 < this->audioInputDevices.size()) {
+        settings->setAudioInputDevice(this->audioInputDevices[selectedInputDeviceIndex - 1].getIndex());
+    }
+
+    size_t selectedOutputDeviceIndex =
+            static_cast<size_t>(gtk_combo_box_get_active(GTK_COMBO_BOX(builder.get("cbAudioOutputDevice"))));
+    if (selectedOutputDeviceIndex == 0) {
+        settings->setAudioOutputDevice(Settings::AUDIO_OUTPUT_SYSTEM_DEFAULT);
+    } else if (selectedOutputDeviceIndex - 1 < this->audioOutputDevices.size()) {
+        settings->setAudioOutputDevice(this->audioOutputDevices[selectedOutputDeviceIndex - 1].getIndex());
+    }
+
+    switch (gtk_combo_box_get_active(GTK_COMBO_BOX(builder.get("cbAudioSampleRate")))) {
+        case 0:
+            settings->setAudioSampleRate(16000.0);
+            break;
+        case 2:
+            settings->setAudioSampleRate(96000.0);
+            break;
+        case 3:
+            settings->setAudioSampleRate(192000.0);
+            break;
+        case 1:
+        default:
+            settings->setAudioSampleRate(44100.0);
+            break;
+    }
+
+    settings->setAudioGain(static_cast<double>(gtk_spin_button_get_value(GTK_SPIN_BUTTON(builder.get("spAudioGain")))));
+    settings->setDefaultSeekTime(
+            static_cast<unsigned int>(gtk_spin_button_get_value(GTK_SPIN_BUTTON(builder.get("spDefaultSeekTime")))));
+#endif
+
+    const std::optional<std::filesystem::path> selectedPalette = paletteTab.getSelectedPalette();
+    if (selectedPalette.has_value()) {
+        settings->setColorPaletteSetting(selectedPalette.value());
+    }
+
+    this->deviceTestingArea->saveSettings();
+
+    this->latexPanel.save(settings->latexSettings);
+
+    settings->transactionEnd();
+
+    this->control->getWindow()->setGtkTouchscreenScrollingForDeviceMapping();
+
+    this->control->initButtonTool();
+    this->control->getWindow()->getXournal()->onSettingsChanged();
+}
diff --git a/entry/src/main/cpp/src/core/gui/dialog/SettingsDialog.h b/entry/src/main/cpp/src/core/gui/dialog/SettingsDialog.h
new file mode 100644
index 0000000..9b36489
--- /dev/null
+++ b/entry/src/main/cpp/src/core/gui/dialog/SettingsDialog.h
@@ -0,0 +1,105 @@
+/*
+ * Xournal++
+ *
+ * Settings Dialog
+ *
+ * @author Xournal++ Team
+ * https://github.com/xournalpp/xournalpp
+ *
+ * @license GNU GPLv2 or later
+ */
+
+#pragma once
+
+#include <functional>
+#include <string>  // for string
+#include <vector>  // for vector
+
+#include <gtk/gtk.h>  // for GtkWidget, GtkWindow
+
+#include "audio/DeviceInfo.h"                    // for DeviceInfo
+#include "control/tools/StrokeStabilizerEnum.h"  // for AveragingMethod, Pre...
+#include "gui/Builder.h"
+#include "util/raii/GtkWindowUPtr.h"
+
+#include "ButtonConfigGui.h"
+#include "LanguageConfigGui.h"
+#include "LatexSettingsPanel.h"
+#include "SettingsDialogPaletteTab.h"
+#include "config-features.h"  // for ENABLE_AUDIO
+#include "filesystem.h"       // for path
+
+class Control;
+class Settings;
+class DeviceTestingArea;
+
+struct Palette;
+
+class SettingsDialog {
+public:
+    SettingsDialog(GladeSearchpath* gladeSearchPath, Settings* settings, Control* control,
+                   const std::vector<fs::path>& paletteDirectories, std::function<void()> callback);
+    ~SettingsDialog();
+
+    inline GtkWindow* getWindow() const { return window.get(); }
+
+private:
+    void save();
+    void setDpi(int dpi);
+
+    /**
+     * Set active regions
+     */
+    void enableWithCheckbox(const std::string& checkbox, const std::string& widget);
+    void disableWithCheckbox(const std::string& checkbox, const std::string& widget);
+    void enableWithEnabledCheckbox(const std::string& checkbox, const std::string& widget);
+
+    /*
+     * Listeners for changes to settings.
+     */
+    void customHandRecognitionToggled();
+    void customStylusIconTypeChanged();
+
+    /**
+     * Update whether options can be selected, tooltips, etc. for
+     * pressure sensitivity options (e.g. pressure multiplier).
+     */
+    void updatePressureSensitivityOptions();
+
+private:
+    void load();
+    void loadCheckbox(const char* name, bool value);
+    bool getCheckbox(const char* name);
+
+    void loadSlider(const char* name, double value);
+    double getSlider(const char* name);
+
+    void initMouseButtonEvents(GladeSearchpath* gladeSearchPath);
+
+    void showStabilizerAvMethodOptions(StrokeStabilizer::AveragingMethod method);
+    void showStabilizerPreprocessorOptions(StrokeStabilizer::Preprocessor preprocessor);
+
+private:
+    Settings* settings = nullptr;
+    Control* control = nullptr;
+    GtkWidget* callib = nullptr;
+    int dpi = 72;
+
+#ifdef ENABLE_AUDIO
+    std::vector<DeviceInfo> audioInputDevices;
+    std::vector<DeviceInfo> audioOutputDevices;
+#endif
+
+    Builder builder;
+    xoj::util::GtkWindowUPtr window;
+
+    std::unique_ptr<DeviceTestingArea> deviceTestingArea;
+
+    LanguageConfigGui languageConfig;
+    std::vector<std::unique_ptr<ButtonConfigGui>> buttonConfigs;
+
+    LatexSettingsPanel latexPanel;
+    SettingsDialogPaletteTab paletteTab;
+
+    std::function<void()> callback;
+};
diff --git a/entry/src/main/cpp/src/core/gui/dialog/SettingsDialogPaletteTab.cpp b/entry/src/main/cpp/src/core/gui/dialog/SettingsDialogPaletteTab.cpp
new file mode 100644
index 0000000..19adb52
--- /dev/null
+++ b/entry/src/main/cpp/src/core/gui/dialog/SettingsDialogPaletteTab.cpp
@@ -0,0 +1,213 @@
+#include "SettingsDialogPaletteTab.h"
+
+#include "gui/toolbarMenubar/icon/ColorIcon.h"
+#include "util/PathUtil.h"
+#include "util/XojMsgBox.h"
+#include "util/gtk4_helper.h"
+#include "util/i18n.h"
+
+static const char* const G_OBJECT_PALETTE_PATH = "xournalpp.palettePath";
+
+
+////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+// HELPER
+////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+
+auto colorize(const std::string& text, const std::string& color) -> std::string {
+    return std::string{"<span foreground=\""} + color + std::string{"\">"} + text + std::string{"</span>"};
+}
+
+void setGObjectPalettePath(GObject* gObject, const fs::path& path) {
+    g_object_set_data(gObject, G_OBJECT_PALETTE_PATH, (gpointer)&path);
+}
+
+auto getGObjectPalettePath(GObject* gObject) -> fs::path {
+    auto* pathPointer = (fs::path*)g_object_get_data(gObject, G_OBJECT_PALETTE_PATH);
+    return *pathPointer;
+}
+
+auto getDisplayPalettePath(const fs::path& path) -> std::string {
+    if (path.parent_path() == Util::getBuiltInPaletteDirectoryPath()) {
+        return std::string{"└─ "} + "<i>" + FS(_F("Built-in palettes")) + "/</i> " +
+               char_cast(path.filename().u8string().c_str());
+    } else if (path.parent_path() == Util::getCustomPaletteDirectoryPath()) {
+        return std::string{"└─ "} + "<i>" + FS(_F("User palettes")) + "/</i> " +
+               char_cast(path.filename().u8string().c_str());
+    } else {
+        g_warning("Unexpected type of palette path encountered %s", char_cast(path.parent_path().u8string().c_str()));
+        return std::string{"└─ "} + char_cast(path.u8string().c_str());
+    }
+}
+
+
+////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+// Public Methods
+////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+
+constexpr auto UI_FILE = "paletteSettings.glade";
+constexpr auto UI_PANEL_NAME = "paletteSettingsPanel";
+
+SettingsDialogPaletteTab::SettingsDialogPaletteTab(GladeSearchpath* gladeSearchPath,
+                                                   const std::vector<fs::path>& paletteDirectories):
+        builder(gladeSearchPath, UI_FILE) {
+    colorPaletteExplainLabel = GTK_LABEL(builder.get("colorPaletteExplainLabel"));
+    paletteListBox = GTK_LIST_BOX(builder.get("paletteListBox"));
+    panel = GTK_SCROLLED_WINDOW(builder.get(UI_PANEL_NAME));
+    renderColorPaletteExplainLabel();
+    setAllPaletteFilePaths(paletteDirectories);
+}
+
+void SettingsDialogPaletteTab::renderPaletteTab(const fs::path& currentlySetPalettePath) {
+    GtkListBox* lb = paletteListBox;
+    if (allPaletteFilePaths.empty()) {
+        renderNoPaletteFoundDisclaimer(lb);
+        return;
+    }
+
+    for (const fs::path& p: allPaletteFilePaths) {
+        GtkWidget* listBoxRow = renderPaletteListBoxRow(lb, p);
+
+        if (p == currentlySetPalettePath) {
+            gtk_list_box_select_row(GTK_LIST_BOX(lb), GTK_LIST_BOX_ROW(listBoxRow));
+        }
+    }
+    gtk_widget_show_all(GTK_WIDGET(lb));
+}
+
+
+////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+// Private Methods
+////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+
+auto SettingsDialogPaletteTab::renderPaletteListBoxRow(GtkListBox* lb, const fs::path& p) -> GtkWidget* {
+    Palette palette{p};
+    GtkWidget* listBoxRow = nullptr;
+
+    try {
+        palette.load();
+        listBoxRow = newPaletteListBoxRow(palette);
+    } catch (const std::exception& e) {
+        listBoxRow = newErrorListBoxRow(p, e.what());
+    }
+    setGObjectPalettePath(G_OBJECT(listBoxRow), p);
+
+    gtk_list_box_prepend(lb, listBoxRow);
+    return listBoxRow;
+}
+
+void SettingsDialogPaletteTab::renderColorPaletteExplainLabel() const {
+    gtk_label_set_label(colorPaletteExplainLabel, FS(_F("<i>The palettes shown below are obtained from the "
+                                                        "<a href=\"{1}\">Built-in palettes</a> and "
+                                                        "<a href=\"{2}\">User palettes</a> directories:</i>\n") %
+                                                     Util::toUri(Util::getBuiltInPaletteDirectoryPath()).value() %
+                                                     Util::toUri(Util::getCustomPaletteDirectoryPath()).value())
+                                                          .c_str());
+    gtk_label_set_wrap(colorPaletteExplainLabel, true);
+    gtk_label_set_use_markup(colorPaletteExplainLabel, true);
+    g_signal_connect(colorPaletteExplainLabel, "activate-link", G_CALLBACK(+[](GtkLabel*, gchar* uri, gpointer) {
+                         XojMsgBox::openURL(nullptr, uri);
+                         return true;  // default handler does not work on Windows
+                     }),
+                     nullptr);
+}
+
+void SettingsDialogPaletteTab::renderNoPaletteFoundDisclaimer(GtkListBox* lb) {
+    GtkWidget* listBoxRow = gtk_list_box_row_new();
+    GtkWidget* label = gtk_label_new(("<span foreground=\"red\">" +
+                                      FS(_F("No palette files (i.e. with extension .gpl) could be found.\n"
+                                            "Using the default until another palette is configured.")) +
+                                      "</span>")
+                                             .c_str());
+    gtk_label_set_use_markup(GTK_LABEL(label), true);
+
+    gtk_list_box_row_set_child(GTK_LIST_BOX_ROW(listBoxRow), label);
+    gtk_list_box_row_set_activatable(GTK_LIST_BOX_ROW(listBoxRow), FALSE);
+    gtk_list_box_row_set_selectable(GTK_LIST_BOX_ROW(listBoxRow), FALSE);
+
+    gtk_list_box_prepend(lb, listBoxRow);
+}
+
+// use list of fs::path as input
+void SettingsDialogPaletteTab::setAllPaletteFilePaths(const std::vector<fs::path>& paletteDirectories) {
+    for (const fs::path& paletteDirectory: paletteDirectories) {
+        std::vector<fs::path> const files = Util::listFilesSorted(paletteDirectory);
+        for (const fs::path& paletteFile: files) {
+            if (paletteFile.extension() == ".gpl") {
+                allPaletteFilePaths.push_back(paletteFile);
+            }
+        }
+    }
+}
+
+auto SettingsDialogPaletteTab::getSelectedPalette() const -> std::optional<fs::path> {
+    GtkListBoxRow* selected_listbox_row = gtk_list_box_get_selected_row(paletteListBox);
+    if (allPaletteFilePaths.empty()) {
+        return std::nullopt;
+    }
+    if (!G_IS_OBJECT(selected_listbox_row)) {
+        return std::nullopt;
+    }
+
+    return getGObjectPalettePath(G_OBJECT(selected_listbox_row));
+}
+
+auto SettingsDialogPaletteTab::newErrorListBoxRow(const fs::path& palettePath, const std::string& error) -> GtkWidget* {
+    GtkWidget* listBoxRow = gtk_list_box_row_new();
+    GtkWidget* rowContent = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 3);
+    gtk_list_box_row_set_child(GTK_LIST_BOX_ROW(listBoxRow), rowContent);
+
+    std::string const formattedError = colorize(FS(_F("Error")) + ": " + error, "red");
+    GtkWidget* text = newPaletteTextBox(formattedError, palettePath);
+    gtk_box_append(GTK_BOX(rowContent), text);
+
+    return listBoxRow;
+}
+
+auto SettingsDialogPaletteTab::newPaletteListBoxRow(Palette& palette) -> GtkWidget* {
+    GtkWidget* listBoxRow = gtk_list_box_row_new();
+    GtkWidget* rowContent = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 3);
+    gtk_list_box_row_set_child(GTK_LIST_BOX_ROW(listBoxRow), rowContent);
+
+    std::string const paletteName = palette.getHeader(std::string{FS(_F("Name"))});
+    GtkWidget* text = nullptr;
+    if (paletteName.empty()) {
+        text = newPaletteTextBox(std::string{"<i>" + FS(_F("Palette has no Name")) + "</i>"}, palette.getFilePath());
+    } else {
+        text = newPaletteTextBox(paletteName, palette.getFilePath().u8string());
+    }
+    gtk_box_append(GTK_BOX(rowContent), text);
+
+    GtkWidget* colorIcons = newPaletteColorIconsBox(palette);
+    gtk_widget_set_hexpand(colorIcons, true);
+    gtk_box_append(GTK_BOX(rowContent), colorIcons);
+
+    return listBoxRow;
+}
+
+auto SettingsDialogPaletteTab::newPaletteTextBox(const std::string& mainContent, const fs::path& path) -> GtkWidget* {
+    GtkWidget* textBox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 3);
+
+    GtkWidget* mainLabel = gtk_label_new(mainContent.c_str());
+    gtk_widget_set_halign(mainLabel, GTK_ALIGN_START);
+    gtk_label_set_use_markup(GTK_LABEL(mainLabel), true);
+    gtk_box_append(GTK_BOX(textBox), mainLabel);
+
+    GtkWidget* secondaryLabel = gtk_label_new(getDisplayPalettePath(path).c_str());
+    gtk_widget_set_halign(secondaryLabel, GTK_ALIGN_START);
+    gtk_label_set_use_markup(GTK_LABEL(secondaryLabel), true);
+    gtk_box_append(GTK_BOX(textBox), secondaryLabel);
+
+    return textBox;
+}
+
+auto SettingsDialogPaletteTab::newPaletteColorIconsBox(const Palette& palette) -> GtkWidget* {
+    GtkWidget* colors = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 3);
+    for (unsigned long i = 0; i < palette.size(); i++) {
+        const NamedColor& namedColor = palette.getColorAt(i);
+        const Color c = namedColor.getColor();
+        GtkWidget* icon = ColorIcon::newGtkImage(c, 16, true);
+        gtk_box_append(GTK_BOX(colors), icon);
+    }
+    gtk_widget_set_halign(colors, GTK_ALIGN_END);
+    return colors;
+}
diff --git a/entry/src/main/cpp/src/core/gui/dialog/SettingsDialogPaletteTab.h b/entry/src/main/cpp/src/core/gui/dialog/SettingsDialogPaletteTab.h
new file mode 100644
index 0000000..30178c3
--- /dev/null
+++ b/entry/src/main/cpp/src/core/gui/dialog/SettingsDialogPaletteTab.h
@@ -0,0 +1,36 @@
+#pragma once
+
+
+#include <filesystem>
+#include <optional>
+#include <vector>
+
+#include <gtk/gtk.h>
+
+#include "gui/Builder.h"
+#include "gui/GladeGui.h"
+#include "gui/toolbarMenubar/model/ColorPalette.h"
+class SettingsDialogPaletteTab {
+public:
+    SettingsDialogPaletteTab(GladeSearchpath* gladeSearchPath, const std::vector<fs::path>& paletteDirectories);
+    void renderPaletteTab(const fs::path& currentlySetPalettePath);
+    auto getSelectedPalette() const -> std::optional<fs::path>;
+    inline GtkWidget* getPanel() const { return GTK_WIDGET(panel); }
+
+private:
+    std::vector<fs::path> allPaletteFilePaths;
+    GtkLabel* colorPaletteExplainLabel;
+    GtkListBox* paletteListBox;
+    Builder builder;
+    GtkScrolledWindow* panel;
+
+    void setAllPaletteFilePaths(const std::vector<fs::path>& paletteDirectories);
+    void renderColorPaletteExplainLabel() const;
+
+    static auto newErrorListBoxRow(const fs::path& palettePath, const std::string& error) -> GtkWidget*;
+    static auto newPaletteTextBox(const std::string& mainContent, const fs::path& path) -> GtkWidget*;
+    static auto newPaletteColorIconsBox(const Palette& palette) -> GtkWidget*;
+    static auto newPaletteListBoxRow(Palette& palette) -> GtkWidget*;
+    static void renderNoPaletteFoundDisclaimer(GtkListBox* lb);
+    static auto renderPaletteListBoxRow(GtkListBox* lb, const fs::path& p) -> GtkWidget*;
+};
diff --git a/entry/src/main/cpp/src/core/gui/dialog/ToolbarManageDialog.cpp b/entry/src/main/cpp/src/core/gui/dialog/ToolbarManageDialog.cpp
new file mode 100644
index 0000000..148bb85
--- /dev/null
+++ b/entry/src/main/cpp/src/core/gui/dialog/ToolbarManageDialog.cpp
@@ -0,0 +1,187 @@
+#include "ToolbarManageDialog.h"
+
+#include <string>  // for allocator, string
+#include <vector>  // for vector
+
+#include <glib-object.h>  // for g_signal_connect
+#include <pango/pango.h>  // for PANGO_WEIGHT_NORMAL
+
+#include "gui/Builder.h"
+#include "gui/toolbarMenubar/model/ToolbarData.h"   // for ToolbarData
+#include "gui/toolbarMenubar/model/ToolbarModel.h"  // for ToolbarModel
+#include "util/Assert.h"                            // for xoj_assert
+#include "util/i18n.h"                              // for _
+
+class GladeSearchpath;
+
+constexpr auto UI_FILE = "toolbarManageDialog.glade";
+constexpr auto UI_DIALOG_NAME = "manageToolbarsDialog";
+
+enum { COLUMN_STRING, COLUMN_BOLD, COLUMN_POINTER, COLUMN_EDITABLE, N_COLUMNS };
+
+static xoj::util::GObjectSPtr<GtkListStore> createModel(ToolbarModel* tb) {
+    xoj_assert(tb);
+    GtkTreeIter iter;
+    GtkListStore* model = gtk_list_store_new(N_COLUMNS, G_TYPE_STRING, G_TYPE_INT, G_TYPE_POINTER, G_TYPE_BOOLEAN);
+    gtk_list_store_append(model, &iter);
+    gtk_list_store_set(model, &iter, COLUMN_STRING, _("Predefined"), COLUMN_BOLD, PANGO_WEIGHT_BOLD, COLUMN_POINTER,
+                       nullptr, COLUMN_EDITABLE, false, -1);
+
+    for (const auto& data: tb->getToolbars()) {
+        if (data->isPredefined()) {
+            gtk_list_store_append(model, &iter);
+            gtk_list_store_set(model, &iter, COLUMN_STRING, data->getName().c_str(), COLUMN_BOLD, PANGO_WEIGHT_NORMAL,
+                               COLUMN_POINTER, data.get(), COLUMN_EDITABLE, false, -1);
+        }
+    }
+
+    gtk_list_store_append(model, &iter);
+    gtk_list_store_set(model, &iter, COLUMN_STRING, _("Customized"), COLUMN_BOLD, PANGO_WEIGHT_BOLD, COLUMN_POINTER,
+                       nullptr, COLUMN_EDITABLE, false, -1);
+
+    for (const auto& data: tb->getToolbars()) {
+        if (!data->isPredefined()) {
+            gtk_list_store_append(model, &iter);
+            gtk_list_store_set(model, &iter, COLUMN_STRING, data->getName().c_str(), COLUMN_BOLD, PANGO_WEIGHT_NORMAL,
+                               COLUMN_POINTER, data.get(), COLUMN_EDITABLE, true, -1);
+        }
+    }
+    return xoj::util::GObjectSPtr<GtkListStore>(model, xoj::util::adopt);
+}
+
+ToolbarManageDialog::ToolbarManageDialog(GladeSearchpath* gladeSearchPath, ToolbarModel* tbModel,
+                                         std::function<void()> callback):
+        tbModel(tbModel), model(createModel(tbModel)), callback(callback) {
+    Builder builder(gladeSearchPath, UI_FILE);
+    window.reset(GTK_WINDOW(builder.get(UI_DIALOG_NAME)));
+    tree = GTK_TREE_VIEW(builder.get("toolbarList"));
+    copyButton = builder.get("btCopy");
+    deleteButton = builder.get("btDelete");
+
+    gtk_tree_view_set_model(tree, GTK_TREE_MODEL(this->model.get()));
+
+    GtkCellRenderer* renderer = gtk_cell_renderer_text_new();
+    GtkTreeViewColumn* column =
+            gtk_tree_view_column_new_with_attributes(_("Toolbars"), renderer, "text", COLUMN_STRING, "weight",
+                                                     COLUMN_BOLD, "editable", COLUMN_EDITABLE, nullptr);
+
+    gtk_tree_view_append_column(tree, column);
+
+    GtkTreeSelection* select = gtk_tree_view_get_selection(tree);
+    gtk_tree_selection_set_mode(select, GTK_SELECTION_SINGLE);
+    g_signal_connect(select, "changed", G_CALLBACK(treeSelectionChangedCallback), this);
+
+    g_signal_connect(renderer, "edited", G_CALLBACK(treeCellEditedCallback), this);
+
+    g_signal_connect(builder.get("btNew"), "clicked", G_CALLBACK(buttonNewCallback), this);
+    g_signal_connect(deleteButton, "clicked", G_CALLBACK(buttonDeleteCallback), this);
+    g_signal_connect(copyButton, "clicked", G_CALLBACK(buttonCopyCallback), this);
+
+    g_signal_connect_swapped(builder.get("btClose"), "clicked", G_CALLBACK(gtk_window_close), this->window.get());
+}
+
+ToolbarManageDialog::~ToolbarManageDialog() { this->callback(); }
+
+void ToolbarManageDialog::buttonNewCallback(GtkButton* button, ToolbarManageDialog* dlg) {
+    auto data = std::make_unique<ToolbarData>(false);
+    data->setName(_("New"));
+    data->setId("custom");
+    dlg->tbModel->initCopyNameId(data.get());
+    dlg->addToolbarData(std::move(data));
+}
+
+void ToolbarManageDialog::buttonDeleteCallback(GtkButton* button, ToolbarManageDialog* dlg) {
+    ToolbarData* selected = dlg->getSelectedEntry();
+    if (selected == nullptr) {
+        return;
+    }
+
+    GtkTreeModel* model = GTK_TREE_MODEL(dlg->model.get());
+    GtkTreeIter iter;
+    if (gtk_tree_model_get_iter_first(model, &iter)) {
+        do {
+            ToolbarData* data = nullptr;
+            gtk_tree_model_get(model, &iter, COLUMN_POINTER, &data, -1);
+
+            if (data == selected) {
+                gtk_list_store_remove(dlg->model.get(), &iter);
+                break;
+            }
+        } while (gtk_tree_model_iter_next(model, &iter));
+    }
+
+    dlg->tbModel->remove(selected);
+    dlg->updateSelectionData();
+}
+
+void ToolbarManageDialog::buttonCopyCallback(GtkButton* button, ToolbarManageDialog* dlg) {
+    ToolbarData* selected = dlg->getSelectedEntry();
+    if (selected == nullptr) {
+        return;
+    }
+
+    auto data = std::make_unique<ToolbarData>(*selected);
+    dlg->tbModel->initCopyNameId(data.get());
+    dlg->addToolbarData(std::move(data));
+}
+
+void ToolbarManageDialog::addToolbarData(std::unique_ptr<ToolbarData> tbd) {
+    auto* data = this->tbModel->add(std::move(tbd));
+
+    GtkTreeIter iter;
+    gtk_list_store_append(this->model.get(), &iter);
+    gtk_list_store_set(this->model.get(), &iter, COLUMN_STRING, data->getName().c_str(), COLUMN_BOLD,
+                       PANGO_WEIGHT_NORMAL, COLUMN_POINTER, data, COLUMN_EDITABLE, true, -1);
+
+    GtkTreePath* path = gtk_tree_model_get_path(GTK_TREE_MODEL(this->model.get()), &iter);
+    GtkTreeViewColumn* column = gtk_tree_view_get_column(tree, 0);
+
+    gtk_tree_view_set_cursor(tree, path, column, true);
+}
+
+void ToolbarManageDialog::treeCellEditedCallback(GtkCellRendererText* renderer, gchar* pathString, gchar* newText,
+                                                 ToolbarManageDialog* dlg) {
+    GtkTreeIter iter;
+    ToolbarData* data = nullptr;
+
+    gtk_tree_model_get_iter_from_string(GTK_TREE_MODEL(dlg->model.get()), &iter, pathString);
+    gtk_tree_model_get(GTK_TREE_MODEL(dlg->model.get()), &iter, COLUMN_POINTER, &data, -1);
+    if (data) {
+        gtk_list_store_set(dlg->model.get(), &iter, COLUMN_STRING, newText, -1);
+        data->setName(newText);
+    }
+}
+
+void ToolbarManageDialog::entrySelected(ToolbarData* data) {
+    if (data == nullptr) {
+        gtk_widget_set_sensitive(copyButton, false);
+        gtk_widget_set_sensitive(deleteButton, false);
+    } else {
+        gtk_widget_set_sensitive(copyButton, true);
+        gtk_widget_set_sensitive(deleteButton, !data->isPredefined());
+    }
+}
+
+auto ToolbarManageDialog::getSelectedEntry() -> ToolbarData* {
+    GtkTreeIter iter;
+    GtkTreeModel* model = nullptr;
+    ToolbarData* data = nullptr;
+
+    GtkTreeSelection* selection = gtk_tree_view_get_selection(tree);
+    if (selection == nullptr) {
+        return nullptr;
+    }
+
+    if (gtk_tree_selection_get_selected(selection, &model, &iter)) {
+        gtk_tree_model_get(model, &iter, COLUMN_POINTER, &data, -1);
+        return data;
+    }
+
+    return nullptr;
+}
+
+void ToolbarManageDialog::updateSelectionData() { entrySelected(getSelectedEntry()); }
+
+void ToolbarManageDialog::treeSelectionChangedCallback(GtkTreeSelection* selection, ToolbarManageDialog* dlg) {
+    dlg->updateSelectionData();
+}
diff --git a/entry/src/main/cpp/src/core/gui/dialog/ToolbarManageDialog.h b/entry/src/main/cpp/src/core/gui/dialog/ToolbarManageDialog.h
new file mode 100644
index 0000000..4c2d7bb
--- /dev/null
+++ b/entry/src/main/cpp/src/core/gui/dialog/ToolbarManageDialog.h
@@ -0,0 +1,60 @@
+/*
+ * Xournal++
+ *
+ * Toolbar edit dialog
+ *
+ * @author Xournal++ Team
+ * https://github.com/xournalpp/xournalpp
+ *
+ * @license GNU GPLv2 or later
+ */
+
+#pragma once
+
+#include <functional>
+
+#include <glib.h>     // for gchar
+#include <gtk/gtk.h>  // for GtkButton, GtkCellRendererText, GtkListStore
+
+#include "util/raii/GObjectSPtr.h"
+#include "util/raii/GtkWindowUPtr.h"
+
+class ToolbarData;
+class ToolbarModel;
+class GladeSearchpath;
+
+class ToolbarManageDialog {
+public:
+    ToolbarManageDialog(GladeSearchpath* gladeSearchPath, ToolbarModel* model, std::function<void()> callback);
+    ~ToolbarManageDialog();
+
+public:
+    inline GtkWindow* getWindow() const { return window.get(); }
+
+private:
+    static void treeSelectionChangedCallback(GtkTreeSelection* selection, ToolbarManageDialog* dlg);
+    static void treeCellEditedCallback(GtkCellRendererText* renderer, gchar* pathString, gchar* newText,
+                                       ToolbarManageDialog* dlg);
+
+    static void buttonNewCallback(GtkButton* button, ToolbarManageDialog* dlg);
+    static void buttonDeleteCallback(GtkButton* button, ToolbarManageDialog* dlg);
+    static void buttonCopyCallback(GtkButton* button, ToolbarManageDialog* dlg);
+
+    void addToolbarData(std::unique_ptr<ToolbarData> tbd);
+    void entrySelected(ToolbarData* data);
+
+    void updateSelectionData();
+
+    ToolbarData* getSelectedEntry();
+
+private:
+    ToolbarModel* tbModel;
+    xoj::util::GObjectSPtr<GtkListStore> model;
+
+    GtkTreeView* tree;
+    GtkWidget* copyButton;
+    GtkWidget* deleteButton;
+
+    xoj::util::GtkWindowUPtr window;
+    std::function<void()> callback;
+};
diff --git a/entry/src/main/cpp/src/core/gui/dialog/XojOpenDlg.cpp b/entry/src/main/cpp/src/core/gui/dialog/XojOpenDlg.cpp
new file mode 100644
index 0000000..58f5eab
--- /dev/null
+++ b/entry/src/main/cpp/src/core/gui/dialog/XojOpenDlg.cpp
@@ -0,0 +1,211 @@
+#include "XojOpenDlg.h"
+
+#include "control/settings/Settings.h"  // for Settings
+#include "util/PathUtil.h"              // for fromGFile, toGFile
+#include "util/PopupWindowWrapper.h"    // for PopupWindowWrapper
+#include "util/Util.h"
+#include "util/gtk4_helper.h"         // for gtk_file_chooser_set_current_folder
+#include "util/i18n.h"                // for _
+#include "util/raii/GObjectSPtr.h"    // for GObjectSPtr
+#include "util/raii/GtkWindowUPtr.h"  // for GtkWindowUPtr
+
+#include "FileChooserFiltersHelper.h"
+
+static void addlastSavePathShortcut(GtkFileChooser* fc, Settings* settings) {
+    auto lastSavePath = settings->getLastSavePath();
+    if (!lastSavePath.empty()) {
+#if GTK_MAJOR_VERSION == 3
+        gtk_file_chooser_add_shortcut_folder(fc, char_cast(lastSavePath.u8string().c_str()), nullptr);
+#else
+        gtk_file_chooser_add_shortcut_folder(fc, Util::toGFile(lastSavePath).get(), nullptr);
+#endif
+    }
+}
+
+static void setCurrentFolderToLastOpenPath(GtkFileChooser* fc, Settings* settings) {
+    xoj::util::GObjectSPtr<GFile> currentFolder;
+    if (settings && !settings->getLastOpenPath().empty()) {
+        currentFolder = Util::toGFile(settings->getLastOpenPath());
+    } else {
+        currentFolder.reset(g_file_new_for_path(g_get_home_dir()), xoj::util::adopt);
+    }
+    gtk_file_chooser_set_current_folder(fc, currentFolder.get(), nullptr);
+}
+
+template <class... Args>
+static std::function<void(fs::path, Args...)> addSetLastSavePathToCallback(
+        std::function<void(fs::path, Args...)> callback, Settings* settings) {
+    return [cb = std::move(callback), settings](fs::path path, Args... args) {
+        if (settings && !path.empty()) {
+            settings->setLastOpenPath(path.parent_path());
+        }
+        cb(std::move(path), std::forward<Args>(args)...);
+    };
+}
+
+
+constexpr auto ATTACH_CHOICE_ID = "attachPdfChoice";
+static void addAttachChoice(GtkFileChooser* fc) {
+    gtk_file_chooser_add_choice(fc, ATTACH_CHOICE_ID, _("Attach file to the journal"), nullptr, nullptr);
+    gtk_file_chooser_set_choice(fc, ATTACH_CHOICE_ID, "false");
+}
+
+// Helper class, for a single open dialog
+class FileDlg {
+public:
+    /**
+     * Creates an open file dialog. The callback is only called if a file is actually chosen
+     * @param callback(path, attachPdf)
+     */
+    FileDlg(const char* title, std::function<void(fs::path, bool)> callback);
+    /**
+     * Creates an open file dialog. The callback is only called if a file is actually chosen
+     * @param callback(path)
+     */
+    FileDlg(const char* title, std::function<void(fs::path)> callback);
+    ~FileDlg() = default;
+
+    inline GtkWindow* getWindow() const { return window.get(); }
+
+private:
+    xoj::util::GtkWindowUPtr window;
+
+    std::function<void(fs::path, bool)> callback;
+    gulong signalId{};
+};
+
+static GtkWindow* makeWindow(const char* title) {
+    // Todo(maybe)
+    // Restore previews using https://discourse.gnome.org/t/file-chooser-gtk-4-image-preview/11510/2
+    auto* win = gtk_file_chooser_dialog_new(title, nullptr, GTK_FILE_CHOOSER_ACTION_OPEN, _("_Cancel"),
+                                            GTK_RESPONSE_CANCEL, _("_Open"), GTK_RESPONSE_OK, nullptr);
+    return GTK_WINDOW(win);
+}
+
+FileDlg::FileDlg(const char* title, std::function<void(fs::path, bool)> callback):
+        window(makeWindow(title)), callback(std::move(callback)) {
+    this->signalId = g_signal_connect(
+            window.get(), "response", G_CALLBACK(+[](GtkDialog* win, int response, gpointer data) {
+                auto* self = static_cast<FileDlg*>(data);
+
+                if (response == GTK_RESPONSE_OK) {
+                    auto path =
+                            Util::fromGFile(xoj::util::GObjectSPtr<GFile>(
+                                                    gtk_file_chooser_get_file(GTK_FILE_CHOOSER(win)), xoj::util::adopt)
+                                                    .get());
+
+                    bool attach = false;
+                    if (const char* choice = gtk_file_chooser_get_choice(GTK_FILE_CHOOSER(win), ATTACH_CHOICE_ID);
+                        choice) {
+                        attach = std::strcmp(choice, "true") == 0;
+                    }
+
+                    // We need to call gtk_window_close() before invoking the callback, because if the callback pops up
+                    // another dialog, the first one won't close...
+                    // So we postpone the callback
+                    Util::execInUiThread([cb = std::move(self->callback), path = std::move(path), attach]() {
+                        cb(std::move(path), attach);
+                    });
+                }
+                // Closing the window causes another "response" signal, which we want to ignore
+                g_signal_handler_disconnect(win, self->signalId);
+                gtk_window_close(self->getWindow());  // Destroys *self. Beware!
+            }),
+            this);
+}
+
+FileDlg::FileDlg(const char* title, std::function<void(fs::path)> callback):
+        FileDlg(title, [cb = std::move(callback)](fs::path path, bool) { cb(std::move(path)); }) {}
+
+
+void xoj::OpenDlg::showOpenTemplateDialog(GtkWindow* parent, Settings* settings,
+                                          std::function<void(fs::path)> callback) {
+    auto popup = xoj::popup::PopupWindowWrapper<FileDlg>(_("Open template file"),
+                                                         addSetLastSavePathToCallback(std::move(callback), settings));
+
+    auto* fc = GTK_FILE_CHOOSER(popup.getPopup()->getWindow());
+    xoj::addFilterAllFiles(fc);
+    xoj::addFilterXopt(fc);
+    setCurrentFolderToLastOpenPath(fc, settings);
+
+    popup.show(parent);
+}
+
+
+void xoj::OpenDlg::showOpenFileDialog(GtkWindow* parent, Settings* settings, std::function<void(fs::path)> callback) {
+    auto popup = xoj::popup::PopupWindowWrapper<FileDlg>(_("Open file"),
+                                                         addSetLastSavePathToCallback(std::move(callback), settings));
+
+    auto* fc = GTK_FILE_CHOOSER(popup.getPopup()->getWindow());
+    xoj::addFilterSupported(fc);
+    xoj::addFilterXoj(fc);
+    xoj::addFilterXopt(fc);
+    xoj::addFilterXopp(fc);
+    xoj::addFilterPdf(fc);
+    xoj::addFilterAllFiles(fc);
+
+    addlastSavePathShortcut(fc, settings);
+    setCurrentFolderToLastOpenPath(fc, settings);
+
+    popup.show(parent);
+}
+
+void xoj::OpenDlg::showAnnotatePdfDialog(GtkWindow* parent, Settings* settings,
+                                         std::function<void(fs::path, bool)> callback) {
+    auto popup = xoj::popup::PopupWindowWrapper<FileDlg>(_("Annotate Pdf file"),
+                                                         addSetLastSavePathToCallback(std::move(callback), settings));
+
+    auto* fc = GTK_FILE_CHOOSER(popup.getPopup()->getWindow());
+
+    xoj::addFilterPdf(fc);
+    xoj::addFilterAllFiles(fc);
+
+    addlastSavePathShortcut(fc, settings);
+    setCurrentFolderToLastOpenPath(fc, settings);
+
+    addAttachChoice(fc);
+
+    popup.show(parent);
+}
+
+void xoj::OpenDlg::showOpenImageDialog(GtkWindow* parent, Settings* settings,
+                                       std::function<void(fs::path, bool)> callback) {
+    auto popup = xoj::popup::PopupWindowWrapper<FileDlg>(_("Choose image file"),
+                                                         [cb = std::move(callback), settings](fs::path p, bool attach) {
+                                                             if (auto folder = p.parent_path(); !folder.empty()) {
+                                                                 settings->setLastImagePath(folder);
+                                                             }
+                                                             cb(std::move(p), attach);
+                                                         });
+
+    auto* fc = GTK_FILE_CHOOSER(popup.getPopup()->getWindow());
+
+    xoj::addFilterImages(fc);
+    xoj::addFilterAllFiles(fc);
+
+    if (!settings->getLastImagePath().empty()) {
+        gtk_file_chooser_set_current_folder(fc, Util::toGFile(settings->getLastImagePath()).get(), nullptr);
+    }
+
+    addAttachChoice(fc);
+
+    popup.show(parent);
+}
+
+void xoj::OpenDlg::showMultiFormatDialog(GtkWindow* parent, std::vector<std::string> formats,
+                                         std::function<void(fs::path)> callback) {
+    auto popup = xoj::popup::PopupWindowWrapper<FileDlg>(_("Open file"), std::move(callback));
+
+    auto* fc = GTK_FILE_CHOOSER(popup.getPopup()->getWindow());
+
+    if (formats.size() > 0) {
+        GtkFileFilter* filterSupported = gtk_file_filter_new();
+        gtk_file_filter_set_name(filterSupported, _("Supported files"));
+        for (std::string format: formats) {
+            gtk_file_filter_add_pattern(filterSupported, format.c_str());
+        }
+        gtk_file_chooser_add_filter(fc, filterSupported);
+    }
+
+    popup.show(parent);
+}
diff --git a/entry/src/main/cpp/src/core/gui/dialog/XojOpenDlg.h b/entry/src/main/cpp/src/core/gui/dialog/XojOpenDlg.h
new file mode 100644
index 0000000..70fca8e
--- /dev/null
+++ b/entry/src/main/cpp/src/core/gui/dialog/XojOpenDlg.h
@@ -0,0 +1,32 @@
+/*
+ * Xournal++
+ *
+ * GTK Open dialog to select XOJ (or PDF) file with preview
+ *
+ * @author Xournal++ Team
+ * https://github.com/xournalpp/xournalpp
+ *
+ * @license GNU GPLv2 or later
+ */
+
+#pragma once
+
+#include <functional>
+
+#include <gtk/gtk.h>  // for GtkWindow
+
+#include "filesystem.h"  // for path
+
+class Settings;
+
+namespace xoj::OpenDlg {
+void showOpenFileDialog(GtkWindow* parent, Settings* settings, std::function<void(fs::path)> callback);
+/// @param callback(path, attachPdf)
+void showAnnotatePdfDialog(GtkWindow* parent, Settings* settings, std::function<void(fs::path, bool)> callback);
+void showOpenTemplateDialog(GtkWindow* parent, Settings* settings, std::function<void(fs::path)> callback);
+
+/// @param callback(path, attachImg)
+void showOpenImageDialog(GtkWindow* parent, Settings* settings, std::function<void(fs::path, bool)> callback);
+
+void showMultiFormatDialog(GtkWindow* parent, std::vector<std::string> formats, std::function<void(fs::path)> callback);
+};  // namespace xoj::OpenDlg
diff --git a/entry/src/main/cpp/src/core/gui/dialog/XojSaveDlg.cpp b/entry/src/main/cpp/src/core/gui/dialog/XojSaveDlg.cpp
new file mode 100644
index 0000000..b014f7c
--- /dev/null
+++ b/entry/src/main/cpp/src/core/gui/dialog/XojSaveDlg.cpp
@@ -0,0 +1,91 @@
+#include "XojSaveDlg.h"
+
+#include <optional>
+
+#include "control/settings/Settings.h"
+#include "util/PathUtil.h"            // for fromGFile, toGFile
+#include "util/PopupWindowWrapper.h"  // for PopupWindowWrapper
+#include "util/Util.h"
+#include "util/XojMsgBox.h"
+#include "util/gtk4_helper.h"         // for gtk_file_chooser_set_current_folder
+#include "util/i18n.h"                // for _
+#include "util/raii/GObjectSPtr.h"    // for GObjectSPtr
+#include "util/raii/GtkWindowUPtr.h"  // for GtkWindowUPtr
+
+#include "FileChooserFiltersHelper.h"
+
+static GtkWindow* makeWindow(Settings* settings, fs::path suggestedPath, const char* windowTitle,
+                             const char* buttonLabel) {
+    GtkWidget* dialog = gtk_file_chooser_dialog_new(windowTitle, nullptr, GTK_FILE_CHOOSER_ACTION_SAVE, _("_Cancel"),
+                                                    GTK_RESPONSE_CANCEL, buttonLabel, GTK_RESPONSE_OK, nullptr);
+
+    if (!suggestedPath.empty()) {
+        gtk_file_chooser_set_current_folder(GTK_FILE_CHOOSER(dialog), Util::toGFile(suggestedPath.parent_path()).get(),
+                                            nullptr);
+        gtk_file_chooser_set_current_name(GTK_FILE_CHOOSER(dialog),
+                                          Util::toGFilename(suggestedPath.filename()).c_str());
+    }
+    if (settings) {
+        gtk_file_chooser_add_shortcut_folder(GTK_FILE_CHOOSER(dialog), Util::toGFile(settings->getLastOpenPath()).get(),
+                                             nullptr);
+    }
+
+    return GTK_WINDOW(dialog);
+}
+
+xoj::SaveExportDialog::SaveExportDialog(Settings* settings, fs::path suggestedPath, const char* windowTitle,
+                                        const char* buttonLabel,
+                                        std::function<bool(fs::path&, const char* filterName)> pathValidation,
+                                        std::function<void(std::optional<fs::path>)> callback):
+        window(makeWindow(settings, std::move(suggestedPath), windowTitle, buttonLabel)),
+        callback(std::move(callback)),
+        pathValidation(std::move(pathValidation)) {
+    this->signalId = g_signal_connect(
+            window.get(), "response", G_CALLBACK(+[](GtkDialog* win, int response, gpointer data) {
+                auto* self = static_cast<SaveExportDialog*>(data);
+                auto* fc = GTK_FILE_CHOOSER(win);
+                if (response == GTK_RESPONSE_OK) {
+                    auto file = Util::fromGFile(
+                            xoj::util::GObjectSPtr<GFile>(gtk_file_chooser_get_file(fc), xoj::util::adopt).get());
+
+                    if (self->pathValidation(file, gtk_file_filter_get_name(gtk_file_chooser_get_filter(fc)))) {
+                        XojMsgBox::replaceFileQuestion(
+                                GTK_WINDOW(win), std::move(file),
+                                std::bind(&SaveExportDialog::close, self, std::placeholders::_1));
+                    }  // else the dialog stays on until a suitable destination is found or cancel is hit.
+                } else {
+                    self->close(std::nullopt);
+                }
+            }),
+            this);
+}
+
+void xoj::SaveExportDialog::close(std::optional<fs::path> path) {
+    // We need to call gtk_window_close() before invoking the callback, because if the callback pops up another dialog,
+    // the first one won't close...
+    // But since gtk_window_close() triggers the destruction of *this, we first move the callback
+    auto cb = std::move(this->callback);
+
+    // Closing the window causes another "response" signal, which we want to ignore
+    g_signal_handler_disconnect(window.get(), signalId);
+    gtk_window_close(window.get());  // Destroys *this. Don't do anything after this call
+
+    cb(std::move(path));
+}
+
+static bool xoppPathValidation(fs::path& p, const char*) {
+    Util::clearExtensions(p);
+    p += ".xopp";
+    return true;
+}
+
+void xoj::SaveExportDialog::showSaveFileDialog(GtkWindow* parent, Settings* settings, fs::path suggestedPath,
+                                               std::function<void(std::optional<fs::path>)> callback) {
+    auto popup = xoj::popup::PopupWindowWrapper<SaveExportDialog>(settings, std::move(suggestedPath), _("Save File"),
+                                                                  _("Save"), xoppPathValidation, std::move(callback));
+
+    auto* fc = GTK_FILE_CHOOSER(popup.getPopup()->getWindow());
+    xoj::addFilterXopp(fc);
+
+    popup.show(parent);
+}
diff --git a/entry/src/main/cpp/src/core/gui/dialog/XojSaveDlg.h b/entry/src/main/cpp/src/core/gui/dialog/XojSaveDlg.h
new file mode 100644
index 0000000..1976ff8
--- /dev/null
+++ b/entry/src/main/cpp/src/core/gui/dialog/XojSaveDlg.h
@@ -0,0 +1,56 @@
+/*
+ * Xournal++
+ *
+ * GTK Save/Export dialog to select destination file
+ *
+ * @author Xournal++ Team
+ * https://github.com/xournalpp/xournalpp
+ *
+ * @license GNU GPLv2 or later
+ */
+
+#pragma once
+
+#include <functional>
+#include <optional>
+
+#include <gtk/gtk.h>  // for GtkWindow
+
+#include "util/raii/GtkWindowUPtr.h"
+
+#include "filesystem.h"  // for path
+
+class Settings;
+
+namespace xoj {
+/// Helper class, for a single dialog
+class SaveExportDialog {
+public:
+    /**
+     * Shows a save file dialog. The callback is called with std::nullopt if no path were selected
+     */
+    static void showSaveFileDialog(GtkWindow* parent, Settings* settings, fs::path suggestedPath,
+                                   std::function<void(std::optional<fs::path>)> callback);
+
+    /**
+     * Creates a save or export file dialog. The callback is called with std::nullopt if no path were selected
+     * @param pathValidation May modify the given path. Returns true if the path is (now) valid for saving/exporting.
+     * @param callback(path)
+     */
+    SaveExportDialog(Settings* settings, fs::path suggestedPath, const char* windowTitle, const char* buttonLabel,
+                     std::function<bool(fs::path&, const char* filterName)> pathValidation,
+                     std::function<void(std::optional<fs::path>)> callback);
+    ~SaveExportDialog() = default;
+
+    inline GtkWindow* getWindow() const { return window.get(); }
+
+private:
+    /// Closes the dialog and calls the callback on `path`
+    void close(std::optional<fs::path> path);
+
+    xoj::util::GtkWindowUPtr window;
+    std::function<void(std::optional<fs::path>)> callback;
+    std::function<bool(fs::path&, const char* filterName)> pathValidation;
+    gulong signalId{};
+};
+};  // namespace xoj
diff --git a/entry/src/main/cpp/src/core/gui/dialog/backgroundSelect/BackgroundSelectDialogBase.cpp b/entry/src/main/cpp/src/core/gui/dialog/backgroundSelect/BackgroundSelectDialogBase.cpp
new file mode 100644
index 0000000..1d7c1c6
--- /dev/null
+++ b/entry/src/main/cpp/src/core/gui/dialog/backgroundSelect/BackgroundSelectDialogBase.cpp
@@ -0,0 +1,111 @@
+#include "BackgroundSelectDialogBase.h"
+
+#include <algorithm>  // for max
+#include <utility>    // for move
+
+#include <gdk/gdk.h>      // for GDK_EXPOSURE_MASK
+#include <glib-object.h>  // for G_CALLBACK, g_signal_connect
+
+#include "gui/Builder.h"
+#include "util/Util.h"  // for paintBackgroundWhite
+#include "util/gtk4_helper.h"
+#include "util/safe_casts.h"  // for round_cast
+
+#include "BaseElementView.h"  // for BaseElementView
+
+class GladeSearchpath;
+
+
+constexpr auto UI_FILE = "backgroundSelection.glade";
+constexpr auto UI_DIALOG_NAME = "Dialog";
+
+BackgroundSelectDialogBase::BackgroundSelectDialogBase(GladeSearchpath* gladeSearchPath, Document* doc,
+                                                       Settings* settings, const char* title):
+        settings(settings), doc(doc) {
+    Builder builder(gladeSearchPath, UI_FILE);
+    this->window.reset(GTK_WINDOW(builder.get(UI_DIALOG_NAME)));
+    gtk_window_set_title(window.get(), title);
+
+    this->container = GTK_FIXED(gtk_fixed_new());
+    gtk_widget_set_hexpand(GTK_WIDGET(this->container), true);
+    this->okButton = builder.get("btOk");
+    this->vbox = GTK_BOX(builder.get("vbox"));
+
+    this->scrolledWindow = GTK_SCROLLED_WINDOW(builder.get("scrollContents"));
+    gtk_scrolled_window_set_child(scrolledWindow, GTK_WIDGET(container));
+
+    g_signal_connect(gtk_scrolled_window_get_hadjustment(scrolledWindow), "notify::page-size",
+                     G_CALLBACK(+[](GObject*, GParamSpec*, gpointer d) {
+                         static_cast<BackgroundSelectDialogBase*>(d)->layout();
+                     }),
+                     this);
+
+    gtk_window_set_default_size(this->window.get(), 800, 600);
+    gtk_widget_set_sensitive(this->okButton, false);
+
+    g_signal_connect_swapped(builder.get("btCancel"), "clicked", G_CALLBACK(gtk_window_close), this->window.get());
+
+    g_signal_connect(this->container, "realize", G_CALLBACK(+[](GtkWidget*, gpointer self) {
+                         static_cast<BackgroundSelectDialogBase*>(self)->layout();
+                     }),
+                     this);
+}
+
+BackgroundSelectDialogBase::~BackgroundSelectDialogBase() = default;
+
+auto BackgroundSelectDialogBase::getSettings() -> Settings* { return this->settings; }
+
+void BackgroundSelectDialogBase::layout() {
+    int x = 0;
+    int y = 0;
+    int row_height = 0;
+
+    auto width = gtk_adjustment_get_page_size(gtk_scrolled_window_get_hadjustment(scrolledWindow));
+
+    for (const auto& p: this->entries) {
+        if (!gtk_widget_get_visible(p->getWidget())) {
+            continue;
+        }
+
+        if (x + p->getWidth() > width) {
+            y += row_height;
+            x = 0;
+            row_height = 0;
+        }
+        gtk_fixed_move(this->container, p->getWidget(), x, y);
+
+        row_height = std::max(row_height, p->getHeight());
+        x += p->getWidth();
+    }
+}
+
+void BackgroundSelectDialogBase::populate() {
+    for (const auto& e: entries) {
+        gtk_fixed_put(this->container, e->getWidget(), 0, 0);
+    }
+
+    if (!entries.empty()) {
+        setSelected(0);
+    }
+
+    layout();
+}
+
+void BackgroundSelectDialogBase::setSelected(size_t selected) {
+    if (this->selected == selected) {
+        return;
+    }
+
+    size_t lastSelected = this->selected;
+    if (lastSelected < entries.size()) {
+        entries[lastSelected]->setSelected(false);
+    }
+
+    if (selected < entries.size()) {
+        entries[selected]->setSelected(true);
+        this->selected = selected;
+        gtk_widget_set_sensitive(okButton, true);
+    }
+}
+
+void BackgroundSelectDialogBase::ok() { gtk_button_clicked(GTK_BUTTON(okButton)); }
diff --git a/entry/src/main/cpp/src/core/gui/dialog/backgroundSelect/BackgroundSelectDialogBase.h b/entry/src/main/cpp/src/core/gui/dialog/backgroundSelect/BackgroundSelectDialogBase.h
new file mode 100644
index 0000000..292834b
--- /dev/null
+++ b/entry/src/main/cpp/src/core/gui/dialog/backgroundSelect/BackgroundSelectDialogBase.h
@@ -0,0 +1,64 @@
+/*
+ * Xournal++
+ *
+ * Base class for Background selection dialog
+ *
+ * @author Xournal++ Team
+ * https://github.com/xournalpp/xournalpp
+ *
+ * @license GNU GPLv2 or later
+ */
+
+#pragma once
+
+#include <memory>
+#include <vector>  // for vector
+
+#include <gtk/gtk.h>  // for GtkWidget, GtkWindow
+
+#include "util/Util.h"     // for npos
+#include "util/raii/GtkWindowUPtr.h"
+
+class Document;
+class Settings;
+class BaseElementView;
+class GladeSearchpath;
+
+class BackgroundSelectDialogBase {
+protected:
+    BackgroundSelectDialogBase(GladeSearchpath* gladeSearchPath, Document* doc, Settings* settings, const char* title);
+    ~BackgroundSelectDialogBase();
+
+public:
+    Settings* getSettings();
+    void setSelected(size_t selected);
+
+    void ok();  ///< As if the Ok button was clicked
+
+    inline GtkWindow* getWindow() const { return window.get(); }
+
+protected:
+    /// Adds the entry widgets
+    void populate();
+    void layout();
+
+protected:
+    xoj::util::GtkWindowUPtr window;
+
+    Settings* settings = nullptr;
+    GtkScrolledWindow* scrolledWindow = nullptr;
+    GtkFixed* container = nullptr;  ///< Area where miniatures are layed out
+    GtkWidget* okButton = nullptr;
+    GtkBox* vbox = nullptr;  ///< Vertical GtkBox containing all.
+
+    Document* doc = nullptr;
+
+    /// Selection confirmed
+    bool confirmed = false;
+
+    /// Selected entry, none if npos
+    size_t selected = npos;
+
+    /// Entries to display
+    std::vector<std::unique_ptr<BaseElementView>> entries;
+};
diff --git a/entry/src/main/cpp/src/core/gui/dialog/backgroundSelect/BaseElementView.cpp b/entry/src/main/cpp/src/core/gui/dialog/backgroundSelect/BaseElementView.cpp
new file mode 100644
index 0000000..831f03a
--- /dev/null
+++ b/entry/src/main/cpp/src/core/gui/dialog/backgroundSelect/BaseElementView.cpp
@@ -0,0 +1,145 @@
+#include "BaseElementView.h"
+
+#include <glib-object.h>  // for G_CALLBACK, g_signal_connect
+
+#include "control/settings/Settings.h"  // for Settings
+#include "gui/Shadow.h"                 // for Shadow
+#include "util/Color.h"                 // for cairo_set_source_rgbi
+#include "util/gtk4_helper.h"
+
+#include "BackgroundSelectDialogBase.h"  // for BackgroundSelectDialogBase
+
+constexpr int BORDER_WIDTH = 2;
+
+BaseElementView::BaseElementView(size_t id, BackgroundSelectDialogBase* dlg): dlg(dlg), id(id) {
+    this->widget = gtk_drawing_area_new();
+    gtk_drawing_area_set_draw_func(GTK_DRAWING_AREA(widget),
+                                   GtkDrawingAreaDrawFunc(+[](GtkWidget*, cairo_t* cr, int, int, gpointer element) {
+                                       static_cast<BaseElementView*>(element)->paint(cr);
+                                   }),
+                                   this, nullptr);
+
+#if GTK_MAJOR_VERSION == 3
+    gtk_widget_show(this->widget);
+    gtk_widget_add_events(widget, GDK_BUTTON_PRESS_MASK);
+    g_signal_connect(this->widget, "button-press-event", G_CALLBACK(+[](GtkWidget*, GdkEventButton* e, gpointer d) {
+                         auto* element = static_cast<BaseElementView*>(d);
+                         if (e->type == GDK_BUTTON_PRESS) {
+                             element->dlg->setSelected(element->id);
+                         } else if (e->type == GDK_2BUTTON_PRESS) {
+                             element->dlg->ok();
+                         }
+                         return true;
+                     }),
+                     this);
+#else
+    auto* ctrl = gtk_gesture_click_new();
+    gtk_widget_add_controller(widget, GTK_EVENT_CONTROLLER(ctrl));
+    gtk_gesture_single_set_button(GTK_GESTURE_SINGLE(ctrl), GDK_BUTTON_PRIMARY);
+    g_signal_connect(ctrl, "pressed",
+                     G_CALLBACK(+[](GtkGestureClick* g, gint n_press, gdouble x, gdouble y, gpointer d) {
+                         auto* element = static_cast<BaseElementView*>(d);
+                         if (n_press == 1) {
+                             element->dlg->setSelected(element->id);
+                         } else if (n_press == 2) {
+                             element->dlg->ok();
+                         }
+                     }),
+                     this);
+#endif
+}
+
+BaseElementView::~BaseElementView() {
+    gtk_widget_destroy(this->widget);
+
+    if (this->crBuffer) {
+        cairo_surface_destroy(this->crBuffer);
+        this->crBuffer = nullptr;
+    }
+}
+
+void BaseElementView::setSelected(bool selected) {
+    if (this->selected == selected) {
+        return;
+    }
+    this->selected = selected;
+
+    repaint();
+}
+
+void BaseElementView::repaint() {
+    if (this->crBuffer) {
+        cairo_surface_destroy(this->crBuffer);
+        this->crBuffer = nullptr;
+    }
+    gtk_widget_queue_draw(this->widget);
+}
+
+void BaseElementView::paint(cairo_t* cr) {
+    GtkAllocation alloc;
+    gtk_widget_get_allocation(this->widget, &alloc);
+
+    if (this->crBuffer == nullptr) {
+        this->crBuffer = cairo_image_surface_create(CAIRO_FORMAT_ARGB32, alloc.width, alloc.height);
+
+        int width = getContentWidth();
+        int height = getContentHeight();
+
+        cairo_t* cr2 = cairo_create(this->crBuffer);
+
+        cairo_save(cr2);
+        cairo_translate(cr2, Shadow::getShadowTopLeftSize() + BORDER_WIDTH,
+                        Shadow::getShadowTopLeftSize() + BORDER_WIDTH);
+        paintContents(cr2);
+        cairo_restore(cr2);
+
+        cairo_set_operator(cr2, CAIRO_OPERATOR_OVER);
+
+        if (this->selected) {
+            // Draw border
+            Util::cairo_set_source_rgbi(cr2, dlg->getSettings()->getBorderColor());
+            cairo_set_line_width(cr2, BORDER_WIDTH);
+            cairo_set_line_cap(cr2, CAIRO_LINE_CAP_BUTT);
+            cairo_set_line_join(cr2, CAIRO_LINE_JOIN_BEVEL);
+
+            cairo_rectangle(cr2, Shadow::getShadowTopLeftSize() + BORDER_WIDTH / 2,
+                            Shadow::getShadowTopLeftSize() + BORDER_WIDTH / 2, width + BORDER_WIDTH,
+                            height + BORDER_WIDTH);
+
+            cairo_stroke(cr2);
+
+            Shadow::drawShadow(cr2, Shadow::getShadowTopLeftSize(), Shadow::getShadowTopLeftSize(),
+                               width + 2 * BORDER_WIDTH, height + 2 * BORDER_WIDTH);
+        } else {
+            Shadow::drawShadow(cr2, Shadow::getShadowTopLeftSize() + BORDER_WIDTH,
+                               Shadow::getShadowTopLeftSize() + BORDER_WIDTH, width, height);
+        }
+
+        cairo_destroy(cr2);
+    }
+
+    cairo_set_operator(cr, CAIRO_OPERATOR_OVER);
+    cairo_set_source_surface(cr, this->crBuffer, 0, 0);
+    cairo_paint(cr);
+}
+
+auto BaseElementView::getWidget() -> GtkWidget* {
+    updateSize();
+    return this->widget;
+}
+
+auto BaseElementView::getWidth() -> int {
+    calcSize();
+    return getContentWidth() + Shadow::getShadowBottomRightSize() + Shadow::getShadowTopLeftSize() + 2 * BORDER_WIDTH;
+}
+
+auto BaseElementView::getHeight() -> int {
+    calcSize();
+    return getContentHeight() + Shadow::getShadowBottomRightSize() + Shadow::getShadowTopLeftSize() + 2 * BORDER_WIDTH;
+}
+
+void BaseElementView::calcSize() {
+    // Not implemented in the base class
+}
+
+void BaseElementView::updateSize() { gtk_widget_set_size_request(this->widget, this->getWidth(), this->getHeight()); }
diff --git a/entry/src/main/cpp/src/core/gui/dialog/backgroundSelect/BaseElementView.h b/entry/src/main/cpp/src/core/gui/dialog/backgroundSelect/BaseElementView.h
new file mode 100644
index 0000000..d794b3f
--- /dev/null
+++ b/entry/src/main/cpp/src/core/gui/dialog/backgroundSelect/BaseElementView.h
@@ -0,0 +1,87 @@
+/*
+ * Xournal++
+ *
+ * Base class for Background selection dialog entry
+ *
+ * @author Xournal++ Team
+ * https://github.com/xournalpp/xournalpp
+ *
+ * @license GNU GPLv2 or later
+ */
+
+#pragma once
+
+#include <cairo.h>    // for cairo_t, cairo_surface_t
+#include <gdk/gdk.h>  // for GdkEventButton
+#include <glib.h>     // for gboolean
+#include <gtk/gtk.h>  // for GtkWidget
+
+#include "util/Util.h"  // for npos
+
+class BackgroundSelectDialogBase;
+
+class BaseElementView {
+public:
+    BaseElementView(size_t id, BackgroundSelectDialogBase* dlg);
+    virtual ~BaseElementView();
+
+public:
+    GtkWidget* getWidget();
+    int getWidth();
+    int getHeight();
+
+    /**
+     * Select / unselect this entry
+     */
+    void setSelected(bool selected);
+
+    /**
+     * Repaint this widget
+     */
+    void repaint();
+
+protected:
+    /**
+     * Apply the size to the Widget
+     */
+    void updateSize();
+
+    /**
+     * Paint the whole widget
+     */
+    void paint(cairo_t* cr);
+
+    /**
+     * Paint the contents (without border / selection)
+     */
+    virtual void paintContents(cairo_t* cr) = 0;
+
+    /**
+     * Get the width in pixel, without shadow / border
+     */
+    virtual int getContentWidth() = 0;
+
+    /**
+     * Get the height in pixel, without shadow / border
+     */
+    virtual int getContentHeight() = 0;
+
+    /**
+     * Will be called before getContentWidth() / getContentHeight(), can be overwritten
+     */
+    virtual void calcSize();
+
+protected:
+    BackgroundSelectDialogBase* dlg;
+
+private:
+    /**
+     * Element ID
+     */
+    size_t id = npos;
+
+    bool selected = false;
+
+    GtkWidget* widget = nullptr;
+    cairo_surface_t* crBuffer = nullptr;
+};
diff --git a/entry/src/main/cpp/src/core/gui/dialog/backgroundSelect/ImageElementView.cpp b/entry/src/main/cpp/src/core/gui/dialog/backgroundSelect/ImageElementView.cpp
new file mode 100644
index 0000000..2d30806
--- /dev/null
+++ b/entry/src/main/cpp/src/core/gui/dialog/backgroundSelect/ImageElementView.cpp
@@ -0,0 +1,46 @@
+#include "ImageElementView.h"
+
+#include <gdk-pixbuf/gdk-pixbuf.h>  // for gdk_pixbuf_...
+#include <gdk/gdk.h>                // for gdk_cairo_s...
+
+#include "gui/Shadow.h"                                   // for Shadow
+#include "gui/dialog/backgroundSelect/BaseElementView.h"  // for BaseElement...
+#include "util/safe_casts.h"                              // for ceil_cast
+
+class BackgroundSelectDialogBase;
+
+constexpr int MINIATURE_PIXEL_SIZE = 128;
+
+ImageElementView::ImageElementView(size_t id, BackgroundSelectDialogBase* dlg): BaseElementView(id, dlg) {}
+
+ImageElementView::~ImageElementView() = default;
+
+void ImageElementView::calcSize() {
+    if (this->width == -1) {
+        GdkPixbuf* p = backgroundImage.getPixbuf();
+        this->width = gdk_pixbuf_get_width(p);
+        this->height = gdk_pixbuf_get_height(p);
+
+        if (this->width < this->height) {
+            zoom = static_cast<double>(MINIATURE_PIXEL_SIZE) / this->height;
+            this->height = MINIATURE_PIXEL_SIZE;
+            this->width = floor_cast<int>(this->width * zoom);
+        } else {
+            zoom = static_cast<double>(MINIATURE_PIXEL_SIZE) / this->width;
+            this->width = MINIATURE_PIXEL_SIZE;
+            this->height = floor_cast<int>(this->height * zoom);
+        }
+    }
+}
+
+void ImageElementView::paintContents(cairo_t* cr) {
+    cairo_scale(cr, this->zoom, this->zoom);
+
+    GdkPixbuf* p = this->backgroundImage.getPixbuf();
+    gdk_cairo_set_source_pixbuf(cr, p, 0, 0);
+    cairo_paint(cr);
+}
+
+auto ImageElementView::getContentWidth() -> int { return width; }
+
+auto ImageElementView::getContentHeight() -> int { return height; }
diff --git a/entry/src/main/cpp/src/core/gui/dialog/backgroundSelect/ImageElementView.h b/entry/src/main/cpp/src/core/gui/dialog/backgroundSelect/ImageElementView.h
new file mode 100644
index 0000000..82c7a4a
--- /dev/null
+++ b/entry/src/main/cpp/src/core/gui/dialog/backgroundSelect/ImageElementView.h
@@ -0,0 +1,58 @@
+/*
+ * Xournal++
+ *
+ * Image view
+ *
+ * @author Xournal++ Team
+ * https://github.com/xournalpp/xournalpp
+ *
+ * @license GNU GPLv2 or later
+ */
+
+#pragma once
+
+#include <cairo.h>  // for cairo_t
+
+#include "model/BackgroundImage.h"  // for BackgroundImage
+#include "util/Util.h"              // for npos
+
+#include "BaseElementView.h"  // for BaseElementView
+
+class BackgroundSelectDialogBase;
+
+
+class ImageElementView: public BaseElementView {
+public:
+    ImageElementView(size_t id, BackgroundSelectDialogBase* dlg);
+    ~ImageElementView() override;
+
+protected:
+    /**
+     * Paint the contents (without border / selection)
+     */
+    void paintContents(cairo_t* cr) override;
+
+    /**
+     * Get the width in pixel, without shadow / border
+     */
+    int getContentWidth() override;
+
+    /**
+     * Get the height in pixel, without shadow / border
+     */
+    int getContentHeight() override;
+
+    /**
+     * Will be called before getContentWidth() / getContentHeight(), can be overwritten
+     */
+    void calcSize() override;
+
+private:
+    double zoom = 1;
+
+    BackgroundImage backgroundImage;
+    int width = -1;
+    int height = -1;
+
+    friend class ImagesDialog;
+};
diff --git a/entry/src/main/cpp/src/core/gui/dialog/backgroundSelect/ImagesDialog.cpp b/entry/src/main/cpp/src/core/gui/dialog/backgroundSelect/ImagesDialog.cpp
new file mode 100644
index 0000000..963bae3
--- /dev/null
+++ b/entry/src/main/cpp/src/core/gui/dialog/backgroundSelect/ImagesDialog.cpp
@@ -0,0 +1,120 @@
+#include "ImagesDialog.h"
+
+#include <cstddef>
+#include <memory>
+#include <string>
+#include <vector>
+
+#include <glib-object.h>
+
+#include "gui/dialog/XojOpenDlg.h"  // for showOpenImageDialog
+#include "gui/dialog/backgroundSelect/BackgroundSelectDialogBase.h"
+#include "gui/dialog/backgroundSelect/BaseElementView.h"
+#include "model/BackgroundImage.h"
+#include "model/Document.h"
+#include "model/PageRef.h"
+#include "model/PageType.h"
+#include "model/XojPage.h"
+#include "util/PathUtil.h"
+#include "util/Util.h"  // for npos
+#include "util/XojMsgBox.h"
+#include "util/i18n.h"
+
+#include "ImageElementView.h"
+
+class GladeSearchpath;
+class Settings;
+
+ImagesDialog::ImagesDialog(GladeSearchpath* gladeSearchPath, Document* doc, Settings* settings,
+                           std::function<void(BackgroundImage)> callback):
+        BackgroundSelectDialogBase(gladeSearchPath, doc, settings, _("Select Image")), callback(std::move(callback)) {
+    loadImagesFromPages();
+
+    GtkWidget* lbl = gtk_label_new(_("<b>... or select already used Image:</b>"));
+    gtk_label_set_use_markup(GTK_LABEL(lbl), true);
+    gtk_box_prepend(vbox, lbl);
+
+    fileChooserButton = GTK_BUTTON(gtk_button_new_with_label(_("Load file")));
+    gtk_box_prepend(vbox, GTK_WIDGET(fileChooserButton));
+
+#if GTK_MAJOR_VERSION == 3
+    gtk_widget_show_all(GTK_WIDGET(vbox));
+#endif
+
+    g_signal_connect(fileChooserButton, "clicked", G_CALLBACK(filechooserButtonCallback), this);
+
+    g_signal_connect_swapped(
+            okButton, "clicked", G_CALLBACK(+[](ImagesDialog* self) {
+                if (self->selected < self->entries.size()) {
+                    auto img = (static_cast<ImageElementView*>(self->entries[self->selected].get()))->backgroundImage;
+                    if (!img.isEmpty()) {
+                        self->callback(std::move(img));
+                    }
+                }
+                gtk_window_close(self->window.get());
+            }),
+            this);
+
+    populate();
+}
+
+ImagesDialog::~ImagesDialog() = default;
+
+void ImagesDialog::loadImagesFromPages() {
+    doc->lock_shared();
+    for (size_t i = 0; i < doc->getPageCount(); i++) {
+        PageRef p = doc->getPage(i);
+
+        if (!p->getBackgroundType().isImagePage()) {
+            continue;
+        }
+
+        if (p->getBackgroundImage().isEmpty()) {
+            continue;
+        }
+
+        if (isImageAlreadyInTheList(p->getBackgroundImage())) {
+            // Do not display the same image twice
+            continue;
+        }
+
+        auto* iv = new ImageElementView(this->entries.size(), this);
+        iv->backgroundImage = p->getBackgroundImage();
+        this->entries.emplace_back(iv);
+    }
+    doc->unlock_shared();
+}
+
+auto ImagesDialog::isImageAlreadyInTheList(BackgroundImage& image) -> bool {
+    for (const auto& v: this->entries) {
+        auto* iv = static_cast<ImageElementView*>(v.get());
+        if (iv->backgroundImage == image) {
+            return true;
+        }
+    }
+
+    return false;
+}
+
+void ImagesDialog::filechooserButtonCallback(GtkButton*, ImagesDialog* dlg) {
+    xoj::OpenDlg::showOpenImageDialog(dlg->window.get(), dlg->settings, [dlg](fs::path p, bool attach) {
+        BackgroundImage img;
+        GError* err = nullptr;
+        img.loadFile(p, &err);
+        img.setAttach(attach);
+        if (err) {
+            XojMsgBox::showErrorToUser(dlg->window.get(),
+                                       FS(_F("This image could not be loaded. Error message: {1}") % err->message));
+            g_error_free(err);
+            return;
+        }
+
+        if (img.isEmpty()) {
+            XojMsgBox::showErrorToUser(dlg->window.get(), _("This image could not be loaded."));
+            return;
+        }
+
+        dlg->callback(std::move(img));
+        gtk_window_close(dlg->window.get());
+    });
+}
diff --git a/entry/src/main/cpp/src/core/gui/dialog/backgroundSelect/ImagesDialog.h b/entry/src/main/cpp/src/core/gui/dialog/backgroundSelect/ImagesDialog.h
new file mode 100644
index 0000000..d88a69c
--- /dev/null
+++ b/entry/src/main/cpp/src/core/gui/dialog/backgroundSelect/ImagesDialog.h
@@ -0,0 +1,47 @@
+/*
+ * Xournal++
+ *
+ * Dialog to select a Image (to insert as background)
+ *
+ * @author Xournal++ Team
+ * https://github.com/xournalpp/xournalpp
+ *
+ * @license GNU GPLv2 or later
+ */
+
+#pragma once
+
+#include <gtk/gtk.h>  // for GtkButton, GtkWindow
+
+#include "BackgroundSelectDialogBase.h"  // for BackgroundSelectDialogBase
+
+struct BackgroundImage;
+class Document;
+class GladeSearchpath;
+class Settings;
+
+class ImagesDialog final: public BackgroundSelectDialogBase {
+public:
+    ImagesDialog(GladeSearchpath* gladeSearchPath, Document* doc, Settings* settings,
+                 std::function<void(BackgroundImage)> callback);
+    ~ImagesDialog();
+
+private:
+    /**
+     * Load all images form all pages
+     */
+    void loadImagesFromPages();
+
+    /**
+     * Check if this image is already displayed
+     */
+    bool isImageAlreadyInTheList(BackgroundImage& image);
+
+    static void okButtonCallback(GtkButton* button, ImagesDialog* dlg);
+    static void filechooserButtonCallback(GtkButton* button, ImagesDialog* dlg);
+
+private:
+    GtkButton* fileChooserButton = nullptr;
+
+    std::function<void(BackgroundImage)> callback;
+};
diff --git a/entry/src/main/cpp/src/core/gui/dialog/backgroundSelect/PdfElementView.cpp b/entry/src/main/cpp/src/core/gui/dialog/backgroundSelect/PdfElementView.cpp
new file mode 100644
index 0000000..3cb4db7
--- /dev/null
+++ b/entry/src/main/cpp/src/core/gui/dialog/backgroundSelect/PdfElementView.cpp
@@ -0,0 +1,34 @@
+#include "PdfElementView.h"
+
+#include <memory>   // for __shared_pt...
+#include <utility>  // for move
+
+#include <gtk/gtk.h>  // for gtk_widget_...
+
+#include "gui/dialog/backgroundSelect/BaseElementView.h"  // for BaseElement...
+#include "pdf/base/XojPdfPage.h"                          // for XojPdfPageSPtr
+#include "util/safe_casts.h"                              // for ceil_cast
+
+#include "PdfPagesDialog.h"  // for PdfPagesDialog
+
+PdfElementView::PdfElementView(size_t id, XojPdfPageSPtr page, PdfPagesDialog* dlg):
+        BaseElementView(id, dlg), page(std::move(page)) {}
+
+PdfElementView::~PdfElementView() = default;
+
+auto PdfElementView::isUsed() const -> bool { return this->used; }
+
+void PdfElementView::setUsed(bool used) { this->used = used; }
+
+void PdfElementView::setHideIfUsed(bool hideIfUsed) { gtk_widget_set_visible(getWidget(), !(hideIfUsed && isUsed())); }
+
+void PdfElementView::paintContents(cairo_t* cr) {
+    cairo_scale(cr, PdfPagesDialog::ZOOM_VALUE, PdfPagesDialog::ZOOM_VALUE);
+    page->render(cr);
+}
+
+auto PdfElementView::getContentWidth() -> int { return floor_cast<int>(page->getWidth() * PdfPagesDialog::ZOOM_VALUE); }
+
+auto PdfElementView::getContentHeight() -> int {
+    return floor_cast<int>(page->getHeight() * PdfPagesDialog::ZOOM_VALUE);
+}
diff --git a/entry/src/main/cpp/src/core/gui/dialog/backgroundSelect/PdfElementView.h b/entry/src/main/cpp/src/core/gui/dialog/backgroundSelect/PdfElementView.h
new file mode 100644
index 0000000..ce0e628
--- /dev/null
+++ b/entry/src/main/cpp/src/core/gui/dialog/backgroundSelect/PdfElementView.h
@@ -0,0 +1,55 @@
+/*
+ * Xournal++
+ *
+ * PDF view
+ *
+ * @author Xournal++ Team
+ * https://github.com/xournalpp/xournalpp
+ *
+ * @license GNU GPLv2 or later
+ */
+
+#pragma once
+
+#include <cairo.h>  // for cairo_t
+
+#include "pdf/base/XojPdfPage.h"  // for XojPdfPageSPtr
+
+#include "BaseElementView.h"  // for BaseElementView
+
+class PdfPagesDialog;
+
+class PdfElementView: public BaseElementView {
+public:
+    PdfElementView(size_t id, XojPdfPageSPtr page, PdfPagesDialog* dlg);
+    ~PdfElementView() override;
+
+protected:
+    /**
+     * Paint the contents (without border / selection)
+     */
+    void paintContents(cairo_t* cr) override;
+
+    /**
+     * Get the width in pixel, without shadow / border
+     */
+    int getContentWidth() override;
+
+    /**
+     * Get the height in pixel, without shadow / border
+     */
+    int getContentHeight() override;
+
+public:
+    bool isUsed() const;
+    void setUsed(bool used);
+    void setHideIfUsed(bool hideIfUsed);
+
+private:
+    XojPdfPageSPtr page;
+
+    /**
+     * This page is already used as background
+     */
+    bool used = false;
+};
diff --git a/entry/src/main/cpp/src/core/gui/dialog/backgroundSelect/PdfPagesDialog.cpp b/entry/src/main/cpp/src/core/gui/dialog/backgroundSelect/PdfPagesDialog.cpp
new file mode 100644
index 0000000..74566d5
--- /dev/null
+++ b/entry/src/main/cpp/src/core/gui/dialog/backgroundSelect/PdfPagesDialog.cpp
@@ -0,0 +1,98 @@
+#include "PdfPagesDialog.h"
+
+#include <cstddef>
+#include <memory>
+#include <string>
+#include <vector>
+
+#include <glib-object.h>
+
+#include "gui/dialog/backgroundSelect/BackgroundSelectDialogBase.h"
+#include "gui/dialog/backgroundSelect/BaseElementView.h"
+#include "model/Document.h"
+#include "model/PageRef.h"
+#include "model/PageType.h"
+#include "model/XojPage.h"
+#include "pdf/base/XojPdfPage.h"
+#include "util/Assert.h"
+#include "util/Util.h"  // for npos
+#include "util/i18n.h"  // for FC
+
+#include "PdfElementView.h"
+
+class GladeSearchpath;
+class Settings;
+
+PdfPagesDialog::PdfPagesDialog(GladeSearchpath* gladeSearchPath, Document* doc, Settings* settings,
+                               std::function<void(size_t)> callback):
+        BackgroundSelectDialogBase(gladeSearchPath, doc, settings, _("Select PDF Page")),
+        callback(std::move(callback)) {
+    doc->lock_shared();
+    for (size_t i = 0; i < doc->getPdfPageCount(); i++) {
+        XojPdfPageSPtr p = doc->getPdfPage(i);
+        entries.emplace_back(std::make_unique<PdfElementView>(entries.size(), p, this));
+    }
+
+    size_t used = 0;
+    for (size_t i = 0; i < doc->getPageCount(); i++) {
+        PageRef p = doc->getPage(i);
+
+        if (p->getBackgroundType().isPdfPage()) {
+            auto pdfPage = p->getPdfPageNr();
+            if (pdfPage >= 0 && pdfPage < entries.size()) {
+                auto* pv = (static_cast<PdfElementView*>(entries[pdfPage].get()));
+                if (!pv->isUsed()) {
+                    pv->setUsed(true);
+                    used++;
+                }
+            }
+        }
+    }
+    xoj_assert(used <= doc->getPdfPageCount());
+    auto unused = doc->getPdfPageCount() - used;
+    doc->unlock_shared();
+
+    cbUnusedOnly = GTK_CHECK_BUTTON(gtk_check_button_new_with_label(
+            (unused == 1 ? _("Show only not used pages (one unused page)") :
+                           FC(_F("Show only not used pages ({1} unused pages)") % unused))));
+
+    gtk_box_prepend(vbox, GTK_WIDGET(cbUnusedOnly));
+
+#if GTK_MAJOR_VERSION == 3
+    gtk_widget_show_all(GTK_WIDGET(vbox));
+#endif
+
+    g_signal_connect(cbUnusedOnly, "toggled", G_CALLBACK(onlyNotUsedCallback), this);
+
+    g_signal_connect_swapped(okButton, "clicked", G_CALLBACK(+[](PdfPagesDialog* self) {
+                                 if (self->selected < self->entries.size()) {
+                                     self->callback(self->selected);
+                                 }
+                                 gtk_window_close(self->window.get());
+                             }),
+                             this);
+
+    populate();
+}
+
+PdfPagesDialog::~PdfPagesDialog() = default;
+
+void PdfPagesDialog::updateOkButton() {
+    bool valid = selected < entries.size() && gtk_widget_get_visible(this->entries[this->selected]->getWidget());
+    gtk_widget_set_sensitive(okButton, valid);
+}
+
+void PdfPagesDialog::onlyNotUsedCallback(GtkToggleButton* tb, PdfPagesDialog* dlg) {
+    bool hideIfUsed = gtk_toggle_button_get_active(tb);
+    for (const auto& p: dlg->entries) {
+        auto* pv = static_cast<PdfElementView*>(p.get());
+        pv->setHideIfUsed(hideIfUsed);
+    }
+
+    dlg->layout();
+    dlg->updateOkButton();
+
+    // For some reason (a bug in GtkViewport, maybe?), the GtkFixed's size is not always updated here.
+    // This hack seems to fix that...
+    gtk_widget_queue_resize(gtk_widget_get_parent(GTK_WIDGET(dlg->container)));
+}
diff --git a/entry/src/main/cpp/src/core/gui/dialog/backgroundSelect/PdfPagesDialog.h b/entry/src/main/cpp/src/core/gui/dialog/backgroundSelect/PdfPagesDialog.h
new file mode 100644
index 0000000..7efdd68
--- /dev/null
+++ b/entry/src/main/cpp/src/core/gui/dialog/backgroundSelect/PdfPagesDialog.h
@@ -0,0 +1,41 @@
+/*
+ * Xournal++
+ *
+ * Dialog to select a PDF page (to insert as background)
+ *
+ * @author Xournal++ Team
+ * https://github.com/xournalpp/xournalpp
+ *
+ * @license GNU GPLv2 or later
+ */
+
+#pragma once
+
+#include <gtk/gtk.h>  // for GtkButton, GtkToggleButton
+
+#include "BackgroundSelectDialogBase.h"  // for BackgroundSelectDialogBase
+
+class Document;
+class GladeSearchpath;
+class Settings;
+
+
+class PdfPagesDialog final: public BackgroundSelectDialogBase {
+public:
+    PdfPagesDialog(GladeSearchpath* gladeSearchPath, Document* doc, Settings* settings,
+                   std::function<void(size_t)> callback);
+    ~PdfPagesDialog();
+
+public:
+    void updateOkButton();
+
+    static constexpr double ZOOM_VALUE = 0.25;
+
+private:
+    static void onlyNotUsedCallback(GtkToggleButton* tb, PdfPagesDialog* dlg);
+
+    GtkCheckButton* cbUnusedOnly;
+
+    /// Takes parameter the pdf page number
+    std::function<void(size_t)> callback;
+};
diff --git a/entry/src/main/cpp/src/core/gui/dialog/toolbarCustomize/ToolItemDragCurrentData.cpp b/entry/src/main/cpp/src/core/gui/dialog/toolbarCustomize/ToolItemDragCurrentData.cpp
new file mode 100644
index 0000000..b957e3e
--- /dev/null
+++ b/entry/src/main/cpp/src/core/gui/dialog/toolbarCustomize/ToolItemDragCurrentData.cpp
@@ -0,0 +1,47 @@
+#include "ToolItemDragCurrentData.h"
+
+#include <glib.h>  // for g_malloc, g_malloc_n, g_free, g_new
+
+#include "util/Stacktrace.h"  // for Stacktrace
+
+class AbstractToolItem;
+struct NamedColor;
+
+std::unique_ptr<ToolItemDragDropData> ToolItemDragCurrentData::data = nullptr;
+
+void ToolItemDragCurrentData::clearData() { data.reset(); }
+
+void ToolItemDragCurrentData::setData(GtkWidget* widget) {
+    data = std::make_unique<ToolItemDragDropData>();
+
+    ToolItemDragDropData* d = ToolitemDragDrop::metadataGetMetadata(widget);
+    if (d == nullptr) {
+        g_warning("ToolItemDragCurrentData::setData(GtkWidget * widget) could not get data!");
+        Stacktrace::printStacktrace();
+        return;
+    }
+
+    *data = *d;
+}
+
+void ToolItemDragCurrentData::setData(ToolItemType type, int id, AbstractToolItem* item) {
+    g_return_if_fail(item != nullptr || type != TOOL_ITEM_ITEM);
+
+    data = ToolitemDragDrop::ToolItemDragDropData_new(item);
+    data->type = type;
+    data->id = id;
+}
+
+void ToolItemDragCurrentData::setDataColor(int id, size_t paletteColorIndex) {
+    data = ToolitemDragDrop::ToolItemDragDropData_new(nullptr);
+    data->type = TOOL_ITEM_COLOR;
+    data->id = id;
+    data->paletteColorIndex = paletteColorIndex;
+}
+
+void ToolItemDragCurrentData::setData(ToolItemDragDropData* d) {
+    data = std::make_unique<ToolItemDragDropData>();
+    *data = *d;
+}
+
+auto ToolItemDragCurrentData::getData() -> const ToolItemDragDropData* { return data.get(); }
diff --git a/entry/src/main/cpp/src/core/gui/dialog/toolbarCustomize/ToolItemDragCurrentData.h b/entry/src/main/cpp/src/core/gui/dialog/toolbarCustomize/ToolItemDragCurrentData.h
new file mode 100644
index 0000000..26671c0
--- /dev/null
+++ b/entry/src/main/cpp/src/core/gui/dialog/toolbarCustomize/ToolItemDragCurrentData.h
@@ -0,0 +1,38 @@
+/*
+ * Xournal++
+ *
+ * Toolbar drag & drop helper class
+ *
+ * @author Xournal++ Team
+ * https://github.com/xournalpp/xournalpp
+ *
+ * @license GNU GPLv2 or later
+ */
+
+#pragma once
+
+#include <memory>
+
+#include <gtk/gtk.h>  // for GtkWidget
+
+#include "gui/ToolitemDragDrop.h"  // for ToolItemDragDropData (ptr only)
+
+class AbstractToolItem;
+struct NamedColor;
+
+class ToolItemDragCurrentData {
+private:
+    ToolItemDragCurrentData();
+    virtual ~ToolItemDragCurrentData();
+
+public:
+    static void clearData();
+    static void setData(ToolItemDragDropData* d);
+    static void setData(ToolItemType type, int id, AbstractToolItem* item);
+    static void setData(GtkWidget* widget);
+    static void setDataColor(int id, size_t paletteColorIndex);
+    static const ToolItemDragDropData* getData();
+
+private:
+    static std::unique_ptr<ToolItemDragDropData> data;
+};
diff --git a/entry/src/main/cpp/src/core/gui/dialog/toolbarCustomize/ToolbarAdapter.cpp b/entry/src/main/cpp/src/core/gui/dialog/toolbarCustomize/ToolbarAdapter.cpp
new file mode 100644
index 0000000..46c8127
--- /dev/null
+++ b/entry/src/main/cpp/src/core/gui/dialog/toolbarCustomize/ToolbarAdapter.cpp
@@ -0,0 +1,345 @@
+#include "ToolbarAdapter.h"
+
+#include <utility>  // for move
+
+#include <glib-object.h>  // for G_CALLBACK
+
+#include "control/Control.h"                           // for Control
+#include "control/settings/Settings.h"                 // for Settings
+#include "gui/MainWindow.h"                            // for MainWindow
+#include "gui/ToolitemDragDrop.h"                      // for ToolItemDragDr...
+#include "gui/toolbarMenubar/AbstractToolItem.h"       // for AbstractToolItem
+#include "gui/toolbarMenubar/ColorToolItem.h"          // for ColorToolItem
+#include "gui/toolbarMenubar/ToolMenuHandler.h"        // for ToolMenuHandler
+#include "gui/toolbarMenubar/icon/ColorIcon.h"         // for ColorIcon
+#include "gui/toolbarMenubar/model/ToolbarData.h"      // for ToolbarData
+#include "util/Assert.h"                               // for xoj_assert
+#include "util/NamedColor.h"                           // for NamedColor
+#include "util/PlaceholderString.h"                    // for PlaceholderString
+#include "util/gtk4_helper.h"
+#include "util/i18n.h"
+
+#include "ToolItemDragCurrentData.h"  // for ToolItemDragCu...
+#include "ToolbarDragDropHelper.h"    // for dragDestAddToo...
+
+using std::string;
+
+ToolbarAdapter::ToolbarAdapter(GtkWidget* toolbar, string toolbarName, ToolMenuHandler* toolHandler,
+                               MainWindow* window):
+        palette(toolHandler->getControl()->getPalette()) {
+    this->w = toolbar;
+    g_object_ref(this->w);
+    this->toolbarName = std::move(toolbarName);
+    this->window = window;
+
+    // prepare drag & drop
+    gtk_drag_dest_set(toolbar, GTK_DEST_DEFAULT_ALL, nullptr, 0, GDK_ACTION_MOVE);
+    ToolbarDragDropHelper::dragDestAddToolbar(toolbar);
+
+    g_signal_connect(toolbar, "drag_motion", G_CALLBACK(toolbarDragMotionCb), this);
+    g_signal_connect(toolbar, "drag_leave", G_CALLBACK(toolbarDragLeafeCb), this);
+    g_signal_connect(toolbar, "drag_data_received", G_CALLBACK(toolbarDragDataReceivedCb), this);
+
+    showToolbar();
+    prepareToolItems();
+
+    gtk_widget_add_css_class(w, "editing");
+}
+
+ToolbarAdapter::~ToolbarAdapter() {
+    // remove drag & drop handler
+    g_signal_handlers_disconnect_by_func(this->w, (gpointer)toolbarDragMotionCb, this);
+    g_signal_handlers_disconnect_by_func(this->w, (gpointer)toolbarDragLeafeCb, this);
+    g_signal_handlers_disconnect_by_func(this->w, (gpointer)toolbarDragDataReceivedCb, this);
+
+    cleanupToolbars();
+
+    gtk_widget_remove_css_class(w, "editing");
+
+    g_object_unref(this->w);
+}
+
+void ToolbarAdapter::cleanupToolbars() {
+    GtkToolbar* tb = GTK_TOOLBAR(this->w);
+    if (gtk_toolbar_get_n_items(tb) == 0) {
+        gtk_widget_hide(this->w);
+    } else {
+        for (int i = 0; i < gtk_toolbar_get_n_items(tb); i++) {
+            GtkToolItem* it = gtk_toolbar_get_nth_item(tb, i);
+            cleanToolItem(it);
+        }
+    }
+}
+
+void ToolbarAdapter::prepareToolItems() {
+    GtkToolbar* tb = GTK_TOOLBAR(this->w);
+
+    for (int i = 0; i < gtk_toolbar_get_n_items(tb); i++) {
+        GtkToolItem* it = gtk_toolbar_get_nth_item(tb, i);
+        prepareToolItem(it);
+    }
+}
+
+void ToolbarAdapter::cleanToolItem(GtkToolItem* it) {
+    GdkWindow* window = gtk_widget_get_window(GTK_WIDGET(it));
+
+    if (window) {
+        gdk_window_set_cursor(window, nullptr);
+    }
+
+    gtk_tool_item_set_use_drag_window(it, false);
+    gtk_drag_source_unset(GTK_WIDGET(it));
+
+    g_signal_handlers_disconnect_by_func(it, (gpointer)toolitemDragBegin, nullptr);
+    g_signal_handlers_disconnect_by_func(it, (gpointer)toolitemDragEnd, nullptr);
+    g_signal_handlers_disconnect_by_func(it, (gpointer)toolitemDragDataGet, this);
+}
+
+void ToolbarAdapter::prepareToolItem(GtkToolItem* it) {
+    gtk_tool_item_set_use_drag_window(it, true);
+
+    /*
+     * Set cursor of drag drop to hand. Note: the tool item must be realized for
+     * this to work!
+     */
+    {
+        gtk_widget_realize(GTK_WIDGET(it));
+        GdkDisplay* display = gtk_widget_get_display(GTK_WIDGET(it));
+        GdkCursor* cursor = gdk_cursor_new_for_display(display, GDK_HAND2);
+        xoj_assert(cursor);
+        GdkWindow* window = gtk_widget_get_window(GTK_WIDGET(it));
+        xoj_assert(window);
+        gdk_window_set_cursor(window, cursor);
+        g_object_unref(cursor);
+    }
+
+    gtk_drag_source_set(GTK_WIDGET(it), GDK_BUTTON1_MASK, &ToolbarDragDropHelper::dropTargetEntry, 1, GDK_ACTION_MOVE);
+    ToolbarDragDropHelper::dragSourceAddToolbar(GTK_WIDGET(it));
+
+    g_signal_connect(it, "drag-begin", G_CALLBACK(toolitemDragBegin), nullptr);
+    g_signal_connect(it, "drag-end", G_CALLBACK(toolitemDragEnd), nullptr);
+    g_signal_connect(it, "drag-data-get", G_CALLBACK(toolitemDragDataGet), this);
+}
+
+void ToolbarAdapter::showToolbar() {
+    // force the toolbar to be shown even if empty
+    gtk_widget_show(this->w);
+}
+
+/**
+ * Drag a Toolitem from toolbar
+ */
+void ToolbarAdapter::toolitemDragBegin(GtkWidget* widget, GdkDragContext* context, void* unused) {
+    ToolItemDragDropData* data = ToolitemDragDrop::metadataGetMetadata(widget);
+    g_return_if_fail(data != nullptr);
+    ToolItemDragCurrentData::setData(data);
+
+    auto* icon = ToolitemDragDrop::getIcon(data);
+    g_object_ref_sink(icon);
+    ToolbarDragDropHelper::gdk_context_set_icon_from_image(context, icon);
+    g_object_unref(icon);
+
+    gtk_widget_hide(widget);
+}
+
+/**
+ * Drag a Toolitem from toolbar STOPPED
+ */
+void ToolbarAdapter::toolitemDragEnd(GtkWidget* widget, GdkDragContext* context, void* unused) {
+    ToolItemDragCurrentData::clearData();
+    gtk_widget_show(widget);
+}
+
+/**
+ * Remove a toolbar item from the tool where it was
+ */
+void ToolbarAdapter::removeFromToolbar(AbstractToolItem* item, const string& toolbarName, int id) {
+    ToolbarData* d = this->window->getSelectedToolbar();
+    if (d->removeItemByID(toolbarName, id)) {
+        if (item != nullptr) {
+            g_message(
+                    "%s",
+                    FS(_F("Removed tool item {1} from Toolbar {2} ID {3}") % item->getId() % toolbarName % id).c_str());
+        } else {
+            g_message("%s", FS(_F("Removed tool item from Toolbar {1} ID {2}") % toolbarName % id).c_str());
+        }
+    } else {
+        if (item != nullptr) {
+            g_message("%s", FS(_F("Could not remove tool item {1} from Toolbar {2} on position {3}") % item->getId() %
+                               toolbarName % id)
+                                    .c_str());
+        } else {
+            g_message("%s",
+                      FS(_F("Could not remove tool item from Toolbar {1} on position {2}") % toolbarName % id).c_str());
+        }
+    }
+}
+
+void ToolbarAdapter::toolitemDragDataGet(GtkWidget* widget, GdkDragContext* context, GtkSelectionData* selection_data,
+                                         guint info, guint time, ToolbarAdapter* adapter) {
+    ToolItemDragDropData* data = ToolitemDragDrop::metadataGetMetadata(widget);
+
+    g_return_if_fail(data != nullptr);
+
+    GtkToolbar* tb = GTK_TOOLBAR(adapter->w);
+    int position = -1;
+    for (int i = 0; i < gtk_toolbar_get_n_items(tb); i++) {
+        GtkToolItem* it = gtk_toolbar_get_nth_item(tb, i);
+
+        if (static_cast<void*>(it) == static_cast<void*>(widget)) {
+            adapter->cleanToolItem(it);
+            gtk_container_remove(GTK_CONTAINER(tb), GTK_WIDGET(it));
+            position = i;
+            break;
+        }
+    }
+
+    g_return_if_fail(position != -1);
+
+    adapter->removeFromToolbar(data->item, adapter->toolbarName, data->id);
+
+    gtk_selection_data_set(selection_data, ToolbarDragDropHelper::atomToolItem, 0,
+                           reinterpret_cast<const guchar*>(data), sizeof(ToolItemDragDropData));
+}
+
+/**
+ * A tool item was dragged to the toolbar
+ */
+auto ToolbarAdapter::toolbarDragMotionCb(GtkToolbar* toolbar, GdkDragContext* context, gint x, gint y, guint time,
+                                         ToolbarAdapter* adapter) -> bool {
+    GdkAtom target = gtk_drag_dest_find_target(GTK_WIDGET(toolbar), context, nullptr);
+    if (target != ToolbarDragDropHelper::atomToolItem) {
+        gdk_drag_status(context, static_cast<GdkDragAction>(0), time);
+        return false;
+    }
+
+    GtkOrientation orientation = gtk_orientable_get_orientation(GTK_ORIENTABLE(toolbar));
+
+    bool horizontal = orientation == GTK_ORIENTATION_HORIZONTAL;
+    gint ipos = toolbarGetDropIndex(toolbar, x, y, horizontal);
+
+    gdk_drag_status(context, gdk_drag_context_get_suggested_action(context), time);
+
+    const ToolItemDragDropData* d = ToolItemDragCurrentData::getData();
+
+    if (d == nullptr) {
+        g_warning("ToolbarAdapter.cpp, ToolItemDragDropData == nullptr");
+        return false;
+    }
+
+    if (d->type == TOOL_ITEM_ITEM) {
+        GtkWidget* iconWidget = d->item->getNewToolIcon();
+        GtkToolItem* it = gtk_tool_button_new(iconWidget, "");
+        gtk_toolbar_set_drop_highlight_item(toolbar, it, ipos);
+    } else if (d->type == TOOL_ITEM_SEPARATOR) {
+        GtkToolItem* it = gtk_separator_tool_item_new();
+        gtk_toolbar_set_drop_highlight_item(toolbar, it, ipos);
+    } else if (d->type == TOOL_ITEM_SPACER) {
+        GtkToolItem* it = gtk_separator_tool_item_new();
+        gtk_tool_item_set_expand(it, true);
+        gtk_toolbar_set_drop_highlight_item(toolbar, it, ipos);
+    } else if (d->type == TOOL_ITEM_COLOR) {
+        auto namedColor = adapter->palette.getColorAt(d->paletteColorIndex);
+        GtkWidget* iconWidget = ColorIcon::newGtkImage(namedColor.getColor(), 16, true);
+        GtkToolItem* it = gtk_tool_button_new(iconWidget, "");
+        gtk_toolbar_set_drop_highlight_item(toolbar, it, ipos);
+    } else {
+        g_warning("ToolbarAdapter::toolbarDragMotionCb Unhandled type %i", d->type);
+    }
+
+    return true;
+}
+
+void ToolbarAdapter::toolbarDragLeafeCb(GtkToolbar* toolbar, GdkDragContext* context, guint time,
+                                        ToolbarAdapter* adapter) {
+    gtk_toolbar_set_drop_highlight_item(toolbar, nullptr, -1);
+}
+
+void ToolbarAdapter::toolbarDragDataReceivedCb(GtkToolbar* toolbar, GdkDragContext* context, gint x, gint y,
+                                               GtkSelectionData* data, guint info, guint time,
+                                               ToolbarAdapter* adapter) {
+    auto* d = reinterpret_cast<ToolItemDragDropData const*>(gtk_selection_data_get_data(data));
+    g_return_if_fail(ToolitemDragDrop::checkToolItemDragDropData(d));
+
+    bool horizontal = gtk_orientable_get_orientation(GTK_ORIENTABLE(toolbar)) == GTK_ORIENTATION_HORIZONTAL;
+    gint pos = toolbarGetDropIndex(toolbar, x, y, horizontal);
+
+    if (d->type == TOOL_ITEM_ITEM) {
+        auto it = d->item->createToolItem(horizontal);
+
+        gtk_toolbar_insert(toolbar, GTK_TOOL_ITEM(it.get()), pos);  // Increases the ref-count of *it
+        adapter->prepareToolItem(GTK_TOOL_ITEM(it.get()));
+
+        ToolbarData* tb = adapter->window->getSelectedToolbar();
+        const char* name = adapter->window->getToolbarName(toolbar);
+
+        string id = d->item->getId();
+
+        int newId = tb->insertItem(name, id, pos);
+        ToolitemDragDrop::attachMetadata(it.get(), newId, d->item);
+    } else if (d->type == TOOL_ITEM_COLOR) {
+        const auto& r = adapter->window->getControl()->getSettings()->getRecolorParameters();
+        auto recolor = r.recolorizeMainView ? std::make_optional(r.recolor) : std::nullopt;
+
+        auto namedColor = adapter->palette.getColorAt(d->paletteColorIndex);
+        auto item = std::make_unique<ColorToolItem>(namedColor, recolor);
+
+        auto it = item->createToolItem(horizontal);
+
+        gtk_toolbar_insert(toolbar, GTK_TOOL_ITEM(it.get()), pos);
+        adapter->prepareToolItem(GTK_TOOL_ITEM(it.get()));
+
+        ToolbarData* tb = adapter->window->getSelectedToolbar();
+        const char* name = adapter->window->getToolbarName(toolbar);
+
+        string id = item->getId();
+
+        int newId = tb->insertItem(name, id, pos);
+        ToolitemDragDrop::attachMetadataColor(it.get(), newId, d->paletteColorIndex, item.get());
+
+        adapter->window->getToolMenuHandler()->addColorToolItem(std::move(item));
+    } else if (d->type == TOOL_ITEM_SEPARATOR) {
+        GtkToolItem* it = gtk_separator_tool_item_new();
+        gtk_widget_show_all(GTK_WIDGET(it));
+        gtk_toolbar_insert(toolbar, it, pos);
+        adapter->prepareToolItem(it);
+
+        ToolbarData* tb = adapter->window->getSelectedToolbar();
+        const char* name = adapter->window->getToolbarName(toolbar);
+
+        int newId = tb->insertItem(name, "SEPARATOR", pos);
+        ToolitemDragDrop::attachMetadata(GTK_WIDGET(it), newId, TOOL_ITEM_SEPARATOR);
+    } else if (d->type == TOOL_ITEM_SPACER) {
+        GtkToolItem* it = gtk_separator_tool_item_new();
+        gtk_separator_tool_item_set_draw(GTK_SEPARATOR_TOOL_ITEM(it), false);
+        gtk_tool_item_set_expand(it, true);
+        gtk_widget_show_all(GTK_WIDGET(it));
+        gtk_toolbar_insert(toolbar, it, pos);
+        adapter->prepareToolItem(it);
+
+        ToolbarData* tb = adapter->window->getSelectedToolbar();
+        const char* name = adapter->window->getToolbarName(toolbar);
+
+        int newId = tb->insertItem(name, "SPACER", pos);
+        ToolitemDragDrop::attachMetadata(GTK_WIDGET(it), newId, TOOL_ITEM_SPACER);
+    } else {
+        g_warning("toolbarDragDataReceivedCb: ToolItemType %i not handled!", d->type);
+    }
+}
+
+auto ToolbarAdapter::toolbarGetDropIndex(GtkToolbar* toolbar, gint x, gint y, bool horizontal) -> gint {
+    /*
+     * gtk_toolbar_get_drop_index does not use the correct coordinate system for the y coordinate
+     * since the y coordinate is only relevant in vertical toolbars the transformation is NOT required for horizontal
+     * toolbars
+     */
+    if (horizontal) {
+        return gtk_toolbar_get_drop_index(toolbar, x, y);
+    } else {
+        gint wx = 0;
+        gint wy = 0;
+        gtk_widget_translate_coordinates(GTK_WIDGET(toolbar), gtk_widget_get_toplevel(GTK_WIDGET(toolbar)), x, y, &wx,
+                                         &wy);
+        return gtk_toolbar_get_drop_index(toolbar, x, wy);
+    }
+}
diff --git a/entry/src/main/cpp/src/core/gui/dialog/toolbarCustomize/ToolbarAdapter.h b/entry/src/main/cpp/src/core/gui/dialog/toolbarCustomize/ToolbarAdapter.h
new file mode 100644
index 0000000..51882d5
--- /dev/null
+++ b/entry/src/main/cpp/src/core/gui/dialog/toolbarCustomize/ToolbarAdapter.h
@@ -0,0 +1,83 @@
+/*
+ * Xournal++
+ *
+ * Toolbar drag & drop helper class
+ *
+ * @author Xournal++ Team
+ * https://github.com/xournalpp/xournalpp
+ *
+ * @license GNU GPLv2 or later
+ */
+
+#pragma once
+
+
+#include <string>  // for string
+
+#include <gdk/gdk.h>  // for GdkDragContext
+#include <glib.h>     // for gint, guint
+#include <gtk/gtk.h>  // for GtkWidget, GtkToolbar, GtkToolItem, GtkSelectio...
+
+#include "gui/toolbarMenubar/model/ColorPalette.h"
+
+class AbstractToolItem;
+class MainWindow;
+class ToolMenuHandler;
+
+class ToolbarAdapter {
+public:
+    ToolbarAdapter(GtkWidget* toolbar, std::string toolbarName, ToolMenuHandler* toolHandler, MainWindow* window);
+    ~ToolbarAdapter();
+
+private:
+    void cleanupToolbars();
+    void prepareToolItems();
+    void cleanToolItem(GtkToolItem* it);
+    void prepareToolItem(GtkToolItem* it);
+    void showToolbar();
+
+private:
+    /**
+     * Drag a Toolitem from toolbar
+     */
+    static void toolitemDragBegin(GtkWidget* widget, GdkDragContext* context, void* unused);
+
+    /**
+     * Drag a Toolitem from toolbar STOPPED
+     */
+    static void toolitemDragEnd(GtkWidget* widget, GdkDragContext* context, void* unused);
+
+    /**
+     * Remove a toolbar item from the tool where it was
+     */
+    void removeFromToolbar(AbstractToolItem* item, const std::string& toolbarName, int id);
+    static void toolitemDragDataGet(GtkWidget* widget, GdkDragContext* context, GtkSelectionData* selection_data,
+                                    guint info, guint time, ToolbarAdapter* adapter);
+
+    /**
+     * A tool item was dragged to the toolbar
+     */
+    static bool toolbarDragMotionCb(GtkToolbar* toolbar, GdkDragContext* context, gint x, gint y, guint time,
+                                    ToolbarAdapter* adapter);
+    static void toolbarDragLeafeCb(GtkToolbar* toolbar, GdkDragContext* context, guint time, ToolbarAdapter* adapter);
+    static void toolbarDragDataReceivedCb(GtkToolbar* toolbar, GdkDragContext* context, gint x, gint y,
+                                          GtkSelectionData* data, guint info, guint time, ToolbarAdapter* adapter);
+
+    /**
+     * @brief Wrapper around gtk_toolbar_get_drop index with coorect coordinate handling
+     *
+     * @param toolbar the corresponding toolbar for the drop index
+     * @param x coordinate in toolbar coordinate system
+     * @param y coordinate in toolbar coordinate system
+     * @param horizontal denotes whether the toolbar is horizontal
+     * @return gint position at which drop item should be inserted
+     */
+    static gint toolbarGetDropIndex(GtkToolbar* toolbar, gint x, gint y, bool horizontal);
+
+private:
+    GtkWidget* w;
+    std::string toolbarName;
+    MainWindow* window;
+
+    Palette palette;
+};
diff --git a/entry/src/main/cpp/src/core/gui/dialog/toolbarCustomize/ToolbarCustomizeDialog.cpp b/entry/src/main/cpp/src/core/gui/dialog/toolbarCustomize/ToolbarCustomizeDialog.cpp
new file mode 100644
index 0000000..8fc73cd
--- /dev/null
+++ b/entry/src/main/cpp/src/core/gui/dialog/toolbarCustomize/ToolbarCustomizeDialog.cpp
@@ -0,0 +1,325 @@
+#include "ToolbarCustomizeDialog.h"
+
+#include <cstddef>  // for size_t
+#include <limits>   // for numeric_l...
+#include <string>   // for allocator
+#include <vector>   // for vector
+
+#include <gdk-pixbuf/gdk-pixbuf.h>  // for GdkPixbuf
+#include <glib-object.h>            // for G_CALLBACK
+
+#include "control/Control.h"            // for Control
+#include "control/settings/Settings.h"  // for Settings
+#include "gui/Builder.h"
+#include "gui/MainWindow.h"                                 // for MainWindow
+#include "gui/ToolitemDragDrop.h"                           // for ToolItemD...
+#include "gui/toolbarMenubar/AbstractToolItem.h"            // for AbstractT...
+#include "gui/toolbarMenubar/ToolMenuHandler.h"             // for ToolMenuH...
+#include "gui/toolbarMenubar/icon/ColorIcon.h"              // for ColorIcon
+#include "gui/toolbarMenubar/icon/ToolbarSeparatorImage.h"  // for getNewToo...
+#include "gui/toolbarMenubar/model/ColorPalette.h"          // for Palette
+#include "util/Assert.h"                                    // for xoj_assert
+#include "util/Color.h"                                     // for Color
+#include "util/EnumIndexedArray.h"
+#include "util/GListView.h"   // for GListView
+#include "util/NamedColor.h"  // for NamedColor
+#include "util/gtk4_helper.h"
+#include "util/i18n.h"  // for _
+#include "util/raii/GObjectSPtr.h"
+
+#include "ToolItemDragCurrentData.h"  // for ToolItemD...
+#include "ToolbarDragDropHandler.h"   // for ToolbarDr...
+#include "ToolbarDragDropHelper.h"    // for dragSourc...
+
+class GladeSearchpath;
+
+/*
+ * struct used for data necessary for dragging
+ * during toolbar customization
+ */
+struct ToolbarCustomizeDialog::ToolItemDragData {
+    ToolbarCustomizeDialog* dlg;
+    GtkWidget* icon;  ///< Currently must be an GtkImage
+    AbstractToolItem* item;
+    xoj::util::WidgetSPtr ebox;
+};
+
+struct ToolbarCustomizeDialog::ColorToolItemDragData {
+    ToolbarCustomizeDialog* dlg;
+    size_t paletteColorIndex;
+    xoj::util::WidgetSPtr ebox;
+};
+
+// Separator and spacer
+struct ToolbarCustomizeDialog::SeparatorData {
+    ToolItemType type;
+    SeparatorType separator;
+    const char* label;
+};
+
+std::array<ToolbarCustomizeDialog::SeparatorData, 2> ToolbarCustomizeDialog::separators = {
+        ToolbarCustomizeDialog::SeparatorData{TOOL_ITEM_SEPARATOR, SeparatorType::SEPARATOR, _("Separator")},
+        ToolbarCustomizeDialog::SeparatorData{TOOL_ITEM_SPACER, SeparatorType::SPACER, _("Spacer")}};
+
+
+constexpr auto UI_FILE = "toolbarCustomizeDialog.glade";
+constexpr auto UI_DIALOG_NAME = "DialogCustomizeToolbar";
+
+ToolbarCustomizeDialog::ToolbarCustomizeDialog(GladeSearchpath* gladeSearchPath, MainWindow* win,
+                                               ToolbarDragDropHandler* handler):
+        itemData(buildToolDataVector(win->getToolMenuHandler()->getToolItems())),
+        colorItemData(buildColorDataVector(handler->getControl()->getPalette())),
+        palette(handler->getControl()->getPalette()) {
+    Builder builder(gladeSearchPath, UI_FILE);
+    window.reset(GTK_WINDOW(builder.get(UI_DIALOG_NAME)));
+    notebook = GTK_NOTEBOOK(builder.get("notebook"));
+
+    using Cat = AbstractToolItem::Category;
+    EnumIndexedArray<std::string, Cat> labels;
+    labels[Cat::AUDIO] = C_("Item category in toolbar customization dialog", "Audio");
+    labels[Cat::COLORS] = C_("Item category in toolbar customization dialog", "Colors");
+    labels[Cat::FILES] = C_("Item category in toolbar customization dialog", "Files");
+    labels[Cat::MISC] = C_("Item category in toolbar customization dialog", "Miscellaneous");
+    labels[Cat::NAVIGATION] = C_("Item category in toolbar customization dialog", "Navigation");
+    labels[Cat::SELECTION] = C_("Item category in toolbar customization dialog", "Selection");
+    labels[Cat::TOOLS] = C_("Item category in toolbar customization dialog", "Tools");
+    labels[Cat::SEPARATORS] = C_("Item category in toolbar customization dialog", "Separators");
+    labels[Cat::PLUGINS] = C_("Item category in toolbar customization dialog", "Plugins");
+    EnumIndexedArray<GtkWidget*, Cat> tabs;
+
+    for (std::underlying_type_t<Cat> n = 0; n < xoj::to_underlying(Cat::ENUMERATOR_COUNT); n++) {
+        Cat c = static_cast<Cat>(n);
+        tabs[c] = gtk_list_box_new();
+        GtkWidget* w = gtk_scrolled_window_new();
+        gtk_scrolled_window_set_child(GTK_SCROLLED_WINDOW(w), tabs[c]);
+        gtk_notebook_append_page(notebook, w, gtk_label_new(labels[c].c_str()));
+    }
+
+    auto addEntry = [&tabs](GtkWidget* w, Cat c) {
+        GtkWidget* row = gtk_list_box_row_new();
+        gtk_list_box_row_set_child(GTK_LIST_BOX_ROW(row), w);
+        gtk_list_box_row_set_selectable(GTK_LIST_BOX_ROW(row), false);
+        gtk_list_box_append(GTK_LIST_BOX(tabs[c]), row);
+    };
+
+    for (auto& data: itemData) {
+        addEntry(data.ebox.get(), data.item->getCategory());
+    }
+
+    for (auto& data: colorItemData) {
+        addEntry(data.ebox.get(), Cat::COLORS);
+    }
+
+    // init separator and spacer
+    for (SeparatorData& data: separators) {
+        GtkBox* box = GTK_BOX(gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 2));
+        gtk_box_append(box, ToolbarSeparatorImage::newImage(data.separator));
+        gtk_box_append(box, gtk_label_new(data.label));
+
+        GtkWidget* ebox = gtk_event_box_new();
+        gtk_container_add(GTK_CONTAINER(ebox), GTK_WIDGET(box));
+        gtk_widget_show_all(ebox);
+
+        // make ebox a drag source
+        gtk_drag_source_set(ebox, GDK_BUTTON1_MASK, &ToolbarDragDropHelper::dropTargetEntry, 1, GDK_ACTION_MOVE);
+        ToolbarDragDropHelper::dragSourceAddToolbar(ebox);
+
+        g_signal_connect(ebox, "drag-begin", G_CALLBACK(toolitemDragBeginSeparator), &data);
+        g_signal_connect(ebox, "drag-end", G_CALLBACK(toolitemDragEndSeparator), &data);
+        g_signal_connect(ebox, "drag-data-get", G_CALLBACK(toolitemDragDataGetSeparator), &data);
+
+        addEntry(ebox, Cat::SEPARATORS);
+    }
+
+    GtkWidget* target = GTK_WIDGET(notebook);  // builder.get("viewport1");
+    // prepare drag & drop
+    gtk_drag_dest_set(target, GTK_DEST_DEFAULT_ALL, nullptr, 0, GDK_ACTION_MOVE);
+    ToolbarDragDropHelper::dragDestAddToolbar(target);
+
+    g_signal_connect(target, "drag-data-received", G_CALLBACK(dragDataReceived), this);
+
+    g_signal_connect_swapped(builder.get("btClose"), "clicked", G_CALLBACK(gtk_window_close), window.get());
+    g_signal_connect_swapped(window.get(), "delete-event",
+                             G_CALLBACK(+[](ToolbarDragDropHandler* h) { h->toolbarConfigDialogClosed(); }), handler);
+}
+
+ToolbarCustomizeDialog::~ToolbarCustomizeDialog() = default;
+
+void ToolbarCustomizeDialog::toolitemDragBeginSeparator(GtkWidget* widget, GdkDragContext* context, void* data) {
+    SeparatorData* sepData = static_cast<SeparatorData*>(data);
+    ToolItemDragCurrentData::setData(sepData->type, -1, nullptr);
+    GdkPixbuf* pixbuf = ToolbarSeparatorImage::getNewToolPixbuf(sepData->separator);
+    gtk_drag_set_icon_pixbuf(context, pixbuf, -2, -2);
+    g_object_unref(pixbuf);
+}
+
+void ToolbarCustomizeDialog::toolitemDragEndSeparator(GtkWidget* widget, GdkDragContext* context, void* unused) {
+    ToolItemDragCurrentData::clearData();
+}
+
+void ToolbarCustomizeDialog::toolitemDragDataGetSeparator(GtkWidget* widget, GdkDragContext* context,
+                                                          GtkSelectionData* selection_data, guint info, guint time,
+                                                          void* data) {
+    SeparatorData* sepData = static_cast<SeparatorData*>(data);
+    auto it = ToolitemDragDrop::ToolItemDragDropData_new(nullptr);
+    it->type = sepData->type;
+
+    gtk_selection_data_set(selection_data, ToolbarDragDropHelper::atomToolItem, 0,
+                           reinterpret_cast<const guchar*>(it.get()), sizeof(ToolItemDragDropData));
+}
+
+/**
+ * Drag a Toolitem from dialog
+ */
+void ToolbarCustomizeDialog::toolitemDragBegin(GtkWidget* widget, GdkDragContext* context, ToolItemDragData* data) {
+    ToolItemDragCurrentData::setData(TOOL_ITEM_ITEM, -1, data->item);
+    if (data->icon) {
+        ToolbarDragDropHelper::gdk_context_set_icon_from_image(context, data->icon);
+    }
+}
+
+/**
+ * Drag a Toolitem from dialog STOPPED
+ */
+void ToolbarCustomizeDialog::toolitemDragEnd(GtkWidget* widget, GdkDragContext* context, ToolItemDragData* data) {
+    ToolItemDragCurrentData::clearData();
+}
+
+void ToolbarCustomizeDialog::toolitemDragDataGet(GtkWidget* widget, GdkDragContext* context,
+                                                 GtkSelectionData* selection_data, guint info, guint time,
+                                                 ToolItemDragData* data) {
+    g_return_if_fail(data != nullptr);
+    g_return_if_fail(data->item != nullptr);
+
+    auto it = ToolitemDragDrop::ToolItemDragDropData_new(data->item);
+
+    gtk_selection_data_set(selection_data, ToolbarDragDropHelper::atomToolItem, 0,
+                           reinterpret_cast<const guchar*>(it.get()), sizeof(ToolItemDragDropData));
+}
+
+/**
+ * Drag a ColorToolitem from dialog
+ */
+void ToolbarCustomizeDialog::toolitemColorDragBegin(GtkWidget* widget, GdkDragContext* context,
+                                                    ColorToolItemDragData* data) {
+    ToolItemDragCurrentData::setDataColor(-1, data->paletteColorIndex);
+
+    auto namedColor = data->dlg->palette.getColorAt(data->paletteColorIndex);
+    auto image = ColorIcon::newGdkPixbuf(namedColor.getColor(), 16, true);
+    gtk_drag_set_icon_pixbuf(context, image.get(), -2, -2);
+}
+
+/**
+ * Drag a ColorToolitem from dialog STOPPED
+ */
+void ToolbarCustomizeDialog::toolitemColorDragEnd(GtkWidget* widget, GdkDragContext* context,
+                                                  ColorToolItemDragData* data) {
+    ToolItemDragCurrentData::clearData();
+}
+
+void ToolbarCustomizeDialog::toolitemColorDragDataGet(GtkWidget* widget, GdkDragContext* context,
+                                                      GtkSelectionData* selection_data, guint info, guint time,
+                                                      ColorToolItemDragData* data) {
+    ToolItemDragCurrentData::setDataColor(-1, data->paletteColorIndex);
+
+    auto it = ToolitemDragDrop::ToolItemDragDropData_new(nullptr);
+    it->type = TOOL_ITEM_COLOR;
+    it->paletteColorIndex = data->paletteColorIndex;
+
+    gtk_selection_data_set(selection_data, ToolbarDragDropHelper::atomToolItem, 0,
+                           reinterpret_cast<const guchar*>(it.get()), sizeof(ToolItemDragDropData));
+}
+
+/**
+ * A tool item was dragged to the dialog
+ */
+void ToolbarCustomizeDialog::dragDataReceived(GtkWidget* widget, GdkDragContext* dragContext, gint x, gint y,
+                                              GtkSelectionData* data, guint info, guint time,
+                                              ToolbarCustomizeDialog* dlg) {
+    if (gtk_selection_data_get_data_type(data) != ToolbarDragDropHelper::atomToolItem) {
+        gtk_drag_finish(dragContext, false, false, time);
+        return;
+    }
+
+    auto* d = reinterpret_cast<ToolItemDragDropData const*>(gtk_selection_data_get_data(data));
+    g_return_if_fail(ToolitemDragDrop::checkToolItemDragDropData(d));
+
+    gtk_drag_finish(dragContext, true, false, time);
+}
+
+/**
+ * builds up the icon list
+ */
+auto ToolbarCustomizeDialog::buildToolDataVector(const std::vector<std::unique_ptr<AbstractToolItem>>& tools)
+        -> std::vector<ToolItemDragData> {
+    // By reserving, we ensure no reallocation is done, so the pointer `&data` used below is not invalidated
+    std::vector<ToolItemDragData> database;
+    database.reserve(tools.size());
+    for (auto&& item: tools) {
+        std::string name = item->getToolDisplayName();
+        GtkWidget* icon = item->getNewToolIcon(); /* floating */
+        xoj_assert(icon);
+
+        GtkBox* box = GTK_BOX(gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 2));
+        gtk_box_append(box, icon);
+        gtk_box_append(box, gtk_label_new(name.c_str()));
+
+        GtkWidget* ebox = gtk_event_box_new();
+        gtk_container_add(GTK_CONTAINER(ebox), GTK_WIDGET(box));
+        gtk_widget_show_all(GTK_WIDGET(ebox));
+
+        auto& data = database.emplace_back();
+        data.dlg = this;
+        data.icon = icon;
+        data.item = item.get();
+        data.ebox.reset(ebox, xoj::util::adopt);
+
+        // make ebox a drag source
+        gtk_drag_source_set(ebox, GDK_BUTTON1_MASK, &ToolbarDragDropHelper::dropTargetEntry, 1, GDK_ACTION_MOVE);
+        ToolbarDragDropHelper::dragSourceAddToolbar(ebox);
+
+        g_signal_connect(ebox, "drag-begin", G_CALLBACK(toolitemDragBegin), &data);
+        g_signal_connect(ebox, "drag-end", G_CALLBACK(toolitemDragEnd), &data);
+        g_signal_connect(ebox, "drag-data-get", G_CALLBACK(toolitemDragDataGet), &data);
+    }
+    return database;
+}
+
+auto ToolbarCustomizeDialog::buildColorDataVector(const Palette& palette) -> std::vector<ColorToolItemDragData> {
+    // By reserving, we ensure no reallocation is done, so the pointer `&data` used below is not invalidated
+    std::vector<ColorToolItemDragData> database;
+    database.reserve(palette.size());
+    for (size_t paletteColorIndex = 0; paletteColorIndex < palette.size(); paletteColorIndex++) {
+        // namedColor needs to be a pointer to pass it into a ColorToolItemDragData
+        const NamedColor& namedColor = palette.getColorAt(paletteColorIndex);
+
+        GtkBox* box = GTK_BOX(gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 2));
+        gtk_box_append(box, ColorIcon::newGtkImage(namedColor.getColor(), 16, true));
+        gtk_box_append(box, gtk_label_new(namedColor.getName().c_str()));
+
+        GtkWidget* ebox = gtk_event_box_new();
+        gtk_container_add(GTK_CONTAINER(ebox), GTK_WIDGET(box));
+        gtk_widget_show_all(GTK_WIDGET(ebox));
+
+        // make ebox a drag source
+        gtk_drag_source_set(ebox, GDK_BUTTON1_MASK, &ToolbarDragDropHelper::dropTargetEntry, 1, GDK_ACTION_MOVE);
+        ToolbarDragDropHelper::dragSourceAddToolbar(ebox);
+
+        auto& data = database.emplace_back();
+        data.dlg = this;
+        data.paletteColorIndex = paletteColorIndex;
+        data.ebox.reset(ebox, xoj::util::ref);
+
+        g_signal_connect(ebox, "drag-begin", G_CALLBACK(toolitemColorDragBegin), &data);
+        g_signal_connect(ebox, "drag-end", G_CALLBACK(toolitemColorDragEnd), &data);
+        g_signal_connect(ebox, "drag-data-get", G_CALLBACK(toolitemColorDragDataGet), &data);
+    }
+    return database;
+}
+
+void ToolbarCustomizeDialog::show(GtkWindow* parent) {
+    gtk_window_set_transient_for(this->window.get(), parent);
+
+    gtk_window_set_position(this->window.get(), GTK_WIN_POS_CENTER_ON_PARENT);
+    gtk_widget_show_all(GTK_WIDGET(this->window.get()));
+}
diff --git a/entry/src/main/cpp/src/core/gui/dialog/toolbarCustomize/ToolbarCustomizeDialog.h b/entry/src/main/cpp/src/core/gui/dialog/toolbarCustomize/ToolbarCustomizeDialog.h
new file mode 100644
index 0000000..148c110
--- /dev/null
+++ b/entry/src/main/cpp/src/core/gui/dialog/toolbarCustomize/ToolbarCustomizeDialog.h
@@ -0,0 +1,93 @@
+/*
+ * Xournal++
+ *
+ * Toolbar edit dialog
+ *
+ * @author Xournal++ Team
+ * https://github.com/xournalpp/xournalpp
+ *
+ * @license GNU GPLv2 or later
+ */
+
+#pragma once
+
+#include <array>
+#include <memory>
+#include <vector>
+
+#include <gdk/gdk.h>  // for GdkDragContext
+#include <glib.h>     // for guint, gint
+#include <gtk/gtk.h>  // for GtkWidget, GtkSelectionData, GtkToolbar
+
+#include "gui/toolbarMenubar/model/ColorPalette.h"
+#include "util/raii/GtkWindowUPtr.h"
+
+class AbstractToolItem;
+struct Palette;
+class MainWindow;
+class ToolbarDragDropHandler;
+class GladeSearchpath;
+
+class ToolbarCustomizeDialog {
+public:
+    ToolbarCustomizeDialog(GladeSearchpath* gladeSearchPath, MainWindow* win, ToolbarDragDropHandler* handler);
+    ~ToolbarCustomizeDialog();
+
+public:
+    inline GtkWindow* getWindow() const { return window.get(); }
+
+    void show(GtkWindow* parent);
+
+private:
+    struct ToolItemDragData;
+    struct ColorToolItemDragData;
+    struct SeparatorData;
+
+    std::vector<ToolItemDragData> buildToolDataVector(const std::vector<std::unique_ptr<AbstractToolItem>>& tools);
+    std::vector<ColorToolItemDragData> buildColorDataVector(const Palette& palette);
+
+    // void rebuildIconview();
+
+
+private:
+    static void dragDataReceived(GtkWidget* widget, GdkDragContext* dragContext, gint x, gint y, GtkSelectionData* data,
+                                 guint info, guint time, ToolbarCustomizeDialog* dlg);
+    static void toolbarDragLeafeCb(GtkToolbar* toolbar, GdkDragContext* context, guint time,
+                                   ToolbarCustomizeDialog* dlg);
+    static void toolbarDragDataReceivedCb(GtkToolbar* toolbar, GdkDragContext* context, gint x, gint y,
+                                          GtkSelectionData* data, guint info, guint time, ToolbarCustomizeDialog* dlg);
+
+    static void toolitemDragBegin(GtkWidget* widget, GdkDragContext* context, ToolItemDragData* data);
+    static void toolitemDragEnd(GtkWidget* widget, GdkDragContext* context, ToolItemDragData* data);
+    static void toolitemDragDataGet(GtkWidget* widget, GdkDragContext* context, GtkSelectionData* selection_data,
+                                    guint info, guint time, ToolItemDragData* data);
+
+    static void toolitemColorDragBegin(GtkWidget* widget, GdkDragContext* context, ColorToolItemDragData* data);
+    static void toolitemColorDragEnd(GtkWidget* widget, GdkDragContext* context, ColorToolItemDragData* data);
+    static void toolitemColorDragDataGet(GtkWidget* widget, GdkDragContext* context, GtkSelectionData* selection_data,
+                                         guint info, guint time, ColorToolItemDragData* data);
+
+    static void toolitemDragBeginSeparator(GtkWidget* widget, GdkDragContext* context, void* unused);
+    static void toolitemDragEndSeparator(GtkWidget* widget, GdkDragContext* context, void* unused);
+    static void toolitemDragDataGetSeparator(GtkWidget* widget, GdkDragContext* context,
+                                             GtkSelectionData* selection_data, guint info, guint time, void* unused);
+
+    // void freeIconview();
+
+private:
+    /**
+     * @brief Stores the widget and other data associated to each drag-able toolbar item
+     * Modifications are not allowed to avoid vector reallocation and pointer invalidation
+     * (pointers are feed to g_signal's callback data)
+     */
+    const std::vector<ToolItemDragData> itemData;
+    /**
+     * @brief Stores the widget and other data associated to each drag-able color item
+     */
+    const std::vector<ColorToolItemDragData> colorItemData;
+    static std::array<SeparatorData, 2> separators;
+
+    xoj::util::GtkWindowUPtr window;
+    GtkNotebook* notebook;
+    Palette palette;
+};
diff --git a/entry/src/main/cpp/src/core/gui/dialog/toolbarCustomize/ToolbarDragDropHandler.cpp b/entry/src/main/cpp/src/core/gui/dialog/toolbarCustomize/ToolbarDragDropHandler.cpp
new file mode 100644
index 0000000..46ce806
--- /dev/null
+++ b/entry/src/main/cpp/src/core/gui/dialog/toolbarCustomize/ToolbarDragDropHandler.cpp
@@ -0,0 +1,57 @@
+#include "ToolbarDragDropHandler.h"
+
+#include <string>  // for allocator, string
+
+#include <gtk/gtk.h>  // for GtkWidget, GTK_TO...
+
+#include "control/Control.h"                        // for Control
+#include "gui/FloatingToolbox.h"                    // for FloatingToolbox
+#include "gui/MainWindow.h"                         // for MainWindow
+#include "gui/toolbarMenubar/model/ToolbarModel.h"  // for ToolbarModel
+#include "util/PathUtil.h"                          // for getConfigFile
+
+#include "ToolbarAdapter.h"          // for ToolbarAdapter
+#include "ToolbarCustomizeDialog.h"  // for ToolbarCustomizeD...
+#include "config-dev.h"              // for TOOLBAR_CONFIG
+
+ToolbarDragDropHandler::ToolbarDragDropHandler(Control* control): control(control) {}
+
+ToolbarDragDropHandler::~ToolbarDragDropHandler() = default;
+
+void ToolbarDragDropHandler::prepareToolbarsForDragAndDrop() {
+    MainWindow* win = control->getWindow();
+
+    this->toolbars.clear();
+
+    for (auto w: win->getToolbarWidgets()) {
+        this->toolbars.emplace_back(std::make_unique<ToolbarAdapter>(w.get(), win->getToolbarName(GTK_TOOLBAR(w.get())),
+                                                                     control->getWindow()->getToolMenuHandler(), win));
+    }
+}
+
+void ToolbarDragDropHandler::clearToolbarsFromDragAndDrop() { this->toolbars.clear(); }
+
+void ToolbarDragDropHandler::toolbarConfigDialogClosed() {
+    this->customizeDialog.reset();
+
+    MainWindow* win = control->getWindow();
+
+    this->clearToolbarsFromDragAndDrop();
+
+    auto file = Util::getConfigFile(TOOLBAR_CONFIG);
+    win->getToolbarModel()->save(file);
+    win->getFloatingToolbox()->hide();
+}
+
+void ToolbarDragDropHandler::configure() {
+    MainWindow* win = control->getWindow();
+
+
+    win->getFloatingToolbox()->showForConfiguration();
+
+    this->prepareToolbarsForDragAndDrop();
+
+    this->customizeDialog = std::make_unique<ToolbarCustomizeDialog>(control->getGladeSearchPath(), win, this);
+
+    this->customizeDialog->show(GTK_WINDOW(win->getWindow()));
+}
diff --git a/entry/src/main/cpp/src/core/gui/dialog/toolbarCustomize/ToolbarDragDropHandler.h b/entry/src/main/cpp/src/core/gui/dialog/toolbarCustomize/ToolbarDragDropHandler.h
new file mode 100644
index 0000000..50c8fee
--- /dev/null
+++ b/entry/src/main/cpp/src/core/gui/dialog/toolbarCustomize/ToolbarDragDropHandler.h
@@ -0,0 +1,42 @@
+/*
+ * Xournal++
+ *
+ * Toolbar drag & drop controller
+ *
+ * @author Xournal++ Team
+ * https://github.com/xournalpp/xournalpp
+ *
+ * @license GNU GPLv2 or later
+ */
+
+#pragma once
+
+#include <memory>
+#include <vector>
+
+class Control;
+class ToolbarAdapter;
+class ToolbarCustomizeDialog;
+
+class ToolbarDragDropHandler {
+public:
+    ToolbarDragDropHandler(Control* control);
+    virtual ~ToolbarDragDropHandler();
+
+public:
+    void configure();
+
+    void toolbarConfigDialogClosed();
+
+public:
+    void prepareToolbarsForDragAndDrop();
+    void clearToolbarsFromDragAndDrop();
+
+    inline Control* getControl() const { return control; }
+
+private:
+    Control* control;
+
+    std::vector<std::unique_ptr<ToolbarAdapter>> toolbars;
+    std::unique_ptr<ToolbarCustomizeDialog> customizeDialog;
+};
diff --git a/entry/src/main/cpp/src/core/gui/dialog/toolbarCustomize/ToolbarDragDropHelper.cpp b/entry/src/main/cpp/src/core/gui/dialog/toolbarCustomize/ToolbarDragDropHelper.cpp
new file mode 100644
index 0000000..1e27127
--- /dev/null
+++ b/entry/src/main/cpp/src/core/gui/dialog/toolbarCustomize/ToolbarDragDropHelper.cpp
@@ -0,0 +1,105 @@
+#include "ToolbarDragDropHelper.h"
+
+#include <cairo.h>        // for cairo_surface_set_device_offset, cairo_surf...
+#include <gio/gio.h>      // for GIcon
+#include <glib-object.h>  // for g_object_get, G_OBJECT
+#include <glib.h>         // for g_warning, gchar
+
+namespace ToolbarDragDropHelper {
+
+const GdkAtom atomToolItem = gdk_atom_intern_static_string("application/xournal-ToolbarItem");
+const GtkTargetEntry dropTargetEntry = {const_cast<char*>("move-buffer"), GTK_TARGET_SAME_APP, 1};
+
+auto gdk_context_set_icon_from_image(GdkDragContext* ctx, GtkWidget* widget) -> bool {
+    auto image = GTK_IMAGE(widget);
+    auto storage = gtk_image_get_storage_type(image);
+    switch (storage) {
+        case GTK_IMAGE_PIXBUF: {
+            gtk_drag_set_icon_pixbuf(ctx, gtk_image_get_pixbuf(image), -2, -2);
+            return true;
+        }
+        case GTK_IMAGE_ICON_NAME: {
+            gchar const* icon_name{};
+            gtk_image_get_icon_name(image, &icon_name, nullptr);
+            gtk_drag_set_icon_name(ctx, icon_name, -2, -2);
+            return true;
+        }
+        case GTK_IMAGE_GICON: {
+#ifndef __APPLE__
+            GIcon* icon{};
+            gtk_image_get_gicon(image, &icon, nullptr);
+            gtk_drag_set_icon_gicon(ctx, icon, -2, -2);
+            return true;
+#else
+            // Todo (fabian): check, if `gtk_drag_set_icon_gicon` is still unimplemented
+            g_warning("ToolbarDragDropHelper::gdk_context_set_icon_from_image: GTK_IMAGE_GICON is not handled because "
+                      "`gtk_drag_set_icon_gicon` is not implemented. Please create an issue, if this has changed.");
+            break;
+#endif
+        }
+        case GTK_IMAGE_SURFACE: {
+            cairo_surface_t* surface{};
+            g_object_get(G_OBJECT(image), "surface", &surface, nullptr);
+            cairo_surface_set_device_offset(surface, -2, -2);
+            gtk_drag_set_icon_surface(ctx, surface);
+            return true;
+        }
+        case GTK_IMAGE_EMPTY: {  ///< Does nothing
+
+            g_warning("ToolbarDragDropHelper::gdk_context_set_icon_from_image: Image storage is empty");
+            break;
+        }
+        case GTK_IMAGE_ICON_SET: {  ///< Deprecated
+            g_warning("ToolbarDragDropHelper::gdk_context_set_icon_from_image: Image storage GTK_IMAGE_ICON_SET is "
+                      "deprecated");
+            break;
+        }
+        case GTK_IMAGE_STOCK: {  ///< Deprecated
+            g_warning("ToolbarDragDropHelper::gdk_context_set_icon_from_image: Image storage GTK_IMAGE_STOCK is "
+                      "deprecated");
+            break;
+        }
+        case GTK_IMAGE_ANIMATION: {  ///< Can't be handled as we know
+            g_warning("ToolbarDragDropHelper::gdk_context_set_icon_from_image: Image storage GTK_IMAGE_ANIMATION can't "
+                      "be handled");
+            break;
+        }
+    }
+    gtk_drag_set_icon_widget(ctx, widget, -2, -2);
+    return false;
+}
+
+void dragDestAddToolbar(GtkWidget* target) {
+    GtkTargetList* targetList = gtk_drag_dest_get_target_list(target);
+    if (targetList) {
+        gtk_target_list_ref(targetList);
+    } else {
+        targetList = gtk_target_list_new(nullptr, 0);
+    }
+
+    // If not exist add, else do nothing
+    if (!gtk_target_list_find(targetList, atomToolItem, nullptr)) {
+        gtk_target_list_add(targetList, atomToolItem, 0, 0);
+    }
+
+    gtk_drag_dest_set_target_list(target, targetList);
+    gtk_target_list_unref(targetList);
+}
+
+void dragSourceAddToolbar(GtkWidget* widget) {
+    GtkTargetList* targetList = gtk_drag_source_get_target_list(widget);
+    if (targetList) {
+        // List contains already this type
+        if (gtk_target_list_find(targetList, atomToolItem, nullptr)) {
+            return;
+        }
+
+        gtk_target_list_ref(targetList);
+    } else {
+        targetList = gtk_target_list_new(nullptr, 0);
+    }
+    gtk_target_list_add(targetList, atomToolItem, 0, 0);
+    gtk_drag_source_set_target_list(widget, targetList);
+    gtk_target_list_unref(targetList);
+}
+}  // namespace ToolbarDragDropHelper
diff --git a/entry/src/main/cpp/src/core/gui/dialog/toolbarCustomize/ToolbarDragDropHelper.h b/entry/src/main/cpp/src/core/gui/dialog/toolbarCustomize/ToolbarDragDropHelper.h
new file mode 100644
index 0000000..f3a6706
--- /dev/null
+++ b/entry/src/main/cpp/src/core/gui/dialog/toolbarCustomize/ToolbarDragDropHelper.h
@@ -0,0 +1,25 @@
+/*
+ * Xournal++
+ *
+ * Toolbar drag and drop helpers
+ *
+ * @author Xournal++ Team
+ * https://github.com/xournalpp/xournalpp
+ *
+ * @license GNU GPLv2 or later
+ */
+
+#pragma once
+
+#include <gdk/gdk.h>  // for GdkAtom, GdkDragContext, _GdkAtom
+#include <gtk/gtk.h>  // for GtkWidget, GtkTargetEntry
+
+namespace ToolbarDragDropHelper {
+void dragDestAddToolbar(GtkWidget* target);
+void dragSourceAddToolbar(GtkWidget* widget);
+
+auto gdk_context_set_icon_from_image(GdkDragContext* ctx, GtkWidget* image) -> bool;
+
+extern const GdkAtom atomToolItem;
+extern const GtkTargetEntry dropTargetEntry;
+};  // namespace ToolbarDragDropHelper
diff --git a/entry/src/main/cpp/src/core/gui/inputdevices/AbstractInputHandler.cpp b/entry/src/main/cpp/src/core/gui/inputdevices/AbstractInputHandler.cpp
new file mode 100644
index 0000000..4356b8f
--- /dev/null
+++ b/entry/src/main/cpp/src/core/gui/inputdevices/AbstractInputHandler.cpp
@@ -0,0 +1,97 @@
+//
+// Created by ulrich on 06.04.19.
+//
+
+#include "AbstractInputHandler.h"
+
+#include <string_view>
+
+#include <glib.h>  // for gdouble
+
+#include "control/settings/Settings.h"           // for Settings
+#include "gui/Layout.h"                          // for Layout
+#include "gui/PageView.h"                        // for XojPageView
+#include "gui/XournalView.h"                     // for XournalView
+#include "gui/XournalppCursor.h"                 // for XournalppCursor
+#include "gui/inputdevices/InputEvents.h"        // for InputEvent
+#include "gui/inputdevices/PositionInputData.h"  // for PositionInputData
+#include "gui/widgets/XournalWidget.h"           // for GtkXournal
+#include "model/Point.h"                         // for Point, Point::NO_PRE...
+#include "util/Assert.h"                         // for xoj_assert
+#include "util/safe_casts.h"                     // for round_cast
+
+#include "InputContext.h"  // for InputContext
+
+AbstractInputHandler::AbstractInputHandler(InputContext* inputContext) { this->inputContext = inputContext; }
+
+AbstractInputHandler::~AbstractInputHandler() = default;
+
+void AbstractInputHandler::block(bool block) {
+    if (block == this->blocked) {
+        return;
+    }
+    this->blocked = block;
+    if (!this->blocked) {
+        this->onUnblock();
+    } else {
+        this->onBlock();
+    }
+}
+
+auto AbstractInputHandler::isBlocked() const -> bool { return this->blocked; }
+
+auto AbstractInputHandler::handle(InputEvent const& event) -> bool {
+    if (!this->blocked) {
+        if (auto* v = this->inputContext->getView(); v) {
+            v->getCursor()->setInputDeviceClass(event.deviceClass);
+        }
+        return this->handleImpl(event);
+    }
+    return true;
+}
+
+/**
+ * Get Page at current position
+ *
+ * @return page or nullptr if none
+ */
+auto AbstractInputHandler::getPageAtCurrentPosition(InputEvent const& event) const -> XojPageView* {
+    if (!event) {
+        return nullptr;
+    }
+
+    GtkXournal* xournal = this->inputContext->getXournal();
+
+    int x = round_cast<int>(event.relative.x);
+    int y = round_cast<int>(event.relative.y);
+
+    return xournal->layout->getPageViewAt(x, y);
+}
+
+/**
+ * Get input data relative to current input page
+ */
+auto AbstractInputHandler::getInputDataRelativeToCurrentPage(XojPageView* page, InputEvent const& event) const
+        -> PositionInputData {
+    xoj_assert(page != nullptr);
+
+    PositionInputData pos = {};
+    pos.x = event.relative.x - static_cast<double>(page->getX());
+    pos.y = event.relative.y - static_cast<double>(page->getY());
+    pos.pressure = Point::NO_PRESSURE;
+
+    if (this->inputContext->getSettings()->isPressureSensitivity()) {
+        pos.pressure = event.pressure;
+    }
+
+    pos.state = event.state;
+    pos.timestamp = event.timestamp;
+
+    pos.deviceId = event.deviceId;
+
+    return pos;
+}
+
+void AbstractInputHandler::onBlock() {}
+
+void AbstractInputHandler::onUnblock() {}
diff --git a/entry/src/main/cpp/src/core/gui/inputdevices/AbstractInputHandler.h b/entry/src/main/cpp/src/core/gui/inputdevices/AbstractInputHandler.h
new file mode 100644
index 0000000..df9217e
--- /dev/null
+++ b/entry/src/main/cpp/src/core/gui/inputdevices/AbstractInputHandler.h
@@ -0,0 +1,45 @@
+/*
+ * Xournal++
+ *
+ * [Header description]
+ *
+ * @author Xournal++ Team
+ * https://github.com/xournalpp/xournalpp
+ *
+ * @license GNU GPLv2 or later
+ */
+
+#pragma once
+
+#include "PositionInputData.h"  // for PositionInputData
+
+class InputContext;
+class XojPageView;
+struct InputEvent;
+
+/**
+ * Abstract class for a specific input state
+ */
+class AbstractInputHandler {
+private:
+    bool blocked = false;
+
+protected:
+    InputContext* inputContext;
+    bool inputRunning = false;
+
+protected:
+    XojPageView* getPageAtCurrentPosition(InputEvent const& event) const;
+    PositionInputData getInputDataRelativeToCurrentPage(XojPageView* page, InputEvent const& event) const;
+
+public:
+    explicit AbstractInputHandler(InputContext* inputContext);
+    virtual ~AbstractInputHandler();
+
+    void block(bool block);
+    bool isBlocked() const;
+    virtual void onBlock();
+    virtual void onUnblock();
+    bool handle(InputEvent const& event);
+    virtual bool handleImpl(InputEvent const& event) = 0;
+};
diff --git a/entry/src/main/cpp/src/core/gui/inputdevices/CompassInputHandler.cpp b/entry/src/main/cpp/src/core/gui/inputdevices/CompassInputHandler.cpp
new file mode 100644
index 0000000..f2f03a3
--- /dev/null
+++ b/entry/src/main/cpp/src/core/gui/inputdevices/CompassInputHandler.cpp
@@ -0,0 +1,90 @@
+#include "CompassInputHandler.h"
+
+#include <memory>  // for __shared_ptr_access, shar...
+
+#include "control/CompassController.h"  // for CompassController, HYPOTENUSE
+#include "control/Control.h"
+#include "control/ToolEnums.h"    // for TOOL_HAND, TOOL_HIGHLIGHTER
+#include "control/ToolHandler.h"  // for ToolHandler
+#include "gui/XournalView.h"      // for XournalView
+#include "gui/inputdevices/InputEvents.h"
+#include "model/Compass.h"
+
+constexpr double MIN_HEIGHT = 0.5;
+constexpr double MAX_HEIGHT = 10.0;
+
+CompassInputHandler::CompassInputHandler(XournalView* xournal, GeometryToolController* controller):
+        GeometryToolInputHandler(xournal, controller) {}
+
+CompassInputHandler::~CompassInputHandler() noexcept = default;
+
+auto CompassInputHandler::handlePointer(InputEvent const& event) -> bool {
+    const auto coords = getCoords(event);
+    CompassController* compassController = static_cast<CompassController*>(controller);
+    const auto p = compassController->posRelToSide(coords.x, coords.y);
+
+    const auto toolHandler = xournal->getControl()->getToolHandler();
+    switch (toolHandler->getToolType()) {
+        case TOOL_HIGHLIGHTER:
+        case TOOL_PEN:
+            if (event.type == BUTTON_PRESS_EVENT) {
+                if (controller->isInsideGeometryTool(coords.x, coords.y, 0) &&
+                    !controller->isInsideGeometryTool(coords.x, coords.y, -0.5)) {
+                    // initialize range
+                    lastProj = std::atan2(-p.y, p.x);
+                    compassController->createOutlineStroke(lastProj);
+                    return true;
+                } else if (double h = controller->getGeometryTool()->getHeight();
+                           controller->isInsideGeometryTool(coords.x, coords.y, 0.) &&
+                           std::abs(compassController->posRelToSide(coords.x, coords.y).y) <= 0.5 &&
+                           std::abs(compassController->posRelToSide(coords.x, coords.y).x - 0.5 * h) <= 0.5 * h) {
+                    compassController->createRadialStroke(std::hypot(p.x, p.y));
+                    return true;
+                }
+                return false;
+            } else if (event.type == MOTION_EVENT) {
+                // update range and paint
+                if (compassController->existsOutlineStroke()) {
+                    auto proj = std::atan2(-p.y, p.x);
+                    proj = lastProj + std::remainder(proj - lastProj, 2 * M_PI);
+                    compassController->updateOutlineStroke(proj);
+                    lastProj = proj;
+                    return true;
+                } else if (compassController->existsRadialStroke()) {
+                    compassController->updateRadialStroke(std::hypot(p.x, p.y));
+                }
+                return false;
+            } else if (event.type == BUTTON_RELEASE_EVENT) {
+                // add stroke to layer and reset
+                if (compassController->existsOutlineStroke()) {
+                    compassController->finalizeOutlineStroke();
+                    lastProj = NAN;
+                    return true;
+                } else if (compassController->existsRadialStroke()) {
+                    compassController->finalizeRadialStroke();
+                    return true;
+                }
+            }
+            return false;
+        case TOOL_HAND:
+            if (event.type == BUTTON_PRESS_EVENT) {
+                if (!controller->isInsideGeometryTool(coords.x, coords.y, 0)) {
+                    return false;
+                } else {
+                    sequenceStart(event);
+                    this->handScrolling = true;
+                    return true;
+                }
+            } else if (event.type == MOTION_EVENT && this->handScrolling) {
+                scrollMotion(event);
+                return true;
+            } else if (event.type == BUTTON_RELEASE_EVENT && this->handScrolling) {
+                this->handScrolling = false;
+            }
+        default:
+            return false;
+    }
+}
+
+auto CompassInputHandler::getMinHeight() const -> double { return MIN_HEIGHT; }
+auto CompassInputHandler::getMaxHeight() const -> double { return MAX_HEIGHT; }
diff --git a/entry/src/main/cpp/src/core/gui/inputdevices/CompassInputHandler.h b/entry/src/main/cpp/src/core/gui/inputdevices/CompassInputHandler.h
new file mode 100644
index 0000000..a7ec15b
--- /dev/null
+++ b/entry/src/main/cpp/src/core/gui/inputdevices/CompassInputHandler.h
@@ -0,0 +1,42 @@
+/*
+ * Xournal++
+ *
+ * Input handler for the compass.
+ *
+ * @author Xournal++ Team
+ * https://github.com/xournalpp/xournalpp
+ *
+ * @license GNU GPLv2 or later
+ */
+
+#pragma once
+
+#include "GeometryToolInputHandler.h"
+
+class Stroke;
+class GeometryToolController;
+struct InputEvent;
+
+/**
+ * @brief Input handler for the compass
+ *
+ * Only the pointer handling (mouse / stylus) is defined in this class.
+ * The rest comes from the GeometryToolHandler
+ * */
+class CompassInputHandler: public GeometryToolInputHandler {
+
+public:
+    explicit CompassInputHandler(XournalView* xournalView, GeometryToolController* controller);
+    ~CompassInputHandler() noexcept override;
+
+private:
+    /**
+     * @brief handles input from mouse and stylus for the compass
+     */
+    bool handlePointer(InputEvent const& event) override;
+
+    double lastProj = NAN;
+
+    double getMinHeight() const override;
+    double getMaxHeight() const override;
+};
diff --git a/entry/src/main/cpp/src/core/gui/inputdevices/DeviceId.cpp b/entry/src/main/cpp/src/core/gui/inputdevices/DeviceId.cpp
new file mode 100644
index 0000000..1a2c36f
--- /dev/null
+++ b/entry/src/main/cpp/src/core/gui/inputdevices/DeviceId.cpp
@@ -0,0 +1,17 @@
+#include "DeviceId.h"
+
+#include <gdk/gdk.h>
+
+DeviceId::DeviceId(const GdkDevice* id): id(id) {
+    if (id) {
+        auto source = gdk_device_get_source(const_cast<GdkDevice*>(id));
+        trackpointOrTouchpad = source == GDK_SOURCE_TRACKPOINT || source == GDK_SOURCE_TOUCHPAD;
+    }
+}
+void DeviceId::reset(const GdkDevice* id) { *this = DeviceId(id); }
+DeviceId::operator bool() const { return id != nullptr; }
+bool DeviceId::operator==(const DeviceId& o) const {
+    // For laptops with both touchpad and trackpoint, allow to use the trackpoint buttons above the touchpad
+    return (id == o.id) || (trackpointOrTouchpad && o.trackpointOrTouchpad);
+}
+bool DeviceId::operator!=(const DeviceId& o) const { return !(*this == o); }
diff --git a/entry/src/main/cpp/src/core/gui/inputdevices/DeviceId.h b/entry/src/main/cpp/src/core/gui/inputdevices/DeviceId.h
new file mode 100644
index 0000000..c3248fa
--- /dev/null
+++ b/entry/src/main/cpp/src/core/gui/inputdevices/DeviceId.h
@@ -0,0 +1,26 @@
+/*
+ * Xournal++
+ *
+ * Device identifier
+ *
+ * @author Xournal++ Team
+ * https://github.com/xournalpp/xournalpp
+ *
+ * @license GNU GPLv2 or later
+ */
+#pragma once
+
+#include <gdk/gdk.h>
+
+struct DeviceId {
+    constexpr DeviceId() = default;
+    explicit DeviceId(const GdkDevice* id);
+    void reset(const GdkDevice* id = nullptr);
+    explicit operator bool() const;
+    bool operator==(const DeviceId& o) const;
+    bool operator!=(const DeviceId& o) const;
+
+private:
+    const void* id = nullptr;
+    bool trackpointOrTouchpad = false;
+};
diff --git a/entry/src/main/cpp/src/core/gui/inputdevices/GeometryToolInputHandler.cpp b/entry/src/main/cpp/src/core/gui/inputdevices/GeometryToolInputHandler.cpp
new file mode 100644
index 0000000..6d95bbe
--- /dev/null
+++ b/entry/src/main/cpp/src/core/gui/inputdevices/GeometryToolInputHandler.cpp
@@ -0,0 +1,309 @@
+#include "GeometryToolInputHandler.h"
+
+#include <algorithm>  // for max
+#include <cmath>      // for atan2, abs, cos, remainder
+#include <memory>     // for __shared_ptr_access, shar...
+
+#include <gdk/gdkkeysyms.h>  // for GDK_KEY_Down, GDK_KEY_Left
+#include <glib.h>            // for g_warning
+
+#include "control/Control.h"                 // for Control
+#include "control/GeometryToolController.h"  // for GeometryToolController
+#include "control/ToolEnums.h"               // for TOOL_HAND, TOOL_HIGHLIGHTER
+#include "control/ToolHandler.h"             // for ToolHandler
+#include "control/settings/Settings.h"       // for Settings
+#include "gui/XournalView.h"                 // for XournalView
+#include "gui/inputdevices/InputContext.h"   // for InputContext::DeviceType
+#include "gui/inputdevices/InputEvents.h"    // for InputEvent, BUTTON_PRESS_...
+#include "model/Document.h"                  // for Document
+#include "model/Element.h"                   // for Element, ELEMENT_STROKE
+#include "model/GeometryTool.h"              // for HALF_CM
+#include "model/Layer.h"                     // for Layer
+#include "model/Snapping.h"                  // for distanceLine
+#include "model/Stroke.h"                    // for Stroke
+#include "model/XojPage.h"                   // for XojPage
+
+constexpr double MOVE_AMOUNT = HALF_CM / 2.0;
+constexpr double MOVE_AMOUNT_SMALL = HALF_CM / 20.0;
+constexpr double ROTATE_AMOUNT = M_PI * 5.0 / 180.0;
+constexpr double ROTATE_AMOUNT_SMALL = M_PI * 0.2 / 180.0;
+constexpr double SCALE_AMOUNT = 1.1;
+constexpr double SCALE_AMOUNT_SMALL = 1.01;
+constexpr double SNAPPING_DISTANCE_TOLERANCE = 5.0;                 // pt
+constexpr double SNAPPING_ROTATION_TOLERANCE = 3.0 * M_PI / 180.0;  // rad
+constexpr double ZOOM_DISTANCE_MIN = 0.01;
+
+GeometryToolInputHandler::GeometryToolInputHandler(XournalView* xournal, GeometryToolController* controller):
+        xournal(xournal), controller(controller) {}
+
+GeometryToolInputHandler::~GeometryToolInputHandler() = default;
+
+auto GeometryToolInputHandler::handle(InputEvent const& event) -> bool {
+    if (xournal->getSelection() || xournal->getControl()->getTextEditor()) {
+        return false;
+    }
+    const auto device = event.deviceClass;
+    if ((device == INPUT_DEVICE_MOUSE && isBlocked[InputContext::DeviceType::MOUSE]) ||
+        (device == INPUT_DEVICE_PEN && isBlocked[InputContext::DeviceType::STYLUS]) ||
+        (device == INPUT_DEVICE_TOUCHSCREEN && isBlocked[InputContext::DeviceType::TOUCHSCREEN])) {
+        return false;  // don't intervene
+    }
+
+    switch (device) {
+        case INPUT_DEVICE_TOUCHSCREEN:
+            return this->handleTouchscreen(event);
+        case INPUT_DEVICE_PEN:
+        case INPUT_DEVICE_MOUSE:
+            return this->handlePointer(event);
+        default:
+            g_warning("Device class %d not handled by geometry tool", event.deviceClass);
+            return false;
+    }
+}
+
+auto GeometryToolInputHandler::handleTouchscreen(InputEvent const& event) -> bool {
+    // Don't handle more than 2 inputs
+    if (this->primarySequence && this->primarySequence != event.sequence && this->secondarySequence &&
+        this->secondarySequence != event.sequence) {
+        return false;
+    }
+    if (event.type == BUTTON_PRESS_EVENT) {
+        // Start scrolling when a sequence starts and we currently have none other
+        if (this->primarySequence == nullptr && this->secondarySequence == nullptr) {
+            const xoj::util::Point<double> coords = getCoords(event);
+
+            if (controller->isInsideGeometryTool(coords.x, coords.y, 0)) {
+                // Set sequence data
+                this->primarySequence = event.sequence;
+                sequenceStart(event);
+                return true;
+            } else {
+                return false;
+            }
+
+        }
+        // Start zooming as soon as we have two sequences.
+        else if (this->primarySequence && this->primarySequence != event.sequence &&
+                 this->secondarySequence == nullptr) {
+            this->secondarySequence = event.sequence;
+
+            // Set sequence data
+            sequenceStart(event);
+            rotateAndZoomStart();
+            return true;
+        }
+    }
+
+    if (event.type == MOTION_EVENT && this->primarySequence) {
+        if (this->secondarySequence) {
+            rotateAndZoomMotion(event);
+            return true;
+        } else if (event.sequence == this->primarySequence) {
+            scrollMotion(event);
+            return true;
+        }
+        return false;
+    }
+
+    if (event.type == BUTTON_RELEASE_EVENT) {
+        if (event.sequence == this->primarySequence) {
+            // If secondarySequence is nullptr, this sets primarySequence
+            // to nullptr. If it isn't, then it is now the primary sequence!
+            this->primarySequence = std::exchange(this->secondarySequence, nullptr);
+            this->priLastPageRel = this->secLastPageRel;
+            return true;
+        } else if (event.sequence == this->secondarySequence) {
+            this->secondarySequence = nullptr;
+            return true;
+        }
+    }
+    return false;
+}
+
+auto GeometryToolInputHandler::keyPressed(KeyEvent const& event) -> bool {
+    double xdir = 0;
+    double ydir = 0;
+    double angle = 0.0;
+    double scale = 1.0;
+    switch (event.keyval) {
+        case GDK_KEY_Left:
+            xdir = -1;
+            break;
+        case GDK_KEY_Up:
+            ydir = -1;
+            break;
+        case GDK_KEY_Right:
+            xdir = 1;
+            break;
+        case GDK_KEY_Down:
+            ydir = 1;
+            break;
+        case GDK_KEY_r:
+            angle = (event.state & GDK_MOD1_MASK) ? -ROTATE_AMOUNT_SMALL : -ROTATE_AMOUNT;
+            break;
+        case GDK_KEY_R:  // r like "rotate"
+            angle = (event.state & GDK_MOD1_MASK) ? ROTATE_AMOUNT_SMALL : ROTATE_AMOUNT;
+            break;
+        case GDK_KEY_s:
+            scale = (event.state & GDK_MOD1_MASK) ? SCALE_AMOUNT_SMALL : SCALE_AMOUNT;
+            break;
+        case GDK_KEY_S:
+            scale = (event.state & GDK_MOD1_MASK) ? 1. / SCALE_AMOUNT_SMALL : 1. / SCALE_AMOUNT;
+            break;
+        case GDK_KEY_m:
+            controller->markOrigin();
+            return true;
+    }
+
+    if (xdir != 0 || ydir != 0) {
+        xoj::util::Point<double> offset;
+        const double amount = (event.state & GDK_MOD1_MASK) ? MOVE_AMOUNT_SMALL : MOVE_AMOUNT;
+        if (event.state & GDK_SHIFT_MASK) {
+            double angle = controller->getGeometryTool()->getRotation();
+            const double c = std::cos(angle);
+            const double s = std::sin(angle);
+            offset = {amount * (c * xdir - s * ydir), amount * (s * xdir + c * ydir)};
+        } else {
+            offset = {amount * xdir, amount * ydir};
+        }
+        controller->translate(offset);
+        return true;
+    }
+
+    if (angle != 0) {
+        controller->rotate(angle);
+        return true;
+    }
+    if (scale != 1.0) {
+        const double h = controller->getGeometryTool()->getHeight() * scale;
+        if (h <= getMaxHeight() && h >= getMinHeight()) {
+            controller->scale(scale);
+            return true;
+        }
+    }
+    return false;
+}
+
+void GeometryToolInputHandler::sequenceStart(InputEvent const& event) {
+    if (event.sequence == this->primarySequence) {
+        this->priLastPageRel = this->getCoords(event);
+    } else {
+        this->secLastPageRel = this->getCoords(event);
+    }
+    const auto page = controller->getPage();
+
+    const Layer* layer = page->getSelectedLayer();
+    this->lines.clear();
+    Document* doc = xournal->getDocument();
+    doc->lock_shared();
+    // Performance improvement might be obtained by avoiding filtering all elements each
+    // time a finger has been put onto the screen
+    for (const auto& e: layer->getElementsView()) {
+        if (e->getType() == ELEMENT_STROKE) {
+            auto* s = dynamic_cast<const Stroke*>(e);
+            if (s->getPointCount() == 2) {
+                lines.push_back(s);
+            }
+        }
+    }
+    doc->unlock_shared();
+}
+
+void GeometryToolInputHandler::scrollMotion(InputEvent const& event) {
+    // Will only be called if there is a single sequence (rotation/zooming handles two sequences)
+    auto offset = [&]() {
+        xoj::util::Point<double> coords = this->getCoords(event);
+        if (event.sequence == this->primarySequence) {
+            const xoj::util::Point<double> offset = coords - this->priLastPageRel;
+            this->priLastPageRel = coords;
+            return offset;
+        } else {
+            const xoj::util::Point<double> offset = coords - this->secLastPageRel;
+            this->secLastPageRel = coords;
+            return offset;
+        }
+    }();
+    const auto& origin = controller->getGeometryTool()->getOrigin();
+    const auto pos = Point(origin.x + offset.x, origin.y + offset.y);
+    double minDist = SNAPPING_DISTANCE_TOLERANCE;
+    double diffAngle{NAN};
+    for (const auto& l: lines) {
+        const Point first = l->getPoint(0);
+        const Point second = l->getPoint(1);
+        const double dist = Snapping::distanceLine(pos, first, second);
+        const double angleLine = std::atan2(second.y - first.y, second.x - first.x);
+        const double diff = std::remainder(angleLine - controller->getGeometryTool()->getRotation(), M_PI_2);
+        if (dist < minDist && std::abs(diff) <= SNAPPING_ROTATION_TOLERANCE) {
+            minDist = dist;
+            diffAngle = diff;
+        }
+    }
+    if (!std::isnan(diffAngle)) {
+        controller->rotate(diffAngle, xoj::util::Point<double>(pos.x, pos.y));
+    }
+    controller->translate(offset);
+}
+
+void GeometryToolInputHandler::rotateAndZoomStart() {
+    this->startZoomDistance = std::max(this->priLastPageRel.distance(this->secLastPageRel), ZOOM_DISTANCE_MIN);
+
+    // Whether we can ignore the zoom portion of the gesture (e.g. distance between touch points
+    // hasn't changed enough or zoom gestures are disabled).
+    this->canBlockZoom = true;
+
+    this->lastZoomScrollCenter = (this->priLastPageRel + this->secLastPageRel) / 2.0;
+    const xoj::util::Point<double> shift = this->secLastPageRel - this->priLastPageRel;
+    this->lastAngle = atan2(shift.y, shift.x);
+    this->lastDist = this->startZoomDistance;
+}
+
+void GeometryToolInputHandler::rotateAndZoomMotion(InputEvent const& event) {
+    if (event.sequence == this->primarySequence) {
+        this->priLastPageRel = this->getCoords(event);
+    } else {
+        this->secLastPageRel = this->getCoords(event);
+    }
+
+    const double dist = std::max(this->priLastPageRel.distance(this->secLastPageRel), ZOOM_DISTANCE_MIN);
+
+    const double zoomTriggerThreshold = xournal->getControl()->getSettings()->getTouchZoomStartThreshold();
+    const double zoomChangePercentage = std::abs(dist - startZoomDistance) / startZoomDistance * 100;
+
+    // Has the touch points moved far enough to trigger a zoom and are zoom gestures enabled?
+    const bool zoomGesturesEnabled = xournal->getControl()->getSettings()->isZoomGesturesEnabled();
+    if (zoomChangePercentage >= zoomTriggerThreshold && zoomGesturesEnabled) {
+        this->canBlockZoom = false;
+    }
+
+    const xoj::util::Point<double> center = (this->priLastPageRel + this->secLastPageRel) / 2;
+    const xoj::util::Point<double> shift = this->secLastPageRel - this->priLastPageRel;
+    const double angle = atan2(shift.y, shift.x);
+
+    const xoj::util::Point<double> offset = center - lastZoomScrollCenter;
+    controller->translate(offset);
+    const double angleIncrease = angle - lastAngle;
+    const xoj::util::Point<double> centerRel = (this->priLastPageRel + this->secLastPageRel) / 2.0;
+    if (controller->isInsideGeometryTool(secLastPageRel.x, secLastPageRel.y, 0.0)) {
+        controller->rotate(angleIncrease, centerRel);
+    }  // allow moving without accidental rotation
+    const double scaleFactor = dist / lastDist;
+    const double h = controller->getGeometryTool()->getHeight() * scaleFactor;
+
+    if (!canBlockZoom && h <= getMaxHeight() && h >= getMinHeight()) {
+        controller->scale(scaleFactor, centerRel);
+    }
+
+    this->lastZoomScrollCenter = center;
+    this->lastAngle = angle;
+    this->lastDist = dist;
+}
+
+auto GeometryToolInputHandler::getCoords(InputEvent const& event) -> xoj::util::Point<double> {
+    const double zoom = xournal->getZoom();
+    const auto view = controller->getView();
+    return (event.relative - xoj::util::Point<double>(view->getX(), view->getY())) / zoom;
+}
+
+void GeometryToolInputHandler::blockDevice(InputContext::DeviceType deviceType) { isBlocked[deviceType] = true; }
+
+void GeometryToolInputHandler::unblockDevice(InputContext::DeviceType deviceType) { isBlocked[deviceType] = false; }
diff --git a/entry/src/main/cpp/src/core/gui/inputdevices/GeometryToolInputHandler.h b/entry/src/main/cpp/src/core/gui/inputdevices/GeometryToolInputHandler.h
new file mode 100644
index 0000000..d1c0aaf
--- /dev/null
+++ b/entry/src/main/cpp/src/core/gui/inputdevices/GeometryToolInputHandler.h
@@ -0,0 +1,164 @@
+/*
+ * Xournal++
+ *
+ * Input handler for the geometry tool.
+ *
+ * @author Xournal++ Team
+ * https://github.com/xournalpp/xournalpp
+ *
+ * @license GNU GPLv2 or later
+ */
+
+#pragma once
+
+#include <map>     // for map
+#include <vector>  // for vector
+
+#include <gdk/gdk.h>  // for GdkEventSequence
+
+#include "util/DispatchPool.h"  // for xoj::util::Listener
+#include "util/Point.h"         // for Point
+
+#include "InputContext.h"  // for InputContext::DeviceType, InputContext
+
+class Stroke;
+class GeometryToolController;
+struct InputEvent;
+struct KeyEvent;
+
+/**
+ * @brief Input handler for the geometry tool
+ *
+ * The geometry tool is designed to be used with touch/keyboard with one hand and mouse/stylus with the other hand
+ * Keyboard and Touch are used to move the geometry tool (and the page), to rotate it and change its size, whereas
+ * Stylus/Mouse are used to draw/annotate.
+ *
+ * The touch handling part is adopted from the TouchInputHandler class
+ */
+class GeometryToolInputHandler {
+
+protected:
+    /**
+     * @brief the XournalView attached to this handler
+     */
+    XournalView* xournal;
+
+    /**
+     * @brief the geometry tool controller
+     *
+     */
+    GeometryToolController* controller;
+
+    /**
+     * @brief saves which devices are blocked, so they don't need to be handled
+     *        This is currently used for the automatic hand recognition, that can be turned on in the settings
+     */
+    std::map<InputContext::DeviceType, bool> isBlocked{};
+
+    /**
+     * @brief the touch event sequence corresponding to the first finger touching the screen
+     */
+    GdkEventSequence* primarySequence{};
+    /**
+     * @brief the touch event sequence corresponding to the second finger touching the screen
+     */
+    GdkEventSequence* secondarySequence{};
+
+    /**
+     * @brief the distance between the two fingers touching the screen at the start of a zoom sequence
+     */
+    double startZoomDistance{0.0};
+
+    /**
+     * @brief the previous mid point between the two fingers in a zoom sequence
+     */
+    xoj::util::Point<double> lastZoomScrollCenter{};
+
+    /**
+     * @brief The current positions of the first (primary) finger and second (secondary) finger in page coordinates
+     */
+    xoj::util::Point<double> priLastPageRel{-1.0, -1.0};
+    xoj::util::Point<double> secLastPageRel{-1.0, -1.0};
+
+    /**
+     * @brief The previous angle between the line through the positions of the two fingers and the x-axis
+     */
+    double lastAngle{0.0};
+
+    /**
+     * @brief The previous distance between the two fingers touching the screen
+     */
+    double lastDist{1.0};
+
+    /**
+     * @brief whether resizing the geometry tool can be blocked, because the distance between the fingers hasn't changed
+     * enough
+     */
+    bool canBlockZoom{false};
+
+    /**
+     * @brief whether a scrolling for the hand tool takes place (after touching the geometry tool with the hand tool)
+     */
+    bool handScrolling{false};
+
+    /**
+     * @brief the line segments (strokes with two points) of the current layer, that are used for rotation snapping the
+     * geometry tool
+     */
+    std::vector<const Stroke*> lines;
+
+protected:
+    /**
+     * @brief initializes an input sequence (right after the first or second finger is put onto the screen)
+     * @param event the input event initializing the sequence
+     */
+    void sequenceStart(InputEvent const& event);
+
+    /**
+     * @brief scrolling method
+     * @param event the current input event
+     */
+    void scrollMotion(InputEvent const& event);
+
+    /**
+     * @brief start rotating and zooming (after the second finger is put onto the screen)
+     * only zooms, when zoom gestures are enabled
+     */
+    void rotateAndZoomStart();
+
+    /**
+     * @brief rotation and zooming method, only zooms when zoom gestures are enabled
+     * @param event the current input event
+     */
+    void rotateAndZoomMotion(InputEvent const& event);
+
+    /**
+     * @brief handles input from the touchscreen for the geometry tool
+     */
+    bool handleTouchscreen(InputEvent const& event);
+
+    /**
+     * @brief handles input from mouse and stylus for the geometry tool
+     */
+    virtual bool handlePointer(InputEvent const& event) = 0;
+
+    /**
+     * @brief the document coordinates derived from an input event
+     * @param event an input event
+     */
+    xoj::util::Point<double> getCoords(InputEvent const& event);
+
+    virtual double getMinHeight() const = 0;
+    virtual double getMaxHeight() const = 0;
+
+public:
+    explicit GeometryToolInputHandler(XournalView* xournalView, GeometryToolController* controller);
+    virtual ~GeometryToolInputHandler();
+
+    bool handle(InputEvent const& event);
+    void blockDevice(InputContext::DeviceType deviceType);
+    void unblockDevice(InputContext::DeviceType deviceType);
+
+    bool keyPressed(KeyEvent const& event);
+    // bool keyReleased(KeyEvent const& event); // Implement if needed
+};
diff --git a/entry/src/main/cpp/src/core/gui/inputdevices/HandRecognition.cpp b/entry/src/main/cpp/src/core/gui/inputdevices/HandRecognition.cpp
new file mode 100644
index 0000000..5426845
--- /dev/null
+++ b/entry/src/main/cpp/src/core/gui/inputdevices/HandRecognition.cpp
@@ -0,0 +1,183 @@
+#include "HandRecognition.h"
+
+#include <cstring>  // for strcmp
+#include <string>   // for all...
+
+#include "control/settings/Settings.h"                            // for SEl...
+#include "gtk/gtk.h"                                              // for Gtk...
+#include "gui/inputdevices/InputEvents.h"                         // for INP...
+#include "gui/inputdevices/touchdisable/TouchDisableCustom.h"     // for Tou...
+#include "gui/inputdevices/touchdisable/TouchDisableInterface.h"  // for Tou...
+#include "gui/inputdevices/touchdisable/TouchDisableX11.h"        // for Tou...
+#include "util/glib_casts.h"                                      // for wrap_v
+#include "util/safe_casts.h"                                      // for as_unsigned
+
+#include "InputContext.h"  // for Inp...
+
+using std::string;
+
+HandRecognition::HandRecognition(InputContext* inputContext):
+        inputContext(inputContext), settings(inputContext->getSettings()) {
+#ifdef X11_ENABLED
+    const char* sessionType = g_getenv("XDG_SESSION_TYPE");
+    if (sessionType != nullptr && strcmp(sessionType, "x11") == 0) {
+        x11Session = true;
+    }
+#endif
+
+    reload();
+}
+
+HandRecognition::~HandRecognition() {
+    // Enable touchscreen on quit application
+    if (!touchState && enabled && touchImpl) {
+        touchImpl->enableTouch();
+    }
+
+    delete touchImpl;
+    touchImpl = nullptr;
+}
+
+/**
+ * Reload settings
+ */
+void HandRecognition::reload() {
+    SElement& touch = settings->getCustomElement("touch");
+
+    enabled = false;
+    touch.getBool("disableTouch", enabled);
+
+    if (!enabled) {
+        delete touchImpl;
+        touchImpl = nullptr;
+        return;
+    }
+
+    disableTimeout = 1000;
+    touch.getInt("timeout", disableTimeout);
+    if (disableTimeout < 500) {
+        disableTimeout = 500;
+    }
+
+    delete touchImpl;
+    touchImpl = nullptr;
+
+    string disableMethod;
+    touch.getString("method", disableMethod);
+    if (disableMethod == "X11") {
+        if (!x11Session) {
+            g_warning("X11 Touch workaround is selected, but no X11 Session running!");
+            enabled = false;
+            return;
+        }
+#ifdef X11_ENABLED
+        touchImpl = new TouchDisableX11();
+#endif
+    } else if (disableMethod == "custom") {
+        string enableCommand;
+        touch.getString("cmdEnable", enableCommand);
+        string disableCommand;
+        touch.getString("cmdDisable", disableCommand);
+
+        touchImpl = new TouchDisableCustom(enableCommand, disableCommand);
+    } else  // Auto detect
+    {
+#ifdef X11_ENABLED
+        if (x11Session) {
+            touchImpl = new TouchDisableX11();
+        }
+#endif
+    }
+
+    if (touchImpl) {
+        touchImpl->init();
+    }
+}
+
+/**
+ * Called after the timeout
+ *
+ * @return true to call again
+ */
+auto HandRecognition::enableTimeout(HandRecognition* self) -> bool {
+    gint64 now = g_get_monotonic_time() / 1000;
+    gint64 lastPenActionTime = now - self->lastPenAction;
+    if (lastPenActionTime < 20) {
+        // Pen action within the last 20ms, so simple restart timeout
+        return true;
+    }
+
+    if (lastPenActionTime > self->disableTimeout) {
+        // Timeout elapsed, enable touch again
+        self->enableTouch();
+        self->touchState = true;
+
+        // Do not call again
+        self->timer.consume();
+        return false;
+    }
+
+    auto nextTime = static_cast<guint>(now - self->lastPenAction + self->disableTimeout);
+
+    self->timer.consume();
+    self->timer = g_timeout_add(strict_cast<guint>(nextTime), xoj::util::wrap_v<enableTimeout>, self);
+
+    // Do not call again, a new time is scheduled
+    return false;
+}
+
+/**
+ * There was a pen event, restart the timer
+ */
+void HandRecognition::penEvent() {
+    lastPenAction = g_get_monotonic_time() / 1000;
+
+    if (touchState) {
+        touchState = false;
+        if (enabled) {
+            disableTouch();
+        }
+        timer = g_timeout_add(strict_cast<guint>(disableTimeout), xoj::util::wrap_v<enableTimeout>, this);
+    }
+}
+
+/**
+ * Enable touchscreen
+ */
+void HandRecognition::enableTouch() {
+    if (inputContext) {
+        inputContext->unblockDevice(InputContext::DeviceType::TOUCHSCREEN);
+    }
+    if (touchImpl && enabled) {
+        touchImpl->enableTouch();
+    }
+}
+
+/**
+ * Disable touchscreen
+ */
+void HandRecognition::disableTouch() {
+    if (inputContext) {
+        inputContext->blockDevice(InputContext::DeviceType::TOUCHSCREEN);
+    }
+    if (touchImpl) {
+        touchImpl->disableTouch();
+    }
+}
+
+/**
+ * An event from a device occurred
+ */
+void HandRecognition::event(InputDeviceClass device) {
+    if (!enabled) {
+        return;
+    }
+    if (device == INPUT_DEVICE_PEN || device == INPUT_DEVICE_ERASER) {
+        penEvent();
+    }
+}
+
+void HandRecognition::unblock() {
+    this->enableTouch();
+    this->touchState = true;
+}
diff --git a/entry/src/main/cpp/src/core/gui/inputdevices/HandRecognition.h b/entry/src/main/cpp/src/core/gui/inputdevices/HandRecognition.h
new file mode 100644
index 0000000..47ccbf5
--- /dev/null
+++ b/entry/src/main/cpp/src/core/gui/inputdevices/HandRecognition.h
@@ -0,0 +1,112 @@
+/*
+ * Xournal++
+ *
+ * Helper class for Touch specific fixes
+ *
+ * @author Xournal++ Team
+ * https://github.com/xournalpp/xournalpp
+ *
+ * @license GNU GPLv2 or later
+ */
+
+#pragma once
+
+#include <gdk/gdk.h>  // for GdkDevice
+#include <glib.h>     // for gint64
+#include <gtk/gtk.h>  // for GtkWidget
+
+#include "util/raii/GSourceURef.h"
+
+#include "InputEvents.h"  // for InputDeviceClass
+
+class Settings;
+class TouchDisableInterface;
+class InputContext;
+
+class HandRecognition final {
+public:
+    HandRecognition(InputContext* inputContext);
+    ~HandRecognition();
+
+public:
+    /**
+     * Reload settings
+     */
+    void reload();
+
+    /**
+     * An event from a device occurred
+     */
+    void event(InputDeviceClass device);
+
+    /**
+     * Unblock the touchscreen immediately
+     */
+    void unblock();
+
+private:
+    /**
+     * Called after the timeout
+     *
+     * @return true to call again
+     */
+    static bool enableTimeout(HandRecognition* self);
+
+    /**
+     * There was a pen event, restart the timer
+     */
+    void penEvent();
+
+    /**
+     * Enable touchscreen
+     */
+    void enableTouch();
+
+    /**
+     * Disable touchscreen
+     */
+    void disableTouch();
+
+private:
+    /**
+     * If touch disabling is enabled
+     */
+    bool enabled = false;
+
+    /**
+     * true if touch is enabled, false if disabled
+     */
+    bool touchState = true;
+
+    /**
+     * When the pen last was seen
+     */
+    gint64 lastPenAction = -1;
+
+    /**
+     * Timeout in ms
+     */
+    int disableTimeout = 500;
+
+    xoj::util::GSourceURef timer;
+
+    /**
+     * True if an X11 session is running
+     */
+    bool x11Session = false;
+
+    /**
+     * Implementation for touch disabling
+     */
+    TouchDisableInterface* touchImpl = nullptr;
+
+    /**
+     * InputContext
+     */
+    InputContext* inputContext;
+
+    /**
+     * Settings
+     */
+    Settings* settings = nullptr;
+};
diff --git a/entry/src/main/cpp/src/core/gui/inputdevices/InputContext.cpp b/entry/src/main/cpp/src/core/gui/inputdevices/InputContext.cpp
new file mode 100644
index 0000000..26e121f
--- /dev/null
+++ b/entry/src/main/cpp/src/core/gui/inputdevices/InputContext.cpp
@@ -0,0 +1,327 @@
+//
+// Created by ulrich on 06.04.19.
+//
+
+#include "InputContext.h"
+
+#include <cstddef>  // for NULL
+#include <vector>   // for vector
+
+#include <glib-object.h>  // for g_signal_hand...
+
+#include "control/Control.h"                            // for Control
+#include "control/DeviceListHelper.h"                   // for InputDevice
+#include "control/settings/Settings.h"                  // for Settings
+#include "gui/XournalView.h"                            // for XournalView
+#include "gui/dialog/DeviceTestingArea.h"               // for DeviceTestingArea
+#include "gui/inputdevices/GeometryToolInputHandler.h"  // for GeometryToolInputHandler
+#include "gui/inputdevices/HandRecognition.h"           // for HandRecognition
+#include "gui/inputdevices/KeyboardInputHandler.h"      // for KeyboardInput...
+#include "gui/inputdevices/MouseInputHandler.h"         // for MouseInputHan...
+#include "gui/inputdevices/StylusInputHandler.h"        // for StylusInputHa...
+#include "gui/inputdevices/TouchDrawingInputHandler.h"  // for TouchDrawingI...
+#include "gui/inputdevices/TouchInputHandler.h"         // for TouchInputHan...
+#include "util/Assert.h"                                // for xoj_assert
+#include "util/gdk4_helper.h"
+#include "util/glib_casts.h"  // for wrap_for_g_callback
+#include "util/gtk4_helper.h"
+
+#include "InputEvents.h"   // for InputEvent
+#include "config-debug.h"  // for DEBUG_INPUT
+
+#ifdef DEBUG_INPUT
+#include "PrintEvent.h"
+#endif
+
+class ScrollHandling;
+class ToolHandler;
+
+InputContext::InputContext(XournalView* view, ScrollHandling* scrollHandling):
+        view(view),
+        scrollHandling(scrollHandling),
+        settings(view->getControl()->getSettings()),
+        stylusHandler(std::make_unique<StylusInputHandler>(this)),
+        mouseHandler(std::make_unique<MouseInputHandler>(this)),
+        touchDrawingHandler(std::make_unique<TouchDrawingInputHandler>(this)),
+        keyboardHandler(std::make_unique<KeyboardInputHandler>(this)),
+        touchHandler(std::make_unique<TouchInputHandler>(this)),
+        handRecognition(std::make_unique<HandRecognition>(this)) {
+    for (const InputDevice& savedDevices: this->view->getControl()->getSettings()->getKnownInputDevices()) {
+        this->knownDevices.insert(savedDevices.getName());
+    }
+}
+
+InputContext::InputContext(Settings* settings, DeviceTestingArea& testing):
+        view(nullptr),
+        scrollHandling(nullptr),
+        settings(settings),
+        stylusHandler(std::make_unique<TestingHandler<StylusInputHandler>>(this, DeviceTestingArea::HandlerType::STYLUS,
+                                                                           testing)),
+        mouseHandler(std::make_unique<TestingHandler<MouseInputHandler>>(this, DeviceTestingArea::HandlerType::MOUSE,
+                                                                         testing)),
+        touchHandler(std::make_unique<TestingHandler<TouchInputHandler>>(this, DeviceTestingArea::HandlerType::TOUCH,
+                                                                         testing)),
+        handRecognition(std::make_unique<HandRecognition>(this)) {
+    for (const InputDevice& savedDevices: settings->getKnownInputDevices()) {
+        this->knownDevices.insert(savedDevices.getName());
+    }
+}
+
+template <bool (KeyboardInputHandler::*handler)(const KeyEvent&) const>
+static gboolean keyboardCallback(GtkEventControllerKey* self, guint keyval, guint, GdkModifierType state, gpointer d) {
+    auto* gdkEvent = gtk_event_controller_get_current_event(GTK_EVENT_CONTROLLER(self));
+    KeyEvent e;
+    e.keyval = keyval;
+    e.state = static_cast<GdkModifierType>(state & gtk_accelerator_get_default_mod_mask() &
+                                           ~gdk_key_event_get_consumed_modifiers(gdkEvent));
+    e.sourceEvent = gdkEvent;
+    return (static_cast<KeyboardInputHandler*>(d)->*handler)(e);
+}
+
+InputContext::~InputContext() {
+    // Destructor is called in xournal_widget_dispose, so it can still accept events
+    g_signal_handler_disconnect(this->widget, signal_id);
+}
+
+void InputContext::connect(GtkWidget* pWidget, bool connectKeyboardHandler,
+                           std::optional<std::function<void(GdkEvent*)>> logfunction) {
+    xoj_assert(!this->widget && pWidget);
+    this->widget = pWidget;
+    gtk_widget_set_support_multidevice(widget, true);
+
+    if (connectKeyboardHandler) {
+#if GTK_MAJOR_VERSION == 3
+        auto* keyCtrl = gtk_event_controller_key_new(widget);
+#else
+        auto* keyCtrl = gtk_event_controller_key_new();
+        gtk_widget_add_controller(keyCtrl);
+#endif
+
+        g_signal_connect(keyCtrl, "key-pressed", G_CALLBACK(keyboardCallback<&KeyboardInputHandler::keyPressed>),
+                         keyboardHandler.get());
+        g_signal_connect(keyCtrl, "key-released", G_CALLBACK(keyboardCallback<&KeyboardInputHandler::keyReleased>),
+                         keyboardHandler.get());
+    }
+
+    int mask =
+            // Allow scrolling
+            GDK_SCROLL_MASK | GDK_SMOOTH_SCROLL_MASK |
+
+            // Touch / Pen / Mouse
+            GDK_TOUCH_MASK | GDK_POINTER_MOTION_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK |
+            GDK_ENTER_NOTIFY_MASK | GDK_LEAVE_NOTIFY_MASK | GDK_PROXIMITY_IN_MASK | GDK_PROXIMITY_OUT_MASK;
+
+    gtk_widget_add_events(pWidget, mask);
+
+
+    if (!logfunction) {
+        signal_id =
+                g_signal_connect(pWidget, "event", G_CALLBACK(+[](GtkWidget* widget, GdkEvent* event, gpointer self) {
+                                     return static_cast<InputContext*>(self)->handle(event);
+                                 }),
+                                 this);
+    } else {
+        struct D {
+            InputContext* self;
+            std::function<void(GdkEvent*)> logfunction;
+        };
+        signal_id = g_signal_connect_data(
+                pWidget, "event", G_CALLBACK(+[](GtkWidget* widget, GdkEvent* event, gpointer d) {
+                    auto* data = static_cast<D*>(d);
+                    data->logfunction(event);
+                    return data->self->handle(event);
+                }),
+                new D{this, logfunction.value()}, xoj::util::closure_notify_cb<D>, GConnectFlags(0));
+    }
+}
+
+auto InputContext::handle(GdkEvent* sourceEvent) -> bool {
+    printDebug(sourceEvent);
+
+    GdkDevice* sourceDevice = gdk_event_get_source_device(sourceEvent);
+    if (sourceDevice == NULL) {
+        return false;
+    }
+
+    GdkInputSource inputSource = gdk_device_get_source(sourceDevice);
+    if (inputSource == GDK_SOURCE_KEYBOARD) {
+        // Keyboard events are handled via the GtkEventControllerKey instance
+        return false;
+    }
+
+    InputEvent event = InputEvents::translateEvent(sourceEvent, this->getSettings());
+
+    // Add the device to the list of known devices if it is currently unknown
+    if (gdk_device_get_device_type(sourceDevice) != GDK_DEVICE_TYPE_MASTER &&
+        this->knownDevices.find(std::string(event.deviceName)) == this->knownDevices.end()) {
+
+        this->knownDevices.insert(std::string(event.deviceName));
+        this->getSettings()->transactionStart();
+        auto deviceClassOption =
+                this->getSettings()->getDeviceClassForDevice(std::string(event.deviceName), inputSource);
+        this->getSettings()->setDeviceClassForDevice(sourceDevice, deviceClassOption);
+        this->getSettings()->transactionEnd();
+    }
+
+    // We do not handle scroll events manually but let GTK do it for us
+    if (event.type == SCROLL_EVENT) {
+        // Hand over to standard GTK Scroll / Zoom handling
+        return false;
+    }
+
+    // Deactivate touchscreen when a pen event occurs
+    this->handRecognition->event(event.deviceClass);
+
+    // separate events to appropriate handlers
+    // handle geometry tool
+    if (geometryToolInputHandler && geometryToolInputHandler->handle(event)) {
+        return true;
+    }
+
+    // handle tablet stylus
+    if (event.deviceClass == INPUT_DEVICE_PEN || event.deviceClass == INPUT_DEVICE_ERASER) {
+        return this->stylusHandler->handle(event);
+    }
+
+    // handle mouse devices
+    if (event.deviceClass == INPUT_DEVICE_MOUSE) {
+        return this->mouseHandler->handle(event);
+    }
+
+    // handle touchscreens
+    if (event.deviceClass == INPUT_DEVICE_TOUCHSCREEN) {
+        bool touchDrawingEnabled = this->getSettings()->getTouchDrawingEnabled();
+
+        // trigger touch drawing depending on the setting
+        if (touchDrawingEnabled && this->touchDrawingHandler) {
+            return this->touchDrawingHandler->handle(event) || this->touchHandler->handle(event);
+        }
+
+        return this->touchHandler->handle(event);
+    }
+
+    if (event.deviceClass == INPUT_DEVICE_IGNORE) {
+        return true;
+    }
+    return false;
+}
+
+auto InputContext::getXournal() const -> GtkXournal* { return GTK_XOURNAL(widget); }
+
+auto InputContext::getView() const -> XournalView* { return view; }
+
+auto InputContext::getSettings() const -> Settings* { return settings; }
+
+auto InputContext::getToolHandler() const -> ToolHandler* { return view->getControl()->getToolHandler(); }
+
+auto InputContext::getScrollHandling() const -> ScrollHandling* { return this->scrollHandling; }
+
+auto InputContext::getHandRecognition() const -> HandRecognition* { return this->handRecognition.get(); }
+
+void InputContext::setGeometryToolInputHandler(std::unique_ptr<GeometryToolInputHandler> handler) {
+    this->geometryToolInputHandler = std::move(handler);
+}
+
+auto InputContext::getGeometryToolInputHandler() const -> GeometryToolInputHandler* {
+    return geometryToolInputHandler.get();
+}
+
+void InputContext::resetGeometryToolInputHandler() { this->geometryToolInputHandler.reset(); }
+
+/**
+ * Focus the widget
+ */
+void InputContext::focusWidget() {
+    if (!gtk_widget_has_focus(widget)) {
+        gtk_widget_grab_focus(widget);
+    }
+}
+
+void InputContext::blockDevice(InputContext::DeviceType deviceType) {
+    if (geometryToolInputHandler) {
+        geometryToolInputHandler->blockDevice(deviceType);
+    }
+    switch (deviceType) {
+        case MOUSE:
+            this->mouseHandler->block(true);
+            break;
+        case STYLUS:
+            this->stylusHandler->block(true);
+            break;
+        case TOUCHSCREEN:
+            if (this->touchDrawingHandler) {
+                this->touchDrawingHandler->block(true);
+            }
+            this->touchHandler->block(true);
+            break;
+    }
+}
+
+void InputContext::unblockDevice(InputContext::DeviceType deviceType) {
+    if (geometryToolInputHandler) {
+        geometryToolInputHandler->unblockDevice(deviceType);
+    }
+    switch (deviceType) {
+        case MOUSE:
+            this->mouseHandler->block(false);
+            break;
+        case STYLUS:
+            this->stylusHandler->block(false);
+            break;
+        case TOUCHSCREEN:
+            if (this->touchDrawingHandler) {
+                this->touchDrawingHandler->block(false);
+            }
+            this->touchHandler->block(false);
+            break;
+    }
+}
+
+auto InputContext::isBlocked(InputContext::DeviceType deviceType) -> bool {
+    switch (deviceType) {
+        case MOUSE:
+            return this->mouseHandler->isBlocked();
+        case STYLUS:
+            return this->stylusHandler->isBlocked();
+        case TOUCHSCREEN:
+            return this->touchDrawingHandler && this->touchDrawingHandler->isBlocked();
+    }
+    return false;
+}
+
+void InputContext::printDebug(GdkEvent* event) {
+#ifdef DEBUG_INPUT_GDK_PRINT_EVENTS
+    gdk_set_show_events(true);
+#else
+#ifdef DEBUG_INPUT
+    auto print = [&]() {
+        GdkDevice* device = gdk_event_get_source_device(event);
+        if (device) {
+            static constexpr const char* inputClassToString[] = {"INPUT_DEVICE_MOUSE", "INPUT_DEVICE_PEN",
+                                                                 "INPUT_DEVICE_ERASER", "INPUT_DEVICE_TOUCHSCREEN",
+                                                                 "INPUT_DEVICE_IGNORE"};
+            InputDeviceClass deviceClass = InputEvents::translateDeviceType(device, this->getSettings());
+            std::cout << "Device Class:\t" << inputClassToString[deviceClass] << "\treceived:\n";
+        } else {
+            std::cout << "Device Class:\t: none (source device is NULL)\n";
+        }
+        xoj::input::printGdkEvent(std::cout, event, 0);
+    };
+
+#ifndef DEBUG_INPUT_PRINT_ALL_MOTION_EVENTS
+    static bool motionEventBlock = false;
+    if (gdk_event_get_event_type(event) == GDK_MOTION_NOTIFY) {
+        if (!motionEventBlock) {
+            motionEventBlock = true;
+            print();
+        }
+    } else {
+        motionEventBlock = false;
+        print();
+    }
+#else
+    print();
+#endif  // DEBUG_INPUT_PRINT_ALL_MOTION_EVENTS
+#endif  // DEBUG_INPUT
+#endif  // DEBUG_INPUT_PRINT_EVENTS
+}
diff --git a/entry/src/main/cpp/src/core/gui/inputdevices/InputContext.h b/entry/src/main/cpp/src/core/gui/inputdevices/InputContext.h
new file mode 100644
index 0000000..6e20e47
--- /dev/null
+++ b/entry/src/main/cpp/src/core/gui/inputdevices/InputContext.h
@@ -0,0 +1,113 @@
+/*
+ * Xournal++
+ *
+ * [Header description]
+ *
+ * @author Xournal++ Team
+ * https://github.com/xournalpp/xournalpp
+ *
+ * @license GNU GPLv2 or later
+ */
+
+#pragma once
+
+#include <functional>
+#include <memory>  // for unique_ptr
+#include <optional>
+#include <set>     // for set
+#include <string>  // for string
+
+#include <gdk/gdk.h>  // for GdkEvent, GdkModifierType
+#include <glib.h>     // for gulong
+#include <gtk/gtk.h>  // for GtkWidget
+
+#include "gui/widgets/XournalWidget.h"  // for GtkXournal
+
+class GeometryToolInputHandler;
+class KeyboardInputHandler;
+class MouseInputHandler;
+class ScrollHandling;
+class Settings;
+class StylusInputHandler;
+class ToolHandler;
+class TouchDrawingInputHandler;
+class TouchInputHandler;
+class XournalView;
+class DeviceTestingArea;
+class HandRecognition;
+
+class InputContext final {
+
+private:
+    XournalView* view;
+    ScrollHandling* scrollHandling;
+    Settings* settings;
+
+    gulong signal_id{0};
+    std::unique_ptr<StylusInputHandler> stylusHandler;
+    std::unique_ptr<MouseInputHandler> mouseHandler;
+    std::unique_ptr<TouchDrawingInputHandler> touchDrawingHandler;
+    std::unique_ptr<KeyboardInputHandler> keyboardHandler;
+    std::unique_ptr<TouchInputHandler> touchHandler;
+    std::unique_ptr<GeometryToolInputHandler> geometryToolInputHandler;
+
+    /**
+     * Helper class for Touch specific fixes
+     */
+    std::unique_ptr<HandRecognition> handRecognition;
+
+    GtkWidget* widget = nullptr;
+
+    std::set<std::string> knownDevices;
+
+public:
+    enum DeviceType {
+        MOUSE,
+        STYLUS,
+        TOUCHSCREEN,
+    };
+
+public:
+    InputContext(XournalView* view, ScrollHandling* scrollHandling);
+    ~InputContext();
+
+    /// Make an input context for testing purposes
+    InputContext(Settings* settings, DeviceTestingArea& testing);
+
+private:
+    /**
+     * Handle the events
+     * @param event The event to handle
+     * @return Whether the event was handled
+     */
+    bool handle(GdkEvent* event);
+
+    /**
+     * Print debug output
+     */
+    void printDebug(GdkEvent* event);
+
+public:
+    /**
+     * Connect the input handling to the window to receive events
+     *
+     * If logfunction is provided, it will be called on all the received events
+     */
+    void connect(GtkWidget* widget, bool connectKeyboardHandler = true,
+                 std::optional<std::function<void(GdkEvent*)>> logfunction = std::nullopt);
+
+    GtkXournal* getXournal() const;
+    XournalView* getView() const;
+    ToolHandler* getToolHandler() const;
+    Settings* getSettings() const;
+    HandRecognition* getHandRecognition() const;
+    ScrollHandling* getScrollHandling() const;
+    void setGeometryToolInputHandler(std::unique_ptr<GeometryToolInputHandler> handler);
+    GeometryToolInputHandler* getGeometryToolInputHandler() const;
+    void resetGeometryToolInputHandler();
+
+    void focusWidget();
+    void blockDevice(DeviceType deviceType);
+    void unblockDevice(DeviceType deviceType);
+    bool isBlocked(DeviceType deviceType);
+};
diff --git a/entry/src/main/cpp/src/core/gui/inputdevices/InputEvents.cpp b/entry/src/main/cpp/src/core/gui/inputdevices/InputEvents.cpp
new file mode 100644
index 0000000..5ad3575
--- /dev/null
+++ b/entry/src/main/cpp/src/core/gui/inputdevices/InputEvents.cpp
@@ -0,0 +1,111 @@
+//
+// Created by ulrich on 17.05.19.
+//
+
+#include "InputEvents.h"
+
+#include "control/settings/Settings.h"       // for Settings
+#include "control/settings/SettingsEnums.h"  // for InputDeviceTypeOption
+#include "util/Point.h"
+#include "util/gdk4_helper.h"
+
+static auto translateEventType(GdkEventType type) -> InputEventType {
+    switch (type) {
+        case GDK_MOTION_NOTIFY:
+        case GDK_TOUCH_UPDATE:
+            return MOTION_EVENT;
+        case GDK_BUTTON_PRESS:
+        case GDK_TOUCH_BEGIN:
+            return BUTTON_PRESS_EVENT;
+        case GDK_2BUTTON_PRESS:
+            return BUTTON_2_PRESS_EVENT;
+        case GDK_3BUTTON_PRESS:
+            return BUTTON_3_PRESS_EVENT;
+        case GDK_BUTTON_RELEASE:
+        case GDK_TOUCH_END:
+        case GDK_TOUCH_CANCEL:
+            return BUTTON_RELEASE_EVENT;
+        case GDK_ENTER_NOTIFY:
+            return ENTER_EVENT;
+        case GDK_LEAVE_NOTIFY:
+            return LEAVE_EVENT;
+        case GDK_PROXIMITY_IN:
+            return PROXIMITY_IN_EVENT;
+        case GDK_PROXIMITY_OUT:
+            return PROXIMITY_OUT_EVENT;
+        case GDK_SCROLL:
+            return SCROLL_EVENT;
+        case GDK_GRAB_BROKEN:
+            return GRAB_BROKEN_EVENT;
+        default:
+            // Events we do not care about or handle otherwise (e.g. key events)
+            return UNKNOWN;
+    }
+}
+
+auto InputEvents::translateDeviceType(const std::string& name, GdkInputSource source, Settings* settings)
+        -> InputDeviceClass {
+    InputDeviceTypeOption deviceType = settings->getDeviceClassForDevice(name, source);
+    switch (deviceType) {
+        case InputDeviceTypeOption::Disabled:
+            return INPUT_DEVICE_IGNORE;
+        case InputDeviceTypeOption::Mouse:
+        case InputDeviceTypeOption::MouseKeyboardCombo:
+            return INPUT_DEVICE_MOUSE;
+        case InputDeviceTypeOption::Pen:
+            return INPUT_DEVICE_PEN;
+        case InputDeviceTypeOption::Eraser:
+            return INPUT_DEVICE_ERASER;
+        case InputDeviceTypeOption::Touchscreen:
+            return INPUT_DEVICE_TOUCHSCREEN;
+        default:
+            return INPUT_DEVICE_IGNORE;
+    }
+}
+
+auto InputEvents::translateDeviceType(GdkDevice* device, Settings* settings) -> InputDeviceClass {
+    return translateDeviceType(gdk_device_get_name(device), gdk_device_get_source(device), settings);
+}
+
+auto InputEvents::translateEvent(GdkEvent* sourceEvent, Settings* settings) -> InputEvent {
+    InputEvent targetEvent{};
+
+    // Map the event type to our internal ones
+    GdkEventType sourceEventType = gdk_event_get_event_type(sourceEvent);
+    targetEvent.type = translateEventType(sourceEventType);
+
+    targetEvent.device = gdk_event_get_source_device(sourceEvent);
+    targetEvent.deviceClass = translateDeviceType(targetEvent.device, settings);
+
+    targetEvent.deviceName = gdk_device_get_name(targetEvent.device);
+    targetEvent.deviceId = DeviceId(targetEvent.device);
+
+    // Copy both coordinates of the event
+    gdk_event_get_root_coords(sourceEvent, &targetEvent.absolute.x, &targetEvent.absolute.y);
+    gdk_event_get_coords(sourceEvent, &targetEvent.relative.x, &targetEvent.relative.y);
+
+    // Copy the event button if there is any
+    if (targetEvent.type == BUTTON_PRESS_EVENT || targetEvent.type == BUTTON_RELEASE_EVENT) {
+        gdk_event_get_button(sourceEvent, &targetEvent.button);
+    }
+    if (sourceEventType == GDK_TOUCH_BEGIN || sourceEventType == GDK_TOUCH_END || sourceEventType == GDK_TOUCH_CANCEL) {
+        // As we only handle single finger events we can set the button statically to 1
+        targetEvent.button = 1;
+    }
+    targetEvent.state = gdk_event_get_modifier_state(sourceEvent);
+
+    // Copy the timestamp
+    targetEvent.timestamp = gdk_event_get_time(sourceEvent);
+
+    // Copy the pressure data
+    gdk_event_get_axis(sourceEvent, GDK_AXIS_PRESSURE, &targetEvent.pressure);
+
+    // Copy the event sequence if there is any, and report no pressure
+    if (sourceEventType == GDK_TOUCH_BEGIN || sourceEventType == GDK_TOUCH_UPDATE || sourceEventType == GDK_TOUCH_END ||
+        sourceEventType == GDK_TOUCH_CANCEL) {
+        targetEvent.sequence = gdk_event_get_event_sequence(sourceEvent);
+        targetEvent.pressure = Point::NO_PRESSURE;
+    }
+
+    return targetEvent;
+}
diff --git a/entry/src/main/cpp/src/core/gui/inputdevices/InputEvents.h b/entry/src/main/cpp/src/core/gui/inputdevices/InputEvents.h
new file mode 100644
index 0000000..2b207ad
--- /dev/null
+++ b/entry/src/main/cpp/src/core/gui/inputdevices/InputEvents.h
@@ -0,0 +1,83 @@
+/*
+ * Xournal++
+ *
+ * [Header description]
+ *
+ * @author Xournal++ Team
+ * https://github.com/xournalpp/xournalpp
+ *
+ * @license GNU GPLv2 or later
+ */
+
+#pragma once
+
+#include <string>  // for string
+
+#include <gdk/gdk.h>  // for GdkEvent, gdk_event_free, gdk_event_copy
+#include <glib.h>     // for gdouble, gchar, guint, guint32
+
+#include "model/Point.h"  // for Point::NO_PRESSURE
+#include "util/Point.h"
+
+#include "DeviceId.h"
+
+class Settings;
+
+enum InputEventType {
+    UNKNOWN,
+    BUTTON_PRESS_EVENT,
+    BUTTON_2_PRESS_EVENT,
+    BUTTON_3_PRESS_EVENT,
+    BUTTON_RELEASE_EVENT,
+    MOTION_EVENT,
+    ENTER_EVENT,
+    LEAVE_EVENT,
+    PROXIMITY_IN_EVENT,
+    PROXIMITY_OUT_EVENT,
+    SCROLL_EVENT,
+    GRAB_BROKEN_EVENT
+};
+
+enum InputDeviceClass {
+    INPUT_DEVICE_MOUSE,
+    INPUT_DEVICE_PEN,
+    INPUT_DEVICE_ERASER,
+    INPUT_DEVICE_TOUCHSCREEN,
+    INPUT_DEVICE_IGNORE
+};
+
+struct InputEvent final {
+    /*explicit(false)*/ explicit operator bool() const { return device; }
+
+    GdkDevice* device{nullptr};  ///< Source device. Avoid using if possible.
+
+    InputEventType type{UNKNOWN};
+    InputDeviceClass deviceClass{INPUT_DEVICE_IGNORE};
+    const gchar* deviceName{};
+
+    xoj::util::Point<double> absolute;  ///< In GdkSurface coordinates
+    xoj::util::Point<double> relative;  ///< In XournalWidget coordinates
+
+    guint button{0};
+    GdkModifierType state{};
+    gdouble pressure{Point::NO_PRESSURE};
+
+    GdkEventSequence* sequence{};
+    guint32 timestamp{0};
+
+    DeviceId deviceId;
+};
+
+struct KeyEvent final {
+    guint keyval{0};
+    GdkModifierType state{};  ///< Consumed modifiers have been masked out
+
+    GdkEvent* sourceEvent;  ///< Original GdkEvent. Avoid using if possible. Will be destroyed when the callback returns
+};
+
+struct InputEvents {
+    static InputDeviceClass translateDeviceType(GdkDevice* device, Settings* settings);
+    static InputDeviceClass translateDeviceType(const std::string& name, GdkInputSource source, Settings* settings);
+
+    static InputEvent translateEvent(GdkEvent* sourceEvent, Settings* settings);
+};
diff --git a/entry/src/main/cpp/src/core/gui/inputdevices/InputUtils.cpp b/entry/src/main/cpp/src/core/gui/inputdevices/InputUtils.cpp
new file mode 100644
index 0000000..e9d0cfa
--- /dev/null
+++ b/entry/src/main/cpp/src/core/gui/inputdevices/InputUtils.cpp
@@ -0,0 +1,42 @@
+#include "InputUtils.h"
+
+#include <glib.h>  // for g_message
+
+#include "control/ToolEnums.h"               // for TOOL_NONE
+#include "control/ToolHandler.h"             // for ToolHandler
+#include "control/settings/ButtonConfig.h"   // for ButtonConfig
+#include "control/settings/Settings.h"       // for Settings
+#include "control/settings/SettingsEnums.h"  // for Button, BUTTON_TOUCH
+#include "util/Assert.h"
+
+
+bool InputUtils::applyButton(ToolHandler* toolHandler, Settings* settings, Button button) {
+    // if active tool already points to the correct tool nothing needs to be done
+    if (toolHandler->pointActiveToolToButtonTool(button)) {
+        ButtonConfig* cfg = settings->getButtonConfig(button);
+
+        xoj_assert(cfg->getAction() != TOOL_NONE);
+        cfg->applyNoChangeSettings(toolHandler, button);
+        return true;
+    }
+    return false;
+}
+
+bool InputUtils::touchDrawingDisallowed(ToolHandler* toolHandler, Settings* settings) {
+    static bool warningAlreadyShown{false};
+    ButtonConfig* cfg = settings->getButtonConfig(Button::BUTTON_TOUCH);
+    if (cfg->getDisableDrawing() && cfg->getAction() == TOOL_NONE && toolHandler->isDrawingTool()) {
+        if (!warningAlreadyShown)
+            g_message("Ignoring touchscreen for drawing:\n"
+                      " Please check the settings for Touchscreen.\n"
+                      " The current combination of \"Disable Drawing for this device\"\n"
+                      " together with \"Tool - don't change\"\n"
+                      " prevents any drawing with the selected tool using the TouchScreen.");
+        warningAlreadyShown = true;
+        return true;
+    }
+    // reset warningAlreadyShown this allows the message to be sent multiple times
+    // in case the user switches the settings in between multiple times
+    warningAlreadyShown = false;
+    return false;
+}
diff --git a/entry/src/main/cpp/src/core/gui/inputdevices/InputUtils.h b/entry/src/main/cpp/src/core/gui/inputdevices/InputUtils.h
new file mode 100644
index 0000000..c6f4074
--- /dev/null
+++ b/entry/src/main/cpp/src/core/gui/inputdevices/InputUtils.h
@@ -0,0 +1,50 @@
+/**
+ * Xournal++
+ *
+ * Part of the customizable toolbars
+ *
+ * @author Xournal++ Team
+ * https://github.com/xournalpp/xournalpp
+ *
+ * @license GNU GPLv2 or later
+ * @brief Helper functions in use in the different InputHandlers as for example StylusInputHandler.h
+ */
+
+#pragma once
+
+#include "control/settings/SettingsEnums.h"
+
+// forward declaration to avoid cyclic dependencies
+class ToolHandler;
+class Settings;
+
+class InputUtils {
+public:
+    /**
+     * @brief Change the active tool based on the pressed button and its corresponding settings.
+     * In case the current tool is already selected nothing is done.
+     *
+     * @param toolHandler the toolHandler containing the tools
+     * @param settings settings storing the information for the buttons
+     * @param button the button pressed
+     * @return true if the tool was changed as a result of the function.
+     * @return false if the tool was not changed as it already was pointing to the correct tool.
+     */
+    static bool applyButton(ToolHandler* toolHandler, Settings* settings, Button button);
+
+    /**
+     * @brief Check whether touch Drawing is disallowed and warn user about this
+     * Warn the user in case all of the following are true:
+     *  1. Disable Drawing for this device is set for Touchscreen
+     *  2. Tool - don't change is set for Touchscreen
+     *  3. current Tool in the toolbar is a Drawing tool (i.e. Pen/Highlighter/Eraser)
+     * As this results in xournalpp just using the currently selected tool to draw
+     * which might be surprising to users. Hence it's logged as warning.
+     *
+     * @param toolHandler the toolHandler containing the tools
+     * @param settings settings storing the information for the buttons
+     * @return true all above conditions are met
+     * @return false any of the above conditions is false
+     */
+    static bool touchDrawingDisallowed(ToolHandler* toolHandler, Settings* settings);
+};
diff --git a/entry/src/main/cpp/src/core/gui/inputdevices/KeyboardInputHandler.cpp b/entry/src/main/cpp/src/core/gui/inputdevices/KeyboardInputHandler.cpp
new file mode 100644
index 0000000..74fcbfa
--- /dev/null
+++ b/entry/src/main/cpp/src/core/gui/inputdevices/KeyboardInputHandler.cpp
@@ -0,0 +1,17 @@
+#include "KeyboardInputHandler.h"
+
+#include "gui/XournalView.h"                        // for XournalView
+#include "gui/inputdevices/GeometryToolInputHandler.h"  // for GeometryToolInputHandler
+
+#include "InputContext.h"  // for InputContext
+#include "InputEvents.h"   // for KeyEvent
+
+KeyboardInputHandler::KeyboardInputHandler(InputContext* inputContext): inputContext(inputContext) {}
+
+KeyboardInputHandler::~KeyboardInputHandler() = default;
+
+bool KeyboardInputHandler::keyPressed(const KeyEvent& e) const { return inputContext->getView()->onKeyPressEvent(e); }
+
+bool KeyboardInputHandler::keyReleased(const KeyEvent& e) const {
+    return inputContext->getView()->onKeyReleaseEvent(e);
+}
diff --git a/entry/src/main/cpp/src/core/gui/inputdevices/KeyboardInputHandler.h b/entry/src/main/cpp/src/core/gui/inputdevices/KeyboardInputHandler.h
new file mode 100644
index 0000000..81dc570
--- /dev/null
+++ b/entry/src/main/cpp/src/core/gui/inputdevices/KeyboardInputHandler.h
@@ -0,0 +1,27 @@
+/*
+ * Xournal++
+ *
+ * [Header description]
+ *
+ * @author Xournal++ Team
+ * https://github.com/xournalpp/xournalpp
+ *
+ * @license GNU GPLv2 or later
+ */
+
+#pragma once
+
+class InputContext;
+struct KeyEvent;
+
+class KeyboardInputHandler {
+private:
+public:
+    explicit KeyboardInputHandler(InputContext* inputContext);
+    ~KeyboardInputHandler();
+    bool keyPressed(const KeyEvent& e) const;
+    bool keyReleased(const KeyEvent& e) const;
+
+private:
+    InputContext* inputContext;
+};
diff --git a/entry/src/main/cpp/src/core/gui/inputdevices/MouseInputHandler.cpp b/entry/src/main/cpp/src/core/gui/inputdevices/MouseInputHandler.cpp
new file mode 100644
index 0000000..636bc13
--- /dev/null
+++ b/entry/src/main/cpp/src/core/gui/inputdevices/MouseInputHandler.cpp
@@ -0,0 +1,157 @@
+//
+// Created by ulrich on 08.04.19.
+//
+
+#include "MouseInputHandler.h"
+
+#include "control/ToolHandler.h"               // for ToolHandler
+#include "control/settings/SettingsEnums.h"    // for Button, BUTTON_MOUSE_M...
+#include "gui/XournalView.h"                   // for XournalView
+#include "gui/XournalppCursor.h"               // for XournalppCursor
+#include "gui/inputdevices/InputEvents.h"      // for InputEvent, BUTTON_PRE...
+#include "gui/inputdevices/PenInputHandler.h"  // for PenInputHandler
+#include "gui/widgets/XournalWidget.h"         // for GtkXournal
+
+#include "InputContext.h"  // for InputContext
+#include "InputUtils.h"    // for InputUtils
+
+class Settings;
+class XojPageView;
+
+MouseInputHandler::MouseInputHandler(InputContext* inputContext): PenInputHandler(inputContext) {}
+
+MouseInputHandler::~MouseInputHandler() = default;
+
+auto MouseInputHandler::handleImpl(InputEvent const& event) -> bool {
+    // Only handle events when there is no active gesture
+    GtkXournal* xournal = inputContext->getXournal();
+
+    // Determine the pressed states of devices and associate them to the current event
+    setPressedState(event);
+
+    /*
+     * Trigger start action
+     */
+    // Trigger start of action when pen/mouse is pressed
+    if (event.type == BUTTON_PRESS_EVENT) {
+        if (pressedButton == BUTTON_NONE || !inputRunning) {
+            pressedButton = event.button;
+            this->actionStart(event);
+        } else if (event.button == pressedButton) {
+            g_warning("MouseInputHandler: Double BUTTON_PRESS_EVENT on button %u", event.button);
+        }
+        return true;
+    }
+
+    if (event.type == BUTTON_2_PRESS_EVENT || event.type == BUTTON_3_PRESS_EVENT) {
+        this->actionPerform(event);
+        return true;
+    }
+
+    /*
+     * Trigger motion actions
+     */
+    // Trigger motion action when pen/mouse is pressed and moved
+    if (event.type == MOTION_EVENT)  // mouse or pen moved
+    {
+        this->actionMotion(event);
+        XournalppCursor* cursor = xournal->view->getCursor();
+        cursor->setInvisible(false);
+        cursor->updateCursor();
+    }
+
+    // Notify if mouse enters/leaves widget
+    if (event.type == ENTER_EVENT) {
+        this->actionEnterWindow(event);
+    }
+    if (event.type == LEAVE_EVENT) {
+        // this->inputContext->unblockDevice(InputContext::TOUCHSCREEN);
+        // this->inputContext->getHandRecognition()->unblock();
+        this->actionLeaveWindow(event);
+    }
+
+    // Trigger end of action if mouse button is released
+    if (event.type == BUTTON_RELEASE_EVENT) {
+        if (event.button == pressedButton) {
+            pressedButton = BUTTON_NONE;
+            this->actionEnd(event);
+        }
+        return true;
+    }
+
+    // If we loose our Grab on the device end the current action
+    if (event.type == GRAB_BROKEN_EVENT && this->deviceClassPressed) {
+        // TODO(fabian): We may need to update pressed state manually here
+        pressedButton = BUTTON_NONE;
+        this->actionEnd(event);
+        return true;
+    }
+
+    return false;
+}
+
+void MouseInputHandler::setPressedState(InputEvent const& event) {
+    XojPageView* currentPage = getPageAtCurrentPosition(event);
+
+    this->inputContext->getXournal()->view->getCursor()->setInsidePage(currentPage != nullptr);
+
+    if (event.type == BUTTON_PRESS_EVENT)  // mouse button pressed or pen touching surface
+    {
+        this->deviceClassPressed = true;
+
+        switch (event.button) {
+            case 2:
+                this->modifier2 = true;
+                break;
+            case 3:
+                this->modifier3 = true;
+            default:
+                break;
+        }
+    }
+    if (event.type == BUTTON_RELEASE_EVENT)  // mouse button released or pen not touching surface anymore
+    {
+        this->deviceClassPressed = false;
+
+        switch (event.button) {
+            case 2:
+                this->modifier2 = false;
+                break;
+            case 3:
+                this->modifier3 = false;
+            default:
+                break;
+        }
+    }
+}
+
+auto MouseInputHandler::changeTool(InputEvent const& event) -> bool {
+    Settings* settings = this->inputContext->getSettings();
+    ToolHandler* toolHandler = this->inputContext->getToolHandler();
+    bool isClickOnSelection = this->inputContext->getXournal()->selection;
+    bool toolChanged = false;
+
+    if (!isClickOnSelection) {
+        if (modifier2) {
+            toolChanged = InputUtils::applyButton(toolHandler, settings, Button::BUTTON_MOUSE_MIDDLE);
+        } else if (modifier3) {
+            toolChanged = InputUtils::applyButton(toolHandler, settings, Button::BUTTON_MOUSE_RIGHT);
+        } else {
+            toolChanged = InputUtils::applyButton(toolHandler, settings, Button::BUTTON_MOUSE_LEFT);
+        }
+    } else {
+        toolChanged = toolHandler->pointActiveToolToToolbarTool();
+    }
+
+    if (toolChanged) {
+        ToolType toolType = toolHandler->getToolType();
+        if (toolType == TOOL_TEXT) {
+            toolHandler->selectTool(toolType);
+        }
+        toolHandler->fireToolChanged();
+    }
+
+    return true;
+}
+
+void MouseInputHandler::onBlock() {}
diff --git a/entry/src/main/cpp/src/core/gui/inputdevices/MouseInputHandler.h b/entry/src/main/cpp/src/core/gui/inputdevices/MouseInputHandler.h
new file mode 100644
index 0000000..289beaf
--- /dev/null
+++ b/entry/src/main/cpp/src/core/gui/inputdevices/MouseInputHandler.h
@@ -0,0 +1,51 @@
+/*
+ * Xournal++
+ *
+ * [Header description]
+ *
+ * @author Xournal++ Team
+ * https://github.com/xournalpp/xournalpp
+ *
+ * @license GNU GPLv2 or later
+ */
+
+#pragma once
+
+#include <glib.h>  // for guint
+
+#include "PenInputHandler.h"  // for PenInputHandler
+
+class InputContext;
+struct InputEvent;
+
+
+class MouseInputHandler: public PenInputHandler {
+private:
+    void setPressedState(InputEvent const& event);
+
+public:
+    explicit MouseInputHandler(InputContext* inputContext);
+    ~MouseInputHandler() override;
+
+    bool handleImpl(InputEvent const& event) override;
+
+    /**
+     * @brief Change the tool based on the settings and the Button pressed.
+     * In case
+     *  - no button is pressed
+     *  - or the settings for that button are "No Toolchange"
+     *  - or the click is happening on top of a selection on the canvas
+     * this function ensures that the tool selected in the toolbar remains selected.
+     *
+     * @param event
+     * @return true if tool was changed successfully
+     * @return false if tool was not changed successfully
+     */
+    bool changeTool(InputEvent const& event) override;
+    void onBlock() override;
+
+private:
+    // see button member in https://docs.gtk.org/gdk3/struct.EventButton.html
+    static constexpr guint BUTTON_NONE = 0;
+    guint pressedButton = BUTTON_NONE;
+};
diff --git a/entry/src/main/cpp/src/core/gui/inputdevices/PenInputHandler.cpp b/entry/src/main/cpp/src/core/gui/inputdevices/PenInputHandler.cpp
new file mode 100644
index 0000000..58b1763
--- /dev/null
+++ b/entry/src/main/cpp/src/core/gui/inputdevices/PenInputHandler.cpp
@@ -0,0 +1,585 @@
+//
+// Created by ulrich on 06.04.19.
+//
+
+#include "PenInputHandler.h"
+
+#include <algorithm>  // for max, min
+#include <cmath>      // for abs, atan, sqrt
+#include <thread>     // for thread
+#include <utility>    // for move
+
+#include <glib.h>     // for gdouble, gint, g_message
+#include <gtk/gtk.h>  // for gtk_adjustment_get_value
+
+#include "control/Control.h"                    // for Control
+#include "control/ToolEnums.h"                  // for TOOL_HAND, TOOL_IMAGE
+#include "control/ToolHandler.h"                // for ToolHandler
+#include "control/settings/Settings.h"          // for Settings
+#include "control/tools/CursorSelectionType.h"  // for CursorSelectionType
+#include "control/tools/EditSelection.h"        // for EditSelection
+#include "control/zoom/ZoomControl.h"           // for ZoomControl
+#include "gui/Layout.h"                         // for Layout
+#include "gui/PageView.h"                       // for XojPageView
+#include "gui/XournalView.h"                    // for XournalView
+#include "gui/XournalppCursor.h"                // for XournalppCursor
+#include "gui/scroll/ScrollHandling.h"          // for ScrollHandling
+#include "gui/widgets/XournalWidget.h"          // for GtkXournal
+#include "model/Point.h"                        // for Point, Point::NO_PRES...
+#include "util/Assert.h"                        // for xoj_assert
+#include "util/Point.h"                         // for Point
+#include "util/Util.h"                          // for execInUiThread
+#include "util/safe_casts.h"
+
+#include "AbstractInputHandler.h"  // for AbstractInputHandler
+#include "InputContext.h"          // for InputContext
+#include "PositionInputData.h"     // for PositionInputData
+#include "config-debug.h"          // for DEBUG_INPUT
+
+#define WIDGET_SCROLL_BORDER 25
+
+PenInputHandler::PenInputHandler(InputContext* inputContext): AbstractInputHandler(inputContext) {}
+
+PenInputHandler::~PenInputHandler() = default;
+
+void PenInputHandler::updateLastEvent(InputEvent const& event) {
+    if (!event) {
+        return;
+    }
+    this->lastEvent = event;
+    if (getPageAtCurrentPosition(event)) {
+        this->lastHitEvent = event;
+    }
+}
+
+void PenInputHandler::handleScrollEvent(InputEvent const& event) {
+    // use root coordinates as reference point because
+    // scrolling changes window relative coordinates
+    // see github Gnome/evince@1adce5486b10e763bed869
+
+    // GTK handles event compression/filtering differently between versions - this may be needed on certain hardware/GTK
+    // combinations.
+    if (std::abs((this->scrollStartPosition.x - event.absolute.x)) < 0.1 &&
+        std::abs((this->scrollStartPosition.y - event.absolute.y)) < 0.1) {
+        return;
+    }
+
+    if (this->scrollOffsetVector == xoj::util::Point<double>(0., 0.)) {
+        this->scrollOffsetVector = this->scrollStartPosition - event.absolute;
+
+        Util::execInUiThread([&]() {
+            this->inputContext->getXournal()->layout->scrollRelative(this->scrollOffsetVector.x,
+                                                                     this->scrollOffsetVector.y);
+
+            // Scrolling done, so reset our counters
+            this->scrollOffsetVector = xoj::util::Point<double>(0., 0.);
+        });
+
+        // Update the reference for the scroll-offset
+        this->scrollStartPosition = event.absolute;
+    }
+}
+
+auto PenInputHandler::actionStart(InputEvent const& event) -> bool {
+    this->inputContext->focusWidget();
+
+    this->lastActionStartTimeStamp = event.timestamp;
+    this->sequenceStartPosition = event.absolute;
+
+    XojPageView* currentPage = this->getPageAtCurrentPosition(event);
+    // set reference data for handling of entering/leaving page
+    this->updateLastEvent(event);
+
+    // Change the tool depending on the key
+    if (!changeTool(event))
+        return false;
+
+    // Used for pressure inference
+    this->lastPressure = 0.0;
+
+    // Flag running input
+    ToolHandler* toolHandler = this->inputContext->getToolHandler();
+    ToolType toolType = toolHandler->getToolType();
+
+    //
+    if (toolType != TOOL_IMAGE) {
+        this->inputRunning = true;
+    } else {
+        this->deviceClassPressed = false;
+    }
+
+    this->penInWidget = true;
+
+    GtkXournal* xournal = this->inputContext->getXournal();
+
+    XournalppCursor* cursor = xournal->view->getCursor();
+    cursor->setMouseDown(true);
+
+
+    // Save the starting offset when hand-tool is selected to get a reference for the scroll-offset
+    if (toolType == TOOL_HAND) {
+        this->scrollStartPosition = event.absolute;
+    }
+
+    this->sequenceStartPage = currentPage;
+
+    // hand tool don't change the selection, so you can scroll e.g. with your touchscreen without remove the selection
+    bool changeSelection = xournal->selection && toolHandler->getToolType() != TOOL_HAND;
+    if ((event.state & GDK_SHIFT_MASK)) {
+        // When tap single selection is enabled
+        if (toolHandler->supportsTapFilter() && inputContext->getSettings()->getStrokeFilterEnabled()) {
+            changeSelection = false;
+        }
+        // Selection tools does not change selection with Shift pressed
+        if (isSelectToolTypeSingleLayer(toolType)) {
+            changeSelection = false;
+        }
+    }
+    if (changeSelection) {
+        EditSelection* selection = xournal->selection;
+
+        XojPageView* view = selection->getView();
+        PositionInputData selectionPos = this->getInputDataRelativeToCurrentPage(view, event);
+
+        // Check if event modifies selection instead of page
+        CursorSelectionType selType =
+                selection->getSelectionTypeForPos(selectionPos.x, selectionPos.y, xournal->view->getZoom());
+        if (selType) {
+
+            if (selType == CURSOR_SELECTION_MOVE && modifier3) {
+                selection->copySelection();
+            }
+
+            xournal->selection->mouseDown(selType, selectionPos.x, selectionPos.y);
+            return true;
+        }
+
+        xournal->view->clearSelection();
+        changeTool(event);
+        // stop early to prevent drawing when clicking outside of the selection with the intention of deselecting
+        if (toolHandler->isDrawingTool()) {
+            return true;
+        }
+    }
+
+    // Forward event to page
+    if (currentPage) {
+        PositionInputData pos = this->getInputDataRelativeToCurrentPage(currentPage, event);
+        if (pos.pressure != Point::NO_PRESSURE) {
+            pressureMode = PressureMode::DEVICE_PRESSURE;
+        } else if (this->inputContext->getSettings()->isPressureGuessingEnabled()) {
+            pressureMode = PressureMode::INFERRED_PRESSURE;
+        } else {
+            pressureMode = PressureMode::NO_PRESSURE;
+        }
+        pos.pressure = this->filterPressure(pos, currentPage);
+
+        return currentPage->onButtonPressEvent(pos);
+    }
+
+    return true;
+}
+
+double PenInputHandler::inferPressureValue(PositionInputData const& pos, XojPageView* page) {
+    PositionInputData lastPos = getInputDataRelativeToCurrentPage(page, this->lastEvent);
+
+    double dt = (pos.timestamp - lastPos.timestamp) / 10.0;
+    double distance = xoj::util::Point<double>(pos.x, pos.y).distance(xoj::util::Point<double>(lastPos.x, lastPos.y));
+    double inverseSpeed = dt / (distance + 0.001);
+
+    // This doesn't have to be exact. Arctan is used here for its sigmoid-like shape,
+    // so that lim inverseSpeed->infinity (newPressure) is some finite value.
+    double newPressure = 3.142 / 2.0 + std::atan(inverseSpeed * 3.14 - 1.3);
+
+    // This weighted average both smooths abrupt changes in newPressure caused
+    // by changes to inverseSpeed and causes an initial increase in pressure.
+    newPressure = std::min(newPressure, 2.0) / 5.0 + this->lastPressure * 4.0 / 5.0;
+
+    // Handle the single-point case.
+    if (distance == 0) {
+        newPressure = std::sqrt(dt / 10.0) - 0.1;
+    }
+
+    this->lastPressure = newPressure;
+
+    // Final pressure tweaks...
+    return (newPressure * 1.1 + 0.8) / 2.0;
+}
+
+double PenInputHandler::filterPressure(PositionInputData const& pos, XojPageView* page) {
+    if (pressureMode == PressureMode::NO_PRESSURE) {
+        return Point::NO_PRESSURE;
+    }
+
+    double filteredPressure;
+    if (pressureMode == PressureMode::INFERRED_PRESSURE) {
+        filteredPressure = inferPressureValue(pos, page);
+    } else {
+        xoj_assert(pressureMode == PressureMode::DEVICE_PRESSURE);
+        /**
+         * On some devices, the pressure value of some events is missing. Use the last recorded pressure value then.
+         */
+        if (pos.pressure == Point::NO_PRESSURE) {
+            g_debug("Pressure-sensitive device omitted pressure this time");
+            filteredPressure = lastPressure;
+        } else {
+            filteredPressure = pos.pressure;
+            lastPressure = pos.pressure;  // Record in case the pressure value is omitted in the next event
+        }
+    }
+
+    Settings* settings = this->inputContext->getSettings();
+    xoj_assert(settings->getMinimumPressure() >= 0.01);
+    return std::max(settings->getMinimumPressure(), filteredPressure * settings->getPressureMultiplier());
+}
+
+bool PenInputHandler::isCurrentTapSelection(InputEvent const& event) const {
+    if (!inputContext->getToolHandler()->supportsTapFilter()) {
+        return false;
+    }
+
+    auto* settings = inputContext->getSettings();
+    if (!settings->getStrokeFilterEnabled()) {
+        return false;
+    }
+
+    int tapMaxDuration = 0, filterRepetitionTime = 0;
+    double tapMaxDistance = NAN;  // in mm
+
+    settings->getStrokeFilter(&tapMaxDuration, &tapMaxDistance, &filterRepetitionTime);
+
+    const double dpmm = inputContext->getView()->getControl()->getZoomControl()->getZoom100Value() *
+                        Util::DPI_NORMALIZATION_FACTOR / 25.4;
+    const double dist = this->sequenceStartPosition.distance(event.absolute);
+
+    const bool noMovement = dist < tapMaxDistance * dpmm;
+    const bool fastEnoughTap = event.timestamp - this->lastActionStartTimeStamp < as_unsigned(tapMaxDuration);
+    const bool notAnAftershock = event.timestamp - this->lastActionEndTimeStamp > as_unsigned(filterRepetitionTime);
+
+    auto* selection = inputContext->getView()->getSelection();
+    const bool notInSelectionDeleteButton = !selection || !selection->isDeleting();
+
+    return noMovement && fastEnoughTap && notAnAftershock && notInSelectionDeleteButton;
+}
+
+auto PenInputHandler::actionMotion(InputEvent const& event) -> bool {
+    /*
+     * Workaround for misbehaving devices where Enter events are not published every time
+     * This is required to disable outside scrolling again
+     */
+    gdouble eventX = event.relative.x;
+    gdouble eventY = event.relative.y;
+
+    GtkAdjustment* adjHorizontal = this->inputContext->getScrollHandling()->getHorizontal();
+    GtkAdjustment* adjVertical = this->inputContext->getScrollHandling()->getVertical();
+    double h = gtk_adjustment_get_value(adjHorizontal);
+    double v = gtk_adjustment_get_value(adjVertical);
+    eventX -= h;
+    eventY -= v;
+
+    GtkWidget* widget = gtk_widget_get_parent(this->inputContext->getView()->getWidget());
+    gint width = gtk_widget_get_allocated_width(widget);
+    gint height = gtk_widget_get_allocated_height(widget);
+
+    if (!this->penInWidget && eventX > WIDGET_SCROLL_BORDER && eventY > WIDGET_SCROLL_BORDER &&
+        eventX < width - WIDGET_SCROLL_BORDER && eventY < height - WIDGET_SCROLL_BORDER) {
+        this->penInWidget = true;
+    }
+
+
+    GtkXournal* xournal = this->inputContext->getXournal();
+    ToolHandler* toolHandler = this->inputContext->getToolHandler();
+
+    this->changeTool(event);
+
+    if (toolHandler->getToolType() == TOOL_HAND) {
+        if (this->deviceClassPressed) {
+            this->handleScrollEvent(event);
+            return true;
+        }
+        return false;
+    }
+
+    bool isShiftDown = (event.state & GDK_SHIFT_MASK);
+    bool handleSelectionMove = xournal->selection != nullptr;
+
+    if (xournal->selection && isSelectToolTypeSingleLayer(toolHandler->getToolType()) &&
+        !xournal->selection->isMoving()) {
+        if (isShiftDown || this->deviceClassPressed) {
+            handleSelectionMove = false;
+            // Cursor mode to match the multiple-selection mode
+            xournal->view->getCursor()->setMouseSelectionType(CURSOR_SELECTION_NONE);
+        }
+    }
+
+    if (handleSelectionMove) {
+        EditSelection* selection = xournal->selection;
+        XojPageView* view = selection->getView();
+
+        PositionInputData pos = this->getInputDataRelativeToCurrentPage(view, event);
+
+        if (xournal->selection->isMoving()) {
+            selection->mouseMove(pos.x, pos.y, pos.isAltDown());
+        } else if (!isShiftDown) {
+            CursorSelectionType selType = selection->getSelectionTypeForPos(pos.x, pos.y, xournal->view->getZoom());
+            xournal->view->getCursor()->setMouseSelectionType(selType);
+        }
+        return true;
+    }
+
+    // Check if page was left / entered
+    XojPageView* lastEventPage = getPageAtCurrentPosition(this->lastEvent);
+    XojPageView* lastHitEventPage = getPageAtCurrentPosition(this->lastHitEvent);
+    XojPageView* currentPage = getPageAtCurrentPosition(event);
+
+    if (!toolHandler->isSinglePageTool()) {
+        /*
+         * Get all events where the input sequence moved from one page to another without stopping the input.
+         * Only trigger once the new page was entered to ensure that an input device can leave the page temporarily.
+         * For these events we need to fake an end point in the old page and a start point in the new page.
+         */
+        if (this->deviceClassPressed && currentPage && currentPage != sequenceStartPage && lastHitEventPage) {
+#ifdef DEBUG_INPUT
+            g_message("PenInputHandler: Start new input on switching page...");
+#endif
+            this->actionEnd(this->lastHitEvent);
+            this->updateLastEvent(event);
+
+            bool result = this->actionStart(event);
+            this->updateLastEvent(event);
+            return result;
+        }
+        /*
+         * Get all events where the input sequence started outside of a page and moved into one.
+         * For these events we need to fake a start point in the current page.
+         */
+        if (this->deviceClassPressed && currentPage && !lastEventPage && !lastHitEventPage) {
+#ifdef DEBUG_INPUT
+            g_message("PenInputHandler: Start new input on entering page...");
+#endif
+            bool result = this->actionStart(event);
+            this->updateLastEvent(event);
+            return result;
+        }
+    }
+
+    // Update the cursor
+    xournal->view->getCursor()->setInsidePage(currentPage != nullptr);
+
+    // Selections and single-page elements will always work on one page so we need to handle them differently
+    if (this->sequenceStartPage && toolHandler->isSinglePageTool()) {
+        // Relay the event to the page
+        PositionInputData pos = getInputDataRelativeToCurrentPage(sequenceStartPage, event);
+
+        if (!toolHandler->acceptsOutOfPageEvents()) {
+            // Enforce input to stay within page
+            pos.x = std::clamp(pos.x, 0.0, static_cast<double>(sequenceStartPage->getDisplayWidth()));
+            pos.y = std::clamp(pos.y, 0.0, static_cast<double>(sequenceStartPage->getDisplayHeight()));
+        }
+
+        pos.pressure = this->filterPressure(pos, sequenceStartPage);
+
+        bool result = sequenceStartPage->onMotionNotifyEvent(pos);
+
+        this->updateLastEvent(event);  // Update the last position of the input device
+        return result;
+    }
+
+    if (currentPage && this->penInWidget) {
+        // Relay the event to the page
+        PositionInputData pos = getInputDataRelativeToCurrentPage(currentPage, event);
+        pos.pressure = this->filterPressure(pos, currentPage);
+
+        bool result = currentPage->onMotionNotifyEvent(pos);
+
+        this->updateLastEvent(event);  // Update the last position of the input device
+        return result;
+    }
+
+    this->updateLastEvent(event);  // Update the last position of the input device
+    return false;
+}
+
+auto PenInputHandler::actionEnd(InputEvent const& event) -> bool {
+    GtkXournal* xournal = inputContext->getXournal();
+    XournalppCursor* cursor = xournal->view->getCursor();
+    ToolHandler* toolHandler = inputContext->getToolHandler();
+    EditSelection* selection = xournal->view->getSelection();
+
+    cursor->setMouseDown(false);
+
+    bool cancelAction = isCurrentTapSelection(event);
+
+    // Holding shift (with selections) also does not imply drawing
+    if (toolHandler->supportsTapFilter()) {
+        if (inputContext->getSettings()->getStrokeFilterEnabled()) {
+            // Tapping/Clicking in the selection delete button should still delete the selection
+            cancelAction |= (event.state & GDK_SHIFT_MASK) && xournal->selection != nullptr && !selection->isDeleting();
+        }
+    }
+
+    if (cancelAction) {
+        // Cancel the sequence and trigger the necessary action
+        XojPageView* pageUnderTap = this->sequenceStartPage ? this->sequenceStartPage : getPageAtCurrentPosition(event);
+        if (pageUnderTap) {
+            PositionInputData pos = getInputDataRelativeToCurrentPage(pageUnderTap, event);
+            pageUnderTap->onSequenceCancelEvent(pos.deviceId);
+            pageUnderTap->onTapEvent(pos);
+        }
+        this->sequenceStartPage = nullptr;
+        this->inputRunning = false;
+        this->lastActionEndTimeStamp = event.timestamp;
+        return false;
+    }
+    this->lastActionEndTimeStamp = event.timestamp;
+
+    if (selection) {
+        selection->mouseUp();
+    }
+
+    // Selections and single-page elements will always work on one page so we need to handle them differently
+    if (this->sequenceStartPage && toolHandler->isSinglePageTool()) {
+        PositionInputData pos = getInputDataRelativeToCurrentPage(this->sequenceStartPage, event);
+        pos.pressure = this->filterPressure(pos, this->sequenceStartPage);
+
+        this->sequenceStartPage->onButtonReleaseEvent(pos);
+    } else {
+        // Relay the event to the page
+        XojPageView* currentPage = getPageAtCurrentPosition(event);
+
+        /*
+         * Use the last active page if you can't find a page under the cursor position.
+         * This is a workaround for input leaving the page while being active and then stopping outside.
+         */
+        if (!currentPage) {
+            if (!this->lastHitEvent) {
+                return false;
+            }
+            currentPage = getPageAtCurrentPosition(this->lastHitEvent);
+        }
+
+        if (currentPage) {
+            PositionInputData pos = getInputDataRelativeToCurrentPage(currentPage, event);
+            pos.pressure = this->filterPressure(pos, currentPage);
+
+            currentPage->onButtonReleaseEvent(pos);
+        }
+    }
+
+    // Reset the selection
+    EditSelection* tmpSelection = xournal->selection;
+    xournal->selection = nullptr;
+    this->sequenceStartPage = nullptr;
+
+    if (toolHandler->pointActiveToolToToolbarTool()) {
+        toolHandler->fireToolChanged();
+    }
+
+    // we need this workaround so it's possible to select something with the middle button
+    if (tmpSelection) {
+        xournal->view->setSelection(tmpSelection);
+    }
+
+    this->inputRunning = false;
+
+    return false;
+}
+
+void PenInputHandler::actionPerform(InputEvent const& event) {
+#ifdef DEBUG_INPUT
+    g_message("Discrete input action; modifier1=%s, modifier2=%s", this->modifier2 ? "true" : "false",
+              this->modifier3 ? "true" : "false");
+#endif
+
+    XojPageView* currentPage = this->getPageAtCurrentPosition(event);
+    if (currentPage == nullptr) {
+        return;
+    }
+
+    PositionInputData pos = this->getInputDataRelativeToCurrentPage(currentPage, event);
+    if (event.type == BUTTON_2_PRESS_EVENT) {
+        currentPage->onButtonDoublePressEvent(pos);
+    } else if (event.type == BUTTON_3_PRESS_EVENT) {
+        currentPage->onButtonTriplePressEvent(pos);
+    }
+}
+
+void PenInputHandler::actionLeaveWindow(InputEvent const& event) {
+    if (!this->penInWidget) {
+        return;
+    }
+
+    if (!this->inputContext->getSettings()->getInputSystemDrawOutsideWindowEnabled()) {
+        this->penInWidget = false;
+    }
+
+    // Stop input sequence if the tool is not a selection tool
+    ToolHandler* toolHandler = this->inputContext->getToolHandler();
+    if (this->inputRunning && !toolHandler->isSinglePageTool()) {
+        if (!this->inputContext->getSettings()->getInputSystemDrawOutsideWindowEnabled()) {
+            this->actionEnd(this->lastHitEvent);
+        }
+    } else if (this->deviceClassPressed) {
+        // scroll if we have an active selection
+        gdouble eventX = event.relative.x;
+        gdouble eventY = event.relative.y;
+
+        GtkAdjustment* adjHorizontal = this->inputContext->getScrollHandling()->getHorizontal();
+        GtkAdjustment* adjVertical = this->inputContext->getScrollHandling()->getVertical();
+        double h = gtk_adjustment_get_value(adjHorizontal);
+        double v = gtk_adjustment_get_value(adjVertical);
+        eventX -= h;
+        eventY -= v;
+
+        GtkWidget* widget = gtk_widget_get_parent(this->inputContext->getView()->getWidget());
+        gint width = gtk_widget_get_allocated_width(widget);
+        gint height = gtk_widget_get_allocated_height(widget);
+
+        new std::thread([&, eventX, eventY, width, height]() {
+            int offsetX = 0, offsetY = 0;
+
+            // TODO(fabian): make offset dependent on how big the distance between pen and view is
+            if (eventX < WIDGET_SCROLL_BORDER) {
+                offsetX = -10;
+            }
+
+            if (eventY < WIDGET_SCROLL_BORDER) {
+                offsetY = -10;
+            }
+
+            if (eventX > width - WIDGET_SCROLL_BORDER) {
+                offsetX = 10;
+            }
+
+            if (eventY > height - WIDGET_SCROLL_BORDER) {
+                offsetY = 10;
+            }
+
+#ifdef DEBUG_INPUT
+            g_message("Offset: X:%d\tY:%d", offsetX, offsetY);
+#endif
+
+            while (!this->penInWidget) {
+                Util::execInUiThread([&]() {
+                    GtkXournal* xournal = this->inputContext->getXournal();
+                    xournal->layout->scrollRelative(offsetX, offsetY);
+                });
+
+                // sleep for half a second until we scroll again
+                g_usleep(static_cast<gulong>(0.5 * G_USEC_PER_SEC));
+            }
+        });
+    }
+}
+
+void PenInputHandler::actionEnterWindow(InputEvent const& event) {
+    this->penInWidget = true;
+
+    if (!this->inputContext->getSettings()->getInputSystemDrawOutsideWindowEnabled()) {
+        // Restart input sequence if the tool is pressed and not a single-page tool
+        ToolHandler* toolHandler = this->inputContext->getToolHandler();
+        if (this->deviceClassPressed && !toolHandler->isSinglePageTool()) {
+            this->actionStart(event);
+        }
+    }
+}
diff --git a/entry/src/main/cpp/src/core/gui/inputdevices/PenInputHandler.h b/entry/src/main/cpp/src/core/gui/inputdevices/PenInputHandler.h
new file mode 100644
index 0000000..042002a
--- /dev/null
+++ b/entry/src/main/cpp/src/core/gui/inputdevices/PenInputHandler.h
@@ -0,0 +1,158 @@
+/*
+ * Xournal++
+ *
+ * [Header description]
+ *
+ * @author Xournal++ Team
+ * https://github.com/xournalpp/xournalpp
+ *
+ * @license GNU GPLv2 or later
+ */
+
+#pragma once
+
+#include "gui/inputdevices/InputEvents.h"  // for InputEvent
+#include "util/Point.h"
+
+#include "AbstractInputHandler.h"  // for AbstractInputHandler
+
+class InputContext;
+class PositionInputData;
+class XojPageView;
+
+enum class PressureMode { NO_PRESSURE, DEVICE_PRESSURE, INFERRED_PRESSURE };
+
+class PenInputHandler: public AbstractInputHandler {
+protected:
+    /**
+     * Whether the current device class has a device with button 1 in pressed state
+     */
+    bool deviceClassPressed = false;
+    /**
+     * modifier variables storing whether button 2 and 3 are pressed
+     */
+    bool modifier2 = false;
+    bool modifier3 = false;
+
+    /**
+     * Reference to the last event
+     */
+    InputEvent lastEvent{};
+
+    PressureMode pressureMode{PressureMode::NO_PRESSURE};
+
+    /**
+     * Last pressure measured or inferred.
+     */
+    double lastPressure{0.0};
+
+    /**
+     * Reference to the last event actually hitting a page
+     */
+    InputEvent lastHitEvent{};
+
+    /**
+     * Start position to reference scroll offset
+     */
+    xoj::util::Point<double> scrollStartPosition{0., 0.};
+
+    /**
+     * The scroll offset vector
+     */
+    xoj::util::Point<double> scrollOffsetVector{0., 0.};
+
+    /**
+     * Flag whether pen is within the widget
+     */
+    bool penInWidget = false;
+
+    /**
+     * Page a selection started at as we require this for motion updates
+     */
+    XojPageView* sequenceStartPage = nullptr;
+
+    /**
+     * For tap event filtering. See Preferences->Drawing Area->Action on Tool Tap
+     */
+    guint32 lastActionEndTimeStamp = 0U;
+    guint32 lastActionStartTimeStamp = 0U;
+    xoj::util::Point<double> sequenceStartPosition;
+
+public:
+    explicit PenInputHandler(InputContext* inputContext);
+    ~PenInputHandler() override;
+
+protected:
+    /**
+     * Action for the start of an input
+     * @param event The event triggering the action
+     */
+    bool actionStart(InputEvent const& event);
+
+    /**
+     * Action for motion during an input
+     * @param event The event triggering the action
+     */
+    bool actionMotion(InputEvent const& event);
+
+    /**
+     * Action for a discrete input.
+     */
+    void actionPerform(InputEvent const& event);
+
+    void actionLeaveWindow(InputEvent const& event);
+    void actionEnterWindow(InputEvent const& event);
+
+    /**
+     * Action for the end of an input
+     * @param event The event triggering the action
+     */
+    bool actionEnd(InputEvent const& event);
+
+    /**
+     * @brief Change the tool according to the InputHandler and buttons pressed
+     *
+     * @param event some Inputevent
+     * @return true if tool was changed successfully
+     * @return false if tool was not changed successfully (currently only in TouchDrawingInputHandler)
+     */
+    virtual bool changeTool(InputEvent const& event) = 0;
+
+    /**
+     * Do the scrolling with the hand tool
+     */
+    void handleScrollEvent(InputEvent const& event);
+
+    /**
+     * Stores references to the provided event in lastEvent and lastHitEvent
+     * Use this to update the references for the last event.
+     * lastHitEvent will only be updated when the event did hit a page
+     * @param event
+     */
+    void updateLastEvent(InputEvent const& event);
+
+    /**
+     * Estimate pressure based on pen speed using the previous event.
+     *
+     * @param pos The position of the current event
+     * @param page The page the event is relative to.
+     * @return The filtered pressure.
+     */
+    double inferPressureValue(PositionInputData const& pos, XojPageView* page);
+
+    /**
+     * @brief Apply filters (e.g. minimum pressure, pressure inference, etc.) to
+     * the pressure at pos.
+     *
+     * @param pos The position of the current event
+     * @param page The page the event is relative to
+     * @return The filtered pressure.
+     */
+    double filterPressure(PositionInputData const& pos, XojPageView* page);
+
+    /**
+     * @brief Detects whether the current input event is to be used as a selection
+     * rather than drawing
+     */
+    bool isCurrentTapSelection(InputEvent const& event) const;
+};
diff --git a/entry/src/main/cpp/src/core/gui/inputdevices/PositionInputData.cpp b/entry/src/main/cpp/src/core/gui/inputdevices/PositionInputData.cpp
new file mode 100644
index 0000000..0a30153
--- /dev/null
+++ b/entry/src/main/cpp/src/core/gui/inputdevices/PositionInputData.cpp
@@ -0,0 +1,7 @@
+#include "PositionInputData.h"
+
+auto PositionInputData::isShiftDown() const -> bool { return state & GDK_SHIFT_MASK; }
+
+auto PositionInputData::isControlDown() const -> bool { return state & GDK_CONTROL_MASK; }
+
+auto PositionInputData::isAltDown() const -> bool { return state & GDK_MOD1_MASK; }
diff --git a/entry/src/main/cpp/src/core/gui/inputdevices/PositionInputData.h b/entry/src/main/cpp/src/core/gui/inputdevices/PositionInputData.h
new file mode 100644
index 0000000..5bf96c4
--- /dev/null
+++ b/entry/src/main/cpp/src/core/gui/inputdevices/PositionInputData.h
@@ -0,0 +1,37 @@
+/*
+ * Xournal++
+ *
+ * Base class for device input handling
+ * Data to do an input
+ *
+ * @author Xournal++ Team
+ * https://github.com/xournalpp/xournalpp
+ *
+ * @license GNU GPLv2 or later
+ */
+
+#pragma once
+
+#include <gdk/gdk.h>  // for GdkModifierType
+#include <glib.h>     // for guint32
+
+#include "DeviceId.h"
+
+class PositionInputData {
+public:
+    bool isShiftDown() const;
+    bool isControlDown() const;
+    bool isAltDown() const;
+
+public:
+    double x;
+    double y;
+    double pressure;
+    guint32 timestamp;
+    DeviceId deviceId;
+
+    /**
+     * State flags from GDKevent (Shift down etc.)
+     */
+    GdkModifierType state;
+};
diff --git a/entry/src/main/cpp/src/core/gui/inputdevices/PrintEvent.cpp b/entry/src/main/cpp/src/core/gui/inputdevices/PrintEvent.cpp
new file mode 100644
index 0000000..cecf183
--- /dev/null
+++ b/entry/src/main/cpp/src/core/gui/inputdevices/PrintEvent.cpp
@@ -0,0 +1,172 @@
+#include "PrintEvent.h"
+
+#include <bitset>
+#include <iomanip>
+
+using namespace xoj::input;
+
+
+struct TimeToReadable {
+    guint32 ts;
+    guint32 reference;
+};
+template <typename StreamType>
+static StreamType& operator<<(StreamType& str, TimeToReadable t) {
+    if (t.ts > t.reference) {
+        static constexpr guint32 SECOND = 1000;
+        static constexpr guint32 MINUTE = 60 * SECOND;
+        static constexpr guint32 HOUR = 60 * MINUTE;
+
+        guint32 diff = t.ts - t.reference;
+        auto h = diff / HOUR;
+        auto m = (diff % HOUR) / MINUTE;
+        auto s = (diff % MINUTE) / SECOND;
+        auto ms = diff % SECOND;
+
+        auto fill = str.fill();
+        str.fill('0');
+        str << h << ":" << std::setw(2) << m << ":" << std::setw(2) << s << "." << std::setw(3) << ms;
+        str.fill(fill);
+    } else {
+        str << "Erronous value";
+    }
+    str << "  (" << t.ts << ")";
+    return str;
+}
+
+void xoj::input::printEvent(std::ostream& str, const InputEvent& e, guint32 referenceTime) {
+    static constexpr const char* deviceClassToString[] = {"INPUT_DEVICE_MOUSE", "INPUT_DEVICE_PEN",
+                                                          "INPUT_DEVICE_ERASER", "INPUT_DEVICE_TOUCHSCREEN",
+                                                          "INPUT_DEVICE_IGNORE"};
+
+    static constexpr const char* inputEventTypeToString[] = {"UNKNOWN",
+                                                             "BUTTON_PRESS_EVENT",
+                                                             "BUTTON_2_PRESS_EVENT",
+                                                             "BUTTON_3_PRESS_EVENT",
+                                                             "BUTTON_RELEASE_EVENT",
+                                                             "MOTION_EVENT",
+                                                             "ENTER_EVENT",
+                                                             "LEAVE_EVENT",
+                                                             "PROXIMITY_IN_EVENT",
+                                                             "PROXIMITY_OUT_EVENT",
+                                                             "SCROLL_EVENT",
+                                                             "GRAB_BROKEN_EVENT"};
+
+    static constexpr const char* gdkInputSources[] = {
+            "GDK_SOURCE_MOUSE",    "GDK_SOURCE_PEN",        "GDK_SOURCE_ERASER",
+            "GDK_SOURCE_CURSOR",   "GDK_SOURCE_KEYBOARD",   "GDK_SOURCE_TOUCHSCREEN",
+            "GDK_SOURCE_TOUCHPAD", "GDK_SOURCE_TRACKPOINT", "GDK_SOURCE_TABLET_PAD"};
+
+    str << "Device " << e.device << ": " << deviceClassToString[e.deviceClass] << " - Name: " << e.deviceName << "\n";
+    str << "   Timestamp: " << TimeToReadable{e.timestamp, referenceTime} << "\n";
+    str << "   GdkInputSource: " << gdkInputSources[gdk_device_get_source(e.device)] << "\n";
+    str << "   EvType: " << inputEventTypeToString[e.type] << "\n";
+    str << "   Button: " << e.button << "\n";
+    str << "   Touch Seq.: " << e.sequence << "\n";
+    str << "   x: " << e.absolute.x << "  y: " << e.absolute.y << "  pressure: " << e.pressure << "\n";
+    str << "   State: " << std::bitset<8 * sizeof(decltype(e.state))>(e.state) << std::endl;
+}
+
+void xoj::input::printGdkEvent(std::ostream& str, GdkEvent* e, guint32 referenceTime) {
+    static constexpr const char* gdkInputSources[] = {
+            "GDK_SOURCE_MOUSE      ", "GDK_SOURCE_PEN        ", "GDK_SOURCE_ERASER     ",
+            "GDK_SOURCE_CURSOR     ", "GDK_SOURCE_KEYBOARD   ", "GDK_SOURCE_TOUCHSCREEN",
+            "GDK_SOURCE_TOUCHPAD   ", "GDK_SOURCE_TRACKPOINT ", "GDK_SOURCE_TABLET_PAD "};
+
+    /// Indexes are shifted by 1 because GDK_NOTHING == -1
+    static constexpr const char* gdkEventTypeWithIndexShiftedByOne[] = {"GDK_NOTHING",
+                                                                        "GDK_DELETE",
+                                                                        "GDK_DESTROY",
+                                                                        "GDK_EXPOSE",
+                                                                        "GDK_MOTION_NOTIFY",
+                                                                        "GDK_BUTTON_PRESS",
+                                                                        "GDK_DOUBLE_BUTTON_PRESS",
+                                                                        "GDK_TRIPLE_BUTTON_PRESS",
+                                                                        "GDK_BUTTON_RELEASE",
+                                                                        "GDK_KEY_PRESS",
+                                                                        "GDK_KEY_RELEASE",
+                                                                        "GDK_ENTER_NOTIFY",
+                                                                        "GDK_LEAVE_NOTIFY",
+                                                                        "GDK_FOCUS_CHANGE",
+                                                                        "GDK_CONFIGURE",
+                                                                        "GDK_MAP",
+                                                                        "GDK_UNMAP",
+                                                                        "GDK_PROPERTY_NOTIFY",
+                                                                        "GDK_SELECTION_CLEAR",
+                                                                        "GDK_SELECTION_REQUEST",
+                                                                        "GDK_SELECTION_NOTIFY",
+                                                                        "GDK_PROXIMITY_IN",
+                                                                        "GDK_PROXIMITY_OUT",
+                                                                        "GDK_DRAG_ENTER",
+                                                                        "GDK_DRAG_LEAVE",
+                                                                        "GDK_DRAG_MOTION",
+                                                                        "GDK_DRAG_STATUS",
+                                                                        "GDK_DROP_START",
+                                                                        "GDK_DROP_FINISHED",
+                                                                        "GDK_CLIENT_EVENT",
+                                                                        "GDK_VISIBILITY_NOTIFY",
+                                                                        "UNKNOWN_GAP_IN_GDK_EVENT_TYPE_ENUM",
+                                                                        "GDK_SCROLL",
+                                                                        "GDK_WINDOW_STATE",
+                                                                        "GDK_SETTING",
+                                                                        "GDK_OWNER_CHANGE",
+                                                                        "GDK_GRAB_BROKEN",
+                                                                        "GDK_DAMAGE",
+                                                                        "GDK_TOUCH_BEGIN",
+                                                                        "GDK_TOUCH_UPDATE",
+                                                                        "GDK_TOUCH_END",
+                                                                        "GDK_TOUCH_CANCEL",
+                                                                        "GDK_TOUCHPAD_SWIPE",
+                                                                        "GDK_TOUCHPAD_PINCH",
+                                                                        "GDK_PAD_BUTTON_PRESS",
+                                                                        "GDK_PAD_BUTTON_RELEASE",
+                                                                        "GDK_PAD_RING",
+                                                                        "GDK_PAD_STRIP",
+                                                                        "GDK_PAD_GROUP_MODE"};
+
+    static constexpr const char* gdkScrollDirection[] = {
+            "GDK_SCROLL_UP", "GDK_SCROLL_DOWN", "GDK_SCROLL_LEFT", "GDK_SCROLL_RIGHT", "GDK_SCROLL_SMOOTH",
+    };
+
+    str << "Event:          " << e << "\n";
+    str << "   Timestamp:   " << TimeToReadable{gdk_event_get_time(e), referenceTime} << "\n";
+    str << "   Type:        " << gdkEventTypeWithIndexShiftedByOne[gdk_event_get_event_type(e) + 1] << "\n";
+    if (GdkDevice* d = gdk_event_get_device(e); d) {
+        str << "   Device:      " << d << " : " << gdkInputSources[gdk_device_get_source(d)] << " -- "
+            << gdk_device_get_name(d) << "\n";
+    }
+    if (GdkDevice* d = gdk_event_get_source_device(e); d) {
+        str << "   Source dev:  " << d << " : " << gdkInputSources[gdk_device_get_source(d)] << " -- "
+            << gdk_device_get_name(d) << "\n";
+    }
+    if (GdkDeviceTool* t = gdk_event_get_device_tool(e); t) {
+        str << "   DeviceTool:  " << t << "\n";
+    }
+    if (guint btn; gdk_event_get_button(e, &btn)) {
+        str << "   Button:      " << btn << "\n";
+    }
+    if (guint key; gdk_event_get_keyval(e, &key)) {
+        str << "   Key:         " << key << "\n";
+    }
+    if (guint clickcount; gdk_event_get_click_count(e, &clickcount)) {
+        str << "   Click count: " << clickcount << "\n";
+    }
+    if (auto* seq = gdk_event_get_event_sequence(e); seq) {
+        str << "   Sequence:    " << seq << "\n";
+    }
+    if (GdkModifierType state; gdk_event_get_state(e, &state)) {
+        str << "   State:       " << std::bitset<8 * sizeof(decltype(state))>(state) << std::endl;
+    }
+    if (double x, y; gdk_event_get_coords(e, &x, &y)) {
+        str << "   Coords:      " << x << "   " << y << "\n";
+    }
+    if (double p; gdk_event_get_axis(e, GDK_AXIS_PRESSURE, &p)) {
+        str << "   Pressure:    " << p << "\n";
+    }
+    if (GdkScrollDirection dir; gdk_event_get_scroll_direction(e, &dir)) {
+        str << "   ScrollDir:   " << gdkScrollDirection[dir] << "\n";
+    }
+    if (double dx, dy; gdk_event_get_scroll_deltas(e, &dx, &dy)) {
+        str << "   ScrollDelta: " << dx << "   " << dy << "\n";
+    }
+}
diff --git a/entry/src/main/cpp/src/core/gui/inputdevices/PrintEvent.h b/entry/src/main/cpp/src/core/gui/inputdevices/PrintEvent.h
new file mode 100644
index 0000000..d881532
--- /dev/null
+++ b/entry/src/main/cpp/src/core/gui/inputdevices/PrintEvent.h
@@ -0,0 +1,23 @@
+/*
+ * Xournal++
+ *
+ * [Header description]
+ *
+ * @author Xournal++ Team
+ * https://github.com/xournalpp/xournalpp
+ *
+ * @license GNU GPLv2 or later
+ */
+
+#pragma once
+
+#include <ostream>
+
+#include <gdk/gdk.h>
+
+#include "InputEvents.h"
+
+namespace xoj::input {
+void printEvent(std::ostream& str, const InputEvent& e, guint32 timeRef);
+void printGdkEvent(std::ostream& str, GdkEvent* e, guint32 timeRef);
+};  // namespace xoj::input
diff --git a/entry/src/main/cpp/src/core/gui/inputdevices/SetsquareInputHandler.cpp b/entry/src/main/cpp/src/core/gui/inputdevices/SetsquareInputHandler.cpp
new file mode 100644
index 0000000..f9399ac
--- /dev/null
+++ b/entry/src/main/cpp/src/core/gui/inputdevices/SetsquareInputHandler.cpp
@@ -0,0 +1,90 @@
+#include "SetsquareInputHandler.h"
+
+#include <memory>  // for __shared_ptr_access, shar...
+
+#include "control/Control.h"               // for Control
+#include "control/SetsquareController.h"   // for SetsquareController, HYPOTENUSE
+#include "control/ToolEnums.h"             // for TOOL_HAND, TOOL_HIGHLIGHTER
+#include "control/ToolHandler.h"           // for ToolHandler
+#include "gui/XournalView.h"               // for XournalView
+#include "gui/inputdevices/InputEvents.h"  // for InputEvent
+#include "model/Setsquare.h"               // for Setsquare::INITIAL_HEIGHT,...
+
+constexpr double MIN_HEIGHT = 4.5;
+constexpr double MAX_HEIGHT = 15.0;
+
+SetsquareInputHandler::SetsquareInputHandler(XournalView* xournal, GeometryToolController* controller):
+        GeometryToolInputHandler(xournal, controller) {}
+
+SetsquareInputHandler::~SetsquareInputHandler() noexcept = default;
+
+auto SetsquareInputHandler::handlePointer(InputEvent const& event) -> bool {
+    const auto coords = getCoords(event);
+    SetsquareController* setsquareController = static_cast<SetsquareController*>(controller);
+
+    const auto toolHandler = xournal->getControl()->getToolHandler();
+    switch (toolHandler->getToolType()) {
+        case TOOL_HIGHLIGHTER:
+        case TOOL_PEN:
+            if (event.type == BUTTON_PRESS_EVENT) {
+                if (controller->isInsideGeometryTool(coords.x, coords.y, 0) &&
+                    setsquareController->posRelToSide(HYPOTENUSE, coords.x, coords.y).y >= -0.5) {
+                    // initialize range
+                    const auto proj = setsquareController->posRelToSide(HYPOTENUSE, coords.x, coords.y).x;
+                    setsquareController->createEdgeStroke(proj);
+                    return true;
+                } else if (controller->isInsideGeometryTool(coords.x, coords.y, 0) &&
+                           (setsquareController->posRelToSide(LEFT_LEG, coords.x, coords.y).y >= -0.5 ||
+                            setsquareController->posRelToSide(RIGHT_LEG, coords.x, coords.y).y >= -0.5)) {
+
+                    // initialize point
+                    setsquareController->createRadialStroke(coords.x, coords.y);
+                    return true;
+                } else {
+                    return false;
+                }
+
+            } else if (event.type == MOTION_EVENT) {
+                // update range and paint
+                if (setsquareController->existsEdgeStroke()) {
+                    const auto proj = setsquareController->posRelToSide(HYPOTENUSE, coords.x, coords.y).x;
+                    setsquareController->updateEdgeStroke(proj);
+                    return true;
+                } else if (setsquareController->existsRadialStroke()) {
+                    setsquareController->updateRadialStroke(coords.x, coords.y);
+                    return true;
+                }
+                return false;
+            } else if (event.type == BUTTON_RELEASE_EVENT) {
+                // add stroke to layer and reset
+                if (setsquareController->existsEdgeStroke()) {
+                    setsquareController->finalizeEdgeStroke();
+                    return true;
+                } else if (setsquareController->existsRadialStroke()) {
+                    setsquareController->finalizeRadialStroke();
+                    return true;
+                }
+            }
+            return false;
+        case TOOL_HAND:
+            if (event.type == BUTTON_PRESS_EVENT) {
+                if (!controller->isInsideGeometryTool(coords.x, coords.y, 0)) {
+                    return false;
+                } else {
+                    sequenceStart(event);
+                    this->handScrolling = true;
+                    return true;
+                }
+            } else if (event.type == MOTION_EVENT && this->handScrolling) {
+                scrollMotion(event);
+                return true;
+            } else if (event.type == BUTTON_RELEASE_EVENT && this->handScrolling) {
+                this->handScrolling = false;
+            }
+        default:
+            return false;
+    }
+}
+
+auto SetsquareInputHandler::getMinHeight() const -> double { return MIN_HEIGHT; }
+auto SetsquareInputHandler::getMaxHeight() const -> double { return MAX_HEIGHT; }
diff --git a/entry/src/main/cpp/src/core/gui/inputdevices/SetsquareInputHandler.h b/entry/src/main/cpp/src/core/gui/inputdevices/SetsquareInputHandler.h
new file mode 100644
index 0000000..256a464
--- /dev/null
+++ b/entry/src/main/cpp/src/core/gui/inputdevices/SetsquareInputHandler.h
@@ -0,0 +1,40 @@
+/*
+ * Xournal++
+ *
+ * Input handler for the setsquare.
+ *
+ * @author Xournal++ Team
+ * https://github.com/xournalpp/xournalpp
+ *
+ * @license GNU GPLv2 or later
+ */
+
+#pragma once
+
+#include "GeometryToolInputHandler.h"
+
+class Stroke;
+class GeometryToolController;
+struct InputEvent;
+
+/**
+ * @brief Input handler for the setsquare
+ *
+ * Only the pointer handling (mouse / stylus) is defined in this class.
+ * The rest comes from the GeometryToolInputHandler
+ * */
+class SetsquareInputHandler: public GeometryToolInputHandler {
+
+public:
+    explicit SetsquareInputHandler(XournalView* xournalView, GeometryToolController* controller);
+    ~SetsquareInputHandler() noexcept override;
+
+private:
+    /**
+     * @brief handles input from mouse and stylus for the setsquare
+     */
+    bool handlePointer(InputEvent const& event) override;
+
+    double getMinHeight() const override;
+    double getMaxHeight() const override;
+};
diff --git a/entry/src/main/cpp/src/core/gui/inputdevices/StylusInputHandler.cpp b/entry/src/main/cpp/src/core/gui/inputdevices/StylusInputHandler.cpp
new file mode 100644
index 0000000..2e59186
--- /dev/null
+++ b/entry/src/main/cpp/src/core/gui/inputdevices/StylusInputHandler.cpp
@@ -0,0 +1,209 @@
+//
+// Created by ulrich on 08.04.19.
+//
+
+#include "StylusInputHandler.h"
+
+#include <cmath>  // for abs
+
+#include <glib.h>  // for g_message
+
+#include "control/ToolHandler.h"                 // for ToolHandler
+#include "control/settings/Settings.h"           // for Settings
+#include "control/settings/SettingsEnums.h"      // for Button, BUTTON_ERASER
+#include "gui/PageView.h"                        // for XojPageView
+#include "gui/XournalView.h"                     // for XournalView
+#include "gui/XournalppCursor.h"                 // for XournalppCursor
+#include "gui/inputdevices/HandRecognition.h"    // for HandRecognition
+#include "gui/inputdevices/InputEvents.h"        // for InputEvent, BUTTON_P...
+#include "gui/inputdevices/PenInputHandler.h"    // for PenInputHandler
+#include "gui/inputdevices/PositionInputData.h"  // for PositionInputData
+#include "gui/widgets/XournalWidget.h"           // for GtkXournal
+
+#include "InputContext.h"  // for InputContext
+#include "InputUtils.h"    // for InputUtils
+
+StylusInputHandler::StylusInputHandler(InputContext* inputContext): PenInputHandler(inputContext) {}
+
+StylusInputHandler::~StylusInputHandler() = default;
+
+auto StylusInputHandler::handleImpl(InputEvent const& event) -> bool {
+    // Only handle events when there is no active gesture
+    GtkXournal* xournal = inputContext->getXournal();
+
+    // Determine the pressed states of devices and associate them to the current event
+    setPressedState(event);
+
+    // Trigger start of action when pen/mouse is pressed
+    if (event.type == BUTTON_PRESS_EVENT) {
+
+        if (event.button == 1 || this->inputContext->getSettings()->getInputSystemTPCButtonEnabled()) {
+            this->eventsToIgnore = this->inputContext->getSettings()->getIgnoredStylusEvents();
+            if (this->eventsToIgnore > 0) {
+                this->eventsToIgnore--;  // This is already the first ignored event
+            } else {
+                this->eventsToIgnore = -1;
+                this->actionStart(event);
+            }
+            return true;
+        }
+        if (this->inputRunning) {
+            // TPCButton is disabled and modifier button was pressed
+            this->actionEnd(event);
+            this->actionStart(event);
+        } else {
+            // No input running but modifier key was pressed
+            // Change the tool depending on the key
+            changeTool(event);
+
+            XojPageView* currentPage = getPageAtCurrentPosition(event);
+            if (currentPage) {
+                PositionInputData pos = this->getInputDataRelativeToCurrentPage(currentPage, event);
+                currentPage->onButtonClickEvent(pos);
+            }
+        }
+    }
+
+    // Trigger discrete action on double tap
+    if (event.type == BUTTON_2_PRESS_EVENT || event.type == BUTTON_3_PRESS_EVENT) {
+        this->actionPerform(event);
+        return true;
+    }
+
+    // Trigger motion action when pen/mouse is pressed and moved
+    if (event.type == MOTION_EVENT)  // mouse or pen moved
+    {
+        if (this->eventsToIgnore > 0) {
+            this->eventsToIgnore--;
+        } else if (this->eventsToIgnore == 0) {
+            this->eventsToIgnore = -1;
+            this->actionStart(event);
+        } else {
+            this->actionMotion(event);
+        }
+        XournalppCursor* cursor = xournal->view->getCursor();
+        cursor->setInvisible(false);
+        cursor->updateCursor();
+    }
+
+
+    // Check if enter/leave events occur in possible locations. This is a bug of the hardware (there are such devices!)
+    if ((event.type == ENTER_EVENT || event.type == LEAVE_EVENT) && this->deviceClassPressed && this->lastEvent) {
+        if (std::abs(event.relative.x - lastEvent.relative.x) > 100 ||
+            std::abs(event.relative.y - lastEvent.relative.y) > 100) {
+            g_message("Discard impossible event - this is a sign of bugged hardware or drivers");
+            return true;
+        }
+    }
+
+    // Notify if pen enters/leaves widget
+    if (event.type == ENTER_EVENT && !this->inputRunning) {
+        this->actionEnterWindow(event);
+    }
+    if (event.type == LEAVE_EVENT) {
+        this->inputContext->getHandRecognition()->unblock();
+        this->actionLeaveWindow(event);
+    }
+
+    // Trigger end of action if pen tip leaves screen or mouse button is released
+    if (event.type == BUTTON_RELEASE_EVENT) {
+        if (event.button == 1 || this->inputContext->getSettings()->getInputSystemTPCButtonEnabled()) {
+            if (this->eventsToIgnore < 0) {
+                this->actionEnd(event);
+            } else {
+                this->eventsToIgnore = -1;
+            }
+            return true;
+        }
+        if (this->inputRunning) {
+            // TPCButton is disabled and modifier button was released
+            this->actionEnd(event);
+            this->actionStart(event);
+        } else {
+            // No input running but modifier key was pressed
+            // Change the tool depending on the key
+            changeTool(event);
+        }
+    }
+
+    // If we loose our Grab on the device end the current action
+    if (event.type == GRAB_BROKEN_EVENT && this->deviceClassPressed) {
+        // TODO(fabian): We may need to update pressed state manually here
+        this->actionEnd(event);
+        return true;
+    }
+
+    return false;
+}
+
+void StylusInputHandler::setPressedState(InputEvent const& event) {
+    XojPageView* currentPage = getPageAtCurrentPosition(event);
+
+    this->inputContext->getXournal()->view->getCursor()->setInsidePage(currentPage != nullptr);
+
+    if (event.type == BUTTON_PRESS_EVENT)  // mouse button pressed or pen touching surface
+    {
+        switch (event.button) {
+            case 1:
+                if (this->inputContext->getSettings()->getIgnoredStylusEvents() <= 0) {
+                    this->deviceClassPressed = true;
+                }
+                break;
+            case 2:
+                this->modifier2 = true;
+                break;
+            case 3:
+                this->modifier3 = true;
+            default:
+                break;
+        }
+    } else if (event.type == MOTION_EVENT) {
+        if (this->eventsToIgnore == 0) {
+            this->deviceClassPressed = true;
+        }
+    } else if (event.type == BUTTON_RELEASE_EVENT)  // mouse button released or pen not touching surface anymore
+    {
+        switch (event.button) {
+            case 1:
+                this->deviceClassPressed = false;
+                break;
+            case 2:
+                this->modifier2 = false;
+                if (this->inputContext->getSettings()->getInputSystemTPCButtonEnabled()) {
+                    this->deviceClassPressed = false;
+                }
+                break;
+            case 3:
+                this->modifier3 = false;
+                if (this->inputContext->getSettings()->getInputSystemTPCButtonEnabled()) {
+                    this->deviceClassPressed = false;
+                }
+            default:
+                break;
+        }
+    }
+}
+
+auto StylusInputHandler::changeTool(InputEvent const& event) -> bool {
+    Settings* settings = this->inputContext->getSettings();
+    ToolHandler* toolHandler = this->inputContext->getToolHandler();
+    bool toolChanged = false;
+
+    if (event.deviceClass == INPUT_DEVICE_PEN && this->modifier2)
+        toolChanged = InputUtils::applyButton(toolHandler, settings, Button::BUTTON_STYLUS_ONE);
+    else if (event.deviceClass == INPUT_DEVICE_PEN && this->modifier3)
+        toolChanged = InputUtils::applyButton(toolHandler, settings, Button::BUTTON_STYLUS_TWO);
+    else if (event.deviceClass == INPUT_DEVICE_ERASER)
+        toolChanged = InputUtils::applyButton(toolHandler, settings, Button::BUTTON_ERASER);
+    else
+        toolChanged = toolHandler->pointActiveToolToToolbarTool();
+
+    if (toolChanged) {
+        ToolType toolType = toolHandler->getToolType();
+        if (toolType == TOOL_TEXT)
+            toolHandler->selectTool(toolType);
+        toolHandler->fireToolChanged();
+    }
+
+    return true;
+}
diff --git a/entry/src/main/cpp/src/core/gui/inputdevices/StylusInputHandler.h b/entry/src/main/cpp/src/core/gui/inputdevices/StylusInputHandler.h
new file mode 100644
index 0000000..d258ce1
--- /dev/null
+++ b/entry/src/main/cpp/src/core/gui/inputdevices/StylusInputHandler.h
@@ -0,0 +1,49 @@
+/*
+ * Xournal++
+ *
+ * [Header description]
+ *
+ * @author Xournal++ Team
+ * https://github.com/xournalpp/xournalpp
+ *
+ * @license GNU GPLv2 or later
+ */
+
+#pragma once
+
+#include "PenInputHandler.h"  // for PenInputHandler
+
+class InputContext;
+struct InputEvent;
+
+class StylusInputHandler: public PenInputHandler {
+public:
+    explicit StylusInputHandler(InputContext* inputContext);
+    ~StylusInputHandler() override;
+
+    bool handleImpl(InputEvent const& event) override;
+
+    /**
+     * @brief Change the tool based on the settings and the Button pressed.
+     * In case no button is pressed or the settings for that button are "No Toolchange" this function ensures that the
+     * tool selected in the toolbar remains selected.
+     *
+     * @param event
+     * @return true if tool was changed successfully
+     * @return false if tool was not changed successfully
+     */
+    bool changeTool(InputEvent const& event) override;
+
+private:
+    /**
+     * How many events since hitting the screen with the stylus are still left to be ignored before actually starting
+     * the action. Set according to the user's setting on every button-1-press-event. Will be evaluated and then
+     * decreased by one (down to -1) on every button-1-press-event and motion-event. Set to -1 on button-1-release.\n
+     * If >0: Ignore the (button-1-press- or motion-) event\n
+     * If 0: Start the action (on the next button-1-press- or motion-event)\n
+     * If -1: Stylus not touching or action already started, handle the event normally
+     */
+    int eventsToIgnore = -1;
+
+    void setPressedState(InputEvent const& event);
+};
diff --git a/entry/src/main/cpp/src/core/gui/inputdevices/TouchDrawingInputHandler.cpp b/entry/src/main/cpp/src/core/gui/inputdevices/TouchDrawingInputHandler.cpp
new file mode 100644
index 0000000..2f34bef
--- /dev/null
+++ b/entry/src/main/cpp/src/core/gui/inputdevices/TouchDrawingInputHandler.cpp
@@ -0,0 +1,158 @@
+//
+// Created by ulrich on 08.04.19.
+//
+
+#include "TouchDrawingInputHandler.h"
+
+#include <string>  // for operator==, basic_string
+
+#include "control/Control.h"                   // for Control
+#include "control/DeviceListHelper.h"          // for getSourceMapping
+#include "control/ToolEnums.h"                 // for TOOL_HAND, ToolType
+#include "control/ToolHandler.h"               // for ToolHandler
+#include "control/settings/ButtonConfig.h"     // for ButtonConfig
+#include "control/settings/Settings.h"         // for Settings
+#include "control/settings/SettingsEnums.h"    // for BUTTON_TOUCH, Button
+#include "gui/MainWindow.h"                    // for MainWindow
+#include "gui/PageView.h"                      // for XojPageView
+#include "gui/XournalView.h"                   // for XournalView
+#include "gui/XournalppCursor.h"               // for XournalppCursor
+#include "gui/inputdevices/InputEvents.h"      // for InputEvent, BUTTON_PRE...
+#include "gui/inputdevices/PenInputHandler.h"  // for PenInputHandler
+#include "gui/widgets/XournalWidget.h"         // for GtkXournal
+
+#include "InputContext.h"  // for InputContext
+#include "InputUtils.h"    // for InputUtils
+
+TouchDrawingInputHandler::TouchDrawingInputHandler(InputContext* inputContext): PenInputHandler(inputContext) {
+    inputContext->getToolHandler()->addToolChangedListener([&](ToolType newToolType) {
+        InputDeviceClass touchscreenClass =
+                DeviceListHelper::getSourceMapping(GDK_SOURCE_TOUCHSCREEN, this->inputContext->getSettings());
+
+        // If using the touchscreen as a touchscreen...
+        if (touchscreenClass == INPUT_DEVICE_TOUCHSCREEN) {
+            updateKineticScrollingEnabled();
+        }
+    });
+}
+
+TouchDrawingInputHandler::~TouchDrawingInputHandler() = default;
+
+auto TouchDrawingInputHandler::handleImpl(InputEvent const& event) -> bool {
+    ToolHandler* toolHandler = this->inputContext->getToolHandler();
+
+    // Do we need to end the touch sequence?
+    bool mustEnd = event.type == BUTTON_RELEASE_EVENT;
+    mustEnd = mustEnd || (event.type == GRAB_BROKEN_EVENT && this->deviceClassPressed);
+
+    // Notify if finger enters/leaves widget
+    // Note: Drawing outside window doesn't seem to work
+    //  if this is put later in handleImpl.
+    if (event.type == ENTER_EVENT) {
+        this->changeTool(event);
+        this->actionEnterWindow(event);
+        return false;
+    }
+
+    if (event.type == LEAVE_EVENT) {
+        this->actionLeaveWindow(event);
+        return false;
+    }
+
+    // Multitouch
+    if ((this->primarySequence && this->primarySequence != event.sequence) || this->secondarySequence) {
+        if (!this->secondarySequence) {
+            this->secondarySequence = event.sequence;
+            XojPageView* currentPage = this->getPageAtCurrentPosition(event);
+
+            if (currentPage) {
+                currentPage->onSequenceCancelEvent(event.deviceId);
+            }
+        }
+
+        if (mustEnd) {
+            // Ending two-finger panning/zooming? We should now only have a primary sequence.
+            if (event.sequence == this->primarySequence) {
+                this->primarySequence = this->secondarySequence;
+                this->secondarySequence = nullptr;
+            } else if (event.sequence == this->secondarySequence) {
+                this->secondarySequence = nullptr;
+            }
+        }
+
+        // false lets another input handler (e.g. TouchInputHandler) handle the event.
+        return false;
+    }
+
+    // Trigger start of action when pen/mouse is pressed
+    if (event.type == BUTTON_PRESS_EVENT && this->primarySequence == nullptr) {
+        this->primarySequence = event.sequence;
+        this->deviceClassPressed = true;
+
+        this->actionStart(event);
+
+        return false;
+    }
+
+    // Trigger motion action when finger is pressed and moved,
+    // unless a hand tool, in which case, we return false to
+    // let an alternate handler (e.g. TouchInputHandler) decide
+    // what to do...
+    if (this->deviceClassPressed && event.type == MOTION_EVENT && toolHandler->getToolType() != TOOL_HAND) {
+        GtkXournal* xournal = inputContext->getXournal();
+
+        this->inputContext->getView()->getCursor()->setRotationAngle(event.relative.x);
+
+        this->actionMotion(event);
+        XournalppCursor* cursor = xournal->view->getCursor();
+        cursor->updateCursor();
+
+        return true;
+    }
+
+    if (mustEnd) {
+        this->primarySequence = nullptr;
+        this->actionEnd(event);
+
+        this->deviceClassPressed = false;
+
+        return false;  // Any alternates should also end.
+    }
+
+    return false;
+}
+
+auto TouchDrawingInputHandler::changeTool(InputEvent const& event) -> bool {
+    Settings* settings = this->inputContext->getSettings();
+    ButtonConfig* cfg = settings->getButtonConfig(Button::BUTTON_TOUCH);
+    ToolHandler* toolHandler = this->inputContext->getToolHandler();
+    bool toolChanged = false;
+
+    if (cfg->device == event.deviceName) {
+        if (InputUtils::touchDrawingDisallowed(toolHandler, settings)) {
+            return false;
+        }
+        toolChanged = InputUtils::applyButton(toolHandler, settings, Button::BUTTON_TOUCH);
+    } else {
+        toolChanged = toolHandler->pointActiveToolToToolbarTool();
+    }
+
+    this->updateKineticScrollingEnabled();
+
+    if (toolChanged) {
+        toolHandler->fireToolChanged();
+    }
+
+    return true;
+}
+
+void TouchDrawingInputHandler::updateKineticScrollingEnabled() {
+    auto* control = inputContext->getView()->getControl();
+    auto* mainWindow = control->getWindow();
+    auto* toolHandler = this->inputContext->getToolHandler();
+
+    // Kinetic scrolling is nice; however, we need to disable it so we can draw (it steals single-finger input).
+    if (mainWindow != nullptr && control->getSettings()->getTouchDrawingEnabled()) {
+        mainWindow->setGtkTouchscreenScrollingEnabled(toolHandler->getToolType() == TOOL_HAND);
+    }
+}
diff --git a/entry/src/main/cpp/src/core/gui/inputdevices/TouchDrawingInputHandler.h b/entry/src/main/cpp/src/core/gui/inputdevices/TouchDrawingInputHandler.h
new file mode 100644
index 0000000..49381bd
--- /dev/null
+++ b/entry/src/main/cpp/src/core/gui/inputdevices/TouchDrawingInputHandler.h
@@ -0,0 +1,44 @@
+/*
+ * Xournal++
+ *
+ * [Header description]
+ *
+ * @author Xournal++ Team
+ * https://github.com/xournalpp/xournalpp
+ *
+ * @license GNU GPLv2 or later
+ */
+
+#pragma once
+
+#include <gdk/gdk.h>  // for GdkEventSequence
+
+#include "PenInputHandler.h"  // for PenInputHandler
+
+class InputContext;
+struct InputEvent;
+
+class TouchDrawingInputHandler: public PenInputHandler {
+private:
+    GdkEventSequence* primarySequence = nullptr;
+    GdkEventSequence* secondarySequence = nullptr;
+
+public:
+    explicit TouchDrawingInputHandler(InputContext* inputContext);
+    ~TouchDrawingInputHandler() override;
+
+    bool handleImpl(InputEvent const& event) override;
+
+protected:
+    /**
+     * @brief Change the tool according to Touch Settings
+     *
+     * @param event some Inputevent
+     * @return true if tool was changed successfully
+     * @return false if tool was not changed successfully
+     */
+    bool changeTool(InputEvent const& event) override;
+
+private:
+    void updateKineticScrollingEnabled();
+};
diff --git a/entry/src/main/cpp/src/core/gui/inputdevices/TouchInputHandler.cpp b/entry/src/main/cpp/src/core/gui/inputdevices/TouchInputHandler.cpp
new file mode 100644
index 0000000..d1f1e16
--- /dev/null
+++ b/entry/src/main/cpp/src/core/gui/inputdevices/TouchInputHandler.cpp
@@ -0,0 +1,221 @@
+//
+// Created by ulrich on 08.04.19.
+//
+
+#include "TouchInputHandler.h"
+
+#include <cmath>  // for abs
+
+#include "control/Control.h"                        // for Control
+#include "control/settings/Settings.h"              // for Settings
+#include "control/zoom/ZoomControl.h"               // for ZoomControl
+#include "gui/Layout.h"                             // for Layout
+#include "gui/MainWindow.h"                         // for MainWindow
+#include "gui/XournalView.h"                        // for XournalView
+#include "gui/inputdevices/AbstractInputHandler.h"  // for AbstractInputHandler
+#include "gui/inputdevices/InputEvents.h"           // for InputEvent, BUTTO...
+
+#include "InputContext.h"  // for InputContext
+
+TouchInputHandler::TouchInputHandler(InputContext* inputContext): AbstractInputHandler(inputContext) {}
+
+auto TouchInputHandler::handleImpl(InputEvent const& event) -> bool {
+    if (!event.sequence) {
+        // On x11, a GDK_MOTION_EVENT with sequence == nullptr is emitted before TOUCH_BEGIN: Ignore it
+        // In general, every valid touch event must have a sequence
+        return false;
+    }
+    bool zoomGesturesEnabled = inputContext->getSettings()->isZoomGesturesEnabled();
+
+    if (event.type == BUTTON_PRESS_EVENT) {
+        if (invalidActive.find(event.sequence) != invalidActive.end()) {
+            g_warning("Missed touch end/cancel event. Resetting touch input handler.");
+            invalidActive.clear();
+        }
+        if (invalidActive.empty() && event.sequence != primarySequence && event.sequence != secondarySequence) {
+            // All touches are previously valid and we did not miss an end/cancel event for the current touch
+            if (primarySequence && secondarySequence) {
+                // All touches become invalid
+                g_debug("All touches become invalid");
+                invalidActive.insert({primarySequence, secondarySequence, event.sequence});
+                primarySequence = secondarySequence = nullptr;
+            } else {
+                if (primarySequence) {
+                    secondarySequence = event.sequence;
+                } else {
+                    primarySequence = event.sequence;
+                }
+                sequenceStart(event);
+                if (secondarySequence) {
+                    startZoomReady = true;
+                }
+            }
+        } else {
+            invalidActive.insert(event.sequence);
+            g_debug("Add touch as invalid. %zu touches are invalid now.", invalidActive.size());
+        }
+        return true;
+    }
+
+    if (event.type == MOTION_EVENT) {
+        if (primarySequence == event.sequence && !secondarySequence) {
+            scrollMotion(event);
+            return true;
+        } else if (event.sequence && (primarySequence == event.sequence || secondarySequence == event.sequence)) {
+            xoj_assert(primarySequence);
+            if (zoomGesturesEnabled) {
+                if (startZoomReady) {
+                    if (this->primarySequence == event.sequence) {
+                        sequenceStart(event);
+                        zoomStart();
+                    }
+                } else {
+                    zoomMotion(event);
+                }
+            } else {
+                scrollMotion(event);
+            }
+            return true;
+        }
+    }
+
+    if (event.type == BUTTON_RELEASE_EVENT) {
+        if (zooming && primarySequence && secondarySequence &&
+            (event.sequence == primarySequence || event.sequence == secondarySequence)) {
+            zoomEnd();
+        }
+
+        if (event.sequence == primarySequence) {
+            // If secondarySequence is nullptr, this sets primarySequence
+            // to nullptr. If it isn't, then it is now the primary sequence!
+            primarySequence = std::exchange(secondarySequence, nullptr);
+
+            this->priLastAbs = this->secLastAbs;
+            this->priLastRel = this->secLastRel;
+        } else if (event.sequence == secondarySequence) {
+            secondarySequence = nullptr;
+        } else {
+            invalidActive.erase(event.sequence);
+            g_debug("Removing sequence from invalid list, %zu inputs remain invalid.", invalidActive.size());
+        }
+        return true;
+    }
+
+    return false;
+}
+
+void TouchInputHandler::sequenceStart(InputEvent const& event) {
+    if (event.sequence == this->primarySequence) {
+        this->priLastAbs = event.absolute;
+        this->priLastRel = event.relative;
+    } else {
+        this->secLastAbs = event.absolute;
+        this->secLastRel = event.relative;
+    }
+}
+
+void TouchInputHandler::scrollMotion(InputEvent const& event) {
+    // Will only be called if there is a single sequence (zooming handles two sequences)
+    auto offset = [&]() {
+        if (event.sequence == this->primarySequence) {
+            auto offset = event.absolute - this->priLastAbs;
+            this->priLastAbs = event.absolute;
+            return offset;
+        } else {
+            auto offset = event.absolute - this->secLastAbs;
+            this->secLastAbs = event.absolute;
+            return offset;
+        }
+    }();
+
+    inputContext->getView()->getLayout()->scrollRelative(-offset.x, -offset.y);
+}
+
+void TouchInputHandler::zoomStart() {
+    this->zooming = true;
+    this->startZoomDistance = this->priLastAbs.distance(this->secLastAbs);
+
+    if (this->startZoomDistance == 0.0) {
+        this->startZoomDistance = 0.01;
+    }
+
+    // Whether we can ignore the zoom portion of the gesture (e.g. distance between touch points
+    // hasn't changed enough).
+    this->canBlockZoom = true;
+
+    ZoomControl* zoomControl = this->inputContext->getView()->getControl()->getZoomControl();
+
+    // Disable zoom fit as we are zooming currently
+    // TODO(fabian): this should happen internally!!!
+    if (zoomControl->isZoomFitMode()) {
+        zoomControl->setZoomFitMode(false);
+    }
+
+    // use screen pixel coordinates for the zoom center
+    // as relative coordinates depend on the changing zoom level
+    auto center = (this->priLastAbs + this->secLastAbs) / 2.0;
+    this->lastZoomScrollCenter = center;
+
+    // translate absolute window coordinates to the widget-local coordinates
+    const auto* mainWindow = inputContext->getView()->getControl()->getWindow();
+    const auto translation = mainWindow->getNegativeXournalWidgetPos();
+    center += translation;
+
+    zoomControl->startZoomSequence(center);
+
+    this->startZoomReady = false;
+}
+
+void TouchInputHandler::zoomMotion(InputEvent const& event) {
+    if (event.sequence == this->primarySequence) {
+        this->priLastAbs = event.absolute;
+    } else {
+        this->secLastAbs = event.absolute;
+    }
+
+    double distance = this->priLastAbs.distance(this->secLastAbs);
+    double zoom = distance / this->startZoomDistance;
+
+    double zoomTriggerThreshold = inputContext->getSettings()->getTouchZoomStartThreshold();
+    double zoomChangePercentage = std::abs(distance - startZoomDistance) / startZoomDistance * 100;
+
+    // Has the touch points moved far enough to trigger a zoom?
+    if (this->canBlockZoom && zoomChangePercentage < zoomTriggerThreshold) {
+        zoom = 1.0;
+    } else {
+        // Touches have moved far enough from their initial location that we
+        // no longer prevent touchscreen zooming.
+        this->canBlockZoom = false;
+    }
+
+    ZoomControl* zoomControl = this->inputContext->getView()->getControl()->getZoomControl();
+    const auto center = (this->priLastAbs + this->secLastAbs) / 2;
+    zoomControl->zoomSequenceChange(zoom, true, center - lastZoomScrollCenter);
+    lastZoomScrollCenter = center;
+}
+
+void TouchInputHandler::zoomEnd() {
+    this->zooming = false;
+    ZoomControl* zoomControl = this->inputContext->getView()->getControl()->getZoomControl();
+    zoomControl->endZoomSequence();
+}
+
+void TouchInputHandler::onBlock() {
+    if (this->zooming) {
+        zoomEnd();
+    }
+}
+
+void TouchInputHandler::onUnblock() {
+    this->invalidActive.clear();
+    this->primarySequence = nullptr;
+    this->secondarySequence = nullptr;
+
+    this->startZoomDistance = 0.0;
+    this->lastZoomScrollCenter = {};
+
+    priLastAbs = {-1.0, -1.0};
+    secLastAbs = {-1.0, -1.0};
+    priLastRel = {-1.0, -1.0};
+    secLastRel = {-1.0, -1.0};
+}
diff --git a/entry/src/main/cpp/src/core/gui/inputdevices/TouchInputHandler.h b/entry/src/main/cpp/src/core/gui/inputdevices/TouchInputHandler.h
new file mode 100644
index 0000000..2b14d2c
--- /dev/null
+++ b/entry/src/main/cpp/src/core/gui/inputdevices/TouchInputHandler.h
@@ -0,0 +1,61 @@
+/*
+ * Xournal++
+ *
+ * Handle touchscreen zooming and panning.
+ *
+ * @author Xournal++ Team
+ * https://github.com/xournalpp/xournalpp
+ *
+ * @license GNU GPLv2 or later
+ */
+
+#pragma once
+
+#include <set>
+
+#include <gdk/gdk.h>  // for GdkEventSequence
+
+#include "util/Point.h"  // for Point
+
+#include "AbstractInputHandler.h"  // for AbstractInputHandler
+
+class InputContext;
+struct InputEvent;
+
+class TouchInputHandler: public AbstractInputHandler {
+private:
+    bool zooming = false;
+    std::set<GdkEventSequence*> invalidActive;
+
+    GdkEventSequence* primarySequence{};
+    GdkEventSequence* secondarySequence{};
+
+    double startZoomDistance = 0.0;
+    xoj::util::Point<double> lastZoomScrollCenter{};
+
+    xoj::util::Point<double> priLastAbs{-1.0, -1.0};
+    xoj::util::Point<double> secLastAbs{-1.0, -1.0};
+
+    xoj::util::Point<double> priLastRel{-1.0, -1.0};
+    xoj::util::Point<double> secLastRel{-1.0, -1.0};
+
+    // True, if a zoom sequence may be started by a motion event.
+    bool startZoomReady{false};
+
+    bool canBlockZoom{false};
+
+private:
+    void sequenceStart(InputEvent const& event);
+    void scrollMotion(InputEvent const& event);
+    void zoomStart();
+    void zoomMotion(InputEvent const& event);
+    void zoomEnd();
+
+public:
+    explicit TouchInputHandler(InputContext* inputContext);
+    ~TouchInputHandler() override = default;
+
+    bool handleImpl(InputEvent const& event) override;
+    void onBlock() override;
+    void onUnblock() override;
+};
diff --git a/entry/src/main/cpp/src/core/gui/inputdevices/touchdisable/TouchDisableCustom.cpp b/entry/src/main/cpp/src/core/gui/inputdevices/touchdisable/TouchDisableCustom.cpp
new file mode 100644
index 0000000..44f4e30
--- /dev/null
+++ b/entry/src/main/cpp/src/core/gui/inputdevices/touchdisable/TouchDisableCustom.cpp
@@ -0,0 +1,15 @@
+#include "TouchDisableCustom.h"
+
+#include <utility>
+
+#include "util/Util.h"
+
+
+TouchDisableCustom::TouchDisableCustom(std::string enableCommand, std::string disableCommand):
+        enableCommand(std::move(enableCommand)), disableCommand(std::move(disableCommand)) {}
+
+TouchDisableCustom::~TouchDisableCustom() = default;
+
+void TouchDisableCustom::enableTouch() { Util::systemWithMessage(enableCommand.c_str()); }
+
+void TouchDisableCustom::disableTouch() { Util::systemWithMessage(disableCommand.c_str()); }
diff --git a/entry/src/main/cpp/src/core/gui/inputdevices/touchdisable/TouchDisableCustom.h b/entry/src/main/cpp/src/core/gui/inputdevices/touchdisable/TouchDisableCustom.h
new file mode 100644
index 0000000..7afda4f
--- /dev/null
+++ b/entry/src/main/cpp/src/core/gui/inputdevices/touchdisable/TouchDisableCustom.h
@@ -0,0 +1,31 @@
+/*
+ * Xournal++
+ *
+ * Interface for touch disable implementations
+ *
+ * @author Xournal++ Team
+ * https://github.com/xournalpp/xournalpp
+ *
+ * @license GNU GPLv2 or later
+ */
+
+#pragma once
+
+#include <string>  // for string
+
+#include "TouchDisableInterface.h"  // for TouchDisableInterface
+
+
+class TouchDisableCustom: public TouchDisableInterface {
+public:
+    TouchDisableCustom(std::string enableCommand, std::string disableCommand);
+    ~TouchDisableCustom() override;
+
+public:
+    void enableTouch() override;
+    void disableTouch() override;
+
+private:
+    std::string enableCommand;
+    std::string disableCommand;
+};
diff --git a/entry/src/main/cpp/src/core/gui/inputdevices/touchdisable/TouchDisableInterface.cpp b/entry/src/main/cpp/src/core/gui/inputdevices/touchdisable/TouchDisableInterface.cpp
new file mode 100644
index 0000000..7a963b7
--- /dev/null
+++ b/entry/src/main/cpp/src/core/gui/inputdevices/touchdisable/TouchDisableInterface.cpp
@@ -0,0 +1,7 @@
+#include "TouchDisableInterface.h"
+
+TouchDisableInterface::TouchDisableInterface() = default;
+
+TouchDisableInterface::~TouchDisableInterface() = default;
+
+void TouchDisableInterface::init() {}
diff --git a/entry/src/main/cpp/src/core/gui/inputdevices/touchdisable/TouchDisableInterface.h b/entry/src/main/cpp/src/core/gui/inputdevices/touchdisable/TouchDisableInterface.h
new file mode 100644
index 0000000..e9abf39
--- /dev/null
+++ b/entry/src/main/cpp/src/core/gui/inputdevices/touchdisable/TouchDisableInterface.h
@@ -0,0 +1,26 @@
+/*
+ * Xournal++
+ *
+ * Interface for touch disable implementations
+ *
+ * @author Xournal++ Team
+ * https://github.com/xournalpp/xournalpp
+ *
+ * @license GNU GPLv2 or later
+ */
+
+#pragma once
+
+
+class TouchDisableInterface {
+public:
+    TouchDisableInterface();
+    virtual ~TouchDisableInterface();
+
+public:
+    virtual void enableTouch() = 0;
+    virtual void disableTouch() = 0;
+    virtual void init();
+
+private:
+};
diff --git a/entry/src/main/cpp/src/core/gui/inputdevices/touchdisable/TouchDisableX11.cpp b/entry/src/main/cpp/src/core/gui/inputdevices/touchdisable/TouchDisableX11.cpp
new file mode 100644
index 0000000..3f51251
--- /dev/null
+++ b/entry/src/main/cpp/src/core/gui/inputdevices/touchdisable/TouchDisableX11.cpp
@@ -0,0 +1,86 @@
+#include "TouchDisableX11.h"
+
+#ifdef X11_ENABLED
+
+#include <vector>  // for vector
+
+#include <X11/Xatom.h>          // for XA_INTEGER
+#include <X11/extensions/XI.h>  // for XI_TOUCHSCREEN
+#include <gdk/gdk.h>            // for gdk_display_get_default
+#include <gdk/gdkx.h>           // for gdk_x11_display_get_xdisplay
+#include <glib.h>               // for g_message, g_warning, g_error
+
+TouchDisableX11::TouchDisableX11() = default;
+
+TouchDisableX11::~TouchDisableX11() {
+    for (auto dev: touchdevs) {
+        XCloseDevice(display, dev);
+    }
+    touchdevs.clear();
+
+    display = nullptr;
+}
+
+void TouchDisableX11::init() {
+    // Get display from GTK
+    display = gdk_x11_display_get_xdisplay(gdk_display_get_default());
+    if (display == nullptr) {
+        g_error("Could not open X11 display");
+        return;
+    }
+
+    touchAtom = XInternAtom(display, "TOUCHSCREEN", true);
+    if (touchAtom == None) {
+        touchAtom = XInternAtom(display, XI_TOUCHSCREEN, false);
+    }
+
+
+    int inputDeviceCount = 0;
+    XDeviceInfo* devices = XListInputDevices(display, &inputDeviceCount);
+    for (int i = 0; i < inputDeviceCount; i++) {
+        if (devices[i].type == touchAtom) {
+            const auto dev = XOpenDevice(display, devices[i].id);
+            if (!dev) {
+                g_warning("Failed to open touch device \"%s\"", devices[i].name);
+                continue;
+            }
+
+            g_message("X11 Touch disabler active for device \"%s\"", devices[i].name);
+            touchdevs.emplace_back(dev);
+        }
+    }
+    XFreeDeviceList(devices);
+
+    if (touchdevs.empty()) {
+        g_warning("Could not find touchscreen device for disabling");
+        return;
+    }
+
+    enabledAtom = XInternAtom(display, "Device Enabled", false);
+}
+
+void TouchDisableX11::enableTouch() {
+    if (touchdevs.empty()) {
+        return;
+    }
+
+    unsigned char value = 1;
+    for (auto dev: touchdevs) {
+        XChangeDeviceProperty(display, dev, enabledAtom, XA_INTEGER, 8, PropModeReplace, &value, 1);
+    }
+    g_message("X11 Touch enabled");
+}
+
+void TouchDisableX11::disableTouch() {
+    if (touchdevs.empty()) {
+        return;
+    }
+
+    unsigned char value = 0;
+    for (auto dev: touchdevs) {
+        XChangeDeviceProperty(display, dev, enabledAtom, XA_INTEGER, 8, PropModeReplace, &value, 1);
+    }
+    g_message("X11 Touch disabled");
+}
+
+#endif
diff --git a/entry/src/main/cpp/src/core/gui/inputdevices/touchdisable/TouchDisableX11.h b/entry/src/main/cpp/src/core/gui/inputdevices/touchdisable/TouchDisableX11.h
new file mode 100644
index 0000000..db618a8
--- /dev/null
+++ b/entry/src/main/cpp/src/core/gui/inputdevices/touchdisable/TouchDisableX11.h
@@ -0,0 +1,57 @@
+/*
+ * Xournal++
+ *
+ * Interface for touch disable implementations
+ *
+ * @author Xournal++ Team
+ * https://github.com/xournalpp/xournalpp
+ *
+ * @license GNU GPLv2 or later
+ */
+
+#pragma once
+
+#ifdef X11_ENABLED
+
+#include <vector>  // for vector
+
+#include <X11/X.h>                  // for Atom, None
+#include <X11/Xlib.h>               // for Display
+#include <X11/extensions/XInput.h>  // for XDevice, XDeviceInfo
+
+#include "TouchDisableInterface.h"  // for TouchDisableInterface
+
+
+class TouchDisableX11: public TouchDisableInterface {
+public:
+    TouchDisableX11();
+    virtual ~TouchDisableX11();
+
+public:
+    virtual void enableTouch();
+    virtual void disableTouch();
+    virtual void init();
+
+private:
+    /**
+     * X11 Display
+     */
+    Display* display = nullptr;
+
+    /**
+     * Touch device ID
+     */
+    Atom touchAtom = None;
+
+    /**
+     * Touch devices
+     */
+    std::vector<XDevice*> touchdevs;
+
+    /**
+     * Enable flag
+     */
+    Atom enabledAtom = None;
+};
+
+#endif
diff --git a/entry/src/main/cpp/src/core/gui/menus/PageTypeSelectionMenuBase.cpp b/entry/src/main/cpp/src/core/gui/menus/PageTypeSelectionMenuBase.cpp
new file mode 100644
index 0000000..f9f4a24
--- /dev/null
+++ b/entry/src/main/cpp/src/core/gui/menus/PageTypeSelectionMenuBase.cpp
@@ -0,0 +1,86 @@
+#include "PageTypeSelectionMenuBase.h"
+
+#include <algorithm>  // for find_if
+#include <iterator>
+#include <memory>
+#include <vector>
+
+#include <glib-object.h>  // for G_CALLBACK, g_sig...
+
+#include "control/pagetype/PageTypeHandler.h"       // for PageTypeInfo, Pag...
+#include "control/settings/PageTemplateSettings.h"  // for PageTemplateSettings
+#include "control/settings/Settings.h"              // for Settings
+#include "util/raii/GVariantSPtr.h"
+
+namespace {
+std::optional<PageType> getInitiallySelectedPageType(const Settings* settings) {
+    if (settings) {
+        return settings->getPageTemplateSettings().getPageInsertType();
+    }
+    return std::nullopt;
+}
+
+/**
+ * @brief Returns the action target value associated to the given page type.
+ */
+size_t findIndex(PageTypeHandler* types, const std::optional<PageType>& pt) {
+    auto find_index_of = [](const std::vector<std::unique_ptr<PageTypeInfo>>& types, const PageType& pt) {
+        auto it = std::find_if(types.begin(), types.end(), [&pt](const auto& info) { return info->page == pt; });
+        return it != types.end() ? static_cast<size_t>(std::distance(types.begin(), it)) :
+                                   PageTypeSelectionMenuBase::COPY_CURRENT_PLACEHOLDER;
+    };
+
+    return pt ? (pt->isSpecial() ?
+                         find_index_of(types->getSpecialPageTypes(), pt.value()) + types->getPageTypes().size() :
+                         find_index_of(types->getPageTypes(), pt.value())) :
+                PageTypeSelectionMenuBase::COPY_CURRENT_PLACEHOLDER;
+}
+
+GSimpleAction* createPageTypeSelectionAction(PageTypeHandler* types, const std::optional<PageType>& pt,
+                                             const std::string_view& actionName) {
+    size_t index = findIndex(types, pt);
+    return g_simple_action_new_stateful(actionName.data(), G_VARIANT_TYPE_UINT64, g_variant_new_uint64(index));
+}
+};  // namespace
+
+
+PageTypeSelectionMenuBase::PageTypeSelectionMenuBase(PageTypeHandler* typesHandler, const Settings* settings,
+                                                     const std::string_view& actionName):
+        selectedPT(getInitiallySelectedPageType(settings)),
+        typeSelectionAction(createPageTypeSelectionAction(typesHandler, selectedPT, actionName), xoj::util::adopt),
+        types(typesHandler) {
+    g_signal_connect(G_OBJECT(typeSelectionAction.get()), "change-state", G_CALLBACK(changeSelectionCallback), this);
+
+    // The GAction is not yet added to any GActionMap/GActionGroup - do it in derived classes
+}
+
+void PageTypeSelectionMenuBase::changeSelectionCallback(GSimpleAction* ga, GVariant* parameter,
+                                                        PageTypeSelectionMenuBase* self) {
+    if (g_variant_equal(parameter, xoj::util::GVariantSPtr(g_action_get_state(G_ACTION(ga)), xoj::util::adopt).get())) {
+        return;
+    }
+
+    g_simple_action_set_state(ga, parameter);
+    auto id = g_variant_get_uint64(parameter);
+    const auto& types = self->types;
+    const auto& genTypes = types->getPageTypes();
+    const auto& specialTypes = types->getSpecialPageTypes();
+
+    PageTypeInfo* info = nullptr;
+    if (id < genTypes.size()) {
+        info = genTypes[id].get();
+    } else if (id < genTypes.size() + specialTypes.size()) {
+        info = specialTypes[id - genTypes.size()].get();
+    }  // The "Copy current page" type has id == npos
+
+    self->selectedPT = info ? std::make_optional(info->page) : std::nullopt;
+    self->entrySelected(info);
+}
+
+void PageTypeSelectionMenuBase::setSelectedPT(const std::optional<PageType>& selected) {
+    if (this->selectedPT != selected) {
+        size_t index = findIndex(types, selected);
+        g_simple_action_set_state(typeSelectionAction.get(), g_variant_new_uint64(index));
+        this->selectedPT = selected;
+    }
+}
diff --git a/entry/src/main/cpp/src/core/gui/menus/PageTypeSelectionMenuBase.h b/entry/src/main/cpp/src/core/gui/menus/PageTypeSelectionMenuBase.h
new file mode 100644
index 0000000..15dbeff
--- /dev/null
+++ b/entry/src/main/cpp/src/core/gui/menus/PageTypeSelectionMenuBase.h
@@ -0,0 +1,60 @@
+/*
+ * Xournal++
+ *
+ * Handles page selection menus -- Base
+ *
+ * @author Xournal++ Team
+ * https://github.com/xournalpp/xournalpp
+ *
+ * @license GNU GPLv2 or later
+ */
+
+#pragma once
+
+#include <limits>
+#include <optional>
+#include <string_view>
+
+#include <gio/gio.h>  // for GSimpleAction
+#include <glib.h>
+
+#include "model/PageType.h"  // for PageType
+#include "util/raii/GObjectSPtr.h"
+
+class PageTypeHandler;
+class PageTypeInfo;
+class Settings;
+
+class PageTypeSelectionMenuBase {
+protected:
+    PageTypeSelectionMenuBase(PageTypeHandler* typesHandler, const Settings* settings,
+                              const std::string_view& actionName);
+    ~PageTypeSelectionMenuBase() = default;
+
+public:
+    /**
+     * @brief Set the selected page type in the menu. Does not trigger any signals but updates the radio buttons.
+     */
+    void setSelectedPT(const std::optional<PageType>& selected);
+
+private:
+    /**
+     * @brief callback subfunction
+     */
+    virtual void entrySelected(const PageTypeInfo* info) = 0;
+
+    static void changeSelectionCallback(GSimpleAction* ga, GVariant* parameter,
+                                        PageTypeSelectionMenuBase* pageTypeMenu);
+
+protected:
+    std::optional<PageType> selectedPT;
+
+    xoj::util::GObjectSPtr<GSimpleAction> typeSelectionAction;
+
+    PageTypeHandler* types;
+
+    bool changeCurrentPageUponCallback = false;
+
+public:
+    static constexpr size_t COPY_CURRENT_PLACEHOLDER = std::numeric_limits<size_t>::max();
+};
diff --git a/entry/src/main/cpp/src/core/gui/menus/StaticAssertActionNamespace.h b/entry/src/main/cpp/src/core/gui/menus/StaticAssertActionNamespace.h
new file mode 100644
index 0000000..35bdfba
--- /dev/null
+++ b/entry/src/main/cpp/src/core/gui/menus/StaticAssertActionNamespace.h
@@ -0,0 +1,52 @@
+/*
+ * Xournal++
+ *
+ * A helper class to statically assert the action namespace is correct
+ *
+ * @author Xournal++ Team
+ * https://github.com/xournalpp/xournalpp
+ *
+ * @license GNU GPLv2 or later
+ */
+
+#pragma once
+
+#include <string_view>
+
+#include "gtk/gtk.h"
+
+class MainWindow;
+
+/**
+ * @brief Returns true if the provided GAction namespace matches the provided type
+ * (i.e. "win" for GtkApplicationWindow and "app" for GtkApplication)
+ */
+template <class action_map_type>
+constexpr bool is_action_namespace_match(const char* nspace) {
+    return false;
+}
+
+template <>
+constexpr bool is_action_namespace_match<GtkWindow*>(const char* nspace) {
+    return std::string_view(nspace) == std::string_view("win.");
+}
+
+template <>
+constexpr bool is_action_namespace_match<GtkApplicationWindow*>(const char* nspace) {
+    return std::string_view(nspace) == std::string_view("win.");
+}
+
+template <>
+constexpr bool is_action_namespace_match<MainWindow*>(const char* nspace) {
+    return std::string_view(nspace) == std::string_view("win.");
+}
+
+template <>
+constexpr bool is_action_namespace_match<GtkApplication*>(const char* nspace) {
+    return std::string_view(nspace) == std::string_view("app.");
+}
+
+template <>
+constexpr bool is_action_namespace_match<GApplication*>(const char* nspace) {
+    return std::string_view(nspace) == std::string_view("app");
+}
diff --git a/entry/src/main/cpp/src/core/gui/menus/menubar/AbstractSubmenu.h b/entry/src/main/cpp/src/core/gui/menus/menubar/AbstractSubmenu.h
new file mode 100644
index 0000000..584a4ed
--- /dev/null
+++ b/entry/src/main/cpp/src/core/gui/menus/menubar/AbstractSubmenu.h
@@ -0,0 +1,26 @@
+/*
+ * Xournal++
+ *
+ * A submenu
+ *
+ * @author Xournal++ Team
+ * https://github.com/xournalpp/xournalpp
+ *
+ * @license GNU GPLv2 or later
+ */
+
+#pragma once
+
+#include "util/raii/GObjectSPtr.h"
+
+class Menubar;
+
+class Submenu {
+protected:
+    Submenu() = default;
+    ~Submenu() noexcept = default;
+
+public:
+    virtual void setDisabled(bool disabled) = 0;
+    virtual void addToMenubar(Menubar& menubar) = 0;
+};
diff --git a/entry/src/main/cpp/src/core/gui/menus/menubar/Menubar.cpp b/entry/src/main/cpp/src/core/gui/menus/menubar/Menubar.cpp
new file mode 100644
index 0000000..161b0b5
--- /dev/null
+++ b/entry/src/main/cpp/src/core/gui/menus/menubar/Menubar.cpp
@@ -0,0 +1,102 @@
+#include "Menubar.h"
+
+#include "control/Control.h"
+#include "gui/GladeSearchpath.h"
+#include "gui/MainWindow.h"
+#include "util/Assert.h"
+#include "util/XojMsgBox.h"
+#include "util/i18n.h"
+#include "util/raii/GVariantSPtr.h"
+
+#include "PageTypeSubmenu.h"
+#include "PluginsSubmenu.h"
+#include "RecentDocumentsSubmenu.h"
+#include "ToolbarSelectionSubmenu.h"
+#include "config-features.h"  // for ENABLE_PLUGINS
+
+constexpr auto MENU_XML_FILE = "mainmenubar.xml";
+constexpr auto MENU_ID = "menubar";
+constexpr auto UNDO_REDO_SECTION_ID = "sectionUndoRedo";
+
+Menubar::Menubar() = default;
+Menubar::~Menubar() noexcept = default;
+
+/// @brief Recursively removes all items with attribute "class" with value classname
+static void removeItemsWithClass(GMenu* menu, const char* classname) {
+    int N = g_menu_model_get_n_items(G_MENU_MODEL(menu));
+    for (int n = 0; n < N; ++n) {
+        xoj::util::GVariantSPtr c(
+                g_menu_model_get_item_attribute_value(G_MENU_MODEL(menu), n, "class", G_VARIANT_TYPE_STRING),
+                xoj::util::adopt);
+        if (c && std::string_view(g_variant_get_string(c.get(), nullptr)) == classname) {
+            g_menu_remove(menu, n--);
+            N--;
+        } else {
+            xoj::util::GObjectSPtr<GMenuLinkIter> it(g_menu_model_iterate_item_links(G_MENU_MODEL(menu), n),
+                                                     xoj::util::adopt);
+            while (g_menu_link_iter_next(it.get())) {
+                xoj::util::GObjectSPtr<GMenuModel> sub(g_menu_link_iter_get_value(it.get()), xoj::util::adopt);
+                if (sub && G_IS_MENU(sub.get())) {
+                    removeItemsWithClass(G_MENU(sub.get()), classname);
+                }
+            }
+        }
+    }
+}
+
+void Menubar::populate(const GladeSearchpath* gladeSearchPath, MainWindow* win) {
+    builder.reset(gtk_builder_new(), xoj::util::adopt);
+
+    auto filepath = gladeSearchPath->findFile("", MENU_XML_FILE);
+    GError* error = nullptr;
+
+    if (auto u8fp = filepath.u8string(); !gtk_builder_add_from_file(builder.get(), char_cast(u8fp.c_str()), &error)) {
+        std::string msg = FS(_F("Error loading menubar XML file (try to load \"{1}\")") % u8fp);
+
+        if (error != nullptr) {
+            msg += "\n";
+            msg += error->message;
+            g_error_free(error);
+        }
+        XojMsgBox::showErrorToUser(nullptr, msg);
+        return;
+    }
+
+    menu = G_MENU_MODEL(gtk_builder_get_object(builder.get(), MENU_ID));
+
+    Control* ctrl = win->getControl();
+
+    recentDocumentsSubmenu = std::make_unique<RecentDocumentsSubmenu>(ctrl, GTK_APPLICATION_WINDOW(win->getWindow()));
+    toolbarSelectionSubmenu =
+            std::make_unique<ToolbarSelectionSubmenu>(win, ctrl->getSettings(), win->getToolMenuHandler());
+    pageTypeSubmenu = std::make_unique<PageTypeSubmenu>(ctrl->getPageTypes(), ctrl->getPageBackgroundChangeController(),
+                                                        ctrl->getSettings(), GTK_APPLICATION_WINDOW(win->getWindow()));
+#ifdef ENABLE_PLUGINS
+    pluginsSubmenu =
+            std::make_unique<PluginsSubmenu>(ctrl->getPluginController(), GTK_APPLICATION_WINDOW(win->getWindow()));
+#endif
+
+    forEachSubmenu([&](auto& subm) { subm.addToMenubar(*this); });
+
+    if (!ctrl->getAudioController()) {
+        removeItemsWithClass(G_MENU(menu), "audio");
+    }
+
+    undoRedoSection = G_MENU(gtk_builder_get_object(builder.get(), UNDO_REDO_SECTION_ID));
+}
+
+void Menubar::setUndoDescription(const std::string& description) {
+    xoj_assert(undoRedoSection);
+    g_menu_remove(undoRedoSection, 0);
+    g_menu_prepend(undoRedoSection, description.c_str(), "win.undo");
+}
+
+void Menubar::setRedoDescription(const std::string& description) {
+    xoj_assert(undoRedoSection);
+    g_menu_remove(undoRedoSection, 1);
+    g_menu_append(undoRedoSection, description.c_str(), "win.redo");
+}
+
+void Menubar::setDisabled(bool disabled) {
+    forEachSubmenu([&](auto& subm) { subm.setDisabled(disabled); });
+}
diff --git a/entry/src/main/cpp/src/core/gui/menus/menubar/Menubar.h b/entry/src/main/cpp/src/core/gui/menus/menubar/Menubar.h
new file mode 100644
index 0000000..d250ec6
--- /dev/null
+++ b/entry/src/main/cpp/src/core/gui/menus/menubar/Menubar.h
@@ -0,0 +1,80 @@
+/*
+ * Xournal++
+ *
+ * The Main menu bar
+ *
+ * @author Xournal++ Team
+ * https://github.com/xournalpp/xournalpp
+ *
+ * @license GNU GPLv2 or later
+ */
+
+#pragma once
+
+#include <memory>
+#include <string_view>
+
+#include <gio/gio.h>  // for GMenu, GMenuItem...
+
+#include "util/raii/GObjectSPtr.h"
+
+#include "config-features.h"  // for ENABLE_PLUGINS
+
+class GladeSearchpath;
+class MainWindow;
+
+class RecentDocumentsSubmenu;
+class ToolbarSelectionSubmenu;
+class PageTypeSubmenu;
+class PluginsSubmenu;
+
+class Menubar {
+public:
+    Menubar();
+    ~Menubar() noexcept;
+
+    void populate(const GladeSearchpath* gladeSearchPath, MainWindow* win);
+
+public:
+    inline GMenuModel* getModel() const { return menu; }
+    inline ToolbarSelectionSubmenu& getToolbarSelectionSubmenu() const { return *toolbarSelectionSubmenu; }
+    inline PageTypeSubmenu& getPageTypeSubmenu() const { return *pageTypeSubmenu; }
+
+    void setDisabled(bool disabled);
+
+    void setUndoDescription(const std::string& description);
+    void setRedoDescription(const std::string& description);
+
+    template <typename gobj, typename Fun>
+    gobj* get(const std::string_view& name, Fun&& converter) const {
+        gobj* w = converter(gtk_builder_get_object(const_cast<GtkBuilder*>(builder.get()), name.data()));
+        if (w == nullptr) {
+            g_warning("Menubar::get: Could not find menu object: \"%s\"", name.data());
+        }
+        return w;
+    }
+
+private:
+    xoj::util::GObjectSPtr<GtkBuilder> builder;
+    GMenuModel* menu;  // owned by `builder`
+
+    // Dynamically created submenus -- also add to forEachSubmenu() below
+    std::unique_ptr<RecentDocumentsSubmenu> recentDocumentsSubmenu;
+    std::unique_ptr<ToolbarSelectionSubmenu> toolbarSelectionSubmenu;
+    std::unique_ptr<PageTypeSubmenu> pageTypeSubmenu;
+#ifdef ENABLE_PLUGINS
+    std::unique_ptr<PluginsSubmenu> pluginsSubmenu;
+#endif
+
+    template <class Fun>
+    void forEachSubmenu(Fun&& fun) {
+        fun(*recentDocumentsSubmenu);
+        fun(*toolbarSelectionSubmenu);
+        fun(*pageTypeSubmenu);
+#ifdef ENABLE_PLUGINS
+        fun(*pluginsSubmenu);
+#endif
+    }
+
+    GMenu* undoRedoSection;  // owned by `builder`
+};
diff --git a/entry/src/main/cpp/src/core/gui/menus/menubar/PageTypeSubmenu.cpp b/entry/src/main/cpp/src/core/gui/menus/menubar/PageTypeSubmenu.cpp
new file mode 100644
index 0000000..d81380e
--- /dev/null
+++ b/entry/src/main/cpp/src/core/gui/menus/menubar/PageTypeSubmenu.cpp
@@ -0,0 +1,93 @@
+#include "PageTypeSubmenu.h"
+
+#include <memory>  // for unique_ptr
+#include <optional>
+#include <string>  // for string
+#include <vector>
+
+#include <glib-object.h>  // for G_CALLBACK, g_sig...
+
+#include "control/PageBackgroundChangeController.h"
+#include "control/pagetype/PageTypeHandler.h"  // for PageTypeInfo, Pag...
+#include "gui/menus/StaticAssertActionNamespace.h"
+#include "util/i18n.h"  // for _
+#include "util/raii/GVariantSPtr.h"
+
+#include "Menubar.h"
+
+namespace {
+static constexpr auto G_ACTION_NAMESPACE = "win.";
+static constexpr auto SELECTION_ACTION_NAME = "menu.pick-page-type";
+static constexpr auto APPLY_ALL_ACTION_NAME = "menu.apply-current-page-type-to-all-pages";
+static constexpr auto SUBMENU_ID = "menuJournalPaperBackground";
+
+auto createPageTypesSection(const std::vector<std::unique_ptr<PageTypeInfo>>& pageTypes, size_t index) {
+    GMenu* menu = g_menu_new();
+
+    // Todo(c++20) constexpr this
+    std::string actionName = G_ACTION_NAMESPACE;
+    actionName += SELECTION_ACTION_NAME;
+
+    for (auto& pageInfo: pageTypes) {
+        xoj::util::GObjectSPtr<GMenuItem> item(g_menu_item_new(pageInfo->name.c_str(), nullptr), xoj::util::adopt);
+        g_menu_item_set_action_and_target_value(item.get(), actionName.c_str(),
+                                                xoj::util::makeGVariantSPtr(index++).get());
+        g_menu_append_item(menu, item.get());
+    }
+    return xoj::util::GObjectSPtr<GMenu>(menu, xoj::util::adopt);
+}
+
+auto createApplyToAllPagesSection() {
+    GMenu* menu = g_menu_new();
+
+    // Todo(c++20) constexpr this
+    std::string actionName = G_ACTION_NAMESPACE;
+    actionName += APPLY_ALL_ACTION_NAME;
+
+    g_menu_append(menu, _("Apply to all pages"), actionName.c_str());
+    return xoj::util::GObjectSPtr<GMenu>(menu, xoj::util::adopt);
+}
+};  // namespace
+
+
+PageTypeSubmenu::PageTypeSubmenu(PageTypeHandler* typesHandler, PageBackgroundChangeController* controller,
+                                 const Settings* settings, GtkApplicationWindow* win):
+        PageTypeSelectionMenuBase(typesHandler, settings, SELECTION_ACTION_NAME),
+        controller(controller),
+        generatedPageTypesSection(createPageTypesSection(typesHandler->getPageTypes(), 0)),
+        specialPageTypesSection(
+                createPageTypesSection(typesHandler->getSpecialPageTypes(), typesHandler->getPageTypes().size())),
+        applyToAllPagesSection(createApplyToAllPagesSection()),
+        applyToAllPagesAction(g_simple_action_new(APPLY_ALL_ACTION_NAME, nullptr), xoj::util::adopt) {
+
+    this->changeCurrentPageUponCallback = true;
+
+    static_assert(is_action_namespace_match<decltype(win)>(G_ACTION_NAMESPACE));
+
+    g_action_map_add_action(G_ACTION_MAP(win), G_ACTION(typeSelectionAction.get()));
+    g_action_map_add_action(G_ACTION_MAP(win), G_ACTION(applyToAllPagesAction.get()));
+
+    g_signal_connect(G_OBJECT(applyToAllPagesAction.get()), "activate",
+                     G_CALLBACK(+[](GSimpleAction*, GVariant*, PageBackgroundChangeController* controller) {
+                         controller->applyCurrentPageBackgroundToAll();
+                     }),
+                     this->controller);
+}
+
+void PageTypeSubmenu::setDisabled(bool disabled) {
+    g_simple_action_set_enabled(typeSelectionAction.get(), !disabled);
+    g_simple_action_set_enabled(applyToAllPagesAction.get(), !disabled);
+}
+
+void PageTypeSubmenu::addToMenubar(Menubar& menubar) {
+    GMenu* submenu = menubar.get<GMenu>(SUBMENU_ID, [](auto* p) { return G_MENU(p); });
+    g_menu_append_section(submenu, nullptr, G_MENU_MODEL(generatedPageTypesSection.get()));
+    g_menu_append_section(submenu, nullptr, G_MENU_MODEL(specialPageTypesSection.get()));
+    g_menu_append_section(submenu, nullptr, G_MENU_MODEL(applyToAllPagesSection.get()));
+}
+
+void PageTypeSubmenu::entrySelected(const PageTypeInfo*) {
+    if (this->selectedPT && this->controller) {
+        this->controller->changeCurrentPageBackground(this->selectedPT.value());
+    }
+}
diff --git a/entry/src/main/cpp/src/core/gui/menus/menubar/PageTypeSubmenu.h b/entry/src/main/cpp/src/core/gui/menus/menubar/PageTypeSubmenu.h
new file mode 100644
index 0000000..ba96e6b
--- /dev/null
+++ b/entry/src/main/cpp/src/core/gui/menus/menubar/PageTypeSubmenu.h
@@ -0,0 +1,43 @@
+/*
+ * Xournal++
+ *
+ * Handles page selection menu
+ *
+ * @author Xournal++ Team
+ * https://github.com/xournalpp/xournalpp
+ *
+ * @license GNU GPLv2 or later
+ */
+
+#pragma once
+
+#include <gio/gio.h>  // for GMenu, GSimpleAction
+
+#include "gui/menus/PageTypeSelectionMenuBase.h"
+#include "util/raii/GObjectSPtr.h"
+
+#include "AbstractSubmenu.h"
+
+class PageTypeHandler;
+class Settings;
+class PageBackgroundChangeController;
+
+class PageTypeSubmenu final: public Submenu, public PageTypeSelectionMenuBase {
+public:
+    PageTypeSubmenu(PageTypeHandler* typesHandler, PageBackgroundChangeController* controller, const Settings* settings,
+                    GtkApplicationWindow* win);
+    ~PageTypeSubmenu() = default;
+
+    void setDisabled(bool disabled) override;
+    void addToMenubar(Menubar& menubar) override;
+
+private:
+    void entrySelected(const PageTypeInfo*) override;
+
+    PageBackgroundChangeController* controller;
+
+    xoj::util::GObjectSPtr<GMenu> generatedPageTypesSection;
+    xoj::util::GObjectSPtr<GMenu> specialPageTypesSection;
+    xoj::util::GObjectSPtr<GMenu> applyToAllPagesSection;
+    xoj::util::GObjectSPtr<GSimpleAction> applyToAllPagesAction;
+};
diff --git a/entry/src/main/cpp/src/core/gui/menus/menubar/PluginsSubmenu.cpp b/entry/src/main/cpp/src/core/gui/menus/menubar/PluginsSubmenu.cpp
new file mode 100644
index 0000000..3799644
--- /dev/null
+++ b/entry/src/main/cpp/src/core/gui/menus/menubar/PluginsSubmenu.cpp
@@ -0,0 +1,33 @@
+#include "PluginsSubmenu.h"
+
+#include "plugin/PluginController.h"
+#include "util/Assert.h"
+#include "util/i18n.h"
+
+#include "Menubar.h"
+
+/// position of the plugin submenu, from the end of the menu bar: 1 means just before the last one (About)
+static constexpr int POSITION_IN_MENUBAR_FROM_END = 1;
+
+PluginsSubmenu::PluginsSubmenu(PluginController* pluginController, GtkApplicationWindow* win):
+        submenu(g_menu_new(), xoj::util::adopt) {
+    xoj::util::GObjectSPtr<GMenu> firstSection(g_menu_new(), xoj::util::adopt);
+    g_menu_append(firstSection.get(), _("Plugin Manager"), "win.plugin-manager");
+
+    g_menu_append_section(submenu.get(), nullptr, G_MENU_MODEL(firstSection.get()));
+
+    for (auto* section: pluginController->createMenuSections(win)) {
+        g_menu_append_section(submenu.get(), nullptr, section);
+    }
+}
+
+void PluginsSubmenu::setDisabled(bool disabled) {
+    // TODO!!
+}
+
+void PluginsSubmenu::addToMenubar(Menubar& menubar) {
+    GMenuModel* mainmenu = menubar.getModel();
+    int insertionPlace = g_menu_model_get_n_items(mainmenu) - POSITION_IN_MENUBAR_FROM_END;
+    xoj_assert(insertionPlace >= 0);
+    g_menu_insert_submenu(G_MENU(mainmenu), insertionPlace, _("Plugin"), G_MENU_MODEL(submenu.get()));
+}
diff --git a/entry/src/main/cpp/src/core/gui/menus/menubar/PluginsSubmenu.h b/entry/src/main/cpp/src/core/gui/menus/menubar/PluginsSubmenu.h
new file mode 100644
index 0000000..c2f0d1f
--- /dev/null
+++ b/entry/src/main/cpp/src/core/gui/menus/menubar/PluginsSubmenu.h
@@ -0,0 +1,34 @@
+/*
+ * Xournal++
+ *
+ * Submenu listing plugins
+ *
+ * @author Xournal++ Team
+ * https://github.com/xournalpp/xournalpp
+ *
+ * @license GNU GPLv2 or later
+ */
+
+#pragma once
+
+#include <vector>
+
+#include <gio/gio.h>
+#include <gtk/gtk.h>
+
+#include "AbstractSubmenu.h"
+
+class PluginController;
+
+class PluginsSubmenu final: public Submenu {
+public:
+    PluginsSubmenu(PluginController* pluginController, GtkApplicationWindow* win);
+    ~PluginsSubmenu() noexcept = default;
+
+public:
+    void setDisabled(bool disabled) override;
+    void addToMenubar(Menubar& menubar) override;
+
+private:
+    xoj::util::GObjectSPtr<GMenu> submenu;
+};
diff --git a/entry/src/main/cpp/src/core/gui/menus/menubar/RecentDocumentsSubmenu.cpp b/entry/src/main/cpp/src/core/gui/menus/menubar/RecentDocumentsSubmenu.cpp
new file mode 100644
index 0000000..4ee869e
--- /dev/null
+++ b/entry/src/main/cpp/src/core/gui/menus/menubar/RecentDocumentsSubmenu.cpp
@@ -0,0 +1,231 @@
+#include "RecentDocumentsSubmenu.h"
+
+#include <string>  // for string, allocator, operator+
+
+#include <gio/gio.h>  // for GMenu
+
+#include "control/Control.h"
+#include "control/RecentManager.h"
+#include "gui/menus/StaticAssertActionNamespace.h"
+#include "util/Assert.h"
+#include "util/PathUtil.h"           // for fromUri, toUri, hasPdfFileExt
+#include "util/PlaceholderString.h"  // for PlaceholderString
+#include "util/StringUtils.h"        // for replace_pair, StringUtils
+#include "util/TinyVector.h"         // for TinyVector
+#include "util/i18n.h"               // for FS, FORMAT_STR, C_F
+
+#include "Menubar.h"
+
+namespace {
+constexpr auto SUBMENU_ID = "menuFileRecent";
+constexpr auto G_ACTION_NAMESPACE = "win.";
+constexpr auto OPEN_ACTION_NAME = "open-file-at";
+constexpr auto REMOVE_ACTION_NAME = "remove-file-at";
+
+/**
+ * @brief For a disable placeholder saying "No recent files"
+ *  To disable a GMenu entry, give it an action name that does not correspond to any GAction
+ */
+constexpr auto DISABLED_ACTION_NAME = "always-disabled-action";
+constexpr auto CLEAR_LIST_ACTION_NAME = "clear-recent-files";
+
+void recentManagerChangedCallback(GtkRecentManager* /*manager*/, RecentDocumentsSubmenu* recentDocsSubmenu) {
+    recentDocsSubmenu->updateMenu();
+}
+
+void clearRecentFilesCallback(GSimpleAction*, GVariant*, gpointer) { RecentManager::clearRecentFiles(); }
+
+auto createRecentMenuItem(const GtkRecentInfo* info, size_t i) {
+    std::string display_name = gtk_recent_info_get_display_name(const_cast<GtkRecentInfo*>(info));
+
+    // escape underscore
+    StringUtils::replaceAllChars(display_name, {replace_pair('_', "__")});
+    std::string label = FS(FORMAT_STR("{1}. {2}") % (i + 1) % display_name);
+
+    std::string action = G_ACTION_NAMESPACE;
+    action += OPEN_ACTION_NAME;
+    action += "(uint64 ";
+    action += std::to_string(i);
+    action += ")";
+
+    return xoj::util::GObjectSPtr<GMenuItem>(g_menu_item_new(label.c_str(), action.c_str()), xoj::util::adopt);
+}
+
+auto createRemoveMenuItem(const GtkRecentInfo* info, size_t i) {
+    std::string display_name = gtk_recent_info_get_display_name(const_cast<GtkRecentInfo*>(info));
+
+    // escape underscore
+    StringUtils::replaceAllChars(display_name, {replace_pair('_', "__")});
+    std::string label =
+            FS(FORMAT_STR("{1}. {2} {3}") % (i + 1) %
+               C_("The selected document will be removed from the recent files list", "Dismiss") % display_name);
+
+    std::string action = G_ACTION_NAMESPACE;
+    action += REMOVE_ACTION_NAME;
+    action += "(uint64 ";
+    action += std::to_string(i);
+    action += ")";
+
+    return xoj::util::GObjectSPtr<GMenuItem>(g_menu_item_new(label.c_str(), action.c_str()), xoj::util::adopt);
+}
+
+template <typename container>
+auto createRecentMenu(const container& recentFiles, size_t start_index) -> xoj::util::GObjectSPtr<GMenu> {
+    if (recentFiles.empty()) {
+        return nullptr;
+    }
+    GMenu* menu = g_menu_new();
+
+    for (auto& recent: recentFiles) {
+        g_menu_append_item(menu, createRecentMenuItem(recent.get(), start_index++).get());
+    }
+    return xoj::util::GObjectSPtr<GMenu>(menu, xoj::util::adopt);
+}
+
+template <typename container>
+auto createRemoveSubmenu(const container& recentFiles, size_t start_index) -> xoj::util::GObjectSPtr<GMenu> {
+    if (recentFiles.empty()) {
+        return nullptr;
+    }
+    GMenu* menu = g_menu_new();
+
+    for (auto& recent: recentFiles) {
+        g_menu_append_item(menu, createRemoveMenuItem(recent.get(), start_index++).get());
+    }
+
+    return xoj::util::GObjectSPtr<GMenu>(menu, xoj::util::adopt);
+}
+
+auto createEmptyListPlaceholder() {
+    return xoj::util::GObjectSPtr<GMenuItem>(g_menu_item_new(_("No recent files"), DISABLED_ACTION_NAME),
+                                             xoj::util::adopt);
+}
+
+auto createClearListSection() {
+    // Todo(cpp20): constexpr this concatenation
+    std::string action = G_ACTION_NAMESPACE;
+    action += CLEAR_LIST_ACTION_NAME;
+
+    GMenu* menu = g_menu_new();
+    g_menu_append(menu, _("Clear list"), action.c_str());
+
+    return xoj::util::GObjectSPtr<GMenu>(menu, xoj::util::adopt);
+}
+}  // namespace
+
+RecentDocumentsSubmenu::RecentDocumentsSubmenu(Control* control, GtkApplicationWindow* win): control(control) {
+    GtkRecentManager* recentManager = gtk_recent_manager_get_default();
+    this->recentHandlerId = g_signal_connect(recentManager, "changed", G_CALLBACK(recentManagerChangedCallback), this);
+
+    if (!win) {
+        g_warning("RecentDocumentsSubmenu::RecentDocumentsSubmenu: no GtkApplicationWindow provided. Cannot push the "
+                  "appropriate GAction.");
+    } else {
+        static_assert(is_action_namespace_match<decltype(win)>(G_ACTION_NAMESPACE));
+
+        openFileAction.reset(g_simple_action_new(OPEN_ACTION_NAME, G_VARIANT_TYPE_UINT64), xoj::util::adopt);
+        g_signal_connect(G_OBJECT(openFileAction.get()), "activate", G_CALLBACK(openFileCallback), this);
+        g_action_map_add_action(G_ACTION_MAP(win), G_ACTION(openFileAction.get()));
+
+        clearListAction.reset(g_simple_action_new(CLEAR_LIST_ACTION_NAME, nullptr), xoj::util::adopt);
+        g_signal_connect(G_OBJECT(clearListAction.get()), "activate", G_CALLBACK(clearRecentFilesCallback), nullptr);
+        g_action_map_add_action(G_ACTION_MAP(win), G_ACTION(clearListAction.get()));
+
+        removeFileAction.reset(g_simple_action_new(REMOVE_ACTION_NAME, G_VARIANT_TYPE_UINT64), xoj::util::adopt);
+        g_signal_connect(G_OBJECT(removeFileAction.get()), "activate", G_CALLBACK(removeFileCallback), this);
+        g_action_map_add_action(G_ACTION_MAP(win), G_ACTION(removeFileAction.get()));
+    }
+}
+
+RecentDocumentsSubmenu::~RecentDocumentsSubmenu() {
+    if (this->recentHandlerId) {
+        GtkRecentManager* recentManager = gtk_recent_manager_get_default();
+        g_signal_handler_disconnect(recentManager, this->recentHandlerId);
+        this->recentHandlerId = 0;
+    }
+}
+
+void RecentDocumentsSubmenu::updateMenu() {
+    auto fileList = RecentManager::getRecentFiles();
+
+    xoppFiles.clear();
+    std::transform(fileList.recentXoppFiles.begin(), fileList.recentXoppFiles.end(), std::back_inserter(xoppFiles),
+                   [](auto& info) { return Util::fromUri(gtk_recent_info_get_uri(info.get())).value(); });
+    pdfFiles.clear();
+    std::transform(fileList.recentPdfFiles.begin(), fileList.recentPdfFiles.end(), std::back_inserter(pdfFiles),
+                   [](auto& info) { return Util::fromUri(gtk_recent_info_get_uri(info.get())).value(); });
+
+    this->menuXoppFiles = createRecentMenu(fileList.recentXoppFiles, 0);
+    this->menuPdfFiles = createRecentMenu(fileList.recentPdfFiles, fileList.recentXoppFiles.size());
+
+    xoj_assert(recentFilesSubmenu);
+    g_menu_remove_all(recentFilesSubmenu.get());
+
+    if (this->menuXoppFiles) {
+        g_menu_append_section(recentFilesSubmenu.get(), nullptr, G_MENU_MODEL(this->menuXoppFiles.get()));
+    }
+    if (this->menuPdfFiles) {
+        g_menu_append_section(recentFilesSubmenu.get(), nullptr, G_MENU_MODEL(this->menuPdfFiles.get()));
+    }
+    if (this->menuXoppFiles || this->menuPdfFiles) {
+        g_menu_append_section(recentFilesSubmenu.get(), nullptr, G_MENU_MODEL(createClearListSection().get()));
+    }
+
+    if (!fileList.recentXoppFiles.empty() || !fileList.recentPdfFiles.empty()) {
+        GMenu* removeSubmenu = g_menu_new();
+
+        if (!fileList.recentXoppFiles.empty()) {
+            auto removeXoppMenu = createRemoveSubmenu(fileList.recentXoppFiles, 0);
+            g_menu_append_section(removeSubmenu,
+                                  C_("In the submenu for removing recent documents, this will display on top of the "
+                                     "list xournal++ files to separate them from PDF files",
+                                     "Xournal++ Files"),
+                                  G_MENU_MODEL(removeXoppMenu.get()));
+        }
+
+        if (!fileList.recentPdfFiles.empty()) {
+            auto removePdfMenu = createRemoveSubmenu(fileList.recentPdfFiles, fileList.recentXoppFiles.size());
+            g_menu_append_section(removeSubmenu,
+                                  C_("In the submenu for removing recent documents, this will display on top of the "
+                                     "list PDF files to separate them from xournal++ files",
+                                     "PDF Files"),
+                                  G_MENU_MODEL(removePdfMenu.get()));
+        }
+
+        GMenuItem* removeSubmenuItem =
+                g_menu_item_new_submenu(C_("This opens a submenu of the recent files list, and clicking on individual "
+                                           "entries in this submenu will remove it from the recent files list",
+                                           "Dismiss a single document"),
+                                        G_MENU_MODEL(removeSubmenu));
+        g_menu_append_item(recentFilesSubmenu.get(), removeSubmenuItem);
+
+        g_object_unref(removeSubmenu);
+    } else {
+        g_menu_append_item(recentFilesSubmenu.get(), createEmptyListPlaceholder().get());
+    }
+}
+
+void RecentDocumentsSubmenu::addToMenubar(Menubar& menubar) {
+    recentFilesSubmenu.reset(menubar.get<GMenu>(SUBMENU_ID, [](auto* p) { return G_MENU(p); }), xoj::util::ref);
+    updateMenu();
+}
+
+void RecentDocumentsSubmenu::setDisabled(bool disabled) {
+    g_simple_action_set_enabled(openFileAction.get(), !disabled);
+    g_simple_action_set_enabled(clearListAction.get(), !disabled);
+}
+
+void RecentDocumentsSubmenu::openFileCallback(GSimpleAction* ga, GVariant* parameter, RecentDocumentsSubmenu* self) {
+    auto index = g_variant_get_uint64(parameter);
+    auto& path =
+            index < self->xoppFiles.size() ? self->xoppFiles[index] : self->pdfFiles[index - self->xoppFiles.size()];
+    self->control->openFile(path);
+}
+
+void RecentDocumentsSubmenu::removeFileCallback(GSimpleAction* ga, GVariant* parameter, RecentDocumentsSubmenu* self) {
+    auto index = g_variant_get_uint64(parameter);
+    auto& path =
+            index < self->xoppFiles.size() ? self->xoppFiles[index] : self->pdfFiles[index - self->xoppFiles.size()];
+    RecentManager::removeRecentFileFilename(path);
+    self->updateMenu();
+}
diff --git a/entry/src/main/cpp/src/core/gui/menus/menubar/RecentDocumentsSubmenu.h b/entry/src/main/cpp/src/core/gui/menus/menubar/RecentDocumentsSubmenu.h
new file mode 100644
index 0000000..9d8f3cd
--- /dev/null
+++ b/entry/src/main/cpp/src/core/gui/menus/menubar/RecentDocumentsSubmenu.h
@@ -0,0 +1,74 @@
+/*
+ * Xournal++
+ *
+ * The recent opened files
+ *
+ * @author Xournal++ Team
+ * https://github.com/xournalpp/xournalpp
+ *
+ * @license GNU GPLv2 or later
+ */
+
+#pragma once
+
+#include <gio/gio.h>  // for GMenu
+#include <glib.h>     // for gulong
+#include <gtk/gtk.h>
+
+#include "control/RecentManager.h"
+#include "util/raii/GObjectSPtr.h"
+
+#include "AbstractSubmenu.h"
+
+class Control;
+class Menubar;
+
+/**
+ * @brief Handles the GtkMenu displaying the recent files
+ */
+class RecentDocumentsSubmenu final: public Submenu {
+public:
+    RecentDocumentsSubmenu(Control* control, GtkApplicationWindow* win);
+    ~RecentDocumentsSubmenu();
+
+    /**
+     * Updates the menu of recent files
+     */
+    void updateMenu();
+
+    void setDisabled(bool disabled) override;
+    void addToMenubar(Menubar& menubar) override;
+
+private:
+    static void openFileCallback(GSimpleAction* ga, GVariant* parameter, RecentDocumentsSubmenu* self);
+    static void removeFileCallback(GSimpleAction* ga, GVariant* parameter, RecentDocumentsSubmenu* self);
+
+    gulong recentHandlerId{};
+
+    TinyVector<fs::path, RecentManager::MAX_RECENT> xoppFiles;
+    TinyVector<fs::path, RecentManager::MAX_RECENT> pdfFiles;
+    Control* control;
+
+    /**
+     * Keep one menu for each section!
+     * Using a single menu with two sections does not work: when adding this to the suitable submenu in the main
+     * menubar, it would give
+     * <submenu>
+     *  <section>
+     *   <section>
+     *    ...
+     *   </section>
+     *   <section>
+     *    ...
+     *   </section>
+     *  </section>
+     * </submenu>
+     * and the section separator does not appear in this case...
+     */
+    xoj::util::GObjectSPtr<GMenu> recentFilesSubmenu;
+    xoj::util::GObjectSPtr<GMenu> menuXoppFiles;
+    xoj::util::GObjectSPtr<GMenu> menuPdfFiles;
+    xoj::util::GObjectSPtr<GSimpleAction> openFileAction;
+    xoj::util::GObjectSPtr<GSimpleAction> clearListAction;
+    xoj::util::GObjectSPtr<GSimpleAction> removeFileAction;
+};
diff --git a/entry/src/main/cpp/src/core/gui/menus/menubar/ToolbarSelectionSubmenu.cpp b/entry/src/main/cpp/src/core/gui/menus/menubar/ToolbarSelectionSubmenu.cpp
new file mode 100644
index 0000000..72a5397
--- /dev/null
+++ b/entry/src/main/cpp/src/core/gui/menus/menubar/ToolbarSelectionSubmenu.cpp
@@ -0,0 +1,88 @@
+#include "ToolbarSelectionSubmenu.h"
+
+#include <algorithm>
+#include <string>  // for operator==, string
+
+#include <glib-object.h>  // for G_CALLBACK, g_sig...
+
+#include "control/settings/Settings.h"  // for Settings
+#include "gui/MainWindow.h"             // for MainWindow
+#include "gui/menus/StaticAssertActionNamespace.h"
+#include "gui/toolbarMenubar/ToolMenuHandler.h"     // for ToolMenuHandler
+#include "gui/toolbarMenubar/model/ToolbarData.h"   // for ToolbarData
+#include "gui/toolbarMenubar/model/ToolbarModel.h"  // for ToolbarModel
+
+#include "Menubar.h"
+
+namespace {
+constexpr auto G_ACTION_NAMESPACE = "win.";
+constexpr auto G_ACTION_NAME = "select-toolbar";
+/// id from ui/mainmenubar.xml
+constexpr auto SUBMENU_ID = "menuViewToolbar";
+
+auto createToolbarSelectionMenuItem(const ToolbarData* toolbarData) {
+
+    std::string action = G_ACTION_NAMESPACE;
+    action += G_ACTION_NAME;
+    action += "('";
+    action += toolbarData->getId();
+    action += "')";
+
+    return xoj::util::GObjectSPtr<GMenuItem>(g_menu_item_new(toolbarData->getName().c_str(), action.c_str()),
+                                             xoj::util::adopt);
+}
+
+void toolbarSelectionMenuChangeStateCallback(GSimpleAction* ga, GVariant* parameter, MainWindow* window) {
+    g_simple_action_set_state(ga, parameter);
+
+    gsize l = 0;
+    const char* p = g_variant_get_string(parameter, &l);
+    std::string toolbarId(p, l);
+
+    window->toolbarSelected(toolbarId);
+}
+};  // namespace
+
+ToolbarSelectionSubmenu::ToolbarSelectionSubmenu(MainWindow* win, Settings* settings, ToolMenuHandler* toolbar):
+        gAction(g_simple_action_new_stateful(G_ACTION_NAME, G_VARIANT_TYPE_STRING,
+                                             g_variant_new_string(settings->getSelectedToolbar().c_str())),
+                xoj::util::adopt) {
+    const auto& toolbars = toolbar->getModel()->getToolbars();
+
+    auto it = toolbars.begin();
+    this->stockConfigurationsSection.reset(g_menu_new(), xoj::util::adopt);
+    for (; it != toolbars.end() && (*it)->isPredefined(); ++it) {
+        g_menu_append_item(this->stockConfigurationsSection.get(), createToolbarSelectionMenuItem(it->get()).get());
+    }
+    this->customConfigurationsSection.reset(g_menu_new(), xoj::util::adopt);
+    for (; it != toolbars.end(); ++it) {
+        g_menu_append_item(this->customConfigurationsSection.get(), createToolbarSelectionMenuItem(it->get()).get());
+    }
+
+    g_signal_connect(G_OBJECT(gAction.get()), "change-state", G_CALLBACK(toolbarSelectionMenuChangeStateCallback), win);
+    static_assert(is_action_namespace_match<decltype(win)>(G_ACTION_NAMESPACE));
+    g_action_map_add_action(G_ACTION_MAP(win->getWindow()), G_ACTION(gAction.get()));
+}
+
+ToolbarSelectionSubmenu::~ToolbarSelectionSubmenu() = default;
+
+void ToolbarSelectionSubmenu::setDisabled(bool disabled) { g_simple_action_set_enabled(gAction.get(), !disabled); }
+
+void ToolbarSelectionSubmenu::addToMenubar(Menubar& menubar) {
+    GMenu* submenu = menubar.get<GMenu>(SUBMENU_ID, [](auto* p) { return G_MENU(p); });
+    g_menu_prepend_section(submenu, nullptr, G_MENU_MODEL(customConfigurationsSection.get()));
+    g_menu_prepend_section(submenu, nullptr, G_MENU_MODEL(stockConfigurationsSection.get()));
+}
+
+void ToolbarSelectionSubmenu::update(ToolMenuHandler* toolbarHandler, const ToolbarData* tb) {
+    const auto& toolbars = toolbarHandler->getModel()->getToolbars();
+    // The first half stockConfigurationsSection of the menu has already been generated: fast forward to the first
+    // custom config
+    auto it = std::find_if_not(toolbars.begin(), toolbars.end(), [](const auto& d) { return d->isPredefined(); });
+    g_menu_remove_all(this->customConfigurationsSection.get());
+    for (; it != toolbars.end(); ++it) {
+        g_menu_append_item(this->customConfigurationsSection.get(), createToolbarSelectionMenuItem(it->get()).get());
+    }
+    // Does not fire a "change-state" signal
+    g_simple_action_set_state(gAction.get(), g_variant_new_string(tb ? tb->getId().c_str() : ""));
+}
diff --git a/entry/src/main/cpp/src/core/gui/menus/menubar/ToolbarSelectionSubmenu.h b/entry/src/main/cpp/src/core/gui/menus/menubar/ToolbarSelectionSubmenu.h
new file mode 100644
index 0000000..895c9aa
--- /dev/null
+++ b/entry/src/main/cpp/src/core/gui/menus/menubar/ToolbarSelectionSubmenu.h
@@ -0,0 +1,38 @@
+/*
+ * Xournal++
+ *
+ * Submenu for toolbar selection
+ *
+ * @author Xournal++ Team
+ * https://github.com/xournalpp/xournalpp
+ *
+ * @license GNU GPLv2 or later
+ */
+
+#pragma once
+
+#include "util/raii/GObjectSPtr.h"
+
+#include "AbstractSubmenu.h"
+
+class Settings;
+class ToolMenuHandler;
+class ToolbarData;
+class MainWindow;
+
+class ToolbarSelectionSubmenu final: public Submenu {
+public:
+    ToolbarSelectionSubmenu(MainWindow* win, Settings* settings, ToolMenuHandler* toolbar);
+    ~ToolbarSelectionSubmenu();
+
+public:
+    void update(ToolMenuHandler* toolbarHandler, const ToolbarData* selectedToolbar);
+
+    void setDisabled(bool disabled) override;
+    void addToMenubar(Menubar& menubar) override;
+
+private:
+    xoj::util::GObjectSPtr<GMenu> stockConfigurationsSection;
+    xoj::util::GObjectSPtr<GMenu> customConfigurationsSection;
+    xoj::util::GObjectSPtr<GSimpleAction> gAction;
+};
diff --git a/entry/src/main/cpp/src/core/gui/menus/popoverMenus/PageTypeSelectionPopover.cpp b/entry/src/main/cpp/src/core/gui/menus/popoverMenus/PageTypeSelectionPopover.cpp
new file mode 100644
index 0000000..82943a7
--- /dev/null
+++ b/entry/src/main/cpp/src/core/gui/menus/popoverMenus/PageTypeSelectionPopover.cpp
@@ -0,0 +1,458 @@
+#include "PageTypeSelectionPopover.h"
+
+#include <memory>  // for unique_ptr
+#include <string>  // for string
+
+#include <glib.h>
+#include <gtk/gtkactionable.h>
+
+#include "control/PageBackgroundChangeController.h"
+#include "control/pagetype/PageTypeHandler.h"  // for PageTypeInfo
+#include "control/settings/Settings.h"
+#include "gui/CreatePreviewImage.h"
+#include "gui/dialog/FormatDialog.h"
+#include "gui/menus/StaticAssertActionNamespace.h"
+#include "model/XojPage.h"
+#include "util/Assert.h"
+#include "util/GtkUtil.h"
+#include "util/PopupWindowWrapper.h"
+#include "util/Util.h"
+#include "util/gtk4_helper.h"  // for gtk_box_append
+#include "util/i18n.h"         // for _
+#include "util/raii/GVariantSPtr.h"
+
+
+namespace {
+static constexpr auto PAGE_TYPES_PER_ROW = 4;
+static constexpr auto G_ACTION_NAMESPACE = "win.";
+static constexpr auto PAGETYPE_SELECTION_ACTION_NAME = "select-page-type-of-new-page";
+static constexpr auto ORIENTATION_SELECTION_ACTION_NAME = "select-page-orientation-of-new-page";
+static constexpr auto PAGESIZE_COMBOBOX_CHANGE_ACTION_NAME = "change-combobox-page-size-selection-new-page";
+static constexpr auto PAGESIZE_CHANGED_ACTION_NAME = "changed-page-size-selection-new-page";
+
+GtkWidget* createEntryWithoutPreview(const char* label, size_t entryNb, const std::string_view& prefixedActionName) {
+    GtkWidget* button = gtk_toggle_button_new();
+
+    GtkWidget* labelWidget = gtk_label_new(label);
+    gtk_label_set_wrap_mode(GTK_LABEL(labelWidget), PANGO_WRAP_WORD);
+    gtk_label_set_wrap(GTK_LABEL(labelWidget), true);
+    gtk_label_set_justify(GTK_LABEL(labelWidget), GTK_JUSTIFY_CENTER);
+    gtk_label_set_max_width_chars(GTK_LABEL(labelWidget), 1);
+    gtk_widget_set_size_request(labelWidget, xoj::helper::PREVIEW_WIDTH, xoj::helper::PREVIEW_HEIGHT);
+
+    gtk_button_set_child(GTK_BUTTON(button), labelWidget);
+    gtk_actionable_set_action_name(GTK_ACTIONABLE(button), prefixedActionName.data());
+    gtk_actionable_set_action_target_value(GTK_ACTIONABLE(button), xoj::util::makeGVariantSPtr(entryNb).get());
+    xoj::util::gtk::setToggleButtonUnreleasable(GTK_TOGGLE_BUTTON(button));
+    return button;
+}
+
+GtkGrid* createEmptyGrid() {
+    GtkGrid* grid = GTK_GRID(gtk_grid_new());
+
+    gtk_grid_set_column_homogeneous(grid, true);
+    gtk_grid_set_row_homogeneous(grid, true);
+    gtk_grid_set_column_spacing(grid, 10);
+    gtk_grid_set_row_spacing(grid, 10);
+    gtk_widget_set_margin_start(GTK_WIDGET(grid), 10);
+    gtk_widget_set_margin_end(GTK_WIDGET(grid), 10);
+
+    return grid;
+}
+auto getInitiallySelectedPaperSize(const Settings* settings) -> std::optional<PaperSize> {
+    if (settings) {
+        PageTemplateSettings model;
+        model.parse(settings->getPageTemplate());
+        return model.isCopyLastPageSize() ? std::nullopt : std::optional(PaperSize(model));
+    }
+    return std::nullopt;
+}
+auto createOrientationGAction(PaperOrientation orientation) -> GSimpleAction* {
+    return g_simple_action_new_stateful(ORIENTATION_SELECTION_ACTION_NAME, G_VARIANT_TYPE_BOOLEAN,
+                                        g_variant_new_boolean(static_cast<bool>(orientation)));
+}
+auto createPageSizeComboBoxChangeSelectionGAction() -> GSimpleAction* {
+    return g_simple_action_new(PAGESIZE_COMBOBOX_CHANGE_ACTION_NAME, G_VARIANT_TYPE_UINT32);
+}
+auto createPageSizeChangedGAction() -> GSimpleAction* {
+    return g_simple_action_new(PAGESIZE_CHANGED_ACTION_NAME, nullptr);
+}
+
+/**
+ * @brief Create a togglebutton containing a miniature of the given (standard) page type
+ *      The toggle button is initialized to follow a GAction with the given action name and target value entryNb.
+ *      The returned widget is a floating ref.
+ */
+GtkWidget* createEntryWithPreview(const PageTypeInfo* pti, size_t entryNb, const std::string_view& prefixedActionName) {
+    GtkWidget* button = gtk_toggle_button_new();
+
+    // // Use to restore labels in the menu
+    // GtkWidget* label = gtk_box_new(GTK_ORIENTATION_VERTICAL, 4);
+    // gtk_box_append(GTK_BOX(label), createPreviewImage(*pti));
+    // gtk_box_append(GTK_BOX(label), gtk_label_new(pti->name.c_str()));
+    // gtk_button_set_child(GTK_BUTTON(button), label);
+
+    GtkWidget* preview = xoj::helper::createPreviewImage(pti->page);
+    gtk_widget_set_tooltip_text(preview, pti->name.c_str());
+    gtk_button_set_child(GTK_BUTTON(button), preview);  // takes ownership of preview
+    gtk_actionable_set_action_name(GTK_ACTIONABLE(button), prefixedActionName.data());
+    gtk_actionable_set_action_target_value(GTK_ACTIONABLE(button), xoj::util::makeGVariantSPtr(entryNb).get());
+    xoj::util::gtk::setToggleButtonUnreleasable(GTK_TOGGLE_BUTTON(button));
+    return button;
+}
+
+/**
+ * @brief Create a grid containing a miniature for each one the given (standard) page types
+ *      The returned widget is a floating ref.
+ */
+GtkWidget* createPreviewGrid(const std::vector<std::unique_ptr<PageTypeInfo>>& pageTypes,
+                             const std::string_view& prefixedActionName) {
+    GtkGrid* grid = createEmptyGrid();
+    gtk_widget_set_margin_top(GTK_WIDGET(grid), 10);
+
+    size_t n = 0;
+    int gridX = 0;
+    int gridY = 0;
+
+    for (const auto& pageInfo: pageTypes) {
+        // Special page types do not get a preview
+        xoj_assert(!pageInfo->page.isSpecial());
+        auto* entry = createEntryWithPreview(pageInfo.get(), n++, prefixedActionName);
+        if (gridX >= PAGE_TYPES_PER_ROW) {
+            gridX = 0;
+            gridY++;
+        }
+        gtk_grid_attach(grid, entry, gridX, gridY, 1, 1);
+        gridX++;
+    }
+    return GTK_WIDGET(grid);
+}
+
+GtkWidget* createOrientationButton(std::string_view actionName, GtkOrientation orientation, std::string_view icon) {
+    GtkWidget* button = gtk_toggle_button_new();
+    gtk_button_set_icon_name(GTK_BUTTON(button), icon.data());
+    gtk_actionable_set_action_name(GTK_ACTIONABLE(button), actionName.data());
+    gtk_actionable_set_action_target_value(GTK_ACTIONABLE(button), g_variant_new_boolean(orientation));
+    return button;
+}
+
+/**
+ * @brief Create a separator with custom margins
+ */
+GtkWidget* createSeparator() {
+    GtkWidget* separator = gtk_separator_new(GTK_ORIENTATION_HORIZONTAL);
+    gtk_widget_set_margin_start(separator, 7);
+    gtk_widget_set_margin_end(separator, 7);
+    return separator;
+}
+
+};  // namespace
+
+PageTypeSelectionPopover::PageTypeSelectionPopover(Control* control, Settings* settings, GtkApplicationWindow* win):
+        PageTypeSelectionMenuBase(control->getPageTypes(), settings, PAGETYPE_SELECTION_ACTION_NAME),
+        control(control),
+        controller(control->getPageBackgroundChangeController()),
+        settings(settings),
+        selectedPageSize(getInitiallySelectedPaperSize(settings)),
+        selectedOrientation(selectedPageSize ? selectedPageSize->orientation() : PaperOrientation::VERTICAL) {
+    static_assert(is_action_namespace_match<decltype(win)>(G_ACTION_NAMESPACE));
+
+    PaperFormatUtils::loadDefaultPaperSizes(paperSizeMenuOptions);
+    // Add Special options
+    customPaperSizeIndex = static_cast<uint32_t>(paperSizeMenuOptions.size());
+    paperSizeMenuOptions.emplace_back(_("Custom"));
+    copyCurrentPaperSizeIndex = static_cast<uint32_t>(paperSizeMenuOptions.size());
+    paperSizeMenuOptions.emplace_back(_("Copy current page"));
+
+    this->controller->setPaperSizeForNewPages(this->selectedPageSize);
+
+    orientationAction.reset(createOrientationGAction(selectedOrientation), xoj::util::adopt);
+    g_action_map_add_action(G_ACTION_MAP(win), G_ACTION(orientationAction.get()));
+    g_simple_action_set_enabled(orientationAction.get(), selectedPageSize.has_value());
+    g_signal_connect(G_OBJECT(orientationAction.get()), "change-state", G_CALLBACK(changedOrientationSelectionCallback),
+                     this);
+
+    g_action_map_add_action(G_ACTION_MAP(win), G_ACTION(typeSelectionAction.get()));
+
+    comboBoxChangeSelectionAction.reset(createPageSizeComboBoxChangeSelectionGAction(), xoj::util::adopt);
+    g_action_map_add_action(G_ACTION_MAP(win), G_ACTION(comboBoxChangeSelectionAction.get()));
+
+    pageSizeChangedAction.reset(createPageSizeChangedGAction(), xoj::util::adopt);
+    g_action_map_add_action(G_ACTION_MAP(win), G_ACTION(pageSizeChangedAction.get()));
+}
+template <bool changeComboBoxSelection>
+void PageTypeSelectionPopover::setSelectedPaperSize(const std::optional<PaperSize>& newPageSize) {
+    if (newPageSize != selectedPageSize) {
+        if constexpr (changeComboBoxSelection) {
+            ignoreComboBoxSelectionChange = true;
+            g_action_activate(G_ACTION(comboBoxChangeSelectionAction.get()),
+                              g_variant_new_uint32(static_cast<uint32_t>(getComboBoxIndexForPaperSize(newPageSize))));
+            ignoreComboBoxSelectionChange = false;
+        }
+
+        selectedPageSize = newPageSize;
+        if (selectedPageSize) {
+            g_simple_action_set_state(orientationAction.get(),
+                                      g_variant_new_boolean(static_cast<bool>(selectedPageSize->orientation())));
+        }
+        g_simple_action_set_enabled(orientationAction.get(), selectedPageSize.has_value());
+
+        // Updates sensitivity of 'apply to current'-button
+        g_action_activate(G_ACTION(this->pageSizeChangedAction.get()), nullptr);
+
+        controller->setPaperSizeForNewPages(selectedPageSize);
+    }
+}
+// Explicit instantiation of the two possible bool values to avoid having to put the function template into header
+template void PageTypeSelectionPopover::setSelectedPaperSize<true>(const std::optional<PaperSize>& newPageSize);
+template void PageTypeSelectionPopover::setSelectedPaperSize<false>(const std::optional<PaperSize>& newPageSize);
+
+unsigned int PageTypeSelectionPopover::getComboBoxIndexForPaperSize(const std::optional<PaperSize>& paperSize) const {
+    if (!paperSize) {
+        return copyCurrentPaperSizeIndex;
+    }
+
+    for (unsigned int i = 0; i < customPaperSizeIndex; i++) {
+        auto& currentPaperSize = std::get<xoj::util::GtkPaperSizeUPtr>(paperSizeMenuOptions[i]);
+        const PaperSize aDefaultPaperSize(currentPaperSize);
+        if (paperSize->equalDimensions(aDefaultPaperSize)) {
+            return i;
+        }
+    }
+    return customPaperSizeIndex;  // Custom option is returned if no matching format is found
+}
+GtkWidget* PageTypeSelectionPopover::createPopover() const {
+    /**
+     * Used to connect to GAction changes: the GAction can outlive the widget. This ensures the callback is disabled
+     * when the widget is destroyed. Like g_signal_connect_object() except the callback data contains a pointer to *this
+     */
+    auto connectToLonglivedAction = [this](GSimpleAction* act, const char* signalname, GCallback cb, GtkWidget* w) {
+        auto* closure =
+                g_cclosure_new(cb, new std::pair<GtkWidget*, const PageTypeSelectionPopover*>(w, this),
+                               xoj::util::closure_notify_cb<std::pair<GtkWidget*, const PageTypeSelectionPopover*>>);
+        g_object_watch_closure(G_OBJECT(w), closure);
+        g_signal_connect_closure(G_OBJECT(act), signalname, closure, GConnectFlags(0));
+    };
+
+    GtkWidget* popover = gtk_popover_new();
+
+    // Todo(cpp20): constexpr this
+    std::string prefixedPageTypeActionName = G_ACTION_NAMESPACE;
+    prefixedPageTypeActionName += PAGETYPE_SELECTION_ACTION_NAME;
+    std::string prefixedOrientationActionName = std::string(G_ACTION_NAMESPACE) + ORIENTATION_SELECTION_ACTION_NAME;
+
+    GtkBox* box = GTK_BOX(gtk_box_new(GTK_ORIENTATION_VERTICAL, 0));
+    gtk_popover_set_child(GTK_POPOVER(popover), GTK_WIDGET(box));
+
+    GtkWidget* previewGrid = createPreviewGrid(types->getPageTypes(), prefixedPageTypeActionName);
+    gtk_widget_set_margin_bottom(previewGrid, 5);
+    gtk_box_append(box, previewGrid);
+
+    gtk_box_append(box, createSeparator());
+
+    GtkGrid* specialTypesGrid = createEmptyGrid();
+    gtk_widget_set_margin_top(GTK_WIDGET(specialTypesGrid), 5);
+    gtk_widget_set_margin_bottom(GTK_WIDGET(specialTypesGrid), 5);
+
+    int gridX = 0;
+    // Create a special entry for copying the current page's background
+    // It has index == npos
+    gtk_grid_attach(specialTypesGrid,
+                    createEntryWithoutPreview(_("Copy current background"), npos, prefixedPageTypeActionName), gridX++,
+                    0, 1, 1);
+
+    // The indices of special page types start after the normal page types'
+    size_t n = types->getPageTypes().size();
+    for (const auto& pageInfo: types->getSpecialPageTypes()) {
+        gtk_grid_attach(specialTypesGrid,
+                        createEntryWithoutPreview(pageInfo->name.c_str(), n++, prefixedPageTypeActionName), gridX++, 0,
+                        1, 1);
+    }
+
+    while (gridX < PAGE_TYPES_PER_ROW) {
+        // Add empty cells to the grid so the buttons don't get extended
+        gtk_grid_attach(specialTypesGrid, gtk_label_new(""), gridX++, 0, 1, 1);
+    }
+
+    GtkBox* pageFormatBox = GTK_BOX(gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 0));
+    gtk_widget_set_margin_start(GTK_WIDGET(pageFormatBox), 10);
+    gtk_widget_set_margin_end(GTK_WIDGET(pageFormatBox), 10);
+    gtk_widget_set_margin_top(GTK_WIDGET(pageFormatBox), 7);
+    gtk_widget_set_margin_bottom(GTK_WIDGET(pageFormatBox), 10);
+
+    GtkBox* orientationFormatBox = GTK_BOX(gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 0));
+    gtk_widget_add_css_class(GTK_WIDGET(orientationFormatBox), "linked");
+    gtk_widget_add_css_class(GTK_WIDGET(orientationFormatBox), "orientationFormatBox");
+
+    std::array<GtkWidget*, 2> orientationButtons{};
+    orientationButtons[GTK_ORIENTATION_VERTICAL] = createOrientationButton(
+            prefixedOrientationActionName, GTK_ORIENTATION_VERTICAL, "xopp-orientation-portrait");
+    orientationButtons[GTK_ORIENTATION_HORIZONTAL] = createOrientationButton(
+            prefixedOrientationActionName, GTK_ORIENTATION_HORIZONTAL, "xopp-orientation-landscape");
+
+    xoj::util::gtk::setToggleButtonUnreleasable(GTK_TOGGLE_BUTTON(orientationButtons[GTK_ORIENTATION_VERTICAL]));
+    xoj::util::gtk::setToggleButtonUnreleasable(GTK_TOGGLE_BUTTON(orientationButtons[GTK_ORIENTATION_HORIZONTAL]));
+
+    gtk_box_append(orientationFormatBox, orientationButtons[GTK_ORIENTATION_VERTICAL]);
+    gtk_box_append(orientationFormatBox, orientationButtons[GTK_ORIENTATION_HORIZONTAL]);
+
+    gtk_box_append(pageFormatBox, GTK_WIDGET(orientationFormatBox));
+    gtk_widget_set_hexpand(GTK_WIDGET(orientationFormatBox), true);
+
+    GtkWidget* pageFormatComboBox = gtk_combo_box_new();
+    PaperFormatUtils::fillPaperFormatDropDown(paperSizeMenuOptions, GTK_COMBO_BOX(pageFormatComboBox));
+    gtk_widget_set_halign(pageFormatComboBox, GTK_ALIGN_END);
+    gtk_combo_box_set_active(GTK_COMBO_BOX(pageFormatComboBox),
+                             static_cast<gint>(getComboBoxIndexForPaperSize(selectedPageSize)));
+    g_signal_connect(pageFormatComboBox, "changed", G_CALLBACK(changedPaperFormatTemplateCb),
+                     const_cast<PageTypeSelectionPopover*>(this));
+    gtk_box_append(pageFormatBox, pageFormatComboBox);
+
+    connectToLonglivedAction(
+            this->typeSelectionAction.get(), "notify::state",
+            G_CALLBACK((+[](GObject* a, GParamSpec*, gpointer pointerTuple) {
+                auto [pageFormatCB, self] =
+                        *static_cast<std::pair<GtkWidget*, const PageTypeSelectionPopover*>*>(pointerTuple);
+                xoj::util::GVariantSPtr state(g_action_get_state(G_ACTION(a)), xoj::util::adopt);
+                auto selectedIndex = getGVariantValue<size_t>(state.get());
+                // Enable page format selection for all page types except special ones (PDF and image)
+                bool shouldPageFormatSettingsBeEnabled =
+                        selectedIndex == COPY_CURRENT_PLACEHOLDER || selectedIndex < self->types->getPageTypes().size();
+                gtk_widget_set_sensitive(pageFormatCB, shouldPageFormatSettingsBeEnabled);
+
+                g_simple_action_set_enabled(self->orientationAction.get(),
+                                            shouldPageFormatSettingsBeEnabled && self->selectedPageSize.has_value());
+            })),
+            pageFormatComboBox);
+
+    gtk_box_append(box, GTK_WIDGET(specialTypesGrid));
+    gtk_box_append(box, createSeparator());
+    gtk_box_append(box, GTK_WIDGET(pageFormatBox));
+
+    GtkWidget* applyToCurrentPageButton = gtk_button_new_with_label(_("Apply to current page"));
+    g_signal_connect_data(
+            applyToCurrentPageButton, "clicked", G_CALLBACK((+[](GtkButton*, gpointer pointerTuple) {
+                auto [self, popover] =
+                        *static_cast<std::tuple<const PageTypeSelectionPopover*, GtkPopover*>*>(pointerTuple);
+                if (self->selectedPT) {
+                    self->controller->changeCurrentPageBackground(self->selectedPT.value());
+                }
+                if (self->selectedPageSize && (!self->selectedPT.has_value() || !self->selectedPT->isSpecial())) {
+                    self->controller->changeCurrentPageSize(self->selectedPageSize.value());
+                }
+            })),
+            new std::tuple<const PageTypeSelectionPopover*, GtkPopover*>(this, GTK_POPOVER(popover)),
+            xoj::util::closure_notify_cb<std::tuple<const PageTypeSelectionPopover*, GtkPopover*>>, GConnectFlags(0));
+    gtk_widget_set_margin_start(applyToCurrentPageButton, 10);
+    gtk_widget_set_margin_end(applyToCurrentPageButton, 10);
+    gtk_widget_set_margin_bottom(applyToCurrentPageButton, 3);
+    gtk_box_append(box, applyToCurrentPageButton);
+
+    // We cannot "Apply to current page" if neither page type nor page size is selected...
+    gtk_widget_set_sensitive(applyToCurrentPageButton,
+                             this->selectedPT.has_value() || this->selectedPageSize.has_value());
+
+    connectToLonglivedAction(
+            this->typeSelectionAction.get(), "notify::state",
+            G_CALLBACK((+[](GObject* a, GParamSpec*, gpointer pointerTuple) {
+                auto [btn, self] = *static_cast<std::pair<GtkWidget*, const PageTypeSelectionPopover*>*>(pointerTuple);
+                xoj::util::GVariantSPtr state(g_action_get_state(G_ACTION(a)), xoj::util::adopt);
+                auto selectedIndex = getGVariantValue<size_t>(state.get());
+                gtk_widget_set_sensitive(
+                        btn, selectedIndex != COPY_CURRENT_PLACEHOLDER || self->selectedPageSize.has_value());
+            })),
+            applyToCurrentPageButton);
+
+    connectToLonglivedAction(
+            this->pageSizeChangedAction.get(), "activate",
+            G_CALLBACK((+[](GSimpleAction*, GVariant*, gpointer pointerTuple) {
+                auto [btn, self] = *static_cast<std::pair<GtkWidget*, const PageTypeSelectionPopover*>*>(pointerTuple);
+                gtk_widget_set_sensitive(btn, self->selectedPT.has_value() || self->selectedPageSize.has_value());
+            })),
+            applyToCurrentPageButton);
+
+    g_signal_connect_object(this->comboBoxChangeSelectionAction.get(), "activate",
+                            G_CALLBACK(+[](GSimpleAction*, GVariant* comboBoxIndex, gpointer comboBoxPtr) {
+                                auto* comboBox = static_cast<GtkWidget*>(comboBoxPtr);
+                                gtk_combo_box_set_active(GTK_COMBO_BOX(comboBox),
+                                                         static_cast<gint>(getGVariantValue<guint32>(comboBoxIndex)));
+                            }),
+                            pageFormatComboBox, GConnectFlags(0));
+
+    GtkWidget* applyToAllPagesButton = gtk_button_new_with_label(_("Apply to all pages"));
+    g_signal_connect_data(
+            applyToAllPagesButton, "clicked", G_CALLBACK((+[](GtkWidget*, gpointer pointerTuple) {
+                auto [self, popover] =
+                        *static_cast<std::tuple<const PageTypeSelectionPopover*, GtkPopover*>*>(pointerTuple);
+                const PageRef currentPage = self->control->getCurrentPage();
+                PageType pt = self->selectedPT.value_or(currentPage->getBackgroundType());
+                self->controller->applyBackgroundToAllPages(pt);
+
+                if (!pt.isSpecial()) {  // Special backgrounds come with their size
+                    self->controller->applyPageSizeToAllPages(self->selectedPageSize.value_or(
+                            PaperSize(currentPage->getWidth(), currentPage->getHeight())));
+                }
+            })),
+            new std::tuple<const PageTypeSelectionPopover*, GtkPopover*>(this, GTK_POPOVER(popover)),
+            xoj::util::closure_notify_cb<std::tuple<const PageTypeSelectionPopover*, GtkPopover*>>, GConnectFlags(0));
+    gtk_widget_set_margin_start(applyToAllPagesButton, 10);
+    gtk_widget_set_margin_end(applyToAllPagesButton, 10);
+    gtk_widget_set_margin_top(applyToAllPagesButton, 3);
+    gtk_widget_set_margin_bottom(applyToAllPagesButton, 10);
+    gtk_box_append(box, applyToAllPagesButton);
+
+    gtk_widget_show_all(GTK_WIDGET(box));
+
+    return popover;
+}
+void PageTypeSelectionPopover::changedPaperFormatTemplateCb(GtkComboBox* widget, PageTypeSelectionPopover* self) {
+    if (self->ignoreComboBoxSelectionChange) {
+        return;
+    }
+    auto selected = static_cast<uint32_t>(gtk_combo_box_get_active(widget));
+    if (selected < self->customPaperSizeIndex) {
+        auto orientation = static_cast<PaperOrientation>(getGVariantValue<bool>(
+                xoj::util::GVariantSPtr(g_action_get_state(G_ACTION(self->orientationAction.get())), xoj::util::adopt)
+                        .get()));
+
+        PaperSize paperSize(std::get<xoj::util::GtkPaperSizeUPtr>(self->paperSizeMenuOptions[selected]));
+        if (paperSize.orientation() != orientation) {
+            paperSize.swapWidthHeight();
+        }
+
+        self->setSelectedPaperSize<false>(paperSize);
+    } else if (selected == self->customPaperSizeIndex) {
+        std::unique_ptr<xoj::popup::PopupWindowWrapper<xoj::popup::FormatDialog>> popup;
+        auto callback = [self](double width, double height) {
+            self->setSelectedPaperSize<true>(PaperSize(width, height));
+        };
+        if (self->selectedPageSize) {
+            popup = std::make_unique<xoj::popup::PopupWindowWrapper<xoj::popup::FormatDialog>>(
+                    self->control->getGladeSearchPath(), self->settings, self->selectedPageSize->width,
+                    self->selectedPageSize->height, callback);
+        } else {
+            PageTemplateSettings model;
+            model.parse(self->settings->getPageTemplate());
+            popup = std::make_unique<xoj::popup::PopupWindowWrapper<xoj::popup::FormatDialog>>(
+                    self->control->getGladeSearchPath(), self->settings, model.getPageWidth(), model.getPageHeight(),
+                    callback);
+        }
+        popup->show(self->control->getGtkWindow());
+
+    } else if (selected == self->copyCurrentPaperSizeIndex) {
+        self->setSelectedPaperSize<false>(std::nullopt);
+    }
+}
+void PageTypeSelectionPopover::changedOrientationSelectionCallback(GSimpleAction* ga, GVariant* parameter,
+                                                                   PageTypeSelectionPopover* self) {
+    g_simple_action_set_state(ga, parameter);
+    self->selectedOrientation = static_cast<PaperOrientation>(getGVariantValue<bool>(parameter));
+    if (self->selectedPageSize && (self->selectedPageSize->orientation() != self->selectedOrientation)) {
+        self->selectedPageSize->swapWidthHeight();
+        self->controller->setPaperSizeForNewPages(self->selectedPageSize);
+    }
+}
+
+void PageTypeSelectionPopover::entrySelected(const PageTypeInfo*) {
+    this->controller->setPageTypeForNewPages(this->selectedPT);
+}
diff --git a/entry/src/main/cpp/src/core/gui/menus/popoverMenus/PageTypeSelectionPopover.h b/entry/src/main/cpp/src/core/gui/menus/popoverMenus/PageTypeSelectionPopover.h
new file mode 100644
index 0000000..b56ed28
--- /dev/null
+++ b/entry/src/main/cpp/src/core/gui/menus/popoverMenus/PageTypeSelectionPopover.h
@@ -0,0 +1,79 @@
+/*
+ * Xournal++
+ *
+ * Handles page selection menu
+ *
+ * @author Xournal++ Team
+ * https://github.com/xournalpp/xournalpp
+ *
+ * @license GNU GPLv2 or later
+ */
+
+#pragma once
+
+#include <memory>
+#include <vector>  // for vector
+
+#include <gtk/gtk.h>  // for GtkWidget
+
+#include "control/Control.h"
+#include "control/settings/PageTemplateSettings.h"
+#include "gui/PaperFormatUtils.h"
+#include "gui/PopoverFactory.h"
+#include "gui/menus/PageTypeSelectionMenuBase.h"
+#include "model/PaperSize.h"
+#include "util/raii/GObjectSPtr.h"
+
+class PageBackgroundChangeController;
+class PageTypeHandler;
+class PageTypeInfo;
+class Settings;
+
+class PageTypeSelectionPopover final: public PageTypeSelectionMenuBase, public PopoverFactory {
+public:
+    PageTypeSelectionPopover(Control* control, Settings* settings, GtkApplicationWindow* win);
+    ~PageTypeSelectionPopover() override = default;
+
+public:
+    GtkWidget* createPopover() const override;
+
+    /**
+     * @brief Sets the selected paper size of the menu.
+     * @tparam changeComboBoxSelection Whether the combo box selection will be changed to a fitting option
+     */
+    template <bool changeComboBoxSelection = true>
+    void setSelectedPaperSize(const std::optional<PaperSize>& newPageSize);
+
+private:
+    void entrySelected(const PageTypeInfo* info) override;
+
+    static void changedOrientationSelectionCallback(GSimpleAction* ga, GVariant* parameter,
+                                                    PageTypeSelectionPopover* self);
+    static void changedPaperFormatTemplateCb(GtkComboBox* widget, PageTypeSelectionPopover* dlg);
+
+    [[nodiscard]] unsigned int getComboBoxIndexForPaperSize(const std::optional<PaperSize>& paperSize) const;
+
+private:
+    Control* control;
+    PageBackgroundChangeController* controller;
+    Settings* settings;
+
+    std::optional<PaperSize> selectedPageSize;
+
+    PaperOrientation selectedOrientation;
+    xoj::util::GObjectSPtr<GSimpleAction> orientationAction;
+
+    // By activating the comboBoxChangeSelectionAction the option selected by the page size comboBox is changed to the
+    // specified index
+    xoj::util::GObjectSPtr<GSimpleAction> comboBoxChangeSelectionAction;
+
+    // The pageSizeChangedAction is activated when the pageSize changed
+    xoj::util::GObjectSPtr<GSimpleAction> pageSizeChangedAction;
+
+    PaperFormatUtils::PaperFormatMenuOptionVector paperSizeMenuOptions;
+
+    bool ignoreComboBoxSelectionChange = false;
+
+    uint32_t customPaperSizeIndex;  // this - 1 is the last index of an actual PaperSize option
+    uint32_t copyCurrentPaperSizeIndex;
+};
diff --git a/entry/src/main/cpp/src/core/gui/menus/popoverMenus/PageTypeSelectionPopoverGridOnly.cpp b/entry/src/main/cpp/src/core/gui/menus/popoverMenus/PageTypeSelectionPopoverGridOnly.cpp
new file mode 100644
index 0000000..7a0261b
--- /dev/null
+++ b/entry/src/main/cpp/src/core/gui/menus/popoverMenus/PageTypeSelectionPopoverGridOnly.cpp
@@ -0,0 +1,83 @@
+#include "PageTypeSelectionPopoverGridOnly.h"
+
+#include <memory>  // for unique_ptr
+#include <string>  // for string
+
+#include <glib.h>
+#include <gtk/gtkactionable.h>
+
+#include "control/pagetype/PageTypeHandler.h"  // for PageTypeInfo
+#include "gui/CreatePreviewImage.h"
+#include "gui/dialog/PageTemplateDialog.h"
+#include "model/PageType.h"  // for PageType
+#include "util/Assert.h"
+#include "util/raii/GVariantSPtr.h"
+
+namespace {
+static constexpr auto PAGE_TYPES_PER_ROW = 4;
+static constexpr auto G_ACTION_NAMESPACE = "popover";
+static constexpr auto SELECTION_ACTION_NAME = "select-page-type-template";
+
+GtkWidget* createPreviewGrid(const std::vector<std::unique_ptr<PageTypeInfo>>& pageTypes,
+                             const std::string_view& prefixedActionName) {
+    /*
+     * Todo(gtk4): replace the GtkMenu with a GtkPopover, using PageTypeSelectionPopover::createPreviewGrid instead.
+     * Note that GtkPopover is no good with GTK 3, as the popover gets cropped to the dialog window (so part of it is
+     * not displayed). GtkMenus don't have this restriction but are removed in GTK 4. Popovers in GTK 4 do not have this
+     * restriction.
+     */
+    GtkMenu* gtkMenu = GTK_MENU(gtk_menu_new());
+
+    size_t n = 0;
+    unsigned int gridX = 0;
+    unsigned int gridY = 0;
+
+    for (const auto& pageInfo: pageTypes) {
+        // Special page types do not get a preview
+        xoj_assert(!pageInfo->page.isSpecial());
+        auto* entry = gtk_check_menu_item_new();
+        gtk_check_menu_item_set_draw_as_radio(GTK_CHECK_MENU_ITEM(entry), true);
+        gtk_actionable_set_action_name(GTK_ACTIONABLE(entry), prefixedActionName.data());
+        gtk_actionable_set_action_target_value(GTK_ACTIONABLE(entry), xoj::util::makeGVariantSPtr(n++).get());
+        GtkWidget* preview = xoj::helper::createPreviewImage(pageInfo->page);
+        gtk_widget_set_tooltip_text(preview, pageInfo->name.c_str());
+        gtk_container_add(GTK_CONTAINER(entry), preview);  // takes ownership of preview
+        if (gridX >= PAGE_TYPES_PER_ROW) {
+            gridX = 0;
+            gridY++;
+        }
+        gtk_menu_attach(gtkMenu, entry, gridX, gridX + 1, gridY, gridY + 1);
+        gridX++;
+    }
+    return GTK_WIDGET(gtkMenu);
+}
+};  // namespace
+
+
+PageTypeSelectionPopoverGridOnly::PageTypeSelectionPopoverGridOnly(PageTypeHandler* typesHandler,
+                                                                   const Settings* settings,
+                                                                   xoj::popup::PageTemplateDialog* parent):
+        PageTypeSelectionMenuBase(typesHandler, settings, SELECTION_ACTION_NAME),
+        parent(parent),
+        popover(createPopover()) {
+
+    xoj::util::GObjectSPtr<GSimpleActionGroup> group(g_simple_action_group_new(), xoj::util::adopt);
+    g_action_map_add_action(G_ACTION_MAP(group.get()), G_ACTION(typeSelectionAction.get()));
+    gtk_widget_insert_action_group(GTK_WIDGET(parent->getWindow()), G_ACTION_NAMESPACE, G_ACTION_GROUP(group.get()));
+}
+
+xoj::util::WidgetSPtr PageTypeSelectionPopoverGridOnly::createPopover() {
+    // Todo(cpp20): constexpr this
+    std::string prefixedActionName = G_ACTION_NAMESPACE;
+    prefixedActionName += ".";
+    prefixedActionName += SELECTION_ACTION_NAME;
+
+    xoj::util::WidgetSPtr popover(createPreviewGrid(types->getPageTypes(), prefixedActionName), xoj::util::adopt);
+    gtk_widget_show_all(popover.get());
+    return popover;
+}
+
+void PageTypeSelectionPopoverGridOnly::entrySelected(const PageTypeInfo* info) {
+    xoj_assert(info);
+    parent->changeCurrentPageBackground(info);
+}
diff --git a/entry/src/main/cpp/src/core/gui/menus/popoverMenus/PageTypeSelectionPopoverGridOnly.h b/entry/src/main/cpp/src/core/gui/menus/popoverMenus/PageTypeSelectionPopoverGridOnly.h
new file mode 100644
index 0000000..5eff044
--- /dev/null
+++ b/entry/src/main/cpp/src/core/gui/menus/popoverMenus/PageTypeSelectionPopoverGridOnly.h
@@ -0,0 +1,45 @@
+/*
+ * Xournal++
+ *
+ * Handles page selection menu
+ *
+ * @author Xournal++ Team
+ * https://github.com/xournalpp/xournalpp
+ *
+ * @license GNU GPLv2 or later
+ */
+
+#pragma once
+
+#include <memory>
+#include <vector>  // for vector
+
+#include <gtk/gtk.h>  // for GtkWidget
+
+#include "gui/menus/PageTypeSelectionMenuBase.h"
+#include "util/raii/GObjectSPtr.h"
+
+namespace xoj::popup {
+class PageTemplateDialog;
+}
+class PageTypeHandler;
+class PageTypeInfo;
+class Settings;
+
+class PageTypeSelectionPopoverGridOnly final: public PageTypeSelectionMenuBase {
+public:
+    PageTypeSelectionPopoverGridOnly(PageTypeHandler* typesHandler, const Settings* settings,
+                                     xoj::popup::PageTemplateDialog* parent);
+    ~PageTypeSelectionPopoverGridOnly() = default;
+
+public:
+    inline GtkWidget* getPopover() { return popover.get(); }
+
+private:
+    xoj::util::WidgetSPtr createPopover();
+    void entrySelected(const PageTypeInfo* info) override;
+
+private:
+    xoj::popup::PageTemplateDialog* parent;
+    xoj::util::WidgetSPtr popover;
+};
diff --git a/entry/src/main/cpp/src/core/gui/scroll/ScrollHandling.cpp b/entry/src/main/cpp/src/core/gui/scroll/ScrollHandling.cpp
new file mode 100644
index 0000000..1453110
--- /dev/null
+++ b/entry/src/main/cpp/src/core/gui/scroll/ScrollHandling.cpp
@@ -0,0 +1,41 @@
+#include "ScrollHandling.h"
+
+#include "gui/Layout.h"
+
+
+ScrollHandling::ScrollHandling(GtkAdjustment* adjHorizontal, GtkAdjustment* adjVertical):
+        adjHorizontal(adjHorizontal), adjVertical(adjVertical) {}
+
+
+ScrollHandling::ScrollHandling(GtkScrolledWindow* win):
+        ScrollHandling(gtk_scrolled_window_get_hadjustment(win), gtk_scrolled_window_get_vadjustment(win)) {}
+
+
+ScrollHandling::~ScrollHandling() = default;
+
+auto ScrollHandling::getHorizontal() -> GtkAdjustment* { return adjHorizontal; }
+
+auto ScrollHandling::getVertical() -> GtkAdjustment* { return adjVertical; }
+
+void ScrollHandling::init(GtkWidget* xournal, Layout* layout) {
+    this->xournal = xournal;
+    this->layout = layout;
+}
+
+
+#define TEMP_FIX true
+
+void ScrollHandling::setLayoutSize(int width, int height) {
+    // after a page has been inserted the layout size must be updated immediately,
+    // otherwise it comes down to a race deciding if scrolling happens normally or not
+#if TEMP_FIX
+    // Todo(Fabian): remove that fix, since it is conceptually wrong behavior
+    //               the adjustment is/must be changed implicitly by the layout and the resulting expose event
+    if (gtk_adjustment_get_upper(getHorizontal()) != width) {
+        gtk_adjustment_set_upper(getHorizontal(), width);
+    }
+    if (gtk_adjustment_get_upper(getVertical()) != height) {
+        gtk_adjustment_set_upper(getVertical(), height);
+    }
+#endif
+}
diff --git a/entry/src/main/cpp/src/core/gui/scroll/ScrollHandling.h b/entry/src/main/cpp/src/core/gui/scroll/ScrollHandling.h
new file mode 100644
index 0000000..df71e5d
--- /dev/null
+++ b/entry/src/main/cpp/src/core/gui/scroll/ScrollHandling.h
@@ -0,0 +1,39 @@
+/*
+ * Xournal++
+ *
+ * Scroll handling for different scroll implementations
+ *
+ * @author Xournal++ Team
+ * https://github.com/xournalpp/xournalpp
+ *
+ * @license GNU GPLv2 or later
+ */
+
+#pragma once
+
+#include <gtk/gtk.h>  // for GtkAdjustment, GtkWidget, GtkScrollable
+
+class Layout;
+
+class ScrollHandling {
+public:
+    ScrollHandling(GtkAdjustment* adjHorizontal, GtkAdjustment* adjVertical);
+    ScrollHandling(GtkScrolledWindow* scrollable);
+    ~ScrollHandling();
+
+public:
+    GtkAdjustment* getHorizontal();
+    GtkAdjustment* getVertical();
+
+    void init(GtkWidget* xournal, Layout* layout);
+
+    void setLayoutSize(int width, int height);
+
+private:
+protected:
+    GtkAdjustment* adjHorizontal = nullptr;
+    GtkAdjustment* adjVertical = nullptr;
+
+    GtkWidget* xournal = nullptr;
+    Layout* layout = nullptr;
+};
diff --git a/entry/src/main/cpp/src/core/gui/sidebar/AbstractSidebarPage.cpp b/entry/src/main/cpp/src/core/gui/sidebar/AbstractSidebarPage.cpp
new file mode 100644
index 0000000..72a8f24
--- /dev/null
+++ b/entry/src/main/cpp/src/core/gui/sidebar/AbstractSidebarPage.cpp
@@ -0,0 +1,30 @@
+#include "AbstractSidebarPage.h"
+
+#include <gdk/gdk.h>      // for gdk_cursor_new_for_display, gdk_display_get...
+#include <glib-object.h>  // for g_object_unref
+
+AbstractSidebarPage::AbstractSidebarPage(Control* control): control(control) {}
+
+AbstractSidebarPage::~AbstractSidebarPage() = default;
+
+void AbstractSidebarPage::selectPageNr(size_t page, size_t pdfPage) {}
+
+auto AbstractSidebarPage::getControl() -> Control* { return this->control; }
+
+void AbstractSidebarPage::setTmpDisabled(bool disabled) {
+    GdkCursor* cursor = nullptr;
+    if (disabled) {
+        cursor = gdk_cursor_new_for_display(gdk_display_get_default(), GDK_WATCH);
+    }
+
+    if (gtk_widget_get_window(this->getWidget())) {
+        gdk_window_set_cursor(gtk_widget_get_window(this->getWidget()), cursor);
+    }
+
+    gtk_widget_set_sensitive(this->getWidget(), !disabled);
+
+
+    if (cursor) {
+        g_object_unref(cursor);
+    }
+}
diff --git a/entry/src/main/cpp/src/core/gui/sidebar/AbstractSidebarPage.h b/entry/src/main/cpp/src/core/gui/sidebar/AbstractSidebarPage.h
new file mode 100644
index 0000000..a2b0adc
--- /dev/null
+++ b/entry/src/main/cpp/src/core/gui/sidebar/AbstractSidebarPage.h
@@ -0,0 +1,81 @@
+/*
+ * Xournal++
+ *
+ * Abstract Sidebar Page
+ *
+ * @author Xournal++ Team
+ * https://github.com/xournalpp/xournalpp
+ *
+ * @license GNU GPLv2 or later
+ */
+
+#pragma once
+
+#include <cstddef>  // for size_t
+#include <string>   // for string
+
+#include <gtk/gtk.h>  // for GtkToolItem
+
+#include "model/DocumentListener.h"                    // for DocumentListener
+
+class Control;
+
+class AbstractSidebarPage: public DocumentListener {
+public:
+    AbstractSidebarPage(Control* control);
+    ~AbstractSidebarPage() override;
+
+public:
+    virtual void enableSidebar() = 0;
+    virtual void disableSidebar() = 0;
+
+    virtual void layout() = 0;
+
+    /**
+     * The name of this sidebar page
+     */
+    virtual std::string getName() = 0;
+
+    /**
+     * The name of this sidebar page
+     */
+    virtual std::string getIconName() = 0;
+
+    /**
+     * If this sidebar page has data for the current document, e.g. if there are bookmarks or not
+     */
+    virtual bool hasData() = 0;
+
+    /**
+     * Gets the Widget to display
+     */
+    virtual GtkWidget* getWidget() = 0;
+
+    /**
+     * Temporary disable Sidebar (e.g. while saving)
+     */
+    virtual void setTmpDisabled(bool disabled);
+
+    /**
+     * A page was selected, supply additional to the Document Page the PDF Page
+     */
+    virtual void selectPageNr(size_t page, size_t pdfPage);
+
+    /**
+     * Returns the Application controller
+     */
+    Control* getControl();
+
+private:
+protected:
+    /**
+     * The Control of the Application
+     */
+    Control* control = nullptr;
+
+public:
+    /**
+     * The Sidebar button
+     */
+    GtkWidget* tabButton = nullptr;
+};
diff --git a/entry/src/main/cpp/src/core/gui/sidebar/Sidebar.cpp b/entry/src/main/cpp/src/core/gui/sidebar/Sidebar.cpp
new file mode 100644
index 0000000..0599cba
--- /dev/null
+++ b/entry/src/main/cpp/src/core/gui/sidebar/Sidebar.cpp
@@ -0,0 +1,171 @@
+#include "Sidebar.h"
+
+#include <cstdint>  // for int64_t
+#include <memory>   // for std::make_unique and std::make_shared
+#include <string>   // for string
+
+#include <config-features.h>
+#include <gdk/gdk.h>      // for gdk_display_get...
+#include <glib-object.h>  // for G_CALLBACK, g_s...
+#include <gtk/gtk.h>      // for gtk_toggle_tool_button_new...
+
+#include "control/Control.h"                         // for Control
+#include "control/settings/Settings.h"               // for Settings
+#include "gui/GladeGui.h"                            // for GladeGui
+#include "gui/sidebar/AbstractSidebarPage.h"         // for AbstractSidebar...
+#include "gui/sidebar/indextree/SidebarIndexPage.h"  // for SidebarIndexPage
+#include "model/Document.h"                          // for Document
+#include "model/XojPage.h"                           // for XojPage
+#include "pdf/base/XojPdfPage.h"                     // for XojPdfPageSPtr
+#include "previews/layer/SidebarPreviewLayers.h"     // for SidebarPreviewL...
+#include "previews/page/SidebarPreviewPages.h"       // for SidebarPreviewP...
+#include "util/Util.h"                               // for npos
+#include "util/glib_casts.h"                         // for closure_notify_cb
+#include "util/gtk4_helper.h"                        //
+#include "util/i18n.h"                               // for _, FC, _F
+
+Sidebar::Sidebar(GladeGui* gui, Control* control): control(control) {
+    this->tbSelectTab = GTK_BOX(gui->get("bxSidebarTopActions"));
+    this->buttonCloseSidebar = gui->get("buttonCloseSidebar");
+
+    this->sidebarContents = gui->get("sidebarContents");
+
+    this->initTabs(sidebarContents);
+
+    registerListener(control);
+}
+
+void Sidebar::initTabs(GtkWidget* sidebarContents) {
+    addTab(std::make_unique<SidebarIndexPage>(this->control));
+    addTab(std::make_unique<SidebarPreviewPages>(this->control));
+    addTab(std::make_unique<SidebarPreviewLayers>(this->control, false));
+    addTab(std::make_unique<SidebarPreviewLayers>(this->control, true));
+
+    // Init toolbar with icons
+
+    size_t i = 0;
+    for (auto&& p: this->tabs) {
+        GtkWidget* btn = gtk_toggle_button_new();
+        p->tabButton = btn;
+
+        gtk_button_set_icon_name(GTK_BUTTON(btn), p->getIconName().c_str());
+        g_signal_connect_data(btn, "clicked", G_CALLBACK(&buttonClicked), new SidebarTabButton(this, i, p.get()),
+                              xoj::util::closure_notify_cb<SidebarTabButton>, GConnectFlags(0));
+        gtk_widget_set_tooltip_text(btn, p->getName().c_str());
+        gtk_box_append(tbSelectTab, btn);
+
+        // Add widget to sidebar
+        gtk_widget_set_vexpand(p->getWidget(), true);
+        gtk_box_append(GTK_BOX(sidebarContents), p->getWidget());
+
+        i++;
+    }
+
+    updateVisibleTabs();
+}
+
+void Sidebar::buttonClicked(GtkButton* button, SidebarTabButton* buttonData) {
+    if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(button))) {
+        if (buttonData->sidebar->visibleTab != buttonData->page->getWidget()) {
+            buttonData->sidebar->setSelectedTab(buttonData->index);
+        }
+    } else if (buttonData->sidebar->visibleTab == buttonData->page->getWidget()) {
+        gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(button), true);
+    }
+}
+
+void Sidebar::addTab(std::unique_ptr<AbstractSidebarPage> tab) { this->tabs.push_back(std::move(tab)); }
+
+Sidebar::~Sidebar() = default;
+
+void Sidebar::selectPageNr(size_t page, size_t pdfPage) {
+    for (auto&& p: this->tabs) {
+        p->selectPageNr(page, pdfPage);
+    }
+}
+
+void Sidebar::setSelectedTab(size_t tab) {
+    this->visibleTab = nullptr;
+
+    size_t i = 0;
+    for (auto&& t: this->tabs) {
+        if (tab == i) {
+            gtk_widget_show(t->getWidget());
+            gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(t->tabButton), true);
+            this->visibleTab = t->getWidget();
+            this->currentTabIdx = i;
+            t->enableSidebar();
+        } else {
+            t->disableSidebar();
+            gtk_widget_hide(t->getWidget());
+            gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(t->tabButton), false);
+        }
+
+        i++;
+    }
+    if (this->visibleTab) {
+        g_idle_add(
+                [](gpointer data) -> gboolean {
+                    Sidebar* sidebar = static_cast<Sidebar*>(data);
+                    sidebar->layout();
+                    return G_SOURCE_REMOVE;
+                },
+                this);
+    }
+}
+
+void Sidebar::updateVisibleTabs() {
+    size_t i = 0;
+    size_t selected = npos;
+
+    for (auto&& p: this->tabs) {
+        gtk_widget_set_visible(GTK_WIDGET(p->tabButton), p->hasData());
+
+        if (p->hasData() && selected == npos) {
+            selected = i;
+        }
+
+        i++;
+    }
+
+    setSelectedTab(selected);
+}
+
+void Sidebar::setTmpDisabled(bool disabled) {
+    gtk_widget_set_sensitive(this->buttonCloseSidebar, !disabled);
+    gtk_widget_set_sensitive(GTK_WIDGET(this->tbSelectTab), !disabled);
+
+    for (auto&& t: this->tabs) {
+        t->setTmpDisabled(disabled);
+    }
+
+    gdk_display_sync(gdk_display_get_default());
+}
+
+void Sidebar::saveSize() {
+    GtkAllocation alloc;
+    gtk_widget_get_allocation(this->sidebarContents, &alloc);
+
+    this->control->getSettings()->setSidebarWidth(alloc.width);
+}
+
+size_t Sidebar::getNumberOfTabs() const { return this->tabs.size(); }
+
+size_t Sidebar::getSelectedTab() const { return this->currentTabIdx; }
+
+auto Sidebar::getControl() -> Control* { return this->control; }
+
+void Sidebar::documentChanged(DocumentChangeType type) {
+    if (type == DOCUMENT_CHANGE_CLEARED || type == DOCUMENT_CHANGE_COMPLETE || type == DOCUMENT_CHANGE_PDF_BOOKMARKS) {
+        updateVisibleTabs();
+    }
+}
+
+SidebarTabButton::SidebarTabButton(Sidebar* sidebar, size_t index, AbstractSidebarPage* page):
+        sidebar(sidebar), index(index), page(page) {}
+
+void Sidebar::layout() {
+    for (auto&& tab: this->tabs) {
+        tab->layout();
+    }
+}
diff --git a/entry/src/main/cpp/src/core/gui/sidebar/Sidebar.h b/entry/src/main/cpp/src/core/gui/sidebar/Sidebar.h
new file mode 100644
index 0000000..e0a2af4
--- /dev/null
+++ b/entry/src/main/cpp/src/core/gui/sidebar/Sidebar.h
@@ -0,0 +1,139 @@
+/*
+ * Xournal++
+ *
+ * The Sidebar
+ *
+ * @author Xournal++ Team
+ * https://github.com/xournalpp/xournalpp
+ *
+ * @license GNU GPLv2 or later
+ */
+
+#pragma once
+
+#include <cstddef>  // for size_t
+#include <memory>   // for unique_ptr
+#include <vector>   // for vector
+
+#include <gtk/gtk.h>  // for GtkWidget, Gtk...
+
+#include "model/DocumentChangeType.h"                  // for DocumentChange...
+#include "model/DocumentListener.h"                    // for DocumentListener
+
+class AbstractSidebarPage;
+class Control;
+class GladeGui;
+class SidebarTabButton;
+
+class Sidebar: public DocumentListener {
+public:
+    Sidebar(GladeGui* gui, Control* control);
+    ~Sidebar() override;
+
+private:
+    void initTabs(GtkWidget* sidebarContents);
+    void addTab(std::unique_ptr<AbstractSidebarPage> tab);
+
+public:
+    /**
+     * Layout sidebar
+     */
+    void layout();
+
+    /**
+     * A page was selected, so also select this page in the sidebar
+     */
+    void selectPageNr(size_t page, size_t pdfPage);
+
+    Control* getControl();
+
+    /**
+     * Temporary disable Sidebar (e.g. while saving)
+     */
+    void setTmpDisabled(bool disabled);
+
+    /**
+     * Saves the current size to the settings
+     */
+    void saveSize();
+
+    /**
+     * Get how many pages are contained in this sidebar
+     *
+     * Todo: it makes no sense to expose this, as the caller has no way of knowing what those pages correspond to
+     */
+    [[deprecated]] size_t getNumberOfTabs() const;
+
+    /**
+     * Get index of the currently selected page
+     *
+     * Todo: it makes no sense to expose this, as the caller has no way of knowing what this number corresponds to
+     */
+    [[deprecated]] size_t getSelectedTab() const;
+
+    /**
+     * Sets the current selected tab
+     *
+     * Todo: this should be private
+     */
+    void setSelectedTab(size_t tab);
+
+public:
+    // DocumentListener interface
+    void documentChanged(DocumentChangeType type) override;
+
+private:
+    /**
+     * Page selected
+     */
+    static void buttonClicked(GtkButton* button, SidebarTabButton* buttonData);
+
+    /**
+     * Show/hide tabs based on whether they have content. Select first active tab (page).
+     */
+    void updateVisibleTabs();
+
+
+private:
+    Control* control = nullptr;
+
+    /**
+     * The sidebar pages
+     */
+    std::vector<std::unique_ptr<AbstractSidebarPage>> tabs;
+
+    /**
+     * The bar with the tab selection
+     */
+    GtkBox* tbSelectTab = nullptr;
+
+    /**
+     * The close button of the sidebar
+     */
+    GtkWidget* buttonCloseSidebar = nullptr;
+
+    /**
+     * The current visible page in the sidebar
+     */
+    GtkWidget* visibleTab = nullptr;
+
+    /**
+     * Current active page
+     */
+    size_t currentTabIdx{0};
+
+    /**
+     * The sidebarContents widget
+     */
+    GtkWidget* sidebarContents = nullptr;
+};
+
+class SidebarTabButton {
+public:
+    SidebarTabButton(Sidebar* sidebar, size_t index, AbstractSidebarPage* page);
+
+public:
+    Sidebar* sidebar = nullptr;
+    size_t index = 0;
+    AbstractSidebarPage* page = nullptr;
+};
diff --git a/entry/src/main/cpp/src/core/gui/sidebar/indextree/SidebarIndexPage.cpp b/entry/src/main/cpp/src/core/gui/sidebar/indextree/SidebarIndexPage.cpp
new file mode 100644
index 0000000..db57042
--- /dev/null
+++ b/entry/src/main/cpp/src/core/gui/sidebar/indextree/SidebarIndexPage.cpp
@@ -0,0 +1,305 @@
+#include "SidebarIndexPage.h"
+
+#include <cstring>  // for strlen
+
+#include <glib-object.h>  // for g_object_unref
+#include <pango/pango.h>  // for PangoLogAttr
+
+#include "control/Control.h"        // for Control
+#include "control/ScrollHandler.h"  // for ScrollHandler
+#include "model/Document.h"         // for Document
+#include "model/LinkDestination.h"  // for XojLinkDest
+#include "util/Assert.h"            // for xoj_assert
+#include "util/glib_casts.h"        // for wrap_v
+#include "util/gtk4_helper.h"       //
+#include "util/i18n.h"              // for _
+#include "util/safe_casts.h"        // for as_unsigned
+
+SidebarIndexPage::SidebarIndexPage(Control* control):
+        AbstractSidebarPage(control), iconNameHelper(control->getSettings()) {
+    this->treeViewBookmarks = gtk_tree_view_new();
+    g_object_ref(this->treeViewBookmarks);
+
+    gtk_tree_view_set_enable_search(GTK_TREE_VIEW(treeViewBookmarks), true);
+    gtk_tree_view_set_search_column(GTK_TREE_VIEW(treeViewBookmarks), DOCUMENT_LINKS_COLUMN_NAME);
+    gtk_tree_view_set_search_equal_func(GTK_TREE_VIEW(treeViewBookmarks),
+                                        reinterpret_cast<GtkTreeViewSearchEqualFunc>(treeSearchFunction), this,
+                                        nullptr);
+
+    this->scrollBookmarks = gtk_scrolled_window_new();
+    g_object_ref(this->scrollBookmarks);
+
+    gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(scrollBookmarks), GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
+
+    GtkTreeSelection* selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(treeViewBookmarks));
+    gtk_tree_selection_set_mode(selection, GTK_SELECTION_SINGLE);
+    gtk_tree_view_set_headers_visible(GTK_TREE_VIEW(treeViewBookmarks), false);
+    gtk_scrolled_window_set_child(GTK_SCROLLED_WINDOW(scrollBookmarks), treeViewBookmarks);
+
+
+    GtkTreeViewColumn* column = gtk_tree_view_column_new();
+    gtk_tree_view_column_set_expand(GTK_TREE_VIEW_COLUMN(column), true);
+    gtk_tree_view_append_column(GTK_TREE_VIEW(treeViewBookmarks), column);
+
+    auto* renderer = static_cast<GtkCellRenderer*>(
+            g_object_new(GTK_TYPE_CELL_RENDERER_TEXT, "ellipsize", PANGO_ELLIPSIZE_END, nullptr));
+    gtk_tree_view_column_pack_start(GTK_TREE_VIEW_COLUMN(column), renderer, true);
+    gtk_tree_view_column_set_attributes(GTK_TREE_VIEW_COLUMN(column), renderer, "markup", DOCUMENT_LINKS_COLUMN_NAME,
+                                        nullptr);
+
+    renderer = gtk_cell_renderer_text_new();
+    gtk_tree_view_column_pack_end(GTK_TREE_VIEW_COLUMN(column), renderer, false);
+    gtk_tree_view_column_set_attributes(GTK_TREE_VIEW_COLUMN(column), renderer, "text",
+                                        DOCUMENT_LINKS_COLUMN_PAGE_NUMBER, nullptr);
+    g_object_set(G_OBJECT(renderer), "style", PANGO_STYLE_ITALIC, nullptr);
+
+    this->selectHandler = g_signal_connect(treeViewBookmarks, "cursor-changed", G_CALLBACK(treeBookmarkSelected), this);
+    xoj_assert(this->selectHandler != 0);
+
+    gtk_widget_show(this->treeViewBookmarks);
+
+    registerListener(control);
+}
+
+SidebarIndexPage::~SidebarIndexPage() {
+    if (this->searchTimeout) {
+        g_source_remove(this->searchTimeout);
+        this->searchTimeout = 0;
+    }
+
+    g_object_unref(this->treeViewBookmarks);
+    g_object_unref(this->scrollBookmarks);
+}
+
+void SidebarIndexPage::enableSidebar() {}
+
+void SidebarIndexPage::disableSidebar() {
+    // Nothing to do at the moment
+}
+
+void SidebarIndexPage::treeBookmarkSelected(GtkTreeView* treeview, SidebarIndexPage* sidebar) {
+    if (sidebar->searchTimeout) {
+        return;
+    }
+
+    gtk_widget_grab_focus(GTK_WIDGET(treeview));
+
+    GtkTreeSelection* selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(treeview));
+
+    if (selection) {
+        GtkTreeModel* model = nullptr;
+        GtkTreeIter iter = {0};
+
+        if (gtk_tree_selection_get_selected(selection, &model, &iter)) {
+            XojLinkDest* link = nullptr;
+
+            gtk_tree_model_get(model, &iter, DOCUMENT_LINKS_COLUMN_LINK, &link, -1);
+            if (link && link->dest) {
+                LinkDestination* dest = link->dest;
+
+                sidebar->control->getScrollHandler()->scrollToLinkDest(*dest);
+            }
+            g_object_unref(link);
+        }
+    }
+}
+
+auto SidebarIndexPage::searchTimeoutFunc(SidebarIndexPage* sidebar) -> bool {
+    sidebar->searchTimeout = 0;
+
+    treeBookmarkSelected(GTK_TREE_VIEW(sidebar->treeViewBookmarks), sidebar);
+
+    return false;
+}
+
+auto SidebarIndexPage::treeSearchFunction(GtkTreeModel* model, gint column, const gchar* key, GtkTreeIter* iter,
+                                          SidebarIndexPage* sidebar) -> gboolean {
+    if (sidebar->searchTimeout) {
+        g_source_remove(sidebar->searchTimeout);
+        sidebar->searchTimeout = 0;
+    }
+    sidebar->searchTimeout = g_timeout_add_seconds_full(G_PRIORITY_DEFAULT_IDLE, 2,
+                                                        xoj::util::wrap_v<searchTimeoutFunc>, sidebar, nullptr);
+
+    // Source: Pidgin
+    gchar* text = nullptr;
+    gtk_tree_model_get(model, iter, DOCUMENT_LINKS_COLUMN_NAME, &text, -1);
+    if (text == nullptr) {
+        return true;
+    }
+
+    gchar* tmp = g_utf8_normalize(key, -1, G_NORMALIZE_DEFAULT);
+    gchar* enteredstring = g_utf8_casefold(tmp, -1);
+    g_free(tmp);
+
+    tmp = g_utf8_normalize(text, -1, G_NORMALIZE_DEFAULT);
+    gchar* normalized = g_utf8_casefold(tmp, -1);
+    g_free(tmp);
+
+    if (g_str_has_prefix(normalized, enteredstring)) {
+        g_free(enteredstring);
+        g_free(normalized);
+        return false;
+    }
+
+    /* Use Pango to separate by words. */
+    size_t len = as_unsigned(g_utf8_strlen(normalized, -1));
+    PangoLogAttr* log_attrs = g_new(PangoLogAttr, len + 1);
+
+    pango_get_log_attrs(normalized, static_cast<int>(strlen(normalized)), -1, nullptr, log_attrs,
+                        static_cast<int>(len + 1));
+
+    gchar* word = normalized;
+    gboolean result = true;
+    for (size_t i = 0; i < (len - 1); i++) {
+        if (log_attrs[i].is_word_start && g_str_has_prefix(word, enteredstring)) {
+            result = false;
+            break;
+        }
+        word = g_utf8_next_char(word);
+    }
+    g_free(log_attrs);
+
+    g_free(enteredstring);
+    g_free(normalized);
+
+    return result;
+}
+
+auto SidebarIndexPage::getName() -> std::string { return _("Contents"); }
+
+auto SidebarIndexPage::getIconName() -> std::string { return this->iconNameHelper.iconName("sidebar-index"); }
+
+auto SidebarIndexPage::hasData() -> bool { return this->hasContents; }
+
+auto SidebarIndexPage::getWidget() -> GtkWidget* { return this->scrollBookmarks; }
+
+auto SidebarIndexPage::expandOpenLinks(GtkTreeModel* model, GtkTreeIter* parent) -> int {
+    GtkTreeIter iter = {0};
+    XojLinkDest* link = nullptr;
+    if (model == nullptr) {
+        return 0;
+    }
+
+    int count = 0;
+
+    if (gtk_tree_model_iter_children(model, &iter, parent)) {
+        do {
+            gtk_tree_model_get(model, &iter, DOCUMENT_LINKS_COLUMN_LINK, &link, -1);
+
+            if (link->dest->getExpand()) {
+                GtkTreePath* path = gtk_tree_model_get_path(model, &iter);
+                gtk_tree_view_expand_row(GTK_TREE_VIEW(treeViewBookmarks), path, false);
+                gtk_tree_path_free(path);
+            }
+
+            g_object_unref(link);
+
+            count++;
+
+            count += expandOpenLinks(model, &iter);
+        } while (gtk_tree_model_iter_next(model, &iter));
+    }
+
+    return count;
+}
+
+void SidebarIndexPage::selectPageNr(size_t page, size_t pdfPage) { selectPageNr(page, pdfPage, nullptr); }
+
+auto SidebarIndexPage::selectPageNr(size_t page, size_t pdfPage, GtkTreeIter* parent) -> bool {
+    GtkTreeIter iter;
+
+    Document* doc = control->getDocument();
+    doc->lock_shared();
+    GtkTreeModel* model = doc->getContentsModel();
+    if (model == nullptr) {
+        doc->unlock_shared();
+        return false;
+    }
+
+    g_object_ref(model);
+    doc->unlock_shared();
+
+    if (parent == nullptr) {
+
+        // check if there is already the current page selected
+        GtkTreeSelection* selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(treeViewBookmarks));
+
+        if (gtk_tree_selection_get_selected(selection, &model, &iter)) {
+            XojLinkDest* link = nullptr;
+
+            gtk_tree_model_get(model, &iter, DOCUMENT_LINKS_COLUMN_LINK, &link, -1);
+
+            if (link && link->dest) {
+                LinkDestination* dest = link->dest;
+
+                if (dest->getPdfPage() == pdfPage) {
+
+                    g_object_unref(model);
+                    g_object_unref(link);
+
+                    // already a bookmark from this page selected
+                    return true;
+                }
+            }
+
+            g_object_unref(link);
+        }
+    }
+
+    gboolean valid = gtk_tree_model_iter_children(model, &iter, parent);
+
+    while (valid) {
+        XojLinkDest* link = nullptr;
+
+        gtk_tree_model_get(model, &iter, DOCUMENT_LINKS_COLUMN_LINK, &link, -1);
+
+        if (link->dest->getPdfPage() == pdfPage) {
+            GtkTreeSelection* selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(treeViewBookmarks));
+            gtk_tree_selection_select_iter(selection, &iter);
+
+            g_object_unref(link);
+            g_object_unref(model);
+            return true;
+        }
+
+
+        g_object_unref(link);
+
+        if (selectPageNr(page, pdfPage, &iter)) {
+            g_object_unref(model);
+            return true;
+        }
+
+
+        valid = gtk_tree_model_iter_next(model, &iter);
+    }
+
+    g_object_unref(model);
+    return false;
+}
+
+void SidebarIndexPage::documentChanged(DocumentChangeType type) {
+    if (type == DOCUMENT_CHANGE_CLEARED) {
+        gtk_tree_view_set_model(GTK_TREE_VIEW(this->treeViewBookmarks), nullptr);
+    } else if (type == DOCUMENT_CHANGE_PDF_BOOKMARKS || type == DOCUMENT_CHANGE_COMPLETE) {
+
+        Document* doc = this->control->getDocument();
+
+        //  Block the cursor-change signal when the document changes, otherwise
+        //  there will be a deadlock: both the selectHandler and this code will
+        //  lock the document.
+        g_signal_handler_block(this->treeViewBookmarks, this->selectHandler);
+        doc->lock_shared();
+        GtkTreeModel* model = doc->getContentsModel();
+        gtk_tree_view_set_model(GTK_TREE_VIEW(this->treeViewBookmarks), model);
+        int count = expandOpenLinks(model, nullptr);
+        doc->unlock_shared();
+        g_signal_handler_unblock(this->treeViewBookmarks, this->selectHandler);
+        this->treeBookmarkSelected(GTK_TREE_VIEW(this->treeViewBookmarks), this);
+
+        hasContents = (count != 0);
+    }
+}
+
+void SidebarIndexPage::layout() {}
diff --git a/entry/src/main/cpp/src/core/gui/sidebar/indextree/SidebarIndexPage.h b/entry/src/main/cpp/src/core/gui/sidebar/indextree/SidebarIndexPage.h
new file mode 100644
index 0000000..322b084
--- /dev/null
+++ b/entry/src/main/cpp/src/core/gui/sidebar/indextree/SidebarIndexPage.h
@@ -0,0 +1,126 @@
+/*
+ * Xournal++
+ *
+ * Index Sidebar Page
+ *
+ * @author Xournal++ Team
+ * https://github.com/xournalpp/xournalpp
+ *
+ * @license GNU GPLv2 or later
+ */
+
+#pragma once
+
+#include <cstddef>  // for size_t
+#include <string>   // for string
+
+#include <glib.h>     // for gboolean, gchar, gint
+#include <gtk/gtk.h>  // for GtkWidget, GtkTreeIter
+
+#include "gui/IconNameHelper.h"               // for IconNameHelper
+#include "gui/sidebar/AbstractSidebarPage.h"  // for AbstractSidebarPage
+#include "model/DocumentChangeType.h"         // for DocumentChangeType
+
+class Control;
+class SidebarToolbar;
+
+class SidebarIndexPage: public AbstractSidebarPage {
+public:
+    SidebarIndexPage(Control* control);
+    ~SidebarIndexPage() override;
+
+public:
+    void enableSidebar() override;
+    void disableSidebar() override;
+
+    void layout() override;
+
+    /**
+     * @overwrite
+     */
+    std::string getName() override;
+
+    /**
+     * @overwrite
+     */
+    std::string getIconName() override;
+
+    /**
+     * @overwrite
+     */
+    bool hasData() override;
+
+    /**
+     * @overwrite
+     */
+    GtkWidget* getWidget() override;
+
+    /**
+     * @overwrite
+     */
+    void selectPageNr(size_t page, size_t pdfPage) override;
+
+    /**
+     * Select page in the tree
+     */
+    bool selectPageNr(size_t page, size_t pdfPage, GtkTreeIter* parent);
+
+    /**
+     * @overwrite
+     */
+    void documentChanged(DocumentChangeType type) override;
+
+private:
+    /**
+     * Tree search function if you type chars within the tree. Source: Pidgin
+     */
+    static gboolean treeSearchFunction(GtkTreeModel* model, gint column, const gchar* key, GtkTreeIter* iter,
+                                       SidebarIndexPage* sidebar);
+
+    /**
+     * A bookmark was selected
+     */
+    static void treeBookmarkSelected(GtkTreeView* treeview, SidebarIndexPage* sidebar);
+
+    /**
+     * The function which is called after a search timeout
+     */
+    static auto searchTimeoutFunc(SidebarIndexPage* sidebar) -> bool;
+
+private:
+    /**
+     * Expand links
+     */
+    int expandOpenLinks(GtkTreeModel* model, GtkTreeIter* parent);
+
+private:
+    /**
+     * The Tree with the Bookmarks
+     */
+    GtkWidget* treeViewBookmarks = nullptr;
+
+    /**
+     * The scrollbars for the Tree
+     */
+    GtkWidget* scrollBookmarks = nullptr;
+
+    /**
+     * Keep track of the tree bookmark selection handler; see documentChanged
+     * method for why this is necessary.
+     */
+    unsigned long selectHandler = 0;  // g_signal_connect uses 0 as error value
+
+    /**
+     * If currently searching, scroll to the page is disable, else search is not really working
+     *
+     * After a timeout we scroll to the selected page
+     */
+    guint searchTimeout = 0;
+
+    /**
+     * If there is something to display in the tree
+     */
+    bool hasContents = false;
+
+    IconNameHelper iconNameHelper;
+};
diff --git a/entry/src/main/cpp/src/core/gui/sidebar/previews/base/SidebarLayout.cpp b/entry/src/main/cpp/src/core/gui/sidebar/previews/base/SidebarLayout.cpp
new file mode 100644
index 0000000..752f5a3
--- /dev/null
+++ b/entry/src/main/cpp/src/core/gui/sidebar/previews/base/SidebarLayout.cpp
@@ -0,0 +1,107 @@
+#include "SidebarLayout.h"
+
+#include <algorithm>  // for max
+#include <vector>     // for vector
+
+#include <gtk/gtk.h>  // for GTK_FIXED, gtk_fixed_move
+
+#include "util/gtk4_helper.h"
+#include "util/safe_casts.h"  // for as_unsigned
+
+#include "SidebarPreviewBase.h"       // for SidebarPreviewBase
+#include "SidebarPreviewBaseEntry.h"  // for SidebarPreviewBaseEntry
+
+class SidebarRow {
+public:
+    explicit SidebarRow(int width) {
+        this->width = width;
+        this->currentWidth = 0;
+    }
+
+    ~SidebarRow() { clear(); }
+
+
+    auto isSpaceFor(SidebarPreviewBaseEntry* p) -> bool {
+        if (this->list.empty()) {
+            return true;
+        }
+
+        if (this->currentWidth + p->getWidth() < width) {
+            return true;
+        }
+        return false;
+    }
+
+    void add(SidebarPreviewBaseEntry* p) {
+        this->list.push_back(p);
+        this->currentWidth += p->getWidth();
+    }
+
+    void clear() {
+        this->list.clear();
+        this->currentWidth = 0;
+    }
+
+    auto getCount() -> size_t { return this->list.size(); }
+
+    auto getWidth() const -> int { return this->currentWidth; }
+
+    auto placeAt(int y, GtkFixed* layout) -> int {
+        int height = 0;
+        int x = 0;
+
+        for (SidebarPreviewBaseEntry* p: this->list) { height = std::max(height, p->getHeight()); }
+
+
+        for (SidebarPreviewBaseEntry* p: this->list) {
+            int currentY = (height - p->getHeight()) / 2;
+
+            gtk_fixed_move(layout, p->getWidget(), x, y + currentY);
+
+            x += p->getWidth();
+        }
+
+
+        return height;
+    }
+
+private:
+    int width;
+    int currentWidth;
+
+    std::vector<SidebarPreviewBaseEntry*> list;
+};
+
+void SidebarLayout::layout(SidebarPreviewBase* sidebar) {
+    int y = 0;
+    int width = 0;
+
+    int sidebarWidth = gtk_widget_get_width(sidebar->scrollableBox.get());
+
+    SidebarRow row(sidebarWidth);
+    GtkFixed* w = sidebar->miniaturesContainer.get();
+
+    for (auto& p: sidebar->previews) {
+        if (row.isSpaceFor(p.get())) {
+            row.add(p.get());
+        } else {
+            y += row.placeAt(y, w);
+
+            width = std::max(width, row.getWidth());
+
+            row.clear();
+            row.add(p.get());
+        }
+    }
+
+    if (row.getCount() != 0) {
+        y += row.placeAt(y, w);
+
+        width = std::max(width, row.getWidth());
+
+        row.clear();
+    }
+
+    gtk_widget_set_size_request(GTK_WIDGET(w), width, y);
+    gtk_widget_show_all(GTK_WIDGET(w));
+}
diff --git a/entry/src/main/cpp/src/core/gui/sidebar/previews/base/SidebarLayout.h b/entry/src/main/cpp/src/core/gui/sidebar/previews/base/SidebarLayout.h
new file mode 100644
index 0000000..5ca6a1f
--- /dev/null
+++ b/entry/src/main/cpp/src/core/gui/sidebar/previews/base/SidebarLayout.h
@@ -0,0 +1,28 @@
+/*
+ * Xournal++
+ *
+ * Sidebar preview layout
+ *
+ * @author Xournal++ Team
+ * https://github.com/xournalpp/xournalpp
+ *
+ * @license GNU GPLv2 or later
+ */
+
+#pragma once
+
+class SidebarPreviewBase;
+
+class SidebarLayout {
+public:
+    SidebarLayout() = delete;
+    ~SidebarLayout() = delete;
+
+public:
+    /**
+     * Layouts the sidebar
+     */
+    static void layout(SidebarPreviewBase* sidebar);
+
+private:
+};
diff --git a/entry/src/main/cpp/src/core/gui/sidebar/previews/base/SidebarPreviewBase.cpp b/entry/src/main/cpp/src/core/gui/sidebar/previews/base/SidebarPreviewBase.cpp
new file mode 100644
index 0000000..da93df4
--- /dev/null
+++ b/entry/src/main/cpp/src/core/gui/sidebar/previews/base/SidebarPreviewBase.cpp
@@ -0,0 +1,152 @@
+#include "SidebarPreviewBase.h"
+
+#include <cstdlib>  // for abs, size_t
+
+#include <glib-object.h>  // for g_object_ref, G_CALLBACK, g_sig...
+#include <glib.h>         // for g_idle_add
+
+#include "control/Control.h"   // for Control
+#include "control/PdfCache.h"  // for PdfCache
+#include "gui/Builder.h"       // for Builder
+#include "gui/MainWindow.h"    // for MainWindow
+#include "model/Document.h"    // for Document
+#include "util/Util.h"         // for npos
+#include "util/glib_casts.h"   // for wrap_for_once_v
+#include "util/gtk4_helper.h"
+
+#include "SidebarLayout.h"            // for SidebarLayout
+#include "SidebarPreviewBaseEntry.h"  // for SidebarPreviewBaseEntry
+
+constexpr auto XML_FILE = "sidebar.ui";
+
+SidebarPreviewBase::SidebarPreviewBase(Control* control, const char* menuId, const char* toolbarId):
+        AbstractSidebarPage(control),
+        scrollableBox(gtk_scrolled_window_new(), xoj::util::adopt),
+        mainBox(gtk_box_new(GTK_ORIENTATION_VERTICAL, 0), xoj::util::adopt),
+        miniaturesContainer(GTK_FIXED(gtk_fixed_new()), xoj::util::adopt) {
+    gtk_box_append(GTK_BOX(mainBox.get()), scrollableBox.get());
+    gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(scrollableBox.get()), GTK_POLICY_AUTOMATIC,
+                                   GTK_POLICY_AUTOMATIC);
+    gtk_scrolled_window_set_child(GTK_SCROLLED_WINDOW(scrollableBox.get()), GTK_WIDGET(miniaturesContainer.get()));
+    gtk_widget_set_vexpand(scrollableBox.get(), true);
+
+    Document* doc = this->control->getDocument();
+    doc->lock_shared();
+    if (doc->getPdfPageCount() != 0) {
+        this->cache = std::make_unique<PdfCache>(doc->getPdfDocument(), control->getSettings());
+    }
+    doc->unlock_shared();
+
+
+    registerListener(this->control);
+    this->control->addChangedDocumentListener(this);
+
+    auto* adj = gtk_scrolled_window_get_hadjustment(GTK_SCROLLED_WINDOW(scrollableBox.get()));
+    g_signal_connect(
+            adj, "notify::page-size", G_CALLBACK(+[](GObject* adj, GParamSpec*, gpointer d) {
+                static_cast<SidebarPreviewBase*>(d)->newWidth(gtk_adjustment_get_page_size(GTK_ADJUSTMENT(adj)));
+            }),
+            this);
+
+    Builder builder(control->getGladeSearchPath(), XML_FILE);
+    GMenuModel* menu = G_MENU_MODEL(builder.get<GObject>(menuId));
+    contextMenu.reset(GTK_MENU(gtk_menu_new_from_model(menu)), xoj::util::adopt);
+    gtk_menu_attach_to_widget(contextMenu.get(), mainBox.get(), nullptr);
+
+    gtk_box_append(GTK_BOX(mainBox.get()), builder.get(toolbarId));
+
+    gtk_widget_show_all(mainBox.get());
+}
+
+SidebarPreviewBase::~SidebarPreviewBase() { this->control->removeChangedDocumentListener(this); }
+
+void SidebarPreviewBase::enableSidebar() {
+    if (!this->enabled) {
+        enabled = true;
+        layout();
+    }
+}
+
+void SidebarPreviewBase::disableSidebar() { enabled = false; }
+
+void SidebarPreviewBase::newWidth(double width) {
+    static constexpr double TRIGGER = 20.;
+
+    if (std::abs(lastWidth - width) > TRIGGER) {
+        this->layout();
+        lastWidth = width;
+    }
+}
+
+auto SidebarPreviewBase::getZoom() const -> double { return this->zoom; }
+
+auto SidebarPreviewBase::getCache() -> PdfCache* { return this->cache.get(); }
+
+void SidebarPreviewBase::layout() {
+    if (enabled) {
+        SidebarLayout::layout(this);
+    }
+}
+
+auto SidebarPreviewBase::hasData() -> bool { return true; }
+
+auto SidebarPreviewBase::getWidget() -> GtkWidget* { return this->mainBox.get(); }
+
+void SidebarPreviewBase::documentChanged(DocumentChangeType type) {
+    if (type == DOCUMENT_CHANGE_COMPLETE || type == DOCUMENT_CHANGE_CLEARED) {
+        this->cache.reset();
+
+        Document* doc = control->getDocument();
+        doc->lock_shared();
+        if (doc->getPdfPageCount() != 0) {
+            this->cache = std::make_unique<PdfCache>(doc->getPdfDocument(), control->getSettings());
+        }
+        doc->unlock_shared();
+        updatePreviews();
+    }
+}
+
+auto SidebarPreviewBase::scrollToPreview(SidebarPreviewBase* sidebar) -> bool {
+    if (!sidebar->enabled) {
+        return false;
+    }
+
+    MainWindow* win = sidebar->control->getWindow();
+    if (win == nullptr) {
+        return false;
+    }
+
+    GtkWidget* w = win->get("sidebar");
+    if (!gtk_widget_get_visible(w)) {
+        return false;
+    }
+
+    if (sidebar->selectedEntry != npos && sidebar->selectedEntry < sidebar->previews.size()) {
+        auto& p = sidebar->previews[sidebar->selectedEntry];
+
+        // scroll to preview
+        GtkAdjustment* vadj = gtk_scrolled_window_get_vadjustment(GTK_SCROLLED_WINDOW(sidebar->scrollableBox.get()));
+        GtkWidget* widget = p->getWidget();
+
+        GtkAllocation allocation;
+        gtk_widget_get_allocation(widget, &allocation);
+        int x = allocation.x;
+        int y = allocation.y;
+
+        if (x == -1) {
+            g_idle_add(xoj::util::wrap_for_once_v<scrollToPreview>, sidebar);
+            return false;
+        }
+
+        gtk_adjustment_clamp_page(vadj, y, y + allocation.height);
+    }
+    return false;
+}
+
+void SidebarPreviewBase::pageDeleted(size_t page) {}
+
+void SidebarPreviewBase::pageInserted(size_t page) {}
+
+void SidebarPreviewBase::openPreviewContextMenu(GdkEvent* currentEvent) {
+    gtk_menu_popup_at_pointer(contextMenu.get(), currentEvent);
+}
diff --git a/entry/src/main/cpp/src/core/gui/sidebar/previews/base/SidebarPreviewBase.h b/entry/src/main/cpp/src/core/gui/sidebar/previews/base/SidebarPreviewBase.h
new file mode 100644
index 0000000..d259c13
--- /dev/null
+++ b/entry/src/main/cpp/src/core/gui/sidebar/previews/base/SidebarPreviewBase.h
@@ -0,0 +1,138 @@
+/*
+ * Xournal++
+ *
+ * Base class for prviews in the sidebar
+ *
+ * @author Xournal++ Team
+ * https://github.com/xournalpp/xournalpp
+ *
+ * @license GNU GPLv2 or later
+ */
+
+#pragma once
+
+#include <cstddef>  // for size_t
+#include <memory>   // for unique_ptr
+#include <vector>   // for vector
+
+#include <gtk/gtk.h>  // for GtkWidget, GtkAllocation
+
+#include "gui/sidebar/AbstractSidebarPage.h"  // for AbstractSidebarPage
+#include "model/DocumentChangeType.h"         // for DocumentChangeType
+#include "util/Util.h"
+#include "util/raii/GObjectSPtr.h"
+
+class PdfCache;
+class SidebarLayout;
+class SidebarPreviewBaseEntry;
+class Control;
+
+class SidebarPreviewBase: public AbstractSidebarPage {
+public:
+    SidebarPreviewBase(Control* control, const char* menuId, const char* toolbarId);
+    ~SidebarPreviewBase() override;
+
+public:
+    void enableSidebar() override;
+    void disableSidebar() override;
+
+    /**
+     * Layout the pages to the current size of the sidebar
+     */
+    void layout() override;
+
+    /**
+     * Update the preview images
+     */
+    virtual void updatePreviews() = 0;
+
+    /**
+     * @overwrite
+     */
+    bool hasData() override;
+
+    /**
+     * @overwrite
+     */
+    GtkWidget* getWidget() override;
+
+    /**
+     * Gets the zoom factor for the previews
+     */
+    double getZoom() const;
+
+    /**
+     * Gets the PDF cache for preview rendering
+     */
+    PdfCache* getCache();
+
+public:
+    // DocumentListener interface (only the part handled by SidebarPreviewBase)
+    void documentChanged(DocumentChangeType type) override;
+    void pageInserted(size_t page) override;
+    void pageDeleted(size_t page) override;
+
+protected:
+    /**
+     * Timeout callback to scroll to a page
+     */
+    static bool scrollToPreview(SidebarPreviewBase* sidebar);
+
+    /// The width of the sidebar has changed
+    void newWidth(double width);
+
+public:
+    /**
+     * Opens a context menu, at the current cursor position.
+     */
+    void openPreviewContextMenu(GdkEvent* currentEvent);
+
+private:
+    /**
+     * The Zoom of the previews
+     */
+    double zoom = 0.15;
+
+    /// last recorded width of the sidebar
+    double lastWidth = -1;
+
+    /**
+     * For preview rendering
+     */
+    std::unique_ptr<PdfCache> cache;
+
+protected:
+    /// The scrollable area with the miniatures
+    xoj::util::WidgetSPtr scrollableBox;
+
+    /// Main box, containing the scrollable area and the toolbar.
+    xoj::util::WidgetSPtr mainBox;
+
+    /// The widget within the scrollable area with the page miniatures
+    xoj::util::GObjectSPtr<GtkFixed> miniaturesContainer;
+
+    /**
+     * The context menu to display when a miniature is right-clicked.
+     * This must be populated by the derived classes constructors.
+     * It must be a GtkPopover parented (gtk_widget_set_parent()) by this->miniaturesContainer
+     */
+    xoj::util::GObjectSPtr<GtkMenu> contextMenu;
+
+    /**
+     * The currently selected entry in the sidebar, starting from 0
+     * -1 means no valid selection
+     */
+    size_t selectedEntry = npos;
+
+    /**
+     * The previews
+     */
+    std::vector<std::unique_ptr<SidebarPreviewBaseEntry>> previews;
+
+    /**
+     * The sidebar is enabled
+     */
+    bool enabled = false;
+
+    friend class SidebarLayout;
+};
diff --git a/entry/src/main/cpp/src/core/gui/sidebar/previews/base/SidebarPreviewBaseEntry.cpp b/entry/src/main/cpp/src/core/gui/sidebar/previews/base/SidebarPreviewBaseEntry.cpp
new file mode 100644
index 0000000..74a117c
--- /dev/null
+++ b/entry/src/main/cpp/src/core/gui/sidebar/previews/base/SidebarPreviewBaseEntry.cpp
@@ -0,0 +1,165 @@
+#include "SidebarPreviewBaseEntry.h"
+
+#include <gdk/gdk.h>      // for GdkEvent, GDK_BUTTON_PRESS
+#include <glib-object.h>  // for G_CALLBACK, g_object_ref
+#include <gtk/gtk.h>      //
+
+#include "control/Control.h"                // for Control
+#include "control/jobs/XournalScheduler.h"  // for XournalScheduler
+#include "control/settings/Settings.h"      // for Settings
+#include "gui/Shadow.h"                     // for Shadow
+#include "model/XojPage.h"                  // for XojPage
+#include "util/Color.h"                     // for cairo_set_source_rgbi
+#include "util/gtk4_helper.h"               //
+#include "util/i18n.h"                      // for _
+#include "util/safe_casts.h"                // for floor_cast
+
+#include "SidebarPreviewBase.h"  // for SidebarPreviewBase
+
+static constexpr int MAX_MINIATURE_SIZE = 500;  ///< in pixels - avoid things going very wrong when pages are huge
+
+SidebarPreviewBaseEntry::SidebarPreviewBaseEntry(SidebarPreviewBase* sidebar, const PageRef& page):
+        sidebar(sidebar), page(page), button(gtk_button_new(), xoj::util::adopt) {
+
+    updateSize();
+    gtk_widget_set_events(this->button.get(), GDK_EXPOSURE_MASK);
+
+    g_signal_connect(this->button.get(), "draw", G_CALLBACK(drawCallback), this);
+
+    g_signal_connect(this->button.get(), "clicked", G_CALLBACK(+[](GtkButton*, gpointer self) {
+                         static_cast<SidebarPreviewBaseEntry*>(self)->mouseButtonPressCallback();
+                     }),
+                     this);
+
+    const auto clickCallback = G_CALLBACK(+[](GtkWidget*, GdkEvent* event, gpointer self) {
+        // Open context menu on right mouse click
+        if (event->type == GDK_BUTTON_PRESS) {
+            auto mouseEvent = reinterpret_cast<GdkEventButton*>(event);
+            if (mouseEvent->button == 3) {
+                static_cast<SidebarPreviewBaseEntry*>(self)->mouseButtonPressCallback();
+                static_cast<SidebarPreviewBaseEntry*>(self)->sidebar->openPreviewContextMenu(event);
+                return true;
+            }
+        }
+        return false;
+    });
+    g_signal_connect_after(this->button.get(), "button-press-event", clickCallback, this);
+}
+
+SidebarPreviewBaseEntry::~SidebarPreviewBaseEntry() {
+    this->sidebar->getControl()->getScheduler()->removeSidebar(this);
+}
+
+auto SidebarPreviewBaseEntry::drawCallback(GtkWidget* widget, cairo_t* cr, SidebarPreviewBaseEntry* preview)
+        -> gboolean {
+    preview->paint(cr);
+    return true;
+}
+
+void SidebarPreviewBaseEntry::setSelected(bool selected) {
+    if (this->selected == selected) {
+        return;
+    }
+    this->selected = selected;
+
+    gtk_widget_queue_draw(this->button.get());
+}
+
+void SidebarPreviewBaseEntry::repaint() { sidebar->getControl()->getScheduler()->addRepaintSidebar(this); }
+
+void SidebarPreviewBaseEntry::drawLoadingPage() {
+    this->buffer.reset(cairo_image_surface_create(CAIRO_FORMAT_ARGB32, imageWidth, imageHeight), xoj::util::adopt);
+
+    double zoom = sidebar->getZoom();
+
+    cairo_t* cr2 = cairo_create(this->buffer.get());
+    cairo_matrix_t defaultMatrix = {0};
+    cairo_get_matrix(cr2, &defaultMatrix);
+
+    cairo_translate(cr2, Shadow::getShadowTopLeftSize() + 2, Shadow::getShadowTopLeftSize() + 2);
+
+    cairo_scale(cr2, zoom, zoom);
+
+    const char* txtLoading = _("Loading...");
+
+    cairo_text_extents_t ex;
+    cairo_set_source_rgb(cr2, 0.5, 0.5, 0.5);
+    cairo_select_font_face(cr2, "Sans", CAIRO_FONT_SLANT_NORMAL, CAIRO_FONT_WEIGHT_BOLD);
+    cairo_set_font_size(cr2, 70.0);
+    cairo_text_extents(cr2, txtLoading, &ex);
+    cairo_move_to(cr2, (page->getWidth() - ex.width) / 2 - ex.x_bearing,
+                  (page->getHeight() - ex.height) / 2 - ex.y_bearing);
+    cairo_text_path(cr2, txtLoading);
+
+    cairo_destroy(cr2);
+}
+
+void SidebarPreviewBaseEntry::paint(cairo_t* cr) {
+    double height = page->getHeight() * sidebar->getZoom();
+    double width = page->getWidth() * sidebar->getZoom();
+
+    if (this->selected) {
+        Shadow::drawShadow(cr, Shadow::getShadowTopLeftSize(), Shadow::getShadowTopLeftSize(),
+                           round_cast<int>(width) + 4, round_cast<int>(height) + 4);
+        // Draw border
+        Util::cairo_set_source_rgbi(cr, sidebar->getControl()->getSettings()->getBorderColor());
+        cairo_set_line_width(cr, 2);
+        cairo_set_line_cap(cr, CAIRO_LINE_CAP_BUTT);
+        cairo_set_line_join(cr, CAIRO_LINE_JOIN_BEVEL);
+
+        cairo_rectangle(cr, Shadow::getShadowTopLeftSize() + 0.5, Shadow::getShadowTopLeftSize() + 0.5, width + 3,
+                        height + 3);
+
+        cairo_stroke(cr);
+    } else {
+        Shadow::drawShadow(cr, Shadow::getShadowTopLeftSize() + 2, Shadow::getShadowTopLeftSize() + 2,
+                           round_cast<int>(width), round_cast<int>(height));
+    }
+
+    this->drawingMutex.lock();
+
+    bool doRepaint = false;
+    if (!this->buffer) {
+        drawLoadingPage();
+        doRepaint = true;
+    }
+
+    cairo_set_source_surface(cr, this->buffer.get(), 0, 0);
+    cairo_paint(cr);
+
+    this->drawingMutex.unlock();
+
+    const auto& recolorParams = sidebar->getControl()->getSettings()->getRecolorParameters();
+    auto recolor = recolorParams.recolorizeSidebarMiniatures ? std::make_optional(recolorParams.recolor) : std::nullopt;
+
+    if (recolor) {
+        // encapsulate in save/restore to limit the scope of the clip operation
+        xoj::util::CairoSaveGuard const saveGuard(cr);
+        cairo_rectangle(cr, Shadow::getShadowTopLeftSize() + 2, Shadow::getShadowTopLeftSize() + 2, width, height);
+        // constrain the area which is painted on
+        cairo_clip(cr);
+        recolor->recolorCurrentCairoRegion(cr);
+    }
+
+    if (doRepaint) {
+        repaint();
+    }
+}
+
+void SidebarPreviewBaseEntry::updateSize() {
+    this->DPIscaling = gtk_widget_get_scale_factor(this->button.get());
+
+    const int shadowPadding = Shadow::getShadowBottomRightSize() + Shadow::getShadowTopLeftSize() + 4;
+    // To avoid having a black line, we use floor rather than ceil
+    this->imageWidth =
+            std::min(floor_cast<int>(page->getWidth() * sidebar->getZoom()) + shadowPadding, MAX_MINIATURE_SIZE);
+    this->imageHeight =
+            std::min(floor_cast<int>(page->getHeight() * sidebar->getZoom()) + shadowPadding, MAX_MINIATURE_SIZE);
+    gtk_widget_set_size_request(this->button.get(), imageWidth, imageHeight);
+}
+
+auto SidebarPreviewBaseEntry::getWidget() const -> GtkWidget* { return this->button.get(); }
+
+auto SidebarPreviewBaseEntry::getWidth() const -> int { return imageWidth; }
+
+auto SidebarPreviewBaseEntry::getHeight() const -> int { return imageHeight; }
diff --git a/entry/src/main/cpp/src/core/gui/sidebar/previews/base/SidebarPreviewBaseEntry.h b/entry/src/main/cpp/src/core/gui/sidebar/previews/base/SidebarPreviewBaseEntry.h
new file mode 100644
index 0000000..6f87e53
--- /dev/null
+++ b/entry/src/main/cpp/src/core/gui/sidebar/previews/base/SidebarPreviewBaseEntry.h
@@ -0,0 +1,103 @@
+/*
+ * Xournal++
+ *
+ * A preview entry in a sidebar
+ *
+ * @author Xournal++ Team
+ * https://github.com/xournalpp/xournalpp
+ *
+ * @license GNU GPLv2 or later
+ */
+
+#pragma once
+
+#include <mutex>  // for mutex
+
+#include <cairo.h>    // for cairo_t, cairo_surface_t
+#include <glib.h>     // for gboolean
+#include <gtk/gtk.h>  // for GtkWidget
+
+#include "model/PageRef.h"  // for PageRef
+#include "util/raii/CairoWrappers.h"
+#include "util/raii/GObjectSPtr.h"
+
+class SidebarPreviewBase;
+
+typedef enum {
+    /**
+     * Render the whole page
+     */
+    RENDER_TYPE_PAGE_PREVIEW = 1,
+
+    /**
+     * Render only a layer
+     */
+    RENDER_TYPE_PAGE_LAYER,
+
+    /**
+     * Render the stack up to a layer
+     */
+    RENDER_TYPE_PAGE_LAYERSTACK
+} PreviewRenderType;
+
+
+class SidebarPreviewBaseEntry {
+public:
+    SidebarPreviewBaseEntry(SidebarPreviewBase* sidebar, const PageRef& page);
+    virtual ~SidebarPreviewBaseEntry();
+
+public:
+    virtual GtkWidget* getWidget() const;
+    virtual int getWidth() const;
+    virtual int getHeight() const;
+
+    virtual void setSelected(bool selected);
+
+    virtual void repaint();
+    virtual void updateSize();
+
+    /**
+     * @return What should be rendered
+     */
+    virtual PreviewRenderType getRenderType() const = 0;
+
+private:
+    static gboolean drawCallback(GtkWidget* widget, cairo_t* cr, SidebarPreviewBaseEntry* preview);
+
+protected:
+    virtual void mouseButtonPressCallback() = 0;
+
+    virtual void drawLoadingPage();
+    virtual void paint(cairo_t* cr);
+
+protected:
+    /**
+     * If this page is currently selected
+     */
+    bool selected = false;
+
+    int imageWidth;
+    int imageHeight;
+    int DPIscaling;  ///< 1, maybe 2 in HiDPI setups
+
+    /**
+     * The sidebar which displays the previews
+     */
+    SidebarPreviewBase* sidebar;
+
+    /**
+     * The page which is representated
+     */
+    PageRef page;
+
+    /// Mutex protecting the buffer
+    std::mutex drawingMutex{};
+
+    /// Buffer because of performance reasons
+    xoj::util::CairoSurfaceSPtr buffer;
+
+    /// The main widget, containing the miniature
+    xoj::util::WidgetSPtr button;
+
+    friend class PreviewJob;
+};
diff --git a/entry/src/main/cpp/src/core/gui/sidebar/previews/layer/SidebarPreviewLayerEntry.cpp b/entry/src/main/cpp/src/core/gui/sidebar/previews/layer/SidebarPreviewLayerEntry.cpp
new file mode 100644
index 0000000..d7ee069
--- /dev/null
+++ b/entry/src/main/cpp/src/core/gui/sidebar/previews/layer/SidebarPreviewLayerEntry.cpp
@@ -0,0 +1,72 @@
+#include "SidebarPreviewLayerEntry.h"
+
+#include <gdk/gdk.h>      // for GdkEvent, GDK_BUTTON_PRESS, GdkEve...
+#include <glib-object.h>  // for G_CALLBACK, g_signal_connect, g_si...
+
+#include "gui/Shadow.h"  // for Shadow
+#include "util/gtk4_helper.h"
+
+#include "SidebarPreviewLayers.h"  // for SidebarPreviewLayers
+
+
+SidebarPreviewLayerEntry::SidebarPreviewLayerEntry(SidebarPreviewLayers* sidebar, const PageRef& page,
+                                                   Layer::Index layerId, const std::string& layerName, bool stacked):
+        SidebarPreviewBaseEntry(sidebar, page),
+        sidebar(sidebar),
+        layerId(layerId),
+        box(gtk_box_new(GTK_ORIENTATION_VERTICAL, 4), xoj::util::adopt),
+        stacked(stacked) {
+
+#if GTK_CHECK_VERSION(4, 8, 0)
+    cbVisible = gtk_check_button_new();
+    GtkWidget* lbl = gtk_label_new(layerName.c_str());
+    gtk_label_set_ellipsize(GTK_LABEL(lbl), PANGO_ELLIPSIZE_END);
+    gtk_check_button_set_child(GTK_CHECK_BUTTON(cbVisible), lbl);
+#else
+    cbVisible = gtk_check_button_new_with_label(layerName.c_str());
+#endif
+
+    callbackId = g_signal_connect(
+            cbVisible, "toggled", G_CALLBACK(+[](GtkCheckButton* btn, gpointer d) {
+                auto* self = static_cast<SidebarPreviewLayerEntry*>(d);
+                bool check = gtk_check_button_get_active(btn);
+                (dynamic_cast<SidebarPreviewLayers*>(self->sidebar))->layerVisibilityChanged(self->layerId, check);
+            }),
+            this);
+    gtk_widget_set_margin_start(cbVisible, Shadow::getShadowTopLeftSize());
+
+    // This doesn't really do it. gtk_widget_get_allocated_height() always returns 1...
+    toolbarHeight = gtk_widget_get_allocated_height(cbVisible) + Shadow::getShadowTopLeftSize() + 20;
+    gtk_box_append(GTK_BOX(box.get()), this->button.get());
+    gtk_box_append(GTK_BOX(box.get()), cbVisible);
+
+    gtk_widget_show_all(box.get());
+}
+
+SidebarPreviewLayerEntry::~SidebarPreviewLayerEntry() {
+    GtkWidget* w = this->getWidget();
+    gtk_fixed_remove(GTK_FIXED(gtk_widget_get_parent(w)), w);
+}
+
+void SidebarPreviewLayerEntry::mouseButtonPressCallback() {
+    (dynamic_cast<SidebarPreviewLayers*>(sidebar))->layerSelected(layerId);
+}
+
+auto SidebarPreviewLayerEntry::getRenderType() const -> PreviewRenderType {
+    return stacked ? RENDER_TYPE_PAGE_LAYERSTACK : RENDER_TYPE_PAGE_LAYER;
+}
+
+auto SidebarPreviewLayerEntry::getHeight() const -> int { return imageHeight + toolbarHeight; }
+
+auto SidebarPreviewLayerEntry::getLayer() const -> Layer::Index { return layerId; }
+
+auto SidebarPreviewLayerEntry::getWidget() const -> GtkWidget* { return this->box.get(); }
+
+/**
+ * Set the value of the visible checkbox
+ */
+void SidebarPreviewLayerEntry::setVisibleCheckbox(bool enabled) {
+    g_signal_handler_block(cbVisible, callbackId);
+    gtk_check_button_set_active(GTK_CHECK_BUTTON(cbVisible), enabled);
+    g_signal_handler_unblock(cbVisible, callbackId);
+}
diff --git a/entry/src/main/cpp/src/core/gui/sidebar/previews/layer/SidebarPreviewLayerEntry.h b/entry/src/main/cpp/src/core/gui/sidebar/previews/layer/SidebarPreviewLayerEntry.h
new file mode 100644
index 0000000..3a8ec3a
--- /dev/null
+++ b/entry/src/main/cpp/src/core/gui/sidebar/previews/layer/SidebarPreviewLayerEntry.h
@@ -0,0 +1,79 @@
+/*
+ * Xournal++
+ *
+ * A Sidebar preview widget
+ *
+ * @author Xournal++ Team
+ * https://github.com/xournalpp/xournalpp
+ *
+ * @license GNU GPLv2 or later
+ */
+
+#pragma once
+
+#include <cstddef>  // for size_t
+#include <string>   // for string
+
+#include <gtk/gtk.h>  // for GtkWi...
+
+#include "gui/sidebar/previews/base/SidebarPreviewBaseEntry.h"  // for Previ...
+#include "model/Layer.h"                                        // for Layer
+#include "model/PageRef.h"                                      // for PageRef
+#include "util/raii/GObjectSPtr.h"
+
+class SidebarPreviewLayers;
+
+class SidebarPreviewLayerEntry: public SidebarPreviewBaseEntry {
+public:
+    SidebarPreviewLayerEntry(SidebarPreviewLayers* sidebar, const PageRef& page, Layer::Index layerId,
+                             const std::string& layerName, bool stacked);
+    ~SidebarPreviewLayerEntry() override;
+
+public:
+    int getHeight() const override;
+
+    /**
+     * @return What should be rendered
+     * @override
+     */
+    PreviewRenderType getRenderType() const override;
+
+    /**
+     * @return The layer to be rendered
+     */
+    Layer::Index getLayer() const;
+
+    GtkWidget* getWidget() const override;
+
+    /**
+     * Set the value of the visible checkbox
+     */
+    void setVisibleCheckbox(bool enabled);
+
+protected:
+    void mouseButtonPressCallback() override;
+    void checkboxToggled();
+
+    SidebarPreviewLayers* sidebar;
+
+private:
+    /// Layer to render
+    Layer::Index layerId;
+
+    /**
+     * Toolbar with controls
+     */
+    int toolbarHeight = 0;
+
+    /// Container box for the preview and the button
+    xoj::util::WidgetSPtr box;
+
+    /// Visibility checkbox
+    GtkWidget* cbVisible = nullptr;
+    gulong callbackId = 0;
+
+    /// render as stacked
+    bool stacked = false;
+
+    friend class PreviewJob;
+};
diff --git a/entry/src/main/cpp/src/core/gui/sidebar/previews/layer/SidebarPreviewLayers.cpp b/entry/src/main/cpp/src/core/gui/sidebar/previews/layer/SidebarPreviewLayers.cpp
new file mode 100644
index 0000000..53535ce
--- /dev/null
+++ b/entry/src/main/cpp/src/core/gui/sidebar/previews/layer/SidebarPreviewLayers.cpp
@@ -0,0 +1,143 @@
+#include "SidebarPreviewLayers.h"
+
+#include <algorithm>  // for max
+#include <vector>     // for vector
+
+#include <gtk/gtk.h>  // for gtk...
+
+#include "control/Control.h"                                    // for Con...
+#include "control/layer/LayerController.h"                      // for Lay...
+#include "gui/sidebar/previews/base/SidebarPreviewBaseEntry.h"  // for Sid...
+#include "model/PageRef.h"                                      // for Pag...
+#include "model/XojPage.h"                                      // for Xoj...
+#include "util/Util.h"                                          // for npos
+#include "util/gtk4_helper.h"
+#include "util/i18n.h"  // for _
+
+#include "SidebarPreviewLayerEntry.h"  // for Sid...
+
+constexpr auto MENU_ID = "PreviewLayersContextMenu";
+constexpr auto TOOLBAR_ID = "PreviewLayersToolbar";
+
+SidebarPreviewLayers::SidebarPreviewLayers(Control* control, bool stacked):
+        SidebarPreviewBase(control, MENU_ID, TOOLBAR_ID),
+        lc(control->getLayerController()),
+        stacked(stacked),
+        iconNameHelper(control->getSettings()) {
+    LayerCtrlListener::registerListener(lc);
+}
+
+SidebarPreviewLayers::~SidebarPreviewLayers() = default;
+
+void SidebarPreviewLayers::enableSidebar() {
+    SidebarPreviewBase::enableSidebar();
+    rebuildLayerMenu();
+}
+
+auto SidebarPreviewLayers::getName() -> std::string { return stacked ? _("Layerstack Preview") : _("Layer Preview"); }
+
+auto SidebarPreviewLayers::getIconName() -> std::string {
+    const char* icon = stacked ? "sidebar-layerstack" : "sidebar-layer";
+    return this->iconNameHelper.iconName(icon);
+}
+
+void SidebarPreviewLayers::pageSizeChanged(size_t page) {
+    if (page != this->lc->getCurrentPageId() || !enabled) {
+        return;
+    }
+
+    updatePreviews();
+}
+
+void SidebarPreviewLayers::pageChanged(size_t page) {
+    if (page != this->lc->getCurrentPageId() || !enabled) {
+        return;
+    }
+
+    // Repaint all layer
+    for (auto& p: this->previews) { p->repaint(); }
+}
+
+void SidebarPreviewLayers::updatePreviews() {
+    if (!enabled) {
+        return;
+    }
+
+    // clear old previews
+    this->previews.clear();
+    this->selectedEntry = npos;
+
+    PageRef page = lc->getCurrentPage();
+    if (!page) {
+        return;
+    }
+
+    auto layerCount = page->getLayerCount();
+
+    for (auto i = layerCount + 1; i != 0;) {
+        --i;
+        std::string name = lc->getLayerNameById(i);
+        auto p = std::make_unique<SidebarPreviewLayerEntry>(this, page, i, name, this->stacked);
+        gtk_fixed_put(this->miniaturesContainer.get(), p->getWidget(), 0, 0);
+        this->previews.emplace_back(std::move(p));
+    }
+
+    layout();
+    updateSelectedLayer();
+    layerVisibilityChanged();
+}
+
+void SidebarPreviewLayers::rebuildLayerMenu() {
+    if (!enabled) {
+        return;
+    }
+
+    updatePreviews();
+}
+
+void SidebarPreviewLayers::layerVisibilityChanged() {
+    PageRef p = lc->getCurrentPage();
+    if (!p) {
+        return;
+    }
+
+    Layer::Index i = p->getLayerCount();
+    for (auto& e: this->previews) {
+        dynamic_cast<SidebarPreviewLayerEntry*>(e.get())->setVisibleCheckbox(p->isLayerVisible(i--));
+    }
+    updateSelectedLayer();
+}
+
+void SidebarPreviewLayers::updateSelectedLayer() {
+    // Layers are in reverse order (top index: 0, but bottom preview is 0)
+    size_t entryIndex = this->previews.size() - lc->getCurrentLayerId() - 1;
+
+    if (this->selectedEntry == entryIndex) {
+        return;
+    }
+
+    if (this->selectedEntry != npos && this->selectedEntry < this->previews.size()) {
+        this->previews[this->selectedEntry]->setSelected(false);
+    }
+
+    this->selectedEntry = entryIndex;
+    if (this->selectedEntry != npos && this->selectedEntry < this->previews.size()) {
+        auto& p = this->previews[this->selectedEntry];
+        p->setSelected(true);
+        scrollToPreview(this);
+    }
+}
+
+void SidebarPreviewLayers::layerSelected(Layer::Index layerId) {
+    if (layerId != 0) {  // We can't select the background
+        lc->switchToLay(layerId);
+        updateSelectedLayer();
+    }
+}
+
+/**
+ * A layer was hidden / showed
+ */
+void SidebarPreviewLayers::layerVisibilityChanged(Layer::Index layerIndex, bool enabled) {
+    lc->setLayerVisible(layerIndex, enabled);
+}
diff --git a/entry/src/main/cpp/src/core/gui/sidebar/previews/layer/SidebarPreviewLayers.h b/entry/src/main/cpp/src/core/gui/sidebar/previews/layer/SidebarPreviewLayers.h
new file mode 100644
index 0000000..4beb439
--- /dev/null
+++ b/entry/src/main/cpp/src/core/gui/sidebar/previews/layer/SidebarPreviewLayers.h
@@ -0,0 +1,86 @@
+/*
+ * Xournal++
+ *
+ * Previews of the layers in the current page
+ *
+ * @author Xournal++ Team
+ * https://github.com/xournalpp/xournalpp
+ *
+ * @license GNU GPLv2 or later
+ */
+
+#pragma once
+
+#include <cstddef>  // for size_t
+#include <memory>   // for shared_ptr
+#include <string>   // for string
+
+#include "control/layer/LayerCtrlListener.h"               // for LayerCtrlL...
+#include "gui/IconNameHelper.h"                            // for IconNameHe...
+#include "gui/sidebar/previews/base/SidebarPreviewBase.h"  // for SidebarPre...
+#include "model/Layer.h"                                   // for Layer, Lay...
+
+class Control;
+class GladeGui;
+class LayerController;
+class SidebarLayersContextMenu;
+
+
+class SidebarPreviewLayers: public SidebarPreviewBase, public LayerCtrlListener {
+public:
+    SidebarPreviewLayers(Control* control, bool stacked);
+
+    ~SidebarPreviewLayers() override;
+
+public:
+    void rebuildLayerMenu() override;
+    void layerVisibilityChanged() override;
+    void updateSelectedLayer() override;
+
+public:
+    void enableSidebar() override;
+
+    /**
+     * @overwrite
+     */
+    std::string getName() override;
+
+    /**
+     * @overwrite
+     */
+    std::string getIconName() override;
+
+    /**
+     * Update the preview images
+     * @overwrite
+     */
+    void updatePreviews() override;
+
+    /**
+     * Select a layer
+     */
+    void layerSelected(Layer::Index layerIndex);
+
+    /**
+     * A layer was hidden / showed
+     */
+    void layerVisibilityChanged(Layer::Index layerIndex, bool enabled);
+
+public:
+    // DocumentListener interface (only the part which is not handled by SidebarPreviewBase)
+    void pageSizeChanged(size_t page) override;
+    void pageChanged(size_t page) override;
+
+private:
+    /**
+     * Layer Controller
+     */
+    LayerController* lc;
+
+    /**
+     * render as stacked
+     */
+    bool stacked;
+
+    IconNameHelper iconNameHelper;
+};
diff --git a/entry/src/main/cpp/src/core/gui/sidebar/previews/page/SidebarPreviewPageEntry.cpp b/entry/src/main/cpp/src/core/gui/sidebar/previews/page/SidebarPreviewPageEntry.cpp
new file mode 100644
index 0000000..38a1a99
--- /dev/null
+++ b/entry/src/main/cpp/src/core/gui/sidebar/previews/page/SidebarPreviewPageEntry.cpp
@@ -0,0 +1,56 @@
+#include "SidebarPreviewPageEntry.h"
+
+#include "control/Control.h"                                // for Control
+#include "control/ScrollHandler.h"                          // for ScrollHan...
+#include "control/settings/Settings.h"                      // for Settings
+#include "gui/PagePreviewDecoration.h"                      // for Drawing  ...
+#include "gui/sidebar/previews/page/SidebarPreviewPages.h"  // for SidebarPr...
+#include "util/gtk4_helper.h"
+
+SidebarPreviewPageEntry::SidebarPreviewPageEntry(SidebarPreviewPages* sidebar, const PageRef& page, size_t index):
+        SidebarPreviewBaseEntry(sidebar, page), sidebar(sidebar), index(index) {
+    if (sidebar->getControl()->getSettings()->getSidebarNumberingStyle() ==
+        SidebarNumberingStyle::NUMBER_BELOW_PREVIEW) {
+        gtk_widget_set_size_request(this->button.get(), imageWidth, imageHeight + PagePreviewDecoration::MARGIN_BOTTOM);
+    }
+}
+
+SidebarPreviewPageEntry::~SidebarPreviewPageEntry() {
+    GtkWidget* w = this->getWidget();
+    gtk_fixed_remove(GTK_FIXED(gtk_widget_get_parent(w)), w);
+}
+
+auto SidebarPreviewPageEntry::getRenderType() const -> PreviewRenderType { return RENDER_TYPE_PAGE_PREVIEW; }
+
+void SidebarPreviewPageEntry::mouseButtonPressCallback() {
+    sidebar->getControl()->getScrollHandler()->scrollToPage(page);
+    sidebar->getControl()->firePageSelected(page);
+}
+
+void SidebarPreviewPageEntry::paint(cairo_t* cr) {
+    SidebarPreviewBaseEntry::paint(cr);
+    if (sidebar->getControl()->getSettings()->getSidebarNumberingStyle() == SidebarNumberingStyle::NONE) {
+        return;
+    }
+    drawEntryNumber(cr);
+}
+
+void SidebarPreviewPageEntry::drawEntryNumber(cairo_t* cr) {
+    PagePreviewDecoration::drawDecoration(cr, this, this->sidebar->getControl());
+}
+
+auto SidebarPreviewPageEntry::getHeight() const -> int {
+    if (sidebar->getControl()->getSettings()->getSidebarNumberingStyle() ==
+        SidebarNumberingStyle::NUMBER_BELOW_PREVIEW) {
+        return imageHeight + PagePreviewDecoration::MARGIN_BOTTOM;
+    }
+    return imageHeight;
+}
+
+void SidebarPreviewPageEntry::setIndex(size_t index) { this->index = index; }
+
+size_t SidebarPreviewPageEntry::getIndex() const { return this->index; }
+
+bool SidebarPreviewPageEntry::isSelected() const { return this->selected; }
+
+double SidebarPreviewPageEntry::getZoom() const { return this->sidebar->getZoom(); }
diff --git a/entry/src/main/cpp/src/core/gui/sidebar/previews/page/SidebarPreviewPageEntry.h b/entry/src/main/cpp/src/core/gui/sidebar/previews/page/SidebarPreviewPageEntry.h
new file mode 100644
index 0000000..fc5ff99
--- /dev/null
+++ b/entry/src/main/cpp/src/core/gui/sidebar/previews/page/SidebarPreviewPageEntry.h
@@ -0,0 +1,45 @@
+/*
+ * Xournal++
+ *
+ * A Sidebar preview widget
+ *
+ * @author Xournal++ Team
+ * https://github.com/xournalpp/xournalpp
+ *
+ * @license GNU GPLv2 or later
+ */
+
+#pragma once
+
+#include "gui/sidebar/previews/base/SidebarPreviewBaseEntry.h"  // for Previ...
+#include "model/PageRef.h"                                      // for PageRef
+
+class SidebarPreviewPages;
+
+class SidebarPreviewPageEntry: public SidebarPreviewBaseEntry {
+public:
+    SidebarPreviewPageEntry(SidebarPreviewPages* sidebar, const PageRef& page, size_t index);
+    ~SidebarPreviewPageEntry() override;
+
+public:
+    int getHeight() const override;
+
+    PreviewRenderType getRenderType() const override;
+
+    void setIndex(size_t index);
+    size_t getIndex() const;
+
+    bool isSelected() const;
+    double getZoom() const;
+
+protected:
+    SidebarPreviewPages* sidebar;
+    void mouseButtonPressCallback() override;
+    void paint(cairo_t* cr) override;
+
+private:
+    size_t index;
+    friend class PreviewJob;
+
+    void drawEntryNumber(cairo_t* cr);
+};
diff --git a/entry/src/main/cpp/src/core/gui/sidebar/previews/page/SidebarPreviewPages.cpp b/entry/src/main/cpp/src/core/gui/sidebar/previews/page/SidebarPreviewPages.cpp
new file mode 100644
index 0000000..c4271a5
--- /dev/null
+++ b/entry/src/main/cpp/src/core/gui/sidebar/previews/page/SidebarPreviewPages.cpp
@@ -0,0 +1,139 @@
+#include "SidebarPreviewPages.h"
+
+#include <algorithm>  // for max
+#include <map>        // for map
+#include <memory>     // for uniqu...
+#include <utility>    // for pair
+
+#include <glib-object.h>  // for g_obj...
+
+#include "control/Control.h"                                    // for Control
+#include "gui/sidebar/previews/base/SidebarPreviewBaseEntry.h"  // for Sideb...
+#include "model/Document.h"                                     // for Document
+#include "model/PageRef.h"                                      // for PageRef
+#include "util/Assert.h"                                        // for xoj_assert
+#include "util/Util.h"                                          // for npos
+#include "util/gtk4_helper.h"
+#include "util/i18n.h"        // for _
+#include "util/safe_casts.h"  // for as_signed
+
+#include "SidebarPreviewPageEntry.h"  // for Sideb...
+
+constexpr auto MENU_ID = "PreviewPagesContextMenu";
+constexpr auto TOOLBAR_ID = "PreviewPagesToolbar";
+
+SidebarPreviewPages::SidebarPreviewPages(Control* control):
+        SidebarPreviewBase(control, MENU_ID, TOOLBAR_ID), iconNameHelper(control->getSettings()) {}
+
+SidebarPreviewPages::~SidebarPreviewPages() = default;
+
+void SidebarPreviewPages::enableSidebar() {
+    SidebarPreviewBase::enableSidebar();
+
+    pageSelected(this->selectedEntry);
+}
+
+auto SidebarPreviewPages::getName() -> std::string { return _("Page Preview"); }
+
+auto SidebarPreviewPages::getIconName() -> std::string { return this->iconNameHelper.iconName("sidebar-page-preview"); }
+
+void SidebarPreviewPages::updatePreviews() {
+    this->previews.clear();
+
+    Document* doc = this->getControl()->getDocument();
+    doc->lock_shared();
+    size_t len = doc->getPageCount();
+    for (size_t i = 0; i < len; i++) {
+        auto p = std::make_unique<SidebarPreviewPageEntry>(this, doc->getPage(i), i);
+        gtk_fixed_put(this->miniaturesContainer.get(), p->getWidget(), 0, 0);
+        this->previews.emplace_back(std::move(p));
+    }
+    doc->unlock_shared();
+
+    layout();
+}
+
+void SidebarPreviewPages::pageSizeChanged(size_t page) {
+    if (page == npos || page >= this->previews.size()) {
+        return;
+    }
+    auto& p = this->previews[page];
+    p->updateSize();
+    p->repaint();
+
+    layout();
+}
+
+void SidebarPreviewPages::pageChanged(size_t page) {
+    if (page == npos || page >= this->previews.size()) {
+        return;
+    }
+
+    auto& p = this->previews[page];
+    p->repaint();
+}
+
+void SidebarPreviewPages::pageDeleted(size_t page) {
+    if (page >= previews.size()) {
+        return;
+    }
+
+    previews.erase(previews.begin() + as_signed(page));
+
+    // Unselect page, to prevent double selection displaying
+    unselectPage();
+
+    updateIndices();
+
+    layout();
+}
+
+void SidebarPreviewPages::pageInserted(size_t page) {
+    Document* doc = control->getDocument();
+    doc->lock_shared();
+    auto p = std::make_unique<SidebarPreviewPageEntry>(this, doc->getPage(page), page);
+    doc->unlock_shared();
+
+    gtk_fixed_put(this->miniaturesContainer.get(), p->getWidget(), 0, 0);
+    this->previews.insert(this->previews.begin() + as_signed(page), std::move(p));
+
+    // Unselect page, to prevent double selection displaying
+    unselectPage();
+
+    updateIndices();
+
+    layout();
+}
+
+/**
+ * Unselect the last selected page, if any
+ */
+void SidebarPreviewPages::unselectPage() {
+    for (auto& p: this->previews) {
+        p->setSelected(false);
+    }
+}
+
+void SidebarPreviewPages::pageSelected(size_t page) {
+    if (this->selectedEntry != npos && this->selectedEntry < this->previews.size()) {
+        this->previews[this->selectedEntry]->setSelected(false);
+    }
+    this->selectedEntry = page;
+
+    if (!this->enabled) {
+        return;
+    }
+
+    if (this->selectedEntry != npos && this->selectedEntry < this->previews.size()) {
+        auto& p = this->previews[this->selectedEntry];
+        p->setSelected(true);
+        scrollToPreview(this);
+    }
+}
+
+void SidebarPreviewPages::updateIndices() {
+    size_t index = 0;
+    for (auto& preview: this->previews) {
+        dynamic_cast<SidebarPreviewPageEntry*>(preview.get())->setIndex(index++);
+    }
+}
diff --git a/entry/src/main/cpp/src/core/gui/sidebar/previews/page/SidebarPreviewPages.h b/entry/src/main/cpp/src/core/gui/sidebar/previews/page/SidebarPreviewPages.h
new file mode 100644
index 0000000..314163b
--- /dev/null
+++ b/entry/src/main/cpp/src/core/gui/sidebar/previews/page/SidebarPreviewPages.h
@@ -0,0 +1,76 @@
+/*
+ * Xournal++
+ *
+ * Previews of the pages in the document
+ *
+ * @author Xournal++ Team
+ * https://github.com/xournalpp/xournalpp
+ *
+ * @license GNU GPLv2 or later
+ */
+
+#pragma once
+
+#include <cstddef>  // for size_t
+#include <memory>   // for unique_ptr
+#include <string>   // for string
+#include <tuple>    // for tuple
+#include <vector>   // for vector
+
+#include <glib.h>     // for gulong
+#include <gtk/gtk.h>  // for GtkWidget
+
+#include "gui/IconNameHelper.h"                            // for IconNameHe...
+#include "gui/sidebar/previews/base/SidebarPreviewBase.h"  // for SidebarPre...
+#include "util/raii/GObjectSPtr.h"
+
+class Control;
+class GladeGui;
+
+
+class SidebarPreviewPages: public SidebarPreviewBase {
+public:
+    SidebarPreviewPages(Control* control);
+    ~SidebarPreviewPages() override;
+
+public:
+    void enableSidebar() override;
+
+    /**
+     * @overwrite
+     */
+    std::string getName() override;
+
+    /**
+     * @overwrite
+     */
+    std::string getIconName() override;
+
+    /**
+     * Update the preview images
+     * @overwrite
+     */
+    void updatePreviews() override;
+
+public:
+    // DocumentListener interface (only the part which is not handled by SidebarPreviewBase)
+    void pageSizeChanged(size_t page) override;
+    void pageChanged(size_t page) override;
+    void pageSelected(size_t page) override;
+    void pageInserted(size_t page) override;
+    void pageDeleted(size_t page) override;
+
+private:
+    /**
+     * Unselect the last selected page, if any
+     */
+    void unselectPage();
+
+    /**
+     * Updates the indices of the pages
+     */
+    void updateIndices();
+
+private:
+    IconNameHelper iconNameHelper;
+};
diff --git a/entry/src/main/cpp/src/core/gui/toolbarMenubar/AbstractSliderItem.cpp b/entry/src/main/cpp/src/core/gui/toolbarMenubar/AbstractSliderItem.cpp
new file mode 100644
index 0000000..bfedb89
--- /dev/null
+++ b/entry/src/main/cpp/src/core/gui/toolbarMenubar/AbstractSliderItem.cpp
@@ -0,0 +1,6 @@
+#include "AbstractSliderItem.h"
+
+#include <utility>  // for move
+
+AbstractSliderItem::AbstractSliderItem(std::string id, Category cat, SliderRange range, ActionRef gAction):
+        AbstractToolItem(std::move(id), cat), range(range), gAction(std::move(gAction)) {}
diff --git a/entry/src/main/cpp/src/core/gui/toolbarMenubar/AbstractSliderItem.h b/entry/src/main/cpp/src/core/gui/toolbarMenubar/AbstractSliderItem.h
new file mode 100644
index 0000000..ea49e99
--- /dev/null
+++ b/entry/src/main/cpp/src/core/gui/toolbarMenubar/AbstractSliderItem.h
@@ -0,0 +1,50 @@
+/*
+ * Xournal++
+ *
+ * Abstract representation of slider-based tools.
+ *
+ * @author Xournal++ Team
+ * https://github.com/xournalpp/xournalpp
+ *
+ * @license GNU GPLv2 or later
+ */
+
+#pragma once
+
+#include <memory>  // for unique_ptr
+#include <string>  // for string
+
+#include <gtk/gtk.h>  // for GtkToolItem, GtkRange
+
+#include "control/actions/ActionRef.h"
+
+#include "AbstractToolItem.h"  // for AbstractToolItem
+
+class AbstractSliderItem: public AbstractToolItem {
+public:
+    struct SliderRange {
+        // Internal units: minimum and maximum slider values.
+        double min;
+        double max;
+
+        // Number of fine/coarse steps between min and max.
+        int nbFineSteps;
+        int nbCoarseSteps;
+    };
+
+public:
+    /**
+     * @param id Unique identifier for this. e.g. `TOOL_FOO_SLIDER`.
+     * @param range The minimum/maximum/step in internal units. {@see #scaleFunc}.
+     * @param gAction A GAction whose (double) state is synced with the slider's value
+     */
+    AbstractSliderItem(std::string id, Category cat, SliderRange range, ActionRef gAction);
+    ~AbstractSliderItem() override = default;
+
+protected:
+    SliderRange range;
+    ActionRef gAction;
+
+    template <class FinalSliderType>
+    friend class SliderItemCreationHelper;
+};
diff --git a/entry/src/main/cpp/src/core/gui/toolbarMenubar/AbstractToolItem.cpp b/entry/src/main/cpp/src/core/gui/toolbarMenubar/AbstractToolItem.cpp
new file mode 100644
index 0000000..5eff905
--- /dev/null
+++ b/entry/src/main/cpp/src/core/gui/toolbarMenubar/AbstractToolItem.cpp
@@ -0,0 +1,25 @@
+#include "AbstractToolItem.h"
+
+#include <utility>  // for move
+
+AbstractToolItem::AbstractToolItem(std::string id, Category cat): id(std::move(id)), category(cat) {}
+
+AbstractToolItem::~AbstractToolItem() = default;
+
+auto AbstractToolItem::getId() const -> const std::string& { return id; }
+auto AbstractToolItem::getCategory() const -> Category { return category; }
+
+xoj::util::WidgetSPtr AbstractToolItem::createToolItem(bool horizontal) {
+    xoj::util::WidgetSPtr item = createItem(horizontal);
+    gtk_widget_set_can_focus(item.get(), false);  // todo(gtk4) not necessary anymore
+    if (GTK_IS_TOOL_ITEM(item.get())) {
+        gtk_widget_show_all(item.get());
+        return item;
+    }
+
+    // Wrap in a GtkToolItem
+    GtkToolItem* wrap = gtk_tool_item_new();
+    gtk_container_add(GTK_CONTAINER(wrap), item.get());
+    gtk_widget_show_all(GTK_WIDGET(wrap));
+    return xoj::util::WidgetSPtr(GTK_WIDGET(wrap), xoj::util::adopt);
+}
diff --git a/entry/src/main/cpp/src/core/gui/toolbarMenubar/AbstractToolItem.h b/entry/src/main/cpp/src/core/gui/toolbarMenubar/AbstractToolItem.h
new file mode 100644
index 0000000..bcd44e9
--- /dev/null
+++ b/entry/src/main/cpp/src/core/gui/toolbarMenubar/AbstractToolItem.h
@@ -0,0 +1,64 @@
+/*
+ * Xournal++
+ *
+ * Part of the customizable toolbars
+ *
+ * @author Xournal++ Team
+ * https://github.com/xournalpp/xournalpp
+ *
+ * @license GNU GPLv2 or later
+ */
+
+#pragma once
+
+#include <string>  // for string
+#include <vector>
+
+#include <gtk/gtk.h>  // for GtkWidget
+
+#include "enums/Action.enum.h"
+#include "util/raii/GObjectSPtr.h"
+#include "util/raii/GVariantSPtr.h"
+
+class AbstractToolItem {
+public:
+    // If you add a category, don't forget to give it a label in ToolbarCustomizeDialog.cpp.
+    // Keep the enum contiguous
+    enum class Category : unsigned char {
+        FILES,
+        TOOLS,
+        COLORS,
+        NAVIGATION,
+        MISC,
+        SELECTION,
+        AUDIO,
+        SEPARATORS,
+        PLUGINS,
+        ENUMERATOR_COUNT  // Keep last
+    };
+    AbstractToolItem(std::string id, Category cat);
+    virtual ~AbstractToolItem();
+
+    AbstractToolItem(AbstractToolItem const&) = delete;
+    auto operator=(AbstractToolItem const&) -> AbstractToolItem& = delete;
+    AbstractToolItem(AbstractToolItem&&) = delete;                     // Implement if desired
+    auto operator=(AbstractToolItem&&) -> AbstractToolItem& = delete;  // Implement if desired
+
+public:
+    virtual xoj::util::WidgetSPtr createItem(bool horizontal) = 0;
+
+    xoj::util::WidgetSPtr createToolItem(bool horizontal);
+
+    const std::string& getId() const;
+    Category getCategory() const;
+    virtual std::string getToolDisplayName() const = 0;
+
+    /**
+     * Returns: (transfer floating)
+     */
+    virtual GtkWidget* getNewToolIcon() const = 0;
+
+protected:
+    std::string id;
+    const Category category;
+};
diff --git a/entry/src/main/cpp/src/core/gui/toolbarMenubar/ColorSelectorToolItem.cpp b/entry/src/main/cpp/src/core/gui/toolbarMenubar/ColorSelectorToolItem.cpp
new file mode 100644
index 0000000..d87a17d
--- /dev/null
+++ b/entry/src/main/cpp/src/core/gui/toolbarMenubar/ColorSelectorToolItem.cpp
@@ -0,0 +1,61 @@
+#include "ColorSelectorToolItem.h"
+
+#include <gtk/gtk.h>
+
+#include "control/actions/ActionDatabase.h"
+#include "gui/toolbarMenubar/icon/ColorIcon.h"  // for ColorIcon
+#include "util/GtkUtil.h"                       // for fixActionableInitialSensitivity
+#include "util/gtk4_helper.h"                   // for gtk_button_set_child
+#include "util/i18n.h"                          // for _
+
+constexpr int ICON_SIZE = 22;
+
+ColorSelectorToolItem::ColorSelectorToolItem(ActionDatabase& db):
+        AbstractToolItem("COLOR_SELECT", Category::COLORS), gAction(db.getAction(Action::TOOL_COLOR)) {}
+
+auto ColorSelectorToolItem::createItem(bool) -> xoj::util::WidgetSPtr {
+    GtkWidget* btn = gtk_button_new();
+    gtk_widget_set_can_focus(btn, false);  // todo(gtk4) not necessary anymore
+    xoj::util::GVariantSPtr v(g_action_get_state(G_ACTION(gAction.get())), xoj::util::adopt);
+    Color initialColor = getGVariantValue<Color>(v.get());
+    gtk_button_set_child(GTK_BUTTON(btn), ColorIcon::newGtkImage(initialColor, ICON_SIZE, false));
+
+    gtk_widget_set_tooltip_text(btn, this->getToolDisplayName().c_str());
+    gtk_widget_set_sensitive(btn, g_action_get_enabled(G_ACTION(gAction.get())));
+    gtk_actionable_set_action_name(GTK_ACTIONABLE(btn),
+                                   (std::string("win.") + Action_toString(Action::SELECT_COLOR)).c_str());
+
+    // The color follows the value of the GAction state
+    // NB: we use the notify::state signal because "change-state" is not raised by g_simple_action_set_state()
+    g_signal_connect_object(gAction.get(), "notify::state", G_CALLBACK(+[](GObject* a, GParamSpec*, gpointer btn) {
+                                xoj::util::GVariantSPtr state(g_action_get_state(G_ACTION(a)), xoj::util::adopt);
+                                auto c = getGVariantValue<Color>(state.get());
+                                gtk_button_set_child(GTK_BUTTON(btn), ColorIcon::newGtkImage(c, ICON_SIZE, false));
+                            }),
+                            btn, GConnectFlags(0));
+
+    // Make a proxy for GtkToolbar
+    GtkToolItem* it = gtk_tool_item_new();
+    gtk_container_add(GTK_CONTAINER(it), btn);
+    /// Makes a proxy item for the toolbar's overflow menu
+    auto createProxy = [&]() {
+        constexpr int PROXY_ICON_SIZE = 16;
+        GtkWidget* proxy = gtk_menu_item_new();
+        auto* box = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 6);
+        gtk_container_add(GTK_CONTAINER(proxy), box);
+        gtk_box_append(GTK_BOX(box), ColorIcon::newGtkImage(Colors::gray, PROXY_ICON_SIZE, false));
+        gtk_box_append(GTK_BOX(box), gtk_label_new(getToolDisplayName().c_str()));
+        gtk_actionable_set_action_name(GTK_ACTIONABLE(proxy),
+                                       (std::string("win.") + Action_toString(Action::SELECT_COLOR)).c_str());
+        xoj::util::gtk::fixActionableInitialSensitivity(GTK_ACTIONABLE(proxy));
+        return proxy;
+    };
+    gtk_tool_item_set_proxy_menu_item(it, "", createProxy());
+    return xoj::util::WidgetSPtr(GTK_WIDGET(it), xoj::util::adopt);
+}
+
+auto ColorSelectorToolItem::getToolDisplayName() const -> std::string { return _("Select color"); }
+
+auto ColorSelectorToolItem::getNewToolIcon() const -> GtkWidget* {
+    return ColorIcon::newGtkImage(Colors::gray, ICON_SIZE, false);
+}
diff --git a/entry/src/main/cpp/src/core/gui/toolbarMenubar/ColorSelectorToolItem.h b/entry/src/main/cpp/src/core/gui/toolbarMenubar/ColorSelectorToolItem.h
new file mode 100644
index 0000000..b514426
--- /dev/null
+++ b/entry/src/main/cpp/src/core/gui/toolbarMenubar/ColorSelectorToolItem.h
@@ -0,0 +1,41 @@
+/*
+ * Xournal++
+ *
+ * Part of the customizable toolbars
+ *
+ * @author Xournal++ Team
+ * https://github.com/xournalpp/xournalpp
+ *
+ * @license GNU GPLv2 or later
+ */
+
+#pragma once
+
+#include <string>  // for string
+
+#include <gtk/gtk.h>  // for GtkWindget
+
+#include "control/actions/ActionRef.h"
+
+#include "AbstractToolItem.h"  // for AbstractToolItem
+
+class ActionDatabase;
+
+class ColorSelectorToolItem: public AbstractToolItem {
+public:
+    ColorSelectorToolItem(ActionDatabase& db);
+    ColorSelectorToolItem(ColorSelectorToolItem const&) = delete;
+    ColorSelectorToolItem(ColorSelectorToolItem&&) noexcept = delete;
+    auto operator=(ColorSelectorToolItem const&) -> ColorSelectorToolItem& = delete;
+    auto operator=(ColorSelectorToolItem&&) noexcept -> ColorSelectorToolItem& = delete;
+    ~ColorSelectorToolItem() override = default;
+
+public:
+    std::string getToolDisplayName() const override;
+    GtkWidget* getNewToolIcon() const override;
+
+    xoj::util::WidgetSPtr createItem(bool horizontal) override;
+
+private:
+    ActionRef gAction;  ///< Corresponds to Action::TOOL_COLOR
+};
diff --git a/entry/src/main/cpp/src/core/gui/toolbarMenubar/ColorToolItem.cpp b/entry/src/main/cpp/src/core/gui/toolbarMenubar/ColorToolItem.cpp
new file mode 100644
index 0000000..33a3ade
--- /dev/null
+++ b/entry/src/main/cpp/src/core/gui/toolbarMenubar/ColorToolItem.cpp
@@ -0,0 +1,77 @@
+#include "ColorToolItem.h"
+
+#include <utility>  // for move
+
+#include "enums/Action.enum.h"                  // for Action
+#include "gui/toolbarMenubar/icon/ColorIcon.h"  // for ColorIcon
+#include "util/GtkUtil.h"                       // for setToggleButtonUnreleasable
+#include "util/gtk4_helper.h"                   // for gtk_button_set_child
+
+ColorToolItem::ColorToolItem(NamedColor namedColor, const std::optional<Recolor>& recolor):
+        AbstractToolItem(std::string("COLOR(") + std::to_string(namedColor.getIndex()) + ")", Category::COLORS),
+        namedColor(std::move(namedColor)),
+        target(xoj::util::makeGVariantSPtr(this->namedColor.getColor())) {
+    if (recolor) {
+        secondaryColor = std::make_optional(recolor->convertColor(namedColor.getColor()));
+    } else {
+        secondaryColor = std::nullopt;
+    }
+}
+
+ColorToolItem::~ColorToolItem() = default;
+
+auto ColorToolItem::getColor() const -> Color { return this->namedColor.getColor(); }
+
+auto ColorToolItem::createItem(bool) -> xoj::util::WidgetSPtr {
+    auto* btn = gtk_toggle_button_new();
+    gtk_widget_set_can_focus(btn, false);  // todo(gtk4) not necessary anymore
+    auto actionName = std::string("win.") + Action_toString(Action::TOOL_COLOR);
+    gtk_actionable_set_action_name(GTK_ACTIONABLE(btn), actionName.data());
+    gtk_actionable_set_action_target_value(GTK_ACTIONABLE(btn), target.get());
+    xoj::util::gtk::setToggleButtonUnreleasable(GTK_TOGGLE_BUTTON(btn));
+
+    gtk_widget_set_tooltip_text(btn, this->namedColor.getName().c_str());
+    gtk_button_set_child(GTK_BUTTON(btn), getNewToolIcon());
+
+
+    // For the sake of deprecated GtkToolbar, wrap the button in a GtkToolItem
+    // Todo(gtk4): remove
+    GtkToolItem* it = gtk_tool_item_new();
+    gtk_container_add(GTK_CONTAINER(it), btn);
+    /// Makes a proxy item for the toolbar's overflow menu
+    auto createProxy = [this]() {
+        GtkWidget* proxy = gtk_check_menu_item_new();
+        gtk_check_menu_item_set_draw_as_radio(GTK_CHECK_MENU_ITEM(proxy), true);
+
+        auto* box = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 6);
+        gtk_container_add(GTK_CONTAINER(proxy), box);
+        gtk_box_append(GTK_BOX(box), getNewToolIcon());
+        gtk_box_append(GTK_BOX(box), gtk_label_new(getToolDisplayName().c_str()));
+
+        gtk_actionable_set_action_name(GTK_ACTIONABLE(proxy),
+                                       (std::string("win.") + Action_toString(Action::TOOL_COLOR)).c_str());
+        if (target) {
+            gtk_actionable_set_action_target_value(GTK_ACTIONABLE(proxy), target.get());
+        }
+        xoj::util::gtk::fixActionableInitialSensitivity(GTK_ACTIONABLE(proxy));
+        return proxy;
+    };
+    gtk_tool_item_set_proxy_menu_item(it, "", createProxy());
+    return xoj::util::WidgetSPtr(GTK_WIDGET(it), xoj::util::adopt);
+}
+
+auto ColorToolItem::getToolDisplayName() const -> std::string { return this->namedColor.getName(); }
+
+auto ColorToolItem::getNewToolIcon() const -> GtkWidget* {
+    return ColorIcon::newGtkImage(this->namedColor.getColor(), 16, true, this->secondaryColor);
+}
+
+void ColorToolItem::updateColor(const Palette& palette) { namedColor = palette.getColorAt(namedColor.getIndex()); }
+
+void ColorToolItem::updateSecondaryColor(const std::optional<Recolor>& recolor) {
+    if (recolor) {
+        secondaryColor = std::make_optional(recolor->convertColor(namedColor.getColor()));
+    } else {
+        secondaryColor = std::nullopt;
+    }
+}
diff --git a/entry/src/main/cpp/src/core/gui/toolbarMenubar/ColorToolItem.h b/entry/src/main/cpp/src/core/gui/toolbarMenubar/ColorToolItem.h
new file mode 100644
index 0000000..1249b42
--- /dev/null
+++ b/entry/src/main/cpp/src/core/gui/toolbarMenubar/ColorToolItem.h
@@ -0,0 +1,63 @@
+/*
+ * Xournal++
+ *
+ * Part of the customizable toolbars
+ *
+ * @author Xournal++ Team
+ * https://github.com/xournalpp/xournalpp
+ *
+ * @license GNU GPLv2 or later
+ */
+
+#pragma once
+
+#include <optional>
+
+#include <gtk/gtk.h>  // for GtkWidget
+
+#include "gui/toolbarMenubar/model/ColorPalette.h"
+#include "util/Color.h"       // for Color
+#include "util/NamedColor.h"  // for NamedColor
+#include "util/Recolor.h"     // for Recolor
+
+#include "AbstractToolItem.h"  // for AbstractToolItem
+
+class ActionDatabase;
+
+class ColorToolItem: public AbstractToolItem {
+public:
+    ColorToolItem(NamedColor namedColor, const std::optional<Recolor>& recolor);
+    ColorToolItem(ColorToolItem const&) = delete;
+    ColorToolItem(ColorToolItem&&) noexcept = delete;
+    auto operator=(ColorToolItem const&) -> ColorToolItem& = delete;
+    auto operator=(ColorToolItem&&) noexcept -> ColorToolItem& = delete;
+    ~ColorToolItem() override;
+
+
+public:
+    std::string getToolDisplayName() const override;
+    GtkWidget* getNewToolIcon() const override;
+
+    Color getColor() const;
+
+    /**
+     * @brief Update Color based on (new) palette
+     *
+     * @param palette
+     */
+    void updateColor(const Palette& palette);
+
+    /**
+     * @brief Update secondary Color based on (new) recoloring settings
+     *
+     * @param recolor
+     */
+    void updateSecondaryColor(const std::optional<Recolor>& recolor);
+
+    xoj::util::WidgetSPtr createItem(bool horizontal) override;
+
+private:
+    NamedColor namedColor;
+    xoj::util::GVariantSPtr target;       ///< Contains the color in ARGB as a uint32_t
+    std::optional<Color> secondaryColor;  //< color for small disk when recoloring is active
+};
diff --git a/entry/src/main/cpp/src/core/gui/toolbarMenubar/ComboToolButton.cpp b/entry/src/main/cpp/src/core/gui/toolbarMenubar/ComboToolButton.cpp
new file mode 100644
index 0000000..846814a
--- /dev/null
+++ b/entry/src/main/cpp/src/core/gui/toolbarMenubar/ComboToolButton.cpp
@@ -0,0 +1,126 @@
+#include "ComboToolButton.h"
+
+#include <algorithm>  // for find_if
+#include <memory>     // for shared_ptr
+#include <utility>    // for move
+
+#include <gtk/gtk.h>
+
+#include "util/GtkUtil.h"  // for setToggleButtonUnreleasable
+#include "util/glib_casts.h"
+#include "util/gtk4_helper.h"  // for gtk_popover_new
+
+/// Returns a floating ref
+static GtkWidget* createEmptyButton(GSimpleAction* a, const ComboToolButton::Entry& e) {
+    GtkWidget* btn = gtk_toggle_button_new();
+    gtk_actionable_set_action_name(GTK_ACTIONABLE(btn), (std::string("win.") + g_action_get_name(G_ACTION(a))).c_str());
+    gtk_actionable_set_action_target_value(GTK_ACTIONABLE(btn), e.target.get());
+    xoj::util::gtk::setToggleButtonUnreleasable(GTK_TOGGLE_BUTTON(btn));
+    gtk_widget_set_tooltip_text(btn, e.name.c_str());
+    gtk_widget_set_can_focus(btn, false);  // todo(gtk4) not necessary anymore
+    return btn;
+}
+/// Returns a floating ref
+static GtkWidget* createPopoverEntry(GSimpleAction* a, const ComboToolButton::Entry& e) {
+    GtkWidget* entry = createEmptyButton(a, e);
+
+    GtkBox* box = GTK_BOX(gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 6));
+    gtk_box_append(box, gtk_image_new_from_icon_name(e.icon.c_str(), GTK_ICON_SIZE_SMALL_TOOLBAR));
+    gtk_box_append(box, gtk_label_new(e.name.c_str()));
+    gtk_button_set_child(GTK_BUTTON(entry), GTK_WIDGET(box));
+
+    return entry;
+}
+
+ComboToolButton::ComboToolButton(std::string id, Category cat, std::string iconName, std::string description,
+                                 Entries entries, ActionRef gAction):
+        AbstractToolItem(std::move(id), cat),
+        entries(std::move(entries)),
+        gAction(std::move(gAction)),
+        iconName(std::move(iconName)),
+        description(std::move(description)) {}
+
+/// Data structure for callbacks
+struct ComboToolInstanceData {
+    GAction* action;
+    GtkButton* btn;
+    GtkPopover* popover;
+    const std::vector<ComboToolButton::Entry>* entries;
+};
+
+/// change the prominent icon depending on G_ACTION(a)'s state
+static void setProminentIconCallback(GObject* a, GParamSpec*, ComboToolInstanceData* data) {
+    xoj::util::GVariantSPtr state(g_action_get_state(G_ACTION(a)), xoj::util::adopt);
+    auto it = std::find_if(data->entries->begin(), data->entries->end(),
+                           [s = state.get()](const auto& e) { return g_variant_equal(e.target.get(), s); });
+    if (it != data->entries->end()) {
+        gtk_button_set_icon_name(data->btn, it->icon.c_str());
+        gtk_widget_set_tooltip_text(GTK_WIDGET(data->btn), it->name.c_str());
+        gtk_actionable_set_action_target_value(GTK_ACTIONABLE(data->btn), state.get());
+        gtk_popover_popdown(data->popover);
+    }
+};
+
+auto ComboToolButton::createItem(bool horizontal) -> xoj::util::WidgetSPtr {
+
+    auto data = std::make_unique<ComboToolInstanceData>();
+    data->entries = &this->entries;
+    data->action = G_ACTION(this->gAction.get());
+
+    {  // Create popover
+        data->popover = GTK_POPOVER(gtk_popover_new());
+        gtk_widget_add_css_class(GTK_WIDGET(data->popover), "toolbar");
+
+        GtkBox* box = GTK_BOX(gtk_box_new(GTK_ORIENTATION_VERTICAL, 0));
+        gtk_popover_set_child(data->popover, GTK_WIDGET(box));
+
+        for (const Entry& t: this->entries) {
+            gtk_box_append(box, createPopoverEntry(gAction.get(), t));
+        }
+
+        gtk_widget_show_all(GTK_WIDGET(box));
+    }
+
+    {                                      // Create prominent button
+        const Entry& e = entries.front();  // Select the first entry by default
+        data->btn = GTK_BUTTON(createEmptyButton(gAction.get(), e));
+        gtk_button_set_icon_name(data->btn, e.icon.c_str());
+    }
+
+    // Create item
+    GtkMenuButton* menubutton = GTK_MENU_BUTTON(gtk_menu_button_new());
+    gtk_widget_set_can_focus(GTK_WIDGET(menubutton), false);  // todo(gtk4) not necessary anymore
+    gtk_menu_button_set_popover(menubutton, GTK_WIDGET(data->popover));
+    gtk_menu_button_set_direction(menubutton,
+                                  horizontal ? GTK_ARROW_DOWN : GTK_ARROW_RIGHT);  // TODO: fix directions
+
+    GtkBox* box = GTK_BOX(gtk_box_new(horizontal ? GTK_ORIENTATION_HORIZONTAL : GTK_ORIENTATION_VERTICAL, 0));
+    gtk_box_append(box, GTK_WIDGET(data->btn));
+    gtk_box_append(box, GTK_WIDGET(menubutton));
+
+    auto item = xoj::util::WidgetSPtr(GTK_WIDGET(box), xoj::util::adopt);
+
+    // Set up the prominent button according to the action state
+    setProminentIconCallback(G_OBJECT(gAction.get()), nullptr, data.get());
+
+    g_signal_connect(gAction.get(), "notify::state", xoj::util::wrap_for_g_callback_v<setProminentIconCallback>,
+                     data.get());
+
+    // Disconnect the signal and destroy *data if the widget is destroyed
+    g_object_weak_ref(
+            G_OBJECT(item.get()),
+            +[](gpointer d, GObject* item) {
+                auto* data = static_cast<ComboToolInstanceData*>(d);
+                g_signal_handlers_disconnect_by_data(data->action, d);
+                delete data;
+            },
+            data.release());
+
+    return item;
+}
+
+auto ComboToolButton::getToolDisplayName() const -> std::string { return this->description; }
+
+auto ComboToolButton::getNewToolIcon() const -> GtkWidget* {
+    return gtk_image_new_from_icon_name(iconName.c_str(), GTK_ICON_SIZE_SMALL_TOOLBAR);
+}
diff --git a/entry/src/main/cpp/src/core/gui/toolbarMenubar/ComboToolButton.h b/entry/src/main/cpp/src/core/gui/toolbarMenubar/ComboToolButton.h
new file mode 100644
index 0000000..89d9495
--- /dev/null
+++ b/entry/src/main/cpp/src/core/gui/toolbarMenubar/ComboToolButton.h
@@ -0,0 +1,63 @@
+/*
+ * Xournal++
+ *
+ * Part of the customizable toolbars
+ *
+ * @author Xournal++ Team
+ * https://github.com/xournalpp/xournalpp
+ *
+ * @license GNU GPLv2 or later
+ */
+
+#pragma once
+
+#include <memory>
+#include <string>
+#include <vector>
+
+#include <gio/gio.h>
+#include <gtk/gtk.h>
+
+#include "control/actions/ActionRef.h"
+#include "util/raii/GObjectSPtr.h"  // for WidgetSPtr
+
+#include "AbstractToolItem.h"  // for AbstractToolItem
+
+class ActionDatabase;
+
+class ComboToolButton: public AbstractToolItem {
+public:
+    struct Entry {
+        template <typename T>
+        Entry(std::string name, std::string icon, T t):
+                name(std::move(name)), icon(std::move(icon)), target(xoj::util::makeGVariantSPtr<T>(t)) {}
+        std::string name;
+        std::string icon;
+        xoj::util::GVariantSPtr target;  /// Target value of the associated GSimpleAction corresponding to the entry
+    };
+    using Entries = std::vector<Entry>;
+    /**
+     * @brief When all entries correspond to a single action (but different target values)
+     * @param iconName Icon used in the toolbar customization dialog to represent this combo button.
+     * @param description Description used in the toolbar customization dialog to explain this combo button.
+     * @param entries Entries of the combo menu.
+     */
+    ComboToolButton(std::string id, Category cat, std::string iconName, std::string description, Entries entries,
+                    ActionRef gAction);
+
+    ~ComboToolButton() override = default;
+
+public:
+    std::string getToolDisplayName() const override;
+
+protected:
+    xoj::util::WidgetSPtr createItem(bool horizontal) override;
+
+    GtkWidget* getNewToolIcon() const override;
+
+protected:
+    const Entries entries;
+    ActionRef gAction;
+    std::string iconName;
+    std::string description;
+};
diff --git a/entry/src/main/cpp/src/core/gui/toolbarMenubar/DrawingTypeComboToolButton.cpp b/entry/src/main/cpp/src/core/gui/toolbarMenubar/DrawingTypeComboToolButton.cpp
new file mode 100644
index 0000000..6cf5001
--- /dev/null
+++ b/entry/src/main/cpp/src/core/gui/toolbarMenubar/DrawingTypeComboToolButton.cpp
@@ -0,0 +1,172 @@
+#include "DrawingTypeComboToolButton.h"
+
+#include <algorithm>  // for find_if
+#include <utility>    // for move
+
+#include <gtk/gtk.h>
+
+#include "control/actions/ActionDatabase.h"
+#include "gui/IconNameHelper.h"
+#include "util/glib_casts.h"
+#include "util/gtk4_helper.h"  // for gtk_popover_new
+#include "util/i18n.h"
+
+/// Returns a floating ref
+static GtkWidget* createPopoverEntry(const DrawingTypeComboToolButton::Entry& e) {
+    GtkWidget* entry = gtk_toggle_button_new();
+    gtk_widget_set_can_focus(entry, false);  // todo(gtk4) not necessary anymore
+    auto actionName = std::string("win.") + g_action_get_name(G_ACTION(e.gAction.get()));
+    gtk_actionable_set_action_name(GTK_ACTIONABLE(entry), actionName.data());
+    GtkBox* box = GTK_BOX(gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 6));
+    gtk_button_set_child(GTK_BUTTON(entry), GTK_WIDGET(box));
+    gtk_box_append(box, gtk_image_new_from_icon_name(e.icon.c_str(), GTK_ICON_SIZE_SMALL_TOOLBAR));
+    gtk_box_append(box, gtk_label_new(e.name.c_str()));
+    gtk_widget_set_tooltip_text(entry, e.name.c_str());
+    return entry;
+}
+
+static auto makeEntries(IconNameHelper& icons, const ActionDatabase& db)
+        -> std::shared_ptr<EnumIndexedArray<DrawingTypeComboToolButton::Entry, DrawingTypeComboToolButton::Type>> {
+    using Type = DrawingTypeComboToolButton::Type;
+    using Entry = DrawingTypeComboToolButton::Entry;
+    auto res = std::make_shared<EnumIndexedArray<Entry, Type>>();
+    auto& entries = *res;
+    entries[Type::RECTANGLE] = Entry(_("Draw Rectangle"), icons.iconName("draw-rect"), db, Action::TOOL_DRAW_RECTANGLE);
+    entries[Type::ELLIPSE] = Entry(_("Draw Ellipse"), icons.iconName("draw-ellipse"), db, Action::TOOL_DRAW_ELLIPSE);
+    entries[Type::ARROW] = Entry(_("Draw Arrow"), icons.iconName("draw-arrow"), db, Action::TOOL_DRAW_ARROW);
+    entries[Type::DOUBLE_ARROW] =
+            Entry(_("Draw Double Arrow"), icons.iconName("draw-double-arrow"), db, Action::TOOL_DRAW_DOUBLE_ARROW);
+    entries[Type::LINE] = Entry(_("Draw Line"), icons.iconName("draw-line"), db, Action::TOOL_DRAW_LINE);
+    entries[Type::COORDINATE_SYSTEM] = Entry(_("Draw coordinate system"), icons.iconName("draw-coordinate-system"), db,
+                                             Action::TOOL_DRAW_COORDINATE_SYSTEM);
+    entries[Type::SPLINE] = Entry(_("Draw Spline"), icons.iconName("draw-spline"), db, Action::TOOL_DRAW_SPLINE);
+    entries[Type::SHAPE_RECOGNIZER] =
+            Entry(_("Stroke recognizer"), icons.iconName("shape-recognizer"), db, Action::TOOL_DRAW_SHAPE_RECOGNIZER);
+    return res;
+}
+
+DrawingTypeComboToolButton::Entry::Entry(std::string name, std::string icon, const ActionDatabase& db, Action a):
+        name(std::move(name)),
+        icon(std::move(icon)),
+        gAction(db.getAction(a)),
+        fullActionName(std::string("win.") + g_action_get_name(G_ACTION(gAction.get()))) {}
+
+DrawingTypeComboToolButton::DrawingTypeComboToolButton(std::string id, IconNameHelper& icons, const ActionDatabase& db):
+        AbstractToolItem(std::move(id), Category::TOOLS),
+        entries(makeEntries(icons, db)),
+        iconName(icons.iconName("combo-drawing-type")),
+        description(_("Drawing Type Combo")) {}
+
+DrawingTypeComboToolButton::~DrawingTypeComboToolButton() = default;
+
+/// Data structure for callbacks
+struct Data {
+    GtkButton* button;
+    GtkPopover* popover;
+    std::shared_ptr<const EnumIndexedArray<DrawingTypeComboToolButton::Entry, DrawingTypeComboToolButton::Type>>
+            entries;
+
+    template <DrawingTypeComboToolButton::Type s>
+    static void setProminentIconCallback(GObject* action, GParamSpec*, Data* self) {
+        xoj::util::GVariantSPtr state(g_action_get_state(G_ACTION(action)), xoj::util::adopt);
+        if (getGVariantValue<bool>(state.get())) {
+            auto& e = (*self->entries)[s];
+            gtk_button_set_icon_name(self->button, e.icon.c_str());
+            gtk_widget_set_tooltip_text(GTK_WIDGET(self->button), e.name.c_str());
+            gtk_actionable_set_action_name(GTK_ACTIONABLE(self->button), e.fullActionName.c_str());
+        }
+        gtk_popover_popdown(self->popover);
+    }
+};
+
+auto DrawingTypeComboToolButton::createItem(bool horizontal) -> xoj::util::WidgetSPtr {
+    auto data = std::make_unique<Data>();
+    data->entries = this->entries;
+
+    {  // Create popover
+        data->popover = GTK_POPOVER(gtk_popover_new());
+        GtkBox* box = GTK_BOX(gtk_box_new(GTK_ORIENTATION_VERTICAL, 0));
+        gtk_popover_set_child(data->popover, GTK_WIDGET(box));
+        gtk_widget_add_css_class(GTK_WIDGET(data->popover), "toolbar");
+
+        for (const Entry& t: *this->entries) {
+            gtk_box_append(box, createPopoverEntry(t));
+        }
+
+        gtk_widget_show_all(GTK_WIDGET(box));
+    }
+
+    {  // Create prominent button
+        GtkWidget* btn = gtk_toggle_button_new();
+        data->button = GTK_BUTTON(btn);
+
+        gtk_widget_set_can_focus(btn, false);  // todo(gtk4) not necessary anymore
+
+        auto it = std::find_if(entries->begin(), entries->end(), [](auto& e) {
+            xoj::util::GVariantSPtr state(g_action_get_state(G_ACTION(e.gAction.get())), xoj::util::adopt);
+            return getGVariantValue<bool>(state.get());
+        });
+        const Entry& e = it == entries->end() ? (*entries)[Type::RECTANGLE] : *it;  // Select an entry by default
+        gtk_actionable_set_action_name(GTK_ACTIONABLE(btn), e.fullActionName.data());
+        gtk_button_set_icon_name(GTK_BUTTON(btn), e.icon.c_str());
+        gtk_widget_set_tooltip_text(btn, e.name.c_str());
+    }
+
+    // Create item
+    GtkMenuButton* menubutton = GTK_MENU_BUTTON(gtk_menu_button_new());
+    gtk_widget_set_can_focus(GTK_WIDGET(menubutton), false);  // todo(gtk4) not necessary anymore
+    gtk_menu_button_set_popover(menubutton, GTK_WIDGET(data->popover));
+    gtk_menu_button_set_direction(menubutton,
+                                  horizontal ? GTK_ARROW_DOWN : GTK_ARROW_RIGHT);  // TODO: fix directions
+
+    GtkBox* box = GTK_BOX(gtk_box_new(horizontal ? GTK_ORIENTATION_HORIZONTAL : GTK_ORIENTATION_VERTICAL, 0));
+    gtk_box_append(box, GTK_WIDGET(data->button));
+    gtk_box_append(box, GTK_WIDGET(menubutton));
+
+    auto item = xoj::util::WidgetSPtr(GTK_WIDGET(box), xoj::util::adopt);
+
+    /// change the prominent icon when selecting an entry (by any means)
+    g_signal_connect((*entries)[Type::RECTANGLE].gAction.get(), "notify::state",
+                     xoj::util::wrap_for_g_callback_v<Data::setProminentIconCallback<Type::RECTANGLE>>, data.get());
+    g_signal_connect((*entries)[Type::ELLIPSE].gAction.get(), "notify::state",
+                     xoj::util::wrap_for_g_callback_v<Data::setProminentIconCallback<Type::ELLIPSE>>, data.get());
+    g_signal_connect((*entries)[Type::ARROW].gAction.get(), "notify::state",
+                     xoj::util::wrap_for_g_callback_v<Data::setProminentIconCallback<Type::ARROW>>, data.get());
+    g_signal_connect((*entries)[Type::DOUBLE_ARROW].gAction.get(), "notify::state",
+                     xoj::util::wrap_for_g_callback_v<Data::setProminentIconCallback<Type::DOUBLE_ARROW>>, data.get());
+    g_signal_connect((*entries)[Type::LINE].gAction.get(), "notify::state",
+                     xoj::util::wrap_for_g_callback_v<Data::setProminentIconCallback<Type::LINE>>, data.get());
+    g_signal_connect((*entries)[Type::COORDINATE_SYSTEM].gAction.get(), "notify::state",
+                     xoj::util::wrap_for_g_callback_v<Data::setProminentIconCallback<Type::COORDINATE_SYSTEM>>,
+                     data.get());
+    g_signal_connect((*entries)[Type::SPLINE].gAction.get(), "notify::state",
+                     xoj::util::wrap_for_g_callback_v<Data::setProminentIconCallback<Type::SPLINE>>, data.get());
+    g_signal_connect((*entries)[Type::SHAPE_RECOGNIZER].gAction.get(), "notify::state",
+                     xoj::util::wrap_for_g_callback_v<Data::setProminentIconCallback<Type::SHAPE_RECOGNIZER>>,
+                     data.get());
+
+    // Disconnect the signal and destroy *data if the widget is destroyed
+    g_object_weak_ref(
+            G_OBJECT(item.get()),
+            +[](gpointer d, GObject*) {
+                Data* data = static_cast<Data*>(d);
+                g_signal_handlers_disconnect_by_data((*data->entries)[Type::RECTANGLE].gAction.get(), d);
+                g_signal_handlers_disconnect_by_data((*data->entries)[Type::ELLIPSE].gAction.get(), d);
+                g_signal_handlers_disconnect_by_data((*data->entries)[Type::ARROW].gAction.get(), d);
+                g_signal_handlers_disconnect_by_data((*data->entries)[Type::DOUBLE_ARROW].gAction.get(), d);
+                g_signal_handlers_disconnect_by_data((*data->entries)[Type::LINE].gAction.get(), d);
+                g_signal_handlers_disconnect_by_data((*data->entries)[Type::COORDINATE_SYSTEM].gAction.get(), d);
+                g_signal_handlers_disconnect_by_data((*data->entries)[Type::SPLINE].gAction.get(), d);
+                g_signal_handlers_disconnect_by_data((*data->entries)[Type::SHAPE_RECOGNIZER].gAction.get(), d);
+                delete data;
+            },
+            data.release());
+
+    return item;
+}
+
+auto DrawingTypeComboToolButton::getToolDisplayName() const -> std::string { return this->description; }
+
+auto DrawingTypeComboToolButton::getNewToolIcon() const -> GtkWidget* {
+    return gtk_image_new_from_icon_name(iconName.c_str(), GTK_ICON_SIZE_SMALL_TOOLBAR);
+}
diff --git a/entry/src/main/cpp/src/core/gui/toolbarMenubar/DrawingTypeComboToolButton.h b/entry/src/main/cpp/src/core/gui/toolbarMenubar/DrawingTypeComboToolButton.h
new file mode 100644
index 0000000..c94d815
--- /dev/null
+++ b/entry/src/main/cpp/src/core/gui/toolbarMenubar/DrawingTypeComboToolButton.h
@@ -0,0 +1,72 @@
+/*
+ * Xournal++
+ *
+ * Part of the customizable toolbars
+ *
+ * @author Xournal++ Team
+ * https://github.com/xournalpp/xournalpp
+ *
+ * @license GNU GPLv2 or later
+ */
+
+#pragma once
+
+#include <memory>
+#include <string>
+
+#include <gio/gio.h>
+#include <gtk/gtk.h>
+
+#include "control/actions/ActionRef.h"
+#include "enums/Action.enum.h"  // for Action
+#include "util/EnumIndexedArray.h"
+#include "util/raii/GObjectSPtr.h"  // for WidgetSPtr
+
+#include "AbstractToolItem.h"  // for AbstractToolItem
+
+class ActionDatabase;
+class IconNameHelper;
+
+class DrawingTypeComboToolButton: public AbstractToolItem {
+public:
+    struct Entry {
+        Entry() = default;
+        Entry(std::string name, std::string icon, const ActionDatabase& db, Action a);
+        std::string name;
+        std::string icon;
+        ActionRef gAction;
+        std::string fullActionName;
+    };
+    DrawingTypeComboToolButton(std::string id, IconNameHelper& icons, const ActionDatabase& db);
+
+    ~DrawingTypeComboToolButton() override;
+
+public:
+    std::string getToolDisplayName() const override;
+
+    enum class Type : size_t {
+        RECTANGLE,
+        ELLIPSE,
+        ARROW,
+        DOUBLE_ARROW,
+        LINE,
+        COORDINATE_SYSTEM,
+        SPLINE,
+        SHAPE_RECOGNIZER,
+        ENUMERATOR_COUNT
+    };
+
+protected:
+    xoj::util::WidgetSPtr createItem(bool horizontal) override;
+
+    GtkWidget* getNewToolIcon() const override;
+
+private:
+    template <Type s>
+    static void setProminentIconCallback(GObject* action, GParamSpec*, DrawingTypeComboToolButton* self);
+
+protected:
+    std::shared_ptr<const EnumIndexedArray<Entry, Type>> entries;
+    std::string iconName;
+    std::string description;
+};
diff --git a/entry/src/main/cpp/src/core/gui/toolbarMenubar/FontButton.cpp b/entry/src/main/cpp/src/core/gui/toolbarMenubar/FontButton.cpp
new file mode 100644
index 0000000..814b6f9
--- /dev/null
+++ b/entry/src/main/cpp/src/core/gui/toolbarMenubar/FontButton.cpp
@@ -0,0 +1,78 @@
+#include "FontButton.h"
+
+#include <sstream>  // for stringstream
+#include <utility>  // for move
+
+#include <glib-object.h>  // for g_object_ref, g_obj...
+
+#include "control/Control.h"                      // for Control
+#include "control/actions/ActionDatabase.h"       // for ActionDatabase
+#include "gui/toolbarMenubar/AbstractToolItem.h"  // for AbstractToolItem
+#include "model/Font.h"                           // for Font
+#include "util/GtkUtil.h"                         // for fixActionableInitialSensitivity
+#include "util/gtk4_helper.h"                     // for gtk_button_set_child
+#include "util/i18n.h"                            // for _
+#include "util/raii/GVariantSPtr.h"
+#include "util/serdesstream.h"
+
+
+FontButton::FontButton(std::string id, ActionDatabase& db):
+        AbstractToolItem(std::move(id), Category::TOOLS), gAction(db.getAction(Action::FONT)) {}
+
+static GtkWidget* makeChild(const char* desc) {
+    XojFont font(desc);
+    GtkWidget* box = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 10);
+    gtk_widget_set_margin_start(box, 4);
+    gtk_widget_set_margin_end(box, 4);
+    GtkWidget* label = gtk_label_new(nullptr);
+    auto markup = "<span font=\"" + font.getName() + "\">" + font.getName() + "</span>";
+    gtk_label_set_markup(GTK_LABEL(label), markup.c_str());
+    gtk_box_append(GTK_BOX(box), label);
+
+    auto size = serdes_stream<std::stringstream>();
+    size << font.getSize();
+    gtk_box_append(GTK_BOX(box), gtk_label_new(size.str().c_str()));
+    gtk_widget_show_all(box);
+    return box;
+}
+
+auto FontButton::createItem(bool horizontal) -> xoj::util::WidgetSPtr {
+    GtkWidget* btn = gtk_button_new();
+    gtk_widget_set_can_focus(btn, false);  // todo(gtk4) not necessary anymore
+    xoj::util::GVariantSPtr font(g_action_get_state(G_ACTION(gAction.get())), xoj::util::adopt);
+    const char* desc = g_variant_get_string(font.get(), nullptr);
+    gtk_button_set_child(GTK_BUTTON(btn), makeChild(desc));
+    gtk_widget_set_tooltip_text(btn, getToolDisplayName().c_str());
+    gtk_actionable_set_action_name(GTK_ACTIONABLE(btn),
+                                   (std::string("win.") + Action_toString(Action::SELECT_FONT)).c_str());
+
+    g_signal_connect_object(gAction.get(), "notify::state", G_CALLBACK(+[](GObject* action, GParamSpec*, gpointer btn) {
+                                xoj::util::GVariantSPtr font(g_action_get_state(G_ACTION(action)), xoj::util::adopt);
+                                const char* desc = g_variant_get_string(font.get(), nullptr);
+                                gtk_button_set_child(GTK_BUTTON(btn), makeChild(desc));
+                            }),
+                            btn, GConnectFlags(0));
+
+    GtkToolItem* it = gtk_tool_item_new();
+    gtk_container_add(GTK_CONTAINER(it), btn);
+    /// Makes a proxy item for the toolbar's overflow menu
+    auto createProxy = [this]() {
+        GtkWidget* proxy = gtk_menu_item_new();
+        auto* box = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 6);
+        gtk_container_add(GTK_CONTAINER(proxy), box);
+        gtk_box_append(GTK_BOX(box), getNewToolIcon());
+        gtk_box_append(GTK_BOX(box), gtk_label_new(getToolDisplayName().c_str()));
+        gtk_actionable_set_action_name(GTK_ACTIONABLE(proxy),
+                                       (std::string("win.") + Action_toString(Action::SELECT_FONT)).c_str());
+        xoj::util::gtk::fixActionableInitialSensitivity(GTK_ACTIONABLE(proxy));
+        return proxy;
+    };
+    gtk_tool_item_set_proxy_menu_item(it, "", createProxy());
+    return xoj::util::WidgetSPtr(GTK_WIDGET(it), xoj::util::adopt);
+}
+
+auto FontButton::getToolDisplayName() const -> std::string { return _("Font"); }
+
+auto FontButton::getNewToolIcon() const -> GtkWidget* {
+    return gtk_image_new_from_icon_name("font-x-generic", GTK_ICON_SIZE_LARGE_TOOLBAR);
+}
diff --git a/entry/src/main/cpp/src/core/gui/toolbarMenubar/FontButton.h b/entry/src/main/cpp/src/core/gui/toolbarMenubar/FontButton.h
new file mode 100644
index 0000000..3c68e89
--- /dev/null
+++ b/entry/src/main/cpp/src/core/gui/toolbarMenubar/FontButton.h
@@ -0,0 +1,37 @@
+/*
+ * Xournal++
+ *
+ * Part of the customizable toolbars
+ *
+ * @author Xournal++ Team
+ * https://github.com/xournalpp/xournalpp
+ *
+ * @license GNU GPLv2 or later
+ */
+
+#pragma once
+
+#include <string>  // for string
+
+#include <gtk/gtk.h>  // for GtkWidget
+
+#include "control/actions/ActionRef.h"
+
+#include "AbstractToolItem.h"
+
+class ActionDatabase;
+
+class FontButton: public AbstractToolItem {
+public:
+    FontButton(std::string id, ActionDatabase& db);
+    ~FontButton() override = default;
+
+public:
+    GtkWidget* getNewToolIcon() const override;
+    std::string getToolDisplayName() const override;
+
+    xoj::util::WidgetSPtr createItem(bool horizontal) override;
+
+private:
+    ActionRef gAction;  ///< Points to the GAction corresponding to Action::FONT
+};
diff --git a/entry/src/main/cpp/src/core/gui/toolbarMenubar/PluginPlaceholderLabel.cpp b/entry/src/main/cpp/src/core/gui/toolbarMenubar/PluginPlaceholderLabel.cpp
new file mode 100644
index 0000000..d102132
--- /dev/null
+++ b/entry/src/main/cpp/src/core/gui/toolbarMenubar/PluginPlaceholderLabel.cpp
@@ -0,0 +1,80 @@
+#include "PluginPlaceholderLabel.h"
+
+#include <algorithm>  // for std::replace
+
+#include "plugin/Plugin.h"  // for ToolbarPlaceholderEntry
+#include "util/glib_casts.h"
+#include "util/gtk4_helper.h"  // for gtk_popover_new
+
+#include "config-features.h"
+
+#ifdef ENABLE_PLUGINS
+
+PluginPlaceholderLabel::PluginPlaceholderLabel(ToolbarPlaceholderEntry* t):
+        AbstractToolItem(t->toolbarId, Category::PLUGINS), t(t) {
+    t->label = this;
+}
+
+PluginPlaceholderLabel::~PluginPlaceholderLabel() {
+    for (auto* label: labelWidgets) {
+        if (GTK_IS_WIDGET(label)) {
+            g_signal_handlers_disconnect_by_data(label, this);
+        }
+    }
+    labelWidgets.clear();
+}
+
+auto PluginPlaceholderLabel::sanitizeText(const std::string& text) const -> std::string {
+    std::string sanitized = text;
+    std::replace(sanitized.begin(), sanitized.end(), '\n', ' ');
+    std::replace(sanitized.begin(), sanitized.end(), '\r', ' ');
+    return sanitized;
+}
+
+auto PluginPlaceholderLabel::getDisplayText() const -> std::string {
+    std::string text = t->value;
+    if (text.empty()) {
+        text = getDisplayId(t->toolbarId);
+    }
+    return sanitizeText(text);
+}
+
+auto PluginPlaceholderLabel::createItem(bool) -> xoj::util::WidgetSPtr {
+    const std::string labelText = getDisplayText();
+
+    xoj::util::WidgetSPtr item(gtk_label_new(labelText.c_str()), xoj::util::adopt);
+    GtkWidget* rawLabel = item.get();
+    labelWidgets.push_back(rawLabel);
+    gtk_widget_set_can_focus(rawLabel, false);
+    gtk_widget_set_size_request(rawLabel, 200, -1);
+    gtk_label_set_ellipsize(GTK_LABEL(rawLabel), PANGO_ELLIPSIZE_END);
+
+    // Remove label from vector when destroyed
+    g_signal_connect(rawLabel, "destroy", G_CALLBACK(+[](GtkWidget* widget, gpointer user_data) {
+                         auto self = static_cast<PluginPlaceholderLabel*>(user_data);
+                         auto& widgets = self->labelWidgets;
+                         widgets.erase(std::remove(widgets.begin(), widgets.end(), widget), widgets.end());
+                     }),
+                     this);
+    return item;
+}
+
+void PluginPlaceholderLabel::setText(std::string text) {
+    t->value = std::move(text);
+    const std::string displayText = getDisplayText();
+
+    for (auto* label: labelWidgets) {
+        if (GTK_IS_WIDGET(label)) {
+            gtk_label_set_text(GTK_LABEL(label), displayText.c_str());
+            gtk_widget_queue_draw(label);
+        }
+    }
+}
+
+auto PluginPlaceholderLabel::getToolDisplayName() const -> std::string { return this->t->description; }
+
+auto PluginPlaceholderLabel::getNewToolIcon() const -> GtkWidget* {
+    return gtk_image_new_from_icon_name("dialog-information", GTK_ICON_SIZE_LARGE_TOOLBAR);
+}
+
+#endif /* ENABLE_PLUGINS */
diff --git a/entry/src/main/cpp/src/core/gui/toolbarMenubar/PluginPlaceholderLabel.h b/entry/src/main/cpp/src/core/gui/toolbarMenubar/PluginPlaceholderLabel.h
new file mode 100644
index 0000000..c6b8bc2
--- /dev/null
+++ b/entry/src/main/cpp/src/core/gui/toolbarMenubar/PluginPlaceholderLabel.h
@@ -0,0 +1,52 @@
+/*
+ * Xournal++
+ *
+ * Part of the customizable toolbars
+ *
+ * @author Xournal++ Team
+ * https://github.com/xournalpp/xournalpp
+ *
+ * @license GNU GPLv2 or later
+ */
+
+#pragma once
+
+#include <string>
+#include <vector>
+
+#include <gtk/gtk.h>
+
+#include "AbstractToolItem.h"
+
+struct ToolbarPlaceholderEntry;
+
+class PluginPlaceholderLabel: public AbstractToolItem {
+public:
+    /// Constructor: links placeholder entry to this label
+    explicit PluginPlaceholderLabel(ToolbarPlaceholderEntry* t);
+
+    /// Destructor: disconnects signal handlers and clears label widget vector
+    ~PluginPlaceholderLabel() override;
+
+    /// Returns the display name for the placeholder tool
+    std::string getToolDisplayName() const override;
+
+    /// Updates all label widgets with new text
+    void setText(std::string text);
+
+protected:
+    /// Creates a label widget for the placeholder; stores and tracks it
+    xoj::util::WidgetSPtr createItem(bool horizontal) override;
+
+    /// Returns a theme-supported icon for the placeholder tool
+    GtkWidget* getNewToolIcon() const override;
+
+private:
+    ToolbarPlaceholderEntry* t;
+    std::vector<GtkWidget*> labelWidgets;
+
+    auto sanitizeText(const std::string& text) const -> std::string;
+
+    /// Gets the display text, using toolbarId as fallback if value is empty
+    auto getDisplayText() const -> std::string;
+};
diff --git a/entry/src/main/cpp/src/core/gui/toolbarMenubar/PluginToolButton.cpp b/entry/src/main/cpp/src/core/gui/toolbarMenubar/PluginToolButton.cpp
new file mode 100644
index 0000000..8a418de
--- /dev/null
+++ b/entry/src/main/cpp/src/core/gui/toolbarMenubar/PluginToolButton.cpp
@@ -0,0 +1,44 @@
+#include "PluginToolButton.h"
+
+#include "config-features.h"  // for ENABLE_PLUGINS
+
+#ifdef ENABLE_PLUGINS
+
+#include <utility>  // for move
+
+#include "plugin/Plugin.h"  // for ToolbarButtonEntry
+#include "util/glib_casts.h"
+#include "util/gtk4_helper.h"
+
+
+PluginToolButton::PluginToolButton(ToolbarButtonEntry* t):
+        AbstractToolItem(std::move(t->toolbarId), Category::PLUGINS), t(t) {}
+
+PluginToolButton::~PluginToolButton() = default;
+
+auto PluginToolButton::createItem(bool) -> xoj::util::WidgetSPtr {
+    xoj::util::WidgetSPtr item(gtk_button_new(), xoj::util::adopt);
+    gtk_widget_set_can_focus(item.get(), false);  // todo(gtk4) not necessary anymore
+
+    GtkButton* btn = GTK_BUTTON(item.get());
+    gtk_button_set_relief(btn, GTK_RELIEF_NONE);
+    gtk_button_set_icon_name(btn, t->iconName.c_str());
+    gtk_widget_set_tooltip_text(GTK_WIDGET(btn), t->description.c_str());
+
+    // Connect signal
+    g_signal_connect(item.get(), "clicked", G_CALLBACK(+[](GtkButton*, gpointer d) {
+                         auto* te = static_cast<ToolbarButtonEntry*>(d);
+                         te->plugin->executeToolbarButton(te);
+                     }),
+                     this->t);
+
+    return item;
+}
+
+auto PluginToolButton::getToolDisplayName() const -> std::string { return this->t->description; }
+
+auto PluginToolButton::getNewToolIcon() const -> GtkWidget* {
+    return gtk_image_new_from_icon_name(t->iconName.c_str(), GTK_ICON_SIZE_SMALL_TOOLBAR);
+}
+
+#endif /* ENABLE_PLUGINS */
diff --git a/entry/src/main/cpp/src/core/gui/toolbarMenubar/PluginToolButton.h b/entry/src/main/cpp/src/core/gui/toolbarMenubar/PluginToolButton.h
new file mode 100644
index 0000000..68db133
--- /dev/null
+++ b/entry/src/main/cpp/src/core/gui/toolbarMenubar/PluginToolButton.h
@@ -0,0 +1,35 @@
+/*
+ * Xournal++
+ *
+ * Part of the customizable toolbars
+ *
+ * @author Xournal++ Team
+ * https://github.com/xournalpp/xournalpp
+ *
+ * @license GNU GPLv2 or later
+ */
+
+#pragma once
+
+#include <string>  // for string, allocator
+
+#include <gtk/gtk.h>  // for GtkWidget, GtkToolItem
+
+#include "AbstractToolItem.h"  // for AbstractToolItem
+
+struct ToolbarButtonEntry;
+
+class PluginToolButton: public AbstractToolItem {
+public:
+    PluginToolButton(ToolbarButtonEntry* t);
+
+    ~PluginToolButton() override;
+    std::string getToolDisplayName() const override;
+
+protected:
+    xoj::util::WidgetSPtr createItem(bool horizontal) override;
+    GtkWidget* getNewToolIcon() const override;
+
+private:
+    ToolbarButtonEntry* t;
+};
diff --git a/entry/src/main/cpp/src/core/gui/toolbarMenubar/SliderItemCreationHelper.h b/entry/src/main/cpp/src/core/gui/toolbarMenubar/SliderItemCreationHelper.h
new file mode 100644
index 0000000..04e2e6d
--- /dev/null
+++ b/entry/src/main/cpp/src/core/gui/toolbarMenubar/SliderItemCreationHelper.h
@@ -0,0 +1,88 @@
+/*
+ * Xournal++
+ *
+ * Abstract representation of slider-based tools.
+ *
+ * @author Xournal++ Team
+ * https://github.com/xournalpp/xournalpp
+ *
+ * @license GNU GPLv2 or later
+ */
+
+#pragma once
+
+#include <string>  // for string
+
+#include <gtk/gtk.h>  // for GtkRange
+
+#include "control/actions/ActionRef.h"
+#include "util/GVariantTemplate.h"  // for makeGVariant
+#include "util/GtkUtil.h"           // for setWidgetFollowActionEnabled
+#include "util/glib_casts.h"        // for wrap_for_g_callback_v
+#include "util/gtk4_helper.h"       // for gtk_scale_set_format_value_func
+
+#include "AbstractSliderItem.h"
+
+/**
+ * @brief Helper function. We rely on a template to avoid adding a vtable to every callback data
+ */
+template <class FinalSliderType>
+class SliderItemCreationHelper {
+public:
+    static void valueChangedCb(GtkRange* slider, gpointer gAction) {
+        double state = FinalSliderType::scaleInverseFunction(gtk_range_get_value(slider));
+        g_action_change_state(G_ACTION(gAction), makeGVariant(state));
+    }
+
+    static xoj::util::WidgetSPtr createItem(AbstractSliderItem* self, bool horizontal) {
+        GtkOrientation orientation = horizontal ? GTK_ORIENTATION_HORIZONTAL : GTK_ORIENTATION_VERTICAL;
+        const double min = FinalSliderType::scaleFunction(self->range.min);
+        const double max = FinalSliderType::scaleFunction(self->range.max);
+        const double fineStepSize = (max - min) / self->range.nbFineSteps;
+        const double coarseStepSize = (max - min) / self->range.nbCoarseSteps;
+
+        GtkRange* slider = GTK_RANGE(gtk_scale_new_with_range(orientation, min, max, fineStepSize));
+        gtk_range_set_increments(slider, fineStepSize, coarseStepSize);
+
+        if (horizontal) {
+            gtk_widget_set_size_request(GTK_WIDGET(slider), 120, 16);
+        } else {
+            gtk_widget_set_size_request(GTK_WIDGET(slider), 16, 120);
+        }
+
+        gtk_widget_set_can_focus(GTK_WIDGET(slider), false);  // todo(gtk4) not necessary anymore
+
+        // gAction does not own the return GVariant and it is not floating either!
+        xoj::util::GVariantSPtr state(g_action_get_state(G_ACTION(self->gAction.get())), xoj::util::adopt);
+        gtk_range_set_value(slider, FinalSliderType::scaleFunction(getGVariantValue<double>(state.get())));
+
+        g_signal_connect_object(slider, "value-changed", G_CALLBACK(valueChangedCb), self->gAction.get(),
+                                GConnectFlags(0));
+
+        g_signal_connect_object(
+                self->gAction.get(), "notify::state", G_CALLBACK(+[](GObject* action, GParamSpec*, gpointer slider) {
+                    // action does not own the return GVariant and it is not floating either!
+                    xoj::util::GVariantSPtr state(g_action_get_state(G_ACTION(action)), xoj::util::adopt);
+                    xoj_assert(state);
+                    g_signal_handlers_block_by_func(slider, (gpointer)valueChangedCb, action);
+                    gtk_range_set_value(GTK_RANGE(slider),
+                                        FinalSliderType::scaleFunction(getGVariantValue<double>(state.get())));
+                    g_signal_handlers_unblock_by_func(slider, (gpointer)valueChangedCb, action);
+                }),
+                slider, GConnectFlags(0));
+
+        xoj::util::gtk::setWidgetFollowActionEnabled(GTK_WIDGET(slider), G_ACTION(self->gAction.get()));
+
+        if constexpr (FinalSliderType::DISPLAY_VALUE) {
+            gtk_scale_set_draw_value(GTK_SCALE(slider), true);
+            gtk_scale_set_format_value_func(
+                    GTK_SCALE(slider),
+                    +[](GtkScale*, double value, gpointer) -> char* {
+                        return g_strdup(FinalSliderType::formatSliderValue(value).c_str());
+                    },
+                    nullptr, nullptr);
+        }
+
+        return xoj::util::WidgetSPtr(GTK_WIDGET(slider), xoj::util::adopt);
+    }
+};
diff --git a/entry/src/main/cpp/src/core/gui/toolbarMenubar/StylePopoverFactory.cpp b/entry/src/main/cpp/src/core/gui/toolbarMenubar/StylePopoverFactory.cpp
new file mode 100644
index 0000000..279cbec
--- /dev/null
+++ b/entry/src/main/cpp/src/core/gui/toolbarMenubar/StylePopoverFactory.cpp
@@ -0,0 +1,57 @@
+#include "StylePopoverFactory.h"
+
+#include <utility>  // for move
+
+#include <glib.h>
+#include <gtk/gtk.h>
+
+#include "util/GtkUtil.h"
+#include "util/gtk4_helper.h"
+
+
+StylePopoverFactory::StylePopoverFactory(Action styleAction, std::vector<Entry> entries):
+        entries(std::move(entries)), styleAction(styleAction) {}
+
+GtkWidget* StylePopoverFactory::createPopover() const {
+    GtkWidget* popover = gtk_popover_new();
+    GtkWidget* box = gtk_box_new(GTK_ORIENTATION_VERTICAL, 0);
+    gtk_popover_set_child(GTK_POPOVER(popover), box);
+
+#if GTK_MAJOR_VERSION == 3
+    GtkRadioButton* group = nullptr;
+    const char* actionName = Action_toString(styleAction);
+    auto appendItem = [&](const StylePopoverFactory::Entry& e) {
+        GtkWidget* btn = gtk_radio_button_new_from_widget(group);
+        group = GTK_RADIO_BUTTON(btn);
+        xoj::util::gtk::setRadioButtonActionName(GTK_RADIO_BUTTON(btn), "win", actionName);
+        g_signal_connect_object(btn, "clicked", G_CALLBACK(+[](GtkButton*, gpointer popover) {
+                                    gtk_popover_popdown(GTK_POPOVER(popover));
+                                }),
+                                popover, GConnectFlags(0));
+#else
+    std::string actionName = std::string("win.") + Action_toString(Action::TOOL_PEN_LINE_STYLE);
+    auto appendLineStyleItem = [&](const char* label, const char* target, const char* icon) {
+        GtkWidget* btn = gtk_check_button_new_with_label(layerName.c_str());
+        gtk_actionable_set_action_name(GTK_ACTIONABLE(btn), actionName.c_str());
+        g_signal_connect_object(btn, "toggled", G_CALLBACK(+[](GtkCheckButton*, gpointer popover){
+            gtk_popover_popdown(GTK_POPOVER(popover));}), popover, GConnectFlags(0));
+#endif
+        gtk_actionable_set_action_target_value(GTK_ACTIONABLE(btn), e.target.get());
+        if (!e.icon.empty()) {
+            GtkWidget* hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 5);
+            gtk_box_append(GTK_BOX(hbox), gtk_image_new_from_icon_name(e.icon.c_str(), GTK_ICON_SIZE_LARGE_TOOLBAR));
+            gtk_box_append(GTK_BOX(hbox), gtk_label_new(e.name.c_str()));
+            gtk_button_set_child(GTK_BUTTON(btn), hbox);
+        } else {
+            gtk_button_set_label(GTK_BUTTON(btn), e.name.c_str());
+        }
+        gtk_box_append(GTK_BOX(box), btn);
+    };
+
+    for (const auto& e: entries) {
+        appendItem(e);
+    }
+
+    gtk_widget_show_all(box);
+    return popover;
+}
diff --git a/entry/src/main/cpp/src/core/gui/toolbarMenubar/StylePopoverFactory.h b/entry/src/main/cpp/src/core/gui/toolbarMenubar/StylePopoverFactory.h
new file mode 100644
index 0000000..20a69ef
--- /dev/null
+++ b/entry/src/main/cpp/src/core/gui/toolbarMenubar/StylePopoverFactory.h
@@ -0,0 +1,46 @@
+/*
+ * Xournal++
+ *
+ * Part of the customizable toolbars
+ *
+ * @author Xournal++ Team
+ * https://github.com/xournalpp/xournalpp
+ *
+ * @license GNU GPLv2 or later
+ */
+
+#pragma once
+
+#include <string>  // for string, allocator
+#include <vector>
+
+#include <gtk/gtk.h>  // for GtkWidget
+
+#include "enums/Action.enum.h"  // for Action
+#include "gui/PopoverFactory.h"
+#include "util/raii/GVariantSPtr.h"
+
+class StylePopoverFactory final: public PopoverFactory {
+public:
+    struct Entry {
+        template <typename T>
+        Entry(std::string name, std::string icon, T t):
+                name(std::move(name)), icon(std::move(icon)), target(xoj::util::makeGVariantSPtr<T>(t)) {}
+        template <typename T>
+        Entry(std::string name, T t): name(std::move(name)), target(xoj::util::makeGVariantSPtr<T>(t)) {}
+        std::string name;
+        std::string icon;
+        xoj::util::GVariantSPtr target;  /// Target value of the associated GSimpleAction corresponding to the entry
+    };
+
+    /// @param styleAction The action activated when an entry in the popover is clicked
+    StylePopoverFactory(Action styleAction, std::vector<Entry> entries);
+    ~StylePopoverFactory() override = default;
+
+    GtkWidget* createPopover() const override;
+
+private:
+    std::vector<Entry> entries;
+    /// The action activated when an entry in the popover is clicked
+    Action styleAction;
+};
diff --git a/entry/src/main/cpp/src/core/gui/toolbarMenubar/ToolButton.cpp b/entry/src/main/cpp/src/core/gui/toolbarMenubar/ToolButton.cpp
new file mode 100644
index 0000000..756a9d8
--- /dev/null
+++ b/entry/src/main/cpp/src/core/gui/toolbarMenubar/ToolButton.cpp
@@ -0,0 +1,111 @@
+#include "ToolButton.h"
+
+#include <utility>  // for move
+
+#include <glib.h>
+#include <gtk/gtk.h>
+
+#include "gui/toolbarMenubar/AbstractToolItem.h"  // for AbstractToolItem
+#include "util/GVariantTemplate.h"
+#include "util/GtkUtil.h"
+#include "util/gtk4_helper.h"
+#include "util/raii/GObjectSPtr.h"  // for WidgetSPtr
+
+
+ToolButton::ToolButton(std::string id, Category cat, Action action, std::string iconName, std::string description,
+                       bool toggle):
+        AbstractToolItem(std::move(id), cat),
+        iconName(std::move(iconName)),
+        description(std::move(description)),
+        action(action),
+        toggle(toggle) {}
+
+ToolButton::ToolButton(std::string id, Category cat, Action action, GVariant* target, std::string iconName,
+                       std::string description):
+        AbstractToolItem(std::move(id), cat),
+        iconName(std::move(iconName)),
+        description(std::move(description)),
+        action(action),
+        target(target, xoj::util::refsink),
+        toggle(true) {}
+
+auto ToolButton::createItem(bool horizontal) -> xoj::util::WidgetSPtr {
+    GtkWidget* btn = toggle ? gtk_toggle_button_new() : gtk_button_new();
+    gtk_widget_set_can_focus(btn, false);  // todo(gtk4) not necessary anymore
+    gtk_button_set_child(GTK_BUTTON(btn), getNewToolIcon());
+    gtk_widget_set_tooltip_text(btn, getToolDisplayName().c_str());
+    gtk_actionable_set_action_name(GTK_ACTIONABLE(btn), (std::string("win.") + Action_toString(action)).c_str());
+    if (target) {
+        gtk_actionable_set_action_target_value(GTK_ACTIONABLE(btn), target.get());
+        xoj::util::gtk::setToggleButtonUnreleasable(GTK_TOGGLE_BUTTON(btn));
+    }
+
+    // For the sake of deprecated GtkToolbar, wrap the button in a GtkToolItem
+    // Todo(gtk4): remove
+    GtkToolItem* it = gtk_tool_item_new();
+    if (popoverFactory) {
+        GtkMenuButton* menubutton = GTK_MENU_BUTTON(gtk_menu_button_new());
+        gtk_widget_set_can_focus(GTK_WIDGET(menubutton), false);  // todo(gtk4) not necessary anymore
+        gtk_menu_button_set_popover(menubutton, popoverFactory->createPopover());
+        gtk_menu_button_set_direction(menubutton, GTK_ARROW_DOWN);
+
+        GtkBox* box = GTK_BOX(gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 0));
+        gtk_box_append(box, btn);
+        gtk_box_append(box, GTK_WIDGET(menubutton));
+
+        gtk_container_add(GTK_CONTAINER(it), GTK_WIDGET(box));
+
+        g_signal_connect_object(it, "toolbar-reconfigured", G_CALLBACK(+[](GtkToolItem* it, gpointer box) {
+                                    gtk_orientable_set_orientation(GTK_ORIENTABLE(box),
+                                                                   gtk_tool_item_get_orientation(it));
+                                }),
+                                box, GConnectFlags(0));
+        g_signal_connect_object(it, "toolbar-reconfigured", G_CALLBACK(+[](GtkToolItem* it, gpointer btn) {
+                                    const bool h = gtk_tool_item_get_orientation(it) == GTK_ORIENTATION_HORIZONTAL;
+                                    gtk_menu_button_set_direction(GTK_MENU_BUTTON(btn),
+                                                                  h ? GTK_ARROW_DOWN : GTK_ARROW_RIGHT);
+                                    if (!gtk_menu_button_get_popover(GTK_MENU_BUTTON(btn))) {
+                                        printf("no popover in callback\n");
+                                    }
+                                }),
+                                menubutton, GConnectFlags(0));
+
+    } else {
+        gtk_container_add(GTK_CONTAINER(it), GTK_WIDGET(btn));
+    }
+
+    /// Makes a proxy item for the toolbar's overflow menu
+    auto createProxy = [this]() {
+        GtkWidget* proxy;
+        if (toggle) {
+            proxy = gtk_check_menu_item_new();
+            if (target) {
+                gtk_check_menu_item_set_draw_as_radio(GTK_CHECK_MENU_ITEM(proxy), true);
+            }
+        } else {
+            proxy = gtk_menu_item_new();
+        }
+
+        auto* box = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 6);
+        gtk_container_add(GTK_CONTAINER(proxy), box);
+        gtk_box_append(GTK_BOX(box), getNewToolIcon());
+        gtk_box_append(GTK_BOX(box), gtk_label_new(getToolDisplayName().c_str()));
+
+        gtk_actionable_set_action_name(GTK_ACTIONABLE(proxy), (std::string("win.") + Action_toString(action)).c_str());
+        if (target) {
+            gtk_actionable_set_action_target_value(GTK_ACTIONABLE(proxy), target.get());
+        }
+        xoj::util::gtk::fixActionableInitialSensitivity(GTK_ACTIONABLE(proxy));
+        return proxy;
+    };
+    gtk_tool_item_set_proxy_menu_item(it, "", createProxy());
+    return xoj::util::WidgetSPtr(GTK_WIDGET(it), xoj::util::adopt);
+}
+
+auto ToolButton::getToolDisplayName() const -> std::string { return description; }
+
+auto ToolButton::getNewToolIcon() const -> GtkWidget* {
+    return gtk_image_new_from_icon_name(iconName.c_str(), GTK_ICON_SIZE_LARGE_TOOLBAR);
+}
+
+void ToolButton::setPopoverFactory(const PopoverFactory* factory) { popoverFactory = factory; }
diff --git a/entry/src/main/cpp/src/core/gui/toolbarMenubar/ToolButton.h b/entry/src/main/cpp/src/core/gui/toolbarMenubar/ToolButton.h
new file mode 100644
index 0000000..71fa655
--- /dev/null
+++ b/entry/src/main/cpp/src/core/gui/toolbarMenubar/ToolButton.h
@@ -0,0 +1,52 @@
+/*
+ * Xournal++
+ *
+ * Part of the customizable toolbars
+ *
+ * @author Xournal++ Team
+ * https://github.com/xournalpp/xournalpp
+ *
+ * @license GNU GPLv2 or later
+ */
+
+#pragma once
+
+#include <memory>
+#include <string>  // for string, allocator
+
+#include <gtk/gtk.h>  // for GtkWidget
+
+#include "enums/Action.enum.h"  // for Action
+#include "gui/PopoverFactory.h"
+#include "util/raii/GVariantSPtr.h"
+
+#include "AbstractToolItem.h"  // for AbstractToolItem
+
+
+class ToolButton: public AbstractToolItem {
+public:
+    ToolButton(std::string id, Category cat, Action action, std::string iconName, std::string description, bool toggle);
+    ToolButton(std::string id, Category cat, Action action, GVariant* target, std::string iconName,
+               std::string description);
+    ~ToolButton() override = default;
+
+public:
+    std::string getToolDisplayName() const override;
+    void setPopoverFactory(const PopoverFactory* factory);
+
+protected:
+    xoj::util::WidgetSPtr createItem(bool horizontal) override;
+
+    GtkWidget* getNewToolIcon() const override;
+
+protected:
+    std::string iconName;
+    std::string description;
+    /// @brief If set, a MenuButton is added with this popover
+    const PopoverFactory* popoverFactory = nullptr;
+    Action action;
+    /// @brief If set, the action target value the button corresponds to
+    xoj::util::GVariantSPtr target;
+    /// @brief Whether or not the button is a ToggleButton.
+    bool toggle;
+};
diff --git a/entry/src/main/cpp/src/core/gui/toolbarMenubar/ToolMenuHandler.cpp b/entry/src/main/cpp/src/core/gui/toolbarMenubar/ToolMenuHandler.cpp
new file mode 100644
index 0000000..91becef
--- /dev/null
+++ b/entry/src/main/cpp/src/core/gui/toolbarMenubar/ToolMenuHandler.cpp
@@ -0,0 +1,550 @@
+#include "ToolMenuHandler.h"
+
+#include <algorithm>  // for max
+#include <sstream>    // for istringstream
+
+#include "control/Control.h"                         // for Control
+#include "control/PageBackgroundChangeController.h"  // for PageBackgroundChangeController
+#include "control/ScrollHandler.h"                   // for ScrollHandler
+#include "control/actions/ActionDatabase.h"          // for ActionDatabase
+#include "control/settings/Settings.h"               // for Settings
+#include "gui/GladeGui.h"                            // for GladeGui
+#include "gui/GladeSearchpath.h"
+#include "gui/ToolitemDragDrop.h"  // for ToolitemDragDrop
+#include "gui/menus/popoverMenus/PageTypeSelectionPopover.h"
+#include "gui/toolbarMenubar/model/ColorPalette.h"  // for Palette
+#include "gui/toolbarMenubar/model/ToolbarData.h"   // for ToolbarData
+#include "gui/toolbarMenubar/model/ToolbarEntry.h"  // for ToolbarEntry
+#include "gui/toolbarMenubar/model/ToolbarItem.h"   // for ToolbarItem
+#include "gui/toolbarMenubar/model/ToolbarModel.h"  // for ToolbarModel
+#include "plugin/Plugin.h"                          // for ToolbarButtonEntr<
+#include "util/GVariantTemplate.h"                  // for gVariantType
+#include "util/GtkUtil.h"
+#include "util/NamedColor.h"  // for NamedColor
+#include "util/PathUtil.h"
+#include "util/StringUtils.h"  // for StringUtils
+#include "util/XojMsgBox.h"
+#include "util/gtk4_helper.h"
+#include "util/i18n.h"  // for _
+
+#include "AbstractToolItem.h"            // for AbstractToolItem
+#include "ColorSelectorToolItem.h"       // for ColorSelectorToolItem
+#include "ColorToolItem.h"               // for ColorToolItem
+#include "DrawingTypeComboToolButton.h"  // for DrawingTypeComboToolButton
+#include "FontButton.h"                  // for FontButton
+#include "PluginPlaceholderLabel.h"      // for PluginPlaceholderLabel
+#include "PluginToolButton.h"            // for PluginToolButton
+#include "StylePopoverFactory.h"         // for ToolButtonWithStylePopover
+#include "ToolButton.h"                  // for ToolButton
+#include "ToolPageLayer.h"               // for ToolPageLayer
+#include "ToolPageSpinner.h"             // for ToolPageSpinner
+#include "ToolPdfCombocontrol.h"         // for ToolPdfCombocontrol
+#include "ToolSelectCombocontrol.h"      // for ToolSelectComboc...
+#include "ToolZoomSlider.h"              // for ToolZoomSlider
+#include "TooltipToolButton.h"           // for TooltipToolButton
+#include "config-dev.h"                  // for TOOLBAR_CONFIG
+#include "config-features.h"             // for ENABLE_PLUGINS
+#include "filesystem.h"                  // for exists
+
+
+using std::string;
+
+ToolMenuHandler::ToolMenuHandler(Control* control, GladeGui* gui):
+        parent(GTK_WINDOW(gui->getWindow())),
+        control(control),
+        zoom(control->getZoomControl()),
+        gui(gui),
+        toolHandler(control->getToolHandler()),
+        tbModel(std::make_unique<ToolbarModel>()),
+        pageBackgroundChangeController(control->getPageBackgroundChangeController()),
+        iconNameHelper(control->getSettings()),
+        pageTypeSelectionPopup(std::make_unique<PageTypeSelectionPopover>(control, control->getSettings(),
+                                                                          GTK_APPLICATION_WINDOW(parent))) {}
+
+void ToolMenuHandler::populate(const GladeSearchpath* gladeSearchPath) {
+    initToolItems();
+
+    auto file = gladeSearchPath->findFile("", "toolbar.ini");
+    if (!tbModel->parse(file, true, this->control->getPalette())) {
+        std::string msg = FS(_F("Could not parse general toolbar.ini file: {1}\n"
+                                "No Toolbars will be available") %
+                             file.u8string());
+        XojMsgBox::showErrorToUser(control->getGtkWindow(), msg);
+    }
+
+    file = Util::getConfigFile(TOOLBAR_CONFIG);
+    if (fs::exists(file)) {
+        if (!tbModel->parse(file, false, this->control->getPalette())) {
+            string msg = FS(_F("Could not parse custom toolbar.ini file: {1}\n"
+                               "Toolbars will not be available") %
+                            file.u8string());
+            XojMsgBox::showErrorToUser(control->getGtkWindow(), msg);
+        }
+    }
+}
+
+ToolMenuHandler::~ToolMenuHandler() = default;
+
+void ToolMenuHandler::freeDynamicToolbarItems() { this->toolbarColorItems.clear(); }
+
+void ToolMenuHandler::unloadToolbar(GtkWidget* toolbar) {
+    for (int i = gtk_toolbar_get_n_items(GTK_TOOLBAR(toolbar)) - 1; i >= 0; i--) {
+        GtkToolItem* tbItem = gtk_toolbar_get_nth_item(GTK_TOOLBAR(toolbar), i);
+        gtk_container_remove(GTK_CONTAINER(toolbar), GTK_WIDGET(tbItem));
+    }
+
+    gtk_widget_hide(toolbar);
+}
+
+void ToolMenuHandler::load(const ToolbarData* d, GtkWidget* toolbar, const char* toolbarName, bool horizontal) {
+    int count = 0;
+    const auto palette = this->control->getPalette();
+
+    const auto& recolorParams = control->getSettings()->getRecolorParameters();
+    auto recolor = recolorParams.recolorizeMainView ? std::make_optional(recolorParams.recolor) : std::nullopt;
+
+    for (const ToolbarEntry& e: d->contents) {
+        if (e.getName() == toolbarName) {
+            for (const ToolbarItem& dataItem: e.getItems()) {
+                std::string name = dataItem.getName();
+
+                if (!this->control->getAudioController() &&
+                    (name == "AUDIO_RECORDING" || name == "AUDIO_SEEK_BACKWARDS" || name == "AUDIO_PAUSE_PLAYBACK" ||
+                     name == "AUDIO_STOP_PLAYBACK" || name == "AUDIO_SEEK_FORWARDS" || name == "PLAY_OBJECT")) {
+                    continue;
+                }
+
+                if (name == "SEPARATOR") {
+                    GtkToolItem* it = gtk_separator_tool_item_new();
+                    gtk_widget_show(GTK_WIDGET(it));
+                    gtk_toolbar_insert(GTK_TOOLBAR(toolbar), it, -1);
+
+                    ToolitemDragDrop::attachMetadata(GTK_WIDGET(it), dataItem.getId(), TOOL_ITEM_SEPARATOR);
+
+                    continue;
+                }
+
+                if (name == "SPACER") {
+                    GtkToolItem* toolItem = gtk_separator_tool_item_new();
+                    gtk_separator_tool_item_set_draw(GTK_SEPARATOR_TOOL_ITEM(toolItem), false);
+                    gtk_tool_item_set_expand(toolItem, true);
+                    gtk_widget_show(GTK_WIDGET(toolItem));
+                    gtk_toolbar_insert(GTK_TOOLBAR(toolbar), toolItem, -1);
+
+                    ToolitemDragDrop::attachMetadata(GTK_WIDGET(toolItem), dataItem.getId(), TOOL_ITEM_SPACER);
+
+                    continue;
+                }
+                if (StringUtils::startsWith(name, "COLOR(") && StringUtils::endsWith(name, ")")) {
+                    std::string arg = name.substr(6, name.length() - 7);
+
+                    size_t paletteIndex{};
+                    std::istringstream colorStream(arg);
+                    colorStream >> paletteIndex;
+                    if (!colorStream.eof() || colorStream.fail()) {
+                        g_warning("Toolbar:COLOR(N) has wrong format: %s", arg.c_str());
+                        continue;
+                    }
+
+                    count++;
+                    const NamedColor& namedColor = palette.getColorAt(paletteIndex);
+                    auto& item =
+                            this->toolbarColorItems.emplace_back(std::make_unique<ColorToolItem>(namedColor, recolor));
+
+                    auto it = item->createToolItem(horizontal);
+                    gtk_toolbar_insert(GTK_TOOLBAR(toolbar), GTK_TOOL_ITEM(it.get()), -1);
+
+                    ToolitemDragDrop::attachMetadataColor(it.get(), dataItem.getId(), paletteIndex, item.get());
+
+                    continue;
+                }
+
+                bool found = false;
+                for (auto& item: this->toolItems) {
+                    if (name == item->getId()) {
+                        count++;
+                        auto it = item->createToolItem(horizontal);
+                        gtk_toolbar_insert(GTK_TOOLBAR(toolbar), GTK_TOOL_ITEM(it.get()), -1);
+
+                        ToolitemDragDrop::attachMetadata(it.get(), dataItem.getId(), item.get());
+
+                        found = true;
+                        break;
+                    }
+                }
+                if (!found) {
+                    g_warning("Toolbar item \"%s\" not found!", name.c_str());
+                }
+            }
+
+            break;
+        }
+    }
+
+    if (count == 0) {
+        gtk_widget_hide(toolbar);
+    } else {
+        gtk_widget_show(toolbar);
+    }
+}
+
+void ToolMenuHandler::removeColorToolItem(AbstractToolItem* it) {
+    g_return_if_fail(it != nullptr);
+    this->toolbarColorItems.erase(std::find_if(this->toolbarColorItems.begin(), this->toolbarColorItems.end(),
+                                               [it](const auto& p) { return p.get() == it; }));
+}
+
+void ToolMenuHandler::addColorToolItem(std::unique_ptr<ColorToolItem> it) {
+    g_return_if_fail(it != nullptr);
+    this->toolbarColorItems.emplace_back(std::move(it));
+}
+
+template <class tool_item, class... Args>
+tool_item& ToolMenuHandler::emplaceItem(Args&&... args) {
+    return static_cast<tool_item&>(*toolItems.emplace_back(std::make_unique<tool_item>(std::forward<Args>(args)...)));
+}
+
+#ifdef ENABLE_PLUGINS
+void ToolMenuHandler::addPluginItem(ToolbarButtonEntry* t) { emplaceItem<PluginToolButton>(t); }
+void ToolMenuHandler::addPluginPlaceholderItem(ToolbarPlaceholderEntry* entry) {
+    emplaceItem<PluginPlaceholderLabel>(entry);
+}
+#endif /* ENABLE_PLUGINS */
+
+
+void ToolMenuHandler::initToolItems() {
+    using Cat = AbstractToolItem::Category;
+    /**
+     * @brief Simple button, with a GTK stock icon name
+     *      The corresponding action in ActionDatabase[action] should have no state (it can have a parameter)
+     **/
+    auto emplaceStockItem = [this](const char* name, Cat c, Action action, const char* icon, std::string description) {
+        emplaceItem<ToolButton>(name, c, action, icon, description, false);
+    };
+    /**
+     * @brief Simple button, with a custom loaded icon
+     *      The corresponding action in ActionDatabase[action] should have no state (it can have a parameter)
+     **/
+    auto emplaceCustomItem = [this](const char* name, Cat c, Action action, const char* icon, std::string description) {
+        emplaceItem<ToolButton>(name, c, action, iconName(icon), description, false);
+    };
+
+    /**
+     * @brief Toggle button, with a GTK stock icon name
+     *      The corresponding action in ActionDatabase[action] should have a boolean state and no parameter
+     **/
+    auto emplaceStockItemTgl = [this](const char* name, Cat c, Action action, const char* icon,
+                                      std::string description) {
+        emplaceItem<ToolButton>(name, c, action, icon, description, true);
+    };
+
+    /**
+     * @brief Toggle button, with a custom loaded icon
+     *      The corresponding action in ActionDatabase[action] should have a boolean state and no parameter
+     **/
+    auto emplaceCustomItemTgl = [this](const char* name, Cat c, Action action, const char* icon,
+                                       std::string description) {
+        emplaceItem<ToolButton>(name, c, action, iconName(icon), description, true);
+    };
+
+    /**
+     * @brief Toggle button linked to others sharing the same action (with a custom loaded icon)
+     *      The corresponding action in ActionDatabase[action] should have a state and a parameter. The button is "on"
+     *when the action state matches `target`.
+     **/
+    auto emplaceCustomItemWithTarget = [this](const char* name, Cat c, Action action, auto target, const char* icon,
+                                              std::string description) {
+        emplaceItem<ToolButton>(name, c, action, makeGVariant(target), iconName(icon), description);
+    };
+
+    /**
+     * @brief Simple button (with a custom loaded icon), with a popover menu to change parameters of the tool
+     *      The corresponding action in ActionDatabase[action] should have no state (it can have a parameter)
+     **/
+    auto emplaceCustomItemWithPopover = [this](const char* name, Cat c, Action action, const char* icon,
+                                               std::string description, const PopoverFactory* popover) {
+        auto&& tb = emplaceItem<ToolButton>(name, c, action, iconName(icon), description, false);
+        tb.setPopoverFactory(popover);
+    };
+
+    auto emplaceCustomItemWithTargetAndMenu = [this](const char* name, Cat c, Action action, auto target,
+                                                     const char* icon, std::string description,
+                                                     const PopoverFactory* popover) {
+        auto&& tb = emplaceItem<ToolButton>(name, c, action, makeGVariant(target), iconName(icon), description);
+        tb.setPopoverFactory(popover);
+    };
+
+
+    /*
+     * Items ordered by menu, if possible.
+     * There are some entries which are not available in the menu, like the Zoom slider
+     * All menu items without tool icon are not listed here - they are connected by ActionDatabase
+     */
+
+    /*
+     * Menu File
+     * ------------------------------------------------------------------------
+     */
+
+    emplaceCustomItem("NEW", Cat::FILES, Action::NEW_FILE, "document-new", _("New Xournal"));
+    emplaceCustomItem("OPEN", Cat::FILES, Action::OPEN, "document-open", _("Open file"));
+    emplaceCustomItem("SAVE", Cat::FILES, Action::SAVE, "document-save", _("Save"));
+    emplaceCustomItem("SAVEPDF", Cat::FILES, Action::EXPORT_AS_PDF, "document-export-pdf", _("Export as PDF"));
+    emplaceCustomItem("PRINT", Cat::FILES, Action::PRINT, "document-print", _("Print"));
+
+    /*
+     * Menu Edit
+     * ------------------------------------------------------------------------
+     */
+
+    // Undo / Redo Texts are updated
+    emplaceItem<TooltipToolButton>(
+            "UNDO", Cat::MISC, Action::UNDO, iconName("edit-undo"), _("Undo"),
+            [undoredo = control->getUndoRedoHandler()]() { return undoredo->undoDescription(); });
+    emplaceItem<TooltipToolButton>(
+            "REDO", Cat::MISC, Action::REDO, iconName("edit-redo"), _("Redo"),
+            [undoredo = control->getUndoRedoHandler()]() { return undoredo->redoDescription(); });
+
+    emplaceCustomItem("CUT", Cat::MISC, Action::CUT, "edit-cut", _("Cut"));
+    emplaceCustomItem("COPY", Cat::MISC, Action::COPY, "edit-copy", _("Copy"));
+    emplaceCustomItem("PASTE", Cat::MISC, Action::PASTE, "edit-paste", _("Paste"));
+
+    emplaceStockItem("SEARCH", Cat::MISC, Action::SEARCH, "edit-find", _("Search"));
+
+    emplaceStockItem("DELETE", Cat::MISC, Action::DELETE, "edit-delete", _("Delete"));
+
+    emplaceCustomItemTgl("ROTATION_SNAPPING", Cat::MISC, Action::ROTATION_SNAPPING, "snapping-rotation",
+                         _("Rotation Snapping"));
+    emplaceCustomItemTgl("GRID_SNAPPING", Cat::MISC, Action::GRID_SNAPPING, "snapping-grid", _("Grid Snapping"));
+
+    /*
+     * Menu View
+     * ------------------------------------------------------------------------
+     */
+
+    emplaceCustomItemTgl("PAIRED_PAGES", Cat::NAVIGATION, Action::PAIRED_PAGES_MODE, "show-paired-pages",
+                         _("Paired pages"));
+    emplaceCustomItemTgl("PRESENTATION_MODE", Cat::NAVIGATION, Action::PRESENTATION_MODE, "presentation-mode",
+                         _("Presentation mode"));
+    emplaceCustomItemTgl("FULLSCREEN", Cat::NAVIGATION, Action::FULLSCREEN, "fullscreen", _("Toggle fullscreen"));
+    emplaceCustomItemTgl("SHOW_SIDEBAR", Cat::NAVIGATION, Action::SHOW_SIDEBAR, "sidebar-show", _("Toggle sidebar"));
+
+    emplaceCustomItem("MANAGE_TOOLBAR", Cat::MISC, Action::MANAGE_TOOLBAR, "toolbars-manage", _("Manage Toolbars"));
+    emplaceCustomItem("CUSTOMIZE_TOOLBAR", Cat::MISC, Action::CUSTOMIZE_TOOLBAR, "toolbars-customize",
+                      _("Customize Toolbars"));
+
+    emplaceStockItem("ZOOM_OUT", Cat::NAVIGATION, Action::ZOOM_OUT, "zoom-out", _("Zoom out"));
+    emplaceStockItem("ZOOM_IN", Cat::NAVIGATION, Action::ZOOM_IN, "zoom-in", _("Zoom in"));
+    emplaceStockItemTgl("ZOOM_FIT", Cat::NAVIGATION, Action::ZOOM_FIT, "zoom-fit-best", _("Zoom fit to screen"));
+    emplaceStockItem("ZOOM_100", Cat::NAVIGATION, Action::ZOOM_100, "zoom-original", _("Zoom to 100%"));
+
+    /*
+     * Menu Navigation
+     * ------------------------------------------------------------------------
+     */
+
+    emplaceStockItem("GOTO_FIRST", Cat::NAVIGATION, Action::GOTO_FIRST, "go-first", _("Go to first page"));
+    emplaceStockItem("GOTO_BACK", Cat::NAVIGATION, Action::GOTO_PREVIOUS, "go-previous", _("Back"));
+    emplaceCustomItem("GOTO_PAGE", Cat::NAVIGATION, Action::GOTO_PAGE, "go-to", _("Go to page"));
+    emplaceStockItem("GOTO_NEXT", Cat::NAVIGATION, Action::GOTO_NEXT, "go-next", _("Next"));
+    emplaceStockItem("GOTO_LAST", Cat::NAVIGATION, Action::GOTO_LAST, "go-last", _("Go to last page"));
+
+    emplaceStockItem("GOTO_PREVIOUS_LAYER", Cat::NAVIGATION, Action::LAYER_GOTO_PREVIOUS, "go-previous",
+                     _("Go to previous layer"));
+    emplaceStockItem("GOTO_NEXT_LAYER", Cat::NAVIGATION, Action::LAYER_GOTO_NEXT, "go-next", _("Go to next layer"));
+    emplaceStockItem("GOTO_TOP_LAYER", Cat::NAVIGATION, Action::LAYER_GOTO_TOP, "go-top", _("Go to top layer"));
+
+    emplaceCustomItem("GOTO_NEXT_ANNOTATED_PAGE", Cat::NAVIGATION, Action::GOTO_NEXT_ANNOTATED_PAGE,
+                      "page-annotated-next", _("Next annotated page"));
+
+    /* Menu Journal
+     * ------------------------------------------------------------------------
+     */
+
+    emplaceCustomItemWithPopover("INSERT_NEW_PAGE", Cat::TOOLS, Action::NEW_PAGE_AFTER, "page-add", _("Insert page"),
+                                 this->pageTypeSelectionPopup.get());
+    emplaceCustomItem("DELETE_CURRENT_PAGE", Cat::TOOLS, Action::DELETE_PAGE, "page-delete", _("Delete current page"));
+
+    /*
+     * Menu Tool
+     * ------------------------------------------------------------------------
+     */
+    this->penLineStylePopover = std::make_unique<StylePopoverFactory>(
+            Action::TOOL_PEN_LINE_STYLE,
+            std::vector<StylePopoverFactory::Entry>{{_("standard"), iconName("line-style-plain"), "plain"},
+                                                    {_("dashed"), iconName("line-style-dash"), "dash"},
+                                                    {_("dash-/ dotted"), iconName("line-style-dash-dot"), "dashdot"},
+                                                    {_("dotted"), iconName("line-style-dot"), "dot"}});
+    emplaceCustomItemWithTargetAndMenu("PEN", Cat::TOOLS, Action::SELECT_TOOL, TOOL_PEN, "tool-pencil", _("Pen"),
+                                       this->penLineStylePopover.get());
+
+    this->eraserTypePopover = std::make_unique<StylePopoverFactory>(
+            Action::TOOL_ERASER_TYPE,
+            std::vector<StylePopoverFactory::Entry>{{_("standard"), ERASER_TYPE_DEFAULT},
+                                                    {_("whiteout"), ERASER_TYPE_WHITEOUT},
+                                                    {_("delete stroke"), ERASER_TYPE_DELETE_STROKE}});
+    emplaceCustomItemWithTargetAndMenu("ERASER", Cat::TOOLS, Action::SELECT_TOOL, TOOL_ERASER, "tool-eraser",
+                                       _("Eraser"), this->eraserTypePopover.get());
+
+    // Add individual line styles as toolbar items
+    emplaceCustomItemWithTarget("PLAIN", Cat::TOOLS, Action::TOOL_PEN_LINE_STYLE, "plain", "line-style-plain-with-pen",
+                                _("standard"));
+    emplaceCustomItemWithTarget("DASHED", Cat::TOOLS, Action::TOOL_PEN_LINE_STYLE, "dash", "line-style-dash-with-pen",
+                                _("dashed"));
+    emplaceCustomItemWithTarget("DASH-/ DOTTED", Cat::TOOLS, Action::TOOL_PEN_LINE_STYLE, "dashdot",
+                                "line-style-dash-dot-with-pen", _("dash-/ dotted"));
+    emplaceCustomItemWithTarget("DOTTED", Cat::TOOLS, Action::TOOL_PEN_LINE_STYLE, "dot", "line-style-dot-with-pen",
+                                _("dotted"));
+
+
+    emplaceCustomItemWithTarget("HIGHLIGHTER", Cat::TOOLS, Action::SELECT_TOOL, TOOL_HIGHLIGHTER, "tool-highlighter",
+                                _("Highlighter"));
+
+    emplaceCustomItemWithTarget("TEXT", Cat::TOOLS, Action::SELECT_TOOL, TOOL_TEXT, "tool-text", _("Text"));
+    emplaceCustomItem("MATH_TEX", Cat::TOOLS, Action::TEX, "tool-math-tex", _("Add/Edit TeX"));
+    emplaceCustomItemWithTarget("IMAGE", Cat::TOOLS, Action::SELECT_TOOL, TOOL_IMAGE, "tool-image", _("Image"));
+    emplaceCustomItem("DEFAULT_TOOL", Cat::TOOLS, Action::SELECT_DEFAULT_TOOL, "default", _("Default Tool"));
+    emplaceCustomItemWithTarget("SELECT_PDF_TEXT_LINEAR", Cat::SELECTION, Action::SELECT_TOOL,
+                                TOOL_SELECT_PDF_TEXT_LINEAR, "select-pdf-text-ht", _("Select Linear PDF Text"));
+    emplaceCustomItemWithTarget("SELECT_PDF_TEXT_RECT", Cat::SELECTION, Action::SELECT_TOOL, TOOL_SELECT_PDF_TEXT_RECT,
+                                "select-pdf-text-area", _("Select PDF Text in Rectangle"));
+
+    emplaceCustomItemTgl("SETSQUARE", Cat::MISC, Action::SETSQUARE, "setsquare", _("Setsquare"));
+    emplaceCustomItemTgl("COMPASS", Cat::MISC, Action::COMPASS, "compass", _("Compass"));
+
+    emplaceCustomItemTgl("TOGGLE_TOUCH_DRAWING", Cat::MISC, Action::TOGGLE_TOUCH_DRAWING, "touch-drawing",
+                         _("Toggle Touch Drawing"));
+
+
+    emplaceCustomItemTgl("SHAPE_RECOGNIZER", Cat::TOOLS, Action::TOOL_DRAW_SHAPE_RECOGNIZER, "shape-recognizer",
+                         _("Shape Recognizer"));
+    emplaceCustomItemTgl("DRAW_RECTANGLE", Cat::TOOLS, Action::TOOL_DRAW_RECTANGLE, "draw-rect", _("Draw Rectangle"));
+    emplaceCustomItemTgl("DRAW_ELLIPSE", Cat::TOOLS, Action::TOOL_DRAW_ELLIPSE, "draw-ellipse", _("Draw Ellipse"));
+    emplaceCustomItemTgl("DRAW_ARROW", Cat::TOOLS, Action::TOOL_DRAW_ARROW, "draw-arrow", _("Draw Arrow"));
+    emplaceCustomItemTgl("DRAW_DOUBLE_ARROW", Cat::TOOLS, Action::TOOL_DRAW_DOUBLE_ARROW, "draw-double-arrow",
+                         _("Draw Double Arrow"));
+    emplaceCustomItemTgl("DRAW_COORDINATE_SYSTEM", Cat::TOOLS, Action::TOOL_DRAW_COORDINATE_SYSTEM,
+                         "draw-coordinate-system", _("Draw Coordinate System"));
+    emplaceCustomItemTgl("RULER", Cat::TOOLS, Action::TOOL_DRAW_LINE, "draw-line", _("Draw Line"));
+    emplaceCustomItemTgl("DRAW_SPLINE", Cat::TOOLS, Action::TOOL_DRAW_SPLINE, "draw-spline", _("Draw Spline"));
+
+    emplaceCustomItemWithTarget("SELECT_REGION", Cat::SELECTION, Action::SELECT_TOOL, TOOL_SELECT_REGION,
+                                "select-lasso", _("Select Region"));
+    emplaceCustomItemWithTarget("SELECT_RECTANGLE", Cat::SELECTION, Action::SELECT_TOOL, TOOL_SELECT_RECT,
+                                "select-rect", _("Select Rectangle"));
+    emplaceCustomItemWithTarget("SELECT_MULTILAYER_REGION", Cat::SELECTION, Action::SELECT_TOOL,
+                                TOOL_SELECT_MULTILAYER_REGION, "select-multilayer-lasso",
+                                _("Select Multi-Layer Region"));
+    emplaceCustomItemWithTarget("SELECT_MULTILAYER_RECTANGLE", Cat::SELECTION, Action::SELECT_TOOL,
+                                TOOL_SELECT_MULTILAYER_RECT, "select-multilayer-rect",
+                                _("Select Multi-Layer Rectangle"));
+    emplaceCustomItemWithTarget("SELECT_OBJECT", Cat::SELECTION, Action::SELECT_TOOL, TOOL_SELECT_OBJECT,
+                                "object-select", _("Select Object"));
+    emplaceCustomItemWithTarget("VERTICAL_SPACE", Cat::SELECTION, Action::SELECT_TOOL, TOOL_VERTICAL_SPACE, "spacer",
+                                _("Vertical Space"));
+    emplaceCustomItemWithTarget("PLAY_OBJECT", Cat::SELECTION, Action::SELECT_TOOL, TOOL_PLAY_OBJECT, "object-play",
+                                _("Play Object"));
+    emplaceCustomItemWithTarget("HAND", Cat::SELECTION, Action::SELECT_TOOL, TOOL_HAND, "hand", _("Hand"));
+
+    emplaceItem<FontButton>("SELECT_FONT", *control->getActionDatabase());
+
+    emplaceCustomItemTgl("AUDIO_RECORDING", Cat::AUDIO, Action::AUDIO_RECORD, "audio-record",
+                         _("Record Audio / Stop Recording"));
+    emplaceCustomItemTgl("AUDIO_PAUSE_PLAYBACK", Cat::AUDIO, Action::AUDIO_PAUSE_PLAYBACK, "audio-playback-pause",
+                         _("Pause / Play"));
+    emplaceCustomItem("AUDIO_STOP_PLAYBACK", Cat::AUDIO, Action::AUDIO_STOP_PLAYBACK, "audio-playback-stop", _("Stop"));
+    emplaceCustomItem("AUDIO_SEEK_FORWARDS", Cat::AUDIO, Action::AUDIO_SEEK_FORWARDS, "audio-seek-forwards",
+                      _("Forward"));
+    emplaceCustomItem("AUDIO_SEEK_BACKWARDS", Cat::AUDIO, Action::AUDIO_SEEK_BACKWARDS, "audio-seek-backwards",
+                      _("Back"));
+
+
+    ///////////////////////////////////////////////////////////////////////////
+
+
+    /*
+     * Footer tools
+     * ------------------------------------------------------------------------
+     */
+    toolPageSpinner = &emplaceItem<ToolPageSpinner>("PAGE_SPIN", iconNameHelper, control->getScrollHandler());
+
+    emplaceItem<ToolZoomSlider>("ZOOM_SLIDER", zoom, iconNameHelper, *control->getActionDatabase());
+
+    emplaceItem<ToolPageLayer>("LAYER", control->getLayerController(), iconNameHelper);
+
+    /*
+     * Non-menu items
+     * ------------------------------------------------------------------------
+     */
+
+    /*
+     * Color item - not in the menu
+     * aka. COLOR_SELECT
+     */
+    emplaceItem<ColorSelectorToolItem>(*control->getActionDatabase());
+
+    bool hideAudio = !this->control->getAudioController();
+    emplaceItem<ToolSelectCombocontrol>("SELECT", this->iconNameHelper, *this->control->getActionDatabase(), hideAudio);
+    emplaceItem<DrawingTypeComboToolButton>("DRAW", this->iconNameHelper, *this->control->getActionDatabase());
+    emplaceItem<ToolPdfCombocontrol>("PDF_TOOL", this->iconNameHelper, *this->control->getActionDatabase());
+
+    auto laserIcon = this->iconNameHelper.iconName("laser-pointer");
+    emplaceItem<ComboToolButton>(
+            "LASER_POINTER", Cat::TOOLS, laserIcon, _("Laser pointer"),
+            ComboToolButton::Entries{{_("Pen"), laserIcon, TOOL_LASER_POINTER_PEN},
+                                     {_("Highlighter"), laserIcon, TOOL_LASER_POINTER_HIGHLIGHTER}},
+            this->control->getActionDatabase()->getAction(Action::SELECT_TOOL));
+
+    // General tool configuration - working for every tool which support it
+    emplaceCustomItemTgl("TOOL_FILL", Cat::TOOLS, Action::TOOL_FILL, "fill", _("Fill"));
+    emplaceCustomItem("FILL_OPACITY", Cat::TOOLS, Action::TOOL_FILL_OPACITY, "fill-opacity", _("Fill Opacity"));
+
+    emplaceCustomItemWithTarget("VERY_FINE", Cat::TOOLS, Action::TOOL_SIZE, TOOL_SIZE_VERY_FINE, "thickness-finer",
+                                _("Very Fine"));
+    emplaceCustomItemWithTarget("FINE", Cat::TOOLS, Action::TOOL_SIZE, TOOL_SIZE_FINE, "thickness-fine", _("Fine"));
+    emplaceCustomItemWithTarget("MEDIUM", Cat::TOOLS, Action::TOOL_SIZE, TOOL_SIZE_MEDIUM, "thickness-medium",
+                                _("Medium"));
+    emplaceCustomItemWithTarget("THICK", Cat::TOOLS, Action::TOOL_SIZE, TOOL_SIZE_THICK, "thickness-thick", _("Thick"));
+    emplaceCustomItemWithTarget("VERY_THICK", Cat::TOOLS, Action::TOOL_SIZE, TOOL_SIZE_VERY_THICK, "thickness-thicker",
+                                _("Very Thick"));
+}
+
+void ToolMenuHandler::setPageInfo(size_t currentPage, size_t pageCount, size_t pdfpage) {
+    if (this->toolPageSpinner) {
+        this->toolPageSpinner->setPageInfo(currentPage, pageCount, pdfpage);
+    }
+}
+
+auto ToolMenuHandler::getModel() -> ToolbarModel* { return this->tbModel.get(); }
+
+auto ToolMenuHandler::getControl() -> Control* { return this->control; }
+
+auto ToolMenuHandler::getToolItems() const -> const std::vector<std::unique_ptr<AbstractToolItem>>& {
+    return this->toolItems;
+}
+
+auto ToolMenuHandler::getColorToolItems() const -> const std::vector<std::unique_ptr<ColorToolItem>>& {
+    return this->toolbarColorItems;
+}
+
+auto ToolMenuHandler::iconName(const char* icon) -> std::string { return iconNameHelper.iconName(icon); }
+
+void ToolMenuHandler::updateColorToolItems(const Palette& palette) {
+    for (const auto& it: this->toolbarColorItems) {
+        it->updateColor(palette);
+    }
+}
+
+void ToolMenuHandler::updateColorToolItemsRecoloring(const std::optional<Recolor>& recolor) {
+    for (const auto& it: this->toolbarColorItems) {
+        it->updateSecondaryColor(recolor);
+    }
+}
+
+void ToolMenuHandler::setDefaultNewPageType(const std::optional<PageType>& pt) {
+    this->pageTypeSelectionPopup->setSelectedPT(pt);
+    this->control->getPageBackgroundChangeController()->setPageTypeForNewPages(pt);
+}
+void ToolMenuHandler::setDefaultNewPaperSize(const std::optional<PaperSize>& paperSize) {
+    this->pageTypeSelectionPopup->setSelectedPaperSize(paperSize);
+}
diff --git a/entry/src/main/cpp/src/core/gui/toolbarMenubar/ToolMenuHandler.h b/entry/src/main/cpp/src/core/gui/toolbarMenubar/ToolMenuHandler.h
new file mode 100644
index 0000000..3d9528e
--- /dev/null
+++ b/entry/src/main/cpp/src/core/gui/toolbarMenubar/ToolMenuHandler.h
@@ -0,0 +1,142 @@
+/*
+ * Xournal++
+ *
+ * Part of the customizable toolbars
+ *
+ * @author Xournal++ Team
+ * https://github.com/xournalpp/xournalpp
+ *
+ * @license GNU GPLv2 or later
+ */
+
+#pragma once
+
+#include <cstddef>   // for size_t
+#include <memory>    // for unique_ptr
+#include <optional>  // for optional
+#include <string>    // for string
+#include <vector>    // for vector
+
+#include <gio/gio.h>
+#include <glib-object.h>  // for GObject, GConnectFlags
+#include <glib.h>         // for gchar
+#include <gtk/gtk.h>      // for GtkWidget, GtkWindow, GtkBuilder
+
+#include "gui/IconNameHelper.h"  // for IconNameHelper
+#include "model/PaperSize.h"
+#include "util/raii/GObjectSPtr.h"
+
+class AbstractToolItem;
+class GladeGui;
+class GladeSearchpath;
+class ToolbarData;
+class ToolbarModel;
+class ToolButton;
+class ToolHandler;
+class ToolPageLayer;
+class ToolPageSpinner;
+class PageTypeMenu;
+class SpinPageAdapter;
+class ZoomControl;
+class Control;
+class PageBackgroundChangeController;
+class ColorToolItem;
+struct ToolbarButtonEntry;
+struct ToolbarPlaceholderEntry;
+class PageTypeSelectionPopover;
+class PageType;
+struct Palette;
+class StylePopoverFactory;
+class Recolor;
+
+class ToolMenuHandler {
+public:
+    ToolMenuHandler(Control* control, GladeGui* gui);
+    virtual ~ToolMenuHandler();
+
+    void populate(const GladeSearchpath* gladeSearchPath);
+
+public:
+    void freeDynamicToolbarItems();
+    static void unloadToolbar(GtkWidget* toolbar);
+
+    /**
+     * @brief Load the toolbar.ini file
+     * This file persists the customized toolbars and is loaded upon starting the application.
+     *
+     * @param d Data Object representing the selected toolbars (e.g Portrait)
+     * @param toolbar reference to the widget representing the toolbar
+     * @param toolbarName toolbarName which should be read from the file
+     * @param horizontal whether the toolbar is horizontal
+     */
+    void load(const ToolbarData* d, GtkWidget* toolbar, const char* toolbarName, bool horizontal);
+
+    /**
+     * @brief Update all ColorToolItems based on palette
+     *
+     * @param palette
+     */
+    void updateColorToolItems(const Palette& palette);
+
+    /**
+     * @brief Update all ColorToolItems based on recolor settings
+     *
+     * @param recolor
+     */
+    void updateColorToolItemsRecoloring(const std::optional<Recolor>& recolor);
+
+    void initToolItems();
+    void addPluginItem(ToolbarButtonEntry* t);
+    void addPluginPlaceholderItem(ToolbarPlaceholderEntry* entry);
+
+    void setPageInfo(size_t currentPage, size_t pageCount, size_t pdfpage);
+
+    [[maybe_unused]] void removeColorToolItem(AbstractToolItem* it);
+    void addColorToolItem(std::unique_ptr<ColorToolItem> it);
+
+    ToolbarModel* getModel();
+
+    const std::vector<std::unique_ptr<AbstractToolItem>>& getToolItems() const;
+    const std::vector<std::unique_ptr<ColorToolItem>>& getColorToolItems() const;
+
+    Control* getControl();
+
+    void hideAudioMenuItems();
+
+    std::string iconName(const char* icon);
+
+    void setDefaultNewPageType(const std::optional<PageType>& pt);
+    void setDefaultNewPaperSize(const std::optional<PaperSize>& paperSize);
+
+private:
+    template <class tool_item, class... Args>
+    tool_item& emplaceItem(Args&&... args);
+
+    void initPenToolItem();
+    void initEraserToolItem();
+
+private:
+    std::vector<std::unique_ptr<ColorToolItem>> toolbarColorItems;
+    GtkWindow* parent = nullptr;
+
+    std::vector<std::unique_ptr<AbstractToolItem>> toolItems;
+
+    ToolPageSpinner* toolPageSpinner = nullptr;
+
+    Control* control = nullptr;
+    ZoomControl* zoom = nullptr;
+    GladeGui* gui = nullptr;
+    ToolHandler* toolHandler = nullptr;
+
+    std::unique_ptr<ToolbarModel> tbModel;
+
+    PageTypeMenu* newPageType = nullptr;
+    PageBackgroundChangeController* pageBackgroundChangeController = nullptr;
+    IconNameHelper iconNameHelper;
+
+    std::unique_ptr<PageTypeSelectionPopover> pageTypeSelectionPopup;
+    std::unique_ptr<StylePopoverFactory> penLineStylePopover;
+    std::unique_ptr<StylePopoverFactory> eraserTypePopover;
+
+    xoj::util::GObjectSPtr<GSimpleAction> gAction;
+};
diff --git a/entry/src/main/cpp/src/core/gui/toolbarMenubar/ToolPageLayer.cpp b/entry/src/main/cpp/src/core/gui/toolbarMenubar/ToolPageLayer.cpp
new file mode 100644
index 0000000..ef4481d
--- /dev/null
+++ b/entry/src/main/cpp/src/core/gui/toolbarMenubar/ToolPageLayer.cpp
@@ -0,0 +1,315 @@
+#include "ToolPageLayer.h"
+
+#include <utility>  // for move
+
+#include <glib-object.h>  // for G_CALLBACK, g_signa...
+#include <glib.h>         // for g_warning
+#include <pango/pango.h>  // for pango_attr_list_insert
+
+#include "control/layer/LayerController.h"        // for LayerController
+#include "enums/Action.enum.h"                    // for Action
+#include "gui/IconNameHelper.h"                   // for IconNameHelper
+#include "gui/toolbarMenubar/AbstractToolItem.h"  // for AbstractToolItem
+#include "model/PageRef.h"                        // for PageRef
+#include "model/XojPage.h"                        // for XojPage
+#include "util/GtkUtil.h"                         // for setRadioButtonActionName
+#include "util/glib_casts.h"                      // for closure_notify_cb
+#include "util/gtk4_helper.h"                     // for gtk_box_append
+#include "util/i18n.h"                            // for _
+#include "util/raii/PangoSPtr.h"                  // for PangoAttrListSPtr
+
+
+class ShowLayerEntry final {
+public:
+    ShowLayerEntry(LayerController* lc, Layer::Index id) noexcept;
+    ShowLayerEntry(const ShowLayerEntry&) = delete;  // No copies, otherwise we'll get an issue with the signals
+    ShowLayerEntry& operator=(const ShowLayerEntry&) = delete;
+    ShowLayerEntry(ShowLayerEntry&& e) noexcept;
+    ShowLayerEntry& operator=(ShowLayerEntry&&) noexcept;
+    ~ShowLayerEntry() noexcept;
+    GtkWidget* checkButton;
+    gulong callbackHandler;
+};
+
+ShowLayerEntry::ShowLayerEntry(LayerController* lc, Layer::Index id) noexcept: checkButton(gtk_check_button_new()) {
+    gtk_widget_set_can_focus(checkButton, false);  // todo(gtk4) not necessary anymore
+    struct Data {
+        LayerController* lc;
+        Layer::Index id;
+    };
+    this->callbackHandler =
+            g_signal_connect_data(checkButton, "toggled", G_CALLBACK(+[](GtkToggleButton* btn, gpointer data) {
+                                      Data* d = reinterpret_cast<Data*>(data);
+                                      d->lc->setLayerVisible(d->id, gtk_toggle_button_get_active(btn));
+                                  }),
+                                  new Data{lc, id}, xoj::util::closure_notify_cb<Data>, GConnectFlags(0));
+    gtk_widget_set_margin_end(checkButton, 4);
+}
+
+ShowLayerEntry::ShowLayerEntry(ShowLayerEntry&& e) noexcept:
+        checkButton(std::move(e.checkButton)), callbackHandler(std::exchange(e.callbackHandler, 0U)) {}
+
+auto ShowLayerEntry::operator=(ShowLayerEntry&& e) noexcept -> ShowLayerEntry& {
+    checkButton = std::move(e.checkButton);
+    callbackHandler = std::exchange(e.callbackHandler, 0U);
+    return *this;
+}
+
+ShowLayerEntry::~ShowLayerEntry() noexcept = default;
+
+/// @return The GtkWidget* is a floating ref
+static std::tuple<GtkWidget*, std::vector<ShowLayerEntry>, std::vector<std::pair<GtkWidget*, gulong>>> createGrid(
+        LayerController* lc, GtkPopover* popover) {
+
+#if GTK_MAJOR_VERSION == 3
+    GtkRadioButton* group = nullptr;
+    auto createLayerRadioButton = [&group, popover](const std::string& layerName,
+                                                    Layer::Index id) -> std::pair<GtkWidget*, gulong> {
+        GtkWidget* btn = gtk_radio_button_new_with_label_from_widget(group, layerName.c_str());
+        gtk_widget_set_can_focus(btn, false);
+        group = GTK_RADIO_BUTTON(btn);
+
+        gtk_actionable_set_action_target_value(GTK_ACTIONABLE(btn), xoj::util::makeGVariantSPtr(id).get());
+        /**
+         * RadioButton's and GAction don't work as expected in GTK3
+         * To circumvent this, we have our own GAction/RadioButton interactions
+         */
+        xoj::util::gtk::setRadioButtonActionName(GTK_RADIO_BUTTON(btn), "win", Action_toString(Action::LAYER_ACTIVE));
+
+        // Callback to hide the popover when a new layer is selected
+        auto sig = g_signal_connect_object(btn, "toggled", G_CALLBACK(+[](GtkToggleButton*, gpointer popover) {
+                                               gtk_popover_popdown(GTK_POPOVER(popover));
+                                           }),
+                                           popover, GConnectFlags(0));
+        // Block this callback for now, otherwise it is called when the grid is added to the popover
+        g_signal_handler_block(btn, sig);
+
+        return {btn, sig};
+    };
+
+    auto createBackgroundRadioButton = [](LayerController* lc) {
+        GtkWidget* btn = gtk_radio_button_new_with_label(nullptr, lc->getLayerNameById(0U).c_str());
+        gtk_widget_set_can_focus(btn, false);
+        gtk_widget_add_css_class(btn, "invisible");
+        gtk_widget_set_hexpand(btn, true);
+        return btn;
+    };
+#else  // GTK4
+    std::string actionName = std::string("win.") + Action_toString(Action::LAYER_ACTIVE);  // Todo(cpp20) constexpr
+    auto createLayerRadioButton = [&actionName, popover](const std::string& layerName,
+                                                         Layer::Index id) -> std::pair<GtkWidget*, gulong> {
+        GtkWidget* btn = gtk_check_button_new_with_label(layerName.c_str());
+        gtk_actionable_set_action_name(GTK_ACTIONABLE(btn), actionName.c_str());
+        gtk_actionable_set_action_target_value(GTK_ACTIONABLE(btn), xoj::util::makeGVariantSPtr(id).get());
+        // Callback to hide the popover when a new layer is selected
+        auto sig = g_signal_connect_object(btn, "toggled", G_CALLBACK(+[](GtkToggleButton*, gpointer popover) {
+            gtk_popover_popdown(GTK_POPOVER(popover)); }), popover, GConnectFlags(0));
+        // Block this callback for now, otherwise it is called when the grid is added to the popover
+        g_signal_handler_block(btn, sig);
+
+        return {btn, sig};
+    };
+    auto createBackgroundRadioButton = [](LayerController* lc) {
+        GtkWidget* btn = gtk_check_button_new_with_label(lc->getLayerNameById(0U).c_str());
+        // Todo(gtk4): adapt the css class
+        gtk_widget_add_css_class(btn, "invisible");
+        gtk_widget_set_hexpand(btn, true);
+        return btn;
+    };
+#endif
+
+    GtkGrid* grid = GTK_GRID(gtk_grid_new());
+
+    auto layerCount = lc->getLayerCount();
+    std::vector<ShowLayerEntry> entries;
+    entries.reserve(layerCount + 1);
+    std::vector<std::pair<GtkWidget*, gulong>> radioButtons;
+    radioButtons.reserve(layerCount);
+    // Handle the background separately, as it cannot be selected
+    gtk_grid_attach(grid, createBackgroundRadioButton(lc), 0, static_cast<int>(layerCount), 1, 1);
+    gtk_grid_attach(grid, entries.emplace_back(lc, 0).checkButton, 1, static_cast<int>(layerCount), 1, 1);
+    // Then the other layers
+    for (Layer::Index id = 1; id <= layerCount; id++) {
+        int y = static_cast<int>(layerCount - id);
+        auto [btn, _] = radioButtons.emplace_back(createLayerRadioButton(lc->getLayerNameById(id), id));
+        gtk_grid_attach(grid, btn, 0, y, 1, 1);
+        gtk_grid_attach(grid, entries.emplace_back(lc, id).checkButton, 1, y, 1, 1);
+    }
+
+    gtk_widget_show_all(GTK_WIDGET(grid));
+    return {GTK_WIDGET(grid), std::move(entries), std::move(radioButtons)};
+}
+
+/// @return floating ref
+static GtkLabel* makeLabel() {
+    auto* label = GTK_LABEL(gtk_label_new(_("Loading...")));
+    xoj::util::PangoAttrListSPtr attrs(pango_attr_list_new(), xoj::util::adopt);
+    pango_attr_list_insert(attrs.get(), pango_attr_weight_new(PANGO_WEIGHT_BOLD));
+    gtk_label_set_attributes(label, attrs.get());
+    return label;
+}
+
+/// @brief Appends to `box` a button with bold label `name` activating the Action `action`
+static void addSpecialButton(GtkBox* box, const std::string& name, Action action) {
+    GtkWidget* btn = gtk_button_new();
+    gtk_widget_set_can_focus(btn, false);  // todo(gtk4) not necessary anymore
+    GtkWidget* lb = gtk_label_new(name.c_str());
+    gtk_widget_set_halign(lb, GTK_ALIGN_START);
+
+    xoj::util::PangoAttrListSPtr attrs(pango_attr_list_new(), xoj::util::adopt);
+    pango_attr_list_insert(attrs.get(), pango_attr_weight_new(PANGO_WEIGHT_BOLD));
+    gtk_label_set_attributes(GTK_LABEL(lb), attrs.get());
+
+    gtk_button_set_child(GTK_BUTTON(btn), lb);
+    std::string fullActionName = std::string("win.") + Action_toString(action);
+    gtk_actionable_set_action_name(GTK_ACTIONABLE(btn), fullActionName.c_str());
+    gtk_box_append(box, btn);
+}
+
+/// @return floating ref
+static GtkBox* makePopoverContent() {
+    GtkBox* box = GTK_BOX(gtk_box_new(GTK_ORIENTATION_VERTICAL, 0));
+    addSpecialButton(box, _("Show all"), Action::LAYER_SHOW_ALL);
+    addSpecialButton(box, _("Hide all"), Action::LAYER_HIDE_ALL);
+    gtk_box_append(box, gtk_separator_new(GTK_ORIENTATION_HORIZONTAL));
+    addSpecialButton(box, _("Add a layer above the active layer"), Action::LAYER_NEW_ABOVE_CURRENT);
+    addSpecialButton(box, _("Add a layer below the active layer"), Action::LAYER_NEW_BELOW_CURRENT);
+    gtk_box_append(box, gtk_separator_new(GTK_ORIENTATION_HORIZONTAL));
+    gtk_widget_show_all(GTK_WIDGET(box));
+    return box;
+}
+
+/// @return floating ref
+static GtkPopover* makePopover(GtkBox* content) {
+    auto popover = GTK_POPOVER(gtk_popover_new());
+    gtk_widget_add_css_class(GTK_WIDGET(popover), "toolbar");
+    gtk_popover_set_child(popover, GTK_WIDGET(content));
+    return popover;
+}
+
+class InstanceData: public LayerCtrlListener {
+public:
+    InstanceData(LayerController* lc):
+            lc(lc),
+            label(makeLabel()),
+            popoverBox(makePopoverContent()),
+            popover(makePopover(popoverBox)),
+            grid(nullptr) {}
+    ~InstanceData() = default;
+
+    xoj::util::WidgetSPtr makeWidget(bool horizontal) {
+        xoj::util::WidgetSPtr item(gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 1), xoj::util::adopt);
+        GtkBox* hbox = GTK_BOX(item.get());
+        GtkWidget* lbl = gtk_label_new(_("Layer"));
+        gtk_widget_set_margin_start(lbl, 7);
+        gtk_widget_set_margin_end(lbl, 7);
+        gtk_box_append(hbox, lbl);
+        GtkWidget* menuButton = gtk_menu_button_new();
+#if GTK_MAJOR_VERSION == 3
+        gtk_widget_set_can_focus(menuButton, false);
+        gtk_box_append(hbox, GTK_WIDGET(this->label));
+#else
+        gtk_menu_button_set_child(GTK_MENU_BUTTON(menuButton), GTK_WIDGET(this->label));
+        gtk_menu_button_set_always_show_arrow(GTK_MENU_BUTTON(menuButton), true);
+#endif
+        gtk_box_append(hbox, menuButton);
+        // TODO: fix orientation
+        gtk_menu_button_set_direction(GTK_MENU_BUTTON(menuButton), horizontal ? GTK_ARROW_DOWN : GTK_ARROW_RIGHT);
+        gtk_menu_button_set_popover(GTK_MENU_BUTTON(menuButton), GTK_WIDGET(this->popover));
+
+        LayerCtrlListener::registerListener(lc);
+
+        // *this is destroyed once the widget (hence *popover) has been destroyed. No need to disconnect those signals
+        g_signal_connect(popover, "show", xoj::util::wrap_for_g_callback_v<popoverShown>, this);
+        g_signal_connect(popover, "hide", xoj::util::wrap_for_g_callback_v<popoverHidden>, this);
+
+        updateSelectedLayer();
+
+        return item;
+    }
+
+    static void popoverShown(GtkWidget*, InstanceData* data) {
+        xoj_assert(!data->grid && data->showLayerItems.empty());
+        data->setupLayersGrid();
+    }
+    static void popoverHidden(GtkWidget*, InstanceData* data) {
+        if (data->grid) {
+            data->showLayerItems.clear();
+            gtk_box_remove(data->popoverBox, data->grid);
+            data->grid = nullptr;
+        }
+    }
+
+private:
+    void setupLayersGrid() {
+        auto [grid, entries, radioButtons] = createGrid(lc, popover);
+        this->grid = grid;
+        gtk_box_append(this->popoverBox, grid);
+        this->showLayerItems = std::move(entries);
+        for (auto [btn, sig]: radioButtons) {
+            g_signal_handler_unblock(btn, sig);
+        }
+
+        layerVisibilityChanged();
+    }
+
+    void rebuildLayerMenu() override {
+        if (grid) {
+            // Only rebuild if the popover is shown
+            showLayerItems.clear();
+            gtk_box_remove(popoverBox, grid);
+            grid = nullptr;
+
+            setupLayersGrid();
+        }
+        updateSelectedLayer();
+    }
+
+    void layerVisibilityChanged() override {
+        PageRef page = lc->getCurrentPage();
+        if (page) {
+            Layer::Index n = 0;
+            for (auto& e: showLayerItems) {
+                g_signal_handler_block(e.checkButton, e.callbackHandler);
+                gtk_check_button_set_active(GTK_CHECK_BUTTON(e.checkButton), page->isLayerVisible(n++));
+                g_signal_handler_unblock(e.checkButton, e.callbackHandler);
+            }
+        }
+    }
+
+    void updateSelectedLayer() override { gtk_label_set_text(label, lc->getCurrentLayerName().c_str()); }
+
+private:
+    LayerController* lc;
+    GtkLabel* label;
+    GtkBox* popoverBox;
+    GtkPopover* popover;
+    GtkWidget* grid;
+
+    std::vector<ShowLayerEntry> showLayerItems;  ///< Widgets for the layer menu. Index = 0 is for background.
+};
+
+
+ToolPageLayer::ToolPageLayer(std::string id, LayerController* lc, IconNameHelper iconNameHelper):
+        AbstractToolItem(std::move(id), Category::NAVIGATION),
+        lc(lc),
+        iconName(iconNameHelper.iconName("combo-layer")) {}
+
+ToolPageLayer::~ToolPageLayer() = default;
+
+auto ToolPageLayer::getToolDisplayName() const -> std::string { return _("Layer Combo"); }
+
+auto ToolPageLayer::getNewToolIcon() const -> GtkWidget* {
+    return gtk_image_new_from_icon_name(this->iconName.c_str(), GTK_ICON_SIZE_SMALL_TOOLBAR);
+}
+
+auto ToolPageLayer::createItem(bool horizontal) -> xoj::util::WidgetSPtr {
+    auto data = std::make_unique<InstanceData>(lc);
+    auto item = data->makeWidget(horizontal);
+
+    // Destroy *data if the widget is destroyed
+    g_object_weak_ref(
+            G_OBJECT(item.get()), +[](gpointer d, GObject*) { delete static_cast<InstanceData*>(d); }, data.release());
+
+    return item;
+}
diff --git a/entry/src/main/cpp/src/core/gui/toolbarMenubar/ToolPageLayer.h b/entry/src/main/cpp/src/core/gui/toolbarMenubar/ToolPageLayer.h
new file mode 100644
index 0000000..a2725c1
--- /dev/null
+++ b/entry/src/main/cpp/src/core/gui/toolbarMenubar/ToolPageLayer.h
@@ -0,0 +1,42 @@
+/*
+ * Xournal++
+ *
+ * Part of the customizable toolbars
+ *
+ * @author Xournal++ Team
+ * https://github.com/xournalpp/xournalpp
+ *
+ * @license GNU GPLv2 or later
+ */
+
+#pragma once
+
+#include <string>  // for string
+#include <vector>  // for vector
+
+#include <gtk/gtk.h>                // for GtkWidget, GtkToolItem
+
+#include "control/layer/LayerCtrlListener.h"  // for LayerCtrlListener
+#include "model/Layer.h"                      // for Layer, Layer::Index
+#include "util/raii/GObjectSPtr.h"            // for WidgetSPtr
+
+#include "AbstractToolItem.h"  // for AbstractToolItem
+
+class LayerController;
+class IconNameHelper;
+
+class ToolPageLayer: public AbstractToolItem {
+public:
+    ToolPageLayer(std::string id, LayerController* lc, IconNameHelper iconNameHelper);
+    ~ToolPageLayer() override;
+
+public:
+    std::string getToolDisplayName() const override;
+    xoj::util::WidgetSPtr createItem(bool horizontal) override;
+
+    GtkWidget* getNewToolIcon() const override;
+
+private:
+    LayerController* lc = nullptr;
+    std::string iconName;
+};
diff --git a/entry/src/main/cpp/src/core/gui/toolbarMenubar/ToolPageSpinner.cpp b/entry/src/main/cpp/src/core/gui/toolbarMenubar/ToolPageSpinner.cpp
new file mode 100644
index 0000000..e1f8653
--- /dev/null
+++ b/entry/src/main/cpp/src/core/gui/toolbarMenubar/ToolPageSpinner.cpp
@@ -0,0 +1,138 @@
+#include "ToolPageSpinner.h"
+
+#include <algorithm>  // for find
+#include <utility>    // for move
+
+#include <glib-object.h>  // for g_object_ref_sink
+
+#include "gui/toolbarMenubar/AbstractToolItem.h"  // for AbstractToolItem
+#include "gui/widgets/SpinPageAdapter.h"          // for SpinPageAdapter
+#include "util/Assert.h"                          // for xoj_assert
+#include "util/Util.h"
+#include "util/gtk4_helper.h"  // for gtk_box_append
+#include "util/i18n.h"         // for FS, _, _F, C_F
+
+class ToolPageSpinner::Instance final {
+public:
+    Instance(ToolPageSpinner* handler, GtkOrientation orientation): handler(handler), orientation(orientation) {}
+
+    xoj::util::WidgetSPtr makeWidget() {
+        GtkWidget* spinner = gtk_spin_button_new_with_range(0, 1, 1);
+        gtk_orientable_set_orientation(GTK_ORIENTABLE(spinner), orientation);
+        this->spinner.setWidget(spinner);  // takes ownership of spinner reference
+        this->spinner.addListener(handler->getListener());
+
+        GtkWidget* numberLabel = gtk_label_new("");
+        GtkWidget* pageLabel = gtk_label_new(_("Page"));
+        if (orientation == GTK_ORIENTATION_HORIZONTAL) {
+            gtk_widget_set_valign(pageLabel, GTK_ALIGN_BASELINE);
+            gtk_widget_set_margin_start(pageLabel, 7);
+            gtk_widget_set_margin_end(pageLabel, 7);
+            gtk_widget_set_valign(spinner, GTK_ALIGN_BASELINE);
+            gtk_widget_set_valign(numberLabel, GTK_ALIGN_BASELINE);
+            gtk_widget_set_margin_start(numberLabel, 7);
+            gtk_widget_set_margin_end(numberLabel, 7);
+        } else {
+            gtk_widget_set_halign(pageLabel, GTK_ALIGN_CENTER);
+            gtk_widget_set_margin_top(pageLabel, 7);
+            gtk_widget_set_margin_bottom(pageLabel, 7);
+            gtk_widget_set_halign(spinner, GTK_ALIGN_CENTER);
+            gtk_widget_set_halign(numberLabel, GTK_ALIGN_CENTER);
+            gtk_widget_set_valign(spinner, GTK_ALIGN_BASELINE);
+            gtk_widget_set_valign(numberLabel, GTK_ALIGN_BASELINE);
+            gtk_label_set_justify(GTK_LABEL(numberLabel), GTK_JUSTIFY_CENTER);
+            gtk_widget_set_margin_top(numberLabel, 7);
+            gtk_widget_set_margin_bottom(numberLabel, 7);
+        }
+        this->numberLabel = GTK_LABEL(numberLabel);
+
+        xoj::util::WidgetSPtr item(gtk_box_new(orientation, 1), xoj::util::adopt);
+        GtkBox* box = GTK_BOX(item.get());
+        gtk_box_append(box, pageLabel);
+        gtk_box_append(box, spinner);
+        gtk_box_append(box, numberLabel);
+
+        return item;
+    }
+
+    void disconnect() { handler = nullptr; }
+
+private:
+    ToolPageSpinner* handler;
+    GtkOrientation orientation;
+    SpinPageAdapter spinner;
+    GtkLabel* numberLabel;
+
+public:
+    void setPageInfo(size_t currentPage, size_t pageCount, size_t pdfPage) {
+        if (pageCount == 0) {
+            spinner.setMinMaxPage(0, 0);
+            spinner.setPage(0);
+        } else {
+            spinner.setMinMaxPage(1, pageCount);
+            spinner.setPage(currentPage + 1);
+        }
+
+        updateLabel(pageCount, pdfPage);
+    }
+    ToolPageSpinner* getHandler() const { return handler; }
+
+private:
+    void updateLabel(const size_t pageCount, const size_t pdfPage) {
+        std::string ofString = FS(C_F("Page {pagenumber} \"of {pagecount}\"", " of {1}") % pageCount);
+        if (pdfPage != npos) {
+            if (this->orientation == GTK_ORIENTATION_HORIZONTAL) {
+                ofString += std::string(", ") + FS(_F("PDF Page {1}") % (pdfPage + 1));
+            } else {
+                ofString += std::string("\n") + FS(_F("PDF {1}") % (pdfPage + 1));
+            }
+        }
+        gtk_label_set_text(this->numberLabel, ofString.c_str());
+    }
+};
+
+ToolPageSpinner::ToolPageSpinner(std::string id, IconNameHelper iconNameHelper, SpinPageListener* listener):
+        AbstractToolItem(std::move(id), Category::NAVIGATION), iconNameHelper(iconNameHelper), listener(listener) {}
+
+ToolPageSpinner::~ToolPageSpinner() {
+    for (auto* i: instances) {
+        i->disconnect();
+    }
+}
+
+void ToolPageSpinner::setPageInfo(size_t currentPage, size_t pageCount, size_t pdfPage) {
+    for (auto* i: instances) {
+        i->setPageInfo(currentPage, pageCount, pdfPage);
+    }
+}
+
+auto ToolPageSpinner::getToolDisplayName() const -> std::string { return _("Page number"); }
+
+auto ToolPageSpinner::getNewToolIcon() const -> GtkWidget* {
+    return gtk_image_new_from_icon_name(iconNameHelper.iconName("page-spinner").c_str(), GTK_ICON_SIZE_SMALL_TOOLBAR);
+}
+
+auto ToolPageSpinner::createItem(bool horizontal) -> xoj::util::WidgetSPtr {
+    auto orientation = horizontal ? GTK_ORIENTATION_HORIZONTAL : GTK_ORIENTATION_VERTICAL;
+    auto data = std::make_unique<Instance>(this, orientation);
+    auto item = data->makeWidget();
+
+    this->instances.emplace_back(data.get());  // Keep a ref for callback propagation
+
+    // Destroy *data if the widget is destroyed
+    g_object_weak_ref(
+            G_OBJECT(item.get()),
+            +[](gpointer d, GObject*) {
+                auto* data = static_cast<Instance*>(d);
+                if (auto* h = data->getHandler(); h) {
+                    auto& instances = h->instances;
+                    if (auto it = std::find(instances.begin(), instances.end(), data); it != instances.end()) {
+                        instances.erase(it);
+                    }
+                }
+                delete data;
+            },
+            data.release());
+
+    return item;
+}
diff --git a/entry/src/main/cpp/src/core/gui/toolbarMenubar/ToolPageSpinner.h b/entry/src/main/cpp/src/core/gui/toolbarMenubar/ToolPageSpinner.h
new file mode 100644
index 0000000..9a8ace0
--- /dev/null
+++ b/entry/src/main/cpp/src/core/gui/toolbarMenubar/ToolPageSpinner.h
@@ -0,0 +1,50 @@
+/*
+ * Xournal++
+ *
+ * Part of the customizable toolbars
+ *
+ * @author Xournal++ Team
+ * https://github.com/xournalpp/xournalpp
+ *
+ * @license GNU GPLv2 or later
+ */
+
+#pragma once
+
+#include <cstddef>  // for size_t
+#include <memory>   // for unique_ptr
+#include <string>   // for string
+
+#include <gdk-pixbuf/gdk-pixbuf.h>  // for GdkPixbuf
+#include <gtk/gtk.h>                // for GtkWidget, GtkToolItem, GTK_ORIEN...
+
+#include "gui/IconNameHelper.h"     // for IconNameHelper
+#include "util/raii/GObjectSPtr.h"  // for WidgetSPtr
+
+#include "AbstractToolItem.h"  // for AbstractToolItem
+
+class SpinPageListener;
+
+class ToolPageSpinner: public AbstractToolItem {
+public:
+    ToolPageSpinner(std::string id, IconNameHelper iconNameHelper, SpinPageListener* listener);
+    ~ToolPageSpinner() override;
+
+public:
+    /// Propagates the info to all instances of the Page Spinner
+    void setPageInfo(size_t currentPage, size_t pageCount, size_t pdfPage);
+    std::string getToolDisplayName() const override;
+    xoj::util::WidgetSPtr createItem(bool horizontal) override;
+
+    inline SpinPageListener* getListener() const { return listener; }
+
+protected:
+    GtkWidget* getNewToolIcon() const override;
+
+private:
+    IconNameHelper iconNameHelper;
+    SpinPageListener* listener;
+
+    class Instance;
+    std::vector<Instance*> instances;
+};
diff --git a/entry/src/main/cpp/src/core/gui/toolbarMenubar/ToolPdfCombocontrol.cpp b/entry/src/main/cpp/src/core/gui/toolbarMenubar/ToolPdfCombocontrol.cpp
new file mode 100644
index 0000000..9674194
--- /dev/null
+++ b/entry/src/main/cpp/src/core/gui/toolbarMenubar/ToolPdfCombocontrol.cpp
@@ -0,0 +1,17 @@
+#include "ToolPdfCombocontrol.h"
+
+#include <utility>  // for move
+
+#include "control/ToolEnums.h"
+#include "control/actions/ActionDatabase.h"
+#include "gui/IconNameHelper.h"
+#include "util/i18n.h"
+
+ToolPdfCombocontrol::ToolPdfCombocontrol(std::string id, IconNameHelper& icons, const ActionDatabase& db):
+        ComboToolButton(
+                std::move(id), Category::SELECTION, icons.iconName("select-pdf-text-ht"),
+                _("PDF text selection dropdown menu"),
+                {Entry(_("Select Linear PDF Text"), icons.iconName("select-pdf-text-ht"), TOOL_SELECT_PDF_TEXT_LINEAR),
+                 Entry(_("Select PDF Text In Rectangle"), icons.iconName("select-pdf-text-area"),
+                       TOOL_SELECT_PDF_TEXT_RECT)},
+                db.getAction(Action::SELECT_TOOL)) {}
diff --git a/entry/src/main/cpp/src/core/gui/toolbarMenubar/ToolPdfCombocontrol.h b/entry/src/main/cpp/src/core/gui/toolbarMenubar/ToolPdfCombocontrol.h
new file mode 100644
index 0000000..94b5bd3
--- /dev/null
+++ b/entry/src/main/cpp/src/core/gui/toolbarMenubar/ToolPdfCombocontrol.h
@@ -0,0 +1,14 @@
+#pragma once
+
+#include <string>
+
+#include "ComboToolButton.h"
+
+class IconNameHelper;
+class ActionDatabase;
+
+class ToolPdfCombocontrol: public ComboToolButton {
+public:
+    ToolPdfCombocontrol(std::string id, IconNameHelper& icons, const ActionDatabase& db);
+    ~ToolPdfCombocontrol() override = default;
+};
diff --git a/entry/src/main/cpp/src/core/gui/toolbarMenubar/ToolSelectCombocontrol.cpp b/entry/src/main/cpp/src/core/gui/toolbarMenubar/ToolSelectCombocontrol.cpp
new file mode 100644
index 0000000..b734ce8
--- /dev/null
+++ b/entry/src/main/cpp/src/core/gui/toolbarMenubar/ToolSelectCombocontrol.cpp
@@ -0,0 +1,29 @@
+#include "ToolSelectCombocontrol.h"
+
+#include <utility>  // for move
+
+#include "control/ToolEnums.h"
+#include "control/actions/ActionDatabase.h"
+#include "gui/IconNameHelper.h"
+#include "util/i18n.h"
+
+static std::vector<ComboToolButton::Entry> makeEntries(IconNameHelper& icons, bool hideAudio) {
+    using Entry = ComboToolButton::Entry;
+    std::vector<Entry> res = {Entry(_("Select Rectangle"), icons.iconName("select-rect"), TOOL_SELECT_RECT),
+                              Entry(_("Select Region"), icons.iconName("select-lasso"), TOOL_SELECT_REGION),
+                              Entry(_("Select Multi-Layer Rectangle"), icons.iconName("select-multilayer-rect"),
+                                    TOOL_SELECT_MULTILAYER_RECT),
+                              Entry(_("Select Multi-Layer Region"), icons.iconName("select-multilayer-lasso"),
+                                    TOOL_SELECT_MULTILAYER_REGION),
+                              Entry(_("Select Object"), icons.iconName("object-select"), TOOL_SELECT_OBJECT),
+                              Entry(_("Play Object"), icons.iconName("object-play"), TOOL_PLAY_OBJECT)};
+    if (hideAudio) {
+        res.pop_back();
+    }
+    return res;
+}
+
+ToolSelectCombocontrol::ToolSelectCombocontrol(std::string id, IconNameHelper& icons, const ActionDatabase& db,
+                                               bool hideAudio):
+        ComboToolButton(std::move(id), Category::TOOLS, icons.iconName("combo-selection"), _("Selection dropdown menu"),
+                        makeEntries(icons, hideAudio), db.getAction(Action::SELECT_TOOL)) {}
diff --git a/entry/src/main/cpp/src/core/gui/toolbarMenubar/ToolSelectCombocontrol.h b/entry/src/main/cpp/src/core/gui/toolbarMenubar/ToolSelectCombocontrol.h
new file mode 100644
index 0000000..401d244
--- /dev/null
+++ b/entry/src/main/cpp/src/core/gui/toolbarMenubar/ToolSelectCombocontrol.h
@@ -0,0 +1,24 @@
+/*
+ * Xournal++
+ *
+ * Part of the customizable toolbars
+ *
+ * @author Xournal++ Team
+ * https://github.com/xournalpp/xournalpp
+ *
+ * @license GNU GPLv2 or later
+ */
+#pragma once
+
+#include <string>
+
+#include "ComboToolButton.h"
+
+class IconNameHelper;
+class ActionDatabase;
+
+class ToolSelectCombocontrol: public ComboToolButton {
+public:
+    ToolSelectCombocontrol(std::string id, IconNameHelper& icons, const ActionDatabase& db, bool hideAudio);
+    ~ToolSelectCombocontrol() override = default;
+};
diff --git a/entry/src/main/cpp/src/core/gui/toolbarMenubar/ToolZoomSlider.cpp b/entry/src/main/cpp/src/core/gui/toolbarMenubar/ToolZoomSlider.cpp
new file mode 100644
index 0000000..155ac24
--- /dev/null
+++ b/entry/src/main/cpp/src/core/gui/toolbarMenubar/ToolZoomSlider.cpp
@@ -0,0 +1,78 @@
+#include "ToolZoomSlider.h"
+
+#include <cmath>    // for exp, log
+#include <sstream>  // for stringstream, bas...
+#include <utility>  // for move
+
+#include <glib.h>  // for g_get_monotonic_time
+
+#include "control/actions/ActionDatabase.h"
+#include "control/zoom/ZoomControl.h"  // for ZoomControl, DEFA...
+#include "util/i18n.h"                 // for _
+
+#include "SliderItemCreationHelper.h"
+
+constexpr double SCALE_LOG_OFFSET = 0.20753;
+
+constexpr int FINE_STEP_COUNT = 100;
+constexpr int COARSE_STEP_COUNT = 10;
+
+// TODO(personalizedrefrigerator): Update the range to reflect the min and max zoom settings.
+constexpr auto SLIDER_RANGE =
+        AbstractSliderItem::SliderRange{DEFAULT_ZOOM_MIN, DEFAULT_ZOOM_MAX, FINE_STEP_COUNT, COARSE_STEP_COUNT};
+
+ToolZoomSlider::ToolZoomSlider(std::string id, ZoomControl* zoom, IconNameHelper iconNameHelper, ActionDatabase& db):
+        AbstractSliderItem{std::move(id), Category::NAVIGATION, SLIDER_RANGE, db.getAction(Action::ZOOM)},
+        iconName(iconNameHelper.iconName("zoom-slider")),
+        zoomCtrl(zoom) {}
+
+auto ToolZoomSlider::formatSliderValue(double value) -> std::string {
+    std::stringstream out;
+    out << static_cast<int>(std::round(100 * scaleInverseFunction(value)));
+    out << "%";
+    return out.str();
+}
+
+auto ToolZoomSlider::createItem(bool horizontal) -> xoj::util::WidgetSPtr {
+    auto item = SliderItemCreationHelper<ToolZoomSlider>::createItem(this, horizontal);
+
+    class Listener: public ZoomListener {
+    public:
+        Listener(GtkScale* slider, ZoomControl* zoomCtrl): slider(slider), zoomCtrl(zoomCtrl) {
+            zoomCtrl->addZoomListener(this);
+        }
+        ~Listener() override { zoomCtrl->removeZoomListener(this); }
+        void zoomChanged() override {}  // No need to do anything here. Handled by the GAction
+        void zoomRangeValuesChanged() override {
+            gtk_scale_clear_marks(slider);
+            auto position = gtk_orientable_get_orientation(GTK_ORIENTABLE(slider)) == GTK_ORIENTATION_HORIZONTAL ?
+                                    GTK_POS_BOTTOM :
+                                    GTK_POS_RIGHT;
+            gtk_scale_add_mark(slider, scaleFunction(1.0), position, nullptr);
+            gtk_scale_add_mark(slider, scaleFunction(zoomCtrl->getZoomFitValue() / zoomCtrl->getZoom100Value()),
+                               position, nullptr);
+        }
+
+        GtkScale* slider;  ///< Parent to this data
+        ZoomControl* zoomCtrl;
+    };
+
+    auto data = std::make_unique<Listener>(GTK_SCALE(item.get()), zoomCtrl);
+    data->zoomRangeValuesChanged();  // Set up the marks
+
+    // Destroy *data if the widget is destroyed
+    g_object_weak_ref(
+            G_OBJECT(item.get()), +[](gpointer d, GObject*) { delete static_cast<Listener*>(d); }, data.release());
+
+    return item;
+}
+
+auto ToolZoomSlider::getToolDisplayName() const -> std::string { return _("Zoom Slider"); }
+
+auto ToolZoomSlider::getNewToolIcon() const -> GtkWidget* {
+    return gtk_image_new_from_icon_name(iconName.c_str(), GTK_ICON_SIZE_SMALL_TOOLBAR);
+}
+
+auto ToolZoomSlider::scaleFunction(double x) -> double { return std::log(x - SCALE_LOG_OFFSET); }
+
+auto ToolZoomSlider::scaleInverseFunction(double x) -> double { return std::exp(x) + SCALE_LOG_OFFSET; }
diff --git a/entry/src/main/cpp/src/core/gui/toolbarMenubar/ToolZoomSlider.h b/entry/src/main/cpp/src/core/gui/toolbarMenubar/ToolZoomSlider.h
new file mode 100644
index 0000000..68ac347
--- /dev/null
+++ b/entry/src/main/cpp/src/core/gui/toolbarMenubar/ToolZoomSlider.h
@@ -0,0 +1,61 @@
+/*
+ * Xournal++
+ *
+ * Part of the customizable toolbars
+ *
+ * @author Xournal++ Team
+ * https://github.com/xournalpp/xournalpp
+ *
+ * @license GNU GPLv2 or later
+ */
+
+#pragma once
+
+#include <memory>  // for unique_ptr
+#include <string>  // for string
+
+#include <gdk-pixbuf/gdk-pixbuf.h>  // for GdkPixbuf
+#include <gtk/gtk.h>                // for GtkRange, GtkWidget
+
+#include "control/zoom/ZoomListener.h"  // for ZoomListener
+#include "gui/IconNameHelper.h"         // for IconNameHelper
+
+#include "AbstractSliderItem.h"  // for NewAbstractSliderItem
+
+class ZoomControl;
+class ActionDatabase;
+
+class ToolZoomSlider: public AbstractSliderItem {
+public:
+    ToolZoomSlider(std::string id, ZoomControl* zoom, IconNameHelper iconNameHelper, ActionDatabase& db);
+    ~ToolZoomSlider() override = default;
+
+    xoj::util::WidgetSPtr createItem(bool horizontal) override;
+
+protected:
+    static constexpr bool DISPLAY_VALUE = true;
+    static std::string formatSliderValue(double value);
+
+    std::string getToolDisplayName() const override;
+
+protected:
+    GtkWidget* getNewToolIcon() const override;
+
+protected:
+    /**
+     * @brief Function to convert from the GAction's state value to the slider's position. (e.g. for log scaling)
+     */
+    static double scaleFunction(double x);
+
+    /**
+     * @brief Function to convert from the slider's position to the GAction's state value. (e.g. for log scaling)
+     */
+    static double scaleInverseFunction(double x);
+
+protected:
+    std::string iconName;
+    ZoomControl* zoomCtrl;
+
+    template <class FinalSliderType>
+    friend class SliderItemCreationHelper;
+};
diff --git a/entry/src/main/cpp/src/core/gui/toolbarMenubar/TooltipToolButton.cpp b/entry/src/main/cpp/src/core/gui/toolbarMenubar/TooltipToolButton.cpp
new file mode 100644
index 0000000..9133123
--- /dev/null
+++ b/entry/src/main/cpp/src/core/gui/toolbarMenubar/TooltipToolButton.cpp
@@ -0,0 +1,33 @@
+#include "TooltipToolButton.h"
+
+#include <utility>  // for move
+
+#include <glib.h>
+#include <gtk/gtk.h>
+
+#include "util/glib_casts.h"
+#include "util/raii/GObjectSPtr.h"  // for WidgetSPtr
+
+TooltipToolButton::TooltipToolButton(std::string id, Category cat, Action action, std::string iconName,
+                                     std::string description, std::function<std::string()> fetchTooltip):
+        ToolButton(std::move(id), cat, action, std::move(iconName), std::move(description), false),
+        fetchTooltip(std::move(fetchTooltip)) {}
+
+auto TooltipToolButton::createItem(bool horizontal) -> xoj::util::WidgetSPtr {
+    auto item = ToolButton::createItem(horizontal);
+
+    gtk_widget_set_has_tooltip(item.get(), true);
+
+    auto* cloneFetchTooltip = new std::function<std::string()>(this->fetchTooltip);
+
+    g_signal_connect_data(item.get(), "query-tooltip",
+                          G_CALLBACK(+[](GtkWidget*, gint, gint, gboolean, GtkTooltip* tooltip, gpointer d) {
+                              auto fn = static_cast<std::function<std::string()>*>(d);
+                              gtk_tooltip_set_text(tooltip, (*fn)().c_str());
+                              return true;
+                          }),
+                          cloneFetchTooltip, xoj::util::closure_notify_cb<std::function<std::string()>>,
+                          GConnectFlags(0));
+
+    return item;
+}
diff --git a/entry/src/main/cpp/src/core/gui/toolbarMenubar/TooltipToolButton.h b/entry/src/main/cpp/src/core/gui/toolbarMenubar/TooltipToolButton.h
new file mode 100644
index 0000000..1887e7c
--- /dev/null
+++ b/entry/src/main/cpp/src/core/gui/toolbarMenubar/TooltipToolButton.h
@@ -0,0 +1,36 @@
+/*
+ * Xournal++
+ *
+ * Part of the customizable toolbars
+ *
+ * @author Xournal++ Team
+ * https://github.com/xournalpp/xournalpp
+ *
+ * @license GNU GPLv2 or later
+ */
+
+#pragma once
+
+#include <functional>
+#include <string>  // for string, allocator
+
+#include <gtk/gtk.h>  // for GtkWidget
+
+#include "enums/Action.enum.h"  // for Action
+#include "gui/PopoverFactory.h"
+#include "util/raii/GVariantSPtr.h"
+
+#include "ToolButton.h"
+
+/// ToolButton with dynamic tooltip description (overrides the GtkWidget::query-tooltip signal handler)
+class TooltipToolButton: public ToolButton {
+public:
+    TooltipToolButton(std::string id, Category cat, Action action, std::string iconName, std::string description,
+                      std::function<std::string()> fetchTooltip);
+    ~TooltipToolButton() override = default;
+
+    xoj::util::WidgetSPtr createItem(bool horizontal) override;
+
+private:
+    std::function<std::string()> fetchTooltip;
+};
diff --git a/entry/src/main/cpp/src/core/gui/toolbarMenubar/icon/ColorIcon.cpp b/entry/src/main/cpp/src/core/gui/toolbarMenubar/icon/ColorIcon.cpp
new file mode 100644
index 0000000..a2e96b0
--- /dev/null
+++ b/entry/src/main/cpp/src/core/gui/toolbarMenubar/icon/ColorIcon.cpp
@@ -0,0 +1,62 @@
+#include "ColorIcon.h"
+
+#include <cmath>  // for M_PI
+
+#include "util/raii/CairoWrappers.h"
+#include "util/raii/GObjectSPtr.h"
+
+namespace ColorIcon {
+/**
+ * Create a new GtkImage with preview color
+ */
+auto newGtkImage(Color color, int size, bool circle, std::optional<Color> secondaryColor) -> GtkWidget* {
+    xoj::util::GObjectSPtr<GdkPixbuf> img(newGdkPixbuf(color, size, circle, secondaryColor));
+    GtkWidget* w = gtk_image_new_from_pixbuf(img.get());
+    gtk_widget_show(w);
+    return w;
+}
+
+/**
+ * Create a new GdkPixbuf* with preview color
+ */
+auto newGdkPixbuf(Color color, int size, bool circle, std::optional<Color> secondaryColor)
+        -> xoj::util::GObjectSPtr<GdkPixbuf> {
+    xoj::util::CairoSurfaceSPtr buf(cairo_image_surface_create(CAIRO_FORMAT_ARGB32, size, size), xoj::util::adopt);
+    xoj::util::CairoSPtr cr(cairo_create(buf.get()), xoj::util::adopt);
+
+    Util::cairo_set_source_rgbi(cr.get(), color, 1);
+
+    constexpr double PADDING = 1;
+
+    if (circle) {
+        const double mid = .5 * size;
+        const double radius = mid - PADDING;
+        cairo_arc(cr.get(), mid, mid, radius, 0, 2 * M_PI);
+    } else {
+        cairo_rectangle(cr.get(), PADDING, PADDING, size - 2 * PADDING, size - 2 * PADDING);
+    }
+    cairo_fill_preserve(cr.get());
+
+    cairo_set_source_rgba(cr.get(), 0, 0, 0, 1);
+    cairo_set_line_width(cr.get(), 1);
+    cairo_stroke(cr.get());
+
+    if (secondaryColor) {
+        // Draw an indicator for the secondary color
+        Util::cairo_set_source_rgbi(cr.get(), secondaryColor.value(), 1);
+
+        const double indicatorMid = size - 2 * PADDING;
+        const double indicatorRadius = (0.5 * size) - PADDING;
+        // only draws the upper left quarter of the arc
+        cairo_arc(cr.get(), indicatorMid, indicatorMid, indicatorRadius, M_PI, M_PI / 2);
+        cairo_fill_preserve(cr.get());
+
+        cairo_set_source_rgba(cr.get(), 0, 0, 0, 1);
+        cairo_set_line_width(cr.get(), 1);
+        cairo_stroke(cr.get());
+    }
+
+    return xoj::util::GObjectSPtr<GdkPixbuf>(gdk_pixbuf_get_from_surface(buf.get(), 0, 0, size, size),
+                                             xoj::util::adopt);
+}
+};  // namespace ColorIcon
diff --git a/entry/src/main/cpp/src/core/gui/toolbarMenubar/icon/ColorIcon.h b/entry/src/main/cpp/src/core/gui/toolbarMenubar/icon/ColorIcon.h
new file mode 100644
index 0000000..2107e67
--- /dev/null
+++ b/entry/src/main/cpp/src/core/gui/toolbarMenubar/icon/ColorIcon.h
@@ -0,0 +1,35 @@
+/*
+ * Xournal++
+ *
+ * Icon for color buttons
+ *
+ * @author Xournal++ Team
+ * https://github.com/xournalpp/xournalpp
+ *
+ * @license GNU GPLv2 or later
+ */
+
+#pragma once
+
+#include <optional>
+
+#include <gdk-pixbuf/gdk-pixbuf.h>  // for GdkPixbuf
+#include <gtk/gtk.h>                // for GtkWidget
+
+#include "util/Color.h"  // for Color
+#include "util/raii/GObjectSPtr.h"
+
+namespace ColorIcon {
+/**
+ * @brief Create a new GtkImage with preview color
+ * @return The pointer is a floating ref
+ */
+GtkWidget* newGtkImage(Color color, int size = 22, bool circle = true,
+                       std::optional<Color> secondaryColor = std::nullopt);
+
+/**
+ * @brief Create a new GdkPixbuf* with preview color
+ */
+xoj::util::GObjectSPtr<GdkPixbuf> newGdkPixbuf(Color color, int size = 22, bool circle = true,
+                                               std::optional<Color> secondaryColor = std::nullopt);
+};  // namespace ColorIcon
diff --git a/entry/src/main/cpp/src/core/gui/toolbarMenubar/icon/ToolbarSeparatorImage.cpp b/entry/src/main/cpp/src/core/gui/toolbarMenubar/icon/ToolbarSeparatorImage.cpp
new file mode 100644
index 0000000..c18f956
--- /dev/null
+++ b/entry/src/main/cpp/src/core/gui/toolbarMenubar/icon/ToolbarSeparatorImage.cpp
@@ -0,0 +1,48 @@
+#include "ToolbarSeparatorImage.h"
+
+#include <cairo.h>        // for cairo_create, cairo_destroy, cairo_image_su...
+#include <gdk/gdk.h>      // for gdk_pixbuf_get_from_surface
+#include <glib-object.h>  // for g_object_unref
+#include <util/Color.h>   // for Colors::red, Colors::gray
+#include <util/Util.h>    // for cairo_set_source_rgbi
+
+constexpr double LINE_WIDTH = 5.;
+constexpr double MARGIN = 3.;
+constexpr double TAIL_SIZE = 5.;
+
+auto ToolbarSeparatorImage::newImage(SeparatorType separator) -> GtkWidget* {
+    GdkPixbuf* pixbuf = ToolbarSeparatorImage::getNewToolPixbuf(separator);
+    GtkWidget* w = gtk_image_new_from_pixbuf(pixbuf);
+    g_object_unref(pixbuf);
+    return w;
+}
+
+auto ToolbarSeparatorImage::getNewToolPixbuf(SeparatorType separator) -> GdkPixbuf* {
+    constexpr auto width = 30;
+    constexpr auto height = 30;
+    cairo_surface_t* crImage = cairo_image_surface_create(CAIRO_FORMAT_ARGB32, width, height);
+    cairo_t* cr = cairo_create(crImage);
+
+    Util::cairo_set_source_rgbi(cr, Colors::red);
+    cairo_set_line_width(cr, LINE_WIDTH);
+    cairo_move_to(cr, width / 2, 0);
+    cairo_line_to(cr, width / 2, height);
+    cairo_stroke(cr);
+    if (separator == SeparatorType::SPACER) {  // add double arrow tails
+        Util::cairo_set_source_rgbi(cr, Colors::gray);
+
+        cairo_move_to(cr, MARGIN + TAIL_SIZE, height / 2 - TAIL_SIZE);
+        cairo_line_to(cr, MARGIN, height / 2);
+        cairo_line_to(cr, MARGIN + TAIL_SIZE, height / 2 + TAIL_SIZE);
+
+        cairo_move_to(cr, width - MARGIN - TAIL_SIZE, height / 2 - TAIL_SIZE);
+        cairo_line_to(cr, width - MARGIN, height / 2);
+        cairo_line_to(cr, width - MARGIN - TAIL_SIZE, height / 2 + TAIL_SIZE);
+
+        cairo_stroke(cr);
+    }
+    cairo_destroy(cr);
+    GdkPixbuf* pixbuf = gdk_pixbuf_get_from_surface(crImage, 0, 0, width, height);
+    cairo_surface_destroy(crImage);
+    return pixbuf;
+}
diff --git a/entry/src/main/cpp/src/core/gui/toolbarMenubar/icon/ToolbarSeparatorImage.h b/entry/src/main/cpp/src/core/gui/toolbarMenubar/icon/ToolbarSeparatorImage.h
new file mode 100644
index 0000000..57b34f6
--- /dev/null
+++ b/entry/src/main/cpp/src/core/gui/toolbarMenubar/icon/ToolbarSeparatorImage.h
@@ -0,0 +1,40 @@
+/*
+ * Xournal++
+ *
+ * Toolbar icon for separator (only used for drag and drop and so)
+ *
+ * @author Xournal++ Team
+ * https://github.com/xournalpp/xournalpp
+ *
+ * @license GNU GPLv2 or later
+ */
+
+#pragma once
+
+#include <gdk-pixbuf/gdk-pixbuf.h>  // for GdkPixbuf
+#include <gtk/gtk.h>                // for GtkWidget
+
+enum SeparatorType { SEPARATOR, SPACER };
+
+/**
+ * Menuitem handler
+ */
+namespace ToolbarSeparatorImage {
+
+/**
+ * @brief Create Seperator Widget
+ * This is used in the toolbar for spacing between items.
+ *
+ * @return GtkWidget* Separator
+ */
+GtkWidget* newImage(SeparatorType separator);
+
+/**
+ * @brief Create Separator Pixbuf
+ * This is used in the toolbar customization to drag the separator
+ * from the Customization dialog to the toolbar and vice versa.
+ *
+ * @return GdkPixbuf* Seperator
+ */
+GdkPixbuf* getNewToolPixbuf(SeparatorType separator);
+};  // namespace ToolbarSeparatorImage
diff --git a/entry/src/main/cpp/src/core/gui/toolbarMenubar/model/ColorPalette.cpp b/entry/src/main/cpp/src/core/gui/toolbarMenubar/model/ColorPalette.cpp
new file mode 100644
index 0000000..142aa5b
--- /dev/null
+++ b/entry/src/main/cpp/src/core/gui/toolbarMenubar/model/ColorPalette.cpp
@@ -0,0 +1,182 @@
+#include "ColorPalette.h"
+
+#include <fstream>    // for basic_ifstream, basic_ofstream
+#include <ostream>
+#include <sstream>    // for operator<<, basic_ostream::operator<<
+#include <stdexcept>  // for invalid_argument
+#include <utility>    // for move
+
+#include <glib.h>  // for g_warning, g_error
+
+#include "util/StringUtils.h"  // for StringUtils
+#include "util/Util.h"
+#include "util/XojMsgBox.h"
+#include "util/i18n.h"          // for FORMAT_STR, FS, _
+#include "util/serdesstream.h"  // for serdes_stream
+
+
+Palette::Palette(fs::path path): filepath{std::move(path)}, namedColors{}, header{} {}
+
+void Palette::load() {
+    if (!fs::exists(this->filepath))
+        throw std::invalid_argument(
+                FS(FORMAT_STR("The palette file {1} does not exist.") % this->filepath.filename().u8string()));
+    header.clear();
+    namedColors.clear();
+
+
+    auto gplFile = serdes_stream<std::ifstream>(filepath);
+    gplFile.exceptions(std::ifstream::failbit | std::ifstream::badbit);
+
+    std::string line;
+    getline(gplFile, line);
+    int lineNumber{1};
+    // parse standard header line
+    parseFirstGimpPaletteLine(line);
+    // attempt parsing line by line as either header, color, or fallback
+    while (!gplFile.eof() && gplFile.peek() != EOF && getline(gplFile, line)) {
+        lineNumber++;
+        parseCommentLine(line) || parseHeaderLine(line) || parseColorLine(line) || parseEmptyLine(line) ||
+                parseLineFallback(lineNumber);
+    }
+    if (namedColors.size() < 1) {
+        throw std::invalid_argument("Your Palettefile has no parsable color. It needs at least one!");
+    }
+}
+
+auto Palette::load_default() -> void {
+    std::stringstream defaultFile{default_palette()};
+    std::string line;
+
+    getline(defaultFile, line);
+    if (!parseFirstGimpPaletteLine(line))
+        g_error("The default file was mallformed. This should never happen!");
+    while (getline(defaultFile, line)) {
+        parseHeaderLine(line) || parseColorLine(line);
+    }
+}
+
+auto Palette::getHeader(const std::string& attr) const -> std::string {
+    if (header.find(attr) == header.end()) {
+        return std::string{};
+    }
+    return header.at(attr);
+}
+
+auto Palette::parseFirstGimpPaletteLine(const std::string& line) const -> bool {
+    if (StringUtils::trim(line) != "GIMP Palette") {
+        throw std::invalid_argument(".gpl file needs to start with \"GIMP Palette\" in the "
+                                    "first line");
+    }
+    return true;
+}
+
+auto Palette::parseHeaderLine(const std::string& line) -> bool {
+    Header headerEntry;
+    std::istringstream iss{line};
+    if (iss >> headerEntry) {
+        header[headerEntry.getAttribute()] = headerEntry.getValue();
+        return true;
+    }
+    return false;
+}
+
+auto Palette::parseColorLine(const std::string& line) -> bool {
+    NamedColor color{namedColors.size()};
+    std::istringstream iss{line};
+    if (iss >> color) {
+        namedColors.emplace_back(std::move(color));
+        return true;
+    }
+    return false;
+}
+
+auto Palette::parseCommentLine(const std::string& line) const -> bool { return line.front() == '#'; }
+
+auto Palette::parseEmptyLine(const std::string& line) const -> bool { return line.empty(); }
+
+auto Palette::parseLineFallback(int lineNumber) const -> const bool {
+    throw std::invalid_argument(FS(FORMAT_STR("The line {1} is malformed.") % lineNumber));
+}
+
+auto Palette::getColorAt(size_t i) const -> NamedColor const& {
+    if (i >= namedColors.size()) {
+        i = i % namedColors.size();
+        g_warning("There are more Coloritems in the Toolbar than your Palette defines.\n"
+                  "Hence, cycling through palette from the beginning.");
+    }
+
+    return namedColors.at(i);
+}
+
+auto Palette::size() const -> size_t { return namedColors.size(); }
+
+
+auto Palette::default_palette() -> const std::string {
+    auto d = serdes_stream<std::stringstream>();
+    d << "GIMP Palette\n"
+      << "Name: Xournal Palette\n"
+      << "#\n"
+      << 0 << " " << 0 << " " << 0 << " " << NC_("Color", "Black") << "\n"
+      << 0 << " " << 128 << " " << 0 << " " << NC_("Color", "Green") << "\n"
+      << 0 << " " << 192 << " " << 255 << " " << NC_("Color", "Light Blue") << "\n"
+      << 0 << " " << 255 << " " << 0 << " " << NC_("Color", "Light Green") << "\n"
+      << 51 << " " << 51 << " " << 204 << " " << NC_("Color", "Blue") << "\n"
+      << 128 << " " << 128 << " " << 128 << " " << NC_("Color", "Gray") << "\n"
+      << 255 << " " << 0 << " " << 0 << " " << NC_("Color", "Red") << "\n"
+      << 255 << " " << 0 << " " << 255 << " " << NC_("Color", "Magenta") << "\n"
+      << 255 << " " << 128 << " " << 0 << " " << NC_("Color", "Orange") << "\n"
+      << 255 << " " << 255 << " " << 0 << " " << NC_("Color", "Yellow") << "\n"
+      << 255 << " " << 255 << " " << 255 << " " << NC_("Color", "White") << std::endl;
+    return d.str();
+}
+
+void Palette::create_default(fs::path filepath) {
+    auto myfile = serdes_stream<std::ofstream>(filepath);
+    myfile << default_palette();
+}
+
+auto Header::getAttribute() const -> std::string { return this->attribute; };
+auto Header::getValue() const -> std::string { return this->value; };
+auto Palette::getFilePath() const -> fs::path const& { return this->filepath; };
+
+auto operator>>(std::istream& str, Header& header) -> std::istream& {
+    /*
+     * inspired by
+     * https://codereview.stackexchange.com/questions/38879/parsing-text-file-in-c
+     */
+    std::string line;
+    Header tmp;
+    if (std::getline(str, line)) {
+        std::istringstream iss{line};
+        if (getline(iss, tmp.attribute, ':') && getline(iss, tmp.value, '\n')) {
+            tmp.attribute = StringUtils::trim(tmp.attribute);
+            tmp.value = StringUtils::trim(tmp.value);
+
+            // parsing was successful hence results can be stored permanently
+            header = std::move(tmp);
+        } else {
+            /*
+             * One operation failed.
+             * So set the state on the main stream
+             * to indicate failure.
+             */
+            str.setstate(std::ios::failbit);
+        }
+    }
+    return str;
+}
+
+auto Palette::parseErrorDialog(const std::exception& e) const -> void {
+    std::stringstream msg_stream{};
+    msg_stream << "There has been a problem parsing the color palette file at " << char_cast(filepath.u8string())
+               << "\n\n";
+    msg_stream << "What happened:\n" << e.what() << "\n";
+    msg_stream << "What to do:\n";
+    msg_stream << "Please fix your palette file, or rename it so xournalpp creates a new default palette file "
+                  "for you. This file can then be used as a template.\n";
+    msg_stream << "Until this is fixed, the application will use the default color palette." << std::endl;
+
+    // Call later, to make sure the main window has been set up, so the popup is displayed in front of it (and modal)
+    Util::execInUiThread([msg = msg_stream.str()]() { XojMsgBox::showErrorToUser(nullptr, msg); });
+}
diff --git a/entry/src/main/cpp/src/core/gui/toolbarMenubar/model/ColorPalette.h b/entry/src/main/cpp/src/core/gui/toolbarMenubar/model/ColorPalette.h
new file mode 100644
index 0000000..46778ce
--- /dev/null
+++ b/entry/src/main/cpp/src/core/gui/toolbarMenubar/model/ColorPalette.h
@@ -0,0 +1,217 @@
+#pragma once
+
+#include <cstddef>    // for size_t
+#include <exception>  // for exception
+#include <iosfwd>     // for istream
+#include <map>        // for map
+#include <string>     // for string, basic_string
+#include <vector>     // for vector
+
+#include "util/NamedColor.h"  // for NamedColor
+
+#include "filesystem.h"  // for path
+
+/**
+ * @brief Header entity of a gpl file
+ * This is simply a key value pair. The main reason to define a struct for this is to define a custom input operator.
+ *
+ */
+struct Header {
+    /**
+     * @brief Input operator for parsing Header from input string stream
+     *
+     * @param str input string stream
+     * @param header output for parsed Header
+     * @return std::istream& which is the rest of the input string stream after parsing
+     */
+    friend std::istream& operator>>(std::istream& str, Header& header);
+
+    std::string getAttribute() const;
+    std::string getValue() const;
+
+private:
+    /**
+     * @brief Attribute name given in gpl file
+     *
+     */
+    std::string attribute;
+
+    /**
+     * @brief Value for corresponding attribute in gpl file
+     *
+     */
+    std::string value;
+
+    /**
+     * @brief Swap all properties between two Header instances
+     *
+     * @param other other Header instance to swap properties with
+     */
+    void swap(Header& other);
+};
+
+/**
+ * @brief ColorPalette coming from a parsed gpl file
+ *
+ */
+struct Palette {
+    /**
+     * @brief Construct a new Palette
+     * This does not yet parse the file. It simply sets up the class.
+     *
+     * @param path to the gpl file
+     */
+    Palette(fs::path path);
+
+    /**
+     * @brief Create default gpl file string
+     * Default xournalpp color scheme
+     *   0 0 0 Black
+     *   0 128 0 Green
+     *   0 192 255 Light Blue
+     *   0 255 0 Light Green
+     *   51 51 204 Blue
+     *   128 128 128 Gray
+     *   255 0 0 Red
+     *   255 0 255 Magenta
+     *   255 128 0 Orange
+     *   255 255 0 Yellow
+     *   255 255 255 White
+     *
+     * @return const std::string
+     */
+    static const std::string default_palette();
+
+    /**
+     * @brief Create a default gpl file for the xournalpp color scheme
+     * See default_palette() for further information.
+     *
+     * @param path to write gpl file to
+     */
+    static void create_default(fs::path path);
+
+    /**
+     * @brief Parse the gpl file in filepath
+     * This fills the header map and the namedColors vector after clearing them first
+     *
+     * @throw exception in case of wrong formatted file
+     *
+     */
+    void load();
+
+    /**
+     * @brief Load the default Palette
+     *
+     */
+    void load_default();
+
+    /**
+     * @brief Show a Dialog with only an OK button
+     *
+     * @param message to be displayed in the dialog
+     */
+    void parseErrorDialog(const std::exception& e) const;
+
+    /**
+     * @brief Get the number of namedColors part of the palette
+     *
+     * @return size_t number of namedColors in palette
+     */
+    size_t size() const;
+
+    /**
+     * @brief Get a NamedColor from the palette
+     *
+     * @param i palette index
+     * @return NamedColor of palette at palette index
+     */
+    NamedColor const& getColorAt(size_t i) const;
+
+    fs::path const& getFilePath() const;
+
+    std::string getHeader(const std::string& attr) const;
+
+
+private:
+    /**
+     * @brief filepath to the gpl file the palette is coming from
+     *
+     */
+    fs::path filepath;
+
+    /**
+     * @brief Vector containing all colors of the palette
+     *
+     */
+    std::vector<NamedColor> namedColors;
+
+    /**
+     * @brief Map containing the key value pairs of the gpl header
+     * e.g. "Palette Name", "Description"
+     *
+     */
+    std::map<std::string, std::string> header;
+
+    /**
+     * @brief Verify if line contains the expected "GIMP Palette" string
+     *
+     * @param line first line of gpl file
+     * @return true if line is "GIMP Palette"
+     * @return false otherwise
+     */
+    bool parseFirstGimpPaletteLine(const std::string& line) const;
+
+    /**
+     * @brief Try to parse a color and add it to namedColors
+     *
+     *
+     * @param line line of gpl file
+     * @return true if line is of form "255 255 255 White" (r g b name)
+     * @return false otherwise
+     */
+    bool parseColorLine(const std::string& line);
+
+    /**
+     * @brief Try to parse a header key value pair and add it to header
+     *
+     * @param line line of gpl file
+     * @return true if line is of form "key:value"
+     * @return false otherwise
+     */
+    bool parseHeaderLine(const std::string& line);
+
+    /**
+     * @brief Parse a Comment line
+     * Every line starting with "#" will be considered a comment
+     *
+     * @param line
+     * @return true if line starts with "#"
+     * @return false else
+     */
+    bool parseCommentLine(const std::string& line) const;
+
+    /**
+     * @brief Parse an empty line
+     * Empty lines do not contain any characters and are ignored
+     *
+     * @param line
+     * @return true if line is empty
+     * @return false otherwise
+     */
+    bool parseEmptyLine(const std::string& line) const;
+
+    /**
+     * @brief Fallback for line parsing
+     * This function is the fallback in case no other parsing attempt works.
+     * In this case this function throws an error containing the non-parseable line number
+     *
+     * This should be used in the following way
+     *
+     *     firstLineParseAttempt(line) || secondLineParseAttempt(line) || parseLineFallback(lineNumber)
+     *
+     * @param lineNumber of the erroneous line
+     * @return nothing as it always throws an error
+     * @throw invalid_argument exception if not a comment
+     */
+    const bool parseLineFallback(int lineNumber) const;
+};
diff --git a/entry/src/main/cpp/src/core/gui/toolbarMenubar/model/ToolbarData.cpp b/entry/src/main/cpp/src/core/gui/toolbarMenubar/model/ToolbarData.cpp
new file mode 100644
index 0000000..9481fb1
--- /dev/null
+++ b/entry/src/main/cpp/src/core/gui/toolbarMenubar/model/ToolbarData.cpp
@@ -0,0 +1,163 @@
+#include "ToolbarData.h"
+
+#include <cstring>  // for strcmp, strncmp
+#include <utility>  // for move
+
+#include "gui/toolbarMenubar/model/ColorPalette.h"  // for Palette
+#include "gui/toolbarMenubar/model/ToolbarEntry.h"  // for ToolbarEntry, Too...
+#include "gui/toolbarMenubar/model/ToolbarItem.h"   // for ToolbarItem
+#include "util/PlaceholderString.h"                 // for PlaceholderString
+#include "util/StringUtils.h"                       // for StringUtils
+#include "util/i18n.h"                              // for FC, FORMAT_STR, _F
+
+using std::string;
+
+ToolbarData::ToolbarData(bool predefined): predefined(predefined) {}
+
+ToolbarData::ToolbarData(const ToolbarData& data) {
+    *this = data;
+    this->predefined = false;
+}
+
+void ToolbarData::operator=(const ToolbarData& other) {
+    this->id = other.id;
+    this->name = other.name;
+    this->predefined = other.predefined;
+    this->contents = other.contents;
+}
+
+ToolbarData::~ToolbarData() = default;
+
+auto ToolbarData::getName() const -> const std::string& { return this->name; }
+
+void ToolbarData::setName(string name) { this->name = std::move(name); }
+
+auto ToolbarData::getId() const -> const std::string& { return this->id; }
+
+void ToolbarData::setId(string id) { this->id = std::move(id); }
+
+auto ToolbarData::isPredefined() const -> bool { return this->predefined; }
+
+void ToolbarData::load(GKeyFile* config, const char* group, const Palette& colorPalette) {
+
+    size_t unassignedColorIndex = 0U;
+    auto filterDeprecatedItemNames = [&](std::string name) -> std::string {
+        // recognize previous name, V1.07 (Jan 2019) and earlier.
+        if (name == "TWO_PAGES") {
+            return "PAIRED_PAGES";
+        }
+
+        // recognize previous name, V1.08 (Feb 2019) and earlier.
+        if (name == "RECSTOP") {
+            return "AUDIO_RECORDING";
+        }
+
+        // recognize previous name, V1.0.19 (Dec 2020) and earlier
+        if (name == "HILIGHTER") {
+            return "HIGHLIGHTER";
+        }
+
+        // recognize previous name, V1.1.0+dev (Jan 2021) and earlier
+        if (name == "DRAW_CIRCLE") {
+            return "DRAW_ELLIPSE";
+        }
+
+        // recognize previous name, V1.1.0+dev (Nov 2022) and earlier
+        if (name == "PEN_FILL_OPACITY") {
+            return "FILL_OPACITY";
+        }
+
+        if (StringUtils::startsWith(name, "COLOR(") && StringUtils::endsWith(name, ")")) {
+            std::string arg = name.substr(6, name.length() - 7);
+            // check for old color format of toolbar.ini
+            if (StringUtils::startsWith(arg, "0x")) {
+                auto paletteIndex = colorPalette.getColorAt(unassignedColorIndex++).getIndex();
+                return "COLOR(" + std::to_string(paletteIndex) + ")";
+            }
+        }
+
+        return name;
+    };
+
+    gsize length = 0;
+    gchar** keys = g_key_file_get_keys(config, group, &length, nullptr);
+    if (keys == nullptr) {
+        return;
+    }
+
+    gchar* name = g_key_file_get_locale_string(config, group, "name", nullptr, nullptr);
+    if (name != nullptr) {
+        this->name = name;
+        g_free(name);
+    }
+
+    for (gsize i = 0; i < length; i++) {
+        if (strcmp(keys[i], "name") == 0 || strncmp(keys[i], "name[", 5) == 0) {
+            continue;
+        }
+
+        auto& e = contents.emplace_back();
+        e.setName(keys[i]);
+
+        gsize keyLen = 0;
+        gchar** list = g_key_file_get_string_list(config, group, keys[i], &keyLen, nullptr);
+
+        for (gsize x = 0; x < keyLen; x++) {
+            e.addItem(filterDeprecatedItemNames(StringUtils::trim(std::string(list[x]))));
+        }
+
+        g_strfreev(list);
+    }
+
+    g_strfreev(keys);
+}
+
+void ToolbarData::saveToKeyFile(GKeyFile* config) const {
+    string group = getId();
+
+    for (const ToolbarEntry& e: this->contents) {
+        string line{};
+
+        for (const auto& it: e.getItems()) {
+            line += ",";
+            line += it.getName();
+        }
+
+        if (line.length() > 2) {
+            g_key_file_set_string(config, group.c_str(), e.getName().c_str(), line.substr(1).c_str());
+        }
+    }
+
+    g_key_file_set_string(config, group.c_str(), "name", this->name.c_str());
+}
+
+auto ToolbarData::insertItem(const std::string& toolbar, const std::string& item, int position) -> int {
+    g_message("ToolbarData::insertItem(%s, %s, %d);", toolbar.data(), item.data(), position);
+
+    g_return_val_if_fail(isPredefined() == false, -1);
+
+    for (ToolbarEntry& e: this->contents) {
+        if (e.getName() == toolbar) {
+            g_message("    | Toolbar %s found -- Inserting element", toolbar.c_str());
+            return e.insertItem(item, position);
+        }
+    }
+
+    // No toolbar named toolbar. Adding a new one
+    g_message("    | Toolbar %s not found -- Creating a new one", toolbar.c_str());
+    auto& newEntry = contents.emplace_back();
+    newEntry.setName(toolbar);
+    return newEntry.addItem(item);
+}
+
+auto ToolbarData::removeItemByID(const string& toolbar, int id) -> bool {
+    g_return_val_if_fail(isPredefined() == false, false);
+
+    for (ToolbarEntry& e: contents) {
+        if (e.getName() == toolbar) {
+            return e.removeItemById(id);
+        }
+    }
+
+    return false;
+}
diff --git a/entry/src/main/cpp/src/core/gui/toolbarMenubar/model/ToolbarData.h b/entry/src/main/cpp/src/core/gui/toolbarMenubar/model/ToolbarData.h
new file mode 100644
index 0000000..412caa3
--- /dev/null
+++ b/entry/src/main/cpp/src/core/gui/toolbarMenubar/model/ToolbarData.h
@@ -0,0 +1,53 @@
+/*
+ * Xournal++
+ *
+ * Toolbar definitions model
+ *
+ * @author Xournal++ Team
+ * https://github.com/xournalpp/xournalpp
+ *
+ * @license GNU GPLv2 or later
+ */
+
+#pragma once
+
+#include <string>  // for string
+#include <vector>  // for vector
+
+#include <glib.h>  // for GKeyFile
+
+class ToolbarEntry;
+struct Palette;
+
+class ToolbarData {
+public:
+    ToolbarData(bool predefined);
+    ToolbarData(const ToolbarData& data);
+    virtual ~ToolbarData();
+
+    void operator=(const ToolbarData& other);
+
+public:
+    const std::string& getName() const;
+    void setName(std::string name);
+    const std::string& getId() const;
+    void setId(std::string id);
+    bool isPredefined() const;
+
+    void load(GKeyFile* config, const char* group, const Palette& colorPalette);
+    void saveToKeyFile(GKeyFile* config) const;
+
+    // Editing API
+    int insertItem(const std::string& toolbar, const std::string& item, int position);
+    bool removeItemByID(const std::string& toolbar, int id);
+
+private:
+    std::string id;
+    std::string name;
+    std::vector<ToolbarEntry> contents;
+
+    bool predefined = false;
+
+    friend class ToolbarModel;
+    friend class ToolMenuHandler;
+};
diff --git a/entry/src/main/cpp/src/core/gui/toolbarMenubar/model/ToolbarEntry.cpp b/entry/src/main/cpp/src/core/gui/toolbarMenubar/model/ToolbarEntry.cpp
new file mode 100644
index 0000000..260b7f7
--- /dev/null
+++ b/entry/src/main/cpp/src/core/gui/toolbarMenubar/model/ToolbarEntry.cpp
@@ -0,0 +1,55 @@
+#include "ToolbarEntry.h"
+
+#include <algorithm>
+#include <utility>  // for move
+
+#include <glib.h>
+
+#include "gui/toolbarMenubar/model/ToolbarItem.h"  // for ToolbarItem
+#include "util/Assert.h"
+
+ToolbarEntry::ToolbarEntry() = default;
+
+ToolbarEntry::ToolbarEntry(const ToolbarEntry& e) { *this = e; }
+ToolbarEntry::ToolbarEntry(ToolbarEntry&& e) { *this = std::move(e); }
+
+ToolbarEntry& ToolbarEntry::operator=(const ToolbarEntry& e) {
+    this->name = e.name;
+    this->entries = e.entries;
+    return *this;
+}
+
+ToolbarEntry& ToolbarEntry::operator=(ToolbarEntry&& e) {
+    this->name = std::move(e.name);
+    this->entries = std::move(e.entries);
+    return *this;
+}
+
+ToolbarEntry::~ToolbarEntry() = default;
+
+auto ToolbarEntry::getName() const -> std::string { return this->name; }
+
+void ToolbarEntry::setName(std::string name) { this->name = std::move(name); }
+
+auto ToolbarEntry::addItem(std::string item) -> int { return entries.emplace_back(std::move(item)).getId(); }
+
+auto ToolbarEntry::removeItemById(int id) -> bool {
+    auto it = std::find_if(entries.begin(), entries.end(), [id](const auto& it) { return it.getId() == id; });
+    if (it != entries.end()) {
+        entries.erase(it);
+        return true;
+    }
+    g_warning("ToolbarEntry::removeItemById: Tried to remove inexistant ID");
+    return false;
+}
+
+auto ToolbarEntry::insertItem(std::string item, int position) -> int {
+    xoj_assert(position >= 0);
+    if (position >= static_cast<int>(entries.size())) {
+        return entries.emplace_back(std::move(item)).getId();
+    }
+
+    return entries.emplace(std::next(entries.begin(), position), std::move(item))->getId();
+}
+
+auto ToolbarEntry::getItems() const -> const ToolbarItemVector& { return entries; }
diff --git a/entry/src/main/cpp/src/core/gui/toolbarMenubar/model/ToolbarEntry.h b/entry/src/main/cpp/src/core/gui/toolbarMenubar/model/ToolbarEntry.h
new file mode 100644
index 0000000..96eccf8
--- /dev/null
+++ b/entry/src/main/cpp/src/core/gui/toolbarMenubar/model/ToolbarEntry.h
@@ -0,0 +1,51 @@
+/*
+ * Xournal++
+ *
+ * Part of the customizable toolbars
+ *
+ * @author Xournal++ Team
+ * https://github.com/xournalpp/xournalpp
+ *
+ * @license GNU GPLv2 or later
+ */
+
+#pragma once
+
+#include <string>  // for string
+#include <vector>  // for vector
+
+class ToolbarItem;
+
+typedef std::vector<ToolbarItem> ToolbarItemVector;
+
+class ToolbarEntry {
+public:
+    ToolbarEntry();
+    ToolbarEntry(const ToolbarEntry& e);
+    ToolbarEntry(ToolbarEntry&& e);
+    ~ToolbarEntry();
+
+    ToolbarEntry& operator=(const ToolbarEntry& e);
+    ToolbarEntry& operator=(ToolbarEntry&& e);
+
+public:
+    std::string getName() const;
+    void setName(std::string name);
+
+    /**
+     * Adds a new item and return the ID of the item
+     */
+    int addItem(std::string item);
+    bool removeItemById(int id);
+
+    /**
+     * Insert a new item and return the ID of the item
+     */
+    int insertItem(std::string item, int position);
+
+    const ToolbarItemVector& getItems() const;
+
+private:
+    std::string name;
+    ToolbarItemVector entries;
+};
diff --git a/entry/src/main/cpp/src/core/gui/toolbarMenubar/model/ToolbarItem.cpp b/entry/src/main/cpp/src/core/gui/toolbarMenubar/model/ToolbarItem.cpp
new file mode 100644
index 0000000..dd85d2f
--- /dev/null
+++ b/entry/src/main/cpp/src/core/gui/toolbarMenubar/model/ToolbarItem.cpp
@@ -0,0 +1,22 @@
+#include "ToolbarItem.h"
+
+#include <utility>
+
+int ToolbarItem::sid = 0;
+
+ToolbarItem::ToolbarItem(std::string name) {
+    this->name = std::move(name);
+    this->id = ToolbarItem::sid++;
+
+    if (ToolbarItem::sid < 0) {
+        ToolbarItem::sid = 0;
+    }
+}
+
+auto ToolbarItem::getName() const -> std::string { return this->name; }
+
+void ToolbarItem::setName(std::string name) { this->name = std::move(name); }
+
+auto ToolbarItem::operator==(ToolbarItem& other) -> bool { return this->name == other.name; }
+
+auto ToolbarItem::getId() const -> int { return this->id; }
diff --git a/entry/src/main/cpp/src/core/gui/toolbarMenubar/model/ToolbarItem.h b/entry/src/main/cpp/src/core/gui/toolbarMenubar/model/ToolbarItem.h
new file mode 100644
index 0000000..e5c72f3
--- /dev/null
+++ b/entry/src/main/cpp/src/core/gui/toolbarMenubar/model/ToolbarItem.h
@@ -0,0 +1,40 @@
+/*
+ * Xournal++
+ *
+ * Part of the customizable toolbars
+ *
+ * @author Xournal++ Team
+ * https://github.com/xournalpp/xournalpp
+ *
+ * @license GNU GPLv2 or later
+ */
+
+#pragma once
+
+#include <string>  // for string
+
+
+class ToolbarItem {
+public:
+    ToolbarItem(std::string name);
+    ToolbarItem() = default;
+
+public:
+    std::string getName() const;
+    void setName(std::string name);
+
+    bool operator==(ToolbarItem& other);
+
+    int getId() const;
+
+private:
+    /**
+     * @brief This is the name of the ToolbarItem
+     * This is also what is stored in the toolbar.ini verbatim.
+     *
+     */
+    std::string name;
+    int id;
+
+    static int sid;
+};
diff --git a/entry/src/main/cpp/src/core/gui/toolbarMenubar/model/ToolbarModel.cpp b/entry/src/main/cpp/src/core/gui/toolbarMenubar/model/ToolbarModel.cpp
new file mode 100644
index 0000000..8fb5a2a
--- /dev/null
+++ b/entry/src/main/cpp/src/core/gui/toolbarMenubar/model/ToolbarModel.cpp
@@ -0,0 +1,162 @@
+#include "ToolbarModel.h"
+
+#include <algorithm>  // for find_if
+#include <cstddef>  // for size_t
+
+#include "util/StringUtils.h"
+#include "util/XojMsgBox.h"   // for XojMsgBox
+#include "util/i18n.h"        // for _
+#include "util/safe_casts.h"  // for as_signed
+
+#include "ToolbarData.h"  // for ToolbarData
+#include "filesystem.h"   // for path
+
+ToolbarModel::ToolbarModel() = default;
+ToolbarModel::~ToolbarModel() = default;
+
+auto ToolbarModel::getToolbars() const -> const std::vector<std::unique_ptr<ToolbarData>>& { return this->toolbars; }
+
+void ToolbarModel::parseGroup(GKeyFile* config, const char* group, bool predefined, const Palette& colorPalette) {
+    auto data = std::make_unique<ToolbarData>(predefined);
+
+    data->name = (predefined ? "predef_" : "custom_");
+    data->id = group;
+
+    data->load(config, group, colorPalette);
+
+    add(std::move(data));
+}
+
+void ToolbarModel::remove(ToolbarData* data) {
+    auto it = std::find_if(toolbars.begin(), toolbars.end(), [data](const auto& tb) { return tb.get() == data; });
+    if (it != this->toolbars.end()) {
+        this->toolbars.erase(it);
+    }
+}
+
+auto ToolbarModel::add(std::unique_ptr<ToolbarData> data) -> ToolbarData* {
+    return this->toolbars.emplace_back(std::move(data)).get();
+}
+
+auto ToolbarModel::parse(fs::path const& filepath, bool predefined, const Palette& colorPalette) -> bool {
+    GKeyFile* config = g_key_file_new();
+    g_key_file_set_list_separator(config, ',');
+    if (!g_key_file_load_from_file(config, char_cast(filepath.u8string().c_str()), G_KEY_FILE_NONE, nullptr)) {
+        g_key_file_free(config);
+        return false;
+    }
+
+    gsize length = 0;
+    gchar** groups = g_key_file_get_groups(config, &length);
+
+    for (gsize i = 0; i < length; i++) {
+        parseGroup(config, groups[i], predefined, colorPalette);
+    }
+
+    g_strfreev(groups);
+    g_key_file_free(config);
+    return true;
+}
+
+void ToolbarModel::initCopyNameId(ToolbarData* data) {
+    if (!existsId(data->getId())) {
+        return;
+    }
+    for (int i = 0; i < 100; i++) {
+        std::string id = data->getId() + " Copy";
+
+        if (i > 0) {
+            id += " ";
+            id += std::to_string(i);
+        }
+
+        if (!existsId(id)) {
+            std::string filename = data->getName();
+            filename += " ";
+            filename += C_("as a noun: a copy of", "Copy");
+
+            if (i > 0) {
+                filename += " ";
+                filename += std::to_string(i);
+            }
+
+            data->setName(filename);
+            data->setId(id);
+            return;
+        }
+    }
+}
+
+auto ToolbarModel::existsId(const std::string& id) const -> bool {
+    return std::any_of(toolbars.begin(), toolbars.end(), [&id](const auto& d) { return d->getId() == id; });
+}
+
+const char* TOOLBAR_INI_HEADER =
+        "# Xournal++ Toolbar configuration\n"
+        "# Here you can customize the Toolbars\n"
+        " Delete this file to generate a new config file with default values\n"
+        "\n"
+        " Available buttons:\n"
+        " File: NEW,OPEN,SAVE,SAVEPDF,PRINT\n"
+        "\n"
+        " Edit: UNDO,REDO,CUT,COPY,PASTE,SEARCH,DELETE,ROTATION_SNAPPING,GRID_SNAPPING\n"
+        "\n"
+        " View: PAIRED_PAGES,PRESENTATION_MODE,FULLSCREEN,MANAGE_TOOLBAR,CUSTOMIZE_TOOLBAR,ZOOM_OUT,ZOOM_IN,ZOOM_FIT,ZOOM_100\n"
+        "\n"
+        " Navigation: GOTO_FIRST,GOTO_BACK,GOTO_PAGE,GOTO_NEXT,GOTO_LAST,GOTO_PREVIOUS_LAYER,GOTO_NEXT_LAYER,GOTO_TOP_LAYER,\n"
+        "             GOTO_NEXT_ANNOTATED_PAGE\n"
+        "\n"
+        " Journal: INSERT_NEW_PAGE,DELETE_CURRENT_PAGE\n"
+        "\n"
+        " Tool: PEN,PLAIN,DASHED,DASH-/ DOTTED,DOTTED,ERASER,HIGHLIGHTER,TEXT,MATH_TEX,IMAGE,DEFAULT_TOOL,SHAPE_RECOGNIZER,SELECT_PDF_TEXT_LINEAR,\n"
+        "       SELECT_PDF_TEXT_RECT,DRAW_RECTANGLE,DRAW_ELLIPSE,DRAW_ARROW,DRAW_DOUBLE_ARROW,DRAW_COORDINATE_SYSTEM,RULER,DRAW_SPLINE,\n"
+        "       SELECT_REGION,SELECT_RECTANGLE,SELECT_MULTILAYER_REGION,SELECT_MULTILAYER_RECTANGLE,SELECT_OBJECT,VERTICAL_SPACE,PLAY_OBJECT,\n"
+        "       HAND,SETSQUARE,COMPASS,SELECT_FONT,AUDIO_RECORDING,AUDIO_PAUSE_PLAYBACK,AUDIO_STOP_PLAYBACK,AUDIO_SEEK_FORWARDS,AUDIO_SEEK_BACKWARDS\n"
+
+        "  Notice: ERASER and PEN also have drop down menus to select the type, SELECT are all selection tools, with drop down menu\n"
+        "\n"
+        " Footer tools: PAGE_SPIN,ZOOM_SLIDER,LAYER,TOOL_FILL,PEN_FILL_OPACITY\n"
+        "  PAGE_SPIN: The page spiner, incl. current page label\n"
+        "  ZOOM_SLIDER: The zoom slider\n"
+        "  LAYER: The layer dropdown menu\n"
+        "\n"
+        " Color: "
+        "COLOR(0),COLOR(1),COLOR(2),COLOR(3),COLOR(4),COLOR(5),COLOR(6),COLOR(7),COLOR(8),COLOR(9),COLOR(10),COLOR_SELECT\n"
+        "  Notice: The colors reference the respective color in the palette.gpl file.\n"
+        "          For backwards compatibility the hex representation, e.g. COLOR(0xff8000), is still permitted. However, the hex value\n"
+        "          will be IGNORED in favour of the \"next\" palette color. They will be automatically migrated when the user customizes\n"
+        "          the respective toolbar configuration.\n"
+        "\n"
+        " Non-menu items: SELECT,DRAW,PDF_TOOL\n"
+        "\n"
+        " Tool configuration: VERY_FINE,FINE,MEDIUM,THICK,VERY_THICK\n"
+        "\n"
+        " Item separation: SEPARATOR,SPACER\n"
+        "\n";
+
+void ToolbarModel::save(fs::path const& filepath) const {
+    GKeyFile* config = g_key_file_new();
+    g_key_file_set_list_separator(config, ',');
+
+    g_key_file_set_comment(config, nullptr, nullptr, TOOLBAR_INI_HEADER, nullptr);
+
+    for (const auto& data: this->toolbars) {
+        if (!data->isPredefined()) {
+            data->saveToKeyFile(config);
+        }
+    }
+
+    gsize len = 0;
+    char* data = g_key_file_to_data(config, &len, nullptr);
+
+    g_key_file_free(config);
+    config = nullptr;
+
+    GError* error = nullptr;
+    if (!g_file_set_contents(char_cast(filepath.u8string().c_str()), data, as_signed(len), &error)) {
+        XojMsgBox::showErrorToUser(nullptr, error->message);
+        g_error_free(error);
+    }
+
+    g_free(data);
+}
diff --git a/entry/src/main/cpp/src/core/gui/toolbarMenubar/model/ToolbarModel.h b/entry/src/main/cpp/src/core/gui/toolbarMenubar/model/ToolbarModel.h
new file mode 100644
index 0000000..bc3f07b
--- /dev/null
+++ b/entry/src/main/cpp/src/core/gui/toolbarMenubar/model/ToolbarModel.h
@@ -0,0 +1,48 @@
+/*
+ * Xournal++
+ *
+ * Toolbar definitions model
+ *
+ * @author Xournal++ Team
+ * https://github.com/xournalpp/xournalpp
+ *
+ * @license GNU GPLv2 or later
+ */
+
+#pragma once
+
+#include <memory>
+#include <string>
+#include <vector>
+
+#include <glib.h>
+
+#include "filesystem.h"
+
+class ToolbarData;
+struct Palette;
+
+class ToolbarModel {
+public:
+    ToolbarModel();
+    virtual ~ToolbarModel();
+
+private:
+    ToolbarModel(const ToolbarModel& other);
+    void operator=(const ToolbarModel& other);
+
+public:
+    const std::vector<std::unique_ptr<ToolbarData>>& getToolbars() const;
+    bool parse(fs::path const& filepath, bool predefined, const Palette& colorPalette);
+    ToolbarData* add(std::unique_ptr<ToolbarData> data);
+    void remove(ToolbarData* data);
+    void save(const fs::path& filepath) const;
+    bool existsId(const std::string& id) const;
+    void initCopyNameId(ToolbarData* data);
+
+private:
+    void parseGroup(GKeyFile* config, const char* group, bool predefined, const Palette& colorPalette);
+
+private:
+    std::vector<std::unique_ptr<ToolbarData>> toolbars;
+};
diff --git a/entry/src/main/cpp/src/core/gui/widgets/SpinPageAdapter.cpp b/entry/src/main/cpp/src/core/gui/widgets/SpinPageAdapter.cpp
new file mode 100644
index 0000000..f11d985
--- /dev/null
+++ b/entry/src/main/cpp/src/core/gui/widgets/SpinPageAdapter.cpp
@@ -0,0 +1,70 @@
+#include "SpinPageAdapter.h"
+
+#include <cstdint>  // for uint64_t
+
+#include <glib-object.h>  // for g_signal_handler_disconnect, G_CALLBACK
+
+#include "util/Assert.h"      // for xoj_assert
+#include "util/glib_casts.h"  // for wrap_for_once_v
+#include "util/safe_casts.h"
+
+auto SpinPageAdapter::pageNrSpinChangedTimerCallback(SpinPageAdapter* adapter) -> bool {
+    adapter->page = strict_cast<size_t>(gtk_spin_button_get_value_as_int(GTK_SPIN_BUTTON(adapter->widget.get())));
+
+    adapter->firePageChanged();
+
+    adapter->timeout.consume();
+    return false;
+}
+
+void SpinPageAdapter::pageNrSpinChangedCallback(GtkSpinButton* spinbutton, SpinPageAdapter* adapter) {
+    // Nothing changed.
+    if (as_unsigned(gtk_spin_button_get_value_as_int(GTK_SPIN_BUTTON(spinbutton))) == adapter->page) {
+        return;
+    }
+
+    // Give the spin button some time to release, if we don't do he will send new events...
+    adapter->timeout = g_timeout_add(100, xoj::util::wrap_for_once_v<pageNrSpinChangedTimerCallback>, adapter);
+}
+
+void SpinPageAdapter::setWidget(GtkWidget* widget) {
+    if (this->widget && this->pageNrSpinChangedHandlerId) {
+        g_signal_handler_disconnect(this->widget.get(), this->pageNrSpinChangedHandlerId);
+    }
+    xoj_assert(widget);
+    this->widget.reset(widget, xoj::util::refsink);
+    this->pageNrSpinChangedHandlerId =
+            g_signal_connect(widget, "value-changed", G_CALLBACK(pageNrSpinChangedCallback), this);
+
+    gtk_spin_button_set_range(GTK_SPIN_BUTTON(widget), static_cast<double>(this->min), static_cast<double>(this->max));
+    gtk_spin_button_set_value(GTK_SPIN_BUTTON(widget), static_cast<double>(this->page));
+}
+
+auto SpinPageAdapter::getPage() const -> size_t { return this->page; }
+
+void SpinPageAdapter::setPage(size_t page) {
+    this->page = page;
+    if (this->widget) {
+        gtk_spin_button_set_value(GTK_SPIN_BUTTON(this->widget.get()), static_cast<double>(page));
+    }
+}
+
+void SpinPageAdapter::setMinMaxPage(size_t min, size_t max) {
+    this->min = min;
+    this->max = max;
+    if (this->widget) {
+        gtk_spin_button_set_range(GTK_SPIN_BUTTON(this->widget.get()), static_cast<double>(min),
+                                  static_cast<double>(max));
+    }
+}
+
+void SpinPageAdapter::addListener(SpinPageListener* listener) { this->listener = listener; }
+
+void SpinPageAdapter::removeListener(SpinPageListener* listener) {
+    xoj_assert(listener == this->listener);
+    this->listener = nullptr;
+}
+
+void SpinPageAdapter::firePageChanged() { this->listener->pageChanged(this->page); }
+
+SpinPageListener::~SpinPageListener() = default;
diff --git a/entry/src/main/cpp/src/core/gui/widgets/SpinPageAdapter.h b/entry/src/main/cpp/src/core/gui/widgets/SpinPageAdapter.h
new file mode 100644
index 0000000..88f7bd6
--- /dev/null
+++ b/entry/src/main/cpp/src/core/gui/widgets/SpinPageAdapter.h
@@ -0,0 +1,65 @@
+/*
+ * Xournal++
+ *
+ * Handle the Page Spin Widget
+ *
+ * @author Xournal++ Team
+ * https://github.com/xournalpp/xournalpp
+ *
+ * @license GNU GPLv2 or later
+ */
+
+#pragma once
+
+#include <cstddef>  // for size_t
+#include <list>     // for list
+
+#include <glib.h>     // for guint, gulong
+#include <gtk/gtk.h>  // for GtkWidget, GtkSpinButton
+
+#include "util/raii/GObjectSPtr.h"  // for WidgetSPtr
+#include "util/raii/GSourceURef.h"
+
+class SpinPageListener;
+
+class SpinPageAdapter final {
+public:
+    SpinPageAdapter() = default;
+    ~SpinPageAdapter() = default;
+
+public:
+    /**
+     * Assumes ownership of widget
+     */
+    void setWidget(GtkWidget* widget);
+
+    size_t getPage() const;
+    void setPage(size_t page);
+    void setMinMaxPage(size_t min, size_t max);
+
+    void addListener(SpinPageListener* listener);
+    void removeListener(SpinPageListener* listener);
+
+private:
+    static bool pageNrSpinChangedTimerCallback(SpinPageAdapter* adapter);
+    static void pageNrSpinChangedCallback(GtkSpinButton* spinbutton, SpinPageAdapter* adapter);
+
+    void firePageChanged();
+
+private:
+    xoj::util::WidgetSPtr widget;
+    gulong pageNrSpinChangedHandlerId = 0;
+    size_t page = 0;
+
+    xoj::util::GSourceURef timeout;
+    SpinPageListener* listener;
+
+    size_t min = 0;
+    size_t max = 0;
+};
+
+class SpinPageListener {
+public:
+    virtual void pageChanged(size_t page) = 0;
+    virtual ~SpinPageListener();
+};
diff --git a/entry/src/main/cpp/src/core/gui/widgets/XournalWidget.cpp b/entry/src/main/cpp/src/core/gui/widgets/XournalWidget.cpp
new file mode 100644
index 0000000..0435848
--- /dev/null
+++ b/entry/src/main/cpp/src/core/gui/widgets/XournalWidget.cpp
@@ -0,0 +1,327 @@
+#include "XournalWidget.h"
+
+#include <algorithm>  // for max
+#include <cmath>      // for NAN
+#include <optional>   // for optional
+#include <vector>     // for vector
+
+#include <cairo.h>    // for cairo_restore, cairo_save
+#include <gdk/gdk.h>  // for GdkRectangle, GdkWindowAttr
+
+#include "control/Control.h"                // for Control
+#include "control/settings/Settings.h"      // for Settings
+#include "control/tools/EditSelection.h"    // for EditSelection
+#include "gui/Layout.h"                     // for Layout
+#include "gui/LegacyRedrawable.h"           // for Redrawable
+#include "gui/PageView.h"                   // for XojPageView
+#include "gui/Shadow.h"                     // for Shadow
+#include "gui/XournalView.h"                // for XournalView
+#include "gui/inputdevices/InputContext.h"  // for InputContext
+#include "gui/scroll/ScrollHandling.h"      // for ScrollHandling
+#include "util/Color.h"                     // for cairo_set_source_rgbi
+#include "util/Rectangle.h"                 // for Rectangle
+
+#include "config-debug.h"  // for DEBUG_DRAW_WIDGET
+
+/*
+ * Declares:
+ *      static void gtk_xournal_class_init(GtkXournalClass*);
+ *      static void gtk_xournal_init(GtkXournal*);
+ * Defines
+ *      gtk_xournal_parent_class (pointer to GtkWidgetClass instance)
+ *      GType gtk_xournal_get_type();
+ */
+G_DEFINE_TYPE(GtkXournal, gtk_xournal, GTK_TYPE_WIDGET)
+
+static void gtk_xournal_get_preferred_width(GtkWidget* widget, gint* minimal_width, gint* natural_width);
+static void gtk_xournal_get_preferred_height(GtkWidget* widget, gint* minimal_height, gint* natural_height);
+static void gtk_xournal_size_allocate(GtkWidget* widget, GtkAllocation* allocation);
+static void gtk_xournal_realize(GtkWidget* widget);
+static auto gtk_xournal_draw(GtkWidget* widget, cairo_t* cr) -> gboolean;
+static void gtk_xournal_dispose(GObject* object);
+
+auto gtk_xournal_new(XournalView* view, InputContext* inputContext) -> GtkWidget* {
+    GtkXournal* xoj = GTK_XOURNAL(g_object_new(gtk_xournal_get_type(), nullptr));
+    xoj->view = view;
+    xoj->scrollHandling = inputContext->getScrollHandling();
+    xoj->layout = new Layout(view, inputContext->getScrollHandling());
+    xoj->selection = nullptr;
+    xoj->input = inputContext;
+
+    xoj->input->connect(GTK_WIDGET(xoj));
+
+    return GTK_WIDGET(xoj);
+}
+
+static void gtk_xournal_class_init(GtkXournalClass* cptr) {
+    auto* widget_class = reinterpret_cast<GtkWidgetClass*>(cptr);
+
+    widget_class->realize = gtk_xournal_realize;
+    widget_class->get_preferred_width = gtk_xournal_get_preferred_width;
+    widget_class->get_preferred_height = gtk_xournal_get_preferred_height;
+    widget_class->size_allocate = gtk_xournal_size_allocate;
+
+    widget_class->draw = gtk_xournal_draw;
+
+#ifdef DEBUG_DRAW_WIDGET
+    widget_class->queue_draw_region = +[](GtkWidget* w, const cairo_region_t* reg) {
+        cairo_rectangle_int_t r;
+        cairo_region_get_extents(reg, &r);
+        auto width = gtk_widget_get_allocated_width(w);
+        auto height = gtk_widget_get_allocated_height(w);
+
+        auto widthp = gtk_widget_get_allocated_width(gtk_widget_get_parent(w));
+        auto heightp = gtk_widget_get_allocated_height(gtk_widget_get_parent(w));
+        printf("   * queue_draw_region: %d x %d + (%d ; %d) out of %d x %d   parent: %d x %d\n", r.width, r.height, r.x,
+               r.y, width, height, widthp, heightp);
+        GTK_WIDGET_CLASS(gtk_xournal_parent_class)->queue_draw_region(w, reg);
+    };
+#endif
+
+    G_OBJECT_CLASS(cptr)->dispose = gtk_xournal_dispose;
+}
+
+auto gtk_xournal_get_visible_area(GtkWidget* widget, const XojPageView* p) -> xoj::util::Rectangle<double>* {
+    g_return_val_if_fail(widget != nullptr, nullptr);
+    g_return_val_if_fail(GTK_IS_XOURNAL(widget), nullptr);
+
+    GtkXournal* xournal = GTK_XOURNAL(widget);
+
+    GtkAdjustment* vadj = xournal->scrollHandling->getVertical();
+    GtkAdjustment* hadj = xournal->scrollHandling->getHorizontal();
+
+    GdkRectangle r2;
+    r2.x = static_cast<int>(gtk_adjustment_get_value(hadj));
+    r2.y = static_cast<int>(gtk_adjustment_get_value(vadj));
+    r2.width = static_cast<int>(gtk_adjustment_get_page_size(hadj));
+    r2.height = static_cast<int>(gtk_adjustment_get_page_size(vadj));
+
+    GdkRectangle r1;
+    r1.x = p->getX();
+    r1.y = p->getY();
+    r1.width = p->getDisplayWidth();
+    r1.height = p->getDisplayHeight();
+
+    GdkRectangle r3 = {0, 0, 0, 0};
+    gdk_rectangle_intersect(&r1, &r2, &r3);
+
+    if (r3.width == 0 && r3.height == 0) {
+        return nullptr;
+    }
+
+    r3.x -= r1.x;
+    r3.y -= r1.y;
+
+    double zoom = xournal->view->getZoom();
+
+    if (r3.x < 0 || r3.y < 0) {
+        g_warning("XournalWidget:gtk_xournal_get_visible_area: intersection rectangle coordinates are negative which "
+                  "should never happen");
+    }
+
+    return new xoj::util::Rectangle<double>(std::max(r3.x, 0) / zoom, std::max(r3.y, 0) / zoom, r3.width / zoom,
+                                            r3.height / zoom);
+}
+
+auto gtk_xournal_get_layout(GtkWidget* widget) -> Layout* {
+    g_return_val_if_fail(widget != nullptr, nullptr);
+    g_return_val_if_fail(GTK_IS_XOURNAL(widget), nullptr);
+
+    GtkXournal* xournal = GTK_XOURNAL(widget);
+    return xournal->layout;
+}
+
+static void gtk_xournal_init(GtkXournal* xournal) {
+    GtkWidget* widget = GTK_WIDGET(xournal);
+
+    gtk_widget_set_can_focus(widget, true);
+}
+
+static void gtk_xournal_get_preferred_width(GtkWidget* widget, gint* minimal_width, gint* natural_width) {
+    g_return_if_fail(GTK_IS_XOURNAL(widget));
+    GtkXournal* xournal = GTK_XOURNAL(widget);
+    g_return_if_fail(xournal->layout);
+    *minimal_width = *natural_width = xournal->layout->getMinimalWidth();
+}
+
+static void gtk_xournal_get_preferred_height(GtkWidget* widget, gint* minimal_height, gint* natural_height) {
+    g_return_if_fail(GTK_IS_XOURNAL(widget));
+    GtkXournal* xournal = GTK_XOURNAL(widget);
+    g_return_if_fail(xournal->layout);
+    *minimal_height = *natural_height = xournal->layout->getMinimalHeight();
+}
+
+/**
+ * This method is called while scrolling or after the XournalWidget size has changed
+ */
+static void gtk_xournal_size_allocate(GtkWidget* widget, GtkAllocation* allocation) {
+    g_return_if_fail(widget != nullptr);
+    g_return_if_fail(GTK_IS_XOURNAL(widget));
+    g_return_if_fail(allocation != nullptr);
+
+    gtk_widget_set_allocation(widget, allocation);
+
+    if (gtk_widget_get_realized(widget)) {
+        gdk_window_move_resize(gtk_widget_get_window(widget), allocation->x, allocation->y, allocation->width,
+                               allocation->height);
+    }
+
+    GtkXournal* xournal = GTK_XOURNAL(widget);
+
+    // layout the pages in the XournalWidget
+    xournal->layout->layoutPages(allocation->width, allocation->height);
+}
+
+static void gtk_xournal_realize(GtkWidget* widget) {
+    GdkWindowAttr attributes;
+
+    g_return_if_fail(widget != nullptr);
+    g_return_if_fail(GTK_IS_XOURNAL(widget));
+
+    gtk_widget_set_realized(widget, true);
+
+    gtk_widget_set_hexpand(widget, true);
+    gtk_widget_set_vexpand(widget, true);
+
+    GtkAllocation allocation;
+    gtk_widget_get_allocation(widget, &allocation);
+    attributes.window_type = GDK_WINDOW_CHILD;
+    attributes.x = allocation.x;
+    attributes.y = allocation.y;
+    attributes.width = allocation.width;
+    attributes.height = allocation.height;
+
+    attributes.wclass = GDK_INPUT_OUTPUT;
+    attributes.event_mask = gtk_widget_get_events(widget) | GDK_EXPOSURE_MASK;
+
+    gint attributes_mask = GDK_WA_X | GDK_WA_Y;
+
+    gtk_widget_set_window(widget, gdk_window_new(gtk_widget_get_parent_window(widget), &attributes, attributes_mask));
+    gdk_window_set_user_data(gtk_widget_get_window(widget), widget);
+}
+
+static void gtk_xournal_draw_shadow(GtkXournal* xournal, cairo_t* cr, int left, int top, int width, int height,
+                                    bool selected) {
+    if (selected) {
+        Shadow::drawShadow(cr, left - 2, top - 2, width + 4, height + 4);
+
+        Settings* settings = xournal->view->getControl()->getSettings();
+
+        // Draw border
+        Util::cairo_set_source_rgbi(cr, settings->getBorderColor());
+        cairo_set_line_width(cr, 2.0);
+        cairo_set_line_cap(cr, CAIRO_LINE_CAP_SQUARE);
+        cairo_set_line_join(cr, CAIRO_LINE_JOIN_MITER);
+
+        cairo_rectangle(cr, left - 1, top - 1, width + 2, height + 2);
+        cairo_stroke(cr);
+    } else {
+        Shadow::drawShadow(cr, left, top, width, height);
+    }
+}
+
+void gtk_xournal_repaint_area(GtkWidget* widget, int x1, int y1, int x2, int y2) {
+    g_return_if_fail(widget != nullptr);
+    g_return_if_fail(GTK_IS_XOURNAL(widget));
+
+    if (x2 < 0 || y2 < 0) {
+        return;  // outside visible area
+    }
+
+    GtkAllocation alloc = {0};
+    gtk_widget_get_allocation(widget, &alloc);
+
+    if (x1 > alloc.width || y1 > alloc.height) {
+        return;  // outside visible area
+    }
+
+    gtk_widget_queue_draw_area(widget, x1, y1, x2 - x1, y2 - y1);
+}
+
+static auto gtk_xournal_draw(GtkWidget* widget, cairo_t* cr) -> gboolean {
+    g_return_val_if_fail(widget != nullptr, false);
+    g_return_val_if_fail(GTK_IS_XOURNAL(widget), false);
+
+
+#ifdef DEBUG_DRAW_WIDGET
+    {
+        double x1 = NAN, x2 = NAN, y1 = NAN, y2 = NAN;
+        cairo_clip_extents(cr, &x1, &y1, &x2, &y2);
+        printf("$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$\n\n"
+               "      DRAW  %d x %d + (%d ; %d)\n\n"
+               "$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$&&&&&&&&&&&&&&&&&&&&&&\n",
+               round_cast<int>(x2 - x1), round_cast<int>(y2 - y1), round_cast<int>(x1), round_cast<int>(y1));
+    }
+#endif
+
+    GtkXournal* xournal = GTK_XOURNAL(widget);
+
+    double x1 = NAN, x2 = NAN, y1 = NAN, y2 = NAN;
+
+    cairo_clip_extents(cr, &x1, &y1, &x2, &y2);
+
+    // Draw background
+    Settings* settings = xournal->view->getControl()->getSettings();
+    Util::cairo_set_source_rgbi(cr, settings->getBackgroundColor());
+    cairo_paint(cr);
+
+    // Add a padding for the shadow of the pages
+    xoj::util::Rectangle<double> clippingRect(x1 - 10, y1 - 10, x2 - x1 + 20, y2 - y1 + 20);
+
+    for (auto&& pv: xournal->view->getViewPages()) {
+        int px = pv->getX();
+        int py = pv->getY();
+        int pw = pv->getDisplayWidth();
+        int ph = pv->getDisplayHeight();
+
+        if (!clippingRect.intersects(pv->getRect())) {
+            continue;
+        }
+
+        gtk_xournal_draw_shadow(xournal, cr, px, py, pw, ph, pv->isSelected());
+
+        cairo_save(cr);
+        cairo_translate(cr, px, py);
+
+        pv->paintPage(cr, nullptr);
+        cairo_restore(cr);
+    }
+
+    if (xournal->selection) {
+        cairo_save(cr);
+        double zoom = xournal->view->getZoom();
+
+        LegacyRedrawable* red = xournal->selection->getView();
+        cairo_translate(cr, red->getX(), red->getY());
+
+        xournal->selection->paint(cr, zoom);
+        cairo_restore(cr);
+    }
+
+    std::optional<Recolor> recolor = settings->getRecolorParameters().recolorizeMainView ?
+                                             std::make_optional(settings->getRecolorParameters().recolor) :
+                                             std::nullopt;
+
+    if (recolor) {
+        recolor->recolorCurrentCairoRegion(cr);
+    }
+
+    return true;
+}
+
+static void gtk_xournal_dispose(GObject* object) {
+    g_return_if_fail(object != nullptr);
+    g_return_if_fail(GTK_IS_XOURNAL(object));
+    GtkXournal* xournal = GTK_XOURNAL(object);
+
+    delete xournal->selection;
+    xournal->selection = nullptr;
+
+    delete xournal->layout;
+    xournal->layout = nullptr;
+
+    delete xournal->input;
+    xournal->input = nullptr;
+
+    G_OBJECT_CLASS(gtk_xournal_parent_class)->dispose(object);
+}
diff --git a/entry/src/main/cpp/src/core/gui/widgets/XournalWidget.h b/entry/src/main/cpp/src/core/gui/widgets/XournalWidget.h
new file mode 100644
index 0000000..0644d8a
--- /dev/null
+++ b/entry/src/main/cpp/src/core/gui/widgets/XournalWidget.h
@@ -0,0 +1,88 @@
+/*
+ * Xournal++
+ *
+ * Xournal widget which is the "View" widget
+ *
+ * @author Xournal++ Team
+ * https://github.com/xournalpp/xournalpp
+ *
+ * @license GNU GPLv2 or later
+ */
+
+#pragma once
+
+#include <memory>  // for unique_ptr
+
+#include <glib-object.h>  // for G_TYPE_CHECK_INSTANCE_CAST, G_TYPE_C...
+#include <glib.h>         // for G_BEGIN_DECLS, G_END_DECLS
+#include <gtk/gtk.h>      // for GtkWidget, GtkWidgetClass
+
+namespace xoj::util {
+template <class T>
+class Rectangle;
+}  // namespace xoj::util
+struct _GtkXournal;
+struct _GtkXournalClass;
+
+G_BEGIN_DECLS
+
+#define GTK_XOURNAL(obj) G_TYPE_CHECK_INSTANCE_CAST(obj, gtk_xournal_get_type(), GtkXournal)
+#define GTK_XOURNAL_CLASS(klass) GTK_CHECK_CLASS_CAST(klass, gtk_xournal_get_type(), GtkXournalClass)
+#define GTK_IS_XOURNAL(obj) G_TYPE_CHECK_INSTANCE_TYPE(obj, gtk_xournal_get_type())
+
+class EditSelection;
+class Layout;
+class XojPageView;
+class ScrollHandling;
+class XournalView;
+class InputContext;
+
+
+typedef struct _GtkXournal GtkXournal;
+typedef struct _GtkXournalClass GtkXournalClass;
+
+struct _GtkXournal {
+    GtkWidget widget;
+
+    /**
+     * The view class
+     */
+    XournalView* view;
+
+    /**
+     * Scrollbars
+     */
+    ScrollHandling* scrollHandling;
+
+
+    Layout* layout;
+
+
+    /**
+     * Selected content, if any
+     */
+    EditSelection* selection;
+
+    /**
+     * Input handling
+     */
+    InputContext* input = nullptr;
+};
+
+struct _GtkXournalClass {
+    GtkWidgetClass parent_class;
+};
+
+GType gtk_xournal_get_type();
+
+GtkWidget* gtk_xournal_new(XournalView* view, InputContext* inputContext);
+
+Layout* gtk_xournal_get_layout(GtkWidget* widget);
+
+void gtk_xournal_scroll_relative(GtkWidget* widget, double x, double y);
+
+void gtk_xournal_repaint_area(GtkWidget* widget, int x1, int y1, int x2, int y2);
+
+xoj::util::Rectangle<double>* gtk_xournal_get_visible_area(GtkWidget* widget, const XojPageView* p);
+
+G_END_DECLS
diff --git a/entry/src/main/cpp/src/core/gui/widgets/ZoomCallib.cpp b/entry/src/main/cpp/src/core/gui/widgets/ZoomCallib.cpp
new file mode 100644
index 0000000..a9cafad
--- /dev/null
+++ b/entry/src/main/cpp/src/core/gui/widgets/ZoomCallib.cpp
@@ -0,0 +1,155 @@
+/*
+ * Xournal++
+ *
+ * Control to callibrate the zoom to fit the display DPI
+ *
+ * @author Xournal Team
+ * http://xournal.sf.net
+ *
+ * @license GPL
+ */
+#include "ZoomCallib.h"
+
+#include <cairo.h>    // for cairo_set_source_rgb, cairo_fill, cairo_move_to
+#include <gdk/gdk.h>  // for GdkWindowAttr, gdk_window_move_resize, gdk_wind...
+
+G_DEFINE_TYPE(ZoomCallib, zoomcallib, GTK_TYPE_WIDGET);
+
+static void zoomcallib_get_preferred_width(GtkWidget* widget, gint* minimal_width, gint* natural_width);
+static void zoomcallib_get_preferred_height(GtkWidget* widget, gint* minimal_height, gint* natural_height);
+
+static void zoomcallib_size_allocate(GtkWidget* widget, GtkAllocation* allocation);
+static void zoomcallib_realize(GtkWidget* widget);
+static auto zoomcallib_draw(GtkWidget* widget, cairo_t* cr) -> gboolean;
+
+void zoomcallib_set_val(ZoomCallib* callib, gint val) {
+    callib->val = val;
+
+    if (gtk_widget_is_drawable(GTK_WIDGET(callib))) {
+        gtk_widget_queue_draw(GTK_WIDGET(callib));
+    }
+}
+
+auto zoomcallib_new() -> GtkWidget* { return GTK_WIDGET(g_object_new(zoomcallib_get_type(), nullptr)); }
+
+static void zoomcallib_class_init(ZoomCallibClass* klass) {
+    GtkWidgetClass* widget_class = nullptr;
+
+    widget_class = reinterpret_cast<GtkWidgetClass*>(klass);
+
+    widget_class->realize = zoomcallib_realize;
+    widget_class->size_allocate = zoomcallib_size_allocate;
+
+    widget_class->draw = zoomcallib_draw;
+    widget_class->get_preferred_width = zoomcallib_get_preferred_width;
+    widget_class->get_preferred_height = zoomcallib_get_preferred_height;
+}
+
+static void zoomcallib_init(ZoomCallib* zc) { zc->val = 72; }
+
+static void zoomcallib_get_preferred_width(GtkWidget* widget, gint* minimal_width, gint* natural_width) {
+    *minimal_width = *natural_width = 200;
+}
+
+static void zoomcallib_get_preferred_height(GtkWidget* widget, gint* minimal_height, gint* natural_height) {
+    *minimal_height = *natural_height = 75;
+}
+
+static void zoomcallib_size_allocate(GtkWidget* widget, GtkAllocation* allocation) {
+    g_return_if_fail(widget != nullptr);
+    g_return_if_fail(IS_ZOOM_CALLIB(widget));
+    g_return_if_fail(allocation != nullptr);
+
+    gtk_widget_set_allocation(widget, allocation);
+
+    if (gtk_widget_get_realized(widget)) {
+        gdk_window_move_resize(gtk_widget_get_window(widget), allocation->x, allocation->y, allocation->width,
+                               allocation->height);
+    }
+}
+
+static void zoomcallib_realize(GtkWidget* widget) {
+    GdkWindowAttr attributes;
+    GtkAllocation allocation;
+
+    g_return_if_fail(widget != nullptr);
+    g_return_if_fail(IS_ZOOM_CALLIB(widget));
+
+    gtk_widget_set_realized(widget, true);
+
+    attributes.window_type = GDK_WINDOW_CHILD;
+
+    gtk_widget_get_allocation(widget, &allocation);
+
+    attributes.x = allocation.x;
+    attributes.y = allocation.y;
+    attributes.width = allocation.width;
+    attributes.height = allocation.height;
+
+    attributes.wclass = GDK_INPUT_OUTPUT;
+    attributes.event_mask = gtk_widget_get_events(widget) | GDK_EXPOSURE_MASK;
+
+    gint attributes_mask = GDK_WA_X | GDK_WA_Y;
+
+    gtk_widget_set_window(widget, gdk_window_new(gtk_widget_get_parent_window(widget), &attributes, attributes_mask));
+
+    gdk_window_set_user_data(gtk_widget_get_window(widget), widget);
+}
+
+static auto zoomcallib_draw(GtkWidget* widget, cairo_t* cr) -> gboolean {
+    if (!IS_ZOOM_CALLIB(widget)) {
+        g_message("zoomcallib_draw without a ZoomCallib");
+    }
+
+    cairo_text_extents_t extents;
+    GtkAllocation allocation;
+
+    cairo_set_source_rgb(cr, 1, 1, 1);
+    cairo_paint(cr);
+
+    gtk_widget_get_allocation(widget, &allocation);
+
+    gdouble hafCm = (ZOOM_CALLIB(widget)->val / 2.54) / 2;
+
+    int h = allocation.height;
+    int height = 50;
+    if (h < height) {
+        height = allocation.height - 10;
+    }
+
+
+    cairo_select_font_face(cr, "Serif", CAIRO_FONT_SLANT_NORMAL, CAIRO_FONT_WEIGHT_BOLD);
+    cairo_set_font_size(cr, 13);
+
+    auto cx = [x_base = 2, hafCm](int i) { return x_base + i * hafCm; };
+    for (int i = 0; cx(i) < allocation.width; ++i) {
+        gdouble x = cx(i);
+
+        int y = 0;
+        if (i % 2 == 0) {
+            cairo_set_source_rgb(cr, 0, 0, 0);
+            y = height - 3;
+        } else {
+            cairo_set_source_rgb(cr, 0.5, 0.5, 0.5);
+            y = height - 17;
+        }
+
+        cairo_rectangle(cr, x, 2 + h - y, 1, y);
+
+        cairo_fill(cr);
+
+        if (i % 2 == 0 && i != 0 && x < allocation.width - 20) {
+            cairo_set_source_rgb(cr, 0, 0, 0);
+
+            char* txt = g_strdup_printf("%i", i / 2);
+            cairo_text_extents(cr, txt, &extents);
+
+            cairo_move_to(cr, x - extents.width / 2, h - y - 3);
+
+            cairo_show_text(cr, txt);
+            g_free(txt);
+        }
+    }
+
+    return true;
+}
diff --git a/entry/src/main/cpp/src/core/gui/widgets/ZoomCallib.h b/entry/src/main/cpp/src/core/gui/widgets/ZoomCallib.h
new file mode 100644
index 0000000..4d5729c
--- /dev/null
+++ b/entry/src/main/cpp/src/core/gui/widgets/ZoomCallib.h
@@ -0,0 +1,43 @@
+/*
+ * Xournal++
+ *
+ * Control to callibrate the zoom to fit the display DPI
+ *
+ * @author Xournal Team
+ * http://xournal.sf.net
+ *
+ * @license GPL
+ */
+#pragma once
+
+#include <glib-object.h>  // for G_TYPE_CHECK_INSTANCE_TYPE, G_TYPE_CHECK_IN...
+#include <glib.h>         // for gint, G_BEGIN_DECLS, G_END_DECLS
+#include <gtk/gtk.h>      // for GtkWidget, GtkWidgetClass
+
+struct _ZoomCallib;
+struct _ZoomCallibClass;
+
+G_BEGIN_DECLS
+
+#define ZOOM_CALLIB(obj) G_TYPE_CHECK_INSTANCE_CAST(obj, zoomcallib_get_type(), ZoomCallib)
+#define ZOOM_CALLIB_CLASS(klass) GTK_CHECK_CLASS_CAST(klass, zoomcallib_get_type(), ZoomCallibClass)
+#define IS_ZOOM_CALLIB(obj) G_TYPE_CHECK_INSTANCE_TYPE(obj, zoomcallib_get_type())
+
+typedef struct _ZoomCallib ZoomCallib;
+typedef struct _ZoomCallibClass ZoomCallibClass;
+
+struct _ZoomCallib {
+    GtkWidget widget;
+
+    gint val;
+};
+
+struct _ZoomCallibClass {
+    GtkWidgetClass parent_class;
+};
+
+GType zoomcallib_get_type(void);
+void zoomcallib_set_val(ZoomCallib* callib, gint val);
+GtkWidget* zoomcallib_new();
+
+G_END_DECLS
diff --git a/entry/src/main/cpp/src/core/model/AudioElement.cpp b/entry/src/main/cpp/src/core/model/AudioElement.cpp
new file mode 100644
index 0000000..5e0f8d2
--- /dev/null
+++ b/entry/src/main/cpp/src/core/model/AudioElement.cpp
@@ -0,0 +1,48 @@
+#include "AudioElement.h"
+
+#include <utility>  // for move
+
+#include "model/Element.h"                        // for Element, ElementType
+#include "util/StringUtils.h"                     // for char_cast
+#include "util/serializing/ObjectInputStream.h"   // for ObjectInputStream
+#include "util/serializing/ObjectOutputStream.h"  // for ObjectOutputStream
+#include "util/utf8_view.h"
+
+AudioElement::AudioElement(ElementType type): Element(type) {}
+
+AudioElement::~AudioElement() { this->timestamp = 0; }
+
+void AudioElement::setAudioFilename(fs::path fn) { this->audioFilename = std::move(fn); }
+
+auto AudioElement::getAudioFilename() const -> fs::path const& { return this->audioFilename; }
+
+void AudioElement::setTimestamp(size_t timestamp) { this->timestamp = timestamp; }
+
+auto AudioElement::getTimestamp() const -> size_t { return this->timestamp; }
+
+void AudioElement::serialize(ObjectOutputStream& out) const {
+    out.writeObject("AudioElement");
+
+    this->Element::serialize(out);
+
+    out.writeString(char_cast(this->audioFilename.u8string()));
+    out.writeSizeT(this->timestamp);
+
+    out.endObject();
+}
+
+void AudioElement::readSerialized(ObjectInputStream& in) {
+    in.readObject("AudioElement");
+
+    this->Element::readSerialized(in);
+
+    this->audioFilename = fs::path(xoj::util::utf8(in.readString()));
+    this->timestamp = in.readSizeT();
+
+    in.endObject();
+}
+
+void AudioElement::cloneAudioData(const AudioElement* other) {
+    setAudioFilename(other->getAudioFilename());
+    setTimestamp(other->getTimestamp());
+}
diff --git a/entry/src/main/cpp/src/core/model/AudioElement.h b/entry/src/main/cpp/src/core/model/AudioElement.h
new file mode 100644
index 0000000..e9d71a9
--- /dev/null
+++ b/entry/src/main/cpp/src/core/model/AudioElement.h
@@ -0,0 +1,46 @@
+/*
+ * Xournal++
+ *
+ * Element that is audio enabled
+ *
+ * @author Xournal++ Team
+ * https://github.com/xournalpp/xournalpp
+ *
+ * @license GNU GPLv2 or later
+ */
+
+#pragma once
+
+#include <cstddef>  // for size_t
+
+#include "Element.h"     // for Element, ElementType
+#include "filesystem.h"  // for path
+
+class ObjectInputStream;
+class ObjectOutputStream;
+
+
+class AudioElement: public Element {
+protected:
+    AudioElement(ElementType type);
+
+public:
+    ~AudioElement() override;
+
+    void setTimestamp(size_t timestamp);
+    size_t getTimestamp() const;
+
+    void setAudioFilename(fs::path fn);
+    auto getAudioFilename() const -> fs::path const&;
+
+protected:
+    void serialize(ObjectOutputStream& out) const override;
+    void readSerialized(ObjectInputStream& in) override;
+
+    void cloneAudioData(const AudioElement* other);
+
+private:
+    // Stroke timestamp, to match it to the audio stream
+    size_t timestamp = 0;
+    fs::path audioFilename{};
+};
diff --git a/entry/src/main/cpp/src/core/model/BackgroundConfig.cpp b/entry/src/main/cpp/src/core/model/BackgroundConfig.cpp
new file mode 100644
index 0000000..2a13ae6
--- /dev/null
+++ b/entry/src/main/cpp/src/core/model/BackgroundConfig.cpp
@@ -0,0 +1,67 @@
+#include "BackgroundConfig.h"
+
+#include <cstddef>  // for size_t
+#include <sstream>  // for istringstream, basic_ios::imbue, basi...
+#include <utility>  // for pair
+#include <vector>   // for vector
+
+#include "util/StringUtils.h"   // for StringUtils
+#include "util/serdesstream.h"  // for serdes_stream
+
+using std::string;
+
+BackgroundConfig::BackgroundConfig(const string& config) {
+    for (const string& s: StringUtils::split(config, ',')) {
+        size_t dotPos = s.find_last_of('=');
+        if (dotPos != string::npos) {
+            string key = s.substr(0, dotPos);
+            string value = s.substr(dotPos + 1);
+            data[key] = value;
+        }
+    }
+}
+
+BackgroundConfig::~BackgroundConfig() = default;
+
+auto BackgroundConfig::loadValue(const string& key, string& value) const -> bool {
+    auto it = data.find(key);
+    if (it != this->data.end()) {
+        value = it->second;
+        return true;
+    }
+
+    return false;
+}
+
+auto BackgroundConfig::loadValue(const string& key, int& value) const -> bool {
+    string str;
+    if (loadValue(key, str)) {
+        auto valueStream = serdes_stream<std::istringstream>(str);
+        valueStream >> value;
+        return true;
+    }
+
+    return false;
+}
+
+auto BackgroundConfig::loadValue(const string& key, double& value) const -> bool {
+    string str;
+    if (loadValue(key, str)) {
+        auto valueStream = serdes_stream<std::istringstream>(str);
+        valueStream >> value;
+        return true;
+    }
+
+    return false;
+}
+
+auto BackgroundConfig::loadValueHex(const string& key, uint32_t& value) const -> bool {
+    string str;
+    if (loadValue(key, str)) {
+        auto valueStream = serdes_stream<std::istringstream>(str);
+        valueStream >> std::hex >> value;
+        return true;
+    }
+
+    return false;
+}
diff --git a/entry/src/main/cpp/src/core/model/BackgroundConfig.h b/entry/src/main/cpp/src/core/model/BackgroundConfig.h
new file mode 100644
index 0000000..af346e8
--- /dev/null
+++ b/entry/src/main/cpp/src/core/model/BackgroundConfig.h
@@ -0,0 +1,47 @@
+/*
+ * Xournal++
+ *
+ * Configuration data for generated backgrounds
+ *
+ * @author Xournal++ Team
+ * https://github.com/xournalpp/xournalpp
+ *
+ * @license GNU GPLv2 or later
+ */
+
+#pragma once
+
+#include <cstdint>    // for uint32_t
+#include <map>        // for map
+#include <string>     // for string
+
+
+// This class corresponds to the config line of entries in pagetemplate.ini
+class BackgroundConfig {
+public:
+    BackgroundConfig(const std::string& config);
+    virtual ~BackgroundConfig();
+
+public:
+    bool loadValue(const std::string& key, std::string& value) const;
+    bool loadValue(const std::string& key, int& value) const;
+    bool loadValue(const std::string& key, double& value) const;
+    bool loadValueHex(const std::string& key, uint32_t& value) const;
+
+private:
+    std::map<std::string, std::string> data;
+};
+
+namespace background_config_strings {
+// Those strings are used in the pagetemplate.ini configuration file
+constexpr static char CFG_FOREGROUND_COLOR_1[] = "f1";
+constexpr static char CFG_ALT_FOREGROUND_COLOR_1[] = "af1";
+constexpr static char CFG_FOREGROUND_COLOR_2[] = "f2";
+constexpr static char CFG_ALT_FOREGROUND_COLOR_2[] = "af2";
+constexpr static char CFG_LINE_WIDTH[] = "lw";
+constexpr static char CFG_MARGIN[] = "m1";
+constexpr static char CFG_ROUND_MARGIN[] = "rm";
+constexpr static char CFG_RASTER[] = "r1";
+constexpr static char CFG_BOLD_LINE_INTERVAL[] = "bli";
+constexpr static char CFG_BOLD_LINE_WIDTH[] = "blw";
+}  // namespace background_config_strings
diff --git a/entry/src/main/cpp/src/core/model/BackgroundImage.cpp b/entry/src/main/cpp/src/core/model/BackgroundImage.cpp
new file mode 100644
index 0000000..d43dc77
--- /dev/null
+++ b/entry/src/main/cpp/src/core/model/BackgroundImage.cpp
@@ -0,0 +1,87 @@
+#include "BackgroundImage.h"
+
+#include <string>   // for string
+#include <utility>  // for move
+
+#include <glib-object.h>  // for g_object_unref
+
+#include "util/Stacktrace.h"  // for Stacktrace
+#include "util/StringUtils.h"
+
+/*
+ * The contents of a background image
+ *
+ * Internal impl object, dont move this to an external header/source file due this is the best way to reduce code
+ * bloat and increase encapsulation. This object is only used in this source scope and is a RAII Container for the
+ * GdkPixbuf*
+ * No xournal memory leak tests necessary, because we use smart ptrs to ensure memory correctness
+ */
+
+struct BackgroundImage::Content {
+    Content(fs::path path, GError** error):
+            path(std::move(path)), pixbuf(gdk_pixbuf_new_from_file(char_cast(this->path.u8string().c_str()), error)) {}
+
+    Content(GInputStream* stream, fs::path path, GError** error):
+            path(std::move(path)), pixbuf(gdk_pixbuf_new_from_stream(stream, nullptr, error)) {}
+
+    ~Content() {
+        if (this->pixbuf) {
+            g_object_unref(this->pixbuf);
+            this->pixbuf = nullptr;
+        }
+    };
+
+    Content(const Content&) = delete;
+    Content(Content&&) = default;
+    auto operator=(const Content&) -> Content& = delete;
+    auto operator=(Content&&) -> Content& = default;
+
+    fs::path path;
+    GdkPixbuf* pixbuf = nullptr;
+    int pageId = -1;
+    bool attach = false;
+};
+
+void BackgroundImage::free() { this->img.reset(); }
+
+void BackgroundImage::loadFile(fs::path const& path, GError** error) {
+    this->img = std::make_shared<Content>(path, error);
+}
+
+void BackgroundImage::loadFile(GInputStream* stream, fs::path const& path, GError** error) {
+    this->img = std::make_shared<Content>(stream, path, error);
+}
+
+auto BackgroundImage::getCloneId() const -> int { return this->img ? this->img->pageId : -1; }
+
+void BackgroundImage::setCloneId(int id) {
+    if (this->img) {
+        this->img->pageId = id;
+    }
+}
+
+void BackgroundImage::clearSaveState() { this->setCloneId(-1); }
+
+auto BackgroundImage::getFilepath() const -> fs::path { return this->img ? this->img->path : fs::path{}; }
+
+void BackgroundImage::setFilepath(fs::path path) {
+    if (this->img) {
+        this->img->path = std::move(path);
+    }
+}
+
+auto BackgroundImage::isAttached() const -> bool { return this->img ? this->img->attach : false; }
+
+void BackgroundImage::setAttach(bool attach) {
+    if (!this->img) {
+        g_warning("BackgroundImage::setAttach: please load first an image before call setAttach!");
+        Stacktrace::printStacktrace();
+        return;
+    }
+    this->img->attach = attach;
+}
+
+auto BackgroundImage::getPixbuf() -> GdkPixbuf* { return this->img ? this->img->pixbuf : nullptr; }
+auto BackgroundImage::getPixbuf() const -> const GdkPixbuf* { return this->img ? this->img->pixbuf : nullptr; }
+
+auto BackgroundImage::isEmpty() const -> bool { return !this->img; }
diff --git a/entry/src/main/cpp/src/core/model/BackgroundImage.h b/entry/src/main/cpp/src/core/model/BackgroundImage.h
new file mode 100644
index 0000000..ea59ed7
--- /dev/null
+++ b/entry/src/main/cpp/src/core/model/BackgroundImage.h
@@ -0,0 +1,49 @@
+/*
+ * Xournal++
+ *
+ * A background image of a page
+ *
+ * @author Xournal++ Team
+ * https://github.com/xournalpp/xournalpp
+ *
+ * @license GNU GPLv2 or later
+ */
+
+#pragma once
+
+#include <memory>  // for shared_ptr
+
+#include <gdk-pixbuf/gdk-pixbuf.h>  // for GdkPixbuf
+#include <gio/gio.h>                // for GInputStream
+#include <glib.h>                   // for GError
+
+#include "filesystem.h"  // for path
+
+struct BackgroundImage {
+    friend bool operator==(const BackgroundImage& lhs, const BackgroundImage& rhs) = default;
+
+    void free();
+
+    void loadFile(fs::path const& filepath, GError** error);
+    void loadFile(GInputStream* stream, fs::path const& filepath, GError** error);
+
+    int getCloneId() const;
+    void setCloneId(int id);
+    void clearSaveState();
+
+    fs::path getFilepath() const;
+    void setFilepath(fs::path filepath);
+
+    bool isAttached() const;
+    void setAttach(bool attach);
+
+    GdkPixbuf* getPixbuf();
+    const GdkPixbuf* getPixbuf() const;
+
+    bool isEmpty() const;
+
+private:
+    struct Content;
+
+    std::shared_ptr<Content> img;
+};
diff --git a/entry/src/main/cpp/src/core/model/Compass.cpp b/entry/src/main/cpp/src/core/model/Compass.cpp
new file mode 100644
index 0000000..5d5fb29
--- /dev/null
+++ b/entry/src/main/cpp/src/core/model/Compass.cpp
@@ -0,0 +1,44 @@
+#include "Compass.h"
+
+#include <cmath>             // for sin, cos
+#include <initializer_list>  // for initializer_list
+
+#include "gui/inputdevices/CompassInputHandler.h"
+#include "view/CompassView.h"
+
+Compass::Compass(): Compass(INITIAL_HEIGHT, .0, 0., 0.) {}
+
+Compass::Compass(double height, double rotation, double x, double y): GeometryTool(height, rotation, x, y) {
+    this->lastRepaintRange = getToolRange(true);
+}
+
+Compass::~Compass() { viewPool->dispatchAndClear(xoj::view::CompassView::FINALIZATION_REQUEST, lastRepaintRange); }
+
+auto Compass::getToolRange(bool transformed) const -> Range {
+    const auto h = height * CM;
+    Range rg;
+    if (transformed) {
+        rg.addPoint(origin.x - h, origin.y - h);
+        rg.addPoint(origin.x + h, origin.y + h);
+    } else {
+        rg.addPoint(-h, -h);
+        rg.addPoint(h, h);
+    }
+
+    // Padding required to fully render the boundary red lines and last blue digit
+    constexpr double RENDER_PADDING = 2.0;
+
+    rg.addPadding(RENDER_PADDING + .5 * xoj::view::CompassView::LINE_WIDTH_IN_CM * CM);  // account for line width
+    return rg;
+}
+
+void Compass::notify(bool resetMask) const {
+    if (resetMask) {
+        viewPool->dispatch(xoj::view::GeometryToolView::RESET_MASK);
+    }
+
+    viewPool->dispatch(xoj::view::CompassView::UPDATE_VALUES, this->getHeight(), this->getRotation(),
+                       this->getMatrix());
+    Range rg = this->getToolRange(true);
+    viewPool->dispatch(xoj::view::CompassView::FLAG_DIRTY_REGION, this->computeRepaintRange(rg));
+}
diff --git a/entry/src/main/cpp/src/core/model/Compass.h b/entry/src/main/cpp/src/core/model/Compass.h
new file mode 100644
index 0000000..670dca5
--- /dev/null
+++ b/entry/src/main/cpp/src/core/model/Compass.h
@@ -0,0 +1,49 @@
+/*
+ * Xournal++
+ *
+ * A compass model
+ *
+ * @author Xournal++ Team
+ * https://github.com/xournalpp/xournalpp
+ *
+ * @license GNU GPLv2 or later
+ */
+
+#pragma once
+
+#include "model/GeometryTool.h"
+
+/**
+ * @brief A class that models a compass
+ *
+ * The compass has the shape of a circle and has a certain height (radius), may be rotated and
+ * translated. User coordinates are specified in cm.
+ */
+
+namespace xoj::view {
+class CompassView;
+};
+
+class CompassInputHandler;
+
+class Compass: public GeometryTool {
+public:
+    Compass();
+
+    /**
+     * @brief A compass specified by its radius, rotation angle and translations in x- and y-directions
+     * @param height the radius of the compass
+     * @param rotation the angle (in radian) around which the compass is rotated with respect to the x-axis
+     * @param x the x-coordinate (in pt) of the center of the compass
+     * @param y the y-coordinate (in pt) of the center of the compass
+     */
+    Compass(double height, double rotation, double x, double y);
+
+    virtual ~Compass();
+
+    void notify(bool resetMask) const override;  // calls the update method of all observers
+    Range getToolRange(bool transformed) const override;
+
+    // parameters used when initially displaying the compass on a page
+    static constexpr double INITIAL_HEIGHT = 3.0;
+};
diff --git a/entry/src/main/cpp/src/core/model/Document.cpp b/entry/src/main/cpp/src/core/model/Document.cpp
new file mode 100644
index 0000000..8631c96
--- /dev/null
+++ b/entry/src/main/cpp/src/core/model/Document.cpp
@@ -0,0 +1,472 @@
+#include "Document.h"
+
+#include <codecvt>  // for codecvt_utf8_utf16
+#include <cstddef>
+#include <ctime>  // for size_t, localtime, strf...
+#include <iomanip>
+#include <memory>
+#include <sstream>
+#include <string>  // for string
+#include <string_view>
+#include <utility>  // for move, pair
+
+#include <glib-object.h>  // for g_object_unref, G_TYPE_...
+
+#include "model/DocumentChangeType.h"         // for DOCUMENT_CHANGE_CLEARED
+#include "model/DocumentHandler.h"            // for DocumentHandler
+#include "model/PageRef.h"                    // for PageRef
+#include "model/PageType.h"                   // for PageType
+#include "pdf/base/XojPdfAction.h"            // for XojPdfAction
+#include "pdf/base/XojPdfBookmarkIterator.h"  // for XojPdfBookmarkIterator
+#include "util/Assert.h"                      // for xoj_assert
+#include "util/PathUtil.h"                    // for clearExtensions
+#include "util/PlaceholderString.h"           // for PlaceholderString
+#include "util/SaveNameUtils.h"               // for parseFilename
+#include "util/Util.h"                        // for npos
+#include "util/glib_casts.h"                  // for wrap_v
+#include "util/i18n.h"                        // for FS, _F
+#include "util/raii/GObjectSPtr.h"            // for GObjectSPtr
+#include "util/safe_casts.h"                  // for as_signed
+#include "util/utf8_view.h"                   // for utf8
+
+#include "LinkDestination.h"  // for XojLinkDest, DOCUMENT_L...
+#include "XojPage.h"          // for XojPage
+#include "filesystem.h"       // for path
+
+Document::Document(DocumentHandler* handler): handler(handler) {}
+
+Document::~Document() {
+    clearDocument(true);
+    freeTreeContentModel();
+}
+
+void Document::freeTreeContentModel() {
+    if (this->contentsModel) {
+        gtk_tree_model_foreach(this->contentsModel.get(), xoj::util::wrap_v<freeTreeContentEntry>, this);
+
+        this->contentsModel.reset();
+    }
+}
+
+auto Document::freeTreeContentEntry(GtkTreeModel* treeModel, GtkTreePath* path, GtkTreeIter* iter, Document* doc)
+        -> bool {
+    XojLinkDest* link = nullptr;
+    gtk_tree_model_get(treeModel, iter, DOCUMENT_LINKS_COLUMN_LINK, &link, -1);
+
+    if (link == nullptr) {
+        return false;
+    }
+
+    // The dispose function of XojLinkDest is not called, this workaround fixes the Memory Leak
+    delete link->dest;
+    link->dest = nullptr;
+
+    return false;
+}
+
+void Document::lock() { this->documentLock.lock(); }
+void Document::unlock() { this->documentLock.unlock(); }
+auto Document::try_lock() -> bool { return this->documentLock.try_lock(); }
+void Document::lock_shared() { this->documentLock.lock_shared(); }
+void Document::unlock_shared() { this->documentLock.unlock_shared(); }
+auto Document::try_lock_shared() -> bool { return this->documentLock.try_lock_shared(); }
+
+void Document::clearDocument(bool destroy) {
+    this->preview.reset();
+
+    if (!destroy) {
+        // release lock
+        bool lastLock = try_lock();
+        unlock();
+        this->handler->fireDocumentChanged(DOCUMENT_CHANGE_CLEARED);
+        if (!lastLock)  // document was locked before
+        {
+            lock();
+        }
+    }
+
+    this->pages.clear();
+    this->pageIndex.reset();
+    freeTreeContentModel();
+
+    this->filepath = fs::path{};
+    this->pdfFilepath = fs::path{};
+}
+
+/**
+ * Returns the pageCount, this call don't need to be synchronized (if it's not critical, you may get wrong data)
+ */
+auto Document::getPageCount() const -> size_t { return this->pages.size(); }
+
+auto Document::getPdfPageCount() const -> size_t { return pdfDocument.getPageCount(); }
+
+void Document::setFilepath(fs::path filepath) { this->filepath = std::move(filepath); }
+
+auto Document::getFilepath() const -> fs::path { return filepath; }
+
+auto Document::getPdfFilepath() const -> fs::path { return pdfFilepath; }
+
+auto Document::createSaveFoldername(const fs::path& lastSavePath) const -> fs::path {
+    if (!filepath.empty()) {
+        return filepath.parent_path();
+    }
+    if (!pdfFilepath.empty()) {
+        return pdfFilepath.parent_path();
+    }
+
+
+    return lastSavePath;
+}
+
+/**
+ * Preprocesses a format string to standardize date/time format specifiers.
+ *
+ * This function is necessary because different systems or libraries may use
+ * non-standard or shorthand format specifiers (e.g., %F, %T, %V) for date/time formatting.
+ * By converting these to widely supported specifiers (e.g., %Y-%m-%d, %H-%M-%S, %U),
+ * it ensures compatibility and consistency across platforms and libraries.
+ *
+ * @param formatStr The input format string to preprocess.
+ * @return The processed format string with standardized specifiers.
+ */
+static std::u8string preprocessFormatString(std::u8string formatStr) {
+    auto replace = [&formatStr](std::u8string_view pattern, std::u8string_view replacement) {
+        for (size_t pos = formatStr.find(pattern); pos != std::string::npos;
+             pos = formatStr.find(pattern, pos + replacement.length())) {
+            formatStr.replace(pos, pattern.length(), replacement);
+        }
+    };
+
+    replace(u8"%F", u8"%Y-%m-%d");
+    replace(u8"%T", u8"%H-%M-%S");
+    replace(u8"%V", u8"%U");
+
+    return formatStr;
+}
+
+auto Document::createSaveFilename(DocumentType type, std::u8string_view defaultSaveName,
+                                  std::u8string_view defaultPdfName) const -> fs::path {
+    constexpr static std::wstring_view forbiddenChars = {L"\\/:*?\"<>|"};
+    std::u8string wildcardString;
+    if (type != Document::PDF) {
+        if (!filepath.empty()) {
+            // This can be any extension
+            fs::path p = filepath.filename();
+            Util::clearExtensions(p);
+            return p;
+        }
+        if (!pdfFilepath.empty()) {
+            fs::path p = pdfFilepath.filename();
+            Util::clearExtensions(p, ".pdf");
+            return p;
+        }
+    } else if (!pdfFilepath.empty()) {
+        wildcardString = SaveNameUtils::parseFilenameFromWildcardString(defaultPdfName, this->pdfFilepath.filename(),
+                                                                        this->filepath.filename());
+    } else if (!filepath.empty()) {
+        wildcardString = SaveNameUtils::parseFilenameFromWildcardString(defaultPdfName, this->filepath.filename(),
+                                                                        this->filepath.filename());
+    }
+
+    auto format_str = preprocessFormatString(wildcardString.empty() ? defaultSaveName.data() : wildcardString);
+
+    std::wstring_convert<std::codecvt_utf8<wchar_t>> converter;
+    auto format = converter.from_bytes(char_cast(format_str).data());
+
+    // Todo (cpp20): use <format>
+    std::wostringstream ss;
+    time_t curtime = time(nullptr);
+    ss << std::put_time(localtime(&curtime), format.c_str());
+    auto filename = ss.str();
+    // Todo (cpp20): use <ranges>
+    for (auto& c: filename) {
+        if ((c < 32 && c > 0) || c == 127 || forbiddenChars.find(c) != std::string::npos) {
+            c = '_';
+        }
+    }
+
+    auto fn2 = converter.to_bytes(filename);
+    auto p = fs::path(xoj::util::utf8(fn2));
+
+    Util::clearExtensions(p);
+    return p;
+}
+
+auto Document::getPreview() const -> xoj::util::CairoSurfaceSPtr { return this->preview; }
+
+void Document::setPreview(xoj::util::CairoSurfaceSPtr preview) { this->preview = std::move(preview); }
+
+auto Document::getEvMetadataFilename() const -> fs::path {
+    if (!this->filepath.empty()) {
+        return this->filepath;
+    }
+    if (!this->pdfFilepath.empty()) {
+        return this->pdfFilepath;
+    }
+    return fs::path{};
+}
+
+auto Document::isAttachPdf() const -> bool { return this->attachPdf; }
+
+auto Document::findPdfPage(size_t pdfPage) const -> size_t {
+    // Create a page index if not already indexed.
+    xoj_assert(this->pageIndex);
+    auto pos = this->pageIndex->find(pdfPage);
+    if (pos == this->pageIndex->end()) {
+        return npos;
+    } else {
+        return pos->second;
+    }
+}
+
+void Document::buildTreeContentsModel(GtkTreeIter* parent, XojPdfBookmarkIterator* iter) {
+    do {
+        GtkTreeIter treeIter = {0};
+
+        XojPdfAction* action = iter->getAction();
+        LinkDestination* dest = new LinkDestination(*action->getDestination());
+        XojLinkDest* link = link_dest_new();
+        link->dest = dest;
+
+        if (action->getTitle().empty()) {
+            g_object_unref(link);
+            delete action;
+            continue;
+        }
+
+        link->dest->setExpand(iter->isOpen());
+
+        gtk_tree_store_append(GTK_TREE_STORE(contentsModel.get()), &treeIter, parent);
+        char* titleMarkup = g_markup_escape_text(action->getTitle().c_str(), -1);
+
+        gtk_tree_store_set(GTK_TREE_STORE(contentsModel.get()), &treeIter, DOCUMENT_LINKS_COLUMN_NAME, titleMarkup,
+                           DOCUMENT_LINKS_COLUMN_LINK, link, DOCUMENT_LINKS_COLUMN_PAGE_NUMBER, "", -1);
+
+        g_free(titleMarkup);
+        g_object_unref(link);
+
+        XojPdfBookmarkIterator* child = iter->getChildIter();
+        if (child) {
+            buildTreeContentsModel(&treeIter, child);
+            delete child;
+        }
+
+        delete action;
+
+    } while (iter->next());
+}
+
+void Document::indexPdfPages() {
+    auto index = std::make_unique<PageIndex>();
+    for (size_t i = 0; i < this->pages.size(); ++i) {
+        const auto& p = this->pages[i];
+        if (p->getBackgroundType().isPdfPage()) {
+            index->emplace(p->getPdfPageNr(), i);
+        }
+    }
+    this->pageIndex.swap(index);
+}
+
+
+void Document::buildContentsModel() {
+    freeTreeContentModel();
+
+    XojPdfBookmarkIterator* iter = pdfDocument.getContentsIter();
+    if (iter == nullptr) {
+        // No Bookmarks
+        return;
+    }
+
+    this->contentsModel.reset(reinterpret_cast<GtkTreeModel*>(gtk_tree_store_new(4, G_TYPE_STRING, G_TYPE_OBJECT,
+                                                                                 G_TYPE_BOOLEAN, G_TYPE_STRING)),
+                              xoj::util::adopt);
+    buildTreeContentsModel(nullptr, iter);
+    delete iter;
+}
+
+auto Document::getContentsModel() const -> GtkTreeModel* { return this->contentsModel.get(); }
+
+auto Document::fillPageLabels(GtkTreeModel* treeModel, GtkTreePath* path, GtkTreeIter* iter, Document* doc) -> bool {
+    XojLinkDest* link = nullptr;
+    gtk_tree_model_get(treeModel, iter, DOCUMENT_LINKS_COLUMN_LINK, &link, -1);
+
+    if (link == nullptr) {
+        return false;
+    }
+
+    auto page = doc->findPdfPage(link->dest->getPdfPage());
+
+    gchar* pageLabel = nullptr;
+    if (page != npos) {
+        pageLabel = g_strdup_printf("%zu", page + 1);
+    }
+    gtk_tree_store_set(GTK_TREE_STORE(treeModel), iter, DOCUMENT_LINKS_COLUMN_PAGE_NUMBER, pageLabel, -1);
+    g_free(pageLabel);
+
+    g_object_unref(link);
+    return false;
+}
+
+void Document::updateIndexPageNumbers() {
+    indexPdfPages();
+    if (this->contentsModel) {
+        gtk_tree_model_foreach(this->contentsModel.get(), xoj::util::wrap_v<fillPageLabels>, this);
+    }
+}
+
+void Document::setPdfAttributes(const fs::path& filename, bool attachToDocument) {
+    this->pdfFilepath = filename;
+    this->attachPdf = attachToDocument;
+}
+
+auto Document::readPdf(const fs::path& filename, bool initPages, bool attachToDocument,
+                       std::unique_ptr<std::string> data) -> bool {
+    GError* popplerError = nullptr;
+
+    lock();
+
+    if (data != nullptr) {
+        if (!pdfDocument.load(std::move(data), password, &popplerError)) {
+            lastError = FS(_F("Document not loaded! ({1}), {2}") % filename.u8string() % popplerError->message);
+            g_error_free(popplerError);
+            unlock();
+
+            return false;
+        }
+    } else {
+        if (!pdfDocument.load(filename, password, &popplerError)) {
+            if (popplerError) {
+                lastError = FS(_F("Document not loaded! ({1}), {2}") % filename.u8string() % popplerError->message);
+                g_error_free(popplerError);
+            } else {
+                lastError = FS(_F("Document not loaded! ({1}), {2}") % filename.u8string() % "");
+            }
+            unlock();
+            return false;
+        }
+    }
+
+    this->pdfFilepath = filename;
+    this->attachPdf = attachToDocument;
+    lastError = "";
+
+    if (initPages) {
+        this->pages.clear();
+    }
+
+    if (initPages) {
+        for (size_t i = 0; i < pdfDocument.getPageCount(); i++) {
+            XojPdfPageSPtr page = pdfDocument.getPage(i);
+            auto p = std::make_shared<XojPage>(page->getWidth(), page->getHeight());
+            p->setBackgroundPdfPageNr(i);
+            this->pages.emplace_back(std::move(p));
+        }
+    }
+
+    indexPdfPages();
+    buildContentsModel();
+    updateIndexPageNumbers();
+
+    unlock();
+
+    this->handler->fireDocumentChanged(DOCUMENT_CHANGE_PDF_BOOKMARKS);
+
+    return true;
+}
+
+void Document::resetPdf() { pdfDocument.reset(); }
+
+void Document::setPageSize(PageRef p, double width, double height) { p->setSize(width, height); }
+
+auto Document::getPageWidth(PageRef p) -> double { return p->getWidth(); }
+
+auto Document::getPageHeight(PageRef p) -> double { return p->getHeight(); }
+
+/**
+ * @return The last error message to show to the user
+ */
+auto Document::getLastErrorMsg() const -> std::string { return lastError; }
+
+void Document::deletePage(size_t pNr) {
+    auto it = this->pages.begin() + as_signed(pNr);
+    this->pages.erase(it);
+
+    // Reset the page index
+    this->pageIndex.reset();
+    updateIndexPageNumbers();
+}
+
+void Document::insertPage(const PageRef& p, size_t position) {
+    this->pages.insert(this->pages.begin() + as_signed(position), p);
+
+    // Reset the page index
+    this->pageIndex.reset();
+    updateIndexPageNumbers();
+}
+
+void Document::addPage(const PageRef& p) {
+    this->pages.push_back(p);
+
+    // Reset the page index
+    this->pageIndex.reset();
+    updateIndexPageNumbers();
+}
+
+auto Document::indexOf(const PageRef& page) -> size_t {
+    for (size_t i = 0; i < this->pages.size(); i++) {
+        PageRef pg = this->pages[i];
+        if (pg == page) {
+            return i;
+        }
+    }
+
+    return npos;
+}
+
+auto Document::getPage(size_t page) const -> PageRef {
+    if (getPageCount() <= page) {
+        return nullptr;
+    }
+    if (page == npos) {
+        return nullptr;
+    }
+
+    return this->pages[page];
+}
+
+auto Document::getPdfPage(size_t page) const -> XojPdfPageSPtr { return this->pdfDocument.getPage(page); }
+
+auto Document::getPdfDocument() const -> const XojPdfDocument& { return this->pdfDocument; }
+
+auto Document::operator=(const Document& doc) -> Document& {
+    clearDocument();
+
+    // Copy PDF Document
+    this->pdfDocument = doc.pdfDocument;
+
+    this->password = doc.password;
+    this->createBackupOnSave = doc.createBackupOnSave;
+    this->pdfFilepath = doc.pdfFilepath;
+    this->filepath = doc.filepath;
+    this->pages = doc.pages;
+    this->attachPdf = doc.attachPdf;
+    this->pathStorageMode = doc.pathStorageMode;
+
+    indexPdfPages();
+    buildContentsModel();
+    updateIndexPageNumbers();
+
+    bool lastLock = try_lock();
+    xoj_assert(!lastLock);
+    unlock();
+    this->handler->fireDocumentChanged(DOCUMENT_CHANGE_COMPLETE);
+    if (!lastLock)  // document was locked before
+    {
+        lock();
+    }
+    return *this;
+}
+
+void Document::setCreateBackupOnSave(bool backup) { this->createBackupOnSave = backup; }
+
+auto Document::shouldCreateBackupOnSave() const -> bool { return this->createBackupOnSave; }
diff --git a/entry/src/main/cpp/src/core/model/Document.h b/entry/src/main/cpp/src/core/model/Document.h
new file mode 100644
index 0000000..864bb95
--- /dev/null
+++ b/entry/src/main/cpp/src/core/model/Document.h
@@ -0,0 +1,184 @@
+/*
+ * Xournal++
+ *
+ * The document
+ *
+ * All methods are unlocked, you need to lock the document before you change something and unlock after.
+ *
+ * @author Xournal++ Team
+ * https://github.com/xournalpp/xournalpp
+ *
+ * @license GNU GPLv2 or later
+ */
+
+#pragma once
+
+#include <cstddef>        // for size_t
+#include <memory>         // for unique_ptr
+#include <shared_mutex>   // for shared_mutex
+#include <string>         // for string
+#include <unordered_map>  // for unordered_map
+#include <vector>         // for vector
+
+#include <cairo.h>    // for cairo_surface_t
+#include <glib.h>     // for gpointer, gsize
+#include <gtk/gtk.h>  // for GtkTreeModel, GtkTreeIter, GtkT...
+
+#include "pdf/base/XojPdfDocument.h"  // for XojPdfDocument
+#include "pdf/base/XojPdfPage.h"      // for XojPdfPageSPtr
+#include "util/PathUtil.h"            // for PathStorageMode
+#include "util/raii/GObjectSPtr.h"    // for GObjectSptr
+
+#include "PageRef.h"     // for PageRef
+#include "filesystem.h"  // for path
+
+class DocumentHandler;
+class XojPdfBookmarkIterator;
+
+class Document {
+public:
+    Document(DocumentHandler* handler);
+    virtual ~Document();
+
+public:
+    enum DocumentType { XOPP, XOJ, PDF };
+
+    void setPdfAttributes(const fs::path& filename, bool attachToDocument);
+    bool readPdf(const fs::path& filename, bool initPages, bool attachToDocument,
+                 std::unique_ptr<std::string> data = {});
+    void resetPdf();
+
+    size_t getPageCount() const;
+    size_t getPdfPageCount() const;
+    XojPdfPageSPtr getPdfPage(size_t page) const;
+    const XojPdfDocument& getPdfDocument() const;
+
+    void insertPage(const PageRef& p, size_t position);
+    void addPage(const PageRef& p);
+    template <class InputIter>
+    void addPages(InputIter first, InputIter last);
+    PageRef getPage(size_t page) const;
+    void deletePage(size_t pNr);
+
+    static void setPageSize(PageRef p, double width, double height);
+    static double getPageWidth(PageRef p);
+    static double getPageHeight(PageRef p);
+
+    size_t indexOf(const PageRef& page);
+
+    /**
+     * @return The last error message to show to the user
+     */
+    std::string getLastErrorMsg() const;
+
+    size_t findPdfPage(size_t pdfPage) const;
+
+    Document& operator=(const Document& doc);
+
+    void setFilepath(fs::path filepath);
+    fs::path getFilepath() const;
+    fs::path getPdfFilepath() const;
+    fs::path createSaveFoldername(const fs::path& lastSavePath) const;
+    fs::path createSaveFilename(DocumentType type, std::u8string_view defaultSaveName,
+                                std::u8string_view defaultPfdName = u8"") const;
+
+    fs::path getEvMetadataFilename() const;
+
+    GtkTreeModel* getContentsModel() const;
+
+    void setCreateBackupOnSave(bool backup);
+    bool shouldCreateBackupOnSave() const;
+
+    void clearDocument(bool destroy = false);
+
+    bool isAttachPdf() const;
+
+    xoj::util::CairoSurfaceSPtr getPreview() const;
+    void setPreview(xoj::util::CairoSurfaceSPtr preview);
+
+    void lock();
+    void unlock();
+    bool try_lock();
+    void lock_shared();
+    void unlock_shared();
+    bool try_lock_shared();
+
+    inline Util::PathStorageMode getPathStorageMode() const { return pathStorageMode; }
+    inline void setPathStorageMode(Util::PathStorageMode m) { pathStorageMode = m; }
+
+private:
+    void buildContentsModel();
+    void freeTreeContentModel();
+    static bool freeTreeContentEntry(GtkTreeModel* treeModel, GtkTreePath* path, GtkTreeIter* iter, Document* doc);
+
+    void buildTreeContentsModel(GtkTreeIter* parent, XojPdfBookmarkIterator* iter);
+    void updateIndexPageNumbers();
+    static bool fillPageLabels(GtkTreeModel* treeModel, GtkTreePath* path, GtkTreeIter* iter, Document* doc);
+
+private:
+    DocumentHandler* handler = nullptr;
+
+    XojPdfDocument pdfDocument;
+
+    fs::path filepath;
+    fs::path pdfFilepath;
+    bool attachPdf = false;
+
+    Util::PathStorageMode pathStorageMode = Util::PathStorageMode::AS_RELATIVE_PATH;
+
+    /**
+     *  Password: not handled yet
+     */
+    std::string password;
+
+    std::string lastError;
+
+    /**
+     * The pages in the document
+     */
+    std::vector<PageRef> pages;
+
+    /**
+     * Index from pdf page number to document page number
+     */
+    using PageIndex = std::unordered_map<size_t, size_t>;
+
+    /**
+     * The cached page index
+     */
+    std::unique_ptr<PageIndex> pageIndex;
+
+    /**
+     * Creates an index from pdf page number to document page number
+     *
+     * Clears the index first in case it is already exists.
+     */
+    void indexPdfPages();
+
+    /**
+     * The bookmark contents model
+     */
+    xoj::util::GObjectSPtr<GtkTreeModel> contentsModel;
+
+    /**
+     *  create a backup before save
+     */
+    bool createBackupOnSave = false;
+
+    /**
+     * The preview for the file
+     */
+    xoj::util::CairoSurfaceSPtr preview;
+
+    /**
+     * The lock of the document
+     */
+    std::shared_mutex documentLock;
+};
+
+template <class InputIter>
+void Document::addPages(InputIter first, InputIter last) {
+    this->pages.insert(this->pages.end(), first, last);
+    this->pageIndex.reset();
+    updateIndexPageNumbers();
+}
diff --git a/entry/src/main/cpp/src/core/model/DocumentChangeType.h b/entry/src/main/cpp/src/core/model/DocumentChangeType.h
new file mode 100644
index 0000000..7f4fb45
--- /dev/null
+++ b/entry/src/main/cpp/src/core/model/DocumentChangeType.h
@@ -0,0 +1,14 @@
+/*
+ * Xournal++
+ *
+ * Enum which type of change is occurred
+ *
+ * @author Xournal++ Team
+ * https://github.com/xournalpp/xournalpp
+ *
+ * @license GNU GPLv2 or later
+ */
+
+#pragma once
+
+enum DocumentChangeType { DOCUMENT_CHANGE_CLEARED, DOCUMENT_CHANGE_COMPLETE, DOCUMENT_CHANGE_PDF_BOOKMARKS };
diff --git a/entry/src/main/cpp/src/core/model/DocumentHandler.cpp b/entry/src/main/cpp/src/core/model/DocumentHandler.cpp
new file mode 100644
index 0000000..80b6069
--- /dev/null
+++ b/entry/src/main/cpp/src/core/model/DocumentHandler.cpp
@@ -0,0 +1,33 @@
+#include "DocumentHandler.h"
+
+#include "model/DocumentChangeType.h"  // for DocumentChangeType
+
+#include "DocumentListener.h"  // for DocumentListener
+
+void DocumentHandler::addListener(DocumentListener* l) { this->listener.push_back(l); }
+
+void DocumentHandler::removeListener(DocumentListener* l) { this->listener.remove(l); }
+
+void DocumentHandler::fireDocumentChanged(DocumentChangeType type) {
+    for (DocumentListener* dl: this->listener) { dl->documentChanged(type); }
+}
+
+void DocumentHandler::firePageSizeChanged(size_t page) {
+    for (DocumentListener* dl: this->listener) { dl->pageSizeChanged(page); }
+}
+
+void DocumentHandler::firePageChanged(size_t page) {
+    for (DocumentListener* dl: this->listener) { dl->pageChanged(page); }
+}
+
+void DocumentHandler::firePageInserted(size_t page) {
+    for (DocumentListener* dl: this->listener) { dl->pageInserted(page); }
+}
+
+void DocumentHandler::firePageDeleted(size_t page) {
+    for (DocumentListener* dl: this->listener) { dl->pageDeleted(page); }
+}
+
+void DocumentHandler::firePageSelected(size_t page) {
+    for (DocumentListener* dl: this->listener) { dl->pageSelected(page); }
+}
diff --git a/entry/src/main/cpp/src/core/model/DocumentHandler.h b/entry/src/main/cpp/src/core/model/DocumentHandler.h
new file mode 100644
index 0000000..7dc0e59
--- /dev/null
+++ b/entry/src/main/cpp/src/core/model/DocumentHandler.h
@@ -0,0 +1,44 @@
+/*
+ * Xournal++
+ *
+ * Document handler
+ *
+ * @author Xournal++ Team
+ * https://github.com/xournalpp/xournalpp
+ *
+ * @license GNU GPLv2 or later
+ */
+
+#pragma once
+
+#include <cstddef>  // for size_t
+#include <list>     // for list
+
+#include "DocumentChangeType.h"  // for DocumentChangeType
+
+class DocumentListener;
+
+class DocumentHandler {
+public:
+    DocumentHandler() = default;
+
+    ~DocumentHandler() = default;
+
+public:
+    void fireDocumentChanged(DocumentChangeType type);
+    void firePageSizeChanged(size_t page);
+    void firePageChanged(size_t page);
+    void firePageInserted(size_t page);
+    void firePageDeleted(size_t page);
+    // void firePageLoaded(PageRef page);
+    void firePageSelected(size_t page);
+
+private:
+    void addListener(DocumentListener* l);
+    void removeListener(DocumentListener* l);
+
+private:
+    std::list<DocumentListener*> listener;
+
+    friend class DocumentListener;
+};
diff --git a/entry/src/main/cpp/src/core/model/DocumentListener.cpp b/entry/src/main/cpp/src/core/model/DocumentListener.cpp
new file mode 100644
index 0000000..3b96c0e
--- /dev/null
+++ b/entry/src/main/cpp/src/core/model/DocumentListener.cpp
@@ -0,0 +1,32 @@
+#include "DocumentListener.h"
+
+#include "model/DocumentChangeType.h"  // for DocumentChangeType
+
+#include "DocumentHandler.h"  // for DocumentHandler
+
+DocumentListener::DocumentListener() = default;
+
+DocumentListener::~DocumentListener() { unregisterListener(); }
+
+void DocumentListener::registerListener(DocumentHandler* handler) {
+    this->handler = handler;
+    handler->addListener(this);
+}
+
+void DocumentListener::unregisterListener() {
+    if (this->handler) {
+        this->handler->removeListener(this);
+    }
+}
+
+void DocumentListener::documentChanged(DocumentChangeType type) {}
+
+void DocumentListener::pageSizeChanged(size_t page) {}
+
+void DocumentListener::pageChanged(size_t page) {}
+
+void DocumentListener::pageInserted(size_t page) {}
+
+void DocumentListener::pageDeleted(size_t page) {}
+
+void DocumentListener::pageSelected(size_t page) {}
diff --git a/entry/src/main/cpp/src/core/model/DocumentListener.h b/entry/src/main/cpp/src/core/model/DocumentListener.h
new file mode 100644
index 0000000..8a497cb
--- /dev/null
+++ b/entry/src/main/cpp/src/core/model/DocumentListener.h
@@ -0,0 +1,38 @@
+/*
+ * Xournal++
+ *
+ * Document listener
+ *
+ * @author Xournal++ Team
+ * https://github.com/xournalpp/xournalpp
+ *
+ * @license GNU GPLv2 or later
+ */
+
+#pragma once
+
+#include <cstddef>  // for size_t
+
+#include "DocumentChangeType.h"  // for DocumentChangeType
+
+class DocumentHandler;
+
+class DocumentListener {
+public:
+    DocumentListener();
+    virtual ~DocumentListener();
+
+public:
+    void registerListener(DocumentHandler* handler);
+    void unregisterListener();
+
+    virtual void documentChanged(DocumentChangeType type);
+    virtual void pageSizeChanged(size_t page);
+    virtual void pageChanged(size_t page);
+    virtual void pageInserted(size_t page);
+    virtual void pageDeleted(size_t page);
+    virtual void pageSelected(size_t page);
+
+private:
+    DocumentHandler* handler = nullptr;
+};
diff --git a/entry/src/main/cpp/src/core/model/Element.cpp b/entry/src/main/cpp/src/core/model/Element.cpp
new file mode 100644
index 0000000..ff9a4ad
--- /dev/null
+++ b/entry/src/main/cpp/src/core/model/Element.cpp
@@ -0,0 +1,162 @@
+#include "Element.h"
+
+#include <algorithm>  // for max, min
+#include <cmath>      // for ceil, floor, NAN
+#include <cstdint>    // for uint32_t
+
+#include <glib.h>  // for gint
+
+#include "util/safe_casts.h"                      // for as_unsigned
+#include "util/serializing/ObjectInputStream.h"   // for ObjectInputStream
+#include "util/serializing/ObjectOutputStream.h"  // for ObjectOutputStream
+
+using xoj::util::Rectangle;
+
+Element::Element(ElementType type): type(type) {}
+
+auto Element::getType() const -> ElementType { return this->type; }
+
+void Element::setX(double x) {
+    this->x = x;
+    this->sizeCalculated = false;
+}
+
+void Element::setY(double y) {
+    this->y = y;
+    this->sizeCalculated = false;
+}
+
+auto Element::getX() const -> double {
+    if (!this->sizeCalculated) {
+        this->sizeCalculated = true;
+        calcSize();
+    }
+    return x;
+}
+
+auto Element::getY() const -> double {
+    if (!this->sizeCalculated) {
+        this->sizeCalculated = true;
+        calcSize();
+    }
+    return y;
+}
+auto Element::getSnappedBounds() const -> Rectangle<double> {
+    if (!this->sizeCalculated) {
+        this->sizeCalculated = true;
+        calcSize();
+    }
+    return this->snappedBounds;
+}
+
+void Element::move(double dx, double dy) {
+    this->x += dx;
+    this->y += dy;
+    this->snappedBounds = this->snappedBounds.translated(dx, dy);
+}
+
+auto Element::getElementWidth() const -> double {
+    if (!this->sizeCalculated) {
+        this->sizeCalculated = true;
+        calcSize();
+    }
+    return this->width;
+}
+
+auto Element::getElementHeight() const -> double {
+    if (!this->sizeCalculated) {
+        this->sizeCalculated = true;
+        calcSize();
+    }
+    return this->height;
+}
+
+auto Element::boundingRect() const -> Rectangle<double> {
+    return Rectangle<double>(getX(), getY(), getElementWidth(), getElementHeight());
+}
+
+void Element::setColor(Color color) { this->color = color; }
+
+auto Element::getColor() const -> Color { return this->color; }
+
+auto Element::intersectsArea(const GdkRectangle* src) const -> bool {
+    // compute the smallest rectangle with integer coordinates containing the bounding box and having width, height > 0
+    auto x = getX();
+    auto y = getY();
+    auto x1 = gint(std::floor(getX()));
+    auto y1 = gint(std::floor(getY()));
+    auto x2 = gint(std::ceil(x + getElementWidth()));
+    auto y2 = gint(std::ceil(y + getElementHeight()));
+    GdkRectangle rect = {x1, y1, std::max(1, x2 - x1), std::max(1, y2 - y1)};
+
+    return gdk_rectangle_intersect(src, &rect, nullptr);
+}
+
+auto Element::intersectsArea(double x, double y, double width, double height) const -> bool {
+    double dest_x = NAN, dest_y = NAN;
+    double dest_w = NAN, dest_h = NAN;
+
+    dest_x = std::max(getX(), x);
+    dest_y = std::max(getY(), y);
+    dest_w = std::min(getX() + getElementWidth(), x + width) - dest_x;
+    dest_h = std::min(getY() + getElementHeight(), y + height) - dest_y;
+
+    return (dest_w > 0 && dest_h > 0);
+}
+
+auto Element::distanceTo(double x, double y) const -> double {
+    // Coordinates of the point in the bounding rectangle that is the closest to (x,y).
+    double projX = std::clamp(x, getX(), getX() + getElementWidth());
+    double projY = std::clamp(y, getY(), getY() + getElementHeight());
+    return std::hypot(x - projX, y - projY);
+}
+
+auto Element::isInSelection(ShapeContainer* container) const -> bool {
+    if (!container->contains(getX(), getY())) {
+        return false;
+    }
+    if (!container->contains(getX() + getElementWidth(), getY())) {
+        return false;
+    }
+    if (!container->contains(getX(), getY() + getElementHeight())) {
+        return false;
+    }
+    if (!container->contains(getX() + getElementWidth(), getY() + getElementHeight())) {
+        return false;
+    }
+
+    return true;
+}
+
+auto Element::rescaleOnlyAspectRatio() const -> bool { return false; }
+auto Element::rescaleWithMirror() const -> bool { return false; }
+
+void Element::serialize(ObjectOutputStream& out) const {
+    out.writeObject("Element");
+
+    out.writeDouble(this->x);
+    out.writeDouble(this->y);
+    out.writeUInt(uint32_t(this->color));
+
+    out.endObject();
+}
+
+void Element::readSerialized(ObjectInputStream& in) {
+    in.readObject("Element");
+
+    this->x = in.readDouble();
+    this->y = in.readDouble();
+    this->color = Color(in.readUInt());
+
+    in.endObject();
+}
+
+namespace xoj {
+
+auto refElementContainer(const std::vector<ElementPtr>& elements) -> std::vector<Element*> {
+    std::vector<Element*> result(elements.size());
+    std::transform(elements.begin(), elements.end(), result.begin(), [](auto const& e) { return e.get(); });
+    return result;
+}
+
+}  // namespace xoj
diff --git a/entry/src/main/cpp/src/core/model/Element.h b/entry/src/main/cpp/src/core/model/Element.h
new file mode 100644
index 0000000..1f27147
--- /dev/null
+++ b/entry/src/main/cpp/src/core/model/Element.h
@@ -0,0 +1,123 @@
+/*
+ * Xournal++
+ *
+ * An element on the Document
+ *
+ * @author Xournal++ Team
+ * https://github.com/xournalpp/xournalpp
+ *
+ * @license GNU GPLv2 or later
+ */
+
+#pragma once
+
+#include <cstddef>  // for ptrdiff_t
+#include <memory>   // for unique_ptr
+#include <vector>   // for vector
+
+#include <gdk/gdk.h>  // for GdkRectangle
+
+#include "util/Color.h"                     // for Color
+#include "util/Rectangle.h"                 // for Rectangle
+#include "util/serializing/Serializable.h"  // for Serializable
+
+class ObjectInputStream;
+class ObjectOutputStream;
+
+enum ElementType { ELEMENT_STROKE = 1, ELEMENT_IMAGE, ELEMENT_TEXIMAGE, ELEMENT_TEXT };
+
+class ShapeContainer {
+public:
+    virtual bool contains(double x, double y) const = 0;
+
+    virtual ~ShapeContainer() = default;
+};
+
+class Element;
+using ElementPtr = std::unique_ptr<Element>;
+
+class Element: public Serializable {
+protected:
+    Element(ElementType type);
+
+public:
+    ~Element() override = default;
+
+    using Index = std::ptrdiff_t;
+    static constexpr auto InvalidIndex = static_cast<Index>(-1);
+
+public:
+    ElementType getType() const;
+
+    void setX(double x);
+    void setY(double y);
+    double getX() const;
+    double getY() const;
+
+    virtual void move(double dx, double dy);
+    virtual void scale(double x0, double y0, double fx, double fy, double rotation, bool restoreLineWidth) = 0;
+    virtual void rotate(double x0, double y0, double th) = 0;
+
+    void setColor(Color color);
+    Color getColor() const;
+
+    double getElementWidth() const;
+    double getElementHeight() const;
+
+    xoj::util::Rectangle<double> getSnappedBounds() const;
+
+    xoj::util::Rectangle<double> boundingRect() const;
+
+    virtual bool intersectsArea(const GdkRectangle* src) const;
+    virtual bool intersectsArea(double x, double y, double width, double height) const;
+    /// Returns the distance between the element "as drawn" and the point (x,y)
+    virtual double distanceTo(double x, double y) const;
+
+    virtual bool isInSelection(ShapeContainer* container) const;
+
+    virtual bool rescaleOnlyAspectRatio() const;
+    virtual bool rescaleWithMirror() const;
+
+    /**
+     * Take 1:1 copy of this element
+     */
+    virtual auto clone() const -> ElementPtr = 0;
+
+    void serialize(ObjectOutputStream& out) const override;
+    void readSerialized(ObjectInputStream& in) override;
+
+private:
+protected:
+    virtual void calcSize() const = 0;
+
+protected:
+    // If the size has been calculated
+    mutable bool sizeCalculated = false;
+
+    mutable double width = 0;
+    mutable double height = 0;
+
+    // The position on the screen
+    mutable double x = 0;
+    mutable double y = 0;
+
+    // The position and dimensions on the screen used for snapping
+    mutable xoj::util::Rectangle<double> snappedBounds{};
+
+private:
+    /**
+     * Type of this element
+     */
+    ElementType type;
+
+    /**
+     * The color in RGB format
+     */
+    Color color{0U};
+};
+
+namespace xoj {
+
+auto refElementContainer(const std::vector<ElementPtr>& elements) -> std::vector<Element*>;
+
+}  // namespace xoj
diff --git a/entry/src/main/cpp/src/core/model/ElementContainer.h b/entry/src/main/cpp/src/core/model/ElementContainer.h
new file mode 100644
index 0000000..4719269
--- /dev/null
+++ b/entry/src/main/cpp/src/core/model/ElementContainer.h
@@ -0,0 +1,25 @@
+/*
+ * Xournal++
+ *
+ * Interface for element containers like selection
+ *
+ * @author Xournal++ Team
+ * https://github.com/xournalpp/xournalpp
+ *
+ * @license GNU GPLv2 or later
+ */
+
+#pragma once
+
+#include <functional>
+
+class Element;
+
+class ElementContainer {
+public:
+    virtual void forEachElement(std::function<void(const Element*)> f) const = 0;
+
+protected:
+    // interface -> protected, non virtual
+    ~ElementContainer() = default;
+};
diff --git a/entry/src/main/cpp/src/core/model/ElementInsertionPosition.h b/entry/src/main/cpp/src/core/model/ElementInsertionPosition.h
new file mode 100644
index 0000000..ce64404
--- /dev/null
+++ b/entry/src/main/cpp/src/core/model/ElementInsertionPosition.h
@@ -0,0 +1,58 @@
+/*
+ * Xournal++
+ *
+ * The position (depth) of an element
+ *
+ * @author Xournal++ Team
+ * https://github.com/xournalpp/xournalpp
+ *
+ * @license GNU GPLv2 or later
+ */
+
+#pragma once
+
+#include <limits>
+#include <vector>
+
+#include "Element.h"
+
+struct InsertionPositionRef {
+    constexpr InsertionPositionRef() = default;
+    constexpr explicit InsertionPositionRef(const Element* e,
+                                            Element::Index pos = std::numeric_limits<Element::Index>::max()):
+            e(e), pos(pos) {}
+    const Element* e{};
+    Element::Index pos{};
+
+    constexpr friend auto operator<(const InsertionPositionRef& p1, const InsertionPositionRef& p2) -> bool {
+        return p1.pos < p2.pos;
+    }
+};
+
+struct InsertionPosition {
+    constexpr InsertionPosition() = default;
+    explicit InsertionPosition(ElementPtr e, Element::Index pos = std::numeric_limits<Element::Index>::max()):
+            e(std::move(e)), pos(pos) {}
+
+    auto ref() const -> InsertionPositionRef { return InsertionPositionRef{e.get(), pos}; }
+
+    ElementPtr e;
+    Element::Index pos{};
+
+    constexpr friend auto operator<(const InsertionPosition& p1, const InsertionPosition& p2) -> bool {
+        return p1.pos < p2.pos;
+    }
+    constexpr friend auto operator<(Element::Index pos, const InsertionPosition& p2) -> bool { return pos < p2.pos; }
+    constexpr friend auto operator<(const InsertionPosition& p2, Element::Index pos) -> bool { return p2.pos < pos; }
+};
+
+using InsertionOrder = std::vector<InsertionPosition>;
+// using InsertionOrderRef = std::span<InsertionPositionRef const>; (cpp20, optional cpp26 (implicit conversion from
+// vector))
+using InsertionOrderRef = std::vector<InsertionPositionRef>;
+
+inline auto refInsertionOrder(InsertionOrder const& order) -> InsertionOrderRef {
+    InsertionOrderRef ref(order.size());
+    std::transform(order.begin(), order.end(), ref.begin(), [](auto const& pos) { return pos.ref(); });
+    return ref;
+}
diff --git a/entry/src/main/cpp/src/core/model/Font.cpp b/entry/src/main/cpp/src/core/model/Font.cpp
new file mode 100644
index 0000000..609b660
--- /dev/null
+++ b/entry/src/main/cpp/src/core/model/Font.cpp
@@ -0,0 +1,71 @@
+#include "Font.h"
+
+#include <cstdlib>  // for atof
+#include <regex>    // for match_results, rege...
+#include <sstream>  // for basic_ostream, oper...
+#include <utility>  // for move
+
+#include "util/serdesstream.h"
+#include "util/serializing/ObjectInputStream.h"   // for ObjectInputStream
+#include "util/serializing/ObjectOutputStream.h"  // for ObjectOutputStream
+
+XojFont::XojFont(std::string name, double size) {
+    setName(std::move(name));
+    setSize(size);
+}
+
+auto XojFont::getName() const -> const std::string& { return this->name; }
+
+void XojFont::setName(std::string name) { this->name = std::move(name); }
+
+auto XojFont::getSize() const -> double { return size; }
+
+void XojFont::setSize(double size) { this->size = size; }
+
+XojFont::XojFont(const char* description) {
+    // See https://stackoverflow.com/questions/44949784/c-regex-which-group-matched for
+    // a good overview of regular expressions in C++.
+    std::regex pangoFontDescriptionRegex{"^(.*) (\\d+[.]?\\d*)$"};
+
+    std::match_results<const char*> results;
+    std::regex_search(description, results, pangoFontDescriptionRegex);
+
+    if (results.size() > 1) {
+        this->name = results[1].str();
+    } else {
+        this->name = "";
+    }
+
+    if (results.size() > 2) {
+        this->size = atof(results[2].str().c_str());
+    } else {
+        this->size = 0;
+    }
+}
+
+XojFont& XojFont::operator=(const std::string& description) { return *this = XojFont(description.c_str()); }
+
+auto XojFont::asString() const -> std::string {
+    auto result = serdes_stream<std::stringstream>();
+    result << getName() << " " << getSize();
+
+    return result.str();
+}
+
+void XojFont::serialize(ObjectOutputStream& out) const {
+    out.writeObject("XojFont");
+
+    out.writeString(this->name);
+    out.writeDouble(this->size);
+
+    out.endObject();
+}
+
+void XojFont::readSerialized(ObjectInputStream& in) {
+    in.readObject("XojFont");
+
+    this->name = in.readString();
+    this->size = in.readDouble();
+
+    in.endObject();
+}
diff --git a/entry/src/main/cpp/src/core/model/Font.h b/entry/src/main/cpp/src/core/model/Font.h
new file mode 100644
index 0000000..08cac70
--- /dev/null
+++ b/entry/src/main/cpp/src/core/model/Font.h
@@ -0,0 +1,68 @@
+/*
+ * Xournal++
+ *
+ * A font with a name and a size
+ *
+ * @author Xournal++ Team
+ * https://github.com/xournalpp/xournalpp
+ *
+ * @license GNU GPLv2 or later
+ */
+
+#pragma once
+
+#include <string>  // for string
+
+#include "util/serializing/Serializable.h"  // for Serializable
+
+class ObjectInputStream;
+class ObjectOutputStream;
+
+
+class XojFont: public Serializable {
+public:
+    XojFont() = default;
+    XojFont(std::string name, double size);
+    XojFont(const XojFont&) = default;
+    XojFont(XojFont&&) = default;
+    ~XojFont() override = default;
+
+    XojFont& operator=(const XojFont&) = default;
+    XojFont& operator=(XojFont&&) = default;
+
+    /**
+     * Set this from a Pango-style font description.
+     * E.g.
+     *   Serif 12
+     * sets this' size to 12 and this font's name to Serif.
+     *
+     * @param description Pango-style font description.
+     */
+    explicit XojFont(const char* description);
+    XojFont& operator=(const std::string& description);
+
+public:
+    const std::string& getName() const;
+    void setName(std::string name);
+
+    double getSize() const;
+    void setSize(double size);
+
+    /**
+     * @return The Pango-style string that represents this
+     * font.
+     */
+    std::string asString() const;
+
+public:
+    // Serialize interface
+    void serialize(ObjectOutputStream& out) const override;
+    void readSerialized(ObjectInputStream& in) override;
+
+private:
+    void updateFontDesc();
+
+private:
+    std::string name;
+    double size = 0;
+};
diff --git a/entry/src/main/cpp/src/core/model/FormatDefinitions.cpp b/entry/src/main/cpp/src/core/model/FormatDefinitions.cpp
new file mode 100644
index 0000000..1e62caf
--- /dev/null
+++ b/entry/src/main/cpp/src/core/model/FormatDefinitions.cpp
@@ -0,0 +1,7 @@
+#include "FormatDefinitions.h"
+
+#include "util/Util.h"  // for DPI_NORMALIZATION_FACTOR
+
+const FormatUnits XOJ_UNITS[] = {{"cm", 28.346}, {"in", Util::DPI_NORMALIZATION_FACTOR}, {"points", 1.0}};
+
+const int XOJ_UNIT_COUNT = sizeof(XOJ_UNITS) / sizeof(FormatUnits);
diff --git a/entry/src/main/cpp/src/core/model/FormatDefinitions.h b/entry/src/main/cpp/src/core/model/FormatDefinitions.h
new file mode 100644
index 0000000..502f4b9
--- /dev/null
+++ b/entry/src/main/cpp/src/core/model/FormatDefinitions.h
@@ -0,0 +1,20 @@
+/*
+ * Xournal++
+ *
+ * Abstract gui class, which loads the glade objcts
+ *
+ * @author Xournal++ Team
+ * https://github.com/xournalpp/xournalpp
+ *
+ * @license GNU GPLv2 or later
+ */
+
+#pragma once
+
+typedef struct {
+    const char* name;
+    const double scale;
+} FormatUnits;
+
+extern const FormatUnits XOJ_UNITS[];
+extern const int XOJ_UNIT_COUNT;
diff --git a/entry/src/main/cpp/src/core/model/GeometryTool.cpp b/entry/src/main/cpp/src/core/model/GeometryTool.cpp
new file mode 100644
index 0000000..ff91f7b
--- /dev/null
+++ b/entry/src/main/cpp/src/core/model/GeometryTool.cpp
@@ -0,0 +1,49 @@
+#include "GeometryTool.h"
+
+#include <initializer_list>  // for initializer_list
+
+GeometryTool::GeometryTool(double h, double r, double tx, double ty):
+        height(h),
+        rotation(r),
+        origin(tx, ty),
+        viewPool(std::make_shared<xoj::util::DispatchPool<xoj::view::GeometryToolView>>()) {}
+
+GeometryTool::~GeometryTool() {}
+
+void GeometryTool::setHeight(double height) { this->height = height; }
+auto GeometryTool::getHeight() const -> double { return this->height; }
+
+void GeometryTool::setRotation(double rotation) { this->rotation = rotation; }
+auto GeometryTool::getRotation() const -> double { return this->rotation; }
+
+auto GeometryTool::getOrigin() const -> const xoj::util::Point<double>& { return origin; }
+
+void GeometryTool::setOrigin(const xoj::util::Point<double>& o) { this->origin = o; }
+
+auto GeometryTool::getMatrix() const -> cairo_matrix_t {
+    cairo_matrix_t matrix;
+    cairo_matrix_init_identity(&matrix);
+    cairo_matrix_translate(&matrix, this->origin.x, this->origin.y);
+    cairo_matrix_rotate(&matrix, this->rotation);
+    cairo_matrix_scale(&matrix, CM, CM);
+    return matrix;
+}
+
+auto GeometryTool::getViewPool() const -> const std::shared_ptr<xoj::util::DispatchPool<xoj::view::GeometryToolView>>& {
+    return viewPool;
+}
+
+auto GeometryTool::getStroke() const -> Stroke* { return this->stroke; }
+
+void GeometryTool::setStroke(Stroke* s) { this->stroke = s; }
+
+auto GeometryTool::computeRepaintRange(Range rg) const -> Range {
+    Range lastRange = this->lastRepaintRange;
+    if (this->stroke) {
+        rg.addPoint(this->stroke->getX(), this->stroke->getY());
+        rg.addPoint(this->stroke->getX() + this->stroke->getElementWidth(),
+                    this->stroke->getY() + this->stroke->getElementHeight());
+    }
+    this->lastRepaintRange = rg;
+    return rg.unite(lastRange);
+}
diff --git a/entry/src/main/cpp/src/core/model/GeometryTool.h b/entry/src/main/cpp/src/core/model/GeometryTool.h
new file mode 100644
index 0000000..7cafa8d
--- /dev/null
+++ b/entry/src/main/cpp/src/core/model/GeometryTool.h
@@ -0,0 +1,112 @@
+/*
+ * Xournal++
+ *
+ * A geometry tool
+ *
+ * @author Xournal++ Team
+ * https://github.com/xournalpp/xournalpp
+ *
+ * @license GNU GPLv2 or later
+ */
+
+#pragma once
+
+#include <cairo.h>  // for cairo_matrix_t
+
+#include "model/OverlayBase.h"
+#include "model/Stroke.h"
+#include "util/DispatchPool.h"
+#include "util/Point.h"
+
+constexpr static double HALF_CM = 14.17;
+constexpr static double CM = 2. * HALF_CM;
+
+enum GeometryToolType { SETSQUARE, COMPASS };
+
+/**
+ * @brief A class that models a geometry tool
+ *
+ * The geometry tool has a certain height/size, may be rotated and
+ * translated. User coordinates are specified in cm.
+ */
+
+namespace xoj::util {
+template <class T>
+class DispatchPool;
+}
+
+namespace xoj::view {
+class GeometryToolView;
+};
+
+class GeometryToolInputHandler;
+
+class GeometryTool: public OverlayBase {
+public:
+    /**
+     * @brief A geometry tool specified by its height, rotation angle and translations in x- and y-directions
+     * @param height the height (size parameter) of the geometry tool
+     * @param rotation the angle (in radian) around which the geometry tool is rotated with respect to the x-axis
+     * @param x the x-coordinate (in pt) of the rotation center
+     * @param y the y-coordinate (in pt) of the rotation center
+     */
+    GeometryTool(double height, double rotation, double x, double y);
+
+    virtual ~GeometryTool();
+
+    void setHeight(double height);
+    double getHeight() const;
+    void setRotation(double rotation);
+    double getRotation() const;
+    const xoj::util::Point<double>& getOrigin() const;
+    void setOrigin(const xoj::util::Point<double>& o);
+
+    cairo_matrix_t getMatrix() const;
+
+    Stroke* getStroke() const;
+    void setStroke(Stroke* s);
+
+    const std::shared_ptr<xoj::util::DispatchPool<xoj::view::GeometryToolView>>& getViewPool() const;
+    const std::shared_ptr<xoj::util::DispatchPool<GeometryToolInputHandler>>& getHandlerPool() const;
+
+    virtual void notify(bool resetMask = false) const = 0;  // calls the update method of all observers
+    /**
+     * @brief Returns the range for the tool alone (without stroke)
+     *
+     * @param transformed whether the range should be rotated and translated
+     */
+    virtual Range getToolRange(bool transformed) const = 0;
+
+
+protected:
+    /**
+     * @brief the height of the geometry tool
+     */
+    double height;
+
+    /**
+     * @brief the angle (in radian) around which the geometry tool is rotated with respect to the x-axis
+     */
+    double rotation;
+
+    /**
+     * @brief the tool's origin
+     */
+    xoj::util::Point<double> origin;
+
+    Stroke* stroke = nullptr;
+
+    std::shared_ptr<xoj::util::DispatchPool<xoj::view::GeometryToolView>> viewPool;
+
+    /**
+     * @brief Bounding box of the geometry tool and stroke after its last update
+     */
+    mutable Range lastRepaintRange;
+
+protected:
+    /**
+     * @brief computes the repaint range by uniting the stroke's repaint range with the geometry tool repaint range
+     * @param rg the geometry tool repaint range
+     */
+    Range computeRepaintRange(Range rg) const;
+};
diff --git a/entry/src/main/cpp/src/core/model/Image.cpp b/entry/src/main/cpp/src/core/model/Image.cpp
new file mode 100644
index 0000000..7f0b709
--- /dev/null
+++ b/entry/src/main/cpp/src/core/model/Image.cpp
@@ -0,0 +1,268 @@
+#include "Image.h"
+
+#include <algorithm>  // for min
+#include <array>      // for array
+#include <cmath>      // for sqrt
+#include <memory>
+#include <utility>  // for move, pair
+
+#include <cairo.h>    // for cairo_surface_destroy
+#include <gdk/gdk.h>  // for gdk_cairo_set_sourc...
+#include <glib.h>     // for guchar
+
+#include "model/Element.h"   // for Element, ELEMENT_IMAGE
+#include "util/Assert.h"     // for xoj_assert
+#include "util/Rectangle.h"  // for Rectangle
+#include "util/i18n.h"
+#include "util/raii/GObjectSPtr.h"  // for GObjectSPtr
+#include "util/safe_casts.h"
+#include "util/serializing/ObjectInputStream.h"   // for ObjectInputStream
+#include "util/serializing/ObjectOutputStream.h"  // for ObjectOutputStream
+
+using xoj::util::Rectangle;
+
+Image::Image(): Element(ELEMENT_IMAGE) {}
+
+Image::~Image() {
+    if (this->image) {
+        cairo_surface_destroy(this->image);
+        this->image = nullptr;
+    }
+
+    if (this->format) {
+        gdk_pixbuf_format_free(this->format);
+        this->format = nullptr;
+    }
+}
+
+auto Image::clone() const -> ElementPtr {
+    auto img = std::make_unique<Image>();
+
+    img->x = this->x;
+    img->y = this->y;
+    img->setColor(this->getColor());
+    img->width = this->width;
+    img->height = this->height;
+    img->data = this->data;
+
+    img->image = cairo_surface_reference(this->image);
+    img->snappedBounds = this->snappedBounds;
+    img->sizeCalculated = this->sizeCalculated;
+
+    return img;
+}
+
+void Image::setWidth(double width) {
+    this->width = width;
+    this->calcSize();
+}
+
+void Image::setHeight(double height) {
+    this->height = height;
+    this->calcSize();
+}
+
+void Image::setImage(std::string_view data) { setImage(std::string(data)); }
+
+void Image::setImage(std::string&& data) {
+    if (this->image) {
+        cairo_surface_destroy(this->image);
+        this->image = nullptr;
+    }
+    this->data = std::move(data);
+
+    if (this->format) {
+        gdk_pixbuf_format_free(this->format);
+        this->format = nullptr;
+    }
+
+    // FIXME: awful hack to try to parse the format
+    std::array<char*, 4096> buffer{};
+    xoj::util::GObjectSPtr<GdkPixbufLoader> loader(gdk_pixbuf_loader_new(), xoj::util::adopt);
+    size_t remaining = this->data.size();
+    while (remaining > 0) {
+        size_t readLen = std::min(remaining, buffer.size());
+        if (!gdk_pixbuf_loader_write(loader.get(), reinterpret_cast<const guchar*>(this->data.c_str()), readLen,
+                                     nullptr))
+            break;
+        remaining -= readLen;
+
+        // Try to determine the format early, if possible
+        this->format = gdk_pixbuf_loader_get_format(loader.get());
+        if (this->format) {
+            break;
+        }
+    }
+    gdk_pixbuf_loader_close(loader.get(), nullptr);
+    // if the format was not determined early, it can probably be determined now
+    if (!this->format) {
+        this->format = gdk_pixbuf_loader_get_format(loader.get());
+    }
+    xoj_assert_message(this->format != nullptr, "could not parse the image format!");
+
+    // the format is owned by the pixbuf, so create a copy
+    this->format = gdk_pixbuf_format_copy(this->format);
+}
+
+void Image::setImage(GdkPixbuf* img) {
+    if (this->image) {
+        cairo_surface_destroy(this->image);
+        this->image = nullptr;
+    }
+    this->imageSize = {gdk_pixbuf_get_width(img), gdk_pixbuf_get_height(img)};
+
+    this->image = cairo_image_surface_create(CAIRO_FORMAT_ARGB32, this->imageSize.first, this->imageSize.second);
+    xoj_assert(this->image != nullptr);
+
+    // Paint the pixbuf on to the surface
+    cairo_t* cr = cairo_create(this->image);
+    gdk_cairo_set_source_pixbuf(cr, img, 0, 0);
+    cairo_paint(cr);
+    cairo_destroy(cr);
+
+    const cairo_write_func_t writeFunc = [](void* bufferPtr, const unsigned char* data,
+                                            unsigned int length) -> cairo_status_t {
+        reinterpret_cast<decltype(Image::data)*>(bufferPtr)->append(reinterpret_cast<const char*>(data), length);
+        return CAIRO_STATUS_SUCCESS;
+    };
+    cairo_surface_write_to_png_stream(image, writeFunc, &data);
+}
+
+auto Image::renderBuffer() const -> std::optional<std::string> {
+    xoj_assert_message(data.length() > 0, "image has no data, cannot render it!");
+    if (this->image) {
+        // Already rendered
+        return std::nullopt;
+    }
+    xoj::util::GObjectSPtr<GdkPixbufLoader> loader(gdk_pixbuf_loader_new(), xoj::util::adopt);
+    g_signal_connect(loader.get(), "size-prepared",
+                     G_CALLBACK(+[](GdkPixbufLoader* self, gint width, gint height, gpointer) {
+                         static constexpr uint64_t MAX_SIZE =
+                                 1 << 25;  ///< Max number of pixels: 32M = more than enough for A4 in 72pp
+                         if (width <= 0 || height <= 0) {
+                             g_warning("Image::renderBuffer(): non-positive width/height");
+                             return;
+                         }
+                         if (static_cast<uint64_t>(width) * static_cast<uint64_t>(height) > MAX_SIZE) {
+                             double ratio = static_cast<double>(width) / static_cast<double>(height);
+                             gint maxHeight = floor_cast<gint>(std::sqrt(MAX_SIZE / ratio));
+                             gint maxWidth = floor_cast<gint>(maxHeight * ratio);
+                             g_warning("Trying to open an image too big %d x %d. Resizing it to %d x %d", width, height,
+                                       maxWidth, maxHeight);
+                             gdk_pixbuf_loader_set_size(self, maxHeight, maxWidth);
+                         }
+                     }),
+                     nullptr);
+    GError* err = nullptr;
+    bool success = gdk_pixbuf_loader_write(loader.get(), reinterpret_cast<const guchar*>(this->data.c_str()),
+                                           this->data.length(), &err);
+    if (!success) {
+        if (err != nullptr) {
+            std::string msg = std::string(_("Failed to load image")) + "\n" + _("Error: ") + err->message;
+            g_free(err);
+            return msg;
+        } else {
+            return std::string(_("Failed to load image")) + "\n" + _("Unrecoverable error");
+        }
+    }
+    success = gdk_pixbuf_loader_close(loader.get(), &err);
+    if (!success) {
+        if (err != nullptr) {
+            std::string msg = std::string(_("Failed to close image stream")) + "\n" + _("Error: ") + err->message;
+            g_free(err);
+            return msg;
+        } else {
+            return std::string(_("Failed to close image stream")) + "\n" + _("Unrecoverable error");
+        }
+    }
+
+    GdkPixbuf* tmp = gdk_pixbuf_loader_get_pixbuf(loader.get());
+    xoj_assert(tmp != nullptr);
+    xoj::util::GObjectSPtr<GdkPixbuf> pixbuf(gdk_pixbuf_apply_embedded_orientation(tmp), xoj::util::adopt);
+
+    this->imageSize = {gdk_pixbuf_get_width(pixbuf.get()), gdk_pixbuf_get_height(pixbuf.get())};
+
+    // TODO: pass in window once this code is refactored into ImageView
+    this->image = cairo_image_surface_create(CAIRO_FORMAT_ARGB32, this->imageSize.first, this->imageSize.second);
+    g_assert(this->image != nullptr);
+
+    // Paint the pixbuf on to the surface
+    // NOTE: we do this manually instead of using gdk_cairo_surface_create_from_pixbuf
+    // since this does not work in CLI mode.
+    cairo_t* cr = cairo_create(this->image);
+    gdk_cairo_set_source_pixbuf(cr, pixbuf.get(), 0, 0);
+    cairo_paint(cr);
+    cairo_destroy(cr);
+    return std::nullopt;
+}
+
+auto Image::getImage() const -> cairo_surface_t* {
+    if (auto opt = renderBuffer(); opt.has_value()) {
+        // An error occurred
+        g_warning("%s", opt->c_str());
+    }
+    return this->image;
+}
+
+void Image::scale(double x0, double y0, double fx, double fy, double rotation,
+                  bool) {  // line width scaling option is not used
+    this->x -= x0;
+    this->x *= fx;
+    this->x += x0;
+    this->y -= y0;
+    this->y *= fy;
+    this->y += y0;
+
+    this->width *= fx;
+    this->height *= fy;
+    this->calcSize();
+}
+
+void Image::rotate(double x0, double y0, double th) {}
+
+void Image::serialize(ObjectOutputStream& out) const {
+    out.writeObject("Image");
+
+    this->Element::serialize(out);
+
+    out.writeDouble(this->width);
+    out.writeDouble(this->height);
+
+    out.writeImage(this->data);
+
+    out.endObject();
+}
+
+void Image::readSerialized(ObjectInputStream& in) {
+    in.readObject("Image");
+
+    this->Element::readSerialized(in);
+
+    this->width = in.readDouble();
+    this->height = in.readDouble();
+
+    if (this->image) {
+        cairo_surface_destroy(this->image);
+        this->image = nullptr;
+    }
+
+    this->data = in.readImage();
+
+    in.endObject();
+    this->calcSize();
+}
+
+void Image::calcSize() const {
+    this->snappedBounds = Rectangle<double>(this->x, this->y, this->width, this->height);
+    this->sizeCalculated = true;
+}
+
+bool Image::hasData() const { return !this->data.empty(); }
+
+const unsigned char* Image::getRawData() const { return reinterpret_cast<const unsigned char*>(this->data.data()); }
+
+size_t Image::getRawDataLength() const { return this->data.size(); }
+
+std::pair<int, int> Image::getImageSize() const { return this->imageSize; }
+
+GdkPixbufFormat* Image::getImageFormat() const { return this->format; }
diff --git a/entry/src/main/cpp/src/core/model/Image.h b/entry/src/main/cpp/src/core/model/Image.h
new file mode 100644
index 0000000..265eecd
--- /dev/null
+++ b/entry/src/main/cpp/src/core/model/Image.h
@@ -0,0 +1,99 @@
+/*
+ * Xournal++
+ *
+ * An Image on the document
+ *
+ * @author Xournal++ Team
+ * https://github.com/xournalpp/xournalpp
+ *
+ * @license GNU GPLv2 or later
+ */
+
+#pragma once
+
+#include <cstddef>      // for size_t
+#include <optional>     // for optional
+#include <string>       // for string
+#include <string_view>  // for string_view
+#include <utility>      // for pair, make_pair
+
+#include <cairo.h>                  // for cairo_surface_t, cairo_status_t
+#include <gdk-pixbuf/gdk-pixbuf.h>  // for GdkPixbufFormat, GdkPixbuf
+
+#include "Element.h"  // for Element
+
+class ObjectInputStream;
+class ObjectOutputStream;
+
+
+class Image: public Element {
+public:
+    Image();
+    Image(const Image&) = delete;
+    Image& operator=(const Image&) = delete;
+    Image(Image&&) = delete;
+    Image& operator=(Image&&) = delete;
+    virtual ~Image();
+
+public:
+    void setWidth(double width);
+    void setHeight(double height);
+
+    /// Set the image data by copying the data from the provided string_view.
+    void setImage(std::string_view data);
+
+    /// Set the image data by moving the data.
+    void setImage(std::string&& data);
+
+    /// Set the image data by copying the data from the provided pixbuf.
+    ///
+    /// \deprecated Pass the raw image data instead.
+    ///
+    /// FIXME: remove this method. Currently, it is used by Control::clipboardPasteImage.
+    [[deprecated]] void setImage(GdkPixbuf* img);
+
+    /// The image is rendered lazily by default; call this method to render it.
+    /// Returns std::nullopt on success, an error message on failure
+    std::optional<std::string> renderBuffer() const;
+
+    /// Returns the internal surface that contains the rendered image data.
+    cairo_surface_t* getImage() const;
+
+    void scale(double x0, double y0, double fx, double fy, double rotation, bool restoreLineWidth) override;
+    void rotate(double x0, double y0, double th) override;
+
+    auto clone() const -> ElementPtr override;
+
+    bool hasData() const;
+
+    /// Return a pointer to the raw data. Note that the pointer will be invalidated if the data is changed.
+    const unsigned char* getRawData() const;
+
+    /// Return the length of the raw data.
+    size_t getRawDataLength() const;
+
+    /// Return the size of the raw image, or (-1, -1) if the image has not been rendered yet.
+    std::pair<int, int> getImageSize() const;
+
+    [[maybe_unused]] GdkPixbufFormat* getImageFormat() const;
+
+    static constexpr std::pair<int, int> NOSIZE = std::make_pair(-1, -1);
+
+public:
+    // Serialize interface
+    void serialize(ObjectOutputStream& out) const override;
+    void readSerialized(ObjectInputStream& in) override;
+
+private:
+    void calcSize() const override;
+
+private:
+    /// Temporary surface used as a render buffer.
+    mutable cairo_surface_t* image = nullptr;
+
+    /// Image format information.
+    mutable GdkPixbufFormat* format = nullptr;
+    mutable std::pair<int, int> imageSize = {-1, -1};
+
+    std::string data;
+};
diff --git a/entry/src/main/cpp/src/core/model/Layer.cpp b/entry/src/main/cpp/src/core/model/Layer.cpp
new file mode 100644
index 0000000..7e20f96
--- /dev/null
+++ b/entry/src/main/cpp/src/core/model/Layer.cpp
@@ -0,0 +1,145 @@
+#include "Layer.h"
+
+#include <cstddef>
+#include <memory>
+#include <utility>
+#include <vector>
+
+#include <glib.h>  // for g_warning
+
+#include "model/Element.h"  // for Element, Element::Index, Element::Inval...
+#include "model/ElementInsertionPosition.h"
+#include "util/Assert.h"      // for xoj_assert
+#include "util/Stacktrace.h"  // for Stacktrace
+#include "util/safe_casts.h"
+
+Layer::Layer() = default;
+
+Layer::~Layer() = default;
+
+auto Layer::clone() const -> Layer* {
+    auto* layer = new Layer();
+
+    if (hasName()) {
+        layer->setName(getName());
+    }
+
+    for (auto const& e: this->elements) {
+        layer->addElement(e->clone());
+    }
+
+    return layer;
+}
+
+void Layer::addElement(ElementPtr e) {
+    if (e == nullptr) {
+        g_warning("addElement(nullptr)!");
+        Stacktrace::printStacktrace();
+        return;
+    }
+
+    this->elements.emplace_back(std::move(e));
+}
+
+void Layer::insertElement(ElementPtr e, Element::Index pos) {
+    if (e == nullptr) {
+        g_warning("insertElement(nullptr)!");
+        Stacktrace::printStacktrace();
+        return;
+    }
+
+    // prevent crash, even if this never should happen,
+    // but there was a bug before which cause this error
+    if (pos < 0) {
+        pos = 0;
+    }
+
+    // If the element should be inserted at the top
+    if (pos >= static_cast<int>(this->elements.size())) {
+        this->elements.push_back(std::move(e));
+    } else {
+        this->elements.insert(this->elements.begin() + pos, std::move(e));
+    }
+}
+
+auto Layer::indexOf(const Element* e) const -> Element::Index {
+    for (unsigned int i = 0; i < this->elements.size(); i++) {
+        if (this->elements[i].get() == e) {
+            return i;
+        }
+    }
+
+    return Element::InvalidIndex;
+}
+
+auto Layer::removeElement(const Element* e) -> InsertionPosition {
+    for (unsigned int i = 0; i < this->elements.size(); i++) {
+        if (e == this->elements[i].get()) {
+            auto res = std::move(this->elements[i]);
+            this->elements.erase(this->elements.begin() + i);
+            return InsertionPosition{std::move(res), i};
+        }
+    }
+
+    g_warning("Could not remove element %p from layer %p, it's not on the layer!", e, this);
+    Stacktrace::printStacktrace();
+    return InsertionPosition{nullptr, Element::InvalidIndex};
+}
+
+auto Layer::removeElementAt(const Element* e, Element::Index pos) -> InsertionPosition {
+    if (pos >= 0 && as_unsigned(pos) < elements.size() && this->elements[as_unsigned(pos)].get() == e) {
+        auto iter = std::next(this->elements.begin(), pos);
+        auto res = std::move(*iter);
+        this->elements.erase(iter);
+        return InsertionPosition{std::move(res), pos};
+    }
+    return removeElement(e);
+}
+
+auto Layer::removeElementsAt(InsertionOrderRef const& elts) -> InsertionOrder {
+    InsertionOrder res;
+    res.reserve(elts.size());
+    auto endIndex = static_cast<Element::Index>(elements.size());
+    for (auto&& [e, p]: elts) {
+        xoj_assert(e);
+        auto pos = p;
+        if (pos < 0 || pos > endIndex || elements[static_cast<size_t>(pos)].get() != e) {
+            pos = indexOf(e);
+            if (pos == Element::InvalidIndex) {
+                g_warning("Could not remove element from layer, it's not on the layer!");
+                Stacktrace::printStacktrace();
+                continue;
+            }
+        }
+        res.emplace_back(std::move(elements[static_cast<size_t>(pos)]), pos);
+    }
+    this->elements.erase(std::remove(this->elements.begin(), this->elements.end(), nullptr), this->elements.end());
+    return res;
+}
+
+auto Layer::clearNoFree() -> std::vector<ElementPtr> { return std::move(this->elements); }
+
+auto Layer::isAnnotated() const -> bool { return !this->elements.empty(); }
+
+/**
+ * @return true if the layer is visible
+ */
+auto Layer::isVisible() const -> bool { return visible; }
+
+/**
+ * @return true if the layer is visible
+ */
+void Layer::setVisible(bool visible) { this->visible = visible; }
+
+auto Layer::getElements() -> std::vector<ElementPtr>& { return this->elements; }
+
+auto Layer::getElementsView() const -> xoj::util::PointerContainerView<std::vector<ElementPtr>> {
+    return this->elements;
+}
+
+
+auto Layer::hasName() const -> bool { return name.has_value(); }
+
+auto Layer::getName() const -> std::string { return name.value_or(""); }
+
+void Layer::setName(const std::string& newName) { this->name = newName; }
diff --git a/entry/src/main/cpp/src/core/model/Layer.h b/entry/src/main/cpp/src/core/model/Layer.h
new file mode 100644
index 0000000..e395fab
--- /dev/null
+++ b/entry/src/main/cpp/src/core/model/Layer.h
@@ -0,0 +1,126 @@
+/*
+ * Xournal++
+ *
+ * A layer on a page
+ *
+ * @author Xournal++ Team
+ * https://github.com/xournalpp/xournalpp
+ *
+ * @license GNU GPLv2 or later
+ */
+
+#pragma once
+
+#include <cstddef>   // for size_t
+#include <memory>    // for unique_ptr
+#include <optional>  // for optional
+#include <string>    // for string
+#include <vector>    // for vector
+
+#include "util/PointerContainerView.h"
+
+#include "Element.h"                   // for Element, Element::Index
+#include "ElementInsertionPosition.h"  // for InsertionOrder
+
+template <class T>
+using optional = std::optional<T>;
+
+class Layer {
+public:
+    Layer();
+    virtual ~Layer();
+
+    using Index = size_t;
+
+public:
+    /**
+     * Appends an Element to this Layer
+     *
+     * @note Performs a check to determine whether the element is already contained in the Layer
+     */
+    void addElement(ElementPtr e);
+
+    /**
+     * Inserts an Element in the specified position of the Layer%s internal list
+     *
+     * @note Performs a check to determine whether the element is already contained in the Layer
+     */
+    void insertElement(ElementPtr e, Element::Index pos);
+
+    /**
+     * Returns the index of the given Element with respect to the internal list
+     */
+    auto indexOf(const Element* e) const -> Element::Index;
+
+    /**
+     * Removes an Element from the Layer and optionally deletes it
+     * @return the position the element occupied
+     */
+    auto removeElement(const Element* e) -> InsertionPosition;
+
+    /**
+     * Removes the Element. If e is not at index pos, tries to find it elsewhere (this could happen is the layer was
+     * modified between now and when pos was computed)
+     * @return The actual position of the removed element
+     */
+    auto removeElementAt(const Element* e, Element::Index pos) -> InsertionPosition;
+
+    /**
+     * Removes the Elements. If an element cannot be found at its designated position, it is search through the layer
+     */
+    auto removeElementsAt(InsertionOrderRef const& elts) -> InsertionOrder;
+
+    /**
+     * Removes all Elements from the Layer *without freeing them*. Returns the elements.
+     */
+    auto clearNoFree() -> std::vector<ElementPtr>;
+
+    /**
+     * Returns an iteratable over the Element%s contained in this Layer
+     */
+    auto getElements() -> std::vector<ElementPtr>&;
+
+    auto getElementsView() const -> xoj::util::PointerContainerView<std::vector<ElementPtr>>;
+
+    /**
+     * Returns whether or not the Layer is empty
+     */
+    auto isAnnotated() const -> bool;
+
+    /**
+     * @return true if the layer is visible
+     */
+    auto isVisible() const -> bool;
+
+    /**
+     * @param visible true if the layer is visible
+     */
+    void setVisible(bool visible);
+
+    /**
+     * Creates a deep copy of this Layer by copying all of the Element%s contained in it
+     */
+    auto clone() const -> Layer*;
+
+    /**
+     * @return true if layer has a name
+     */
+    auto hasName() const -> bool;
+
+    /**
+     * @return layer custom name or empty string if custom name is not set
+     */
+    auto getName() const -> std::string;
+
+    /**
+     * Sets custom name for the layer
+     */
+    void setName(const std::string& newName);
+
+private:
+    std::vector<ElementPtr> elements;
+
+    bool visible = true;
+
+    std::optional<std::string> name;
+};
diff --git a/entry/src/main/cpp/src/core/model/LineStyle.cpp b/entry/src/main/cpp/src/core/model/LineStyle.cpp
new file mode 100644
index 0000000..33fcb40
--- /dev/null
+++ b/entry/src/main/cpp/src/core/model/LineStyle.cpp
@@ -0,0 +1,38 @@
+#include "LineStyle.h"
+
+#include <cstring>  // for memcpy
+#include <vector>   // for vector
+
+#include <glib.h>  // for g_free, g_malloc
+
+#include "util/serializing/ObjectInputStream.h"   // for ObjectInputStream
+#include "util/serializing/ObjectOutputStream.h"  // for ObjectOutputStream
+
+
+LineStyle::LineStyle() = default;
+
+LineStyle::~LineStyle() = default;
+
+auto LineStyle::operator==(const LineStyle& rhs) const -> bool { return dashes == rhs.dashes; }
+
+void LineStyle::serialize(ObjectOutputStream& out) const {
+    out.writeObject("LineStyle");
+
+    out.writeData(this->dashes);
+
+    out.endObject();
+}
+
+void LineStyle::readSerialized(ObjectInputStream& in) {
+    in.readObject("LineStyle");
+
+    in.readData(dashes);
+
+    in.endObject();
+}
+
+auto LineStyle::getDashes() const -> const std::vector<double>& { return dashes; }
+
+void LineStyle::setDashes(std::vector<double>&& dashes) { this->dashes = std::move(dashes); }
+
+auto LineStyle::hasDashes() const -> bool { return !dashes.empty(); }
diff --git a/entry/src/main/cpp/src/core/model/LineStyle.h b/entry/src/main/cpp/src/core/model/LineStyle.h
new file mode 100644
index 0000000..b10fdb8
--- /dev/null
+++ b/entry/src/main/cpp/src/core/model/LineStyle.h
@@ -0,0 +1,55 @@
+/*
+ * Xournal++
+ *
+ * Dash definition of a stroke
+ *
+ * @author Xournal++ Team
+ * https://github.com/xournalpp/xournalpp
+ *
+ * @license GNU GPLv2 or later
+ */
+
+#pragma once
+
+#include <vector>
+
+#include "util/serializing/Serializable.h"  // for Serializable
+
+class ObjectInputStream;
+class ObjectOutputStream;
+
+
+class LineStyle: public Serializable {
+public:
+    LineStyle();
+    ~LineStyle() override;
+
+    bool operator==(const LineStyle& other) const;
+
+public:
+    // Serialize interface
+    void serialize(ObjectOutputStream& out) const override;
+    void readSerialized(ObjectInputStream& in) override;
+
+    /**
+     * Get dash vector
+     *
+     * @return dashes
+     */
+    const std::vector<double>& getDashes() const;
+
+    /**
+     * @return true if dashed
+     */
+    bool hasDashes() const;
+
+    /**
+     * Set the dash vector and count
+     *
+     * @param dashes Dash data, will be moved, and continuous use from caller invalid
+     */
+    void setDashes(std::vector<double>&& dashes);
+
+private:
+    std::vector<double> dashes;
+};
diff --git a/entry/src/main/cpp/src/core/model/LinkDestination.cpp b/entry/src/main/cpp/src/core/model/LinkDestination.cpp
new file mode 100644
index 0000000..ebc201a
--- /dev/null
+++ b/entry/src/main/cpp/src/core/model/LinkDestination.cpp
@@ -0,0 +1,99 @@
+#include "LinkDestination.h"
+
+#include <utility>  // for move
+
+#include "util/Util.h"  // for npos
+
+struct _LinkDestClass {
+    GObjectClass base_class;
+};
+
+G_DEFINE_TYPE(XojLinkDest, link_dest, G_TYPE_OBJECT)  // @suppress("Unused static function")
+
+static void link_dest_init(XojLinkDest* linkAction) { linkAction->dest = nullptr; }
+
+static gpointer parent_class = nullptr;
+
+static void link_dest_finalize(GObject* object) {
+    delete LINK_DEST(object)->dest;
+    LINK_DEST(object)->dest = nullptr;
+
+    G_OBJECT_CLASS(parent_class)->finalize(object);
+}
+
+static void link_dest_dispose(GObject* object) { G_OBJECT_CLASS(parent_class)->dispose(object); }
+
+static void link_dest_class_init(XojLinkDestClass* linkClass) {
+    GObjectClass* g_object_class = nullptr;
+
+    parent_class = g_type_class_peek_parent(linkClass);
+
+    g_object_class = G_OBJECT_CLASS(linkClass);
+
+    g_object_class->dispose = link_dest_dispose;
+    g_object_class->finalize = link_dest_finalize;
+}
+
+auto link_dest_new() -> XojLinkDest* { return LINK_DEST(g_object_new(TYPE_LINK_DEST, nullptr)); }
+
+LinkDestination::LinkDestination():
+        page(npos),
+        expand(false),
+        left(0),
+        top(0),
+        zoom(0),
+        changeLeft(false),
+        changeZoom(false),
+        changeTop(false),
+        name(""),
+        contents(UnknownType{}) {}
+
+LinkDestination::~LinkDestination() = default;
+
+auto LinkDestination::getPdfPage() const -> size_t { return this->page; }
+
+void LinkDestination::setPdfPage(size_t page) { this->page = page; }
+
+void LinkDestination::setExpand(bool expand) { this->expand = expand; }
+
+auto LinkDestination::getExpand() const -> bool { return this->expand; }
+
+auto LinkDestination::shouldChangeLeft() const -> bool { return changeLeft; }
+
+auto LinkDestination::shouldChangeTop() const -> bool { return changeTop; }
+
+auto LinkDestination::getZoom() const -> double { return zoom; }
+
+auto LinkDestination::getLeft() const -> double { return left; }
+
+auto LinkDestination::getTop() const -> double { return top; }
+
+void LinkDestination::setChangeLeft(double left) {
+    this->left = left;
+    this->changeLeft = true;
+}
+
+void LinkDestination::setChangeZoom(double zoom) {
+    this->zoom = zoom;
+    this->changeZoom = true;
+}
+
+void LinkDestination::setChangeTop(double top) {
+    this->top = top;
+    this->changeTop = true;
+}
+
+void LinkDestination::setName(std::string name) { this->name = std::move(name); }
+auto LinkDestination::getName() const -> const std::string& { return name; }
+
+void LinkDestination::setURI(std::string uri) { this->contents = LinkType{std::move(uri)}; }
+
+auto LinkDestination::isURI() const -> bool { return std::holds_alternative<LinkDestination::LinkType>(contents); }
+
+auto LinkDestination::getURI() const -> std::optional<std::string> {
+    if (auto* t = std::get_if<LinkDestination::LinkType>(&contents)) {
+        return t->uri;
+    } else {
+        return std::nullopt;
+    }
+}
diff --git a/entry/src/main/cpp/src/core/model/LinkDestination.h b/entry/src/main/cpp/src/core/model/LinkDestination.h
new file mode 100644
index 0000000..3e12b94
--- /dev/null
+++ b/entry/src/main/cpp/src/core/model/LinkDestination.h
@@ -0,0 +1,108 @@
+/*
+ * Xournal++
+ *
+ * A link destination in a PDF Document
+ *
+ * @author Xournal++ Team
+ * https://github.com/xournalpp/xournalpp
+ *
+ * @license GNU GPLv2 or later
+ */
+
+#pragma once
+
+#include <cstddef>   // for size_t
+#include <optional>  // for optional
+#include <string>    // for string
+#include <variant>   // for variant
+
+#include <glib-object.h>  // for G_TYPE_CHECK_INSTANCE_CAST, GObject, GType
+#include <glib.h>         // for G_GNUC_CONST
+
+struct _LinkDest;
+
+
+typedef struct _LinkDest XojLinkDest;
+typedef struct _LinkDestClass XojLinkDestClass;
+
+class LinkDestination {
+public:
+    LinkDestination();
+    virtual ~LinkDestination();
+
+    /// A link to a URI.
+    struct LinkType {
+        std::string uri;
+    };
+    /// A link to some unknown PDF action.
+    struct UnknownType {};
+
+    /// Represents a possible PDF link action.
+    using Type = std::variant<UnknownType, LinkType>;
+
+public:
+    size_t getPdfPage() const;
+    void setPdfPage(size_t page);
+
+    void setExpand(bool expand);
+    bool getExpand() const;
+
+    bool shouldChangeLeft() const;
+    bool shouldChangeTop() const;
+
+    double getZoom() const;
+    [[maybe_unused]] double getLeft() const;
+    double getTop() const;
+
+    void setChangeLeft(double left);
+    void setChangeZoom(double zoom);
+    void setChangeTop(double top);
+
+    void setName(std::string name);
+    const std::string& getName() const;
+
+    /// \return Whether this link refers to a URI.
+    bool isURI() const;
+
+    std::optional<std::string> getURI() const;
+
+    /// \return Changes this link to refer to the given URI.
+    void setURI(std::string uri);
+
+private:
+    size_t page;
+    bool expand;
+
+    double left;
+    double top;
+    double zoom;
+
+    bool changeLeft;
+    bool changeZoom;
+    bool changeTop;
+
+    std::string name;
+    Type contents;
+};
+
+struct _LinkDest {
+    GObject base_instance;
+    LinkDestination* dest;
+};
+
+enum {
+    DOCUMENT_LINKS_COLUMN_NAME,
+    DOCUMENT_LINKS_COLUMN_LINK,
+    DOCUMENT_LINKS_COLUMN_EXPAND,
+    DOCUMENT_LINKS_COLUMN_PAGE_NUMBER
+};
+
+#define TYPE_LINK_DEST (link_dest_get_type())
+#define LINK_DEST(object) (G_TYPE_CHECK_INSTANCE_CAST((object), TYPE_LINK_DEST, XojLinkDest))
+#define LINK_DEST_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST((klass), TYPE_LINK_DEST, XojLinkDestClass))
+#define IS_LINK_DEST(object) (G_TYPE_CHECK_INSTANCE_TYPE((object), TYPE_LINK_DEST))
+#define IS_LINK_DEST_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((klass), TYPE_LINK_DEST))
+#define LINK_DEST_GET_CLASS(object) (G_TYPE_INSTANCE_GET_CLASS((object), TYPE_LINK_DEST, XojLinkDestClass))
+
+GType link_dest_get_type(void);
+XojLinkDest* link_dest_new();
diff --git a/entry/src/main/cpp/src/core/model/MathVect.cpp b/entry/src/main/cpp/src/core/model/MathVect.cpp
new file mode 100644
index 0000000..42bdd3a
--- /dev/null
+++ b/entry/src/main/cpp/src/core/model/MathVect.cpp
@@ -0,0 +1,17 @@
+#include "MathVect.h"
+
+#include <cmath>
+
+MathVect2::MathVect2(double dx, double dy): dx(dx), dy(dy) {}
+
+double MathVect2::scalarProduct(const MathVect2& u, const MathVect2& v) { return u.dx * v.dx + u.dy * v.dy; }
+double MathVect2::norm() const { return std::hypot(dx, dy); }
+double MathVect2::squaredNorm() const { return dx * dx + dy * dy; }
+bool MathVect2::isZero() const { return dx == 0.0 && dx == 0.0; }
+double MathVect2::argument() const { return std::atan2(dy, dx); }
+
+MathVect2 MathVect2::operator+(const MathVect2& u) const { return {dx + u.dx, dy + u.dy}; }
+MathVect2 MathVect2::operator-(const MathVect2& u) const { return {dx - u.dx, dy - u.dy}; }
+MathVect2 MathVect2::operator-() const { return {-dx, -dy}; }
+
+MathVect2 operator*(const double c, const MathVect2& u) { return {c * u.dx, c * u.dy}; }
diff --git a/entry/src/main/cpp/src/core/model/MathVect.h b/entry/src/main/cpp/src/core/model/MathVect.h
new file mode 100644
index 0000000..90a3f78
--- /dev/null
+++ b/entry/src/main/cpp/src/core/model/MathVect.h
@@ -0,0 +1,42 @@
+/*
+ * Xournal++
+ *
+ * Rudimentary 2D mathematical vectors
+ *
+ * @author Xournal++ Team
+ * https://github.com/xournalpp/xournalpp
+ *
+ * @license GNU GPLv2 or later
+ */
+
+#pragma once
+
+#include "util/Point.h"
+
+struct MathVect2 {
+    MathVect2() = default;
+    MathVect2(double dx, double dy);
+    template <typename point_type, std::enable_if_t<!std::is_arithmetic_v<point_type>, bool> = true>
+    MathVect2(const point_type& p, const point_type& q): dx(q.x - p.x), dy(q.y - p.y) {}
+
+    double dx{};
+    double dy{};
+    static double scalarProduct(const MathVect2& u, const MathVect2& v);
+    double norm() const;
+    double squaredNorm() const;
+    bool isZero() const;
+    MathVect2 operator+(const MathVect2& u) const;
+    MathVect2 operator-(const MathVect2& u) const;
+    MathVect2 operator-() const;
+    double argument() const;
+};
+
+MathVect2 operator*(const double c, const MathVect2& u);
+template <typename point_type>
+xoj::util::Point<double> operator+(const point_type& p, const MathVect2& v) {
+    return {p.x + v.dx, p.y + v.dy};
+}
+template <typename point_type>
+xoj::util::Point<double> operator-(const point_type& p, const MathVect2& v) {
+    return {p.x - v.dx, p.y - v.dy};
+}
diff --git a/entry/src/main/cpp/src/core/model/OverlayBase.h b/entry/src/main/cpp/src/core/model/OverlayBase.h
new file mode 100644
index 0000000..73751eb
--- /dev/null
+++ b/entry/src/main/cpp/src/core/model/OverlayBase.h
@@ -0,0 +1,23 @@
+/*
+ * Xournal++
+ *
+ *
+ *
+ * @author Xournal++ Team
+ * https://github.com/xournalpp/xournalpp
+ *
+ * @license GNU GPLv2 or later
+ */
+
+#pragma once
+
+/**
+ * Empty base class for overlays: anything that is drawn over a document, but not in the document
+ *  (e.g. active tools, selections, search results highlighting...).
+ *
+ * This class is only used for pointer comparison.
+ */
+class OverlayBase {
+public:
+    virtual ~OverlayBase() = default;
+};
diff --git a/entry/src/main/cpp/src/core/model/PageHandler.cpp b/entry/src/main/cpp/src/core/model/PageHandler.cpp
new file mode 100644
index 0000000..fffa753
--- /dev/null
+++ b/entry/src/main/cpp/src/core/model/PageHandler.cpp
@@ -0,0 +1,40 @@
+#include "PageHandler.h"
+
+#include "PageListener.h"  // for PageListener
+
+namespace xoj::util {
+template <class T>
+class Rectangle;
+}  // namespace xoj::util
+
+using xoj::util::Rectangle;
+
+PageHandler::PageHandler() = default;
+
+PageHandler::~PageHandler() = default;
+
+void PageHandler::addListener(PageListener* l) { this->listeners.push_back(l); }
+
+void PageHandler::removeListener(PageListener* l) { this->listeners.remove(l); }
+
+void PageHandler::fireRectChanged(Rectangle<double>& rect) {
+    for (PageListener* pl: this->listeners) { pl->rectChanged(rect); }
+}
+
+void PageHandler::fireRangeChanged(Range& range) {
+    for (PageListener* pl: this->listeners) { pl->rangeChanged(range); }
+}
+
+void PageHandler::fireElementChanged(const Element* elem) {
+    for (PageListener* pl: this->listeners) { pl->elementChanged(elem); }
+}
+
+void PageHandler::fireElementsChanged(const std::vector<const Element*>& elements, Range range) {
+    for (PageListener* pl: this->listeners) {
+        pl->elementsChanged(elements, range);
+    }
+}
+
+void PageHandler::firePageChanged() {
+    for (PageListener* pl: this->listeners) { pl->pageChanged(); }
+}
diff --git a/entry/src/main/cpp/src/core/model/PageHandler.h b/entry/src/main/cpp/src/core/model/PageHandler.h
new file mode 100644
index 0000000..5266191
--- /dev/null
+++ b/entry/src/main/cpp/src/core/model/PageHandler.h
@@ -0,0 +1,52 @@
+/*
+ * Xournal++
+ *
+ * Page handler
+ *
+ * @author Xournal++ Team
+ * https://github.com/xournalpp/xournalpp
+ *
+ * @license GNU GPLv2 or later
+ */
+
+#pragma once
+
+#include <list>  // for list
+#include <vector>
+
+#include "util/Range.h"  // for Range
+
+class Element;
+class PageListener;
+class Range;
+namespace xoj::util {
+template <class T>
+class Rectangle;
+}  // namespace xoj::util
+
+class PageHandler {
+public:
+    PageHandler();
+    virtual ~PageHandler();
+
+public:
+    void fireRectChanged(xoj::util::Rectangle<double>& rect);
+    void fireRangeChanged(Range& range);
+    void fireElementChanged(const Element* elem);
+    /**
+     * @brief The listed elements have been changed
+     * @param range (optional) if provided, the Range must contain the bounding boxes of the changed elements, both
+     * before and after they were changed
+     */
+    void fireElementsChanged(const std::vector<const Element*>& elements, Range range = Range());
+    void firePageChanged();
+
+private:
+    void addListener(PageListener* l);
+    void removeListener(PageListener* l);
+
+private:
+    std::list<PageListener*> listeners;
+
+    friend class PageListener;
+};
diff --git a/entry/src/main/cpp/src/core/model/PageListener.cpp b/entry/src/main/cpp/src/core/model/PageListener.cpp
new file mode 100644
index 0000000..397c265
--- /dev/null
+++ b/entry/src/main/cpp/src/core/model/PageListener.cpp
@@ -0,0 +1,19 @@
+#include "PageListener.h"
+
+#include "PageHandler.h"
+
+PageListener::PageListener() = default;
+
+PageListener::~PageListener() { unregisterFromHandler(); }
+
+void PageListener::registerToHandler(std::shared_ptr<PageHandler> const& _handler) {
+    this->handler = _handler;
+    _handler->addListener(this);
+}
+
+void PageListener::unregisterFromHandler() {
+    if (auto _handler = this->handler.lock(); _handler) {
+        _handler->removeListener(this);
+        this->handler.reset();
+    }
+}
diff --git a/entry/src/main/cpp/src/core/model/PageListener.h b/entry/src/main/cpp/src/core/model/PageListener.h
new file mode 100644
index 0000000..b5d237d
--- /dev/null
+++ b/entry/src/main/cpp/src/core/model/PageListener.h
@@ -0,0 +1,42 @@
+/*
+ * Xournal++
+ *
+ * Page listener
+ *
+ * @author Xournal++ Team
+ * https://github.com/xournalpp/xournalpp
+ *
+ * @license GNU GPLv2 or later
+ */
+
+#pragma once
+
+#include <memory>  // for shared_ptr, weak_ptr
+#include <vector>
+
+class Element;
+class PageHandler;
+class Range;
+namespace xoj::util {
+template <class T>
+class Rectangle;
+}  // namespace xoj::util
+
+class PageListener {
+public:
+    PageListener();
+    virtual ~PageListener();
+
+public:
+    void registerToHandler(std::shared_ptr<PageHandler> const& handler);
+    void unregisterFromHandler();
+
+    virtual void rectChanged(xoj::util::Rectangle<double>& rect) {}
+    virtual void rangeChanged(Range& range) {}
+    virtual void elementChanged(const Element* elem) {}
+    virtual void elementsChanged(const std::vector<const Element*>& elements, const Range& range) {}
+    virtual void pageChanged() {}
+
+private:
+    std::weak_ptr<PageHandler> handler;
+};
diff --git a/entry/src/main/cpp/src/core/model/PageRef.h b/entry/src/main/cpp/src/core/model/PageRef.h
new file mode 100644
index 0000000..8feefb4
--- /dev/null
+++ b/entry/src/main/cpp/src/core/model/PageRef.h
@@ -0,0 +1,18 @@
+/*
+ * Xournal++
+ *
+ * A page reference, should only allocated on the stack
+ *
+ * @author Xournal++ Team
+ * https://github.com/xournalpp/xournalpp
+ *
+ * @license GNU GPLv2 or later
+ */
+#pragma once
+
+#include <memory>
+
+class XojPage;
+
+using PageRef = std::shared_ptr<XojPage>;
+using ConstPageRef = std::shared_ptr<const XojPage>;
diff --git a/entry/src/main/cpp/src/core/model/PageType.cpp b/entry/src/main/cpp/src/core/model/PageType.cpp
new file mode 100644
index 0000000..db81621
--- /dev/null
+++ b/entry/src/main/cpp/src/core/model/PageType.cpp
@@ -0,0 +1,37 @@
+#include "PageType.h"
+
+PageType::PageType(): format(PageTypeFormat::Lined) {}
+
+PageType::PageType(PageTypeFormat format): format(format) {}
+
+PageType::PageType(const PageType& other) {
+    this->format = other.format;
+    this->config = other.config;
+}
+
+PageType::~PageType() = default;
+
+/**
+ * Compare Operator
+ */
+auto PageType::operator==(const PageType& other) const -> bool {
+    return this->config == other.config && this->format == other.format;
+}
+auto PageType::operator!=(const PageType& other) const -> bool { return !(*this == other); }
+
+/**
+ * PDF background
+ */
+auto PageType::isPdfPage() const -> bool { return this->format == PageTypeFormat::Pdf; }
+
+/**
+ * Image Background
+ */
+auto PageType::isImagePage() const -> bool { return this->format == PageTypeFormat::Image; }
+
+/**
+ * Special background
+ */
+auto PageType::isSpecial() const -> bool {
+    return this->format == PageTypeFormat::Pdf || this->format == PageTypeFormat::Image;
+}
diff --git a/entry/src/main/cpp/src/core/model/PageType.h b/entry/src/main/cpp/src/core/model/PageType.h
new file mode 100644
index 0000000..529aead
--- /dev/null
+++ b/entry/src/main/cpp/src/core/model/PageType.h
@@ -0,0 +1,59 @@
+/*
+ * Xournal++
+ *
+ * Paper background type
+ *
+ * @author Xournal++ Team
+ * https://github.com/xournalpp/xournalpp
+ *
+ * @license GNU GPLv2 or later
+ */
+
+#pragma once
+
+#include <string>  // for string
+
+
+enum class PageTypeFormat { Plain, Ruled, Lined, Staves, Graph, Dotted, IsoDotted, IsoGraph, Pdf, Image };
+
+class PageType {
+public:
+    PageType();
+    explicit PageType(PageTypeFormat format);
+    PageType(const PageType& other);
+    ~PageType();
+
+private:
+public:
+    /**
+     * Compare Operator
+     */
+    bool operator==(const PageType& other) const;
+    bool operator!=(const PageType& other) const;
+
+    /**
+     * PDF background
+     */
+    bool isPdfPage() const;
+
+    /**
+     * Image Background
+     */
+    bool isImagePage() const;
+
+    /**
+     * Special background
+     */
+    bool isSpecial() const;
+
+public:
+    /**
+     * Base format
+     */
+    PageTypeFormat format;
+
+    /**
+     * Arguments for the format
+     */
+    std::string config;
+};
diff --git a/entry/src/main/cpp/src/core/model/PaperSize.cpp b/entry/src/main/cpp/src/core/model/PaperSize.cpp
new file mode 100644
index 0000000..c8b35cc
--- /dev/null
+++ b/entry/src/main/cpp/src/core/model/PaperSize.cpp
@@ -0,0 +1,30 @@
+#include "PaperSize.h"
+
+static auto areDoublesEqual(double x, double y) -> bool { return std::abs(x - y) <= 0.01; }
+
+PaperSize::PaperSize(const xoj::util::GtkPaperSizeUPtr& gtkPaperSize):
+        width(gtk_paper_size_get_width(gtkPaperSize.get(), GTK_UNIT_POINTS)),
+        height(gtk_paper_size_get_height(gtkPaperSize.get(), GTK_UNIT_POINTS)) {}
+
+PaperSize::PaperSize(const PageTemplateSettings& model): width(model.getPageWidth()), height(model.getPageHeight()) {}
+
+PaperSize::PaperSize(double width, double height): width(width), height(height) {}
+
+auto PaperSize::orientation() const -> PaperOrientation { return static_cast<PaperOrientation>(height > width); }
+
+void PaperSize::swapWidthHeight() {
+    double const originalWidth = width;
+    width = height;
+    height = originalWidth;
+}
+
+auto PaperSize::equalDimensions(const PaperSize& other) const -> bool {
+    return (areDoublesEqual(other.height, height) && areDoublesEqual(other.width, width)) ||
+           (areDoublesEqual(other.height, width) && areDoublesEqual(other.width, height));
+}
+
+auto PaperSize::operator!=(const PaperSize& other) const -> bool { return !operator==(other); }
+
+auto PaperSize::operator==(const PaperSize& other) const -> bool {
+    return areDoublesEqual(other.height, height) && areDoublesEqual(other.width, width);
+}
diff --git a/entry/src/main/cpp/src/core/model/PaperSize.h b/entry/src/main/cpp/src/core/model/PaperSize.h
new file mode 100644
index 0000000..f52e89a
--- /dev/null
+++ b/entry/src/main/cpp/src/core/model/PaperSize.h
@@ -0,0 +1,62 @@
+/*
+ * Xournal++
+ *
+ * Paper size type and paper orientation enum
+ *
+ * @author Xournal++ Team
+ * https://github.com/xournalpp/xournalpp
+ *
+ * @license GNU GPLv2 or later
+ */
+
+#include <memory>
+#include <variant>
+#include <vector>
+
+#include <gtk/gtk.h>
+
+#include "control/settings/PageTemplateSettings.h"
+#include "gui/PaperFormatUtils.h"
+
+#pragma once
+
+enum class PaperOrientation : bool { HORIZONTAL = false, VERTICAL = true };
+
+class PaperSize {
+public:
+    /*
+     * Width of the paper stored in the standard unit "points"
+     */
+    double width;
+    /*
+     * Height of the paper stored in the standard unit "points"
+     */
+    double height;
+
+    /**
+     * @brief Checks that the dimensions and orientation equal (width and height cannot be swapped)
+     * @param other The second PaperSize struct
+     * @return Whether both PaperSize structs are exactly equal
+     */
+    auto operator==(const PaperSize& other) const -> bool;
+    auto operator!=(const PaperSize& other) const -> bool;
+
+    /**
+     * @brief Checks that the dimensions are equal, not checking for equality of orientation (width and height can be
+     * swapped)
+     * @param other The second PaperSize struct
+     * @return Whether both PaperSize structs have equal dimensions
+     */
+    auto equalDimensions(const PaperSize& other) const -> bool;
+
+    /**
+     * @brief Swapping width and height, effectively reversing orientation
+     */
+    void swapWidthHeight();
+    [[nodiscard]] auto orientation() const -> PaperOrientation;
+
+    // Constructors
+    explicit PaperSize(const xoj::util::GtkPaperSizeUPtr& gtkPaperSize);
+    explicit PaperSize(const PageTemplateSettings& model);
+    PaperSize(double width, double height);
+};
\ No newline at end of file
diff --git a/entry/src/main/cpp/src/core/model/PathParameter.h b/entry/src/main/cpp/src/core/model/PathParameter.h
new file mode 100644
index 0000000..2cc7429
--- /dev/null
+++ b/entry/src/main/cpp/src/core/model/PathParameter.h
@@ -0,0 +1,30 @@
+/**
+ * Xournal++
+ *
+ * @brief Type for parameters of points on a path.
+ * Similar to std::pair<size_t, double>, but with named variables
+ *
+ * @author Xournal++ Team
+ * https://github.com/xournalpp/xournalpp
+ *
+ * @license GNU GPLv2 or later
+ */
+
+#pragma once
+
+struct PathParameter {
+    PathParameter() = default;
+    PathParameter(size_t index, double t): index(index), t(t) {}
+    ~PathParameter() = default;
+    bool operator==(const PathParameter& p) const { return index == p.index && t == p.t; };
+    bool operator!=(const PathParameter& p) const { return !(*this == p); };
+    bool operator<(const PathParameter& p) const { return index < p.index || (index == p.index && t < p.t); };
+    bool operator>(const PathParameter& p) const { return index > p.index || (index == p.index && t > p.t); };
+    bool operator<=(const PathParameter& p) const { return index < p.index || (index == p.index && t <= p.t); };
+    bool operator>=(const PathParameter& p) const { return index > p.index || (index == p.index && t >= p.t); };
+
+    bool isValid() const { return t <= 1.0 && t >= 0.0; }
+
+    size_t index;
+    double t;
+};
diff --git a/entry/src/main/cpp/src/core/model/Point.cpp b/entry/src/main/cpp/src/core/model/Point.cpp
new file mode 100644
index 0000000..5d0324f
--- /dev/null
+++ b/entry/src/main/cpp/src/core/model/Point.cpp
@@ -0,0 +1,23 @@
+#include "Point.h"
+
+#include <cmath>  // for hypot
+
+#include "util/Rectangle.h"  // for Rectangle
+
+Point::Point(double x, double y): x(x), y(y) {}
+
+Point::Point(double x, double y, double z): x(x), y(y), z(z) {}
+
+auto Point::lineLengthTo(const Point& p) const -> double { return std::hypot(this->x - p.x, this->y - p.y); }
+
+auto Point::lineTo(const Point& p, double length) const -> Point { return relativeLineTo(p, length / lineLengthTo(p)); }
+
+auto Point::relativeLineTo(const Point& p, const double ratio) const -> Point {
+    return Point(x + ratio * (p.x - x), y + ratio * (p.y - y), z + ratio * (p.z - z));
+}
+
+auto Point::equalsPos(const Point& p) const -> bool { return this->x == p.x && this->y == p.y; }
+
+auto Point::isInside(const xoj::util::Rectangle<double>& rect) const -> bool {
+    return x >= rect.x && x <= rect.x + rect.width && y >= rect.y && y <= rect.y + rect.height;
+}
diff --git a/entry/src/main/cpp/src/core/model/Point.h b/entry/src/main/cpp/src/core/model/Point.h
new file mode 100644
index 0000000..5a101a0
--- /dev/null
+++ b/entry/src/main/cpp/src/core/model/Point.h
@@ -0,0 +1,102 @@
+/*
+ * Xournal++
+ *
+ * A point of a stroke
+ *
+ * @author Xournal++ Team
+ * https://github.com/xournalpp/xournalpp
+ *
+ * @license GNU GPLv2 or later
+ */
+
+#pragma once
+
+
+namespace xoj::util {
+template <class T>
+class Rectangle;
+}  // namespace xoj::util
+
+/**
+ * @class Point
+ * @brief Representation of a point.
+ */
+class Point {
+public:
+    Point() = default;
+    ~Point() = default;
+    Point(const Point& p) = default;
+
+    Point& operator=(Point const&) = default;
+
+    /**
+     * @brief Point from two values.
+     * @param x X value of the point.
+     * @param y Y value of the point.
+     */
+    Point(double x, double y);
+
+    /**
+     * @brief Point from three values.
+     * @param x X value of the point.
+     * @param y Y value of the point.
+     * @param z Z value of the point. This denotes the pressure sensitivity.
+     */
+    Point(double x, double y, double z);
+
+public:
+    /**
+     * @brief Compute the distance to another point.
+     * @param p The other point.
+     * @return The Euclidean distance to the other point.
+     */
+    double lineLengthTo(const Point& p) const;
+
+    /**
+     * @brief Compute new Point in the direction from this to another Point.
+     * @param p The other Point.
+     * @param length The line length or vector length.
+     * @return The new Point.
+     */
+    Point lineTo(const Point& p, double length) const;
+
+    /**
+     * @brief Compute new Point in the direction from this to another Point.
+     * @param p The other Point.
+     * @param ratio The line length over the distance between this and the other Point p
+     * @return The new Point.
+     */
+    Point relativeLineTo(const Point& p, double ratio) const;
+
+    /**
+     * @brief Compare if this Point has the same position as another Point.
+     * @param p The other Point.
+     * @return True if the coordinates are equal. False otherwise.
+     */
+    bool equalsPos(const Point& p) const;
+
+    /**
+     * @brief Test if the point lies (strictly) inside a given rectangle
+     * @param rect The rectangle
+     * @return True if the point is in rectangle, false otherwise
+     */
+    bool isInside(const xoj::util::Rectangle<double>& rect) const;
+
+public:
+    /**
+     * @brief Private storage for x coordinate.
+     */
+    double x = 0;
+
+    /**
+     * @brief Private storage for y coordinate.
+     */
+    double y = 0;
+
+    /**
+     * @brief Private storage for pressure.
+     */
+    double z = NO_PRESSURE;
+
+    static constexpr double NO_PRESSURE = -1;
+};
diff --git a/entry/src/main/cpp/src/core/model/Setsquare.cpp b/entry/src/main/cpp/src/core/model/Setsquare.cpp
new file mode 100644
index 0000000..af693c1
--- /dev/null
+++ b/entry/src/main/cpp/src/core/model/Setsquare.cpp
@@ -0,0 +1,49 @@
+#include "Setsquare.h"
+
+#include <cmath>             // for sin, cos
+#include <initializer_list>  // for initializer_list
+
+#include "gui/inputdevices/SetsquareInputHandler.h"
+#include "view/SetsquareView.h"
+
+Setsquare::Setsquare(): Setsquare(INITIAL_HEIGHT, .0, 0., 0.) {}
+
+Setsquare::Setsquare(double height, double rotation, double x, double y): GeometryTool(height, rotation, x, y) {
+    this->lastRepaintRange = getToolRange(true);
+}
+
+Setsquare::~Setsquare() {
+    viewPool->dispatchAndClear(xoj::view::SetsquareView::FINALIZATION_REQUEST, lastRepaintRange);
+}
+
+auto Setsquare::getToolRange(bool transformed) const -> Range {
+    const auto h = height * CM;
+    Range rg;
+    if (transformed) {
+        const auto cs = std::cos(rotation);
+        const auto si = std::sin(rotation);
+        rg.addPoint(origin.x + cs * h, origin.y - si * h);
+        rg.addPoint(origin.x - cs * h, origin.y + si * h);
+        rg.addPoint(origin.x - si * h, origin.y + cs * h);
+    } else {
+        rg.addPoint(h, 0);
+        rg.addPoint(-h, 0);
+        rg.addPoint(0, h);
+    }
+
+    // Padding required to fully render the boundary red lines
+    constexpr double RENDER_PADDING = 1.0;
+
+    rg.addPadding(RENDER_PADDING + .5 * xoj::view::SetsquareView::LINE_WIDTH_IN_CM * CM);  // account for line width
+    return rg;
+}
+
+void Setsquare::notify(bool resetMask) const {
+    if (resetMask) {
+        viewPool->dispatch(xoj::view::GeometryToolView::RESET_MASK);
+    }
+    viewPool->dispatch(xoj::view::SetsquareView::UPDATE_VALUES, this->getHeight(), this->getRotation(),
+                       this->getMatrix());
+    Range rg = this->getToolRange(true);
+    viewPool->dispatch(xoj::view::SetsquareView::FLAG_DIRTY_REGION, this->computeRepaintRange(rg));
+}
diff --git a/entry/src/main/cpp/src/core/model/Setsquare.h b/entry/src/main/cpp/src/core/model/Setsquare.h
new file mode 100644
index 0000000..9aa7308
--- /dev/null
+++ b/entry/src/main/cpp/src/core/model/Setsquare.h
@@ -0,0 +1,57 @@
+/*
+ * Xournal++
+ *
+ * A setsquare model
+ *
+ * @author Xournal++ Team
+ * https://github.com/xournalpp/xournalpp
+ *
+ * @license GNU GPLv2 or later
+ */
+
+#pragma once
+
+#include <cmath>
+
+#include "model/GeometryTool.h"
+
+/**
+ * @brief A class that models a setsquare
+ *
+ * The setsquare has the shape of a right-angled isosceles triangle and has a certain height, may be rotated and
+ * translated. User coordinates are specified in cm.
+ */
+
+class SetsquareInputHandler;
+
+namespace xoj::view {
+class SetsquareView;
+};
+
+
+class Setsquare: public GeometryTool {
+public:
+    Setsquare();
+
+    /**
+     * @brief A setsquare specified by its height, rotation angle and translations in x- and y-directions
+     * @param height the height of the setsquare
+     * @param rotation the angle (in radian) around which the setsquare is rotated with respect to the x-axis
+     * @param x the x-coordinate o(in pt) f the mid point of the longest side of the setsquare
+     * @param y the y-coordinate (in pt) of the mid point of the longest side of the setsquare
+     */
+    Setsquare(double height, double rotation, double x, double y);
+
+    virtual ~Setsquare();
+
+    void notify(bool resetMask) const override;  // calls the update method of all observers
+    Range getToolRange(bool transformed) const override;
+
+    // parameters used when initially displaying setsquare on a page
+    static constexpr double INITIAL_HEIGHT = 8.0;
+    // relation between setsquare height and radius
+    static constexpr double DISTANCE_SEMICIRCLE_FROM_LEGS = 1.15;
+    static inline double radiusFromHeight(double height) {
+        return height / std::sqrt(2.) - DISTANCE_SEMICIRCLE_FROM_LEGS;
+    }
+};
diff --git a/entry/src/main/cpp/src/core/model/Snapping.cpp b/entry/src/main/cpp/src/core/model/Snapping.cpp
new file mode 100644
index 0000000..b01b893
--- /dev/null
+++ b/entry/src/main/cpp/src/core/model/Snapping.cpp
@@ -0,0 +1,71 @@
+#include "Snapping.h"
+
+#include <algorithm>  // for min, max
+#include <array>      // for array
+#include <cmath>      // for pow, atan2, cos, hypot, remainder, sin, abs
+#include <cstdlib>    // for abs
+
+#include "model/Point.h"  // for Point
+
+namespace Snapping {
+
+[[nodiscard]] inline double roundToMultiple(double val, double multiple) { return val - std::remainder(val, multiple); }
+[[nodiscard]] inline double distance(Point const& a, Point const& b) { return std::hypot(b.x - a.x, b.y - a.y); }
+
+double snapVertically(double y, double gridSize, double tolerance, double yOffset) {
+    double ySnapped = roundToMultiple(y - yOffset, gridSize) + yOffset;
+    return std::abs(ySnapped - y) < tolerance * gridSize / 2.0 ? ySnapped : y;
+}
+
+double snapHorizontally(double x, double gridSize, double tolerance, double xOffset) {
+    double xSnapped = roundToMultiple(x - xOffset, gridSize) + xOffset;
+    return std::abs(xSnapped - x) < tolerance * gridSize / 2.0 ? xSnapped : x;
+}
+
+Point snapToGrid(Point const& pos, double columnSpacing, double rowSpacing, double tolerance, double xOffset,
+                 double yOffset) {
+    // Round to nearest grid point
+    Point nearestVertex{roundToMultiple(pos.x - xOffset, columnSpacing) + xOffset,
+                        roundToMultiple(pos.y - yOffset, rowSpacing) + yOffset, pos.z};
+
+    // Only snap if within tolerance threshold (fraction of the half-diagonal)
+    const double dist = distance(pos, nearestVertex);
+    const double snapThreshold = 0.5 * std::hypot(columnSpacing, rowSpacing) * tolerance;
+    return (dist < snapThreshold) ? nearestVertex : pos;
+}
+
+double snapAngle(double radian, double tolerance) {
+    auto snapped = roundToMultiple(radian, M_PI_4 / 3.0);
+    double abs_tolerance = (M_PI_4 / 6.0) * tolerance;
+    return std::abs(snapped - radian) < abs_tolerance ? snapped : radian;
+}
+
+Point snapRotation(Point const& pos, Point const& center, double tolerance) {
+    auto const dist = distance(pos, center);
+    auto const angle = std::atan2(pos.y - center.y, pos.x - center.x);
+    auto const snappedAngle = snapAngle(angle, tolerance);
+    return {center.x + dist * std::cos(snappedAngle),  //
+            center.y + dist * std::sin(snappedAngle), pos.z};
+}
+
+Point projToLine(Point const& pos, Point const& first, Point const& second) {
+    const double scalar = ((first.x - pos.x) * (second.y - first.y) + (first.y - pos.y) * (first.x - second.x)) /
+                          (std::pow(second.y - first.y, 2) + std::pow(first.x - second.x, 2));
+    const double projX = pos.x + scalar * (second.y - first.y);
+    const double projY = pos.y + scalar * (first.x - second.x);
+    return Point(projX, projY, pos.z);
+}
+
+double distanceLine(Point const& pos, Point const& first, Point const& second) {
+    const auto proj = projToLine(pos, first, second);
+    if (std::min(first.x, second.x) <= proj.x && proj.x <= std::max(first.x, second.x) &&
+        std::min(first.y, second.y) <= proj.y && proj.y <= std::max(first.y, second.y)) {
+        return distance(pos, proj);
+    } else {
+        const double dist1 = distance(pos, first);
+        const double dist2 = distance(pos, second);
+        return std::min(dist1, dist2);
+    }
+}
+
+}  // namespace Snapping
diff --git a/entry/src/main/cpp/src/core/model/Snapping.h b/entry/src/main/cpp/src/core/model/Snapping.h
new file mode 100644
index 0000000..2e9d2d5
--- /dev/null
+++ b/entry/src/main/cpp/src/core/model/Snapping.h
@@ -0,0 +1,83 @@
+/*
+ * Xournal++
+ *
+ * Snapping methods
+ *
+ * @author Xournal++ Team
+ * https://github.com/xournalpp/xournalpp
+ *
+ * @license GNU GPLv2 or later
+ */
+#pragma once
+
+#include "Point.h"
+
+namespace Snapping {
+
+/**
+ * @brief If a value is near enough to the y-coordinate of a grid point, it returns the nearest y-coordinate of the
+ * grid point. Otherwise the original value itself.
+ * @param y the value
+ * @param gridSize the distance to each snapping point
+ * @param tolerance the tolerance as a fraction of a half grid diagonal (assumed to be between 0 and 1)
+ * @param yOffset the vertical offset of the grid (e.g., from page margins)
+ */
+[[nodiscard]] double snapVertically(double y, double gridSize, double tolerance, double yOffset = 0.0);
+
+/**
+ * @brief If a value is near enough to the x-coordinate of a grid point, it returns the nearest x-coordinate of the
+ * grid point. Otherwise the original value itself.
+ * @param x the value
+ * @param gridSize the distance to each snapping point
+ * @param tolerance the tolerance as a fraction of a half grid diagonal (assumed to be between 0 and 1)
+ * @param xOffset the horizontal offset of the grid (e.g., from page margins)
+ */
+[[nodiscard]] double snapHorizontally(double x, double gridSize, double tolerance, double xOffset = 0.0);
+
+/**
+ * @brief If a point's distance to the nearest grid point is under a certain tolerance, it returns the nearest
+ * grid point. Otherwise the original Point itself. Supports arbitrary column/row spacings.
+ * @param pos the position
+ * @param columnSpacing the horizontal distance between grid points (in user units)
+ * @param rowSpacing the vertical distance between grid points (in user units)
+ * @param tolerance the tolerance as a fraction of the grid diagonal (assumed to be between 0 and 1)
+ * @param xOffset the horizontal offset of the grid (e.g., from page margins)
+ * @param yOffset the vertical offset of the grid (e.g., from page margins)
+ */
+[[nodiscard]] Point snapToGrid(Point const& pos, double columnSpacing, double rowSpacing, double tolerance,
+                               double xOffset, double yOffset);
+
+/**
+ * @brief if the angles distance to a multiple quarter of PI is under a certain tolerance, it returns the latter.
+ * Otherwise the original angle.
+ * @param radian the angle (in radian)
+ * @param tolerance the tolerance as a fraction of M_PI/8 (assumed to be between 0 and 1)
+ */
+[[nodiscard]] double snapAngle(double radian, double tolerance);
+
+/**
+ * @brief Snaps the angle between the horizontal axis and the line between the given point and center
+ * and returns the point rotated accordingly
+ * @param pos the coordinate of the point
+ * @param center the center of rotation
+ * @param tolerance the tolerance as a fraction of M_PI/8 (assumed to be between 0 and 1)
+ */
+[[nodiscard]] Point snapRotation(Point const& pos, Point const& center, double tolerance);
+
+/**
+ * @brief For a given point computes the nearest point on a straight line specified by two points lying on it
+ * @param pos the given point
+ * @param first the first point of the straight line
+ * @param second the second point of the straight line
+ */
+[[nodiscard]] Point projToLine(Point const& pos, Point const& first, Point const& second);
+
+/**
+ * @brief Computes the distance from a given point to a line sgement specified by its end points
+ * @param pos the given point
+ * @param first the first end point of the line segment
+ * @param second the second end point of the line segment
+ */
+[[nodiscard]] double distanceLine(Point const& pos, Point const& first, Point const& second);
+
+}  // namespace Snapping
diff --git a/entry/src/main/cpp/src/core/model/SplineSegment.cpp b/entry/src/main/cpp/src/core/model/SplineSegment.cpp
new file mode 100644
index 0000000..5aa006b
--- /dev/null
+++ b/entry/src/main/cpp/src/core/model/SplineSegment.cpp
@@ -0,0 +1,70 @@
+#include "SplineSegment.h"
+
+#include <cmath>     // for abs
+#include <iterator>  // for end
+
+SplineSegment::SplineSegment(const Point& p, const Point& q):
+        firstKnot(p), secondKnot(q), firstControlPoint(p), secondControlPoint(q) {}
+
+SplineSegment::SplineSegment(const Point& p, const Point& fp, const Point& sp, const Point& q) {
+    firstKnot = p;
+    firstControlPoint = fp;
+    secondControlPoint = sp;
+    secondKnot = q;
+}
+
+void SplineSegment::draw(cairo_t* cr) const {
+    cairo_move_to(cr, firstKnot.x, firstKnot.y);
+    cairo_curve_to(cr, firstControlPoint.x, firstControlPoint.y, secondControlPoint.x, secondControlPoint.y,
+                   secondKnot.x, secondKnot.y);
+}
+
+auto SplineSegment::toPointSequence(bool usePressure) const -> std::list<Point> {
+    if (isFlatEnough(usePressure)) {
+        return {firstKnot};
+    }
+    auto const& childSegments = subdivide(0.5, usePressure);
+    auto left_points = childSegments.first.toPointSequence(usePressure);
+    left_points.splice(end(left_points), childSegments.second.toPointSequence(usePressure));
+    return left_points;
+}
+
+auto SplineSegment::subdivide(float t, bool usePressure) const -> std::pair<SplineSegment, SplineSegment> {
+
+    Point b0 = SplineSegment::linearInterpolate(firstKnot, firstControlPoint, t);  // Same as evaluating a Bezier
+    Point b1 = SplineSegment::linearInterpolate(firstControlPoint, secondControlPoint, t);
+    Point b2 = SplineSegment::linearInterpolate(secondControlPoint, secondKnot, t);
+
+    Point c0 = SplineSegment::linearInterpolate(b0, b1, t);
+    Point c1 = SplineSegment::linearInterpolate(b1, b2, t);
+
+    Point d0 = SplineSegment::linearInterpolate(c0, c1, t);  // This would be the interpolated point
+
+    if (usePressure) {
+        /**
+         * Beware: with this quite imperfect formula, the pressure does not change linearly with the lengths
+         */
+        d0.z = t * firstKnot.z + (1 - t) * secondKnot.z;
+    }
+
+    SplineSegment firstPart = SplineSegment(firstKnot, b0, c0, d0);    // first point of each step
+    SplineSegment secondPart = SplineSegment(d0, c1, b2, secondKnot);  // last point of each step
+    return std::make_pair(firstPart, secondPart);
+}
+
+auto SplineSegment::linearInterpolate(const Point& p, const Point& q, float t) -> Point {
+    return Point(p.x * (1 - t) + q.x * t, p.y * (1 - t) + q.y * t);
+}
+
+constexpr double FLATNESS_TOLERANCE = 1.0001;
+constexpr double MIN_KNOT_DISTANCE = 0.3;
+constexpr double MAX_WIDTH_VARIATION = 0.1;
+
+auto SplineSegment::isFlatEnough(bool usePressure) const -> bool {
+    double l1 = firstKnot.lineLengthTo(firstControlPoint);
+    double l2 = firstControlPoint.lineLengthTo(secondControlPoint);
+    double l3 = secondControlPoint.lineLengthTo(secondKnot);
+    double l = firstKnot.lineLengthTo(secondKnot);
+    return l < MIN_KNOT_DISTANCE || (l1 + l2 + l3 < FLATNESS_TOLERANCE * l &&
+                                     ((!usePressure) || std::abs(firstKnot.z - secondKnot.z) <= MAX_WIDTH_VARIATION));
+}
diff --git a/entry/src/main/cpp/src/core/model/SplineSegment.h b/entry/src/main/cpp/src/core/model/SplineSegment.h
new file mode 100644
index 0000000..1a61f68
--- /dev/null
+++ b/entry/src/main/cpp/src/core/model/SplineSegment.h
@@ -0,0 +1,109 @@
+/*
+ * Xournal++
+ *
+ * A spline segment
+ *
+ * @author Xournal++ Team
+ * https://github.com/xournalpp/xournalpp
+ *
+ * @license GNU GPLv2 or later
+ */
+
+#pragma once
+
+#include <list>     // for list
+#include <utility>  // for pair
+
+#include <cairo.h>  // for cairo_t
+
+#include "model/Point.h"  // for Point
+
+
+/**
+ * @brief A class to handle splines segments
+ *
+ * Every spline segment is defined by two knot points and two control points.
+ * This contrasts to the cairo-draw command cairo_curve_to, where everything is relative to the current position of
+ * another knot,
+ */
+
+
+class SplineSegment {
+public:
+    SplineSegment() = default;
+
+    /**
+     * @brief A linear spline segment from two points
+     * @param p the first knot
+     * @param q the second knot
+     */
+    SplineSegment(const Point& p, const Point& q);
+
+    /**
+     * @brief A spline segment from four points
+     * @param p the first knot
+     * @param fp the first control point
+     * @param sp the second control point
+     * @param q the second knot
+     */
+    SplineSegment(const Point& p, const Point& fp, const Point& sp, const Point& q);
+
+    /**
+     * @brief draw the spline segment via the cairo_curve_to command
+     * @param cr the cairo context on which the spline segment ought to be drawn
+     */
+    void draw(cairo_t* cr) const;
+
+    /**
+     * @brief Convert the spline segment to a list of points.
+     * @param usePressure If true, interpolate the pressure along the spline. Default: false
+     * @return A point list which represents the spline segment without the end point.
+     */
+    std::list<Point> toPointSequence(bool usePressure = false) const;
+
+    /**
+     * @brief Subdivide the spline into two parts with respect to parameter t.
+     * @param t the parameter between 0 and 1, which corresponds to the point where the spline is split
+     * @param usePressure If true, infer pressure values for the resulting SplineSegments' endpoints. Default: false.
+     * @return A pair of two spline segments corresponding to the two parts of the spline
+     */
+    std::pair<SplineSegment, SplineSegment> subdivide(float t, bool usePressure = false) const;
+
+    /**
+     * @brief Interpolate a line segment with respect to parameter t
+     * @param t the parameter between 0 and 1, which corresponds to the point on the line segment
+     * @param p the starting point of the line segment
+     * @param q the end point of the line segment
+     * @return A point on the line segment which corresponds to the parameter value t
+     */
+    static Point linearInterpolate(const Point& p, const Point& q, float t);
+
+    /**
+     * @brief checks if the spline segment is flat enough so that it can be drawn as a straight line
+     * @param usePressure If true, return false if the endpoints' pressure values are to far appart. Default: false.
+     * @return true, if the spline segment is flat enough; false otherwise
+     */
+    bool isFlatEnough(bool usePressure = false) const;
+
+
+public:
+    /**
+     * @brief The first knot of the spline segment.
+     */
+    Point firstKnot;
+
+    /**
+     * @brief The second knot of the spline segment.
+     */
+    Point secondKnot;
+
+    /**
+     * @brief The first control point of the spline segment.
+     */
+    Point firstControlPoint;
+
+    /**
+     * @brief The second control point of the spline segment.
+     */
+    Point secondControlPoint;
+};
diff --git a/entry/src/main/cpp/src/core/model/Stroke.cpp b/entry/src/main/cpp/src/core/model/Stroke.cpp
new file mode 100644
index 0000000..ad4a41e
--- /dev/null
+++ b/entry/src/main/cpp/src/core/model/Stroke.cpp
@@ -0,0 +1,875 @@
+#include "Stroke.h"
+
+#include <algorithm>  // for min, max, copy
+#include <cmath>      // for abs, hypot, sqrt
+#include <cstdint>    // for uint64_t
+#include <iterator>   // for back_insert_iterator
+#include <limits>     // for numeric_limits
+#include <memory>
+#include <numeric>    // for accumulate
+#include <optional>   // for optional, nullopt
+#include <string>     // for to_string, operator<<
+
+#include <cairo.h>  // for cairo_matrix_translate
+#include <glib.h>   // for g_free, g_message
+
+#include "eraser/PaddedBox.h"                     // for PaddedBox
+#include "model/AudioElement.h"                   // for AudioElement
+#include "model/Element.h"                        // for Element, ELEMENT_ST...
+#include "model/LineStyle.h"                      // for LineStyle
+#include "model/Point.h"                          // for Point, Point::NO_PR...
+#include "util/Assert.h"                          // for xoj_assert
+#include "util/BasePointerIterator.h"             // for BasePointerIterator
+#include "util/Interval.h"                        // for Interval
+#include "util/PairView.h"                        // for PairView<>::BaseIte...
+#include "util/PairView.h"                        // for PairView
+#include "util/PlaceholderString.h"               // for PlaceholderString
+#include "util/Point.h"                           // for xoj::util::Point<>
+#include "util/Rectangle.h"                       // for Rectangle
+#include "util/SmallVector.h"                     // for SmallVector
+#include "util/TinyVector.h"                      // for TinyVector
+#include "util/i18n.h"                            // for FC, FORMAT_STR
+#include "util/serdesstream.h"                    // for serdes_stream
+#include "util/serializing/ObjectInputStream.h"   // for ObjectInputStream
+#include "util/serializing/ObjectOutputStream.h"  // for ObjectOutputStream
+
+#include "PathParameter.h"  // for PathParameter
+#include "config-debug.h"   // for ENABLE_ERASER_DEBUG
+
+using xoj::util::Rectangle;
+
+#define COMMA ,
+// #define ENABLE_ERASER_DEBUG // See config-debug.h.in
+#ifdef ENABLE_ERASER_DEBUG
+#include <iomanip>  // for operator<<, setw
+#include <sstream>  // for operator<<, basic_o...
+
+#define DEBUG_ERASER(f) f
+#else
+#define DEBUG_ERASER(f)
+#endif
+
+template <typename Float>
+constexpr void updateBoundingBox(Float& x, Float& y, Float& width, Float& height, Point const& p, double half_width) {
+    {
+        Float x2 = x + width;
+        Float y2 = y + height;
+
+        x = std::min(x, p.x - half_width);
+        y = std::min(y, p.y - half_width);
+        x2 = std::max(x2, p.x + half_width);
+        y2 = std::max(y2, p.y + half_width);
+        width = x2 - x;
+        height = y2 - y;
+    }
+}
+
+template <typename Float>
+constexpr void updateSnappedBounds(Rectangle<Float>& snap, Point const& p) {
+    {
+        Float snapx2 = snap.x + snap.width;
+        Float snapy2 = snap.y + snap.height;
+
+        snap.x = std::min(snap.x, p.x);
+        snap.y = std::min(snap.y, p.y);
+        snapx2 = std::max(snapx2, p.x);
+        snapy2 = std::max(snapy2, p.y);
+        snap.width = snapx2 - snap.x;
+        snap.height = snapy2 - snap.y;
+    }
+}
+
+
+Stroke::Stroke(): AudioElement(ELEMENT_STROKE) {}
+
+Stroke::~Stroke() = default;
+
+/**
+ * Clone style attributes, but not the data (position, pressure etc.)
+ */
+void Stroke::applyStyleFrom(const Stroke* other) {
+    setColor(other->getColor());
+    setToolType(other->getToolType());
+    setWidth(other->getWidth());
+    setFill(other->getFill());
+    setStrokeCapStyle(other->getStrokeCapStyle());
+    setLineStyle(other->getLineStyle());
+
+    cloneAudioData(other);
+}
+
+auto Stroke::cloneStroke() const -> std::unique_ptr<Stroke> {
+    auto s = std::make_unique<Stroke>();
+    s->applyStyleFrom(this);
+    s->points = this->points;
+    s->x = this->x;
+    s->y = this->y;
+    s->Element::width = this->Element::width;
+    s->Element::height = this->Element::height;
+    s->snappedBounds = this->snappedBounds;
+    s->sizeCalculated = this->sizeCalculated;
+    return s;
+}
+
+auto Stroke::clone() const -> ElementPtr { return this->cloneStroke(); }
+
+std::unique_ptr<Stroke> Stroke::cloneSection(const PathParameter& lowerBound, const PathParameter& upperBound) const {
+    xoj_assert(lowerBound.isValid() && upperBound.isValid());
+    xoj_assert(lowerBound <= upperBound);
+    xoj_assert(upperBound.index < this->points.size() - 1);
+
+    auto s = std::make_unique<Stroke>();
+    s->applyStyleFrom(this);
+
+    s->points.reserve(upperBound.index - lowerBound.index + 2);
+
+    s->points.emplace_back(this->getPoint(lowerBound));
+
+    auto beginIt = std::next(this->points.cbegin(), (std::ptrdiff_t)lowerBound.index + 1);
+    auto endIt = std::next(this->points.cbegin(), (std::ptrdiff_t)upperBound.index + 1);
+    std::copy(beginIt, endIt, std::back_inserter(s->points));
+
+    s->points.emplace_back(this->getPoint(upperBound));
+
+    // Remove unused pressure value
+    s->points.back().z = Point::NO_PRESSURE;
+
+    return s;
+}
+
+std::unique_ptr<Stroke> Stroke::cloneCircularSectionOfClosedStroke(const PathParameter& startParam,
+                                                                   const PathParameter& endParam) const {
+    xoj_assert(startParam.isValid() && endParam.isValid());
+    xoj_assert(endParam < startParam);
+    xoj_assert(startParam.index < this->points.size() - 1);
+
+    auto s = std::make_unique<Stroke>();
+    s->applyStyleFrom(this);
+
+    s->points.reserve(this->points.size() - startParam.index + endParam.index + 1);
+
+    s->points.emplace_back(this->getPoint(startParam));
+
+    auto startIt = std::next(this->points.cbegin(), (std::ptrdiff_t)startParam.index + 1);
+    // Skip the last point: points.back().equalPos(points.front()) == true and we want this point only once
+    xoj_assert(startIt != this->points.cend());
+    std::copy(startIt, std::prev(this->points.cend()), std::back_inserter(s->points));
+
+    auto endIt = std::next(this->points.cbegin(), (std::ptrdiff_t)endParam.index + 1);
+    std::copy(this->points.cbegin(), endIt, std::back_inserter(s->points));
+
+    s->points.emplace_back(this->getPoint(endParam));
+
+    // Remove unused pressure value
+    s->points.back().z = Point::NO_PRESSURE;
+
+    return s;
+}
+
+void Stroke::serialize(ObjectOutputStream& out) const {
+    out.writeObject("Stroke");
+
+    this->AudioElement::serialize(out);
+
+    out.writeDouble(this->width);
+
+    out.writeInt(this->toolType);
+
+    out.writeInt(fill);
+
+    out.writeInt(this->capStyle);
+
+    out.writeData(this->points.data(), this->points.size(), sizeof(Point));
+
+    this->lineStyle.serialize(out);
+
+    out.endObject();
+}
+
+void Stroke::readSerialized(ObjectInputStream& in) {
+    in.readObject("Stroke");
+
+    this->AudioElement::readSerialized(in);
+
+    this->width = in.readDouble();
+
+    this->toolType = static_cast<StrokeTool::Value>(in.readInt());
+
+    this->fill = in.readInt();
+
+    this->capStyle = static_cast<StrokeCapStyle>(in.readInt());
+
+    in.readData(this->points);
+    this->lineStyle.readSerialized(in);
+
+    in.endObject();
+}
+
+/**
+ * Option to fill the shape:
+ *  -1: The shape is not filled
+ * 255: The shape is fully opaque filled
+ * ...
+ *   1: The shape is nearly fully transparent filled
+ */
+auto Stroke::getFill() const -> int { return fill; }
+
+/**
+ * Option to fill the shape:
+ *  -1: The shape is not filled
+ * 255: The shape is fully opaque filled
+ * ...
+ *   1: The shape is nearly fully transparent filled
+ */
+void Stroke::setFill(int fill) { this->fill = fill; }
+
+void Stroke::setWidth(double width) {
+    this->width = width;
+    this->sizeCalculated = false;
+}
+
+auto Stroke::getWidth() const -> double { return this->width; }
+
+auto Stroke::rescaleWithMirror() const -> bool { return true; }
+
+auto Stroke::isInSelection(ShapeContainer* container) const -> bool {
+    for (auto&& p: this->points) {
+        double px = p.x;
+        double py = p.y;
+
+        if (!container->contains(px, py)) {
+            return false;
+        }
+    }
+
+    return true;
+}
+
+void Stroke::addPoint(const Point& p) {
+    this->points.emplace_back(p);
+    if (!sizeCalculated) {
+        return;
+    }
+
+    if (hasPressure()) {
+        updateBoundsLastTwoPressures();
+    } else {
+        updateBoundingBox(Element::x, Element::y, Element::width, Element::height, p, 0.5 * this->width);
+        updateSnappedBounds(Element::snappedBounds, p);
+    }
+}
+
+auto Stroke::getPointCount() const -> size_t { return this->points.size(); }
+
+auto Stroke::getPointVector() const -> std::vector<Point> const& { return points; }
+
+void Stroke::deletePointsFrom(size_t index) {
+    points.resize(std::min(index, points.size()));
+    this->sizeCalculated = false;
+}
+
+auto Stroke::getPoint(size_t index) const -> Point {
+    if (index < 0 || index >= this->points.size()) {
+        g_warning("Stroke::getPoint(%zu) out of bounds!", index);
+        return Point(0., 0., Point::NO_PRESSURE);
+    }
+    return points.at(index);
+}
+
+Point Stroke::getPoint(PathParameter parameter) const {
+    xoj_assert(parameter.isValid() && parameter.index < this->points.size() - 1);
+
+    const Point& p = this->points[parameter.index];
+    Point res = p.relativeLineTo(this->points[parameter.index + 1], parameter.t);
+    res.z = p.z;  // The point's width should be that of the segment's first point
+    return res;
+}
+
+auto Stroke::getPoints() const -> const Point* { return this->points.data(); }
+
+void Stroke::setPointVectorInternal(const Range* const snappingBox) {
+    if (!snappingBox || this->points.empty() || this->points.front().z != Point::NO_PRESSURE) {
+        // We cannot deduce the bounding box from the snapping box if the stroke has pressure values
+        this->sizeCalculated = false;
+    } else {
+        xoj_assert(snappingBox->isValid());
+        this->snappedBounds = xoj::util::Rectangle<double>(*snappingBox);
+        Element::x = snappingBox->minX - 0.5 * this->width;
+        Element::y = snappingBox->minY - 0.5 * this->width;
+        Element::width = snappingBox->getWidth() + this->width;
+        Element::height = snappingBox->getHeight() + this->width;
+        this->sizeCalculated = true;
+    }
+}
+
+void Stroke::setPointVector(const std::vector<Point>& other, const Range* const snappingBox) {
+    this->points = other;
+    this->setPointVectorInternal(snappingBox);
+}
+
+void Stroke::setPointVector(std::vector<Point>&& other, const Range* const snappingBox) {
+    this->points = std::move(other);
+    this->setPointVectorInternal(snappingBox);
+}
+
+
+void Stroke::freeUnusedPointItems() { this->points = {begin(this->points), end(this->points)}; }
+
+void Stroke::setToolType(StrokeTool type) { this->toolType = type; }
+
+auto Stroke::getToolType() const -> StrokeTool { return this->toolType; }
+
+void Stroke::setLineStyle(const LineStyle& style) { this->lineStyle = style; }
+
+auto Stroke::getLineStyle() const -> const LineStyle& { return this->lineStyle; }
+
+void Stroke::move(double dx, double dy) {
+    for (auto&& point: points) {
+        point.x += dx;
+        point.y += dy;
+    }
+    Element::x += dx;
+    Element::y += dy;
+    Element::snappedBounds = Element::snappedBounds.translated(dx, dy);
+}
+
+void Stroke::rotate(double x0, double y0, double th) {
+    cairo_matrix_t rotMatrix;
+    cairo_matrix_init_identity(&rotMatrix);
+    cairo_matrix_translate(&rotMatrix, x0, y0);
+    cairo_matrix_rotate(&rotMatrix, th);
+    cairo_matrix_translate(&rotMatrix, -x0, -y0);
+
+    for (auto&& p: points) {
+        cairo_matrix_transform_point(&rotMatrix, &p.x, &p.y);
+    }
+    this->sizeCalculated = false;
+    // Width and Height will likely be changed after this operation
+}
+
+void Stroke::scale(double x0, double y0, double fx, double fy, double rotation, bool restoreLineWidth) {
+    double fz = (restoreLineWidth) ? 1 : sqrt(std::abs(fx * fy));
+    cairo_matrix_t scaleMatrix;
+    cairo_matrix_init_identity(&scaleMatrix);
+    cairo_matrix_translate(&scaleMatrix, x0, y0);
+    cairo_matrix_rotate(&scaleMatrix, rotation);
+    cairo_matrix_scale(&scaleMatrix, fx, fy);
+    cairo_matrix_rotate(&scaleMatrix, -rotation);
+    cairo_matrix_translate(&scaleMatrix, -x0, -y0);
+
+    for (auto&& p: points) {
+        cairo_matrix_transform_point(&scaleMatrix, &p.x, &p.y);
+
+        if (p.z != Point::NO_PRESSURE) {
+            p.z *= fz;
+        }
+    }
+    this->width *= fz;
+
+    this->sizeCalculated = false;
+}
+
+auto Stroke::hasPressure() const -> bool {
+    if (!this->points.empty()) {
+        return this->points[0].z != Point::NO_PRESSURE;
+    }
+    return false;
+}
+
+auto Stroke::getAvgPressure() const -> double {
+    return std::accumulate(begin(this->points), end(this->points), 0.0,
+                           [](double l, Point const& p) { return l + p.z; }) /
+           static_cast<double>(this->points.size());
+}
+
+void Stroke::updateBoundsLastTwoPressures() {
+    if (!sizeCalculated || this->points.empty()) {
+        return;
+    }
+
+    auto const pointCount = this->getPointCount();
+    xoj_assert(pointCount >= 2);
+
+    Point& p = this->points.back();
+    Point& p2 = this->points[pointCount - 2];
+    double pressure = p2.z;
+
+    updateSnappedBounds(snappedBounds, p);
+    updateBoundingBox(Element::x, Element::y, Element::width, Element::height, p, 0.5 * pressure);
+    updateBoundingBox(Element::x, Element::y, Element::width, Element::height, p2, 0.5 * pressure);
+}
+
+void Stroke::scalePressure(double factor) {
+    if (!hasPressure()) {
+        return;
+    }
+    for (auto&& p: this->points) {
+        p.z *= factor;
+    }
+    this->sizeCalculated = false;
+}
+
+void Stroke::setLastPressure(double pressure) {
+    if (!this->points.empty()) {
+        xoj_assert(pressure != Point::NO_PRESSURE);
+        Point& back = this->points.back();
+        back.z = pressure;
+    }
+}
+
+void Stroke::setSecondToLastPressure(double pressure) {
+    auto const pointCount = this->getPointCount();
+    if (pointCount >= 2) {
+        Point& p = this->points[pointCount - 2];
+        p.z = pressure;
+        updateBoundsLastTwoPressures();
+    }
+}
+
+void Stroke::setPressure(const std::vector<double>& pressure) {
+    // The last pressure is not used - as there is no line drawn from this point
+    if (this->points.size() - 1 != pressure.size()) {
+        g_warning("invalid pressure point count: %s, expected %s", std::to_string(pressure.size()).data(),
+                  std::to_string(this->points.size() - 1).data());
+    }
+
+    auto max_size = std::min(pressure.size(), this->points.size() - 1);
+    for (size_t i = 0U; i != max_size; ++i) {
+        this->points[i].z = pressure[i];
+    }
+}
+
+/**
+ * checks if the stroke is intersected by the eraser rectangle
+ */
+auto Stroke::intersects(double x, double y, double halfEraserSize) const -> bool {
+    if (this->points.empty()) {
+        return false;
+    }
+
+    double x1 = x - halfEraserSize;
+    double x2 = x + halfEraserSize;
+    double y1 = y - halfEraserSize;
+    double y2 = y + halfEraserSize;
+
+    double lastX = points[0].x;
+    double lastY = points[0].y;
+    for (auto&& point: points) {
+        double px = point.x;
+        double py = point.y;
+
+        if (px >= x1 && py >= y1 && px <= x2 && py <= y2) {
+            return true;
+        }
+
+        double len = hypot(px - lastX, py - lastY);
+        if (len >= halfEraserSize) {
+            /**
+             * The distance of the center of the eraser box to the line passing through (lastx, lasty) and (px, py)
+             */
+            double p = std::abs((x - lastX) * (lastY - py) + (y - lastY) * (px - lastX)) / len;
+
+            // If the distance p of the center of the eraser box to the (full) line is in the range,
+            // we check whether the eraser box is not too far from the line segment through the two points.
+
+            if (p <= halfEraserSize) {
+                double centerX = (lastX + px) / 2;
+                double centerY = (lastY + py) / 2;
+                double distance = hypot(x - centerX, y - centerY);
+
+                // For the above check we imagine a circle whose center is the mid point of the two points of the stroke
+                // and whose radius is half the length of the line segment plus half the diameter of the eraser box
+                // plus some small padding
+                // If the center of the eraser box lies within that circle then we consider it to be close enough
+
+                distance -= halfEraserSize * std::sqrt(2);
+
+                constexpr double PADDING = 0.1;
+
+                if (distance <= len / 2 + PADDING) {
+                    return true;
+                }
+            }
+        }
+
+        lastX = px;
+        lastY = py;
+    }
+
+    return false;
+}
+
+double Stroke::distanceTo(double x, double y) const {
+    double distance = std::numeric_limits<double>::max();
+    for (auto&& [p1, p2]: PairView(this->points)) {
+        xoj::util::Point<double> v(p2.x - p1.x, p2.y - p1.y);
+        double ratio = std::clamp(((x - p1.x) * v.x + (y - p1.y) * v.y) / (v.x * v.x + v.y * v.y), 0., 1.);
+        /// Projection of (x,y) onto the segment [p1,p2]
+        xoj::util::Point<double> projection(p1.x + ratio * v.x, p1.y + ratio * v.y);
+        double width = p1.z == Point::NO_PRESSURE ? this->width : p1.z;
+        distance = std::clamp(std::hypot(x - projection.x, y - projection.y) - .5 * width, 0., distance);
+    }
+    return distance;
+}
+
+/**
+ * @brief Get the interval of length parameters where the line (pq) is in the rectangle.
+ * @param p First point
+ * @param q Second point
+ * @param rectangle The rectangle
+ * @return Optional interval res.
+ * The line enters the rectangle at the point  res.min * p + (1 - res.min) * q
+ * The line leaves the rectangle at the point  res.max * p + (1 - res.max) * q
+ */
+static std::optional<Interval<double>> intersectLineWithRectangle(const Point& p, const Point& q,
+                                                                  const Rectangle<double>& rectangle) {
+    auto intersectLineWithStrip = [](double a1, double a2, double stripAMin, double stripWidth) {
+        // a1, a2 are coordinates along an axis orthogonal to the strip
+        double norm = 1.0 / (a2 - a1);
+        double t1 = (stripAMin - a1) * norm;
+        double t2 = t1 + stripWidth * norm;
+        return Interval<double>::getInterval(t1, t2);
+    };
+
+    if (p.x == q.x) {
+        if (p.y == q.y) {
+            // Single dot
+            return std::nullopt;
+        }
+        // Vertical segment
+        if (rectangle.x < p.x && p.x < rectangle.x + rectangle.width) {
+            return intersectLineWithStrip(p.y, q.y, rectangle.y, rectangle.height);
+        }
+        return std::nullopt;
+    }
+
+    if (p.y == q.y) {
+        // Horizontal segment
+        if (rectangle.y < p.y && p.y < rectangle.y + rectangle.height) {
+            return intersectLineWithStrip(p.x, q.x, rectangle.x, rectangle.width);
+        }
+        return std::nullopt;
+    }
+
+    // Generic case
+    Interval<double> verticalIntersections = intersectLineWithStrip(p.y, q.y, rectangle.y, rectangle.height);
+    Interval<double> horizontalIntersections = intersectLineWithStrip(p.x, q.x, rectangle.x, rectangle.width);
+
+    return verticalIntersections.intersect(horizontalIntersections);
+}
+
+/**
+ * Same as intersectLineWithRectangle but only returns parameters between 0 and 1
+ * (corresponding to points between p and q)
+ */
+static TinyVector<double, 2> intersectLineSegmentWithRectangle(const Point& p, const Point& q,
+                                                               const Rectangle<double>& rectangle) {
+    std::optional<Interval<double>> intersections = intersectLineWithRectangle(p, q, rectangle);
+
+    if (intersections) {
+        TinyVector<double, 2> result;
+        if (intersections->min > 0.0 && intersections->min <= 1.0) {
+            result.emplace_back(intersections->min);
+        }
+        if (intersections->max > 0.0 && intersections->max <= 1.0) {
+            result.emplace_back(intersections->max);
+        }
+        return result;
+    }
+
+    return {};
+}
+
+auto Stroke::intersectWithPaddedBox(const PaddedBox& box) const -> IntersectionParametersContainer {
+    auto pointCount = this->points.size();
+    if (pointCount < 2) {
+        if (pointCount == 1 && this->points.back().isInside(box.getInnerRectangle())) {
+            IntersectionParametersContainer result;
+            result.emplace_back(0U, 0.0);
+            result.emplace_back(0U, 0.0);
+            return result;
+        }
+        return IntersectionParametersContainer();
+    }
+    return this->intersectWithPaddedBox(box, 0, pointCount - 2);
+}
+
+auto Stroke::intersectWithPaddedBox(const PaddedBox& box, size_t firstIndex, size_t lastIndex) const
+        -> IntersectionParametersContainer {
+    xoj_assert(firstIndex <= lastIndex && lastIndex < this->points.size() - 1);
+
+    const auto innerBox = box.getInnerRectangle();
+    const auto outerBox = box.getOuterRectangle();
+
+    struct Flags {
+        bool isInsideOuter;
+        bool wentInsideInner;
+        bool lastSegmentEndedOnBoundary;
+    };
+
+    auto initializeFlagsFromHalfTangentAtFirstKnot =
+            [&outerBox, &innerBox](const Point& firstKnot, const Point& halfTangentControlPoint) -> Flags {
+        if (firstKnot.isInside(innerBox)) {
+            return {true, true, false};
+        } else if (firstKnot.isInside(outerBox)) {
+            std::optional<Interval<double>> innerLineIntersections =
+                    intersectLineWithRectangle(firstKnot, halfTangentControlPoint, innerBox);
+            // If the half tangent goes towards to inner box, say we've been inside the inner box
+            return {true, innerLineIntersections && innerLineIntersections.value().max <= 0.0, false};
+        }
+        return {false, false, false};
+    };
+
+    size_t index = firstIndex;
+
+    const PairView segments(this->points);
+    auto segmentIt = std::next(segments.begin(), (std::ptrdiff_t)index);
+
+    Flags flags = initializeFlagsFromHalfTangentAtFirstKnot(segmentIt.first(), segmentIt.second());
+
+    DEBUG_ERASER(auto debugstream = serdes_stream<std::stringstream>();
+                 debugstream << "Stroke::intersectWithPaddedBox debug:\n"; debugstream << std::boolalpha;
+                 debugstream << "| * flags.isInsideOuter              = " << flags.isInsideOuter << std::endl;
+                 debugstream << "| * flags.wentInsideInner            = " << flags.wentInsideInner << std::endl;
+                 debugstream << "| * flags.lastSegmentEndedOnBoundary = " << flags.lastSegmentEndedOnBoundary
+                             << std::endl;
+                 debugstream << std::fixed;)
+
+    IntersectionParametersContainer result;
+    if (flags.isInsideOuter) {
+        // We start inside the padded box. Add a fake intersection parameter
+        result.emplace_back(firstIndex, 0.0);
+    }
+
+    auto processSegment = [&flags, &outerBox, &innerBox, &result DEBUG_ERASER(COMMA & debugstream)](
+                                  const Point& firstKnot, const Point& secondKnot, size_t index) {
+        DEBUG_ERASER(debugstream << "| * Segment " << std::setw(3) << index << std::setprecision(5);
+                     debugstream << ": (" << std::setw(9) << firstKnot.x;
+                     debugstream << " ; " << std::setw(9) << firstKnot.y;
+                     debugstream << ") -- (" << std::setw(9) << secondKnot.x;
+                     debugstream << " ; " << std::setw(9) << secondKnot.y;
+                     debugstream << ")\n"
+                                 << std::setprecision(17);  // High precision to detect numerical inaccuracy
+        )
+
+        auto outerIntersections = intersectLineSegmentWithRectangle(firstKnot, secondKnot, outerBox);
+        if (!outerIntersections.empty() || firstKnot.isInside(outerBox) || secondKnot.isInside(outerBox)) {
+            // Some part of the segment lies inside the padded box
+            auto innerIntersections = intersectLineSegmentWithRectangle(firstKnot, secondKnot, innerBox);
+            auto itInner = innerIntersections.begin();
+            auto itInnerEnd = innerIntersections.end();
+
+            auto skipInnerIntersectionsBelowValue = [&itInner, itInnerEnd](double upToValue) -> bool {
+                bool skipSome = false;
+                while (itInner != itInnerEnd && *itInner < upToValue) {
+                    skipSome = true;
+                    ++itInner;
+                }
+                return skipSome;
+            };
+
+            if (flags.lastSegmentEndedOnBoundary) {
+                flags.lastSegmentEndedOnBoundary = false;
+                Point p = secondKnot;
+                if (!outerIntersections.empty()) {
+                    double t = 0.5 * outerIntersections.front();
+                    p = firstKnot.relativeLineTo(secondKnot, t);
+                }
+                if (p.isInside(outerBox) != (result.size() % 2 != 0)) {
+                    // The stroke bounced back on the box border and never got in or out
+                    // Remove the last intersection point
+                    xoj_assert(!result.empty());
+                    result.pop_back();
+                }
+            }
+
+            for (auto outerIntersection: outerIntersections) {
+                flags.wentInsideInner |= skipInnerIntersectionsBelowValue(outerIntersection);
+
+                DEBUG_ERASER(debugstream << "|  |  ** "
+                                         << "wentInsideInner = " << flags.wentInsideInner << std::endl;)
+
+                if (!flags.isInsideOuter || flags.wentInsideInner) {
+                    result.emplace_back(index, outerIntersection);
+                    if (outerIntersection == 1.0) {
+                        flags.lastSegmentEndedOnBoundary = true;
+                    }
+
+                    DEBUG_ERASER(
+                            if (!flags.isInsideOuter) {
+                                debugstream << "|  |  ** going-in  (" << std::setw(3) << index << "," << std::setw(20)
+                                            << outerIntersection << ")" << std::endl;
+                            } if (flags.wentInsideInner) {
+                                debugstream << "|  |  ** going-out (" << std::setw(3) << index << "," << std::setw(20)
+                                            << outerIntersection << ")" << std::endl;
+                            })
+                } else {
+                    xoj_assert(!result.empty());
+                    DEBUG_ERASER(debugstream << "|  |  ** popping   (" << std::setw(3) << result.back().index << ","
+                                             << std::setw(20) << result.back().t << ")" << std::endl;)
+                    result.pop_back();
+                }
+                flags.wentInsideInner = false;
+                flags.isInsideOuter = !flags.isInsideOuter;
+            }
+            if (itInner != itInnerEnd) {
+                flags.wentInsideInner = true;
+            }
+        }
+        DEBUG_ERASER(debugstream << "|  |__** result.size() = " << std::setw(3) << result.size() << std::endl;)
+    };
+
+    auto endSegmentIt = std::next(segments.begin(), (std::ptrdiff_t)(lastIndex + 1));
+    for (; segmentIt != endSegmentIt; segmentIt++, index++) {
+        processSegment(segmentIt.first(), segmentIt.second(), index);
+    }
+
+    auto isHalfTangentAtLastKnotGoingTowardInnerBox =
+            [&innerBox, &outerBox](const Point& lastKnot, const Point& halfTangentControlPoint) -> bool {
+        xoj_assert(lastKnot.isInside(outerBox));
+        std::optional<Interval<double>> innerLineIntersections =
+                intersectLineWithRectangle(lastKnot, halfTangentControlPoint, innerBox);
+        return innerLineIntersections && innerLineIntersections.value().max < 0.0;
+    };
+
+    /**
+     * Due to numerical imprecision, we could get inconsistent results
+     * (typically when a stroke's point lies on outerBox' boundary).
+     * We try and detect those cases, and simply drop them
+     */
+    bool inconsistentResults = false;
+    if (result.size() % 2) {
+        // Not necessarily inconsistent: could be the stroke ends in outerBox
+        --segmentIt;
+        const Point& lastPoint = segmentIt.second();
+
+        DEBUG_ERASER(debugstream << "|  |  Odd number of intersection points" << std::endl;)
+
+        if (lastPoint.isInside(outerBox)) {
+            if (flags.wentInsideInner || isHalfTangentAtLastKnotGoingTowardInnerBox(lastPoint, segmentIt.first())) {
+                result.emplace_back(index - 1, 1.0);
+                DEBUG_ERASER(debugstream << "|  |  ** pushing   (" << std::setw(3) << result.back().index << ","
+                                         << std::setw(20) << result.back().t << ")" << std::endl;)
+            } else {
+                DEBUG_ERASER(debugstream << "|  |  ** popping   (" << std::setw(3) << result.back().index << ","
+                                         << std::setw(20) << result.back().t << ")" << std::endl;)
+                result.pop_back();
+            }
+        } else {
+            inconsistentResults = true;
+        }
+    }
+
+    // Returns true if the result is inconsistent
+    auto checkSanity = [&outerBox,
+                        this DEBUG_ERASER(COMMA & debugstream)](const IntersectionParametersContainer& res) -> bool {
+        for (auto it1 = res.begin(), it2 = std::next(it1), end = res.end(); it1 != end; it1 += 2, it2 += 2) {
+            const auto& paramStart = *it1;
+            const auto& paramLast = *it2;
+            DEBUG_ERASER(debugstream << "| SanityCheck on parameters (" << paramStart.index << " ; " << paramStart.t
+                                     << ") -- (" << paramLast.index << " ; " << paramLast.t << ")" << std::endl;)
+            Point testPoint;
+            // Get a point on the stroke within the interval of parameters
+            if (paramStart.index == paramLast.index) {
+                testPoint = this->getPoint(PathParameter(paramStart.index, 0.5 * (paramStart.t + paramLast.t)));
+                DEBUG_ERASER(debugstream << "| -------- getting point (" << paramStart.index << " ; "
+                                         << 0.5 * (paramStart.t + paramLast.t) << ")" << std::endl;)
+            } else {
+                testPoint = this->getPoint((paramStart.index + paramLast.index + 1) / 2);
+                DEBUG_ERASER(debugstream << "| -------- getting point (" << (paramStart.index + paramLast.index + 1) / 2
+                                         << " ; 0.0)" << std::endl;)
+            }
+            if (!testPoint.isInside(outerBox)) {
+                DEBUG_ERASER(debugstream << "| --------- It is not in !!" << std::endl;)
+                return true;
+            }
+            DEBUG_ERASER(debugstream << "| --------- It is in." << std::endl;)
+        }
+        return false;
+    };
+
+    inconsistentResults = inconsistentResults || checkSanity(result);
+
+    if (inconsistentResults) {
+        DEBUG_ERASER(debugstream << "| Inconsistent results!\n"; debugstream << "| * innerBox = (";
+                     debugstream << std::setprecision(5); debugstream << std::setw(9) << innerBox.x << " ; ";
+                     debugstream << std::setw(9) << innerBox.x + innerBox.width << ") -- (";
+                     debugstream << std::setw(9) << innerBox.y << " ; ";
+                     debugstream << std::setw(9) << innerBox.y + innerBox.height << ")\n";
+                     debugstream << "| * outerBox = ("; debugstream << std::setw(9) << outerBox.x << " ; ";
+                     debugstream << std::setw(9) << outerBox.x + outerBox.width << ") -- (";
+                     debugstream << std::setw(9) << outerBox.y << " ; ";
+                     debugstream << std::setw(9) << outerBox.y + outerBox.height << ")\n";
+                     std::cout << debugstream.str();)
+        return {};
+    }
+
+    return result;
+}
+
+/**
+ * Updates the size
+ * The size is needed to only redraw the requested part instead of redrawing
+ * the whole page (performance reason).
+ * Also used for Selected Bounding box.
+ */
+void Stroke::calcSize() const {
+    if (this->points.empty()) {
+        Element::x = 0;
+        Element::y = 0;
+
+        // The size of the rectangle, not the size of the pen!
+        Element::width = 0;
+        Element::height = 0;
+
+        // used for snapping
+        Element::snappedBounds = Rectangle<double>{};
+    }
+
+    double minSnapX = std::numeric_limits<double>::max();
+    double maxSnapX = std::numeric_limits<double>::min();
+    double minSnapY = std::numeric_limits<double>::max();
+    double maxSnapY = std::numeric_limits<double>::min();
+
+    auto halfThick = 0.0;
+
+    // #pragma omp parralel
+    for (auto&& p: points) {
+        halfThick = std::max(halfThick, p.z);
+        minSnapX = std::min(minSnapX, p.x);
+        minSnapY = std::min(minSnapY, p.y);
+        maxSnapX = std::max(maxSnapX, p.x);
+        maxSnapY = std::max(maxSnapY, p.y);
+    }
+
+    halfThick = points[0].z != Point::NO_PRESSURE ? halfThick / 2.0 : this->width / 2.0;
+
+    auto minX = minSnapX - halfThick;
+    auto minY = minSnapY - halfThick;
+    auto maxX = maxSnapX + halfThick;
+    auto maxY = maxSnapY + halfThick;
+
+    Element::x = minX;
+    Element::y = minY;
+    Element::width = maxX - minX;
+    Element::height = maxY - minY;
+    Element::snappedBounds = Rectangle<double>(minSnapX, minSnapY, maxSnapX - minSnapX, maxSnapY - minSnapY);
+}
+
+auto Stroke::getErasable() const -> ErasableStroke* { return this->erasable; }
+
+void Stroke::setErasable(ErasableStroke* erasable) { this->erasable = erasable; }
+
+auto Stroke::getStrokeCapStyle() const -> StrokeCapStyle { return this->capStyle; }
+
+void Stroke::setStrokeCapStyle(const StrokeCapStyle capStyle) { this->capStyle = capStyle; }
+
+void Stroke::debugPrint() const {
+    g_message("%s", FC(FORMAT_STR("Stroke {1} / hasPressure() = {2}") % (int64_t)this % this->hasPressure()));
+
+    for (auto&& p: points) {
+        g_message("%lf / %lf / %lf", p.x, p.y, p.z);
+    }
+
+    g_message("\n");
+}
diff --git a/entry/src/main/cpp/src/core/model/Stroke.h b/entry/src/main/cpp/src/core/model/Stroke.h
new file mode 100644
index 0000000..c9c8213
--- /dev/null
+++ b/entry/src/main/cpp/src/core/model/Stroke.h
@@ -0,0 +1,228 @@
+/*
+ * Xournal++
+ *
+ * A stroke on the document
+ *
+ * @author Xournal++ Team
+ * https://github.com/xournalpp/xournalpp
+ *
+ * @license GNU GPLv2 or later
+ */
+
+#pragma once
+
+#include <cstddef>  // for size_t
+#include <memory>   // for unique_ptr
+#include <vector>   // for vector
+
+#include "model/Element.h"
+
+#include "AudioElement.h"  // for AudioElement
+#include "LineStyle.h"     // for LineStyle
+#include "Point.h"         // for Point
+
+class Element;
+class ObjectInputStream;
+class ObjectOutputStream;
+class ShapeContainer;
+
+class StrokeTool {
+public:
+    enum Value { PEN, ERASER, HIGHLIGHTER };
+    StrokeTool(Value v): value(v) {}
+
+    [[nodiscard]] bool isPressureSensitive() const { return value == PEN; }
+    [[nodiscard]] bool hasLineStyle() const { return value == PEN; }
+    operator const Value&() const { return value; }
+    operator Value&() { return value; }
+
+private:
+    Value value = PEN;
+};
+
+enum StrokeCapStyle {
+    ROUND = 0,
+    BUTT = 1,
+    SQUARE = 2
+};  // Must match the indices in StrokeView::CAIRO_LINE_CAP
+    // and in EraserHandler::PADDING_COEFFICIENT_CAP
+
+class ErasableStroke;
+struct PaddedBox;
+struct PathParameter;
+template <class T, size_t N>
+class SmallVector;
+
+using IntersectionParametersContainer = SmallVector<PathParameter, 4>;
+
+class Stroke: public AudioElement {
+public:
+    Stroke();
+    Stroke(Stroke const&) = default;
+    Stroke(Stroke&&) = default;
+
+    Stroke& operator=(Stroke const&) = default;
+    Stroke& operator=(Stroke&&) = default;
+    ~Stroke() override;
+
+public:
+    auto cloneStroke() const -> std::unique_ptr<Stroke>;
+    auto clone() const -> ElementPtr override;
+
+    /**
+     * @brief Create a partial clone whose points are those of parameters between lowerBound and upperBound
+     * Assumes both lowerBound and upperBound are valid parameters of the stroke, and lowerBound <= upperBound
+     */
+    std::unique_ptr<Stroke> cloneSection(const PathParameter& lowerBound, const PathParameter& upperBound) const;
+
+    /**
+     * @brief Create a partial clone of a closed stroke (i.e. points.front() == points.back()) with points
+     *     getPoint(startParam) -- ... -- points.back() == points.front() -- ... -- getPoint(endParam)
+     * Assumes both startParam and endParam are valid parameters of the stroke, and endParam.index < startParam.index
+     */
+    std::unique_ptr<Stroke> cloneCircularSectionOfClosedStroke(const PathParameter& startParam,
+                                                               const PathParameter& endParam) const;
+
+    /**
+     * Clone style attributes, but not the data (position, width etc.)
+     */
+    void applyStyleFrom(const Stroke* other);
+
+    void setWidth(double width);
+    double getWidth() const;
+
+    /**
+     * Option to fill the shape:
+     *  -1: The shape is not filled
+     * 255: The shape is fully opaque filled
+     * ...
+     *   1: The shape is nearly fully transparent filled
+     */
+    int getFill() const;
+
+    /**
+     * Option to fill the shape:
+     *  -1: The shape is not filled
+     * 255: The shape is fully opaque filled
+     * ...
+     *   1: The shape is nearly fully transparent filled
+     */
+    void setFill(int fill);
+
+    void addPoint(const Point& p);
+    size_t getPointCount() const;
+    void freeUnusedPointItems();
+    std::vector<Point> const& getPointVector() const;
+    Point getPoint(size_t index) const;
+    Point getPoint(PathParameter parameter) const;
+    const Point* getPoints() const;
+
+    /**
+     * @brief Replace the stroke's points by the ones in the provided vector (they will be copied).
+     * @param other New vector of points for the stroke
+     * @param snappingBox (optional) Precomputed snapping box of the new points (i.e. the smallest Range containing all
+     * the points, stroke width or pressure values not being considered). The snappingBox parameter avoids a
+     * recomputation of the bounding boxes if the new points have no pressure values.
+     */
+    void setPointVector(const std::vector<Point>& other, const Range* const snappingBox = nullptr);
+    void setPointVector(std::vector<Point>&& other, const Range* const snappingBox = nullptr);
+
+private:
+    void setPointVectorInternal(const Range* const snappingBox);
+
+public:
+    void deletePointsFrom(size_t index);
+
+    void setToolType(StrokeTool type);
+    StrokeTool getToolType() const;
+
+    const LineStyle& getLineStyle() const;
+    void setLineStyle(const LineStyle& style);
+
+    bool intersects(double x, double y, double halfEraserSize) const;
+    /**
+     * Computes the actual distance between (x,y) and the stroke, taking thickness into account
+     * If (x,y) is within the painted area corresponding to the stroke, the return value will be 0.
+     */
+    double distanceTo(double x, double y) const override;
+
+    /**
+     * @brief Find the parameters within a certain interval corresponding to the points where the stroke crosses in
+     * or out of the given box with its padding. Intersections are ignored if the stroke does not hit the small box
+     * itself.
+     * @param box The padded box
+     * @param firstIndex The lower bound of the interval
+     * @param lastIndex The upper bound of the interval
+     * @return The parameters (sorted). The size of the returned vector is always even.
+     *
+     * Warning: this function does not test if the box intersects the stroke's bounding box.
+     * For optimization purposes, this test should be performed beforehand by the caller.
+     */
+    IntersectionParametersContainer intersectWithPaddedBox(const PaddedBox& box, size_t firstIndex,
+                                                           size_t lastIndex) const;
+
+    IntersectionParametersContainer intersectWithPaddedBox(const PaddedBox& box) const;
+
+    void setPressure(const std::vector<double>& pressure);
+    void setLastPressure(double pressure);
+    void setSecondToLastPressure(double pressure);
+    void scalePressure(double factor);
+
+    /**
+     * @brief Update the stroke's bounding box using the second-to-last point's pressure value and the last two points.
+     */
+    void updateBoundsLastTwoPressures();
+
+    bool hasPressure() const;
+    double getAvgPressure() const;
+
+    void move(double dx, double dy) override;
+    void scale(double x0, double y0, double fx, double fy, double rotation, bool restoreLineWidth) override;
+    void rotate(double x0, double y0, double th) override;
+
+    bool isInSelection(ShapeContainer* container) const override;
+
+    ErasableStroke* getErasable() const;
+    void setErasable(ErasableStroke* erasable);
+
+    StrokeCapStyle getStrokeCapStyle() const;
+    void setStrokeCapStyle(const StrokeCapStyle capStyle);
+
+    [[maybe_unused]] void debugPrint() const;
+
+public:
+    // Serialize interface
+    void serialize(ObjectOutputStream& out) const override;
+    void readSerialized(ObjectInputStream& in) override;
+
+    bool rescaleWithMirror() const override;
+
+protected:
+    void calcSize() const override;
+
+private:
+    // The stroke width cannot be inherited from Element
+    double width = 0;
+    StrokeTool toolType = StrokeTool::PEN;
+
+    // The array with the points
+    std::vector<Point> points{};
+
+    /**
+     * Dashed line
+     */
+    LineStyle lineStyle;
+
+    ErasableStroke* erasable = nullptr;
+
+    /**
+     * Option to fill the shape:
+     *  -1: The shape is not filled
+     * 255: The shape is fully opaque filled
+     * ...
+     *   1: The shape is nearly fully transparent filled
+     */
+    int fill = -1;
+
+    StrokeCapStyle capStyle = StrokeCapStyle::ROUND;
+};
diff --git a/entry/src/main/cpp/src/core/model/StrokeContour.cpp b/entry/src/main/cpp/src/core/model/StrokeContour.cpp
new file mode 100644
index 0000000..f733709
--- /dev/null
+++ b/entry/src/main/cpp/src/core/model/StrokeContour.cpp
@@ -0,0 +1,354 @@
+#include "StrokeContour.h"
+
+#include <cmath>
+#include <numeric>
+
+#include "model/MathVect.h"
+#include "model/Point.h"
+#include "util/Assert.h"
+#include "util/safe_casts.h"
+
+static_assert(std::numeric_limits<double>::is_iec559);  // Ensures atan2(0., 0.) does not error
+
+/// Takes a double between -2*pi and 2*pi and returns the corresponding angle between -pi and pi
+static constexpr double inMinusPiPiInterval(double t) {
+    xoj_assert(t >= -2 * M_PI && t <= 2 * M_PI);
+    return t > M_PI ? t - 2 * M_PI : t < -M_PI ? t + 2 * M_PI : t;
+}
+
+// Adds to cairo a segment corresponding to the cord of an arc obtained via cairo_arc() (with the same parameters)
+static void drawChord(cairo_t* cr, double cx, double cy, double radius, double angle1, double angle2) {
+    cairo_line_to(cr, cx + radius * std::cos(angle1), cy + radius * std::sin(angle1));
+    cairo_line_to(cr, cx + radius * std::cos(angle2), cy + radius * std::sin(angle2));
+}
+
+static void hookAfter(cairo_t* cr, double x, double y, double r, double a, double b) {
+    cairo_line_to(cr, x, y);
+    cairo_arc(cr, x, y, r, a, b);
+}
+static void hookBefore(cairo_t* cr, double x, double y, double r, double a, double b) {
+    cairo_arc(cr, x, y, r, a, b);
+    cairo_line_to(cr, x, y);
+}
+
+struct ReturnOp {
+    ReturnOp(void (*op)(cairo_t*, double, double, double, double, double), double x, double y, double r, double a,
+             double b):
+            op(op), x(x), y(y), r(r), a(a), b(b) {}
+    void (*op)(cairo_t*, double, double, double, double, double);
+    double x, y, r, a, b;
+
+    void operator()(cairo_t* cr) { op(cr, x, y, r, a, b); }
+};
+
+xoj::view::StrokeContour::StrokeContour(const std::vector<Point>& path): path(path) {}
+xoj::view::StrokeContour::~StrokeContour() = default;
+
+static inline void drawCoupling(cairo_t* cr, std::vector<ReturnOp>& ops, const Point& p2, double n1, double n3,
+                                double a1, double a3, double z1) {
+    if (z1 < p2.z) {
+        if (.5 * p2.z < n1  // Optimisation to avoid computing the std::hypot
+            || .5 * p2.z <= std::hypot(.5 * z1, n1)) [[likely]] {
+            double angleIn = std::asin(z1 / p2.z);
+            double a = inMinusPiPiInterval(a1 + angleIn);
+            double b = inMinusPiPiInterval(a3 - M_PI_2);
+            auto* arcFun =
+                    (inMinusPiPiInterval(a3 - a1) <= 0.0 || inMinusPiPiInterval(b - a) > 0.0) ? cairo_arc : drawChord;
+            arcFun(cr, p2.x, p2.y, .5 * p2.z, a, b);
+
+            double bp = inMinusPiPiInterval(a1 - angleIn);
+            double ap = inMinusPiPiInterval(a3 + M_PI_2);
+            auto* arcFunp =
+                    (inMinusPiPiInterval(a3 - a1) >= 0.0 || inMinusPiPiInterval(bp - ap) > 0.0) ? cairo_arc : drawChord;
+            ops.emplace_back(arcFunp, p2.x, p2.y, .5 * p2.z, ap, bp);
+        } else {
+            cairo_line_to(cr, p2.x, p2.y);
+            cairo_arc(cr, p2.x, p2.y, .5 * p2.z, a1, a3 - M_PI_2);
+            ops.emplace_back(hookBefore, p2.x, p2.y, .5 * p2.z, a3 + M_PI_2, a1);
+        }
+    } else {
+        if (.5 * z1 < n3  // Optimisation to avoid computing the std::hypot
+            || .5 * z1 <= std::hypot(.5 * p2.z, n3)) [[likely]] {
+            double angleOut = std::asin(p2.z / z1);
+            double a = inMinusPiPiInterval(a1 + M_PI_2);
+            double b = inMinusPiPiInterval(a3 - angleOut);
+            auto* arcFun =
+                    (inMinusPiPiInterval(a3 - a1) <= 0.0 || inMinusPiPiInterval(b - a) > 0.0) ? cairo_arc : drawChord;
+            arcFun(cr, p2.x, p2.y, .5 * z1, a, b);
+
+            double bp = inMinusPiPiInterval(a1 - M_PI_2);
+            double ap = inMinusPiPiInterval(a3 + angleOut);
+            auto* arcFunp =
+                    (inMinusPiPiInterval(a3 - a1) >= 0.0 || inMinusPiPiInterval(bp - ap) > 0.0) ? cairo_arc : drawChord;
+            ops.emplace_back(arcFunp, p2.x, p2.y, .5 * z1, ap, bp);
+        } else {
+            cairo_arc(cr, p2.x, p2.y, .5 * z1, a1 + M_PI_2, a3);
+            cairo_line_to(cr, p2.x, p2.y);
+            ops.emplace_back(hookAfter, p2.x, p2.y, .5 * z1, a3, a1 - M_PI_2);
+        }
+    }
+}
+
+template <typename It>
+static inline std::vector<ReturnOp> addSideToCairo(cairo_t* cr, It begin, It end) {
+    std::vector<ReturnOp> ops;
+    ops.reserve(static_cast<size_t>(std::distance(begin, end)));
+
+    for (auto it1 = begin, it2 = it1 + 1, it3 = it2 + 1; it3 != end; it1++, it2++, it3++) {
+        const auto& p1 = *it1;
+        const auto& p2 = *it2;
+        const auto& p3 = *it3;
+
+        MathVect2 v1(p2, p1);
+        MathVect2 v3(p2, p3);
+
+        drawCoupling(cr, ops, p2, v1.norm(), v3.norm(), v1.argument(), v3.argument(), p1.z);
+    }
+    return ops;
+}
+
+template <bool forward>
+static inline void contourStrokeEnd(cairo_t* cr, const Point& endPoint, const Point& adjacentPoint) {
+    double a = MathVect2(endPoint, adjacentPoint).argument();
+    cairo_arc(cr, endPoint.x, endPoint.y, .5 * (forward ? endPoint.z : adjacentPoint.z), a + M_PI_2, a - M_PI_2);
+}
+
+void xoj::view::StrokeContour::addToCairo(cairo_t* cr) const {
+    xoj_assert(path.size() >= 2);
+    contourStrokeEnd<true>(cr, path.front(), path[1]);
+    // left side of the stroke
+    auto ops = addSideToCairo(cr, path.begin(), path.end());
+
+    // Second end of the stroke
+    contourStrokeEnd<false>(cr, path.back(), path[path.size() - 2]);
+
+    for (auto it = ops.rbegin(); it < ops.rend(); it++) {
+        (*it)(cr);
+    }
+
+    cairo_close_path(cr);
+}
+
+void xoj::view::StrokeContour::drawDebug(cairo_t* cr) const {
+    {
+        // Draw the points as dashed circles
+        cairo_save(cr);
+        for (auto&& p: path) {
+            cairo_new_sub_path(cr);
+            cairo_arc(cr, p.x, p.y, .5 * p.z, 0, 2 * M_PI);
+        }
+        cairo_set_line_width(cr, .05);
+        double dashes[2] = {.2, .3};
+        cairo_set_dash(cr, dashes, 2, 0.);
+        cairo_set_source_rgb(cr, 0, 0, 0);
+        cairo_stroke(cr);
+        cairo_restore(cr);
+    }
+
+    // First end of the stroke
+    contourStrokeEnd<true>(cr, path.front(), path[1]);
+    // left side of the stroke
+    auto ops = addSideToCairo(cr, path.begin(), path.end());
+    cairo_set_line_width(cr, .1);
+    cairo_set_source_rgb(cr, 1, 0, 0);
+    cairo_stroke(cr);
+
+    // Second end of the stroke
+    contourStrokeEnd<false>(cr, path.back(), path[path.size() - 2]);
+    // right side of the stroke on the way back
+
+    for (auto it = ops.rbegin(); it < ops.rend(); it++) {
+        (*it)(cr);
+    }
+    cairo_set_line_width(cr, .1);
+    cairo_set_source_rgb(cr, 0, .5, 1);
+    cairo_stroke(cr);
+
+    for (auto&& p: path) {
+        cairo_move_to(cr, p.x, p.y);
+        cairo_line_to(cr, p.x, p.y);
+    }
+    cairo_set_line_width(cr, .2);
+    cairo_set_source_rgb(cr, 0, 0, 0);
+    cairo_stroke(cr);
+
+    for (auto&& p: {path.front(), path.back()}) {
+        cairo_move_to(cr, p.x, p.y);
+        cairo_line_to(cr, p.x, p.y);
+    }
+    cairo_set_line_width(cr, .4);
+    cairo_set_source_rgb(cr, 0, 0, 0);
+    cairo_stroke(cr);
+}
+
+
+// Dashes
+xoj::view::StrokeContourDashes::StrokeContourDashes(const std::vector<Point>& path,
+                                                    const std::vector<double>& dashPattern):
+        path(path), dashPattern(dashPattern) {}
+xoj::view::StrokeContourDashes::~StrokeContourDashes() = default;
+
+static void noop(cairo_t*) {};
+
+template <auto xtraFun = noop>
+static inline void dashSegment(cairo_t* cr, std::vector<ReturnOp>& ops, double& dashoffset,
+                               std::vector<double>::const_iterator& dashIt, const std::vector<double>& dashPattern,
+                               const Point& p1, const Point& p2, double norm1, double a1, bool& on) {
+    dashoffset += norm1;
+
+    while (dashoffset >= *dashIt) {
+        Point p = p1.lineTo(p2, *dashIt - dashoffset + norm1);
+        if (on) {
+            cairo_arc(cr, p.x, p.y, .5 * p1.z, a1 + M_PI_2, a1 - M_PI_2);
+            for (auto it = ops.rbegin(); it < ops.rend(); it++) {
+                (*it)(cr);
+            }
+            cairo_close_path(cr);
+            xtraFun(cr);  // Only for printing debug
+
+            ops.clear();
+        } else {
+            cairo_new_sub_path(cr);
+            cairo_arc(cr, p.x, p.y, .5 * p1.z, a1 - M_PI_2, a1 + M_PI_2);
+        }
+
+        dashoffset -= *dashIt;
+        if (++dashIt == dashPattern.end()) {
+            dashIt = dashPattern.begin();
+        }
+        on = !on;
+    }
+}
+
+double xoj::view::StrokeContourDashes::addToCairo(cairo_t* cr, double globalDashOffset) const {
+    std::vector<ReturnOp> ops;
+    auto dashIt = dashPattern.begin();
+    bool on = true;
+
+    double dashoffset = globalDashOffset;
+
+    if (dashoffset != 0.) {
+        // We need to advance dashIt to account for the offset
+
+        double dashPeriod = std::accumulate(dashPattern.begin(), dashPattern.end(), 0.);
+        xoj_assert(dashoffset >= 0.);
+        xoj_assert(dashPeriod >= 0.);
+
+        auto ratio = floor_cast<unsigned>(dashoffset / dashPeriod);
+        dashoffset -= dashPeriod * ratio;
+
+        on = (ratio * dashPattern.size() + 1) % 2;
+
+        while (dashoffset >= *dashIt) {
+            dashoffset -= *dashIt;
+            on = !on;
+            dashIt++;
+            // as dashoffset < dashPeriod, this loop should not consume all of dashPattern
+            xoj_assert(dashIt != dashPattern.end());
+        }
+    }
+
+    if (on) {
+        contourStrokeEnd<true>(cr, path.front(), path[1]);
+    }
+
+    for (auto it1 = path.begin(), it2 = it1 + 1, it3 = it2 + 1; it3 != path.end(); it1++, it2++, it3++) {
+        const auto& p1 = *it1;
+        const auto& p2 = *it2;
+        const auto& p3 = *it3;
+
+        MathVect2 v1(p2, p1);
+        double norm1 = v1.norm();
+        double a1 = v1.argument();
+
+        dashSegment(cr, ops, dashoffset, dashIt, dashPattern, p1, p2, norm1, a1, on);
+        if (on) {
+            MathVect2 v3(p2, p3);
+            drawCoupling(cr, ops, p2, std::min(dashoffset, norm1), std::min(*dashIt - dashoffset, v3.norm()), a1,
+                         v3.argument(), p1.z);
+        }
+
+        globalDashOffset += norm1;
+    }
+
+    const Point& p1 = path[path.size() - 2];
+    const Point& p2 = path.back();
+    MathVect2 v(p2, p1);
+    double a = v.argument();
+    double norm = v.norm();
+    globalDashOffset += norm;
+    dashSegment(cr, ops, dashoffset, dashIt, dashPattern, p1, p2, norm, a, on);
+    if (on) {
+        cairo_arc(cr, p2.x, p2.y, .5 * p1.z, a + M_PI_2, a - M_PI_2);
+        for (auto it = ops.rbegin(); it < ops.rend(); it++) {
+            (*it)(cr);
+        }
+        cairo_close_path(cr);
+    }
+    return globalDashOffset;
+}
+
+static void xtraFun(cairo_t* cr) {
+    static int i = 0;
+    static constexpr struct {
+        double r, g, b;
+    } colors[] = {{1., 0., 0.}, {0., 0.2, 1.}};
+    cairo_set_source_rgb(cr, colors[i].r, colors[i].g, colors[i].b);
+    i = (i + 1) % 2;
+    cairo_stroke(cr);
+}
+
+void xoj::view::StrokeContourDashes::drawDebug(cairo_t* cr) const {
+    {
+        // Draw the points as dashed circles
+        cairo_save(cr);
+        for (auto&& p: path) {
+            cairo_new_sub_path(cr);
+            cairo_arc(cr, p.x, p.y, .5 * p.z, 0, 2 * M_PI);
+        }
+        cairo_set_line_width(cr, .05);
+        double dashes[2] = {.2, .3};
+        cairo_set_dash(cr, dashes, 2, 0.);
+        cairo_set_source_rgb(cr, 0, 0, 0);
+        cairo_stroke(cr);
+        cairo_restore(cr);
+    }
+
+    cairo_set_line_width(cr, .1);
+    double dashoffset = 0.;
+    std::vector<ReturnOp> ops;
+    auto dashIt = dashPattern.begin();
+    bool on = true;
+
+    contourStrokeEnd<true>(cr, path.front(), path[1]);
+
+    for (auto it1 = path.begin(), it2 = it1 + 1, it3 = it2 + 1; it3 != path.end(); it1++, it2++, it3++) {
+        const auto& p1 = *it1;
+        const auto& p2 = *it2;
+        const auto& p3 = *it3;
+
+        MathVect2 v1(p2, p1);
+        double norm1 = v1.norm();
+        double a1 = v1.argument();
+        dashSegment<xtraFun>(cr, ops, dashoffset, dashIt, dashPattern, p1, p2, norm1, a1, on);
+
+        if (on) {
+            MathVect2 v3(p2, p3);
+            drawCoupling(cr, ops, p2, std::min(dashoffset, norm1), std::min(*dashIt - dashoffset, v3.norm()), a1,
+                         v3.argument(), p1.z);
+        }
+    }
+
+    const Point& p1 = path[path.size() - 2];
+    const Point& p2 = path.back();
+    MathVect2 v(p2, p1);
+    double a = v.argument();
+    dashSegment<xtraFun>(cr, ops, dashoffset, dashIt, dashPattern, p1, p2, v.norm(), a, on);
+    if (on) {
+        cairo_arc(cr, p2.x, p2.y, .5 * p1.z, a + M_PI_2, a - M_PI_2);
+        for (auto it = ops.rbegin(); it < ops.rend(); it++) {
+            (*it)(cr);
+        }
+        xtraFun(cr);
+    }
+}
diff --git a/entry/src/main/cpp/src/core/model/StrokeContour.h b/entry/src/main/cpp/src/core/model/StrokeContour.h
new file mode 100644
index 0000000..de1267b
--- /dev/null
+++ b/entry/src/main/cpp/src/core/model/StrokeContour.h
@@ -0,0 +1,44 @@
+/*
+ * Xournal++
+ *
+ * Helper class to add the contour of a stroke to a cairo context
+ *
+ * @author Xournal++ Team
+ * https://github.com/xournalpp/xournalpp
+ *
+ * @license GNU GPLv2 or later
+ */
+
+#pragma once
+
+#include <vector>  // for vector
+
+#include <cairo.h>
+
+class Point;
+
+namespace xoj::view {
+class StrokeContour final {
+public:
+    explicit StrokeContour(const std::vector<Point>& path);
+    ~StrokeContour();
+    void addToCairo(cairo_t* cr) const;
+    void drawDebug(cairo_t* cr) const;
+
+private:
+    const std::vector<Point>& path;
+};
+
+class StrokeContourDashes final {
+public:
+    StrokeContourDashes(const std::vector<Point>& path, const std::vector<double>& dashPattern);
+    ~StrokeContourDashes();
+    /// Returns the new dash offset (= dashoffset + path length)
+    double addToCairo(cairo_t* cr, double dashoffset) const;
+    void drawDebug(cairo_t* cr) const;
+
+private:
+    const std::vector<Point>& path;
+    const std::vector<double>& dashPattern;
+};
+};  // namespace xoj::view
diff --git a/entry/src/main/cpp/src/core/model/StrokeStyle.cpp b/entry/src/main/cpp/src/core/model/StrokeStyle.cpp
new file mode 100644
index 0000000..b51bc24
--- /dev/null
+++ b/entry/src/main/cpp/src/core/model/StrokeStyle.cpp
@@ -0,0 +1,79 @@
+#include "StrokeStyle.h"
+
+#include <cstring>   // for memcmp, strcmp, strncmp
+#include <iomanip>   // for setprecision
+#include <iterator>  // for ostream_iterator
+#include <map>       // for map
+#include <sstream>   // for istringstream
+#include <vector>    // for vector
+
+#include "model/LineStyle.h"  // for LineStyle
+#include "util/serdesstream.h"
+
+namespace {
+
+constexpr auto CUSTOM_KEY = "cust: ";
+
+const std::map<std::string, std::vector<double>> predefinedPatterns = {
+        {"dash", {6, 3}}, {"dashdot", {6, 3, 0.5, 3}}, {"dot", {0.5, 3}}};
+
+auto formatStyle(const std::vector<double>& dashes) -> std::string {
+
+    // Check if dashes match named predefined dashes.
+    for (auto& pair: predefinedPatterns) {
+        if (pair.second == dashes) {
+            return pair.first;
+        }
+    }
+
+    // Else generate custom dashes string
+    auto custom = serdes_stream<std::ostringstream>();
+    custom << std::setprecision(2) << std::fixed;
+    custom << CUSTOM_KEY;
+    std::copy(dashes.begin(), dashes.end(), std::ostream_iterator<double>(custom, " "));
+
+    // Return dashes string with traling space removed.
+    return custom.str().substr(0, custom.str().length() - 1);
+}
+
+}  // namespace
+
+auto StrokeStyle::parseStyle(const std::string& style) -> LineStyle {
+    auto it = predefinedPatterns.find(style);
+    if (it != predefinedPatterns.end()) {
+        LineStyle ls;
+        std::vector<double> dashes = it->second;
+        ls.setDashes(std::move(dashes));
+        return ls;
+    }
+
+    if (style.substr(0, strlen(CUSTOM_KEY)) != CUSTOM_KEY) {
+        return LineStyle();
+    }
+
+    auto dashStream = serdes_stream<std::stringstream>(style);
+    std::vector<double> dashes;
+
+    dashStream.seekg(strlen(CUSTOM_KEY));
+    for (double value; dashStream >> value;) {
+        dashes.push_back(value);
+    }
+
+    if (dashes.empty()) {
+        return LineStyle();
+    }
+
+    LineStyle ls;
+    ls.setDashes(std::move(dashes));
+    return ls;
+}
+
+auto StrokeStyle::formatStyle(const LineStyle& style) -> std::string {
+    const auto& dashes = style.getDashes();
+    if (!dashes.empty()) {
+        return ::formatStyle(dashes);
+    }
+
+    // Should not be returned, in this case the attribute is not written
+    return "plain";
+}
diff --git a/entry/src/main/cpp/src/core/model/StrokeStyle.h b/entry/src/main/cpp/src/core/model/StrokeStyle.h
new file mode 100644
index 0000000..788f27a
--- /dev/null
+++ b/entry/src/main/cpp/src/core/model/StrokeStyle.h
@@ -0,0 +1,30 @@
+/*
+ * Xournal++
+ *
+ * Definition for StrokeStyles
+ *
+ * @author Xournal++ Team
+ * https://github.com/xournalpp/xournalpp
+ *
+ * @license GNU GPLv2 or later
+ */
+
+#pragma once
+
+#include <string>  // for string
+
+#include "LineStyle.h"  // for LineStyle
+
+namespace StrokeStyle {
+/** Parse LineStyle from string.
+ *
+ * @return LineStyle deserialized from string
+ */
+LineStyle parseStyle(const std::string& style);
+/** Convert a LineStyle to a string.
+ *
+ * @param style to be serialized
+ * @return string containing serialized version of LineStyle
+ */
+std::string formatStyle(const LineStyle& style);
+}  // namespace StrokeStyle
diff --git a/entry/src/main/cpp/src/core/model/TexImage.cpp b/entry/src/main/cpp/src/core/model/TexImage.cpp
new file mode 100644
index 0000000..f904db1
--- /dev/null
+++ b/entry/src/main/cpp/src/core/model/TexImage.cpp
@@ -0,0 +1,170 @@
+#include "TexImage.h"
+
+#include <memory>
+#include <utility>  // for move
+
+#include <poppler-document.h>  // for poppler_document_ge...
+#include <poppler-page.h>      // for poppler_page_get_size
+
+#include "model/Element.h"                        // for Element, ELEMENT_TE...
+#include "util/Rectangle.h"                       // for Rectangle
+#include "util/raii/GObjectSPtr.h"                // for GObjectSPtr
+#include "util/serializing/ObjectInputStream.h"   // for ObjectInputStream
+#include "util/serializing/ObjectOutputStream.h"  // for ObjectOutputStream
+
+using xoj::util::Rectangle;
+
+TexImage::TexImage(): Element(ELEMENT_TEXIMAGE) { this->sizeCalculated = true; }
+
+TexImage::~TexImage() { freeImageAndPdf(); }
+
+void TexImage::freeImageAndPdf() {
+    if (this->image) {
+        cairo_surface_destroy(this->image);
+        this->image = nullptr;
+    }
+
+    this->pdf.reset();
+}
+
+auto TexImage::cloneTexImage() const -> std::unique_ptr<TexImage> {
+
+    auto img = std::make_unique<TexImage>();
+    img->x = this->x;
+    img->y = this->y;
+    img->setColor(this->getColor());
+    img->width = this->width;
+    img->height = this->height;
+    img->text = this->text;
+    img->snappedBounds = this->snappedBounds;
+    img->sizeCalculated = this->sizeCalculated;
+
+    // Clone has a copy of our PDF.
+    img->pdf = this->pdf;
+
+    // Load a copy of our data (must be called after
+    // giving the clone a copy of our PDF -- it may change
+    // the PDF we've given it).
+    img->loadData(std::string(this->binaryData), nullptr);
+
+    return img;
+}
+
+auto TexImage::clone() const -> ElementPtr { return cloneTexImage(); }
+
+void TexImage::setWidth(double width) {
+    this->width = width;
+    this->calcSize();
+}
+
+void TexImage::setHeight(double height) {
+    this->height = height;
+    this->calcSize();
+}
+
+auto TexImage::cairoReadFunction(TexImage* image, unsigned char* data, unsigned int length) -> cairo_status_t {
+    for (unsigned int i = 0; i < length; i++, image->read++) {
+        if (image->read >= image->binaryData.length()) {
+            return CAIRO_STATUS_READ_ERROR;
+        }
+        data[i] = static_cast<unsigned char>(image->binaryData[image->read]);
+    }
+
+    return CAIRO_STATUS_SUCCESS;
+}
+
+/**
+ * Gets the binary data, a .PNG image or a .PDF
+ */
+auto TexImage::getBinaryData() const -> std::string const& { return this->binaryData; }
+
+void TexImage::setText(std::string text) { this->text = std::move(text); }
+
+auto TexImage::getText() const -> std::string { return this->text; }
+
+auto TexImage::loadData(std::string&& bytes, GError** err) -> bool {
+    this->freeImageAndPdf();
+    this->binaryData = bytes;
+    if (this->binaryData.length() < 4) {
+        return false;
+    }
+
+    const std::string type = binaryData.substr(1, 3);
+    if (type == "PDF") {
+        // Note: binaryData must not be modified while pdf is live.
+        auto* bytes = g_bytes_new_with_free_func(this->binaryData.data(), this->binaryData.size(), nullptr, nullptr);
+        this->pdf.reset(poppler_document_new_from_bytes(bytes, nullptr, err), xoj::util::adopt);
+        g_bytes_unref(bytes);
+
+        if (!pdf.get() || poppler_document_get_n_pages(this->pdf.get()) < 1) {
+            return false;
+        }
+        if (std::abs(this->width * this->height) <= std::numeric_limits<double>::epsilon()) {
+            xoj::util::GObjectSPtr<PopplerPage> page(poppler_document_get_page(this->pdf.get(), 0), xoj::util::adopt);
+            poppler_page_get_size(page.get(), &this->width, &this->height);
+        }
+    } else if (type == "PNG") {
+        this->image = cairo_image_surface_create_from_png_stream(
+                reinterpret_cast<cairo_read_func_t>(&cairoReadFunction), this);
+    } else {
+        g_warning("Unknown Latex image type: \"%s\"", type.c_str());
+    }
+
+    return true;
+}
+
+auto TexImage::getImage() const -> cairo_surface_t* { return this->image; }
+
+auto TexImage::getPdf() const -> PopplerDocument* { return this->pdf.get(); }
+
+void TexImage::scale(double x0, double y0, double fx, double fy, double rotation,
+                     bool) {  // line width scaling option is not used
+
+    this->x = (this->x - x0) * fx + x0;
+    this->y = (this->y - y0) * fy + y0;
+
+    this->width *= fx;
+    this->height *= fy;
+    this->calcSize();
+}
+
+void TexImage::rotate(double x0, double y0, double th) {
+    // Rotation for TexImages not yet implemented
+}
+
+void TexImage::serialize(ObjectOutputStream& out) const {
+    out.writeObject("TexImage");
+
+    this->Element::serialize(out);
+
+    out.writeDouble(this->width);
+    out.writeDouble(this->height);
+    out.writeString(this->text);
+
+    out.writeString(this->binaryData);
+
+    out.endObject();
+}
+
+void TexImage::readSerialized(ObjectInputStream& in) {
+    in.readObject("TexImage");
+
+    this->Element::readSerialized(in);
+
+    this->width = in.readDouble();
+    this->height = in.readDouble();
+    this->text = in.readString();
+
+    freeImageAndPdf();
+
+    std::string data = in.readString();
+    this->loadData(std::move(data), nullptr);
+
+    in.endObject();
+    this->calcSize();
+}
+
+void TexImage::calcSize() const {
+    this->snappedBounds = Rectangle<double>(this->x, this->y, this->width, this->height);
+    this->sizeCalculated = true;
+}
diff --git a/entry/src/main/cpp/src/core/model/TexImage.h b/entry/src/main/cpp/src/core/model/TexImage.h
new file mode 100644
index 0000000..2ee860f
--- /dev/null
+++ b/entry/src/main/cpp/src/core/model/TexImage.h
@@ -0,0 +1,114 @@
+/*
+ * Xournal++
+ *
+ * A TexImage on the document
+ *
+ * @author Xournal++ Team
+ * https://github.com/xournalpp/xournalpp
+ *
+ * @license GNU GPLv2 or later
+ */
+
+#pragma once
+
+#include <memory>
+#include <string>  // for string
+
+#include <cairo.h>    // for cairo_surface_t, cairo_status_t
+#include <glib.h>     // for GError
+#include <poppler.h>  // for PopplerDocument
+
+#include "util/raii/GObjectSPtr.h"  // for GObjectSPtr
+
+#include "Element.h"  // for Element
+
+class ObjectInputStream;
+class ObjectOutputStream;
+
+
+class TexImage: public Element {
+public:
+    TexImage();
+    TexImage(const TexImage&) = delete;
+    TexImage& operator=(const TexImage&) = delete;
+    TexImage(const TexImage&&) = delete;
+    TexImage&& operator=(const TexImage&&) = delete;
+    ~TexImage() override;
+
+public:
+    void setWidth(double width);
+    void setHeight(double height);
+
+    /**
+     * Returns the binary data (PDF or PNG (deprecated)).
+     */
+    const std::string& getBinaryData() const;
+
+    /**
+     * @return The image, if render source is PNG. Note: this is deprecated.
+     */
+    cairo_surface_t* getImage() const;
+
+    /**
+     * @return The PDF Document, if rendered as a PDF.
+     *
+     * The document needs to be referenced, if it will be hold somewhere
+     */
+    PopplerDocument* getPdf() const;
+
+    void scale(double x0, double y0, double fx, double fy, double rotation, bool restoreLineWidth) override;
+    void rotate(double x0, double y0, double th) override;
+
+    // text tag to alow latex
+    void setText(std::string text);
+    std::string getText() const;
+
+    auto cloneTexImage() const -> std::unique_ptr<TexImage>;
+    auto clone() const -> ElementPtr override;
+
+    /**
+     * @return true if the binary data (PNG or PDF) was loaded successfully.
+     */
+    bool loadData(std::string&& bytes, GError** err = nullptr);
+
+public:
+    // Serialize interface
+    void serialize(ObjectOutputStream& out) const override;
+    void readSerialized(ObjectInputStream& in) override;
+
+private:
+    void calcSize() const override;
+
+    static cairo_status_t cairoReadFunction(TexImage* image, unsigned char* data, unsigned int length);
+
+    /**
+     * Free image and PDF
+     */
+    void freeImageAndPdf();
+
+private:
+    /**
+     * Tex PDF Document, if rendered as PDF
+     */
+    xoj::util::GObjectSPtr<PopplerDocument> pdf;
+
+    /**
+     * Tex image, if rendered as image. Note: this is deprecated and subject to removal in a later version.
+     */
+    cairo_surface_t* image = nullptr;
+
+    /**
+     * PNG Image / PDF Document
+     */
+    std::string binaryData;
+
+    /**
+     * Read position for PNG binaryData (deprecated).
+     */
+    std::string::size_type read = 0;
+
+    /**
+     * Tex String
+     */
+    std::string text;
+};
diff --git a/entry/src/main/cpp/src/core/model/Text.cpp b/entry/src/main/cpp/src/core/model/Text.cpp
new file mode 100644
index 0000000..bf3451f
--- /dev/null
+++ b/entry/src/main/cpp/src/core/model/Text.cpp
@@ -0,0 +1,199 @@
+#include "Text.h"
+
+#include <memory>
+#include <utility>  // for move
+
+#include <glib.h>  // for g_warning
+#include <pango/pangocairo.h>
+
+#include "model/AudioElement.h"   // for AudioElement
+#include "model/Element.h"        // for ELEMENT_TEXT, Eleme...
+#include "model/Font.h"           // for XojFont
+#include "pdf/base/XojPdfPage.h"  // for XojPdfRectangle
+#include "util/Rectangle.h"       // for Rectangle
+#include "util/Stacktrace.h"      // for Stacktrace
+#include "util/StringUtils.h"
+#include "util/raii/GObjectSPtr.h"
+#include "util/serializing/ObjectInputStream.h"   // for ObjectInputStream
+#include "util/serializing/ObjectOutputStream.h"  // for ObjectOutputStream
+
+using xoj::util::Rectangle;
+
+Text::Text(): AudioElement(ELEMENT_TEXT) {
+    this->font.setName("Sans");
+    this->font.setSize(12);
+}
+
+Text::~Text() = default;
+
+auto Text::cloneText() const -> std::unique_ptr<Text> {
+    auto text = std::make_unique<Text>();
+    text->font = this->font;
+    text->text = this->text;
+    text->setColor(this->getColor());
+    text->x = this->x;
+    text->y = this->y;
+    text->width = this->width;
+    text->height = this->height;
+    text->cloneAudioData(this);
+    text->snappedBounds = this->snappedBounds;
+    text->sizeCalculated = this->sizeCalculated;
+    text->inEditing = this->inEditing;
+
+    return text;
+}
+
+auto Text::clone() const -> ElementPtr { return cloneText(); }
+
+auto Text::getFont() -> XojFont& { return font; }
+auto Text::getFont() const -> const XojFont& { return font; }
+
+void Text::setFont(const XojFont& font) {
+    this->font = font;
+    sizeCalculated = false;
+}
+
+auto Text::getFontSize() const -> double { return font.getSize(); }
+
+auto Text::getFontName() const -> std::string { return font.getName(); }
+
+auto Text::getText() const -> const std::string& { return this->text; }
+
+void Text::setText(std::string text) {
+    this->text = std::move(text);
+    sizeCalculated = false;
+}
+
+void Text::calcSize() const {
+    auto layout = createPangoLayout();
+    pango_layout_set_text(layout.get(), this->text.c_str(), static_cast<int>(this->text.length()));
+    int w = 0;
+    int h = 0;
+    pango_layout_get_size(layout.get(), &w, &h);
+    this->width = (static_cast<double>(w)) / PANGO_SCALE;
+    this->height = (static_cast<double>(h)) / PANGO_SCALE;
+    this->updateSnapping();
+}
+
+void Text::setWidth(double width) {
+    this->width = width;
+    this->updateSnapping();
+}
+
+void Text::setHeight(double height) {
+    this->height = height;
+    this->updateSnapping();
+}
+
+void Text::setInEditing(bool inEditing) { this->inEditing = inEditing; }
+
+auto Text::createPangoLayout() const -> xoj::util::GObjectSPtr<PangoLayout> {
+    xoj::util::GObjectSPtr<PangoContext> c(pango_font_map_create_context(pango_cairo_font_map_get_default()),
+                                           xoj::util::adopt);
+    pango_context_set_round_glyph_positions(c.get(), false);  // Avoid weird glyph positioning on small fonts
+    xoj::util::GObjectSPtr<PangoLayout> layout(pango_layout_new(c.get()), xoj::util::adopt);
+
+#if PANGO_VERSION_CHECK(1, 48, 5)  // see https://gitlab.gnome.org/GNOME/pango/-/issues/499
+    pango_layout_set_line_spacing(layout.get(), 1.0);
+#endif
+
+    updatePangoFont(layout.get());
+
+    return layout;
+}
+
+void Text::updatePangoFont(PangoLayout* layout) const {
+    PangoFontDescription* desc = pango_font_description_from_string(this->getFontName().c_str());
+    pango_font_description_set_absolute_size(desc, this->getFontSize() * PANGO_SCALE);
+
+    pango_layout_set_font_description(layout, desc);
+    pango_font_description_free(desc);
+}
+
+void Text::scale(double x0, double y0, double fx, double fy, double rotation,
+                 bool) {  // line width scaling option is not used
+    // only proportional scale allowed...
+    if (fx != fy) {
+        g_warning("rescale font with fx != fy not supported: %lf / %lf", fx, fy);
+        Stacktrace::printStacktrace();
+    }
+
+    this->x -= x0;
+    this->x *= fx;
+    this->x += x0;
+    this->y -= y0;
+    this->y *= fy;
+    this->y += y0;
+
+    double size = this->font.getSize() * fx;
+    this->font.setSize(size);
+
+    sizeCalculated = false;
+}
+
+void Text::rotate(double x0, double y0, double th) {}
+
+auto Text::isInEditing() const -> bool { return this->inEditing; }
+
+auto Text::rescaleOnlyAspectRatio() const -> bool { return true; }
+
+void Text::serialize(ObjectOutputStream& out) const {
+    out.writeObject("Text");
+
+    this->AudioElement::serialize(out);
+
+    out.writeString(this->text);
+
+    font.serialize(out);
+
+    out.endObject();
+}
+
+void Text::readSerialized(ObjectInputStream& in) {
+    in.readObject("Text");
+
+    this->AudioElement::readSerialized(in);
+
+    this->text = in.readString();
+
+    font.readSerialized(in);
+
+    in.endObject();
+}
+
+void Text::updateSnapping() const {
+    this->snappedBounds = Rectangle<double>(this->x, this->y, this->width, this->height);
+}
+
+auto Text::findText(const std::string& search) const -> std::vector<XojPdfRectangle> {
+    size_t patternLength = search.length();
+    if (patternLength == 0) {
+        return {};
+    }
+
+    auto layout = this->createPangoLayout();
+    pango_layout_set_text(layout.get(), this->text.c_str(), static_cast<int>(this->text.length()));
+
+
+    std::string text = StringUtils::toLowerCase(this->text);
+
+    std::string pattern = StringUtils::toLowerCase(search);
+
+    std::vector<XojPdfRectangle> list;
+
+    for (size_t pos = text.find(pattern); pos != std::string::npos; pos = text.find(pattern, pos + 1)) {
+        XojPdfRectangle mark;
+        PangoRectangle rect = {0};
+        pango_layout_index_to_pos(layout.get(), static_cast<int>(pos), &rect);
+        mark.x1 = (static_cast<double>(rect.x)) / PANGO_SCALE + this->getX();
+        mark.y1 = (static_cast<double>(rect.y)) / PANGO_SCALE + this->getY();
+
+        pango_layout_index_to_pos(layout.get(), static_cast<int>(pos + patternLength - 1), &rect);
+        mark.x2 = (static_cast<double>(rect.x) + rect.width) / PANGO_SCALE + this->getX();
+        mark.y2 = (static_cast<double>(rect.y) + rect.height) / PANGO_SCALE + this->getY();
+
+        list.push_back(mark);
+    }
+
+    return list;
+}
diff --git a/entry/src/main/cpp/src/core/model/Text.h b/entry/src/main/cpp/src/core/model/Text.h
new file mode 100644
index 0000000..8c5ec16
--- /dev/null
+++ b/entry/src/main/cpp/src/core/model/Text.h
@@ -0,0 +1,80 @@
+/*
+ * Xournal++
+ *
+ * A text element
+ *
+ * @author Xournal++ Team
+ * https://github.com/xournalpp/xournalpp
+ *
+ * @license GNU GPLv2 or later
+ */
+
+#pragma once
+
+#include <string>  // for string
+#include <vector>
+
+#include <pango/pango.h>
+
+#include "model/Element.h"
+#include "util/raii/GObjectSPtr.h"
+
+#include "AudioElement.h"  // for AudioElement
+#include "Font.h"          // for XojFont
+
+class Element;
+class ObjectInputStream;
+class ObjectOutputStream;
+class XojPdfRectangle;
+
+class Text: public AudioElement {
+public:
+    Text();
+    ~Text() override;
+
+public:
+    void setFont(const XojFont& font);
+    XojFont& getFont();
+    const XojFont& getFont() const;
+    double getFontSize() const;       // same result as getFont()->getSize(), but const
+    std::string getFontName() const;  // same result as getFont()->getName(), but const
+
+    const std::string& getText() const;
+    void setText(std::string text);
+
+    void setWidth(double width);
+    void setHeight(double height);
+
+    void setInEditing(bool inEditing);
+    bool isInEditing() const;
+
+    xoj::util::GObjectSPtr<PangoLayout> createPangoLayout() const;
+    void updatePangoFont(PangoLayout* layout) const;
+
+    void scale(double x0, double y0, double fx, double fy, double rotation, bool restoreLineWidth) override;
+    void rotate(double x0, double y0, double th) override;
+
+    bool rescaleOnlyAspectRatio() const override;
+
+    auto cloneText() const -> std::unique_ptr<Text>;
+    auto clone() const -> ElementPtr override;
+
+public:
+    // Serialize interface
+    void serialize(ObjectOutputStream& out) const override;
+    void readSerialized(ObjectInputStream& in) override;
+
+protected:
+    void calcSize() const override;
+    void updateSnapping() const;
+
+public:
+    std::vector<XojPdfRectangle> findText(const std::string& search) const;
+
+private:
+    XojFont font;
+
+    std::string text;
+
+    bool inEditing = false;
+};
diff --git a/entry/src/main/cpp/src/core/model/XojPage.cpp b/entry/src/main/cpp/src/core/model/XojPage.cpp
new file mode 100644
index 0000000..cdb5a17
--- /dev/null
+++ b/entry/src/main/cpp/src/core/model/XojPage.cpp
@@ -0,0 +1,177 @@
+#include "XojPage.h"
+
+#include <algorithm>  // for find, transform
+#include <iterator>   // for back_insert_iterator, back_inserter, begin
+#include <utility>    // for move
+
+#include "model/Layer.h"     // for Layer, Layer::Index
+#include "model/PageType.h"  // for PageType, PageTypeFormat, PageTypeForma...
+#include "util/Assert.h"     // for xoj_assert
+#include "util/i18n.h"       // for _
+
+#include "BackgroundImage.h"  // for BackgroundImage
+
+XojPage::XojPage(double width, double height, bool suppressLayerCreation): width(width), height(height), bgType(PageTypeFormat::Lined) {
+    if (!suppressLayerCreation) {
+        // ensure at least one valid layer exists
+        this->addLayer(new Layer());
+        this->currentLayer = 1;
+    }
+}
+
+XojPage::~XojPage() {
+    for (Layer* l: this->layer) { delete l; }
+    this->layer.clear();
+}
+
+XojPage::XojPage(XojPage const& page):
+        backgroundImage(page.backgroundImage),
+        width(page.width),
+        height(page.height),
+        currentLayer(page.currentLayer),
+        bgType(page.bgType),
+        pdfBackgroundPage(page.pdfBackgroundPage),
+        backgroundColor(page.backgroundColor) {
+    this->layer.reserve(page.layer.size());
+    std::transform(begin(page.layer), end(page.layer), std::back_inserter(this->layer),
+                   [](auto* layer) { return layer->clone(); });
+}
+
+auto XojPage::clone() -> XojPage* { return new XojPage(*this); }
+
+void XojPage::addLayer(Layer* layer) {
+    this->layer.push_back(layer);
+    this->currentLayer = npos;
+}
+
+void XojPage::insertLayer(Layer* layer, Layer::Index index) {
+    if (index >= this->layer.size()) {
+        addLayer(layer);
+        return;
+    }
+
+    this->layer.insert(std::next(this->layer.begin(), static_cast<ptrdiff_t>(index)), layer);
+    this->currentLayer = index + 1;
+}
+
+void XojPage::removeLayer(Layer* l) {
+    if (auto it = std::find(layer.begin(), layer.end(), l); it != layer.end()) {
+        this->layer.erase(it);
+    }
+    this->currentLayer = npos;
+    // ensure at least one valid layer exists
+    if (layer.empty()) {
+        addLayer(new Layer());
+    }
+}
+
+void XojPage::setSelectedLayerId(Layer::Index id) { this->currentLayer = id; }
+
+auto XojPage::getLayers() -> std::vector<Layer*>& { return this->layer; }
+
+auto XojPage::getLayersView() const -> xoj::util::PointerContainerView<std::vector<Layer*>> { return this->layer; }
+
+auto XojPage::getLayerCount() const -> Layer::Index { return this->layer.size(); }
+
+/**
+ * Layer ID 0 = Background, Layer ID 1 = Layer 1
+ */
+auto XojPage::getSelectedLayerId() -> Layer::Index {
+    if (this->currentLayer == npos) {
+        this->currentLayer = this->layer.size();
+    }
+
+    return this->currentLayer;
+}
+
+void XojPage::setLayerVisible(Layer::Index layerId, bool visible) {
+    if (layerId == 0) {
+        backgroundVisible = visible;
+        return;
+    }
+
+    layerId--;
+    if (layerId >= this->layer.size()) {
+        return;
+    }
+
+    this->layer[layerId]->setVisible(visible);
+}
+
+auto XojPage::isLayerVisible(Layer::Index layerId) const -> bool {
+    if (layerId == 0) {
+        return backgroundVisible;
+    }
+
+    layerId--;
+    if (layerId >= this->layer.size()) {
+        return false;
+    }
+
+    return this->layer[layerId]->isVisible();
+}
+
+void XojPage::setBackgroundPdfPageNr(size_t page) {
+    this->pdfBackgroundPage = page;
+    this->bgType.format = PageTypeFormat::Pdf;
+    this->bgType.config = "";
+}
+
+void XojPage::setBackgroundColor(Color color) { this->backgroundColor = color; }
+
+auto XojPage::getBackgroundColor() const -> Color { return this->backgroundColor; }
+
+void XojPage::setSize(double width, double height) {
+    this->width = width;
+    this->height = height;
+}
+
+auto XojPage::getWidth() const -> double { return this->width; }
+
+auto XojPage::getHeight() const -> double { return this->height; }
+
+auto XojPage::getPdfPageNr() const -> size_t { return this->pdfBackgroundPage; }
+
+auto XojPage::isAnnotated() const -> bool {
+    for (Layer* l: this->layer) {
+        if (l->isAnnotated()) {
+            return true;
+        }
+    }
+    return false;
+}
+
+void XojPage::setBackgroundType(const PageType& bgType) {
+    this->bgType = bgType;
+
+    if (!bgType.isPdfPage()) {
+        this->pdfBackgroundPage = npos;
+    }
+    if (!bgType.isImagePage()) {
+        this->backgroundImage.free();
+    }
+}
+
+auto XojPage::getBackgroundType() const -> PageType { return this->bgType; }
+
+auto XojPage::getBackgroundImage() -> BackgroundImage& { return this->backgroundImage; }
+auto XojPage::getBackgroundImage() const -> const BackgroundImage& { return this->backgroundImage; }
+
+void XojPage::setBackgroundImage(BackgroundImage img) { this->backgroundImage = std::move(img); }
+
+auto XojPage::getSelectedLayer() -> Layer* {
+    xoj_assert(!layer.empty());
+    size_t layer = getSelectedLayerId();
+
+    if (layer > 0) {
+        layer--;
+    }
+
+    return this->layer[layer];
+}
+
+auto XojPage::getBackgroundName() const -> std::string { return backgroundName.value_or(_("Background")); }
+
+auto XojPage::backgroundHasName() const -> bool { return backgroundName.has_value(); }
+
+void XojPage::setBackgroundName(const std::string& newName) { backgroundName = newName; }
diff --git a/entry/src/main/cpp/src/core/model/XojPage.h b/entry/src/main/cpp/src/core/model/XojPage.h
new file mode 100644
index 0000000..04892df
--- /dev/null
+++ b/entry/src/main/cpp/src/core/model/XojPage.h
@@ -0,0 +1,141 @@
+/*
+ * Xournal++
+ *
+ * A page (PDF or drawings or both)
+ *
+ * @author Xournal++ Team
+ * https://github.com/xournalpp/xournalpp
+ *
+ * @license GNU GPLv2 or later
+ */
+
+#pragma once
+
+#include <cstddef>   // for size_t
+#include <optional>  // for optional
+#include <string>    // for string
+#include <vector>    // for vector
+
+#include "util/Color.h"  // for Color
+#include "util/PointerContainerView.h"
+#include "util/Util.h"  // for npos
+
+#include "BackgroundImage.h"  // for BackgroundImage
+#include "Layer.h"            // for Layer, Layer::Index
+#include "PageHandler.h"      // for PageHandler
+#include "PageType.h"         // for PageType
+
+class XojPage: public PageHandler {
+public:
+    XojPage(double width, double height, bool suppressLayerCreation = false);
+    ~XojPage() override;
+    XojPage(const XojPage& page);
+    void operator=(const XojPage& p) = delete;
+
+    // Do not modify layers directly, use LayerController
+    // So notification can be sent on change
+protected:
+    void addLayer(Layer* layer);
+    void insertLayer(Layer* layer, Layer::Index index);
+    void removeLayer(Layer* layer);
+    void setLayerVisible(Layer::Index layerId, bool visible);
+
+public:
+    // Also set the size over doc->setPageSize!
+    void setBackgroundPdfPageNr(size_t page);
+
+    void setBackgroundType(const PageType& bgType);
+    PageType getBackgroundType() const;
+
+    /**
+     * Do not call this, cal doc->setPageSize(Page * p, double width, double height);
+     */
+    void setSize(double width, double height);
+
+    double getWidth() const;
+    double getHeight() const;
+
+    size_t getPdfPageNr() const;
+
+    bool isAnnotated() const;
+
+    void setBackgroundColor(Color color);
+    Color getBackgroundColor() const;
+
+    std::vector<Layer*>& getLayers();
+    xoj::util::PointerContainerView<std::vector<Layer*>> getLayersView() const;
+
+    Layer::Index getLayerCount() const;
+    Layer::Index getSelectedLayerId();
+    void setSelectedLayerId(Layer::Index id);
+    bool isLayerVisible(Layer::Index layerId) const;
+
+    Layer* getSelectedLayer();
+
+    BackgroundImage& getBackgroundImage();
+    const BackgroundImage& getBackgroundImage() const;
+    void setBackgroundImage(BackgroundImage img);
+
+    std::string getBackgroundName() const;
+    bool backgroundHasName() const;
+    void setBackgroundName(const std::string& newName);
+
+    /**
+     * Copies this page an all it's contents to a new page
+     */
+    XojPage* clone();
+
+private:
+    /**
+     * The Background image if any
+     */
+    BackgroundImage backgroundImage;
+
+    /**
+     * The size of the page
+     */
+    double width = 0;
+    double height = 0;
+
+    /**
+     * The layer list
+     */
+    std::vector<Layer*> layer;
+
+    /**
+     * The current selected layer ID
+     */
+    Layer::Index currentLayer = npos;
+
+    /**
+     * The Background Type of the page
+     */
+    PageType bgType;
+
+    /**
+     * If the page has a PDF background, the page number of the PDF Page
+     */
+    size_t pdfBackgroundPage = npos;
+
+    /**
+     * The background color if the background type is plain
+     */
+    Color backgroundColor{Colors::white};
+
+    /**
+     * Background visible
+     */
+    bool backgroundVisible = true;
+
+    /**
+     * Background name
+     */
+    std::optional<std::string> backgroundName;
+
+    // Allow LoadHandler to add layers directly
+    friend class LoadHandler;
+
+    // Allow LayerController to modify layers of a page
+    // Notifications were be sent
+    friend class LayerController;
+};
diff --git a/entry/src/main/cpp/src/core/model/eraser/ErasableStroke.cpp b/entry/src/main/cpp/src/core/model/eraser/ErasableStroke.cpp
new file mode 100644
index 0000000..e8131f9
--- /dev/null
+++ b/entry/src/main/cpp/src/core/model/eraser/ErasableStroke.cpp
@@ -0,0 +1,375 @@
+#include "ErasableStroke.h"
+
+#include <algorithm>  // for max, min, copy, lower_bound
+#include <cstddef>    // for size_t, ptrdiff_t
+#include <iterator>   // for next
+#include <optional>   // for optional
+#include <tuple>      // for forward_as_tuple
+
+#include <glib.h>  // for g_warning
+
+#include "model/Point.h"            // for Point
+#include "model/Stroke.h"           // for Stroke, IntersectionParameter...
+#include "util/Assert.h"            // for xoj_assert
+#include "util/Range.h"             // for Range
+#include "util/SmallVector.h"       // for SmallVector
+#include "util/UnionOfIntervals.h"  // for UnionOfIntervals
+
+#include "ErasableStrokeOverlapTree.h"  // for ErasableStroke::OverlapTree
+#include "PaddedBox.h"                  // for PaddedBox
+
+using xoj::util::Rectangle;
+
+ErasableStroke::ErasableStroke(const Stroke& stroke): stroke(stroke) {
+    const auto& pts = this->stroke.getPointVector();
+    closedStroke = pts.size() >= 3 && pts.front().lineLengthTo(pts.back()) < CLOSED_STROKE_DISTANCE;
+}
+
+ErasableStroke::~ErasableStroke() = default;
+
+/**
+ * Erasure works as follows:
+ *  * Two squares: * the visible eraser square
+ *                 * the same square with a padding depending on the stroke's width (see #997)
+ *
+ *  We erase every section of the stroke that comes in the box with its padding, provided it hits the box itself at
+ *  some point.
+ *  This means we erase a little outside the visible box, but only when the stroke enters or leaves the visible box.
+ */
+void ErasableStroke::beginErasure(const IntersectionParametersContainer& paddedIntersections, Range& range) {
+    size_t n = this->stroke.getPointCount();
+    if (n < 2) {
+        return;
+    }
+
+    xoj_assert(paddedIntersections.size() % 2 == 0);
+
+    UnionOfIntervals<PathParameter> sections;
+    // Contains the removed sections
+    sections.appendData(paddedIntersections);
+
+    // We will need to rerender everywhere a section was removed
+    for (auto& s: sections.cloneToIntervalVector()) {
+        range = range.unite(computeSubSectionBoundingBox(s));
+    }
+
+    // Now contains remaining sections
+    sections.complement({0, 0.0}, {n - 2, 1.0});
+
+    const bool highlighter = this->stroke.getToolType() == StrokeTool::HIGHLIGHTER;
+    const bool filled = this->stroke.getFill() != -1;
+    if (highlighter || filled) {
+        auto subsections = sections.cloneToIntervalVector();
+        if (filled) {
+            if (subsections.size() == 1) {
+                // We erased the stroke from its ends. Simply add the end points to ensure the filling is rerendered
+                const Point& p1 = this->stroke.getPointVector().front();
+                range.addPoint(p1.x, p1.y);
+                const Point& p2 = this->stroke.getPointVector().back();
+                range.addPoint(p2.x, p2.y);
+            } else {
+                // The stroke was split in two or more (and possibly shrank). Need to rerender its entire box.
+                range.addPoint(this->stroke.getX(), this->stroke.getY());
+                range.addPoint(this->stroke.getX() + this->stroke.getElementWidth(),
+                               this->stroke.getY() + this->stroke.getElementHeight());
+            }
+        } else if (subsections.size() > 1) {
+            /**
+             * Highlighter and the stroke has been split in two or more subsections.
+             * Rerender wherever those subsections overlap
+             */
+            addOverlapsToRange(subsections, range);
+        }
+    }
+
+    {  // lock_guard range
+        std::lock_guard<std::mutex> lock(this->sectionsMutex);
+        this->remainingSections.swap(sections);
+    }  // release the mutex
+}
+
+void ErasableStroke::erase(const PaddedBox& box, Range& range) {
+    size_t n = (size_t)this->stroke.getPointCount();
+    if (n < 2) {
+        g_warning("Erasing empty stroke");
+        return;
+    }
+
+    std::vector<SubSection> sections = this->getRemainingSubSectionsVector();
+
+    if (sections.empty()) {
+        /** Nothing left to erase! **/
+        std::lock_guard<std::mutex> lock(this->boxesMutex);
+        boundingBoxes.clear();
+        return;
+    }
+
+    if (changesAtLastIteration) {
+        // Remove the boxes of the cache corresponding to sections that no longer exist
+        std::lock_guard<std::mutex> lock(this->boxesMutex);
+        auto it = boundingBoxes.begin();
+        for (auto itSection = sections.cbegin(), itSectionEnd = sections.cend();
+             it != boundingBoxes.end() && itSection != itSectionEnd;) {
+            if (*itSection < it->first) {
+                ++itSection;
+            } else if (*itSection > it->first) {
+                it = boundingBoxes.erase(it);
+            } else {
+                ++it;
+            }
+        }
+        boundingBoxes.erase(it, boundingBoxes.end());
+    }
+
+    /**
+     * Determine which (intervals of) segments are still (partially) visible and have their bounding box intersecting
+     * the eraser square
+     *
+     * This avoids computing a segment's intersections with the eraser box twice
+     */
+    std::vector<Interval<size_t>> indexIntervals;
+
+    for (const SubSection& section: sections) {
+        if (!getSubSectionBoundingBox(section).intersect(Range(box.getInnerRectangle())).empty()) {
+            if (indexIntervals.empty()) {
+                indexIntervals.emplace_back(section.min.index, section.max.index);
+            } else {
+                if (indexIntervals.back().max + 1 >= section.min.index) {
+                    // Merge together two sections if the first ends in the segment in which the second begins
+                    indexIntervals.back().envelop(section.max.index);
+                } else {
+                    indexIntervals.emplace_back(section.min.index, section.max.index);
+                }
+            }
+        }
+    }
+
+    UnionOfIntervals<PathParameter> newErasedSections;
+
+    for (auto& i: indexIntervals) {
+        newErasedSections.appendData(this->stroke.intersectWithPaddedBox(box, i.min, i.max));
+    }
+
+    changesAtLastIteration = !newErasedSections.empty();
+    if (changesAtLastIteration) {
+
+        // We will need to rerender everywhere a section was removed
+        for (auto& s: newErasedSections.cloneToIntervalVector()) {
+            range = range.unite(computeSubSectionBoundingBox(s));
+        }
+
+        const bool highlighter = this->stroke.getToolType() == StrokeTool::HIGHLIGHTER;
+        const bool filled = this->stroke.getFill() != -1;
+        if (highlighter || filled) {
+            /**
+             * Detect if a section has been modified. If so, rerender whatever needs rerendering.
+             */
+
+            std::vector<SubSection> newRemainingSections;
+            // Update the remaining sections
+            newErasedSections.complement({0, 0.0}, {n - 2, 1.0});
+            {  // lock_guard scope
+                std::lock_guard<std::mutex> lock(sectionsMutex);
+                remainingSections.intersect(newErasedSections.getData());
+                newRemainingSections = remainingSections.cloneToIntervalVector();
+            }  // Release the mutex
+
+            auto itNewSection = newRemainingSections.begin();
+            auto itNewSectionEnd = newRemainingSections.end();
+            for (auto& section: sections) {
+                // Find out which new sections belonged to the same section before
+                std::vector<SubSection> subsections;
+                while (itNewSection != itNewSectionEnd && itNewSection->max <= section.max) {
+                    subsections.emplace_back(*itNewSection);
+                    ++itNewSection;
+                }
+                if (subsections.empty()) {
+                    // The section was entirely erased. No need for special rerendering.
+                    continue;
+                }
+                if (filled) {
+                    if (subsections.size() == 1) {
+                        const auto& subsection = subsections.back();
+                        if (subsection.min == section.min && subsection.max == section.max) {
+                            // No modification
+                            continue;
+                        }
+                        // The section shrank.
+                        Point p = this->stroke.getPoint(section.min);
+                        range.addPoint(p.x, p.y);
+                        p = this->stroke.getPoint(section.max);
+                        range.addPoint(p.x, p.y);
+                        p = this->stroke.getPoint(subsection.min);
+                        range.addPoint(p.x, p.y);
+                        p = this->stroke.getPoint(subsection.max);
+                        range.addPoint(p.x, p.y);
+                        continue;
+                    }
+                    // The section was split in two or more (and possibly shrank). Need to rerender its entire box.
+                    range = range.unite(this->getSubSectionBoundingBox(section));
+                    break;
+                }
+                // Necessarily highlighter and not filled
+                if (subsections.size() > 1) {
+                    /**
+                     * The section has been split in two (or more).
+                     * Rerender wherever those subsections overlap.
+                     */
+                    addOverlapsToRange(subsections, range);
+                }
+            }
+        } else {
+            // Update the remaining sections
+            newErasedSections.complement({0, 0.0}, {n - 2, 1.0});
+            {  // lock_guard scope
+                std::lock_guard<std::mutex> lock(sectionsMutex);
+                remainingSections.intersect(newErasedSections.getData());
+            }  // Release the mutex
+        }
+    }
+}
+
+auto ErasableStroke::getStrokes() const -> std::vector<std::unique_ptr<Stroke>> {
+    std::vector<SubSection> sections = this->getRemainingSubSectionsVector();
+
+    std::vector<std::unique_ptr<Stroke>> strokes;
+    strokes.reserve(sections.size());
+
+    bool mergeFirstAndLast = this->closedStroke && sections.size() >= 2 &&
+                             sections.front().min == PathParameter(0, 0.0) &&
+                             sections.back().max == PathParameter(this->stroke.getPointCount() - 2, 1.0);
+
+    auto sectionIt = sections.cbegin();
+    auto sectionEndIt = sections.cend();
+
+    if (mergeFirstAndLast) {
+        /**
+         * Clone the first and last sections as a single stroke
+         */
+        strokes.push_back(this->stroke.cloneCircularSectionOfClosedStroke(sections.back().min, sections.front().max));
+
+        // Avoid cloning those sections again
+        ++sectionIt;
+        --sectionEndIt;
+    }
+
+    for (; sectionIt != sectionEndIt; ++sectionIt) {
+        strokes.push_back(this->stroke.cloneSection(sectionIt->min, sectionIt->max));
+    }
+
+    return strokes;
+}
+
+std::vector<ErasableStroke::SubSection> ErasableStroke::getRemainingSubSectionsVector() const {
+    std::lock_guard<std::mutex> lock(this->sectionsMutex);
+    return this->remainingSections.cloneToIntervalVector();
+}
+
+bool ErasableStroke::isClosedStroke() const { return this->closedStroke; }
+
+auto ErasableStroke::getSubSectionBoundingBox(const ErasableStroke::SubSection& section) const -> const Range& {
+
+    std::lock_guard<std::mutex> lock(this->boxesMutex);
+
+    //  First look for the box in the cache
+    auto it = std::lower_bound(boundingBoxes.begin(), boundingBoxes.end(), section,
+                               [](const std::pair<SubSection, Range>& cacheData, const SubSection& section) {
+                                   return cacheData.first < section;
+                               });
+    if (it != boundingBoxes.end() && section == it->first) {
+        // There was already a box computed for this section
+        return it->second;
+    }
+
+    // Need to compute the bounding box
+    // Assign the computed box to the cache
+    it = boundingBoxes.emplace(it, std::piecewise_construct, std::forward_as_tuple(section),
+                               std::forward_as_tuple(computeSubSectionBoundingBox(section)));
+
+    return it->second;
+}
+
+auto ErasableStroke::computeSubSectionBoundingBox(const SubSection& section) const -> Range {
+
+    const bool hasPressure = this->stroke.hasPressure();
+    const double halfWidth = 0.5 * this->stroke.getWidth();
+    double lastPressure = 0;
+
+    auto pointRange = [&](const Point& p) {
+        const double padding = hasPressure ? 0.5 * std::max(lastPressure, p.z) : halfWidth;
+        lastPressure = p.z;
+        return Range(p.x - padding, p.y - padding, p.x + padding, p.y + padding);
+    };
+
+    Range rg = pointRange(this->stroke.getPoint(section.min));
+
+    auto data = this->stroke.getPointVector();
+    auto endIt = std::next(data.cbegin(), (std::ptrdiff_t)section.max.index + 1);
+    for (auto ptIt = std::next(data.cbegin(), (std::ptrdiff_t)section.min.index + 1); ptIt != endIt; ++ptIt) {
+        rg = rg.unite(pointRange(*ptIt));
+    }
+
+    return rg.unite(pointRange(this->stroke.getPoint(section.max)));
+}
+
+void ErasableStroke::addOverlapsToRange(const std::vector<SubSection>& subsections, Range& range) {
+
+    // Will contain the intersection trees of the subsections
+    std::vector<OverlapTree> overlapTrees(subsections.size());
+    /**
+     * For each given subsection, we compute a binary tree whose leaves correspond to individual segments in the
+     * subsection and contain the thin bounding box of the segments.
+     * The nodes contain the union of the bounding boxes of their children, so that the root itself contains the
+     * bounding box of the subsection.
+     *
+     * To compute the overlaps between two subsections, we intersect the bounding boxes in their trees, until we reach
+     * intersecting leaves.
+     * See ErasableStroke::OverlapTree for the details.
+     */
+
+    const double halfWidth = 0.5 * this->stroke.getWidth();
+    size_t i = 0;
+    size_t j = 0;
+    for (auto it1 = subsections.cbegin(), itEnd = subsections.cend(); it1 != itEnd; ++it1, ++i) {
+        j = i + 1;
+        for (auto it2 = std::next(it1); it2 != itEnd; ++it2, ++j) {
+            if (!getSubSectionBoundingBox(*it1).intersect(getSubSectionBoundingBox(*it2)).empty()) {
+                // Compute the intersections trees if they have not yet been computed
+                if (!overlapTrees[i].isPopulated()) {
+                    overlapTrees[i].populate(*it1, this->stroke);
+                }
+                if (!overlapTrees[j].isPopulated()) {
+                    overlapTrees[j].populate(*it2, this->stroke);
+                }
+#ifdef DEBUG_ERASABLE_STROKE_BOXES
+                overlapTrees[i].addOverlapsToRange(overlapTrees[j], halfWidth, range, debugMask.get());
+#else
+                overlapTrees[i].addOverlapsToRange(overlapTrees[j], halfWidth, range);
+#endif
+            }
+        }
+    }
+}
+
+#ifdef DEBUG_ERASABLE_STROKE_BOXES
+void ErasableStroke::paintDebugRect(const Rectangle<double>& rect, char color, cairo_t* cr) {
+    if (cr == nullptr) {
+        return;
+    }
+    if (color == 'r') {
+        cairo_set_source_rgba(cr, 1, 0, 0, 0.8);
+    } else if (color == 'g') {
+        cairo_set_source_rgba(cr, 0, 1, 0, 0.8);
+    } else if (color == 'b') {
+        cairo_set_source_rgba(cr, 0, 0, 1, 0.8);
+    } else {
+        cairo_set_source_rgba(cr, 0.5, 0.5, 0.5, 0.8);
+    }
+    cairo_move_to(cr, rect.x, rect.y);
+    cairo_line_to(cr, rect.x + rect.width, rect.y);
+    cairo_line_to(cr, rect.x + rect.width, rect.y + rect.height);
+    cairo_line_to(cr, rect.x, rect.y + rect.height);
+    cairo_line_to(cr, rect.x, rect.y);
+    cairo_stroke(cr);
+}
+#endif
diff --git a/entry/src/main/cpp/src/core/model/eraser/ErasableStroke.h b/entry/src/main/cpp/src/core/model/eraser/ErasableStroke.h
new file mode 100644
index 0000000..91359f7
--- /dev/null
+++ b/entry/src/main/cpp/src/core/model/eraser/ErasableStroke.h
@@ -0,0 +1,152 @@
+/*
+ * Xournal++
+ *
+ * A stroke which is temporary used if you erase a part
+ * This class remembers which sections of a stroke have not yet been erased, until the eraser sequence is concluded
+ *
+ * @author Xournal++ Team
+ * https://github.com/xournalpp/xournalpp
+ *
+ * @license GNU GPLv2 or later
+ */
+
+#pragma once
+
+#include <memory>   // for unique_ptr
+#include <mutex>    // for mutex
+#include <utility>  // for pair
+#include <vector>   // for vector
+
+#include "model/PathParameter.h"    // for PathParameter
+#include "model/Stroke.h"           // for Stroke (ptr only), IntersectionPa...
+#include "util/Interval.h"          // for Interval
+#include "util/Rectangle.h"         // for Rectangle
+#include "util/UnionOfIntervals.h"  // for UnionOfIntervals
+
+#include "config-debug.h"  // for DEBUG_ERASABLE_STROKE_BOXES
+
+#ifdef DEBUG_ERASABLE_STROKE_BOXES
+#include <cairo.h>  // for cairo_t
+
+#include "view/Mask.h"
+#endif
+
+class Range;
+struct PaddedBox;
+
+class ErasableStroke {
+public:
+    ErasableStroke(const Stroke& stroke);
+    ~ErasableStroke();
+
+    /**
+     * @brief Type for subsections of a stroke
+     */
+    using SubSection = Interval<PathParameter>;
+
+public:
+    /**
+     * @brief Starts erasing the stroke, with the already computed intersection parameters
+     * @param intersectionParameters Vector of even length containing the parameters of the sections to be erased
+     * @param range Range (destined to rerendering) that will be widened around the eraser box
+     * @param view Redrawable to which we pass areas that need rerendering
+     * view is only used when the stroke is from the highlighter tool.
+     * The rerendered areas correspond to where the stroke overlaps itself after being split in two (or more)
+     */
+    void beginErasure(const IntersectionParametersContainer& intersectionParameters, Range& range);
+
+    /**
+     * @brief Erase the stroke
+     * @param box PaddedBox of the eraser
+     * @param range Range (destined to rerendering) that will be widened around the eraser box
+     * @param view Redrawable to which we pass areas that need rerendering
+     * view is only used when the stroke is from the highlighter tool.
+     * The rerendered areas correspond to where the stroke overlaps itself after being split in two (or more)
+     */
+    void erase(const PaddedBox& box, Range& range);
+
+    /**
+     * @brief Get the resulting strokes (if any) once the erasing is finished
+     * @return A vector of pointers to newly created strokes (owned by the caller).
+     * The resulting strokes correspond to what's left of the original stroke
+     */
+    std::vector<std::unique_ptr<Stroke>> getStrokes() const;
+
+    /**
+     * @brief Get a clone of the data, in the form of a vector of sections
+     * @return The clone
+     */
+    std::vector<ErasableStroke::SubSection> getRemainingSubSectionsVector() const;
+
+    /**
+     * @return true if the stroke is closed (i.e. the first and last knots are very close), false otherwise.
+     */
+    bool isClosedStroke() const;
+
+    /**
+     * @brief Get the bounding box of a subsection.
+     * The bounding box is either pulled from cache or computed and added to cache
+     * @return The bounding box.
+     */
+    const Range& getSubSectionBoundingBox(const SubSection& section) const;
+
+protected:
+    /**
+     * @brief Compute the bounding box of a subsection.
+     * @return The bounding box.
+     */
+    Range computeSubSectionBoundingBox(const SubSection& section) const;
+
+    /**
+     * @brief Given a vector of subsections, compute (coarsely) where those subsections overlap.
+     * @param subsections The input subsections
+     * @return Vector of disjoint rectangles. Altogether, those rectangles contains all the overlaps of the subsections
+     */
+    void addOverlapsToRange(const std::vector<SubSection>& subsections, Range& range);
+
+public:
+    /**
+     * @brief Reference to the stroke being erased
+     */
+    const Stroke& stroke;
+
+protected:
+    /**
+     * @brief Parameters for the subsections that have not (yet) been erased
+     * Protected by the associated mutex
+     */
+    UnionOfIntervals<PathParameter> remainingSections{};
+    mutable std::mutex sectionsMutex;
+
+    /**
+     * @brief Cache for the bounding boxes of the remaining subsections
+     * Usually pretty small (< 10): std::vector is faster than std::map
+     * Protected by the associated mutex
+     */
+    mutable std::vector<std::pair<SubSection, Range>> boundingBoxes;
+    mutable std::mutex boxesMutex;
+
+    /**
+     * @brief Whether or not the last iteration erased anything
+     */
+    bool changesAtLastIteration = false;
+
+    /**
+     * @brief Whether the stroke is closed (i.e. the first and last knots are very close)
+     */
+    bool closedStroke;
+    static constexpr double CLOSED_STROKE_DISTANCE = 0.3;
+
+#ifdef DEBUG_ERASABLE_STROKE_BOXES
+public:
+    mutable xoj::view::Mask debugMask;
+
+    static void paintDebugRect(const xoj::util::Rectangle<double>& rect, char color, cairo_t* cr);
+#endif
+
+public:
+    /**
+     * Binary tree used for searching for overlaps between subsections
+     */
+    class OverlapTree;
+};
diff --git a/entry/src/main/cpp/src/core/model/eraser/ErasableStrokeOverlapTree.cpp b/entry/src/main/cpp/src/core/model/eraser/ErasableStrokeOverlapTree.cpp
new file mode 100644
index 0000000..cbdb63c
--- /dev/null
+++ b/entry/src/main/cpp/src/core/model/eraser/ErasableStrokeOverlapTree.cpp
@@ -0,0 +1,233 @@
+#include "ErasableStrokeOverlapTree.h"
+
+#include <algorithm>  // for max, min, minmax
+#include <optional>   // for optional
+#include <tuple>      // for tie, tuple
+
+#include "model/PathParameter.h"          // for PathParameter
+#include "model/Point.h"                  // for Point
+#include "model/Stroke.h"                 // for Stroke
+#include "model/eraser/ErasableStroke.h"  // for ErasableStroke::SubSection
+#include "util/Assert.h"                  // for xoj_assert
+#include "util/Range.h"                   // for Range
+
+using xoj::util::Rectangle;
+
+void ErasableStroke::OverlapTree::populate(const SubSection& section, const Stroke& stroke) {
+    Populator populator(this->data, stroke);
+    populator.populate(section, this->root);
+    populated = true;
+}
+
+bool ErasableStroke::OverlapTree::isPopulated() const { return populated; }
+
+#ifdef DEBUG_ERASABLE_STROKE_BOXES
+void ErasableStroke::OverlapTree::addOverlapsToRange(const ErasableStroke::OverlapTree& other, double halfWidth,
+                                                     Range& range, cairo_t* cr) const {
+#else
+void ErasableStroke::OverlapTree::addOverlapsToRange(const ErasableStroke::OverlapTree& other, double halfWidth,
+                                                     Range& range) const {
+#endif
+    xoj_assert(this->isPopulated() && other.isPopulated());
+
+#ifdef DEBUG_ERASABLE_STROKE_BOXES
+    this->root.addOverlapsToRange(other.root, halfWidth, range, cr);
+#else
+    this->root.addOverlapsToRange(other.root, halfWidth, range);
+#endif
+}
+
+void ErasableStroke::OverlapTree::Populator::populate(const SubSection& section, Node& root) {
+    xoj_assert(section.min.index <= section.max.index && section.max.index < stroke.getPointCount());
+
+    size_t nbLeaves = section.max.index - section.min.index + 1;
+    this->data.resize(nbLeaves - 1);
+
+    this->nextFreeSlot = this->data.begin();
+
+    if (section.min.index == section.max.index) {
+        // The section spans on a single segment
+        root.initializeOnSegment(this->stroke.getPoint(section.min), this->stroke.getPoint(section.max));
+        return;
+    }
+
+    if (section.max.t == 0.0) {
+        if (section.min.index + 1 == section.max.index) {
+            // The section spans on a single segment
+            root.initializeOnSegment(this->stroke.getPoint(section.min), this->stroke.getPoint(section.max.index));
+            return;
+        }
+        if (section.min.t == 0.0) {
+            this->populateNode(root, section.min.index, section.max.index, this->stroke.getPointVector());
+            return;
+        }
+        this->populateNode(root, this->stroke.getPoint(section.min), section.min.index + 1, section.max.index,
+                           this->stroke.getPointVector());
+        return;
+    }
+
+    if (section.min.t == 0.0) {
+        this->populateNode(root, section.min.index, section.max.index, this->stroke.getPoint(section.max),
+                           this->stroke.getPointVector());
+        return;
+    }
+
+    this->populateNode(root, this->stroke.getPoint(section.min), section.min.index + 1, section.max.index,
+                       this->stroke.getPoint(section.max), this->stroke.getPointVector());
+}
+
+auto ErasableStroke::OverlapTree::Populator::getNextFreeSlot() -> std::pair<Node, Node>* {
+    xoj_assert(nextFreeSlot < data.end());
+    return &*(nextFreeSlot++);
+}
+
+void ErasableStroke::OverlapTree::Populator::populateNode(Node& node, const Point& firstPoint, size_t min, size_t max,
+                                                          const Point& lastPoint, const std::vector<Point>& pts) {
+    xoj_assert(min <= max && max < pts.size());
+    /**
+     * Split in two in the middle
+     */
+    size_t middle = (min + max) / 2;
+
+    node.children = getNextFreeSlot();
+
+    this->populateNode(node.children->first, firstPoint, min, middle, pts);
+    this->populateNode(node.children->second, middle, max, lastPoint, pts);
+    node.computeBoxFromChildren();
+}
+
+void ErasableStroke::OverlapTree::Populator::populateNode(Node& node, const Point& firstPoint, size_t min, size_t max,
+                                                          const std::vector<Point>& pts) {
+    xoj_assert(min <= max && max < pts.size());
+    if (min == max) {
+        // The node corresponds to a single segment
+        node.initializeOnSegment(firstPoint, pts[min]);
+        return;
+    }
+    /**
+     * Split in two
+     */
+    size_t middle = (min + max) / 2;
+    xoj_assert(middle >= min && middle < max);
+
+    node.children = getNextFreeSlot();
+
+    this->populateNode(node.children->first, firstPoint, min, middle, pts);
+    this->populateNode(node.children->second, middle, max, pts);
+    node.computeBoxFromChildren();
+}
+
+void ErasableStroke::OverlapTree::Populator::populateNode(Node& node, size_t min, size_t max, const Point& lastPoint,
+                                                          const std::vector<Point>& pts) {
+    xoj_assert(min <= max && max < pts.size());
+    if (min == max) {
+        // The node corresponds to a single segment
+        node.initializeOnSegment(pts[min], lastPoint);
+        return;
+    }
+    /**
+     * Split in two
+     */
+    size_t middle = (min + max + 1) / 2;
+    xoj_assert(middle > min && middle <= max);
+
+    node.children = getNextFreeSlot();
+
+    this->populateNode(node.children->first, min, middle, pts);
+    this->populateNode(node.children->second, middle, max, lastPoint, pts);
+    node.computeBoxFromChildren();
+}
+
+void ErasableStroke::OverlapTree::Populator::populateNode(Node& node, size_t min, size_t max,
+                                                          const std::vector<Point>& pts) {
+    xoj_assert(max > min);
+    if (min + 1 == max) {
+        // The node corresponds to a single segment
+        node.initializeOnSegment(pts[min], pts[max]);
+        return;
+    }
+    /**
+     * Split in two
+     */
+    size_t middle = (min + max) / 2;
+    xoj_assert(middle > min && middle < max);
+
+    node.children = getNextFreeSlot();
+
+    this->populateNode(node.children->first, min, middle, pts);
+    this->populateNode(node.children->second, middle, max, pts);
+    node.computeBoxFromChildren();
+}
+
+void ErasableStroke::OverlapTree::Node::initializeOnSegment(const Point& p1, const Point& p2) {
+    std::tie(this->minX, this->maxX) = std::minmax(p1.x, p2.x);
+    std::tie(this->minY, this->maxY) = std::minmax(p1.y, p2.y);
+}
+
+void ErasableStroke::OverlapTree::Node::computeBoxFromChildren() {
+    xoj_assert(children != nullptr);
+    minX = std::min(children->first.minX, children->second.minX);
+    maxX = std::max(children->first.maxX, children->second.maxX);
+    minY = std::min(children->first.minY, children->second.minY);
+    maxY = std::max(children->first.maxY, children->second.maxY);
+}
+
+#ifdef DEBUG_ERASABLE_STROKE_BOXES
+void ErasableStroke::OverlapTree::Node::addOverlapsToRange(const Node& other, double halfWidth, Range& range,
+                                                           cairo_t* cr) const {
+#else
+void ErasableStroke::OverlapTree::Node::addOverlapsToRange(const Node& other, double halfWidth, Range& range) const {
+#endif
+    bool intersect = this->maxX + halfWidth > other.minX - halfWidth &&
+                     this->minX - halfWidth<other.maxX + halfWidth&& this->maxY + halfWidth> other.minY - halfWidth &&
+                     this->minY - halfWidth < other.maxY + halfWidth;
+    if (!intersect) {
+        return;
+    }
+    if (other.children != nullptr) {
+#ifdef DEBUG_ERASABLE_STROKE_BOXES
+        other.children->first.addOverlapsToRange(*this, halfWidth, range, cr);
+        other.children->second.addOverlapsToRange(*this, halfWidth, range, cr);
+#else
+        other.children->first.addOverlapsToRange(*this, halfWidth, range);
+        other.children->second.addOverlapsToRange(*this, halfWidth, range);
+#endif
+        return;
+    }
+    /**
+     * other is a leaf corresponding to a single segment of the stroke
+     * Split *this until it's just a leaf
+     */
+    if (this->children != nullptr) {
+#ifdef DEBUG_ERASABLE_STROKE_BOXES
+        this->children->first.addOverlapsToRange(other, halfWidth, range, cr);
+        this->children->second.addOverlapsToRange(other, halfWidth, range, cr);
+#else
+        this->children->first.addOverlapsToRange(other, halfWidth, range);
+        this->children->second.addOverlapsToRange(other, halfWidth, range);
+#endif
+        return;
+    }
+    /**
+     * Both this and other are leaves corresponding to single segments
+     * Repaint the intersection of their bounding boxes
+     */
+    auto rectThis = this->toRectangle(halfWidth);
+    auto rectOther = other.toRectangle(halfWidth);
+    auto inter = rectThis.intersects(rectOther);
+
+    xoj_assert(inter);
+
+    const Rectangle<double>& rect = inter.value();
+#ifdef DEBUG_ERASABLE_STROKE_BOXES
+    paintDebugRect(rectThis, 'g', cr);
+    paintDebugRect(rectOther, 'g', cr);
+    paintDebugRect(rect, 'b', cr);
+#endif
+    range.addPoint(rect.x, rect.y);
+    range.addPoint(rect.x + rect.width, rect.y + rect.height);
+}
+
+auto ErasableStroke::OverlapTree::Node::toRectangle(double padding) const -> Rectangle<double> {
+    return {minX - padding, minY - padding, maxX - minX + 2 * padding, maxY - minY + 2 * padding};
+}
diff --git a/entry/src/main/cpp/src/core/model/eraser/ErasableStrokeOverlapTree.h b/entry/src/main/cpp/src/core/model/eraser/ErasableStrokeOverlapTree.h
new file mode 100644
index 0000000..a93a5a7
--- /dev/null
+++ b/entry/src/main/cpp/src/core/model/eraser/ErasableStrokeOverlapTree.h
@@ -0,0 +1,163 @@
+/*
+ * Xournal++
+ *
+ * A stroke which is temporary used if you erase a part
+ *
+ * @author Xournal++ Team
+ * https://github.com/xournalpp/xournalpp
+ *
+ * @license GNU GPLv2 or later
+ */
+
+#pragma once
+
+#include <cstddef>  // for size_t
+#include <utility>  // for pair
+#include <vector>   // for vector, vector<>::iterator
+
+#include <cairo.h>  // for cairo_t
+
+#include "util/Rectangle.h"  // for Rectangle
+
+#include "ErasableStroke.h"  // for ErasableStroke::SubSection, ErasableStroke
+#include "config-debug.h"    // for DEBUG_ERASABLE_STROKE_BOXES
+
+class Point;
+class Range;
+class Stroke;
+
+class ErasableStroke::OverlapTree {
+public:
+    OverlapTree() = default;
+
+    /**
+     * @brief Populate the tree, so that it corresponds to the given section of the given stroke.
+     */
+    void populate(const SubSection& section, const Stroke& stroke);
+
+    bool isPopulated() const;
+
+#ifdef DEBUG_ERASABLE_STROKE_BOXES
+    /**
+     * @brief Add to a vector rectangles which altogether contain every overlap between the subsection corresponding
+     * to this tree and the subsection corresponding to another tree.
+     * @param other The other tree
+     * @param halfWidth half the width of the stroke
+     * @param overlapBoxes the Rectangle vector to which we push
+     * @param cr A cairo context in which we paint the rectangles, for debug purposes
+     */
+    void addOverlapsToRange(const OverlapTree& other, double halfWidth, Range& range, cairo_t* cr = nullptr) const;
+#else
+    /**
+     * @brief Add to a vector rectangles which altogether contain every overlap between the subsection corresponding
+     * to this tree and the subsection corresponding to another tree.
+     * @param other The other tree
+     * @param halfWidth half the width of the stroke
+     * @param overlapBoxes the Rectangle vector to which we push
+     */
+    void addOverlapsToRange(const OverlapTree& other, double halfWidth, Range& range) const;
+#endif
+
+private:
+    /**
+     * Root, node or leaf of a binary tree used for searching for overlaps between subsections
+     */
+    class Node {
+    public:
+        Node() = default;
+#ifdef DEBUG_ERASABLE_STROKE_BOXES
+        /**
+         * @brief Add to a vector rectangles which altogether contain every overlap between the subsection corresponding
+         * to this node and the subsection corresponding to another node.
+         * @param other The other node
+         * @param halfWidth half the width of the stroke
+         * @param overlapBoxes the Rectangle vector to which we push
+         * @param cr A cairo context in which we paint the rectangles, for debug purposes
+         */
+        void addOverlapsToRange(const Node& other, double halfWidth, Range& range, cairo_t* cr) const;
+#else
+        /**
+         * @brief Add to a vector rectangles which altogether contain every overlap between the subsection corresponding
+         * to this node and the subsection corresponding to another node.
+         * @param other The other node
+         * @param halfWidth half the width of the stroke
+         * @param overlapBoxes the Rectangle vector to which we push
+         */
+        void addOverlapsToRange(const Node& other, double halfWidth, Range& range) const;
+#endif
+
+        /**
+         * Bounding box of the subsection represented by the node.
+         * WARNING: The bounding box does not take the stroke thickness into account
+         */
+        double minX;
+        double maxX;
+        double minY;
+        double maxY;
+
+        /**
+         * Descendants, corresponding to the two halves of the subsection represented by the node
+         */
+        std::pair<Node, Node>* children = nullptr;
+
+        /**
+         * @brief Initialize the bounding box (minX, maxX, minY, maxY) when the node corresponds to a single segment
+         * @param p1 The first endpoint of the segment
+         * @param p2 The second endpoint of the segment
+         */
+        void initializeOnSegment(const Point& p1, const Point& p2);
+
+        /**
+         * @brief Compute the node's bounding box by taking the union of the children's boxes
+         */
+        void computeBoxFromChildren();
+
+        /**
+         * @brief Get a rectangle from the box (minX, maxX, minY, maxY), with an additional padding
+         * @param padding Padding added to the box (typically, half the stroke's width)
+         */
+        xoj::util::Rectangle<double> toRectangle(double padding) const;
+    };
+
+    Node root;
+    std::vector<std::pair<Node, Node>> data;
+    bool populated = false;
+
+    class Populator {
+    public:
+        Populator(std::vector<std::pair<Node, Node>>& data, const Stroke& stroke): data(data), stroke(stroke) {}
+        void populate(const SubSection& section, Node& root);
+
+    private:
+        std::vector<std::pair<Node, Node>>& data;
+        const Stroke& stroke;
+        std::vector<std::pair<Node, Node>>::iterator nextFreeSlot;
+
+        std::pair<Node, Node>* getNextFreeSlot();
+
+        /**
+         * @brief Create a root corresponding to the subsection:
+         *      firstPoint -- pts[min] -- ... -- pts[max] -- lastPoint
+         */
+        void populateNode(Node& node, const Point& firstPoint, size_t min, size_t max, const Point& lastPoint,
+                          const std::vector<Point>& pts);
+
+        /**
+         * @brief Create a subtree corresponding to the subsection:
+         *      firstPoint -- pts[min] -- ... -- pts[max]
+         */
+        void populateNode(Node& node, const Point& firstPoint, size_t min, size_t max, const std::vector<Point>& pts);
+
+        /**
+         * @brief Create a subtree corresponding to the subsection:
+         *      pts[min] -- ... -- pts[max] -- lastPoint
+         */
+        void populateNode(Node& node, size_t min, size_t max, const Point& lastPoint, const std::vector<Point>& pts);
+
+        /**
+         * @brief Create a subtree corresponding to the subsection:
+         *      pts[min] -- ... -- pts[max]
+         */
+        void populateNode(Node& node, size_t min, size_t max, const std::vector<Point>& pts);
+    };
+};
diff --git a/entry/src/main/cpp/src/core/model/eraser/PaddedBox.h b/entry/src/main/cpp/src/core/model/eraser/PaddedBox.h
new file mode 100644
index 0000000..d6ccd0f
--- /dev/null
+++ b/entry/src/main/cpp/src/core/model/eraser/PaddedBox.h
@@ -0,0 +1,34 @@
+/**
+ * Xournal++
+ *
+ * @brief Small structure for a square with a padding
+ *
+ * @author Xournal++ Team
+ * https://github.com/xournalpp/xournalpp
+ *
+ * @license GNU GPLv2 or later
+ */
+
+#pragma once
+
+#include "model/Point.h"
+#include "util/Rectangle.h"
+
+struct PaddedBox {
+    Point center;
+    double halfSize;
+    double halfSizeWithPadding;
+
+    xoj::util::Rectangle<double> getInnerRectangle() const {
+        return {center.x - halfSize, center.y - halfSize, 2 * halfSize, 2 * halfSize};
+    }
+    xoj::util::Rectangle<double> getOuterRectangle() const {
+        return {center.x - halfSizeWithPadding, center.y - halfSizeWithPadding, 2 * halfSizeWithPadding,
+                2 * halfSizeWithPadding};
+    }
+
+    void addToRange(Range& range) const {
+        range.addPoint(center.x - halfSizeWithPadding, center.y - halfSizeWithPadding);
+        range.addPoint(center.x + halfSizeWithPadding, center.y + halfSizeWithPadding);
+    }
+};
diff --git a/entry/src/main/cpp/src/core/model/eraser/readme.txt b/entry/src/main/cpp/src/core/model/eraser/readme.txt
new file mode 100644
index 0000000..56eaa1c
--- /dev/null
+++ b/entry/src/main/cpp/src/core/model/eraser/readme.txt
@@ -0,0 +1,4 @@
+Eraser and paint / repaint are asynchron.
+
+So here are some classes which are temporary needed to handle this.
+This classes are not Model View Control.
diff --git a/entry/src/main/cpp/src/core/pdf/base/HybridPdfExport.cpp b/entry/src/main/cpp/src/core/pdf/base/HybridPdfExport.cpp
new file mode 100644
index 0000000..3ce1458
--- /dev/null
+++ b/entry/src/main/cpp/src/core/pdf/base/HybridPdfExport.cpp
@@ -0,0 +1,127 @@
+#include "HybridPdfExport.h"
+
+#include <algorithm>  // for min
+#include <ctime>      // for time_t
+#include <sstream>    // for stringstream
+#include <vector>     // for vector
+
+#include <cairo-pdf.h>  // for cairo_pdf_surface_create_for_stream
+
+#include "control/jobs/ProgressListener.h"  // for ProgressListener
+#include "model/Document.h"                 // for Document
+#include "model/PageRef.h"                  // for PageRef
+#include "model/XojPage.h"                  // for XojPage
+#include "util/Assert.h"                    // for xoj_assert
+#include "util/i18n.h"                      // for _
+#include "util/serdesstream.h"              // for serdes_stream
+
+#include "filesystem.h"  // for path
+
+
+HybridPdfExport::HybridPdfExport(const Document* doc, ProgressListener* progressListener):
+        XojCairoPdfExport(doc, progressListener) {}
+
+HybridPdfExport::~HybridPdfExport() = default;
+
+static cairo_status_t writeFun(void* stream, const unsigned char* data, unsigned int length) {
+    *static_cast<std::stringstream*>(stream) << std::string_view((char*)data, length);
+    return CAIRO_STATUS_SUCCESS;
+}
+
+auto HybridPdfExport::startPdf(std::stringstream& stream) -> bool {
+    this->surface = cairo_pdf_surface_create_for_stream(writeFun, &stream, 0, 0);
+    this->cr = cairo_create(surface);
+
+    configureCairoFontOptions();
+
+    return cairo_surface_status(this->surface) == CAIRO_STATUS_SUCCESS;
+}
+
+auto HybridPdfExport::createPdf(fs::path const& file, const PageRangeVector& range, bool progressiveMode) -> bool {
+    if (progressiveMode || exportBackground == EXPORT_BACKGROUND_NONE) {
+        // For progressive mode or without any background, cairo export seems enough.
+        return XojCairoPdfExport::createPdf(file, range, progressiveMode);
+    }
+    if (range.empty()) {
+        this->lastError = _("No pages to export!");
+        return false;
+    }
+
+    // Export the annotations to a PDF stream via cairo
+    auto stream = serdes_stream<std::stringstream>();
+
+    if (!startPdf(stream)) {
+        this->lastError = _("Failed to initialize PDF Cairo surface");
+        this->lastError += "\nCairo error: ";
+        this->lastError += cairo_status_to_string(cairo_surface_status(this->surface));
+        return false;
+    }
+
+    size_t count = 0;
+    for (const auto& e: range) {
+        xoj_assert(e.last >= e.first);  // Ok, when the PageRangeVector was the result of parsing
+        count += e.last - e.first + 1;  // Not accurate, if e.last is > doc->getPageCount()
+    }
+
+    if (this->progressListener) {
+        this->progressListener->setMaximumState(count);
+    }
+
+    size_t progress = 0;
+    std::vector<OutputPageInfo> overlayToBackgroundIndex;
+    overlayToBackgroundIndex.reserve(count);
+    for (const auto& e: range) {
+        auto max = std::min(e.last, doc->getPageCount() - 1);  // Should be e.last for parsed PageRangeVector
+        for (size_t i = e.first; i <= max; i++) {
+
+            PageRef p = doc->getPage(i);
+            if (p->isAnnotated() || p->getPdfPageNr() == npos) {
+                // Pages with only a PDF background and no annotations will be copied directly
+                exportPage(i, false /* omit background if PDF */);
+                overlayToBackgroundIndex.push_back({true, doc->getPage(i)->getPdfPageNr()});
+            } else {
+                overlayToBackgroundIndex.push_back({false, doc->getPage(i)->getPdfPageNr()});
+            }
+
+            if (this->progressListener) {
+                this->progressListener->setCurrentState(++progress);
+            }
+        }
+    }
+
+    if (!endPdf()) {
+        return false;
+    }
+
+    return overlayAndSave(file, stream, overlayToBackgroundIndex);
+}
+
+auto HybridPdfExport::createPdf(fs::path const& file, bool progressiveMode) -> bool {
+    PageRangeVector range = {{0, doc->getPageCount() - 1}};
+    return createPdf(file, range, progressiveMode);
+}
+
+auto HybridPdfExport::countOccurrences(size_t backgroundPageCount, const std::vector<OutputPageInfo>& outputPageInfos)
+        -> std::vector<Occurrences> {
+    std::vector<Occurrences> occurrences(backgroundPageCount);
+    for (auto [hasOverlay, n]: outputPageInfos) {
+        if (n != npos) {
+            if (n >= backgroundPageCount) {
+                throw std::out_of_range(_("PDF page number is out of range"));
+            }
+            occurrences[n].number++;
+            occurrences[n].hasOverlay = occurrences[n].hasOverlay | hasOverlay;
+        }
+    }
+    return occurrences;
+}
+
+auto HybridPdfExport::createPDFDateStringForNow() -> std::string {
+    std::time_t now = std::time(nullptr);
+    auto* time = std::gmtime(&now);
+    std::string buf(30, 0);
+    if (strftime(buf.data(), 30, "D:%Y%m%d%H%M%SZ", time)) {  // See PDF 1.7 specs - section 7.9.4
+        return buf;
+    }
+    return std::string();
+}
diff --git a/entry/src/main/cpp/src/core/pdf/base/HybridPdfExport.h b/entry/src/main/cpp/src/core/pdf/base/HybridPdfExport.h
new file mode 100644
index 0000000..b73f870
--- /dev/null
+++ b/entry/src/main/cpp/src/core/pdf/base/HybridPdfExport.h
@@ -0,0 +1,52 @@
+/*
+ * Xournal++
+ *
+ * PDF Document Export Abstraction Interface - uses cairo for the annotations and overlay them on the original PDF using
+ * another PDF library
+ *
+ * @author Xournal++ Team
+ * https://github.com/xournalpp/xournalpp
+ *
+ * @license GNU GPLv2 or later
+ */
+#pragma once
+
+#include <cstddef>  // for size_t
+#include <sstream>
+
+#include "util/ElementRange.h"  // for PageRangeVector
+
+#include "XojCairoPdfExport.h"  // for XojPdfExport
+#include "filesystem.h"         // for path
+
+class Document;
+class ProgressListener;
+
+class HybridPdfExport: public XojCairoPdfExport {
+public:
+    HybridPdfExport(const Document* doc, ProgressListener* progressListener);
+    ~HybridPdfExport() override;
+
+public:
+    bool createPdf(fs::path const& file, bool progressiveMode) override;
+    bool createPdf(fs::path const& file, const PageRangeVector& range, bool progressiveMode) override;
+
+    struct OutputPageInfo {
+        bool hasOverlay;
+        size_t pdfBackgroundPageNumber;
+    };
+    /// Occurrences of a given background page
+    struct Occurrences {
+        size_t number = 0;
+        bool hasOverlay = false;
+    };
+    // Count occurrences of background pages: the user might have duplicated or removed pages
+    static std::vector<Occurrences> countOccurrences(size_t backgroundPageCount,
+                                                     const std::vector<OutputPageInfo>& outputPageInfos);
+
+protected:
+    bool startPdf(std::stringstream& stream);
+    virtual bool overlayAndSave(const fs::path& saveDestination, std::stringstream& overlaystream,
+                                const std::vector<OutputPageInfo>& outputPageInfos) = 0;
+    static std::string createPDFDateStringForNow();  // See PDF 1.7 specs - section 7.9.4
+};
diff --git a/entry/src/main/cpp/src/core/pdf/base/PdfExportBackend.cpp b/entry/src/main/cpp/src/core/pdf/base/PdfExportBackend.cpp
new file mode 100644
index 0000000..c9df0ea
--- /dev/null
+++ b/entry/src/main/cpp/src/core/pdf/base/PdfExportBackend.cpp
@@ -0,0 +1,45 @@
+#include "PdfExportBackend.h"
+
+#include "util/i18n.h"
+
+#include "config-features.h"
+
+ExportBackend ExportBackend::fromString(const char* str) {
+    return str != nullptr ? fromString(std::string_view(str)) : ExportBackend(ExportBackend::DEFAULT);
+}
+
+ExportBackend ExportBackend::fromString(std::string_view str) {
+    if (str == "cairo") {
+        return ExportBackend::CAIRO;
+    }
+#ifdef ENABLE_QPDF
+    if (str == "qpdf") {
+        return ExportBackend::QPDF;
+    }
+#endif
+    if (str != DEFAULT_ID_STRING && !str.empty()) {
+        g_warning("%s", (_F("Unknown pdf backend: {1}. Available backends are: {2}. Using default backend.") % str %
+                         listAvailableBackends())
+                                .c_str());
+    }
+    return ExportBackend::DEFAULT;
+}
+
+const char* ExportBackend::listAvailableBackends() {
+    static const char* availablePdfExportBackends = "cairo"
+#ifdef ENABLE_QPDF
+                                                    " qpdf"
+#endif
+            ;
+    return availablePdfExportBackends;
+}
+
+std::vector<std::pair<const char*, const char*>> ExportBackend::getPrettyNamesOfAvailableBackends() {
+    std::vector<std::pair<const char*, const char*>> res;
+    res.emplace_back(DEFAULT_ID_STRING, _("Default"));
+    res.emplace_back("cairo", "Cairo");
+#ifdef ENABLE_QPDF
+    res.emplace_back("qpdf", "QPDF");
+#endif
+    return res;
+}
diff --git a/entry/src/main/cpp/src/core/pdf/base/PdfExportBackend.h b/entry/src/main/cpp/src/core/pdf/base/PdfExportBackend.h
new file mode 100644
index 0000000..ad0a9d0
--- /dev/null
+++ b/entry/src/main/cpp/src/core/pdf/base/PdfExportBackend.h
@@ -0,0 +1,43 @@
+/*
+ * Xournal++
+ *
+ * PDF Document Export backend enum
+ *
+ * @author Xournal++ Team
+ * https://github.com/xournalpp/xournalpp
+ *
+ * @license GNU GPLv2 or later
+ */
+#pragma once
+
+#include <string_view>
+#include <utility>
+#include <vector>
+
+#include "util/i18n.h"
+
+class ExportBackend {  // Must match the order in ui/exportSettings.glade:listPdfExportBackend
+public:
+    enum Value {
+        DEFAULT,
+        CAIRO,
+        QPDF,
+        // Keep last
+        ENUM_END
+    };
+
+    ExportBackend() = default;
+    constexpr ExportBackend(Value v): v(v) {}
+    constexpr operator Value() const { return v; }
+    explicit operator bool() const = delete;
+
+    static constexpr auto DEFAULT_ID_STRING = "default";
+
+    static ExportBackend fromString(std::string_view str);
+    static ExportBackend fromString(const char* str);
+    static const char* listAvailableBackends();
+    static std::vector<std::pair<const char*, const char*>> getPrettyNamesOfAvailableBackends();
+
+private:
+    Value v;
+};
diff --git a/entry/src/main/cpp/src/core/pdf/base/QPdfExport.cpp b/entry/src/main/cpp/src/core/pdf/base/QPdfExport.cpp
new file mode 100644
index 0000000..e7f373b
--- /dev/null
+++ b/entry/src/main/cpp/src/core/pdf/base/QPdfExport.cpp
@@ -0,0 +1,179 @@
+#include "QPdfExport.h"
+
+#ifdef ENABLE_QPDF
+
+#include <algorithm>
+#include <sstream>  // for ostringstream
+#include <vector>   // for vector
+
+#include <qpdf/DLL.h>
+#if QPDF_MAJOR_VERSION == 11
+#define POINTERHOLDER_TRANSITION 4  // Only used for QPDF 11
+#endif
+#include <qpdf/QPDF.hh>
+#include <qpdf/QPDFPageDocumentHelper.hh>
+#include <qpdf/QPDFPageObjectHelper.hh>
+#include <qpdf/QPDFWriter.hh>
+
+#include "model/Document.h"   // for Document
+#include "util/Assert.h"      // for xoj_assert
+#include "util/Util.h"        // for npos
+#include "util/i18n.h"        // for _
+#include "util/safe_casts.h"  // for strict_cast
+
+#include "config.h"      // for PROJECT_STRING
+#include "filesystem.h"  // for path
+
+QPdfExport::QPdfExport(const Document* doc, ProgressListener* progressListener):
+        HybridPdfExport(doc, progressListener) {}
+
+QPdfExport::~QPdfExport() = default;
+
+static void reorderBackgrounds(QPDF& background, const std::vector<HybridPdfExport::OutputPageInfo>& outputPageInfos) {
+    auto pageHelper = QPDFPageDocumentHelper(background);
+    // We may need to shuffle the pages around: Remember the original pages addresses.
+    auto backgroundPages = pageHelper.getAllPages();
+    auto count = backgroundPages.size();
+    // Count occurrences of background pages: the user might have duplicated or removed pages
+    auto occurrences = HybridPdfExport::countOccurrences(count, outputPageInfos);
+
+    size_t nbValidPages = 0;
+    std::optional<QPDFPageObjectHelper> lastPageSet;
+    for (size_t i = 0; i < outputPageInfos.size(); i++) {
+        auto n = outputPageInfos[i].pdfBackgroundPageNumber;
+        if (n != npos) {
+#if QPDF_MAJOR_VERSION >= 11
+            if (const auto& ps = background.getAllPages();
+                !ps[nbValidPages].isSameObjectAs(backgroundPages[n].getObjectHandle())) {
+#else
+            {
+                const auto& ps = background.getAllPages();
+#endif
+                if (nbValidPages > 0) {
+                    auto prevPage = ps[nbValidPages - 1];
+                    pageHelper.removePage(backgroundPages[n]);
+                    pageHelper.addPageAt(backgroundPages[n], false, prevPage);
+                } else {
+                    pageHelper.removePage(backgroundPages[n]);
+                    pageHelper.addPage(backgroundPages[n], true);
+                }
+            }
+            if (occurrences[n].number >= 2) {
+                // Keep a copy for next time
+                backgroundPages[n].getObjectHandle().makeResourcesIndirect(background);
+                backgroundPages[n] = backgroundPages[n].shallowCopyPage();
+                pageHelper.addPage(backgroundPages[n], false);  // Append the copy
+#if QPDF_MAJOR_VERSION >= 11
+                xoj_assert(background.getAllPages().back().isSameObjectAs(backgroundPages[n].getObjectHandle()));
+#endif
+            }
+            nbValidPages++;
+            occurrences[n].number--;
+        }
+    }
+
+    // The backgrounds are in place. Remove the unused backgrounds.
+    auto pages = pageHelper.getAllPages();  // Makes a copy of the vector, so the iterators don't get invalidated
+    for (auto it = std::next(pages.begin(), as_signed(nbValidPages)); it != pages.end(); it++) {
+        pageHelper.removePage(*it);
+    }
+    xoj_assert(as_signed(background.getAllPages().size()) ==
+               std::count_if(outputPageInfos.begin(), outputPageInfos.end(),
+                             [](auto&& a) { return a.pdfBackgroundPageNumber != npos; }));
+}
+
+bool QPdfExport::overlayAndSave(const fs::path& saveDestination, std::stringstream& overlaystream,
+                                const std::vector<OutputPageInfo>& outputPageInfos) {
+    try {
+        auto overlaydata = overlaystream.str();  // Should probably be kept alive until we are done (not sure)
+        QPDF overlay;
+        overlay.processMemoryFile("overlay", overlaydata.data(), overlaydata.length());
+
+        QPDF background;
+        background.processFile(char_cast(doc->getPdfFilepath().u8string().c_str()));  // TODO: UTF8 is ok?
+
+        reorderBackgrounds(background, outputPageInfos);
+
+        // Prepare xobjects representing the pages in the overlay document
+        std::vector<QPDFObjectHandle> overlaysAsXObjects;
+        auto overlayPages = QPDFPageDocumentHelper(overlay).getAllPages();
+        overlaysAsXObjects.reserve(overlayPages.size());
+        for (auto&& p: overlayPages) {
+            auto&& xobj = overlaysAsXObjects.emplace_back(p.getFormXObjectForPage());
+            xobj.getDict().getKey("/Group").removeKey("/I");
+        }
+
+        auto outputPages = QPDFPageDocumentHelper(background).getAllPages();
+        for (size_t n = 0, overlayPagesConsumed = 0; n < outputPageInfos.size(); n++) {
+            auto [hasOverlay, bgIndex] = outputPageInfos[n];
+            if (hasOverlay) {
+                if (bgIndex != npos) {
+                    auto page = QPDFPageObjectHelper(background.getAllPages()[n]);
+                    // See qpdf/examples/pdf-overlay-page.cc
+
+                    // Find a unique resource name for the new form XObject
+                    QPDFObjectHandle resources = page.getAttribute("/Resources", true);
+                    int min_suffix = 1;
+                    std::string name = resources.getUniqueResourceName("/Fx", min_suffix);
+
+                    auto localXObj = background.copyForeignObject(overlaysAsXObjects[overlayPagesConsumed]);
+
+                    // Generate content to place the form XObject centered within destination page's trim box.
+                    QPDFMatrix m;
+                    std::string content =
+                            page.placeFormXObject(localXObj, name, page.getMediaBox().getArrayAsRectangle(), m);
+                    if (!content.empty()) {
+                        // Append the content to the page's content. Surround the original content with q...Q to
+                        // the new content from the page's original content.
+                        resources.mergeResources("<< /XObject << >> >>"_qpdf);
+                        resources.getKey("/XObject").replaceKey(name, localXObj);
+#if QPDF_MAJOR_VERSION > 11 || (QPDF_MAJOR_VERSION == 11 && QPDF_MINOR_VERSION >= 2)
+                        page.addPageContents(background.newStream("q\n"), true);
+                        page.addPageContents(background.newStream("\nQ\n" + content), false);
+#else
+                        page.addPageContents(QPDFObjectHandle::newStream(&background, "q\n"), true);
+                        page.addPageContents(QPDFObjectHandle::newStream(&background, "\nQ\n" + content), false);
+#endif
+                    }
+                } else {
+                    // Simply insert the overlay as a page
+                    if (n == 0) {
+                        QPDFPageDocumentHelper(background).addPage(overlayPages[overlayPagesConsumed], true);
+                    } else {
+                        QPDFPageDocumentHelper(background)
+                                .addPageAt(overlayPages[overlayPagesConsumed], false, background.getAllPages()[n - 1]);
+                    }
+                }
+                overlayPagesConsumed++;
+            }
+        }
+
+        auto info = [&]() {
+            auto trailer = background.getTrailer();
+            if (trailer.hasKey("/Info")) {
+                return trailer.getKey("/Info");
+            }
+            auto info = QPDFObjectHandle::newDictionary();
+            trailer.replaceKey("/Info", info);
+            return info;
+        }();
+
+        auto replaceKey = [&](const char* key, const std::string& val) {
+            QPDFObjectHandle str = info.newString(val);
+            str.makeDirect();
+            info.replaceKey(key, str);
+        };
+
+        replaceKey("/Producer", (std::string(PROJECT_STRING) + " + QPDF " + QPDF_VERSION));
+        replaceKey("/ModDate", createPDFDateStringForNow());
+
+        QPDFWriter writer(background, char_cast(saveDestination.u8string().data()));  // is UTF8 ok?
+        writer.write();
+    } catch (const std::exception& e) {
+        this->lastError = _("Error with overlay or final export:");
+        this->lastError += std::string("\n") + e.what();
+        return false;
+    }
+    return true;
+}
+#endif
diff --git a/entry/src/main/cpp/src/core/pdf/base/QPdfExport.h b/entry/src/main/cpp/src/core/pdf/base/QPdfExport.h
new file mode 100644
index 0000000..8ad3856
--- /dev/null
+++ b/entry/src/main/cpp/src/core/pdf/base/QPdfExport.h
@@ -0,0 +1,36 @@
+/*
+ * Xournal++
+ *
+ * PDF Document Export Abstraction Interface - use cairo for the annotations and overlay them on the original PDF using
+ * QPDF to avoid information loss
+ *
+ * @author Xournal++ Team
+ * https://github.com/xournalpp/xournalpp
+ *
+ * @license GNU GPLv2 or later
+ */
+#pragma once
+
+#include "config-features.h"
+
+#ifdef ENABLE_QPDF
+
+#include <sstream>
+
+#include "HybridPdfExport.h"  // for HybridPdfExport
+#include "filesystem.h"       // for path
+
+class Document;
+class ProgressListener;
+
+class QPdfExport: public HybridPdfExport {
+public:
+    QPdfExport(const Document* doc, ProgressListener* progressListener);
+    ~QPdfExport() override;
+
+protected:
+    bool overlayAndSave(const fs::path& saveDestination, std::stringstream& overlaystream,
+                        const std::vector<OutputPageInfo>& outputPageInfos) override;
+};
+
+#endif
diff --git a/entry/src/main/cpp/src/core/pdf/base/XojCairoPdfExport.cpp b/entry/src/main/cpp/src/core/pdf/base/XojCairoPdfExport.cpp
new file mode 100644
index 0000000..f124046
--- /dev/null
+++ b/entry/src/main/cpp/src/core/pdf/base/XojCairoPdfExport.cpp
@@ -0,0 +1,283 @@
+#include "XojCairoPdfExport.h"
+
+#include <algorithm>  // for copy, min
+#include <map>        // for map
+#include <memory>     // for __shared_ptr_access
+#include <sstream>    // for ostringstream, operator<<
+#include <stack>      // for stack
+#include <utility>    // for pair, make_pair
+#include <vector>     // for vector
+
+#include <cairo-pdf.h>    // for cairo_pdf_surface_set_met...
+#include <glib-object.h>  // for g_object_unref
+
+#include "control/jobs/ProgressListener.h"  // for ProgressListener
+#include "model/Document.h"                 // for Document
+#include "model/Layer.h"                    // for Layer
+#include "model/LinkDestination.h"          // for LinkDestination, XojLinkDest
+#include "model/PageRef.h"                  // for PageRef
+#include "model/PageType.h"                 // for PageType
+#include "model/XojPage.h"                  // for XojPage
+#include "pdf/base/XojPdfPage.h"            // for XojPdfPageSPtr, XojPdfPage
+#include "util/Assert.h"                    // for xoj_assert
+#include "util/StringUtils.h"               // for char_cast
+#include "util/Util.h"                      // for npos
+#include "util/i18n.h"                      // for _
+#include "util/serdesstream.h"              // for serdes_stream
+#include "view/DocumentView.h"              // for DocumentView
+
+#include "config.h"      // for PROJECT_STRING
+#include "filesystem.h"  // for path
+
+XojCairoPdfExport::XojCairoPdfExport(const Document* doc, ProgressListener* progressListener):
+        doc(doc), progressListener(progressListener) {}
+
+XojCairoPdfExport::~XojCairoPdfExport() {
+    if (this->surface != nullptr) {
+        endPdf();
+    }
+}
+
+/**
+ * Export without background
+ */
+void XojCairoPdfExport::setExportBackground(ExportBackgroundType exportBackground) {
+    this->exportBackground = exportBackground;
+}
+
+auto XojCairoPdfExport::startPdf(const fs::path& file, bool exportOutline) -> bool {
+    this->surface = cairo_pdf_surface_create(char_cast(file.u8string().c_str()), 0, 0);
+    this->cr = cairo_create(surface);
+
+#if CAIRO_VERSION >= CAIRO_VERSION_ENCODE(1, 16, 0)
+    cairo_pdf_surface_set_metadata(surface, CAIRO_PDF_METADATA_TITLE,
+                                   char_cast(doc->getFilepath().filename().u8string().c_str()));
+    cairo_pdf_surface_set_metadata(surface, CAIRO_PDF_METADATA_CREATOR, PROJECT_STRING);
+    if (exportOutline) {
+        this->populatePdfOutline();
+    }
+#endif
+    configureCairoFontOptions();
+
+    return cairo_surface_status(this->surface) == CAIRO_STATUS_SUCCESS;
+}
+
+void XojCairoPdfExport::configureCairoFontOptions() {
+    // Turn on font hint metrics, for consistency with text display in the app
+    cairo_font_options_t* fontOptions = cairo_font_options_create();
+    cairo_font_options_set_hint_metrics(fontOptions, CAIRO_HINT_METRICS_ON);
+    cairo_set_font_options(cr, fontOptions);
+    cairo_font_options_destroy(fontOptions);
+}
+
+#if CAIRO_VERSION >= CAIRO_VERSION_ENCODE(1, 16, 0)
+void XojCairoPdfExport::populatePdfOutline() {
+    auto tocModel = doc->getContentsModel();
+    if (tocModel == nullptr)
+        return;
+
+    int idCounter = CAIRO_PDF_OUTLINE_ROOT;
+    std::stack<std::pair<GtkTreeIter, int>> nodeStack;
+
+    GtkTreeIter firstIter = {0};
+    if (!gtk_tree_model_get_iter_first(tocModel, &firstIter)) {
+        // Outline is empty, so do nothing.
+        return;
+    }
+
+    nodeStack.push(std::make_pair(firstIter, idCounter));
+    while (!nodeStack.empty()) {
+        auto [iter, parentId] = nodeStack.top();
+        nodeStack.pop();
+        const int currentId = ++idCounter;
+        XojLinkDest* link = nullptr;
+
+        gtk_tree_model_get(tocModel, &iter, DOCUMENT_LINKS_COLUMN_LINK, &link, -1);
+        auto dest = link->dest;
+        auto pdfBgPage = dest->getPdfPage();  // Link destination in original background PDF
+        auto pageDest = pdfBgPage == npos ? npos : doc->findPdfPage(pdfBgPage);  // Destination in document
+        if (pageDest != npos) {
+            auto linkAttrBuf = serdes_stream<std::ostringstream>();
+            linkAttrBuf << "page=" << pageDest + 1;
+            if (dest->shouldChangeLeft() && dest->shouldChangeTop()) {
+                linkAttrBuf << " pos=[" << dest->getLeft() << " " << dest->getTop() << "]";
+            }
+            const auto linkAttr = linkAttrBuf.str();
+            auto outlineFlags = dest->getExpand() ? CAIRO_PDF_OUTLINE_FLAG_OPEN : 0;
+            cairo_pdf_surface_add_outline(this->surface, parentId, link->dest->getName().data(), linkAttr.data(),
+                                          static_cast<cairo_pdf_outline_flags_t>(outlineFlags));
+        }
+        g_object_unref(link);
+
+        GtkTreeIter childIter;
+        if (gtk_tree_model_iter_children(tocModel, &childIter, &iter)) {
+            nodeStack.push(std::make_pair(childIter, currentId));
+        }
+
+        if (gtk_tree_model_iter_next(tocModel, &iter)) {
+            nodeStack.push(std::make_pair(iter, parentId));
+        }
+    }
+}
+#endif
+
+bool XojCairoPdfExport::endPdf() {
+    cairo_surface_finish(this->surface);
+    bool success = cairo_surface_status(this->surface) == CAIRO_STATUS_SUCCESS;
+    if (!success) {
+        this->lastError = _("Error while finalizing the PDF Cairo surface");
+        this->lastError += "\nCairo error: ";
+        this->lastError += cairo_status_to_string(cairo_surface_status(this->surface));
+    }
+    cairo_destroy(this->cr);
+    this->cr = nullptr;
+    cairo_surface_destroy(this->surface);
+    this->surface = nullptr;
+    return success;
+}
+
+void XojCairoPdfExport::exportPage(size_t page, bool exportPdfBackground) {
+    PageRef p = doc->getPage(page);
+
+    cairo_pdf_surface_set_size(this->surface, p->getWidth(), p->getHeight());
+
+    DocumentView view;
+
+    cairo_save(this->cr);
+
+    // For a better pdf quality, we use a dedicated pdf rendering
+    if (exportPdfBackground && p->getBackgroundType().isPdfPage() && (exportBackground != EXPORT_BACKGROUND_NONE)) {
+        auto pgNo = p->getPdfPageNr();
+        XojPdfPageSPtr popplerPage = doc->getPdfPage(pgNo);
+
+        popplerPage->renderForPrinting(cr);
+    }
+
+    xoj::view::BackgroundFlags flags;
+    flags.showPDF = xoj::view::HIDE_PDF_BACKGROUND;  // Already exported (if any)
+    flags.showImage = exportBackground == EXPORT_BACKGROUND_NONE ? xoj::view::HIDE_IMAGE_BACKGROUND :
+                                                                   xoj::view::SHOW_IMAGE_BACKGROUND;
+    flags.showRuling = exportBackground <= EXPORT_BACKGROUND_UNRULED ? xoj::view::HIDE_RULING_BACKGROUND :
+                                                                       xoj::view::SHOW_RULING_BACKGROUND;
+
+    if (layerRange) {
+        view.drawLayersOfPage(*layerRange, p, this->cr, true /* dont render eraseable */, flags);
+    } else {
+        view.drawPage(p, this->cr, true /* dont render eraseable */, flags);
+    }
+
+    // next page
+    cairo_show_page(this->cr);
+    cairo_restore(this->cr);
+}
+
+// export layers one by one to produce as many PDF pages as there are layers.
+void XojCairoPdfExport::exportPageLayers(size_t page) {
+    PageRef p = doc->getPage(page);
+
+    // We keep a copy of the layers initial Visible state
+    std::map<Layer*, bool> initialVisibility;
+    for (const auto& layer: p->getLayers()) {
+        initialVisibility[layer] = layer->isVisible();
+        layer->setVisible(false);
+    }
+
+    // We draw as many pages as there are layers. The first page has
+    // only Layer 1 visible, the last has all layers visible.
+    for (const auto& layer: p->getLayers()) {
+        layer->setVisible(true);
+        exportPage(page);
+    }
+
+    // We restore the initial visibilities
+    for (const auto& layer: p->getLayers()) layer->setVisible(initialVisibility[layer]);
+}
+
+auto XojCairoPdfExport::createPdf(fs::path const& file, const PageRangeVector& range, bool progressiveMode) -> bool {
+    if (range.empty()) {
+        this->lastError = _("No pages to export!");
+        return false;
+    }
+
+    // Only export the outline if we are exporting the entire document. otherwise, links may point to page numbers
+    // greater than the total number of pages, leading to corrupt pdf files
+    bool outline = range.size() == 1 && range.front().first == 0 && range.front().last >= doc->getPageCount() - 1;
+
+    if (!startPdf(file, outline)) {
+        this->lastError = _("Failed to initialize PDF Cairo surface");
+        this->lastError += "\nCairo error: ";
+        this->lastError += cairo_status_to_string(cairo_surface_status(this->surface));
+        return false;
+    }
+
+    size_t count = 0;
+    for (const auto& e: range) {
+        xoj_assert(e.last >= e.first);  // Ok, when the PageRangeVector was the result of parsing
+        count += e.last - e.first + 1;  // Not accurate, if e.last is > doc->getPageCount()
+    }
+
+    if (this->progressListener) {
+        this->progressListener->setMaximumState(count);
+    }
+
+    size_t c = 0;
+    for (const auto& e: range) {
+        auto max = std::min(e.last, doc->getPageCount());  // Should be e.last for parsed PageRangeVector
+        for (size_t i = e.first; i <= max; i++) {
+            if (progressiveMode) {
+                exportPageLayers(i);
+            } else {
+                exportPage(i);
+            }
+
+            if (this->progressListener) {
+                this->progressListener->setCurrentState(++c);
+            }
+        }
+    }
+
+    return endPdf();
+}
+
+auto XojCairoPdfExport::createPdf(fs::path const& file, bool progressiveMode) -> bool {
+    if (doc->getPageCount() < 1) {
+        lastError = _("No pages to export!");
+        return false;
+    }
+
+    if (!startPdf(file, /* exportOutline */ true)) {
+        this->lastError = _("Failed to initialize PDF Cairo surface");
+        this->lastError += "\nCairo error: ";
+        this->lastError += cairo_status_to_string(cairo_surface_status(this->surface));
+        return false;
+    }
+
+    auto count = doc->getPageCount();
+    if (this->progressListener) {
+        this->progressListener->setMaximumState(count);
+    }
+
+    for (decltype(count) i = 0; i < count; i++) {
+        if (progressiveMode) {
+            exportPageLayers(i);
+        } else {
+            exportPage(i);
+        }
+
+        if (this->progressListener) {
+            this->progressListener->setCurrentState(i + 1);
+        }
+    }
+
+    return endPdf();
+}
+
+auto XojCairoPdfExport::getLastError() -> std::string { return lastError; }
+
+void XojCairoPdfExport::setLayerRange(const char* rangeStr) {
+    if (rangeStr) {
+        // Use no upper bound for layer indices, as the maximal value can vary between pages
+        layerRange =
+                std::make_unique<LayerRangeVector>(ElementRange::parse(rangeStr, std::numeric_limits<size_t>::max()));
+    }
+}
diff --git a/entry/src/main/cpp/src/core/pdf/base/XojCairoPdfExport.h b/entry/src/main/cpp/src/core/pdf/base/XojCairoPdfExport.h
new file mode 100644
index 0000000..ab1ffc2
--- /dev/null
+++ b/entry/src/main/cpp/src/core/pdf/base/XojCairoPdfExport.h
@@ -0,0 +1,83 @@
+/*
+ * Xournal++
+ *
+ * PDF Document Export Abstraction Interface
+ *
+ * @author Xournal++ Team
+ * https://github.com/xournalpp/xournalpp
+ *
+ * @license GNU GPLv2 or later
+ */
+
+#pragma once
+
+#include <cstddef>  // for size_t
+#include <string>   // for string
+
+#include <cairo.h>    // for CAIRO_VERSION, CAIRO_VERSION...
+#include <gtk/gtk.h>  // for GtkTreeModel
+
+#include "control/jobs/BaseExportJob.h"  // for ExportBackgroundType, EXPORT...
+#include "util/ElementRange.h"           // for PageRangeVector
+
+#include "XojPdfExport.h"  // for XojPdfExport
+#include "filesystem.h"    // for path
+
+class Document;
+class ProgressListener;
+
+class XojCairoPdfExport: public XojPdfExport {
+public:
+    XojCairoPdfExport(const Document* doc, ProgressListener* progressListener);
+    ~XojCairoPdfExport() override;
+
+public:
+    bool createPdf(fs::path const& file, bool progressiveMode) override;
+    bool createPdf(fs::path const& file, const PageRangeVector& range, bool progressiveMode) override;
+    std::string getLastError() override;
+
+    /**
+     * Export without background
+     */
+    void setExportBackground(ExportBackgroundType exportBackground) override;
+
+private:
+    bool startPdf(const fs::path& file, bool exportOutline);
+#if CAIRO_VERSION >= CAIRO_VERSION_ENCODE(1, 16, 0)
+    /**
+     * Populate the outline of the generated PDF using the outline of the
+     * background PDF.
+     *
+     * This requires features available only in cairo 1.16 or newer.
+     */
+    void populatePdfOutline();
+#endif
+
+protected:
+    void configureCairoFontOptions();
+    bool endPdf();
+    void exportPage(size_t page, bool exportPdfBackground = true);
+    /**
+     * Export as a PDF document where each additional layer creates a
+     * new page */
+    void exportPageLayers(size_t page);
+
+    /**
+     * @brief Select layers to export by parsing str
+     * @param rangeStr A string parsed to get a list of layers
+     */
+    void setLayerRange(const char* rangeStr) override;
+
+protected:
+    const Document* doc = nullptr;
+    ProgressListener* progressListener = nullptr;
+
+    cairo_surface_t* surface = nullptr;
+    cairo_t* cr = nullptr;
+
+    ExportBackgroundType exportBackground = EXPORT_BACKGROUND_ALL;
+
+    std::string lastError;
+
+    std::unique_ptr<LayerRangeVector> layerRange;
+};
diff --git a/entry/src/main/cpp/src/core/pdf/base/XojPdfAction.cpp b/entry/src/main/cpp/src/core/pdf/base/XojPdfAction.cpp
new file mode 100644
index 0000000..fc6ee30
--- /dev/null
+++ b/entry/src/main/cpp/src/core/pdf/base/XojPdfAction.cpp
@@ -0,0 +1,5 @@
+#include "XojPdfAction.h"
+
+XojPdfAction::XojPdfAction() = default;
+
+XojPdfAction::~XojPdfAction() = default;
diff --git a/entry/src/main/cpp/src/core/pdf/base/XojPdfAction.h b/entry/src/main/cpp/src/core/pdf/base/XojPdfAction.h
new file mode 100644
index 0000000..2964fbb
--- /dev/null
+++ b/entry/src/main/cpp/src/core/pdf/base/XojPdfAction.h
@@ -0,0 +1,31 @@
+/*
+ * Xournal++
+ *
+ * PDF Action Abstraction Interface
+ *
+ * @author Xournal++ Team
+ * https://github.com/xournalpp/xournalpp
+ *
+ * @license GNU GPLv2 or later
+ */
+
+#pragma once
+
+#include <string>  // for string
+#include <memory>
+#include <vector>
+
+#include "model/LinkDestination.h"  // for XojLinkDest
+
+
+class XojPdfAction {
+public:
+    XojPdfAction();
+    virtual ~XojPdfAction();
+
+public:
+    virtual std::shared_ptr<const LinkDestination> getDestination() = 0;
+    virtual std::string getTitle() = 0;
+
+private:
+};
diff --git a/entry/src/main/cpp/src/core/pdf/base/XojPdfBookmarkIterator.cpp b/entry/src/main/cpp/src/core/pdf/base/XojPdfBookmarkIterator.cpp
new file mode 100644
index 0000000..1c4f9ab
--- /dev/null
+++ b/entry/src/main/cpp/src/core/pdf/base/XojPdfBookmarkIterator.cpp
@@ -0,0 +1,5 @@
+#include "XojPdfBookmarkIterator.h"
+
+XojPdfBookmarkIterator::XojPdfBookmarkIterator() = default;
+
+XojPdfBookmarkIterator::~XojPdfBookmarkIterator() = default;
diff --git a/entry/src/main/cpp/src/core/pdf/base/XojPdfBookmarkIterator.h b/entry/src/main/cpp/src/core/pdf/base/XojPdfBookmarkIterator.h
new file mode 100644
index 0000000..1830baa
--- /dev/null
+++ b/entry/src/main/cpp/src/core/pdf/base/XojPdfBookmarkIterator.h
@@ -0,0 +1,29 @@
+/*
+ * Xournal++
+ *
+ * PDF Bookmark iterator interface
+ *
+ * @author Xournal++ Team
+ * https://github.com/xournalpp/xournalpp
+ *
+ * @license GNU GPLv2 or later
+ */
+
+#pragma once
+
+
+class XojPdfAction;
+
+class XojPdfBookmarkIterator {
+public:
+    XojPdfBookmarkIterator();
+    virtual ~XojPdfBookmarkIterator();
+
+public:
+    virtual bool next() = 0;
+    virtual bool isOpen() = 0;
+    virtual XojPdfBookmarkIterator* getChildIter() = 0;
+    virtual XojPdfAction* getAction() = 0;
+
+private:
+};
diff --git a/entry/src/main/cpp/src/core/pdf/base/XojPdfDocument.cpp b/entry/src/main/cpp/src/core/pdf/base/XojPdfDocument.cpp
new file mode 100644
index 0000000..c3ad429
--- /dev/null
+++ b/entry/src/main/cpp/src/core/pdf/base/XojPdfDocument.cpp
@@ -0,0 +1,51 @@
+#include "XojPdfDocument.h"
+
+#include "pdf/base/XojPdfDocumentInterface.h"    // for XojPdfDocumentInterface
+#include "pdf/base/XojPdfPage.h"                 // for XojPdfPageSPtr
+#include "pdf/popplerapi/PopplerGlibDocument.h"  // for PopplerGlibDocument
+
+#include "filesystem.h"  // for path
+
+class XojPdfBookmarkIterator;
+
+XojPdfDocument::XojPdfDocument(): doc(new PopplerGlibDocument()) {}
+
+XojPdfDocument::XojPdfDocument(const XojPdfDocument& doc): doc(new PopplerGlibDocument()) {
+    this->doc->assign(doc.doc);
+}
+
+XojPdfDocument::~XojPdfDocument() {
+    delete doc;
+    doc = nullptr;
+}
+
+auto XojPdfDocument::operator=(const XojPdfDocument& doc) -> XojPdfDocument& {
+    this->doc->assign(doc.doc);
+    return *this;
+}
+
+auto XojPdfDocument::operator==(XojPdfDocument& doc) const -> bool { return this->doc->equals(doc.doc); }
+
+void XojPdfDocument::assign(XojPdfDocumentInterface* doc) { this->doc->assign(doc); }
+
+auto XojPdfDocument::equals(XojPdfDocumentInterface* doc) const -> bool { return this->doc->equals(doc); }
+
+auto XojPdfDocument::save(fs::path const& file, GError** error) const -> bool { return doc->save(file, error); }
+
+auto XojPdfDocument::load(fs::path const& file, std::string password, GError** error) -> bool {
+    return doc->load(file, password, error);
+}
+
+auto XojPdfDocument::load(std::unique_ptr<std::string> data, std::string password, GError** error) -> bool {
+    return doc->load(std::move(data), password, error);
+}
+
+auto XojPdfDocument::isLoaded() const -> bool { return doc->isLoaded(); }
+
+void XojPdfDocument::reset() { doc->reset(); }
+
+auto XojPdfDocument::getPage(size_t page) const -> XojPdfPageSPtr { return doc->getPage(page); }
+
+auto XojPdfDocument::getPageCount() const -> size_t { return doc->getPageCount(); }
+
+auto XojPdfDocument::getContentsIter() const -> XojPdfBookmarkIterator* { return doc->getContentsIter(); }
diff --git a/entry/src/main/cpp/src/core/pdf/base/XojPdfDocument.h b/entry/src/main/cpp/src/core/pdf/base/XojPdfDocument.h
new file mode 100644
index 0000000..c154136
--- /dev/null
+++ b/entry/src/main/cpp/src/core/pdf/base/XojPdfDocument.h
@@ -0,0 +1,54 @@
+/*
+ * Xournal++
+ *
+ * PDF Document Container
+ *
+ * @author Xournal++ Team
+ * https://github.com/xournalpp/xournalpp
+ *
+ * @license GNU GPLv2 or later
+ */
+
+#pragma once
+
+#include <cstddef>  // for size_t
+#include <string>   // for string
+#include <optional>
+#include <string>
+#include <vector>
+
+#include <glib.h>  // for GError, gpointer, gsize
+
+#include "XojPdfDocumentInterface.h"  // for XojPdfDocumentInterface
+#include "XojPdfPage.h"               // for XojPdfPageSPtr
+#include "filesystem.h"               // for path
+
+class XojPdfBookmarkIterator;
+
+
+class XojPdfDocument: XojPdfDocumentInterface {
+public:
+    XojPdfDocument();
+    XojPdfDocument(const XojPdfDocument& doc);
+    ~XojPdfDocument() override;
+
+public:
+    XojPdfDocument& operator=(const XojPdfDocument& doc);
+    bool operator==(XojPdfDocument& doc) const;
+    void assign(XojPdfDocumentInterface* doc) override;
+    bool equals(XojPdfDocumentInterface* doc) const override;
+
+public:
+    bool save(fs::path const& file, GError** error) const override;
+    bool load(fs::path const& file, std::string password, GError** error) override;
+    bool load(std::unique_ptr<std::string> data, std::string password, GError** error) override;
+    bool isLoaded() const override;
+    void reset() override;
+
+    XojPdfPageSPtr getPage(size_t page) const override;
+    size_t getPageCount() const override;
+    XojPdfBookmarkIterator* getContentsIter() const override;
+
+private:
+    XojPdfDocumentInterface* doc;
+};
diff --git a/entry/src/main/cpp/src/core/pdf/base/XojPdfDocumentInterface.cpp b/entry/src/main/cpp/src/core/pdf/base/XojPdfDocumentInterface.cpp
new file mode 100644
index 0000000..b5a1c70
--- /dev/null
+++ b/entry/src/main/cpp/src/core/pdf/base/XojPdfDocumentInterface.cpp
@@ -0,0 +1,5 @@
+#include "XojPdfDocumentInterface.h"
+
+XojPdfDocumentInterface::XojPdfDocumentInterface() = default;
+
+XojPdfDocumentInterface::~XojPdfDocumentInterface() = default;
diff --git a/entry/src/main/cpp/src/core/pdf/base/XojPdfDocumentInterface.h b/entry/src/main/cpp/src/core/pdf/base/XojPdfDocumentInterface.h
new file mode 100644
index 0000000..4ac2e5d
--- /dev/null
+++ b/entry/src/main/cpp/src/core/pdf/base/XojPdfDocumentInterface.h
@@ -0,0 +1,45 @@
+/*
+ * Xournal++
+ *
+ * PDF Document Container Interface
+ *
+ * @author Xournal++ Team
+ * https://github.com/xournalpp/xournalpp
+ *
+ * @license GNU GPLv2 or later
+ */
+
+#pragma once
+
+#include <cstddef>  // for size_t
+#include <string>   // for string
+
+#include <glib.h>  // for GError, gpointer, gsize
+
+#include "XojPdfPage.h"  // for XojPdfPageSPtr
+#include "filesystem.h"  // for path
+
+class XojPdfBookmarkIterator;
+
+class XojPdfDocumentInterface {
+public:
+    XojPdfDocumentInterface();
+    virtual ~XojPdfDocumentInterface();
+
+public:
+    virtual void assign(XojPdfDocumentInterface* doc) = 0;
+    virtual bool equals(XojPdfDocumentInterface* doc) const = 0;
+
+public:
+    virtual bool save(fs::path const& file, GError** error) const = 0;
+    virtual bool load(fs::path const& file, std::string password, GError** error) = 0;
+    virtual bool load(std::unique_ptr<std::string> data, std::string password, GError** error) = 0;
+    virtual bool isLoaded() const = 0;
+    virtual void reset() = 0;
+
+    virtual XojPdfPageSPtr getPage(size_t page) const = 0;
+    virtual size_t getPageCount() const = 0;
+    virtual XojPdfBookmarkIterator* getContentsIter() const = 0;
+
+private:
+};
diff --git a/entry/src/main/cpp/src/core/pdf/base/XojPdfExport.cpp b/entry/src/main/cpp/src/core/pdf/base/XojPdfExport.cpp
new file mode 100644
index 0000000..56c91f0
--- /dev/null
+++ b/entry/src/main/cpp/src/core/pdf/base/XojPdfExport.cpp
@@ -0,0 +1,12 @@
+#include "XojPdfExport.h"
+
+XojPdfExport::XojPdfExport() = default;
+
+XojPdfExport::~XojPdfExport() = default;
+
+/**
+ * Export without background
+ */
+void XojPdfExport::setExportBackground(ExportBackgroundType exportBackground) {
+    // Does nothing in the base class
+}
diff --git a/entry/src/main/cpp/src/core/pdf/base/XojPdfExport.h b/entry/src/main/cpp/src/core/pdf/base/XojPdfExport.h
new file mode 100644
index 0000000..bafe05d
--- /dev/null
+++ b/entry/src/main/cpp/src/core/pdf/base/XojPdfExport.h
@@ -0,0 +1,43 @@
+/*
+ * Xournal++
+ *
+ * PDF Document Export Abstraction Interface
+ *
+ * @author Xournal++ Team
+ * https://github.com/xournalpp/xournalpp
+ *
+ * @license GNU GPLv2 or later
+ */
+
+#pragma once
+
+#include <string>
+
+#include "control/jobs/BaseExportJob.h"
+#include "util/ElementRange.h"
+
+#include "filesystem.h"
+
+class XojPdfExport {
+public:
+    XojPdfExport();
+    virtual ~XojPdfExport();
+
+public:
+    virtual bool createPdf(fs::path const& file, bool progressiveMode) = 0;
+    virtual bool createPdf(fs::path const& file, const PageRangeVector& range, bool progressiveMode) = 0;
+    virtual std::string getLastError() = 0;
+
+    /**
+     * Export without background
+     */
+    virtual void setExportBackground(ExportBackgroundType exportBackground);
+
+    /**
+     * @brief Select layers to export by parsing str
+     * @param rangeStr A string parsed to get a list of layers
+     */
+    virtual void setLayerRange(const char* rangeStr) = 0;
+
+private:
+};
diff --git a/entry/src/main/cpp/src/core/pdf/base/XojPdfExportFactory.cpp b/entry/src/main/cpp/src/core/pdf/base/XojPdfExportFactory.cpp
new file mode 100644
index 0000000..2a6fdd0
--- /dev/null
+++ b/entry/src/main/cpp/src/core/pdf/base/XojPdfExportFactory.cpp
@@ -0,0 +1,29 @@
+#include "XojPdfExportFactory.h"
+
+#include "model/Document.h"
+
+#include "QPdfExport.h"
+#include "XojCairoPdfExport.h"  // for XojCairoPdfExport
+
+class XojPdfExport;
+
+XojPdfExportFactory::XojPdfExportFactory() = default;
+
+XojPdfExportFactory::~XojPdfExportFactory() = default;
+
+auto XojPdfExportFactory::createExport(const Document* doc, ProgressListener* listener, ExportBackend backend)
+        -> std::unique_ptr<XojPdfExport> {
+    if (!doc->getPdfFilepath().empty()) {
+        switch (backend) {
+            case ExportBackend::DEFAULT:  // fallback to qpdf/podofo/mupdf/cairo in that order
+#ifdef ENABLE_QPDF
+            case ExportBackend::QPDF:
+                return std::make_unique<QPdfExport>(doc, listener);
+#endif
+            case ExportBackend::CAIRO:
+            default:  // The requested backend has not been included in this build
+                return std::make_unique<XojCairoPdfExport>(doc, listener);
+        }
+    }
+    return std::make_unique<XojCairoPdfExport>(doc, listener);
+}
diff --git a/entry/src/main/cpp/src/core/pdf/base/XojPdfExportFactory.h b/entry/src/main/cpp/src/core/pdf/base/XojPdfExportFactory.h
new file mode 100644
index 0000000..ee439a2
--- /dev/null
+++ b/entry/src/main/cpp/src/core/pdf/base/XojPdfExportFactory.h
@@ -0,0 +1,30 @@
+/*
+ * Xournal++
+ *
+ * PDF Document Export Abstraction Interface
+ *
+ * @author Xournal++ Team
+ * https://github.com/xournalpp/xournalpp
+ *
+ * @license GNU GPLv2 or later
+ */
+
+#pragma once
+
+#include <memory>  // for unique_ptr
+
+#include "PdfExportBackend.h"
+
+class Document;
+class ProgressListener;
+class XojPdfExport;
+
+class XojPdfExportFactory {
+private:
+    XojPdfExportFactory();
+    ~XojPdfExportFactory();
+
+public:
+    static std::unique_ptr<XojPdfExport> createExport(const Document* doc, ProgressListener* listener,
+                                                      ExportBackend backend = ExportBackend::DEFAULT);
+};
diff --git a/entry/src/main/cpp/src/core/pdf/base/XojPdfPage.cpp b/entry/src/main/cpp/src/core/pdf/base/XojPdfPage.cpp
new file mode 100644
index 0000000..62e02b0
--- /dev/null
+++ b/entry/src/main/cpp/src/core/pdf/base/XojPdfPage.cpp
@@ -0,0 +1,3 @@
+#include "XojPdfPage.h"
+
+XojPdfRectangle::XojPdfRectangle(double x1, double y1, double x2, double y2): x1(x1), y1(y1), x2(x2), y2(y2) {}
diff --git a/entry/src/main/cpp/src/core/pdf/base/XojPdfPage.h b/entry/src/main/cpp/src/core/pdf/base/XojPdfPage.h
new file mode 100644
index 0000000..a1935cb
--- /dev/null
+++ b/entry/src/main/cpp/src/core/pdf/base/XojPdfPage.h
@@ -0,0 +1,113 @@
+/*
+ * Xournal++
+ *
+ * PDF Page Abstraction Interface
+ *
+ * @author Xournal++ Team
+ * https://github.com/xournalpp/xournalpp
+ *
+ * @license GNU GPLv2 or later
+ */
+
+#pragma once
+
+#include <cstdint>  // for uint8_t
+#include <memory>   // for shared_ptr
+#include <string>   // for string
+#include <vector>   // for vector
+
+#include <cairo.h>  // for cairo_region_t, cairo_t
+#include <glib.h>   // for GURI
+
+#include "util/raii/CairoWrappers.h"
+
+#include "XojPdfAction.h"
+
+class XojPdfLink;
+
+/// Determines how text is selected on a user action.
+enum class XojPdfPageSelectionStyle : uint8_t {
+    /// Standard selection, where all text between start and end positions is selected.
+    Linear,
+    /// Select a single word.
+    Word,
+    /// Select a single line.
+    Line,
+    /// Select an area.
+    Area,
+};
+
+class XojPdfRectangle {
+public:
+    XojPdfRectangle() = default;
+    XojPdfRectangle(double x1, double y1, double x2, double y2);
+
+public:
+    double x1 = -1;
+    double y1 = -1;
+    double x2 = -1;
+    double y2 = -1;
+};
+
+class XojPdfPage {
+public:
+    struct TextSelection {
+        xoj::util::CairoRegionSPtr region;
+        std::vector<XojPdfRectangle> rects;
+    };
+
+    struct Link {
+        XojPdfRectangle bounds;
+        std::unique_ptr<XojPdfAction> action;
+    };
+
+    virtual double getWidth() const = 0;
+    virtual double getHeight() const = 0;
+
+    /**
+     * Renders the page to the given cairo context.
+     * Use render() for rendering to a screen (or a raster image format),
+     * Use renderForPrinting() for exports to vector formats (not sure it will be vectorial, but the quality is better)
+     *
+     * See https://poppler.freedesktop.org/api/glib/poppler-Poppler-Page.html#poppler-page-render-for-printing
+     * for actual differences between the two functions in the poppler based implementation.
+     */
+    virtual void render(cairo_t* cr) const = 0;
+    virtual void renderForPrinting(cairo_t* cr) const = 0;
+
+    virtual std::vector<XojPdfRectangle> findText(const std::string& text) = 0;
+
+    /// Retrieve the text contained in the provided rectangle using the given
+    /// selection style.
+    /// @param rect start and end points
+    /// @param style The text selection style
+    /// @return The selected text.
+    virtual std::string selectText(const XojPdfRectangle& rect, XojPdfPageSelectionStyle style) = 0;
+
+    /// Retrieve the cairo_region_t that encompasses the text that would be
+    /// selected in the given rectangle with the given text selection style.
+    /// @param rect start and end points
+    /// @param style The text selection style
+    /// @return A region that contains the text that would be selected.
+    virtual cairo_region_t* selectTextRegion(const XojPdfRectangle& rect, XojPdfPageSelectionStyle style) = 0;
+
+    /// Retrieve the set of rectangles that represent each line of text selected
+    /// in the given rectangle with the given text selection style.
+    /// @param rect start and end points
+    /// @param style The text selection style
+    /// @return The rectangles that cover the text that would be selected.
+    virtual TextSelection selectTextLines(const XojPdfRectangle& rect, XojPdfPageSelectionStyle style) = 0;
+
+    /**
+     * @return A list of Links in the current page.
+     */
+    virtual auto getLinks() -> std::vector<Link> = 0;
+
+    virtual int getPageId() const = 0;
+
+    virtual std::string getPageLabel() const = 0;
+
+private:
+};
+
+typedef std::shared_ptr<XojPdfPage> XojPdfPageSPtr;
diff --git a/entry/src/main/cpp/src/core/pdf/popplerapi/PopplerGlibAction.cpp b/entry/src/main/cpp/src/core/pdf/popplerapi/PopplerGlibAction.cpp
new file mode 100644
index 0000000..75881d3
--- /dev/null
+++ b/entry/src/main/cpp/src/core/pdf/popplerapi/PopplerGlibAction.cpp
@@ -0,0 +1,100 @@
+#include "PopplerGlibAction.h"
+
+#include <algorithm>  // for min
+#include <cstddef>    // for size_t
+
+#include <glib.h>              // for g_warning, gchar
+#include <poppler-action.h>    // for poppler_dest_free, PopplerActi...
+#include <poppler-document.h>  // for poppler_document_find_dest
+#include <poppler-page.h>      // for poppler_page_get_size
+
+#include "model/LinkDestination.h"     // for LinkDestination
+#include "util/Util.h"                 // for npos
+#include "util/raii/CLibrariesSPtr.h"  // for ref
+
+using std::string;
+
+PopplerGlibAction::PopplerGlibAction(PopplerAction* action, PopplerDocument* document):
+        document(document, xoj::util::ref) {
+    if (gchar* title_cstr = reinterpret_cast<PopplerActionAny*>(action)->title) {
+        title = std::string{title_cstr};
+    }
+
+    destination = getDestination(action);
+}
+
+PopplerGlibAction::~PopplerGlibAction() = default;
+
+auto PopplerGlibAction::getDestination(PopplerAction* action) -> std::shared_ptr<const LinkDestination> {
+    auto dest = std::make_shared<LinkDestination>();
+    dest->setName(getTitle());
+
+    if (action->type == POPPLER_ACTION_URI && action->uri.uri) {
+        dest->setURI(std::string{action->uri.uri});
+    } else if (action->type == POPPLER_ACTION_GOTO_DEST) {
+        auto* actionDest = reinterpret_cast<PopplerActionGotoDest*>(action);
+        PopplerDest* pDest = actionDest->dest;
+
+        if (pDest == nullptr) {
+            return dest;
+        }
+
+        linkFromDest(*dest, pDest);
+    } else {
+        // Every other action is currently unsupported.
+    }
+
+    return dest;
+}
+
+auto PopplerGlibAction::getDestination() -> std::shared_ptr<const LinkDestination> { return destination; }
+
+void PopplerGlibAction::linkFromDest(LinkDestination& link, PopplerDest* pDest) {
+    switch (pDest->type) {
+        case POPPLER_DEST_UNKNOWN:
+            g_warning("PDF Contains unknown link destination");
+            break;
+        case POPPLER_DEST_XYZ: {
+            PopplerPage* page = poppler_document_get_page(document.get(), pDest->page_num - 1);
+            if (page == nullptr) {
+                return;
+            }
+
+            double pageWidth = 0;
+            double pageHeight = 0;
+            poppler_page_get_size(page, &pageWidth, &pageHeight);
+
+            if (pDest->left != 0) {
+                link.setChangeLeft(pDest->left);
+            } else if (pDest->right != 0) {
+                link.setChangeLeft(pageWidth - pDest->right);
+            }
+
+            if (pDest->top != 0) {
+                link.setChangeTop(pageHeight - std::min(pageHeight, pDest->top));
+            } else if (pDest->bottom != 0) {
+                link.setChangeTop(pageHeight - std::min(pageHeight, pageHeight - pDest->bottom));
+            }
+
+            if (pDest->zoom != 0) {
+                link.setChangeZoom(pDest->zoom);
+            }
+            g_object_unref(page);
+        } break;
+        case POPPLER_DEST_NAMED: {
+            PopplerDest* pDest2 = poppler_document_find_dest(document.get(), pDest->named_dest);
+            if (pDest2 != nullptr) {
+                linkFromDest(link, pDest2);
+                poppler_dest_free(pDest2);
+                return;
+            }
+        } break;
+
+        default:
+            break;
+    }
+
+    link.setPdfPage(pDest->page_num > 0 ? static_cast<size_t>(pDest->page_num - 1) : npos);
+}
+
+auto PopplerGlibAction::getTitle() -> std::string { return title; }
diff --git a/entry/src/main/cpp/src/core/pdf/popplerapi/PopplerGlibAction.h b/entry/src/main/cpp/src/core/pdf/popplerapi/PopplerGlibAction.h
new file mode 100644
index 0000000..d50a8bb
--- /dev/null
+++ b/entry/src/main/cpp/src/core/pdf/popplerapi/PopplerGlibAction.h
@@ -0,0 +1,42 @@
+/*
+ * Xournal++
+ *
+ * PDF Action Abstraction Interface
+ *
+ * @author Xournal++ Team
+ * https://github.com/xournalpp/xournalpp
+ *
+ * @license GNU GPLv2 or later
+ */
+
+#pragma once
+
+#include <memory>  // for shared_ptr
+#include <string>  // for string
+
+#include <poppler.h>  // for PopplerAction, PopplerDocument
+
+#include "pdf/base/XojPdfAction.h"  // for XojPdfAction
+#include "util/raii/GObjectSPtr.h"  // for GObjectSPtr
+
+class LinkDestination;
+
+
+class PopplerGlibAction: public XojPdfAction {
+public:
+    PopplerGlibAction(PopplerAction* action, PopplerDocument* document);
+    ~PopplerGlibAction() override;
+
+public:
+    virtual std::shared_ptr<const LinkDestination> getDestination() override;
+    virtual std::string getTitle() override;
+
+private:
+    virtual std::shared_ptr<const LinkDestination> getDestination(PopplerAction* action);
+    void linkFromDest(LinkDestination& link, PopplerDest* pDest);
+
+private:
+    xoj::util::raii::GObjectSPtr<PopplerDocument> document;
+    std::shared_ptr<const LinkDestination> destination;
+    std::string title;
+};
diff --git a/entry/src/main/cpp/src/core/pdf/popplerapi/PopplerGlibDocument.cpp b/entry/src/main/cpp/src/core/pdf/popplerapi/PopplerGlibDocument.cpp
new file mode 100644
index 0000000..8ae5ee0
--- /dev/null
+++ b/entry/src/main/cpp/src/core/pdf/popplerapi/PopplerGlibDocument.cpp
@@ -0,0 +1,136 @@
+#include "PopplerGlibDocument.h"
+
+#include <memory>    // for make_shared, unique_ptr
+#include <optional>  // for optional
+
+#include <poppler-document.h>  // for poppler_document_get_n_...
+
+#include "util/PathUtil.h"  // for toUri
+
+#include "PopplerGlibPage.h"                  // for PopplerGlibPage
+#include "PopplerGlibPageBookmarkIterator.h"  // for PopplerGlibPageBookmark...
+#include "filesystem.h"                       // for path
+
+class XojPdfBookmarkIterator;
+
+using std::string;
+
+PopplerGlibDocument::PopplerGlibDocument(): mutex(std::make_shared<std::mutex>()) {}
+
+PopplerGlibDocument::PopplerGlibDocument(const PopplerGlibDocument& doc): document(doc.document), mutex(doc.mutex) {
+    if (document) {
+        g_object_ref(document);
+    }
+}
+
+PopplerGlibDocument::~PopplerGlibDocument() {
+    if (document) {
+        g_object_unref(document);
+        document = nullptr;
+    }
+}
+
+void PopplerGlibDocument::assign(XojPdfDocumentInterface* doc) {
+    if (document) {
+        g_object_unref(document);
+    }
+
+    auto* popplerdoc = dynamic_cast<PopplerGlibDocument*>(doc);
+    document = popplerdoc->document;
+    if (document) {
+        g_object_ref(document);
+    }
+
+    mutex = popplerdoc->mutex;
+}
+
+auto PopplerGlibDocument::equals(XojPdfDocumentInterface* doc) const -> bool {
+    return document == (dynamic_cast<PopplerGlibDocument*>(doc))->document;
+}
+
+auto PopplerGlibDocument::save(fs::path const& file, GError** error) const -> bool {
+    if (document == nullptr) {
+        return false;
+    }
+
+    auto uri = Util::toUri(file);
+    if (!uri) {
+        return false;
+    }
+    return poppler_document_save(document, uri->c_str(), error);
+}
+
+auto PopplerGlibDocument::load(fs::path const& file, string password, GError** error) -> bool {
+    auto uri = Util::toUri(file);
+    if (!uri) {
+        return false;
+    }
+
+    if (document) {
+        g_object_unref(document);
+    }
+
+    this->document = poppler_document_new_from_file(uri->c_str(), password.c_str(), error);
+
+    return this->document != nullptr;
+}
+
+auto PopplerGlibDocument::load(std::unique_ptr<std::string> data, string password, GError** error) -> bool {
+    if (document) {
+        g_object_unref(document);
+    }
+
+    GBytes* bytes = g_bytes_new_with_free_func(
+            data->data(), data->size(), [](gpointer d) { delete reinterpret_cast<std::string*>(d); }, data.get());
+    data.release();  // the string will be deleted with the bytes object
+    this->document = poppler_document_new_from_bytes(bytes, password.c_str(), error);
+    g_bytes_unref(bytes);  // a reference is now held by the document
+
+    return this->document != nullptr;
+}
+
+auto PopplerGlibDocument::isLoaded() const -> bool { return this->document != nullptr; }
+
+void PopplerGlibDocument::reset() {
+    if (document) {
+        g_object_unref(document);
+        document = nullptr;
+    }
+}
+
+auto PopplerGlibDocument::getPage(size_t page) const -> XojPdfPageSPtr {
+    if (document == nullptr) {
+        return nullptr;
+    }
+
+    PopplerPage* pg = poppler_document_get_page(document, int(page));
+    if (pg == nullptr) {
+        return nullptr;
+    }
+    XojPdfPageSPtr pageptr = std::make_shared<PopplerGlibPage>(pg, document, mutex);
+    g_object_unref(pg);
+
+    return pageptr;
+}
+
+auto PopplerGlibDocument::getPageCount() const -> size_t {
+    if (document == nullptr) {
+        return 0;
+    }
+
+    return size_t(poppler_document_get_n_pages(document));
+}
+
+auto PopplerGlibDocument::getContentsIter() const -> XojPdfBookmarkIterator* {
+    if (document == nullptr) {
+        return nullptr;
+    }
+
+    PopplerIndexIter* iter = poppler_index_iter_new(document);
+
+    if (iter == nullptr) {
+        return nullptr;
+    }
+
+    return new PopplerGlibPageBookmarkIterator(iter, document);
+}
diff --git a/entry/src/main/cpp/src/core/pdf/popplerapi/PopplerGlibDocument.h b/entry/src/main/cpp/src/core/pdf/popplerapi/PopplerGlibDocument.h
new file mode 100644
index 0000000..3ff5d8b
--- /dev/null
+++ b/entry/src/main/cpp/src/core/pdf/popplerapi/PopplerGlibDocument.h
@@ -0,0 +1,53 @@
+/*
+ * Xournal++
+ *
+ * Poppler GLib Implementation
+ *
+ * @author Xournal++ Team
+ * https://github.com/xournalpp/xournalpp
+ *
+ * @license GNU GPLv2 or later
+ */
+
+#pragma once
+
+#include <cstddef>  // for size_t
+#include <memory>
+#include <mutex>
+#include <string>  // for string
+
+#include <glib.h>     // for GError, gpointer, gsize
+#include <poppler.h>  // for PopplerDocument
+
+#include "pdf/base/XojPdfDocumentInterface.h"  // for XojPdfDocumentInterface
+#include "pdf/base/XojPdfPage.h"               // for XojPdfPageSPtr
+
+#include "filesystem.h"  // for path
+
+class XojPdfBookmarkIterator;
+
+class PopplerGlibDocument: public XojPdfDocumentInterface {
+public:
+    PopplerGlibDocument();
+    PopplerGlibDocument(const PopplerGlibDocument& doc);
+    ~PopplerGlibDocument() override;
+
+public:
+    void assign(XojPdfDocumentInterface* doc) override;
+    bool equals(XojPdfDocumentInterface* doc) const override;
+
+public:
+    bool save(fs::path const& filepath, GError** error) const override;
+    bool load(fs::path const& filepath, std::string password, GError** error) override;
+    bool load(std::unique_ptr<std::string> data, std::string password, GError** error) override;
+    bool isLoaded() const override;
+    void reset() override;
+
+    XojPdfPageSPtr getPage(size_t page) const override;
+    size_t getPageCount() const override;
+    XojPdfBookmarkIterator* getContentsIter() const override;
+
+private:
+    PopplerDocument* document = nullptr;
+    std::shared_ptr<std::mutex> mutex;
+};
diff --git a/entry/src/main/cpp/src/core/pdf/popplerapi/PopplerGlibPage.cpp b/entry/src/main/cpp/src/core/pdf/popplerapi/PopplerGlibPage.cpp
new file mode 100644
index 0000000..e4854cc
--- /dev/null
+++ b/entry/src/main/cpp/src/core/pdf/popplerapi/PopplerGlibPage.cpp
@@ -0,0 +1,331 @@
+#include "PopplerGlibPage.h"
+
+#include <algorithm>  // for max, min
+#include <cstdlib>    // for abs, NULL, ptrdiff_t
+#include <memory>     // for make_unique
+#include <sstream>    // for operator<<, ostringstream, bas...
+
+#include <glib.h>          // for g_free, g_utf8_offset_to_pointer
+#include <poppler-page.h>  // for _PopplerRectangle, _PopplerLin...
+#include <poppler.h>       // for PopplerRectangle, g_object_ref
+
+#include "pdf/base/XojPdfAction.h"     // for XojPdfAction
+#include "pdf/base/XojPdfPage.h"       // for XojPdfRectangle, XojPdfPage::Link
+#include "util/Assert.h"               // for xoj_assert
+#include "util/GListView.h"            // for GListView, GListView<>::GListV...
+#include "util/raii/CLibrariesSPtr.h"  // for adopt
+#include "util/raii/CairoWrappers.h"   // for CairoRegionSPtr
+
+#include "PopplerGlibAction.h"  // for PopplerGlibAction
+#include "cairo.h"              // for cairo_region_create, cairo_reg...
+
+PopplerGlibPage::PopplerGlibPage(PopplerPage* page, PopplerDocument* parentDoc, std::shared_ptr<std::mutex> mutex):
+        page(page), document(parentDoc), mutex(mutex) {
+    if (page != nullptr) {
+        g_object_ref(page);
+    }
+}
+
+PopplerGlibPage::PopplerGlibPage(const PopplerGlibPage& other):
+        page(other.page), document(other.document), mutex(other.mutex) {
+    if (page != nullptr) {
+        g_object_ref(page);
+    }
+}
+
+PopplerGlibPage::~PopplerGlibPage() {
+    if (page) {
+        g_object_unref(page);
+        page = nullptr;
+    }
+}
+
+PopplerGlibPage& PopplerGlibPage::operator=(const PopplerGlibPage& other) {
+    if (&other == this) {
+        return *this;
+    }
+    if (page) {
+        g_object_unref(page);
+        page = nullptr;
+    }
+
+    page = other.page;
+    if (page != nullptr) {
+        g_object_ref(page);
+    }
+
+    document = other.document;
+    mutex = other.mutex;
+
+    return *this;
+}
+
+auto PopplerGlibPage::getWidth() const -> double {
+    double width = 0;
+    poppler_page_get_size(const_cast<PopplerPage*>(page), &width, nullptr);
+
+    return width;
+}
+
+auto PopplerGlibPage::getHeight() const -> double {
+    double height = 0;
+    poppler_page_get_size(const_cast<PopplerPage*>(page), nullptr, &height);
+
+    return height;
+}
+
+void PopplerGlibPage::render(cairo_t* cr) const {
+    std::lock_guard guard(*mutex);
+    cairo_save(cr);
+    cairo_set_source_rgb(cr, 1., 1., 1.);
+    cairo_paint(cr);
+    poppler_page_render(page, cr);
+    cairo_restore(cr);
+}
+
+void PopplerGlibPage::renderForPrinting(cairo_t* cr) const {
+    std::lock_guard guard(*mutex);
+    poppler_page_render_for_printing(page, cr);
+}
+
+auto PopplerGlibPage::getPageId() const -> int { return poppler_page_get_index(page); }
+
+auto PopplerGlibPage::getPageLabel() const -> std::string {
+    gchar* label{poppler_page_get_label(page)};
+    std::string cpp_label{label};
+    g_free(label);
+    return cpp_label;
+}
+
+auto PopplerGlibPage::findText(const std::string& text) -> std::vector<XojPdfRectangle> {
+    std::vector<XojPdfRectangle> findings;
+
+    double height = getHeight();
+    GList* matches = poppler_page_find_text(page, text.c_str());
+    for (auto& rect: GListView<PopplerRectangle>(matches)) {
+        findings.emplace_back(rect.x1, height - rect.y2, rect.x2, height - rect.y1);
+        poppler_rectangle_free(&rect);
+    }
+    g_list_free(matches);
+
+    return findings;
+}
+
+auto getPopplerSelectionStyle(XojPdfPageSelectionStyle style) -> PopplerSelectionStyle {
+    switch (style) {
+        case XojPdfPageSelectionStyle::Word:
+            return POPPLER_SELECTION_WORD;
+        case XojPdfPageSelectionStyle::Line:
+            return POPPLER_SELECTION_LINE;
+        case XojPdfPageSelectionStyle::Linear:
+        case XojPdfPageSelectionStyle::Area:
+            return POPPLER_SELECTION_GLYPH;
+        default:
+            xoj_assert_message(false, "unimplemented");
+    }
+    return POPPLER_SELECTION_GLYPH;
+}
+
+auto PopplerGlibPage::selectText(const XojPdfRectangle& rect, XojPdfPageSelectionStyle style) -> std::string {
+    PopplerRectangle pRect = {rect.x1, rect.y1, rect.x2, rect.y2};
+    const auto pStyle = getPopplerSelectionStyle(style);
+    if (style == XojPdfPageSelectionStyle::Area) {
+        PopplerRectangle* rectArray = nullptr;
+        guint numRects = 0;
+        if (!poppler_page_get_text_layout_for_area(this->page, &pRect, &rectArray, &numRects)) {
+            return "";
+        }
+        char* textBytes = poppler_page_get_text_for_area(page, &pRect);
+        xoj_assert(textBytes);
+
+        double y = rectArray[0].y2;
+        std::ostringstream ss;
+        for (guint i = 0; i < numRects; i++) {
+            // do not copy characters whose bounding box has a non-empty intersection with rect
+            const auto& r = rectArray[i];
+            {
+                auto x1 = std::max(rect.x1, r.x1);
+                auto y1 = std::max(rect.y1, r.y1);
+                auto x2 = std::min(rect.x2, r.x2);
+                auto y2 = std::min(rect.y2, r.y2);
+
+                bool inBounds = x2 > x1 && y2 > y1;
+                if (!inBounds)
+                    continue;
+            }
+
+            const auto eps = 1e-5;
+            if (std::abs(y - r.y2) > eps) {
+                // new line
+                ss << '\n';
+                y = rectArray[i].y2;
+            }
+
+            char* const startPos = g_utf8_offset_to_pointer(textBytes, i);
+            char* const endPos = g_utf8_offset_to_pointer(textBytes, i + 1);
+            for (long j = 0; j < static_cast<ptrdiff_t>(endPos - startPos); ++j) { ss << startPos[j]; }
+        }
+        g_free(textBytes);
+        return ss.str();
+    } else {
+        char* text = poppler_page_get_selected_text(page, pStyle, &pRect);
+        if (text) {
+            std::string ret(text);
+            g_free(text);
+            return ret;
+        } else {
+            return "";
+        }
+    }
+}
+
+auto PopplerGlibPage::selectTextRegion(const XojPdfRectangle& rect, XojPdfPageSelectionStyle style) -> cairo_region_t* {
+    PopplerRectangle pRect = {rect.x1, rect.y1, rect.x2, rect.y2};
+    const auto pStyle = getPopplerSelectionStyle(style);
+    // The computed region is technically wrong for
+    // XojPdfPageSelectionStyle::Area, but there is no selection preview with
+    // area select.
+    cairo_region_t* region = poppler_page_get_selected_region(page, 1.0, pStyle, &pRect);
+    return region;
+}
+
+namespace {
+cairo_rectangle_int_t cairoRectFromDouble(double x1, double y1, double width, double height) {
+    return {static_cast<int>(x1), static_cast<int>(y1), static_cast<int>(width), static_cast<int>(height)};
+}
+}  // namespace
+
+auto PopplerGlibPage::selectTextLines(const XojPdfRectangle& selectRect, XojPdfPageSelectionStyle style)
+        -> TextSelection {
+    std::vector<XojPdfRectangle> textRects;
+
+    // The selection rectangle may be "improper" by having x2 <= x1 or y1 <= y2 (e.g., if user
+    // selects from right to left or from bottom to top). This is incompatible with cairo, so
+    // construct a proper rectangle satisfying x1 <= x2 and y1 <= y2.
+    PopplerRectangle rect{std::min(selectRect.x1, selectRect.x2), std::min(selectRect.y1, selectRect.y2),
+                          std::max(selectRect.x1, selectRect.x2), std::max(selectRect.y1, selectRect.y2)};
+
+    PopplerRectangle* rectArray = nullptr;
+    guint numRects = 0;
+    if (style == XojPdfPageSelectionStyle::Area) {
+        // We always want to select in the "proper" rectangle.
+        PopplerRectangle area{rect.x1, rect.y1, rect.x2, rect.y2};
+        if (!poppler_page_get_text_layout_for_area(this->page, &area, &rectArray, &numRects)) {
+            return {xoj::util::CairoRegionSPtr(cairo_region_create(), xoj::util::adopt), textRects};
+        }
+    } else {
+        if (!poppler_page_get_text_layout(this->page, &rectArray, &numRects)) {
+            return {xoj::util::CairoRegionSPtr(cairo_region_create(), xoj::util::adopt), textRects};
+        }
+    }
+
+    // construct the region later for area selection, but use poppler's region
+    // for other selection styles
+    cairo_region_t* region = nullptr;
+    if (style != XojPdfPageSelectionStyle::Area) {
+        // do not use the "proper" rectangle here as it may be different from the actual selection.
+        region = selectTextRegion(selectRect, style);
+    }
+
+    const auto isSameLine = [&](const auto& r1, const auto& r2) {
+        const auto eps = 1e-5;
+        return std::abs(r1.y1 - r2.y1) < eps && std::abs(r1.y2 - r2.y2) < eps;
+    };
+
+    PopplerRectangle prevRect = rectArray[0];
+    if (style == XojPdfPageSelectionStyle::Area) {
+        // helper to add only those rectangles that have nonempty intersection with the selected area
+        const auto addTextRectsInArea = [&](const PopplerRectangle& r) {
+            auto x1 = std::max(rect.x1, r.x1);
+            auto y1 = std::max(rect.y1, r.y1);
+            auto x2 = std::min(rect.x2, r.x2);
+            auto y2 = std::min(rect.y2, r.y2);
+
+            bool inBounds = x2 > x1 && y2 > y1;
+            if (inBounds) {
+                textRects.emplace_back(r.x1, r.y1, r.x2, r.y2);
+            }
+        };
+
+        // construct the text rectangles
+        for (guint i = 1; i < numRects; i++) {
+            PopplerRectangle nextRect = rectArray[i];
+            if (isSameLine(prevRect, nextRect)) {
+                // Merge if both prev & next rectangles are in bounds. Note that
+                // only x is checked since rectArray was constructed for the
+                // selected area.
+                bool shouldMerge = (rect.x1 <= prevRect.x1 && prevRect.x2 <= rect.x2 && rect.x1 <= nextRect.x1 &&
+                                    nextRect.x2 <= rect.x2);
+                if (shouldMerge) {
+                    prevRect.x1 = std::min(prevRect.x1, nextRect.x2);
+                    prevRect.x2 = std::max(prevRect.x2, nextRect.x2);
+                    continue;
+                }
+            }
+
+            addTextRectsInArea(prevRect);
+            prevRect = nextRect;
+        }
+        addTextRectsInArea(prevRect);
+
+        region = cairo_region_create();
+        for (const XojPdfRectangle& r: textRects) {
+            const auto x1 = std::min(r.x1, r.x2);
+            const auto x2 = std::max(r.x1, r.x2);
+            const auto y1 = std::min(r.y1, r.y2);
+            const auto y2 = std::max(r.y1, r.y2);
+            cairo_rectangle_int_t crect = cairoRectFromDouble(x1, y1, x2 - x1, y2 - y1);
+            cairo_region_union_rectangle(region, &crect);
+        }
+    } else {
+        // this is for all other styles (e.g., linear)
+
+        // helper to add only those rectangles that are contained in the selection region
+        const auto addTextRectsInRegion = [&](const PopplerRectangle& r) {
+            auto crect = cairoRectFromDouble(r.x1, r.y1, r.x2 - r.x1, r.y2 - r.y1);
+            if (cairo_region_contains_rectangle(region, &crect) == CAIRO_REGION_OVERLAP_IN) {
+                textRects.emplace_back(r.x1, r.y1, r.x2, r.y2);
+            }
+        };
+
+        // construct the text rectangles
+        for (guint i = 1; i < numRects; i++) {
+            PopplerRectangle nextRect = rectArray[i];
+            if (isSameLine(prevRect, nextRect)) {
+                // merge the rectangles if they, when combined, are contained in the selection region
+                auto x1 = std::min(prevRect.x1, nextRect.x2);
+                auto x2 = std::max(prevRect.x2, nextRect.x2);
+                auto crect = cairoRectFromDouble(x1, prevRect.y1, x2 - x1, prevRect.y2 - prevRect.y1);
+                if (cairo_region_contains_rectangle(region, &crect) == CAIRO_REGION_OVERLAP_IN) {
+                    prevRect.x1 = x1;
+                    prevRect.x2 = x2;
+                    continue;
+                }
+            }
+            addTextRectsInRegion(prevRect);
+            prevRect = nextRect;
+        }
+        addTextRectsInRegion(prevRect);
+    }
+
+    xoj_assert(region);
+    return {xoj::util::CairoRegionSPtr(region, xoj::util::adopt), textRects};
+}
+
+auto PopplerGlibPage::getLinks() -> std::vector<Link> {
+    std::vector<Link> results;
+    const double height = getHeight();
+
+    GList* links = poppler_page_get_link_mapping(this->page);
+    for (GList* l = links; l != NULL; l = g_list_next(l)) {
+        const auto& link = *static_cast<PopplerLinkMapping*>(l->data);
+
+        if (link.action) {
+            XojPdfRectangle rect{link.area.x1, height - link.area.y2, link.area.x2, height - link.area.y1};
+            results.emplace_back(Link{rect, std::make_unique<PopplerGlibAction>(link.action, document)});
+        }
+    }
+    poppler_page_free_link_mapping(links);
+
+    return results;
+}
diff --git a/entry/src/main/cpp/src/core/pdf/popplerapi/PopplerGlibPage.h b/entry/src/main/cpp/src/core/pdf/popplerapi/PopplerGlibPage.h
new file mode 100644
index 0000000..ff9af7a
--- /dev/null
+++ b/entry/src/main/cpp/src/core/pdf/popplerapi/PopplerGlibPage.h
@@ -0,0 +1,57 @@
+/*
+ * Xournal++
+ *
+ * PDF Page GLib Implementation
+ *
+ * @author Xournal++ Team
+ * https://github.com/xournalpp/xournalpp
+ *
+ * @license GNU GPLv2 or later
+ */
+
+#pragma once
+
+#include <memory>
+#include <mutex>
+#include <string>  // for string
+#include <vector>  // for vector
+
+#include <cairo.h>    // for cairo_t, cairo_region_t
+#include <poppler.h>  // for PopplerPage
+
+#include "pdf/base/XojPdfPage.h"  // for XojPdfRectangle (ptr only), XojPdfP...
+
+
+class PopplerGlibPage: public XojPdfPage {
+public:
+    PopplerGlibPage(PopplerPage* page, PopplerDocument* doc, std::shared_ptr<std::mutex> mutex);
+    PopplerGlibPage(const PopplerGlibPage& other);
+    virtual ~PopplerGlibPage();
+    PopplerGlibPage& operator=(const PopplerGlibPage& other);
+
+public:
+    double getWidth() const override;
+    double getHeight() const override;
+
+    void render(cairo_t* cr) const override;
+    void renderForPrinting(cairo_t* cr) const override;
+
+    std::vector<XojPdfRectangle> findText(const std::string& text) override;
+
+    std::string selectText(const XojPdfRectangle& rect, XojPdfPageSelectionStyle style) override;
+
+    cairo_region_t* selectTextRegion(const XojPdfRectangle& rect, XojPdfPageSelectionStyle style) override;
+
+    TextSelection selectTextLines(const XojPdfRectangle& rect, XojPdfPageSelectionStyle style) override;
+
+    auto getLinks() -> std::vector<Link> override;
+
+    int getPageId() const override;
+
+    std::string getPageLabel() const override;
+
+private:
+    PopplerPage* page;
+    PopplerDocument* document;
+    std::shared_ptr<std::mutex> mutex;  ///< Poppler doesn't support parallel renderings. Lock this mutex when rendering
+};
diff --git a/entry/src/main/cpp/src/core/pdf/popplerapi/PopplerGlibPageBookmarkIterator.cpp b/entry/src/main/cpp/src/core/pdf/popplerapi/PopplerGlibPageBookmarkIterator.cpp
new file mode 100644
index 0000000..dc25747
--- /dev/null
+++ b/entry/src/main/cpp/src/core/pdf/popplerapi/PopplerGlibPageBookmarkIterator.cpp
@@ -0,0 +1,49 @@
+#include "PopplerGlibPageBookmarkIterator.h"
+
+#include <poppler-action.h>    // for poppler_action_free
+#include <poppler-document.h>  // for poppler_index_iter_free
+
+#include "pdf/popplerapi/PopplerGlibAction.h"  // for PopplerGlibAction
+
+class XojPdfAction;
+
+PopplerGlibPageBookmarkIterator::PopplerGlibPageBookmarkIterator(PopplerIndexIter* iter, PopplerDocument* document):
+        iter(iter), document(document) {
+    g_object_ref(document);
+}
+
+PopplerGlibPageBookmarkIterator::~PopplerGlibPageBookmarkIterator() {
+    poppler_index_iter_free(iter);
+    iter = nullptr;
+
+    if (document) {
+        g_object_unref(document);
+        document = nullptr;
+    }
+}
+
+auto PopplerGlibPageBookmarkIterator::next() -> bool { return poppler_index_iter_next(iter); }
+
+auto PopplerGlibPageBookmarkIterator::isOpen() -> bool { return poppler_index_iter_is_open(iter); }
+
+auto PopplerGlibPageBookmarkIterator::getChildIter() -> XojPdfBookmarkIterator* {
+    PopplerIndexIter* child = poppler_index_iter_get_child(iter);
+    if (child == nullptr) {
+        return nullptr;
+    }
+
+    return new PopplerGlibPageBookmarkIterator(child, document);
+}
+
+auto PopplerGlibPageBookmarkIterator::getAction() -> XojPdfAction* {
+    PopplerAction* action = poppler_index_iter_get_action(iter);
+
+    if (action == nullptr) {
+        return nullptr;
+    }
+
+    XojPdfAction* result = new PopplerGlibAction(action, document);
+    poppler_action_free(action);  // XojPdfAction does not own action.
+
+    return result;
+}
diff --git a/entry/src/main/cpp/src/core/pdf/popplerapi/PopplerGlibPageBookmarkIterator.h b/entry/src/main/cpp/src/core/pdf/popplerapi/PopplerGlibPageBookmarkIterator.h
new file mode 100644
index 0000000..7c785f6
--- /dev/null
+++ b/entry/src/main/cpp/src/core/pdf/popplerapi/PopplerGlibPageBookmarkIterator.h
@@ -0,0 +1,35 @@
+/*
+ * Xournal++
+ *
+ * PDF Bookmark iterator interface
+ *
+ * @author Xournal++ Team
+ * https://github.com/xournalpp/xournalpp
+ *
+ * @license GNU GPLv2 or later
+ */
+
+#pragma once
+
+#include <poppler.h>  // for PopplerDocument, Popple...
+
+#include "pdf/base/XojPdfBookmarkIterator.h"  // for XojPdfBookmarkIterator
+
+class XojPdfAction;
+
+
+class PopplerGlibPageBookmarkIterator: public XojPdfBookmarkIterator {
+public:
+    PopplerGlibPageBookmarkIterator(PopplerIndexIter* iter, PopplerDocument* document);
+    ~PopplerGlibPageBookmarkIterator() override;
+
+public:
+    bool next() override;
+    bool isOpen() override;
+    XojPdfBookmarkIterator* getChildIter() override;
+    XojPdfAction* getAction() override;
+
+private:
+    PopplerIndexIter* iter;
+    PopplerDocument* document;
+};
diff --git a/entry/src/main/cpp/src/core/plugin/ActionBackwardCompatibilityLayer.cpp b/entry/src/main/cpp/src/core/plugin/ActionBackwardCompatibilityLayer.cpp
new file mode 100644
index 0000000..145763a
--- /dev/null
+++ b/entry/src/main/cpp/src/core/plugin/ActionBackwardCompatibilityLayer.cpp
@@ -0,0 +1,208 @@
+#include "ActionBackwardCompatibilityLayer.h"
+
+#ifdef ENABLE_PLUGINS
+
+#include <map>
+#include <string_view>
+
+#include "control/Control.h"
+#include "control/ToolEnums.h"
+#include "control/actions/ActionDatabase.h"
+#include "control/settings/Settings.h"
+#include "control/tools/EditSelection.h"
+
+using namespace std::literals::string_view_literals;
+
+static const std::map<std::string_view, Action> STATELESS_ACTION_MAP = {
+        {"ACTION_NEW"sv, Action::NEW_FILE},
+        {"ACTION_OPEN"sv, Action::OPEN},
+        {"ACTION_ANNOTATE_PDF"sv, Action::ANNOTATE_PDF},
+        {"ACTION_SAVE"sv, Action::SAVE},
+        {"ACTION_SAVE_AS"sv, Action::SAVE_AS},
+        {"ACTION_EXPORT_AS_PDF"sv, Action::EXPORT_AS_PDF},
+        {"ACTION_EXPORT_AS"sv, Action::EXPORT_AS},
+        {"ACTION_PRINT"sv, Action::PRINT},
+        {"ACTION_QUIT"sv, Action::QUIT},
+        {"ACTION_UNDO"sv, Action::UNDO},
+        {"ACTION_REDO"sv, Action::REDO},
+        {"ACTION_CUT"sv, Action::CUT},
+        {"ACTION_COPY"sv, Action::COPY},
+        {"ACTION_PASTE"sv, Action::PASTE},
+        {"ACTION_SEARCH"sv, Action::SEARCH},
+        {"ACTION_SELECT_ALL"sv, Action::SELECT_ALL},
+        {"ACTION_DELETE"sv, Action::DELETE},
+        {"ACTION_SETTINGS"sv, Action::PREFERENCES},
+        {"ACTION_GOTO_FIRST"sv, Action::GOTO_FIRST},
+        {"ACTION_GOTO_BACK"sv, Action::GOTO_PREVIOUS},
+        {"ACTION_GOTO_PAGE"sv, Action::GOTO_PAGE},
+        {"ACTION_GOTO_NEXT"sv, Action::GOTO_NEXT},
+        {"ACTION_GOTO_LAST"sv, Action::GOTO_LAST},
+        {"ACTION_GOTO_NEXT_ANNOTATED_PAGE"sv, Action::GOTO_NEXT_ANNOTATED_PAGE},
+        {"ACTION_GOTO_PREVIOUS_ANNOTATED_PAGE"sv, Action::GOTO_PREVIOUS_ANNOTATED_PAGE},
+        {"ACTION_NEW_PAGE_BEFORE"sv, Action::NEW_PAGE_BEFORE},
+        {"ACTION_DUPLICATE_PAGE"sv, Action::DUPLICATE_PAGE},
+        {"ACTION_NEW_PAGE_AFTER"sv, Action::NEW_PAGE_AFTER},
+        {"ACTION_APPEND_NEW_PDF_PAGES"sv, Action::APPEND_NEW_PDF_PAGES},
+        {"ACTION_NEW_PAGE_AT_END"sv, Action::NEW_PAGE_AT_END},
+        {"ACTION_DELETE_PAGE"sv, Action::DELETE_PAGE},
+        {"ACTION_PAPER_FORMAT"sv, Action::PAPER_FORMAT},
+        {"ACTION_CONFIGURE_PAGE_TEMPLATE"sv, Action::CONFIGURE_PAGE_TEMPLATE},
+        {"ACTION_PAPER_BACKGROUND_COLOR"sv, Action::PAPER_BACKGROUND_COLOR},
+        {"ACTION_MOVE_SELECTION_LAYER_UP"sv, Action::MOVE_SELECTION_LAYER_UP},
+        {"ACTION_MOVE_SELECTION_LAYER_DOWN"sv, Action::MOVE_SELECTION_LAYER_DOWN},
+        {"ACTION_TOOL_PEN_FILL_OPACITY"sv, Action::TOOL_PEN_FILL_OPACITY},
+        {"ACTION_TOOL_DEFAULT"sv, Action::SELECT_DEFAULT_TOOL},
+        {"ACTION_TOOL_HIGHLIGHTER_FILL_OPACITY"sv, Action::TOOL_HIGHLIGHTER_FILL_OPACITY},
+        {"ACTION_ZOOM_IN"sv, Action::ZOOM_IN},
+        {"ACTION_ZOOM_OUT"sv, Action::ZOOM_OUT},
+        {"ACTION_ZOOM_100"sv, Action::ZOOM_100},
+        {"ACTION_TEX"sv, Action::TEX},
+        {"ACTION_MANAGE_TOOLBAR"sv, Action::MANAGE_TOOLBAR},
+        {"ACTION_CUSTOMIZE_TOOLBAR"sv, Action::CUSTOMIZE_TOOLBAR},
+        {"ACTION_AUDIO_SEEK_FORWARDS"sv, Action::AUDIO_SEEK_FORWARDS},
+        {"ACTION_AUDIO_SEEK_BACKWARDS"sv, Action::AUDIO_SEEK_BACKWARDS},
+        {"ACTION_AUDIO_STOP_PLAYBACK"sv, Action::AUDIO_STOP_PLAYBACK},
+        {"ACTION_PLUGIN_MANAGER"sv, Action::PLUGIN_MANAGER},
+        {"ACTION_HELP"sv, Action::HELP},
+        {"ACTION_ABOUT"sv, Action::ABOUT},
+        {"ACTION_NEW_LAYER"sv, Action::LAYER_NEW_ABOVE_CURRENT},
+        {"ACTION_NEW_LAYER_BELOW_CURRENT"sv, Action::LAYER_NEW_BELOW_CURRENT},
+        {"ACTION_DELETE_LAYER"sv, Action::LAYER_DELETE},
+        {"ACTION_MERGE_LAYER_DOWN"sv, Action::LAYER_MERGE_DOWN},
+        {"ACTION_GOTO_NEXT_LAYER"sv, Action::LAYER_GOTO_NEXT},
+        {"ACTION_GOTO_PREVIOUS_LAYER"sv, Action::LAYER_GOTO_PREVIOUS},
+        {"ACTION_GOTO_TOP_LAYER"sv, Action::LAYER_GOTO_TOP},
+        {"ACTION_RENAME_LAYER"sv, Action::LAYER_RENAME},
+        {"ACTION_SELECT_FONT"sv, Action::SELECT_FONT}};
+
+static const std::map<std::string_view, ToolType> SELECT_TOOL_MAP = {
+        {"ACTION_TOOL_PEN"sv, TOOL_PEN},
+        {"ACTION_TOOL_ERASER"sv, TOOL_ERASER},
+        {"ACTION_TOOL_HIGHLIGHTER"sv, TOOL_HIGHLIGHTER},
+        {"ACTION_TOOL_TEXT"sv, TOOL_TEXT},
+        {"ACTION_TOOL_IMAGE"sv, TOOL_IMAGE},
+        {"ACTION_TOOL_SELECT_RECT"sv, TOOL_SELECT_RECT},
+        {"ACTION_TOOL_SELECT_REGION"sv, TOOL_SELECT_REGION},
+        {"ACTION_TOOL_SELECT_MULTILAYER_RECT"sv, TOOL_SELECT_MULTILAYER_RECT},
+        {"ACTION_TOOL_SELECT_MULTILAYER_REGION"sv, TOOL_SELECT_MULTILAYER_REGION},
+        {"ACTION_TOOL_SELECT_OBJECT"sv, TOOL_SELECT_OBJECT},
+        {"ACTION_TOOL_PLAY_OBJECT"sv, TOOL_PLAY_OBJECT},
+        {"ACTION_TOOL_SELECT_PDF_TEXT_LINEAR"sv, TOOL_SELECT_PDF_TEXT_LINEAR},
+        {"ACTION_TOOL_SELECT_PDF_TEXT_RECT"sv, TOOL_SELECT_PDF_TEXT_RECT},
+        {"ACTION_TOOL_VERTICAL_SPACE"sv, TOOL_VERTICAL_SPACE},
+        {"ACTION_TOOL_HAND"sv, TOOL_HAND},
+        {"ACTION_TOOL_FLOATING_TOOLBOX"sv, TOOL_FLOATING_TOOLBOX},
+        {"ACTION_TOOL_LASER_POINTER_PEN"sv, TOOL_LASER_POINTER_PEN},
+        {"ACTION_TOOL_LASER_POINTER_HIGHLIGHTER"sv, TOOL_LASER_POINTER_HIGHLIGHTER}};
+
+static const std::map<std::string_view, std::pair<Action, ToolSize>> TOOL_SIZE_MAP = {
+        {"ACTION_SIZE_VERY_FINE"sv, {Action::TOOL_SIZE, TOOL_SIZE_VERY_FINE}},
+        {"ACTION_SIZE_FINE"sv, {Action::TOOL_SIZE, TOOL_SIZE_FINE}},
+        {"ACTION_SIZE_MEDIUM"sv, {Action::TOOL_SIZE, TOOL_SIZE_MEDIUM}},
+        {"ACTION_SIZE_THICK"sv, {Action::TOOL_SIZE, TOOL_SIZE_THICK}},
+        {"ACTION_SIZE_VERY_THICK"sv, {Action::TOOL_SIZE, TOOL_SIZE_VERY_THICK}},
+        {"ACTION_TOOL_ERASER_SIZE_VERY_FINE"sv, {Action::TOOL_ERASER_SIZE, TOOL_SIZE_VERY_FINE}},
+        {"ACTION_TOOL_ERASER_SIZE_FINE"sv, {Action::TOOL_ERASER_SIZE, TOOL_SIZE_FINE}},
+        {"ACTION_TOOL_ERASER_SIZE_MEDIUM"sv, {Action::TOOL_ERASER_SIZE, TOOL_SIZE_MEDIUM}},
+        {"ACTION_TOOL_ERASER_SIZE_THICK"sv, {Action::TOOL_ERASER_SIZE, TOOL_SIZE_THICK}},
+        {"ACTION_TOOL_ERASER_SIZE_VERY_THICK"sv, {Action::TOOL_ERASER_SIZE, TOOL_SIZE_VERY_THICK}},
+        {"ACTION_TOOL_PEN_SIZE_VERY_FINE"sv, {Action::TOOL_PEN_SIZE, TOOL_SIZE_VERY_FINE}},
+        {"ACTION_TOOL_PEN_SIZE_FINE"sv, {Action::TOOL_PEN_SIZE, TOOL_SIZE_FINE}},
+        {"ACTION_TOOL_PEN_SIZE_MEDIUM"sv, {Action::TOOL_PEN_SIZE, TOOL_SIZE_MEDIUM}},
+        {"ACTION_TOOL_PEN_SIZE_THICK"sv, {Action::TOOL_PEN_SIZE, TOOL_SIZE_THICK}},
+        {"ACTION_TOOL_PEN_SIZE_VERY_THICK"sv, {Action::TOOL_PEN_SIZE, TOOL_SIZE_VERY_THICK}},
+        {"ACTION_TOOL_HIGHLIGHTER_SIZE_VERY_FINE"sv, {Action::TOOL_HIGHLIGHTER_SIZE, TOOL_SIZE_VERY_FINE}},
+        {"ACTION_TOOL_HIGHLIGHTER_SIZE_FINE"sv, {Action::TOOL_HIGHLIGHTER_SIZE, TOOL_SIZE_FINE}},
+        {"ACTION_TOOL_HIGHLIGHTER_SIZE_MEDIUM"sv, {Action::TOOL_HIGHLIGHTER_SIZE, TOOL_SIZE_MEDIUM}},
+        {"ACTION_TOOL_HIGHLIGHTER_SIZE_THICK"sv, {Action::TOOL_HIGHLIGHTER_SIZE, TOOL_SIZE_THICK}},
+        {"ACTION_TOOL_HIGHLIGHTER_SIZE_VERY_THICK"sv, {Action::TOOL_HIGHLIGHTER_SIZE, TOOL_SIZE_VERY_THICK}}};
+
+static const std::map<std::string_view, Action> BOOLEAN_ACTION_MAP = {
+        {"ACTION_SETSQUARE"sv, Action::SETSQUARE},
+        {"ACTION_COMPASS"sv, Action::COMPASS},
+        {"ACTION_TOOL_DRAW_RECT"sv, Action::TOOL_DRAW_RECTANGLE},
+        {"ACTION_TOOL_DRAW_ELLIPSE"sv, Action::TOOL_DRAW_ELLIPSE},
+        {"ACTION_TOOL_DRAW_ARROW"sv, Action::TOOL_DRAW_ARROW},
+        {"ACTION_TOOL_DRAW_DOUBLE_ARROW"sv, Action::TOOL_DRAW_DOUBLE_ARROW},
+        {"ACTION_TOOL_DRAW_COORDINATE_SYSTEM"sv, Action::TOOL_DRAW_COORDINATE_SYSTEM},
+        {"ACTION_RULER"sv, Action::TOOL_DRAW_LINE},
+        {"ACTION_TOOL_DRAW_SPLINE"sv, Action::TOOL_DRAW_SPLINE},
+        {"ACTION_SHAPE_RECOGNIZER"sv, Action::TOOL_DRAW_SHAPE_RECOGNIZER},
+        {"ACTION_TOOL_FILL"sv, Action::TOOL_FILL},
+        {"ACTION_TOOL_PEN_FILL"sv, Action::TOOL_PEN_FILL},
+        {"ACTION_TOOL_HIGHLIGHTER_FILL"sv, Action::TOOL_HIGHLIGHTER_FILL},
+        {"ACTION_ZOOM_FIT"sv, Action::ZOOM_FIT},
+        {"ACTION_VIEW_PAIRED_PAGES"sv, Action::PAIRED_PAGES_MODE},
+        {"ACTION_VIEW_PRESENTATION_MODE"sv, Action::PRESENTATION_MODE},
+        {"ACTION_FULLSCREEN"sv, Action::FULLSCREEN},
+        {"ACTION_SHOW_SIDEBAR"sv, Action::SHOW_SIDEBAR},
+        {"ACTION_AUDIO_PAUSE_PLAYBACK"sv, Action::AUDIO_PAUSE_PLAYBACK},
+        {"ACTION_AUDIO_RECORD"sv, Action::AUDIO_RECORD},
+        {"ACTION_GRID_SNAPPING"sv, Action::GRID_SNAPPING},
+        {"ACTION_ROTATION_SNAPPING"sv, Action::ROTATION_SNAPPING},
+        {"ACTION_HIGHLIGHT_POSITION"sv, Action::POSITION_HIGHLIGHTING}};
+
+static const std::map<std::string_view, const char*> LINE_STYLE_MAP = {{"ACTION_TOOL_LINE_STYLE_PLAIN"sv, "plain"},
+                                                                       {"ACTION_TOOL_LINE_STYLE_DASH"sv, "dash"},
+                                                                       {"ACTION_TOOL_LINE_STYLE_DASH_DOT"sv, "dashdot"},
+                                                                       {"ACTION_TOOL_LINE_STYLE_DOT"sv, "dot"}};
+
+static const std::map<std::string_view, EraserType> ERASER_TYPE_MAP = {
+        {"ACTION_TOOL_ERASER_STANDARD"sv, ERASER_TYPE_DEFAULT},
+        {"ACTION_TOOL_ERASER_DELETE_STROKE"sv, ERASER_TYPE_DELETE_STROKE},
+        {"ACTION_TOOL_ERASER_WHITEOUT"sv, ERASER_TYPE_WHITEOUT}};
+
+static const std::map<std::string_view, int> COL_ROWS_MAP = {
+        {"ACTION_SET_COLUMNS_1"sv, 1}, {"ACTION_SET_COLUMNS_2"sv, 2}, {"ACTION_SET_COLUMNS_3"sv, 3},
+        {"ACTION_SET_COLUMNS_4"sv, 4}, {"ACTION_SET_COLUMNS_5"sv, 5}, {"ACTION_SET_COLUMNS_6"sv, 6},
+        {"ACTION_SET_COLUMNS_7"sv, 7}, {"ACTION_SET_COLUMNS_8"sv, 8}, {"ACTION_SET_ROWS_1"sv, -1},
+        {"ACTION_SET_ROWS_2"sv, -2},   {"ACTION_SET_ROWS_3"sv, -3},   {"ACTION_SET_ROWS_4"sv, -4},
+        {"ACTION_SET_ROWS_5"sv, -5},   {"ACTION_SET_ROWS_6"sv, -6},   {"ACTION_SET_ROWS_7"sv, -7},
+        {"ACTION_SET_ROWS_8"sv, -8}};
+
+static const std::map<std::string_view, std::pair<Action, bool>> LAYOUT_MAP = {
+        {"ACTION_SET_LAYOUT_HORIZONTAL"sv, {Action::SET_LAYOUT_VERTICAL, false}},
+        {"ACTION_SET_LAYOUT_VERTICAL"sv, {Action::SET_LAYOUT_VERTICAL, true}},
+        {"ACTION_SET_LAYOUT_L2R"sv, {Action::SET_LAYOUT_RIGHT_TO_LEFT, false}},
+        {"ACTION_SET_LAYOUT_R2L"sv, {Action::SET_LAYOUT_RIGHT_TO_LEFT, true}},
+        {"ACTION_SET_LAYOUT_T2B"sv, {Action::SET_LAYOUT_BOTTOM_TO_TOP, false}},
+        {"ACTION_SET_LAYOUT_B2T"sv, {Action::SET_LAYOUT_BOTTOM_TO_TOP, true}}};
+
+static const std::map<std::string_view, EditSelection::OrderChange> SELECTION_ORDER_ACTION_MAP = {
+        {"ACTION_ARRANGE_BRING_TO_FRONT"sv, EditSelection::OrderChange::BringToFront},
+        {"ACTION_ARRANGE_BRING_FORWARD"sv, EditSelection::OrderChange::BringForward},
+        {"ACTION_ARRANGE_SEND_BACKWARD"sv, EditSelection::OrderChange::SendBackward},
+        {"ACTION_ARRANGE_SEND_TO_BACK"sv, EditSelection::OrderChange::SendToBack}};
+
+void ActionBackwardCompatibilityLayer::actionPerformed(Control* ctrl, std::string_view type, bool enabled) {
+    auto* actionDB = ctrl->getActionDatabase();
+    if (auto it = STATELESS_ACTION_MAP.find(type); it != STATELESS_ACTION_MAP.end()) {
+        actionDB->fireActivateAction(it->second);
+    } else if (auto it = SELECT_TOOL_MAP.find(type); it != SELECT_TOOL_MAP.end()) {
+        actionDB->fireChangeActionState(Action::SELECT_TOOL, it->second);
+    } else if (auto it = TOOL_SIZE_MAP.find(type); it != TOOL_SIZE_MAP.end()) {
+        actionDB->fireChangeActionState(it->second.first, it->second.second);
+    } else if (auto it = LINE_STYLE_MAP.find(type); it != LINE_STYLE_MAP.end()) {
+        actionDB->fireChangeActionState(Action::TOOL_PEN_LINE_STYLE, it->second);
+    } else if (auto it = ERASER_TYPE_MAP.find(type); it != ERASER_TYPE_MAP.end()) {
+        actionDB->fireChangeActionState(Action::TOOL_ERASER_TYPE, it->second);
+    } else if (auto it = BOOLEAN_ACTION_MAP.find(type); it != BOOLEAN_ACTION_MAP.end()) {
+        actionDB->fireChangeActionState(it->second, enabled);
+    } else if (auto it = COL_ROWS_MAP.find(type); it != COL_ROWS_MAP.end()) {
+        actionDB->fireChangeActionState(Action::SET_COLUMNS_OR_ROWS, it->second);
+    } else if (auto it = LAYOUT_MAP.find(type); it != LAYOUT_MAP.end()) {
+        actionDB->fireChangeActionState(it->second.first, it->second.second);
+    } else if (auto it = SELECTION_ORDER_ACTION_MAP.find(type); it != SELECTION_ORDER_ACTION_MAP.end()) {
+        actionDB->fireActivateAction(Action::ARRANGE_SELECTION_ORDER, it->second);
+    } else {
+        // The most specific translations not handled by the above cases
+        if (type == "ACTION_TOGGLE_PAIRS_PARITY") {
+            int offset = ctrl->getSettings()->getPairsOffset();
+            actionDB->fireChangeActionState(Action::PAIRED_PAGES_OFFSET, offset + (offset % 2 == 0 ? 1 : -1));
+        } else {
+            g_warning("Plugin: Unhandled action event: %s", type.data());
+        }
+    }
+}
+
+#endif
diff --git a/entry/src/main/cpp/src/core/plugin/ActionBackwardCompatibilityLayer.h b/entry/src/main/cpp/src/core/plugin/ActionBackwardCompatibilityLayer.h
new file mode 100644
index 0000000..70e0322
--- /dev/null
+++ b/entry/src/main/cpp/src/core/plugin/ActionBackwardCompatibilityLayer.h
@@ -0,0 +1,29 @@
+/*
+ * Xournal++
+ *
+ * Compat. layer for mapping old plugin action triggers to new actions
+ *
+ * @author Xournal++ Team
+ * https://github.com/xournalpp/xournalpp
+ *
+ * @license GNU GPLv2 or later
+ */
+
+#pragma once
+
+#include "config-features.h"  // for ENABLE_PLUGINS
+
+#ifdef ENABLE_PLUGINS
+
+#include <string_view>
+
+class Control;
+
+namespace ActionBackwardCompatibilityLayer {
+/**
+ * @brief Translates the old ActionType type to a new Action and fires it.
+ * @param enabled Used for boolean actions only
+ */
+void actionPerformed(Control* ctrl, std::string_view type, bool enabled);
+};  // namespace ActionBackwardCompatibilityLayer
+#endif
diff --git a/entry/src/main/cpp/src/core/plugin/Plugin.cpp b/entry/src/main/cpp/src/core/plugin/Plugin.cpp
new file mode 100644
index 0000000..fc433c9
--- /dev/null
+++ b/entry/src/main/cpp/src/core/plugin/Plugin.cpp
@@ -0,0 +1,367 @@
+#include "Plugin.h"
+
+#include <algorithm>  // for max
+#include <array>      // for array
+
+#include <gdk/gdk.h>      // for GdkModifierType
+#include <glib-object.h>  // for G_CALLBACK, g_signal_connect
+#include <glib.h>         // for g_key_file_free, g_warning, g_free
+
+#include "util/Assert.h"     // for xoj_assert
+#include "util/PathUtil.h"   // for toGFilename
+#include "util/XojMsgBox.h"  // for XojMsgBox
+
+#include "config-features.h"  // for ENABLE_PLUGINS
+
+#ifdef ENABLE_PLUGINS
+
+#include <utility>  // for move, pair
+
+#include "gui/toolbarMenubar/PluginPlaceholderLabel.h"  // for the PlaceholderLabel Plugin
+#include "gui/toolbarMenubar/ToolMenuHandler.h"         // for ToolMenuHandler
+#include "util/i18n.h"                                  // for _
+#include "util/raii/GObjectSPtr.h"
+
+#include "config.h"  // for PROJECT_VERSION
+
+extern "C" {
+#include <lauxlib.h>  // for luaL_Reg, luaL_newstate, luaL_requiref
+#include <lua.h>      // for lua_getglobal, lua_getfield, lua_setf...
+#include <lualib.h>   // for luaL_openlibs
+}
+
+#include "luapi_application.h"  // for luaopen_app
+
+/*
+ ** these libs are loaded by lua.c and are readily available to any Lua
+ ** program
+ */
+constexpr std::array loadedlibs{luaL_Reg{"app", luaopen_app}};
+
+Plugin::Plugin(Control* control, std::string name, fs::path path):
+        control(control), name(std::move(name)), path(std::move(path)) {
+    loadIni();
+}
+
+auto Plugin::getPluginFromLua(lua_State* lua) -> Plugin* {
+    lua_getfield(lua, LUA_REGISTRYINDEX, "Xournalpp_Plugin");
+
+    if (lua_islightuserdata(lua, -1)) {
+        auto* data = static_cast<Plugin*>(lua_touserdata(lua, -1));
+        lua_pop(lua, 1);
+        return data;
+    }
+
+    return nullptr;
+}
+
+void Plugin::registerToolbar() {
+    if (!this->valid || !this->enabled) {
+        return;
+    }
+
+    inInitUi = true;
+
+    lua_getglobal(lua.get(), "initUi");
+    if (lua_isfunction(lua.get(), -1) == 1) {
+        if (callFunction("initUi")) {
+            g_message("Plugin \"%s\" UI initialized", name.c_str());
+        } else {
+            g_warning("Plugin \"%s\" init failed!", name.c_str());
+        }
+    } else {
+        g_message("Plugin \"%s\" has no UI init", name.c_str());
+    }
+
+    inInitUi = false;
+}
+
+size_t Plugin::populateMenuSection(GtkApplicationWindow* win, size_t startId) {
+    if (menuEntries.empty() || !this->enabled) {
+        // No entries - nothing to do
+        return startId;
+    }
+
+    // The menu should never be populated twice.
+    // If this assert ever fails, do not recreate the GSimpleAction's below
+    xoj_assert(!menuSection);
+
+    this->menuSection.reset(g_menu_new(), xoj::util::adopt);
+
+    for (auto& m: menuEntries) {
+        std::string actionName = G_ACTION_NAME_PREFIX;
+        actionName += std::to_string(startId++);
+        m.action.reset(g_simple_action_new(actionName.c_str(), nullptr), xoj::util::adopt);
+
+        actionName = "win." + actionName;
+        xoj::util::GObjectSPtr<GMenuItem> entry(g_menu_item_new(m.label.c_str(), actionName.c_str()), xoj::util::adopt);
+
+        g_menu_append_item(menuSection.get(), entry.get());
+
+        // This might fail, when the vector reallocates, but then the order of initialisation is violated
+        g_signal_connect(
+                m.action.get(), "activate",
+                G_CALLBACK(+[](GSimpleAction*, GVariant*, MenuEntry* me) { me->plugin->executeMenuEntry(me); }), &m);
+
+        g_action_map_add_action(G_ACTION_MAP(win), G_ACTION(m.action.get()));
+
+        if (!m.accelerator.empty()) {
+            const char* accels[2] = {m.accelerator.c_str(), nullptr};
+            gtk_application_set_accels_for_action(gtk_window_get_application(GTK_WINDOW(win)), actionName.c_str(),
+                                                  accels);
+        }
+    }
+    return startId;
+}
+
+void Plugin::executeMenuEntry(MenuEntry* entry) { callFunction(entry->callback, entry->mode); }
+
+auto Plugin::registerMenu(std::string menu, std::string callback, ptrdiff_t mode, std::string accelerator) -> size_t {
+    menuEntries.emplace_back(this, std::move(menu), std::move(callback), mode, std::move(accelerator));
+    return menuEntries.size() - 1;
+}
+
+void Plugin::registerToolButton(ToolMenuHandler* toolMenuHandler) {
+    if (toolbarButtonEntries.empty() || !this->enabled) {
+        // No entries - nothing to do
+        return;
+    }
+
+    for (auto&& t: toolbarButtonEntries) {
+        g_message("Add toolbar button with id: %s and icon: %s", t.toolbarId.c_str(), t.iconName.c_str());
+        toolMenuHandler->addPluginItem(&t);
+    }
+}
+
+void Plugin::executeToolbarButton(ToolbarButtonEntry* entry) { callFunction(entry->callback, entry->mode); }
+
+void Plugin::registerToolButton(std::string description, std::string toolbarId, std::string iconName,
+                                std::string callback, ptrdiff_t mode) {
+    if (toolbarId == "") {
+        return;
+    }
+    toolbarId = "Plugin::" + toolbarId;  // In order to avoid name collisions with built in toolbar id's.
+    toolbarButtonEntries.emplace_back(this, std::move(description), std::move(toolbarId), std::move(iconName),
+                                      std::move(callback), mode);
+}
+
+auto Plugin::getControl() const -> Control* { return control; }
+
+void Plugin::loadIni() {
+    GKeyFile* config = g_key_file_new();
+    g_key_file_set_list_separator(config, ',');
+
+    auto filename = path / "plugin.ini";
+    if (!g_key_file_load_from_file(config, Util::toGFilename(filename).c_str(), G_KEY_FILE_NONE, nullptr)) {
+        g_key_file_free(config);
+        return;
+    }
+
+    auto LOAD_FROM_INI = [config](auto& target, char const* group, char const* key) {
+        char* value = g_key_file_get_string(config, group, key, nullptr);
+        if (value != nullptr) {
+            target = value;
+            g_free(value);
+        }
+    };
+
+    LOAD_FROM_INI(author, "about", "author");
+    LOAD_FROM_INI(version, "about", "version");
+    LOAD_FROM_INI(description, "about", "description");
+
+    if (version == "<xournalpp>") {
+        version = PROJECT_VERSION;
+    }
+
+    LOAD_FROM_INI(mainfile, "plugin", "mainfile");
+
+    std::string defaultEnabledStr;
+    LOAD_FROM_INI(defaultEnabledStr, "default", "enabled");
+
+    defaultEnabled = defaultEnabledStr == "true";
+    enabled = defaultEnabled;
+
+    g_key_file_free(config);
+
+    this->valid = true;
+}
+
+void Plugin::registerXournalppLibs(lua_State* luaPtr) {
+    for (auto const& lib: loadedlibs) {
+        luaL_requiref(luaPtr, lib.name, lib.func, 1);
+        // remove lib
+        lua_pop(luaPtr, 1);
+    }
+}
+
+void Plugin::addPluginToLuaPath() {
+    lua_getglobal(lua.get(), "package");
+
+    // get field "path" from table at top of stack (-1)
+    lua_getfield(lua.get(), -1, "path");
+
+    // grab path string from top of stack
+    std::string luaPath = lua_tostring(lua.get(), -1);
+
+    // prepend the path of the current plugin
+    auto curPath = this->path / "?.lua";
+    std::string combinedPath = curPath.string() + ";" + luaPath;
+
+    // get rid of the std::string on the stack we just pushed
+    lua_pop(lua.get(), 1);
+
+    // push the new one
+    lua_pushstring(lua.get(), combinedPath.c_str());
+
+    // set the field "path" in table at -2 with value at top of stack
+    lua_setfield(lua.get(), -2, "path");
+
+    // get rid of package table from top of stack
+    lua_pop(lua.get(), 1);
+}
+
+void Plugin::loadScript() {
+    if (mainfile.empty()) {
+        this->valid = false;
+        return;
+    }
+
+    if (mainfile.find("..") != std::string::npos) {
+        g_warning("Plugin \"%s\" contains unsupported path \"%s\"", name.c_str(), mainfile.c_str());
+        this->valid = false;
+        return;
+    }
+
+    if (!this->enabled) {
+        return;
+    }
+
+
+    // Create Lua state variable
+    lua.reset(luaL_newstate());
+
+    // Load Lua libraries
+    luaL_openlibs(lua.get());
+
+    // Load but don't run the Lua script
+    auto luafile = path / mainfile;
+    int status = luaL_loadfile(lua.get(), luafile.string().c_str());
+    if (status != LUA_OK) {
+        const char* errMsg = lua_tostring(lua.get(), -1);
+        XojMsgBox::showPluginMessage(name, errMsg, true);
+
+        // Error out if file can't be read
+        g_warning("Could not load plugin Lua file. Error: \"%s\", error code: %d (syntax error: %s)", errMsg, status, status == LUA_ERRSYNTAX ? "true" : "false");
+        this->valid = false;
+        return;
+    }
+
+    // Register Plugin object to Lua instance
+    lua_pushlightuserdata(lua.get(), this);
+    lua_setfield(lua.get(), LUA_REGISTRYINDEX, "Xournalpp_Plugin");
+
+    registerXournalppLibs(lua.get());
+
+    addPluginToLuaPath();
+
+    // Run the loaded Lua script
+    if (lua_pcall(lua.get(), 0, 0, 0) != LUA_OK) {
+        const char* errMsg = lua_tostring(lua.get(), -1);
+        XojMsgBox::showPluginMessage(name, errMsg, true);
+
+        g_warning("Could not run plugin Lua file: \"%s\", error: \"%s\"", char_cast(luafile.u8string().c_str()),
+                  errMsg);
+        this->valid = false;
+        return;
+    }
+}
+
+auto Plugin::callFunction(const std::string& fnc, ptrdiff_t mode) -> bool {
+    lua_getglobal(lua.get(), fnc.c_str());
+
+    int numArgs = 0;
+
+    if (mode != std::numeric_limits<ptrdiff_t>::max()) {
+        lua_pushinteger(lua.get(), mode);
+        numArgs = 1;
+    }
+
+    // Run the function
+    if (lua_pcall(lua.get(), numArgs, 0, 0)) {
+        const char* errMsg = lua_tostring(lua.get(), -1);
+        XojMsgBox::showPluginMessage(name, errMsg, true);
+
+        g_warning("Error in Plugin: \"%s\", error: \"%s\"", name.c_str(), errMsg);
+        return false;
+    }
+
+    return true;
+}
+
+auto Plugin::callFunction(const std::string& fnc, const char* s) -> bool {
+    lua_getglobal(lua.get(), fnc.c_str());
+
+    lua_pushstring(lua.get(), s);
+
+    // Run the function
+    if (lua_pcall(lua.get(), 1, 0, 0)) {
+        const char* errMsg = lua_tostring(lua.get(), -1);
+        XojMsgBox::showPluginMessage(name, errMsg, true);
+
+        g_warning("Error in Plugin: \"%s\", error: \"%s\"", name.c_str(), errMsg);
+        return false;
+    }
+
+    return true;
+}
+
+auto Plugin::getName() const -> std::string const& { return name; }
+auto Plugin::getDescription() const -> std::string const& { return description; }
+auto Plugin::getAuthor() const -> std::string const& { return author; }
+auto Plugin::getVersion() const -> std::string const& { return version; }
+auto Plugin::getPath() const -> fs::path const& { return path; }
+
+auto Plugin::isEnabled() const -> bool { return enabled; }
+void Plugin::setEnabled(bool lEnabled) { this->enabled = lEnabled; }
+auto Plugin::isDefaultEnabled() const -> bool { return defaultEnabled; }
+
+auto Plugin::isInInitUi() const -> bool { return inInitUi; }
+auto Plugin::isValid() const -> bool { return valid; }
+
+void Plugin::registerPlaceholders(ToolMenuHandler* toolMenuHandler) {
+    if (toolbarPlaceholderEntries.empty() || !this->enabled) {
+        // No entries - nothing to do
+        return;
+    }
+    for (auto& pair: toolbarPlaceholderEntries) {
+        g_message("Plugin: Adding placeholder to ToolMenuHandler: %s", pair.first.c_str());
+        toolMenuHandler->addPluginPlaceholderItem(pair.second.get());
+    }
+}
+
+void Plugin::registerPlaceholder(const std::string& toolbarId, const std::string& description) {
+    std::string prefixedId = "Plugin::" + toolbarId;
+    if (toolbarPlaceholderEntries.find(prefixedId) == toolbarPlaceholderEntries.end()) {
+        auto entry = std::make_unique<ToolbarPlaceholderEntry>();
+        entry->toolbarId = prefixedId;
+        entry->description = description;
+        entry->value = "";
+        entry->label = nullptr;  // Will be set when toolbar is built
+        toolbarPlaceholderEntries[prefixedId] = std::move(entry);
+    }
+}
+
+void Plugin::setPlaceholderValue(const std::string& toolbarId, const std::string& value) {
+    std::string prefixedId = toolbarId.rfind("Plugin::", 0) == 0 ? toolbarId : "Plugin::" + toolbarId;
+    auto it = toolbarPlaceholderEntries.find(prefixedId);
+    if (it != toolbarPlaceholderEntries.end()) {
+        it->second->value = value;
+        if (it->second->label) {
+            it->second->label->setText(value.empty() ? getDisplayId(it->second->toolbarId) : value);
+        }
+    } else {
+        g_warning("setPlaceholderValue: placeholder id '%s' does not exist", prefixedId.c_str());
+    }
+}
+
+#endif
diff --git a/entry/src/main/cpp/src/core/plugin/Plugin.h b/entry/src/main/cpp/src/core/plugin/Plugin.h
new file mode 100644
index 0000000..f1a4a3a
--- /dev/null
+++ b/entry/src/main/cpp/src/core/plugin/Plugin.h
@@ -0,0 +1,218 @@
+/*
+ * Xournal++
+ *
+ * A single Xournal++ Plugin
+ *
+ * @author Xournal++ Team
+ * https://github.com/xournalpp/xournalpp
+ *
+ * @license GNU GPLv2 or later
+ */
+
+#pragma once
+
+#include <cstddef>  // for size_t
+#include <limits>   // for numeric_limits
+#include <memory>   // for unique_ptr
+#include <unordered_map>
+
+#include "config-features.h"  // for ENABLE_PLUGINS
+
+#ifdef ENABLE_PLUGINS
+
+#include <string>   // for string
+#include <utility>  // for move
+#include <vector>   // for vector
+
+#include <gtk/gtk.h>  // for GtkWidget, GtkWindow
+
+#include "util/raii/GObjectSPtr.h"
+
+#include "filesystem.h"  // for path
+
+extern "C" {
+#include <lua.h>  // for lua_State, lua_close
+}
+
+class Plugin;
+class Control;
+class ToolMenuHandler;
+
+struct MenuEntry final {
+    MenuEntry() = default;
+    MenuEntry(Plugin* plugin, std::string label, std::string callback, ptrdiff_t mode, std::string accelerator):
+            plugin(plugin),
+            label(std::move(label)),
+            callback(std::move(callback)),
+            mode(mode),
+            accelerator(std::move(accelerator)) {}
+
+    Plugin* plugin = nullptr;                               ///< The Plugin
+    std::string label{};                                    ///< Menu display name
+    std::string callback{};                                 ///< Callback function name
+    ptrdiff_t mode{std::numeric_limits<ptrdiff_t>::max()};  ///< mode in which the callback function is run
+    /**
+     * @brief Accelerator key, see
+     *     https://developer.gnome.org/gtk3/stable/gtk3-Keyboard-Accelerators.html#gtk-accelerator-parse
+     */
+    std::string accelerator{};
+    /// Action activated when using the menu entry
+    xoj::util::GObjectSPtr<GSimpleAction> action;
+};
+
+struct ToolbarButtonEntry final {
+    ToolbarButtonEntry() = default;
+    ToolbarButtonEntry(Plugin* plugin, std::string description, std::string toolbarId, std::string iconName,
+                       std::string callback, ptrdiff_t mode):
+            plugin(plugin),
+            description(std::move(description)),
+            toolbarId(std::move(toolbarId)),
+            iconName(std::move(iconName)),
+            callback(std::move(callback)),
+            mode(mode) {}
+
+    Plugin* plugin = nullptr;
+    std::string description{};  ///< description displayed on hovering over the toolbar button
+    std::string toolbarId{};    ///< toolbar ID to be used in toolbar.ini
+    std::string iconName{};     ///< name of the icon which should be stored as iconName + ".svg"
+    std::string callback{};     ///< Callback function name
+    ptrdiff_t mode{std::numeric_limits<ptrdiff_t>::max()};  ///< mode in which the callback function is run
+};
+
+struct ToolbarPlaceholderEntry final {
+    std::string toolbarId;                          ///< prefixed toolbar ID to be used in toolbar.ini
+    std::string description;                        ///< description displayed on hovering over the placeholder
+    std::string value;                              ///< current value of the placeholder
+    class PluginPlaceholderLabel* label = nullptr;  ///< pointer to the label for updates
+};
+
+inline std::string getDisplayId(const std::string& toolbarId) {
+    constexpr const char* prefix = "Plugin::";
+    if (toolbarId.rfind(prefix, 0) == 0) {
+        return toolbarId.substr(strlen(prefix));
+    }
+    return toolbarId;
+}
+
+struct LuaDeleter {
+    void operator()(lua_State* ptr) const { lua_close(ptr); }
+};
+
+class Plugin final {
+public:
+    Plugin(Control* control, std::string name, fs::path path);
+    // Register a placeholder label for the toolbar
+    void registerPlaceholder(const std::string& toolbarId, const std::string& description);
+    // Update the value of a placeholder label
+    void setPlaceholderValue(const std::string& toolbarId, const std::string& value);
+
+public:
+    /// Load the plugin script
+    void loadScript();
+
+    /// Check if this plugin is valid
+    auto isValid() const -> bool;
+
+    /// Register toolbar item and all other UI stuff
+    void registerToolbar();
+
+    /**
+     * @brief Create a GMenu section for the plugin
+     * @param startId next available id
+     * @return next available id after this menu is populated
+     */
+    size_t populateMenuSection(GtkApplicationWindow* win, size_t startId);
+
+    /// Get a model for the GMenu section for the plugin
+    inline GMenuModel* getMenuSection() const { return G_MENU_MODEL(menuSection.get()); }
+
+    // Register toolbar button
+    void registerToolButton(std::string description, std::string toolbarId, std::string iconName, std::string callback,
+                            ptrdiff_t mode);
+    // Register all toolbar buttons
+    void registerToolButton(ToolMenuHandler* toolMenuHandler);
+    void registerPlaceholders(ToolMenuHandler* toolMenuHandler);
+
+    /// Execute menu entry
+    void executeMenuEntry(MenuEntry* entry);
+    // Execute toolbar button
+    void executeToolbarButton(ToolbarButtonEntry* entry);
+
+    /// @return the Plugin name
+    auto getName() const -> std::string const&;
+
+    /// @return Description of the plugin
+    auto getDescription() const -> std::string const&;
+
+    /// Author of the plugin
+    auto getAuthor() const -> std::string const&;
+
+    /// Plugin version
+    auto getVersion() const -> std::string const&;
+
+    /// @return the path to the plugin folder. Each plugin should have a unique path.
+    auto getPath() const -> fs::path const&;
+
+    /// The plugin is enabled
+    auto isEnabled() const -> bool;
+
+    /// The plugin is enabled
+    void setEnabled(bool lEnabled);
+
+    /// The plugin is default enabled
+    auto isDefaultEnabled() const -> bool;
+
+    ///@return Flag to check if init ui is currently running
+    auto isInInitUi() const -> bool;
+
+    /// Register a menu item
+    /// @return Internal ID, can e.g. be used to disable the menu
+    auto registerMenu(std::string menu, std::string callback, ptrdiff_t mode, std::string accelerator) -> size_t;
+
+    ///@return The main controller
+    auto getControl() const -> Control*;
+
+private:
+    /// Load ini file
+    void loadIni();
+
+    /// Load custom Lua Libraries
+    static void registerXournalppLibs(lua_State* luaPtr);
+
+    /// Add the plugin folder to the lua path
+    void addPluginToLuaPath();
+
+public:
+    /// Get Plugin from lua engine
+    static auto getPluginFromLua(lua_State* lua) -> Plugin*;
+
+    /// Execute lua function
+    auto callFunction(const std::string& fnc, ptrdiff_t mode = std::numeric_limits<ptrdiff_t>::max()) -> bool;
+    auto callFunction(const std::string& fnc, const char* s) -> bool;
+
+private:
+    Control* control;                                      ///< The main controller
+    std::unique_ptr<lua_State, LuaDeleter> lua{};          ///< Lua engine
+    std::vector<MenuEntry> menuEntries;                    ///< All registered menu entries
+    xoj::util::GObjectSPtr<GMenu> menuSection;             ///< Menu section containing the menu entries
+    std::vector<ToolbarButtonEntry> toolbarButtonEntries;  ///< All registered toolbar button entries
+    std::unordered_map<std::string, std::unique_ptr<ToolbarPlaceholderEntry>>
+            toolbarPlaceholderEntries;  ///< Storage for toolbar placeholder entries
+
+    std::string name;             ///< Plugin name
+    std::string description;      ///< Description of the plugin
+    std::string author;           ///< Author of the plugin
+    std::string version;          ///< Plugin version
+    std::string mainfile;         ///< Main plugin script
+    fs::path path;                ///< Plugin root path
+    bool enabled = false;         ///< The plugin is enabled
+    bool defaultEnabled = false;  ///< The plugin is default enabled
+    bool inInitUi = false;        ///< Flag to check if init ui is currently running
+    bool valid = false;           ///< Flag if the plugin is valid / correct loaded
+
+    static constexpr auto G_ACTION_NAME_PREFIX = "plugins.action-";
+};
+
+#else
+struct Plugin final {};  ///< empty struct, since Plugins are not available
+#endif
diff --git a/entry/src/main/cpp/src/core/plugin/PluginController.cpp b/entry/src/main/cpp/src/core/plugin/PluginController.cpp
new file mode 100644
index 0000000..e68c7bc
--- /dev/null
+++ b/entry/src/main/cpp/src/core/plugin/PluginController.cpp
@@ -0,0 +1,189 @@
+#include "PluginController.h"
+
+#include <memory>
+
+#include "control/Control.h"
+#include "gui/MainWindow.h"
+#include "util/Assert.h"
+
+#include "config-features.h"  // for ENABLE_PLUGINS
+
+#ifdef ENABLE_PLUGINS
+
+#include <algorithm>
+#include <tuple>
+#include <utility>
+
+#include "control/settings/Settings.h"
+#include "gui/GladeSearchpath.h"
+#include "gui/dialog/PluginDialog.h"
+#include "util/PathUtil.h"
+#include "util/PopupWindowWrapper.h"
+#include "util/StringUtils.h"
+
+#include "Plugin.h"
+
+namespace {
+
+/**
+ * @brief This Comparator defines the ordering of Plugins in the Plugin-vector, so that all Plugins are sorted first by
+ * their name, then by their path. Since the name is determined by the parent directory of the Plugin's path, this
+ * also ensures that only Plugins with unique paths are kept in the vector.
+ */
+struct PluginComparator {
+    using KeyType = std::tuple<std::string const&, fs::path const&>;
+    static auto get_key(Plugin const& plugin) -> KeyType { return {plugin.getName(), plugin.getPath()}; }
+
+    [[maybe_unused]] auto operator()(std::unique_ptr<Plugin> const& lhs, std::unique_ptr<Plugin> const& rhs) const;
+    [[maybe_unused]] auto operator()(std::unique_ptr<Plugin> const& lhs, KeyType const& rhs) const;
+    [[maybe_unused]] auto operator()(KeyType const& lhs, std::unique_ptr<Plugin> const& rhs) const;
+
+    [[maybe_unused]] auto operator()(Plugin const& lhs, Plugin const& rhs) const { return get_key(lhs) < get_key(rhs); }
+    [[maybe_unused]] auto operator()(Plugin const& lhs, KeyType const& rhs) const { return get_key(lhs) < rhs; }
+    [[maybe_unused]] auto operator()(KeyType const& lhs, Plugin const& rhs) const { return lhs < get_key(rhs); }
+};
+
+auto PluginComparator::operator()(std::unique_ptr<Plugin> const& lhs, std::unique_ptr<Plugin> const& rhs) const {
+    return PluginComparator{}(*lhs, *rhs);
+}
+
+auto PluginComparator::operator()(std::unique_ptr<Plugin> const& lhs, KeyType const& rhs) const {
+    return PluginComparator{}(*lhs, rhs);
+}
+
+auto PluginComparator::operator()(KeyType const& lhs, std::unique_ptr<Plugin> const& rhs) const {
+    return PluginComparator{}(lhs, *rhs);
+}
+
+auto load_available_plugins_from(fs::path const& path, Control* control) -> std::vector<std::unique_ptr<Plugin>> {
+    if (!fs::is_directory(path)) {
+        g_info("Skipping Plugin path, it is not a directory: %s", path.string().c_str());
+        return {};
+    }
+    g_info("Loading plugins from: %s", path.string().c_str());
+
+    std::vector<std::unique_ptr<Plugin>> returner;
+    try {
+        for (auto const& f: fs::directory_iterator(path)) {
+            if (!f.is_directory()) {
+                continue;
+            }
+            const auto& pluginPath = f.path();
+            try {
+                auto plugin = std::make_unique<Plugin>(control, pluginPath.filename().string(), pluginPath);
+                if (!plugin || !plugin->isValid()) {
+                    g_warning("Error loading plugin \"%s\"", f.path().string().c_str());
+                    continue;
+                }
+                plugin->setEnabled(plugin->isDefaultEnabled());
+                returner.emplace_back(std::move(plugin));
+            } catch (const std::exception& e) {
+                g_warning("Error loading plugin \"%s\": %s", f.path().string().c_str(), e.what());
+            }
+        }
+    } catch (const fs::filesystem_error& e) {
+        g_warning("Could not open plugin dir: \"%s\": %s", path.string().c_str(), e.what());
+    }
+    return returner;
+}
+
+auto emplace_sorted_if_not_exists(std::vector<std::unique_ptr<Plugin>>& plugins, std::unique_ptr<Plugin> plugin)
+        -> void {
+    xoj_assert(std::is_sorted(begin(plugins), end(plugins), PluginComparator{}));
+    auto iter = std::equal_range(begin(plugins), std::end(plugins), plugin, PluginComparator{});
+    if (iter.first != iter.second) {
+        return;
+    }
+    plugins.emplace(iter.first, std::move(plugin));
+    xoj_assert(std::is_sorted(begin(plugins), end(plugins), PluginComparator{}));
+}
+}  // namespace
+#endif
+
+
+PluginController::PluginController(Control* control): control(control) {
+#ifdef ENABLE_PLUGINS
+    // Todo(fabian) move those search paths into PathUtils
+    auto searchPath = control->getGladeSearchPath()->getFirstSearchPath();
+    auto searchPaths = {fs::weakly_canonical(searchPath /= "../plugins"),  //
+                        Util::getConfigSubfolder("plugins")};
+
+    for (auto&& path: searchPaths) {
+        auto loaded_plugins = load_available_plugins_from(path, control);
+        this->plugins.reserve(loaded_plugins.size() + this->plugins.size());
+        for (auto&& plugin: loaded_plugins) {
+            emplace_sorted_if_not_exists(this->plugins, std::move(plugin));
+        }
+    }
+
+    Settings* settings = control->getSettings();
+    // enable plugins
+    std::vector<std::string> pluginEnabled = StringUtils::split(settings->getPluginEnabled(), ',');
+    for (auto&& plugin_path: pluginEnabled) {
+        auto path = fs::path(plugin_path);
+        auto name = path.filename().string();
+        auto iter = std::equal_range(begin(plugins), end(plugins), std::tie(name, path), PluginComparator{});
+        if (iter.first != iter.second) {
+            iter.first->get()->setEnabled(true);
+        }
+    }
+    // disable plugins
+    std::vector<std::string> pluginDisabled = StringUtils::split(settings->getPluginDisabled(), ',');
+    for (auto&& plugin_path: pluginDisabled) {
+        auto path = fs::path(plugin_path);
+        auto name = path.filename().string();
+        auto iter = std::equal_range(begin(plugins), end(plugins), std::tie(name, path), PluginComparator{});
+        if (iter.first != iter.second) {
+            iter.first->get()->setEnabled(false);
+        }
+    }
+
+    for (auto&& plugin: plugins) {
+        if (plugin->isEnabled()) {
+            plugin->loadScript();
+        }
+    }
+#endif
+}
+
+void PluginController::registerToolbar() {
+#ifdef ENABLE_PLUGINS
+    for (auto&& p: this->plugins) {
+        p->registerToolbar();
+    }
+#endif
+}
+
+void PluginController::showPluginManager() const {
+#ifdef ENABLE_PLUGINS
+    xoj::popup::PopupWindowWrapper<PluginDialog> dlg(control->getGladeSearchPath(), control->getSettings(),
+                                                     this->plugins);
+    dlg.show(control->getGtkWindow());
+#endif
+}
+
+auto PluginController::createMenuSections(GtkApplicationWindow* win) -> std::vector<GMenuModel*> {
+#ifdef ENABLE_PLUGINS
+    size_t id = 0;
+    std::vector<GMenuModel*> sections;
+    for (auto&& p: this->plugins) {
+        id = p->populateMenuSection(win, id);
+        auto* section = p->getMenuSection();
+        if (section) {
+            sections.emplace_back(section);
+        }
+    }
+    return sections;
+#else
+    return {};
+#endif
+}
+
+void PluginController::registerToolButtons(ToolMenuHandler* toolMenuHandler) {
+#ifdef ENABLE_PLUGINS
+    for (auto&& p: this->plugins) {
+        p->registerToolButton(toolMenuHandler);
+        p->registerPlaceholders(toolMenuHandler);
+    }
+#endif
+}
diff --git a/entry/src/main/cpp/src/core/plugin/PluginController.h b/entry/src/main/cpp/src/core/plugin/PluginController.h
new file mode 100644
index 0000000..d615804
--- /dev/null
+++ b/entry/src/main/cpp/src/core/plugin/PluginController.h
@@ -0,0 +1,63 @@
+/*
+ * Xournal++
+ *
+ * Plugin main controller
+ *
+ * @author Xournal++ Team
+ * https://github.com/xournalpp/xournalpp
+ *
+ * @license GNU GPLv2 or later
+ */
+
+#pragma once
+
+#include <memory>
+#include <string>
+#include <vector>
+
+#include <gtk/gtk.h>  // for GtkApplicationWindow
+
+#include "Plugin.h"
+#include "filesystem.h"
+
+class Control;
+class ToolMenuHandler;
+
+class PluginController final {
+public:
+    explicit PluginController(Control* control);
+
+public:
+    /**
+     * Register toolbar item and all other UI stuff
+     */
+    void registerToolbar();
+
+    /**
+     * @brief Create menu sections (one per enabled plugin with menu entries)
+     * The data is owned by the Plugin's themselves - do not unref
+     */
+    std::vector<GMenuModel*> createMenuSections(GtkApplicationWindow* win);
+
+    /**
+     * Add toolbar buttons
+     */
+    void registerToolButtons(ToolMenuHandler* toolMenuHandler);
+
+    /**
+     * Show Plugin manager Dialog
+     */
+    void showPluginManager() const;
+
+private:
+    /**
+     * The main controller
+     */
+    Control* control;
+
+    /**
+     * All loaded Plugins, sorted by name and path
+     * Todo: replace with boost::flat_map
+     */
+    std::vector<std::unique_ptr<Plugin>> plugins;
+};
diff --git a/entry/src/main/cpp/src/core/plugin/luapi_application.h b/entry/src/main/cpp/src/core/plugin/luapi_application.h
new file mode 100644
index 0000000..d8661c8
--- /dev/null
+++ b/entry/src/main/cpp/src/core/plugin/luapi_application.h
@@ -0,0 +1,3805 @@
+/*
+ * Xournal++
+ *
+ * Lua API, application library
+ *
+ * @author Xournal++ Team
+ * https://github.com/xournalpp/xournalpp
+ *
+ * @license GNU GPLv2 or later
+ */
+#pragma once
+
+#include <cstring>
+#include <limits>  // for numeric_limits
+#include <memory>
+#include <sstream>
+#include <unordered_set>
+
+#include <gtk/gtk.h>
+#include <pango/pango.h>
+#include <pango/pangocairo.h>
+#include <stdint.h>
+
+#include "control/Control.h"
+#include "control/ExportHelper.h"
+#include "control/PageBackgroundChangeController.h"
+#include "control/ScrollHandler.h"
+#include "control/Tool.h"
+#include "control/ToolEnums.h"               // for ToolSize, ToolType
+#include "control/actions/ActionDatabase.h"  // for ActionDatabase
+#include "control/actions/ActionProperties.h"
+#include "control/layer/LayerController.h"
+#include "control/pagetype/PageTypeHandler.h"
+#include "control/settings/Settings.h"
+#include "control/tools/EditSelection.h"
+#include "control/tools/ImageHandler.h"
+#include "control/zoom/ZoomControl.h"
+#include "enums/Action.enum.h"
+#include "gui/Layout.h"
+#include "gui/MainWindow.h"
+#include "gui/XournalView.h"
+#include "gui/dialog/FileChooserFiltersHelper.h"
+#include "gui/dialog/XojOpenDlg.h"  // for XojO...
+#include "gui/dialog/XojSaveDlg.h"  // for XojS...
+#include "gui/sidebar/Sidebar.h"
+#include "gui/toolbarMenubar/model/ColorPalette.h"  // for Palette
+#include "gui/widgets/XournalWidget.h"
+#include "model/Document.h"
+#include "model/Element.h"
+#include "model/Font.h"
+#include "model/Image.h"
+#include "model/SplineSegment.h"
+#include "model/Stroke.h"
+#include "model/StrokeStyle.h"
+#include "model/Text.h"
+#include "model/XojPage.h"  // IWYU pragma: keep for XojPage
+#include "plugin/Plugin.h"
+#include "undo/InsertUndoAction.h"
+#include "util/GVariantTemplate.h"    // for makeGVariant
+#include "util/PathUtil.h"            // for clea...
+#include "util/PopupWindowWrapper.h"  // for PopupWindowWrapper
+#include "util/StringUtils.h"
+#include "util/XojMsgBox.h"
+#include "util/i18n.h"              // for _
+#include "util/raii/GObjectSPtr.h"  // for GObjectSPtr (font validation)
+#include "util/safe_casts.h"        // for round_cast, as_signed, as_unsigned
+
+#include "ActionBackwardCompatibilityLayer.h"
+
+extern "C" {
+#include <lauxlib.h>  // for luaL_Reg, luaL_newstate, luaL_requiref
+#include <lua.h>      // for lua_getglobal, lua_getfield, lua_setf...
+#include <lualib.h>   // for luaL_openlibs
+
+#include "undo/PageSizeChangeUndoAction.h"
+}
+
+
+static std::tuple<std::optional<std::string>, std::vector<const Element*>> getElementsFromHelper(
+        Control* control, const std::string& type) {
+    std::vector<const Element*> elements = {};
+    if (type == "layer") {
+        auto sel = control->getWindow()->getXournal()->getSelection();
+        if (sel) {
+            control->clearSelection();  // otherwise texts in the selection won't be recognized
+        }
+        elements = control->getCurrentPage()->getSelectedLayer()->getElementsView().clone();
+    } else if (type == "selection") {
+        auto sel = control->getWindow()->getXournal()->getSelection();
+        if (sel) {
+            elements = sel->getElementsView().clone();
+        } else {
+            return std::make_tuple(std::make_optional("There is no selection"), elements);
+        }
+    } else {
+        std::stringstream err_msg;
+        err_msg << "Unknown argument (" << type << ") for getting selection";
+        return std::make_tuple(std::make_optional(err_msg.str()), elements);
+    }
+    return std::make_tuple(std::nullopt, elements);
+}
+
+
+/*
+ * Code conventions:
+ *     Error handling:
+ *         luapi functions should call `return luaL_error(L, fmt, ...)` if
+ *         something *unexpected happens* (e.g. wrong arguments). This throws a
+ *         real lua error.
+ *         They may also `return nil, errorMessage`. This behavior is reserved for
+ *         things that are *expected to happen* (e.g. ressource is not
+ *         available).
+ */
+
+/**
+ * Renames file 'from' to file 'to' in the file system.
+ * Overwrites 'to' if it already exists.
+ *
+ * @param from string
+ * @param to string
+ * @return number|nil Returns 1 on success, and (nil, message) on failure.
+ * @return string
+ *
+ * Example:
+ *   assert(app.glib_rename("path/to/foo", "other/bar"))
+ *
+ * Preferred to os.rename() because it works across
+ * partitions. Uses glib's rename function.
+ *
+ * Returns 1 on success, and (nil, message) on failure.
+ */
+static int applib_glib_rename(lua_State* L) {
+    GError* err = nullptr;
+    xoj::util::GObjectSPtr<GFile> to(g_file_new_for_path(lua_tostring(L, -1)), xoj::util::adopt);
+    xoj::util::GObjectSPtr<GFile> from(g_file_new_for_path(lua_tostring(L, -2)), xoj::util::adopt);
+
+    g_file_move(from.get(), to.get(), G_FILE_COPY_OVERWRITE, nullptr, nullptr, nullptr, &err);
+    if (err) {
+        // return nil, error message
+        lua_pushnil(L);
+        lua_pushfstring(L, "%s (error code: %d)", err->message, err->code);
+        g_error_free(err);
+        return 2;
+    } else {
+        // return 1
+        lua_pushinteger(L, 1);
+        return 1;
+    }
+}
+
+
+/**
+ * THIS FUNCTION IS DEPRECATED AND WILL BE REMOVED SOON. Use applib_fileDialogSave() instead.
+ *
+ * @deprecated
+ * Create a 'Save As' native dialog and return as a string
+ * the filepath of the location the user chose to save.
+ *
+ * @param filename string suggestion for a filename, defaults to "Untitled"
+ * @return string path of the selected location
+ *
+ * Examples:
+ *   local filename = app.saveAs() -- defaults to suggestion "Untitled"
+ *   local filename = app.saveAs("foo") -- suggests "foo" as filename
+ */
+static int applib_saveAs(lua_State* L) {
+    gint res;
+    int args_returned = 0;  // change to 1 if user chooses file
+
+    const char* filename = luaL_checkstring(L, -1);
+
+    // Create a 'Save As' native dialog
+    xoj::util::GObjectSPtr<GtkFileChooserNative> native(
+            gtk_file_chooser_native_new(_("Save file"), nullptr, GTK_FILE_CHOOSER_ACTION_SAVE, nullptr, nullptr),
+            xoj::util::adopt);
+
+    // If user tries to overwrite a file, ask if it's OK
+    gtk_file_chooser_set_do_overwrite_confirmation(GTK_FILE_CHOOSER(native.get()), TRUE);
+    // Offer a suggestion for the filename if filename absent
+    gtk_file_chooser_set_current_name(GTK_FILE_CHOOSER(native.get()),
+                                      filename ? filename : (std::string{_("Untitled")}).c_str());
+
+    // Wait until user responds to dialog
+    res = gtk_native_dialog_run(GTK_NATIVE_DIALOG(native.get()));
+
+    // Return the filename chosen to lua
+    if (res == GTK_RESPONSE_ACCEPT) {
+        char* filename = static_cast<char*>(gtk_file_chooser_get_filename(GTK_FILE_CHOOSER(native.get())));
+
+        lua_pushlstring(L, filename, strlen(filename));
+        g_free(static_cast<gchar*>(filename));
+        args_returned = 1;
+    }
+
+    return args_returned;
+}
+
+/**
+ * Create a 'Save As' dialog and once the user has chosen the filepath of the location to save
+ * calls the specified callback function to which it passes the filepath or the empty string, if the
+ * operation was cancelled.
+ *
+ * @param cb string name of the callback function(path:string) to call when a file has been chosen
+ * @param filename string suggestion for a filename, defaults to "Untitled"
+ *
+ * Examples:
+ *   app.fileDialogSave("cb") -- defaults to suggestion "Untitled" in current working directory
+ *   app.fileDialogSave("cb", "foo") -- suggests "foo" as filename in current working directory
+ *   app.fileDialogSave("cb", "/path/to/folder/bar.png") -- suggestes the given absolute path
+ */
+static int applib_fileDialogSave(lua_State* L) {
+
+    lua_settop(L, 2);  // discard extra arguments
+    const char* luaCallback = luaL_checkstring(L, 1);
+    fs::path suggestedPath{luaL_optstring(L, 2, _("Untitled"))};
+
+    if (!suggestedPath.has_parent_path()) {
+        suggestedPath = "." / suggestedPath;
+    }
+
+    auto pathValidation = [](fs::path& p, const char* filterName) { return true; };
+
+    Plugin* plugin = Plugin::getPluginFromLua(L);
+    Control* ctrl = plugin->getControl();
+
+    auto callback = [plugin, luaCallback = std::string(luaCallback)](std::optional<fs::path> p) {
+        if (p && !p->empty()) {
+            plugin->callFunction(luaCallback, p.value().string().c_str());
+        } else {
+            plugin->callFunction(luaCallback, "");
+        }
+    };
+
+    auto popup = xoj::popup::PopupWindowWrapper<xoj::SaveExportDialog>(ctrl->getSettings(), std::move(suggestedPath),
+                                                                       _("Save File"), _("Save"),
+                                                                       std::move(pathValidation), std::move(callback));
+
+    auto* fc = GTK_FILE_CHOOSER(popup.getPopup()->getWindow());
+    xoj::addFilterAllFiles(fc);
+
+    popup.show(GTK_WINDOW(ctrl->getWindow()->getWindow()));
+
+    return 0;
+}
+
+
+/**
+ * THIS FUNCTION IS DEPRECATED AND WILL BE REMOVED SOON. Use applib_fileDialogOpen() instead.
+ *
+ * @deprecated
+ * Create a 'Open File' native dialog and return as a string
+ * the filepath the user chose to open.
+ *
+ * @param types string[] array of the different allowed extensions e.g. {'\*.bmp', '\*.png'}
+ * @returns string path of the selected location
+ *
+ * Examples:
+ *   path = app.getFilePath({})
+ *   path = app.getFilePath({'*.bmp', '*.png'})
+ */
+static int applib_getFilePath(lua_State* L) {
+    xoj::util::GObjectSPtr<GtkFileChooserNative> native(
+            gtk_file_chooser_native_new(_("Open file"), nullptr, GTK_FILE_CHOOSER_ACTION_OPEN, nullptr, nullptr),
+            xoj::util::adopt);
+    gint res;
+    int args_returned = 0;  // change to 1 if user chooses file
+    char* filename;
+
+    // Get vector of supported formats from Lua stack
+    std::vector<std::string> formats;
+    // stack now contains: -1 => table
+    lua_pushnil(L);
+    // stack now contains: -1 => nil; -2 => table
+    while (lua_next(L, -2)) {
+        // stack now contains: -1 => value; -2 => key; -3 => table
+        const char* value = lua_tostring(L, -1);
+        formats.push_back(value);
+        lua_pop(L, 1);
+        // stack now contains: -1 => key; -2 => table
+    }
+    // stack now contains: -1 => table
+    lua_pop(L, 1);  // Stack is now the same as it was on entry to this function
+    if (formats.size() > 0) {
+        GtkFileFilter* filterSupported = gtk_file_filter_new();
+        gtk_file_filter_set_name(filterSupported, _("Supported files"));
+        for (std::string format: formats) {
+            gtk_file_filter_add_pattern(filterSupported, format.c_str());
+        }
+        gtk_file_chooser_add_filter(GTK_FILE_CHOOSER(native.get()), filterSupported);
+    }
+
+    // Wait until user responds to dialog
+    res = gtk_native_dialog_run(GTK_NATIVE_DIALOG(native.get()));
+    // Return the filename chosen to lua
+    if (res == GTK_RESPONSE_ACCEPT) {
+        filename = static_cast<char*>(gtk_file_chooser_get_filename(GTK_FILE_CHOOSER(native.get())));
+        lua_pushlstring(L, filename, strlen(filename));
+        g_free(static_cast<gchar*>(filename));
+        args_returned = 1;
+    }
+    // Destroy the dialog and free memory
+    return args_returned;
+}
+
+/**
+ * Create an 'Open File' dialog and when the user has chosen a filepath
+ * call a callback function whose sole argument is the filepath.
+ *
+ * @param cb string name of the callback function(path:string) to call when a file was chosen
+ * @param types string[] array of the different allowed extensions e.g. {'\*.bmp', '\*.png'}
+ *
+ * Examples:
+ *   app.fileDialogOpen("cb", {})
+ *   app.fileDialogOpen("cb", {'*.bmp', '*.png'})
+ */
+static int applib_fileDialogOpen(lua_State* L) {
+
+    // discard any extra arguments passed in
+    lua_settop(L, 2);
+    const char* callback = luaL_checkstring(L, 1);
+
+    // Get vector of supported formats from Lua stack
+    std::vector<std::string> formats;
+    // stack now contains: -1 => table
+    lua_pushnil(L);
+    // stack now contains: -1 => nil; 2 => table, 1 => string
+    while (lua_next(L, 2)) {
+        // stack now contains: -1 => value; -2 => key; 2 => table, 1 => string
+        const char* value = lua_tostring(L, -1);
+        formats.push_back(value);
+        lua_pop(L, 1);
+        // stack now contains: -1 => key; 2 => table, 1 => string
+    }
+    lua_pop(L, 1);  // Stack is now the same as it was on entry to this function
+
+    Plugin* plugin = Plugin::getPluginFromLua(L);
+    Control* ctrl = plugin->getControl();
+
+    xoj::OpenDlg::showMultiFormatDialog(ctrl->getGtkWindow(), formats,
+                                        [plugin, callback = std::string(callback)](fs::path path) {
+                                            g_message("%s", (_F("file: {1}") % path.string()).c_str());
+                                            plugin->callFunction(callback, path.string().c_str());
+                                        });
+    return 0;
+}
+
+
+/**
+ * THIS FUNCTION IS DEPRECATED AND WILL BE REMOVED SOON. Use applib_openDialog() instead.
+ *
+ * @deprecated
+ * Example: local result = app.msgbox("Test123", {[1] = "Yes", [2] = "No"})
+ * Pops up a message box with two buttons "Yes" and "No" and returns 1 for yes, 2 for no
+ */
+static int applib_msgbox(lua_State* L) {
+    const char* msg = luaL_checkstring(L, 1);
+
+    // discard any extra arguments passed in
+    lua_settop(L, 2);
+    luaL_checktype(L, 2, LUA_TTABLE);
+
+    lua_pushnil(L);  // initial key for table traversal with `next`
+
+    std::vector<XojMsgBox::Button> buttons;
+
+    while (lua_next(L, 2) != 0) {
+        int index = static_cast<int>(lua_tointeger(L, -2));
+        const char* buttonText = luaL_checkstring(L, -1);
+        lua_pop(L, 1);
+
+        buttons.emplace_back(buttonText, index);
+    }
+
+    Plugin* plugin = Plugin::getPluginFromLua(L);
+
+    int result = XojMsgBox::askPluginQuestion(plugin->getName(), msg, buttons);
+    lua_pushinteger(L, result);
+    return 1;
+}
+
+/**
+ * Open a dialog with arbitrary text and buttons (with callbacks)
+ *
+ * @param message string
+ * @param options table<integer, string> integer to button texts
+ * @param cb string name of the callback function(button:integer) to call on user interaction
+ * @param error boolean is this message an error (optional)
+ *
+ * Example 1: app.openDialog("Test123", {[1] = "Yes", [2] = "No"}, "cb", false)
+ *   or       app.openDialog("Test123", {"Yes", "No"}, "cb")
+ * Pops up a message box with two buttons "Yes" and "No" and executed function "cb" whose single parameter is the number
+ * corresponding to the button the user clicked.
+ *
+ * If the optional boolean parameter is true, the dialog is treated as an error message
+ * Example 2: app.openDialog("Invalid parameter", {"Ok"}, "", true)
+ *
+ * Warning: the callback function is never called if the dialog is closed without pressing one of the custom buttons.
+ */
+static int applib_openDialog(lua_State* L) {
+    const char* msg = luaL_checkstring(L, 1);
+
+    // discard any extra arguments passed in
+    lua_settop(L, 4);
+    luaL_checktype(L, 2, LUA_TTABLE);
+
+    lua_pushnil(L);  // initial key for table traversal with `next`
+
+    std::vector<XojMsgBox::Button> buttons;
+
+    while (lua_next(L, 2) != 0) {
+        int index = static_cast<int>(lua_tointeger(L, -2));
+        const char* buttonText = luaL_checkstring(L, -1);
+        lua_pop(L, 1);
+
+        buttons.emplace_back(buttonText, index);
+    }
+
+    std::string cb = luaL_optstring(L, 3, "");
+    bool error = lua_toboolean(L, 4);
+
+    Plugin* plugin = Plugin::getPluginFromLua(L);
+
+    const std::string& pluginName = plugin->getName();
+    auto header = (error ? std::string("<b>Error in </b>") : "") + std::string("Xournal++ Plugin «") + pluginName + "»";
+
+    XojMsgBox::askQuestionWithMarkup(nullptr, header, msg, buttons, [cb, plugin](int response) {
+        if (cb != "" && response >= 1) {
+            plugin->callFunction(cb, static_cast<ptrdiff_t>(response));
+        }
+    });
+
+    return 0;
+}
+
+
+/**
+ * Allow to register menupoints and toolbar buttons. This needs to be called from initUi
+ *
+ * @param opts {menu: string, callback: string, toolbarID: string, mode:integer, accelerator:string} options (`mode`,
+ `toolbarID` and `accelerator` are optional)
+ * @return {menuId:integer}
+ *
+ * Example 1: app.registerUi({["menu"] = "HelloWorld", callback="printMessage", mode=1, accelerator="<Control>a"})
+ * registers a menupoint with name "HelloWorld" executing a function named "printMessage", in mode 1,
+ * which can be triggered via the "<Control>a" keyboard accelerator
+ *
+ * Example 2: app.registerUi({callback ="blueDashedPen", toolbarId="CUSTOM_PEN_1", iconName="bluePenIcon"})
+ * registers a toolbar icon named "bluePenIcon" executing a function named "blueDashedPen", which can be added
+ * to a toolbar via toolbar customization or by editing the toolbar.ini file using the name "Plugin::CUSTOM_PEN_1"
+ * Note that in toolbar.ini the string "Plugin::" must always be prepended to the toolbarId specified in the plugin
+ *
+ * The mode and accelerator are optional. When specifying the mode, the callback function should have one parameter
+   that receives the mode. This is useful for callback functions that are shared among multiple menu entries.
+ */
+static int applib_registerUi(lua_State* L) {
+    Plugin* plugin = Plugin::getPluginFromLua(L);
+    if (!plugin->isInInitUi()) {
+        return luaL_error(L, "registerUi needs to be called within initUi()");
+    }
+
+    // discard any extra arguments passed in
+    lua_settop(L, 1);
+    luaL_checktype(L, 1, LUA_TTABLE);
+
+    // Now to get the data out of the table
+    // 'unpack' the table by putting the values onto
+    // the stack first. Then convert those stack values
+    // into an appropriate C type.
+    lua_getfield(L, 1, "accelerator");
+    lua_getfield(L, 1, "menu");
+    lua_getfield(L, 1, "callback");
+    lua_getfield(L, 1, "mode");
+    lua_getfield(L, 1, "toolbarId");
+    lua_getfield(L, 1, "iconName");
+    // In Example 1 stack now has following:
+    //    1 = {"menu"="MenuName", callback="functionName", mode=1, accelerator="<Control>a"}
+    //   -6 = "<Control>a"
+    //   -5 = "MenuName"
+    //   -4 = "functionName"
+    //   -3 = mode
+    //   -2 = nil
+    //   -1 = nil
+
+    const char* accelerator = luaL_optstring(L, -6, "");
+    const char* menu = luaL_optstring(L, -5, "");
+    const char* callback = luaL_optstring(L, -4, nullptr);
+    const ptrdiff_t mode = luaL_optinteger(L, -3, std::numeric_limits<ptrdiff_t>::max());
+    const char* toolbarId = luaL_optstring(L, -2, "");
+    const char* iconName = luaL_optstring(L, -1, "");
+    if (callback == nullptr) {
+        return luaL_error(L, "Missing callback function!");
+    }
+
+    size_t menuId = plugin->registerMenu(menu, callback, mode, accelerator);
+    plugin->registerToolButton(menu, toolbarId, iconName, callback, mode);
+
+    // Make sure to remove all vars which are put to the stack before!
+    lua_pop(L, 6);
+
+    // Add return value to the Stack
+    lua_createtable(L, 0, 2);
+
+    lua_pushstring(L, "menuId");
+    lua_pushinteger(L, as_signed(menuId));
+    lua_settable(L, -3); /* 3rd element from the stack top */
+
+    return 1;
+}
+
+/**
+ * Helper function to convert Lua stack items to GVariant*
+ * Returns a floating reference to a new GVariant instance.
+ */
+GVariant* lua_to_gvariant(lua_State* L, int idx, const GVariantType* typeHint) {
+    if (!typeHint) {
+        return nullptr;
+    }
+    std::string typeString =
+            std::string(g_variant_type_peek_string(typeHint), g_variant_type_get_string_length(typeHint));
+    if (typeString.length() > 1) {
+        g_warning("Unsupported type: %s", typeString.c_str());
+        return nullptr;
+    }
+    const char* luaTypeName = lua_typename(L, lua_type(L, idx));
+
+    switch (typeString[0]) {
+        case 'b':  // Expecting boolean
+            return g_variant_new_boolean(lua_toboolean(L, idx));
+        case 'i':  // Expecting int32
+            if (!lua_isinteger(L, idx)) {
+                luaL_error(L, "Expected: int32, provided: %s", luaTypeName);
+            }
+            return g_variant_new_int32(lua_tointeger(L, idx));
+        case 't':  // Expecting uint64
+            if (!lua_isinteger(L, idx)) {
+                luaL_error(L, "Expected: uint64, provided: %s", luaTypeName);
+            }
+            return g_variant_new_uint64(as_unsigned(lua_tointeger(L, idx)));
+        case 'u':  // Expecting uint32 (Color)
+            if (!lua_isinteger(L, idx)) {
+                luaL_error(L, "Expected: uint32, provided: %s", luaTypeName);
+            }
+            return g_variant_new_uint32(as_unsigned(lua_tointeger(L, idx)));
+        case 'd':  // Expecting double
+            if (!lua_isnumber(L, idx)) {
+                luaL_error(L, "Expected double, provided: %s", luaTypeName);
+            }
+            return g_variant_new_double(lua_tonumber(L, idx));
+        case 's':  // Expecting string
+            if (!lua_isstring(L, idx)) {
+                luaL_error(L, "Expected string, provided: %s", luaTypeName);
+            }
+            return g_variant_new_string(lua_tostring(L, idx));
+        default:
+            g_warning("Unhandled type: %s", typeString.c_str());
+            return nullptr;
+    }
+}
+
+void lua_push_gvariant(lua_State* L, GVariant* state, const GVariantType* typeHint) {
+    std::string typeString =
+            std::string(g_variant_type_peek_string(typeHint), g_variant_type_get_string_length(typeHint));
+    if (typeString.length() > 1) {
+        g_warning("Unsupported type: %s", typeString.c_str());
+        lua_pushnil(L);
+        return;
+    }
+
+    switch (typeString[0]) {
+        case 'b':  // Expecting boolean
+            lua_pushboolean(L, getGVariantValue<bool>(state));
+            break;
+        case 'i':  // Expecting int32
+            lua_pushinteger(L, getGVariantValue<int32_t>(state));
+            break;
+        case 't':  // Expecting uint64
+            lua_pushinteger(L, getGVariantValue<uint64_t>(state));
+            break;
+        case 'u':  // Expecting uint32
+            lua_pushinteger(L, getGVariantValue<uint32_t>(state));
+            break;
+        case 'd':  // Expecting double
+            lua_pushnumber(L, getGVariantValue<double>(state));
+            break;
+        case 's':  // Expecting string
+            lua_pushstring(L, getGVariantValue<const char*>(state));
+            break;
+        default:
+            g_warning("Unhandled type: %s", typeString.c_str());
+            lua_pushnil(L);
+    }
+}
+
+/***
+ * Change the action's state, triggering callbacks. Actions with state from an enum
+ * (like ToolType, ToolSize, EraserSize, OrderChange) should be accessed via the app.C
+ * table of constants for consistency between different versions of Xournal++
+ * @param action Action
+ * @param state any
+ *
+ * Example 1: app.changeActionState("select-tool",  app.C.Tool_text)
+ * Example 2: app.changeActionState("set-layout-vertical", false)
+ * Example 3: app.changeActionState("set-columns-or-rows", -3)      # 3 rows
+ * Example 4: app.changeActionState("tool-color", 0xff0000)         # red color
+ * Example 5: app.changeActionState("zoom", 2.25)
+ * Example 6: app.changeActionState("tool-pen-line-style", "cust: 1 5 3 5")
+ */
+static int applib_changeActionState(lua_State* L) {
+    const char* actionStr = luaL_checkstring(L, 1);
+    if (actionStr == nullptr) {
+        return luaL_error(L, "Missing action!");
+    }
+    auto optAction = Action_fromString(actionStr);
+    if (!optAction) {
+        return luaL_error(L, "Invalid action name: \"%s\"", actionStr);
+    }
+    Action action = optAction.value();
+
+    Plugin* plugin = Plugin::getPluginFromLua(L);
+    Control* control = plugin->getControl();
+    auto* actionDB = control->getActionDatabase();
+    GAction* gAction = G_ACTION(actionDB->getAction(action).get());
+
+    auto* type = g_action_get_state_type(gAction);
+    GVariant* state = lua_to_gvariant(L, 2, type);
+
+    actionDB->fireChangeActionState(action, state);
+    return 0;
+}
+
+/***
+ * Get the action's state. For actions with state from an enum
+ * (like ToolType, ToolSize, EraserSize, OrderChange) the return value should
+ * be compared to the app.C table of constants for consistency between different
+ * versions of Xournal++
+ * @param action Action
+ *
+ * Example 1: if app.getActionState("select-tool") == app.C.Tool_text then
+ *               print("Currently the text tool is selected")
+ *            end
+ * Example 2: app.getActionState("set-layout-vertical")    -- whether the layout is vertical or not
+ * Example 3: app.getActionState("set-columns-or-rows")    -- number of columns (positive values) or rows (negative
+ * values) Example 4: app.getActionState("tool-color")             -- current color Example 5:
+ * app.getActionState("zoom")                   -- current zoom value Example 6:
+ * app.getActionState("tool-pen-line-style")    -- current pen line style (as a string)
+ */
+static int applib_getActionState(lua_State* L) {
+    const char* actionStr = luaL_checkstring(L, 1);
+    if (actionStr == nullptr) {
+        return luaL_error(L, "Missing action!");
+    }
+    auto optAction = Action_fromString(actionStr);
+    if (!optAction) {
+        return luaL_error(L, "Invalid action name: \"%s\"", actionStr);
+    }
+    Action action = optAction.value();
+    Plugin* plugin = Plugin::getPluginFromLua(L);
+    Control* control = plugin->getControl();
+    auto* actionDB = control->getActionDatabase();
+    GAction* gAction = G_ACTION(actionDB->getAction(action).get());
+    auto* state = g_action_get_state(gAction);
+    auto* type = g_action_get_state_type(gAction);
+    lua_push_gvariant(L, state, type);
+    return 1;
+}
+
+/***
+ * Activate the action, triggering callbacks. Actions with state from an enum
+ * (like ToolType, ToolSize, EraserSize, OrderChange) should be accessed via the app.C
+ * table of constants for consistency between different versions of Xournal++
+ * @param action Action
+ * @param state nil | any
+ *
+ * Example 1: app.activateAction("arrange-selection-order", app.C.OrderChange.bringForward)
+ * Example 2: app.activateAction("setsquare")
+ * Example 3: app.activateAction("tool-fill")
+ */
+static int applib_activateAction(lua_State* L) {
+    const char* actionStr = luaL_checkstring(L, 1);
+    if (actionStr == nullptr) {
+        return luaL_error(L, "Missing action!");
+    }
+    auto optAction = Action_fromString(actionStr);
+    if (!optAction) {
+        return luaL_error(L, "Invalid action name: \"%s\"", actionStr);
+    }
+    Action action = optAction.value();
+    Plugin* plugin = Plugin::getPluginFromLua(L);
+    Control* control = plugin->getControl();
+    auto* actionDB = control->getActionDatabase();
+    GAction* gAction = G_ACTION(actionDB->getAction(action).get());
+
+    auto* type = g_action_get_parameter_type(gAction);
+    GVariant* state = lua_to_gvariant(L, 2, type);
+    if (state) {
+        actionDB->fireActivateAction(action, state);
+    } else {
+        actionDB->fireActivateAction(action);
+    }
+    return 0;
+}
+
+
+/**
+ * THIS FUNCTION IS DEPRECATED AND WILL BE REMOVED SOON. Use applib_changeActionState or
+ * applib_activateAction instead.
+ *
+ * @deprecated
+ * Execute an UI action (usually internally called from Toolbar / Menu)
+ * The argument consists of a Lua table with 3 keys: "action", "group" and "enabled"
+ * The key "group" is currently only used for debugging purpose and can safely be omitted.
+ * The key "enabled" is true by default.
+ *
+ * @param opts {action: string, enabled:boolean} options (`enabled` is `true` by default)
+ *
+ * Example 1: app.uiAction({["action"] = "ACTION_PASTE"})
+ * pastes the clipboard content into the document
+ *
+ * Example 2: app.uiAction({["action"] = "ACTION_TOOL_DRAW_ELLIPSE", ["enabled"] = false})
+ * turns off the Ellipse drawing type
+ */
+static int applib_uiAction(lua_State* L) {
+    Plugin* plugin = Plugin::getPluginFromLua(L);
+
+    // discard any extra arguments passed in
+    lua_settop(L, 1);
+    luaL_checktype(L, 1, LUA_TTABLE);
+
+    lua_getfield(L, 1, "enabled");
+    lua_getfield(L, 1, "action");
+    // stack now has following:
+    //    1 = {["action"] = "ACTION_GRID_SNAPPING", ["group"] = "GROUP_GRID_SNAPPING", ["enabled"] = true}
+    //   -2 = true
+    //   -1 = "ACTION_GRID_SNAPPING"
+
+    bool enabled = lua_isboolean(L, -2) ? lua_toboolean(L, -2) : true;
+
+    const char* actionStr = luaL_optstring(L, -1, nullptr);
+    if (actionStr == nullptr) {
+        return luaL_error(L, "Missing action!");
+    }
+
+    ActionBackwardCompatibilityLayer::actionPerformed(plugin->getControl(), actionStr, enabled);
+
+    return 0;
+}
+
+/**
+ * THIS FUNCTION IS DEPRECATED AND WILL BE REMOVED SOON. Use applib_activateAction instead.
+ *
+ * @deprecated
+ * Execute action from sidebar menu
+ *
+ * @param action string the desired action
+ *
+ * Example: app.sidebarAction("MOVE_DOWN")
+ * moves down the current page or layer, depending on which sidebar tab is selected
+ */
+static int applib_sidebarAction(lua_State* L) {
+    // Connect the context menu actions
+    const std::map<std::string, Action> actionMapPage = {
+            {"COPY", Action::DUPLICATE_PAGE},
+            {"DELETE", Action::DELETE_PAGE},
+            {"MOVE_UP", Action::MOVE_PAGE_TOWARDS_BEGINNING},
+            {"MOVE_DOWN", Action::MOVE_PAGE_TOWARDS_END},
+            {"NEW_BEFORE", Action::NEW_PAGE_BEFORE},
+            {"NEW_AFTER", Action::NEW_PAGE_AFTER},
+    };
+    const std::map<std::string, Action> actionMapLayer = {
+            {"COPY", Action::LAYER_COPY},
+            {"DELETE", Action::LAYER_DELETE},
+            {"MOVE_UP", Action::LAYER_MOVE_UP},
+            {"MOVE_DOWN", Action::LAYER_MOVE_DOWN},
+            {"MERGE_DOWN", Action::LAYER_MERGE_DOWN},
+    };
+    const char* actionStr = luaL_checkstring(L, 1);
+    if (actionStr == nullptr) {
+        return luaL_error(L, "Missing action!");
+    }
+    Plugin* plugin = Plugin::getPluginFromLua(L);
+    Control* control = plugin->getControl();
+    size_t tab = control->getSidebar()->getSelectedTab();
+
+    if (tab == 0) {
+        return luaL_error(L, "Currently selected sidebar tab does not have any actions");
+    }
+
+    const auto actionMap = (tab == 1) ? actionMapPage : actionMapLayer;
+    auto pos = actionMap.find(actionStr);
+    if (pos == actionMap.end()) {
+        return luaL_error(L, "Unknown action: %s", actionStr);
+    }
+
+    auto* actionDB = control->getActionDatabase();
+    actionDB->fireActivateAction(pos->second);
+
+    return 0;
+}
+
+/**
+ * THIS FUNCTION IS DEPRECATED AND WILL BE REMOVED SOON. No substitute needed.
+ *
+ * @deprecated
+ * Get the index of the currently active sidebar-page.
+ *
+ * @return integer pageNr pageNr of the sidebar page
+ *
+ * Example: app.getSidebarPageNo() -- returns e.g. 1
+ */
+static int applib_getSidebarPageNo(lua_State* L) {
+    Plugin* plugin = Plugin::getPluginFromLua(L);
+    Sidebar* sidebar = plugin->getControl()->getSidebar();
+    lua_pushinteger(L, as_signed(sidebar->getSelectedTab()) + 1);
+    return 1;
+}
+
+/**
+ * THIS FUNCTION IS DEPRECATED AND WILL BE REMOVED SOON. No substitute needed.
+ *
+ * @deprecated
+ * Set the currently active sidebar-page by its index.
+ *
+ * @param pageNr integer pageNr of the sidebar page
+ *
+ * Look at src/core/gui/sidebar/Sidebar.cpp to find out which index corresponds to which page (e.g. currently 1 is the
+ * page with the TOC/index if available). Note that indexing the sidebar-pages starts at 1 (as usual in lua).
+ *
+ * Example: app.setSidebarPageNo(3) -- sets the sidebar-page to preview Layer
+ */
+static int applib_setSidebarPageNo(lua_State* L) {
+    Plugin* plugin = Plugin::getPluginFromLua(L);
+    Sidebar* sidebar = plugin->getControl()->getSidebar();
+
+    // Discard any extra arguments passed in
+    lua_settop(L, 1);
+    if (!lua_isinteger(L, 1)) {
+        return luaL_error(L, "Missing pageNo for setSidebarPageNo!");
+    }
+
+    auto page = static_cast<int>(lua_tointeger(L, 1));
+    if (page <= 0) {
+        lua_pushnil(L);
+        lua_pushfstring(L, "Invalid pageNo (%d) provided!", page);
+        return 2;
+    }
+    if (as_unsigned(page) > sidebar->getNumberOfTabs()) {
+        lua_pushnil(L);
+        lua_pushfstring(L, "Invalid pageNo (%d >= %d) provided!", page, sidebar->getNumberOfTabs());
+        return 2;
+    }
+
+    sidebar->setSelectedTab(as_unsigned(page) - 1);
+    return 0;
+}
+
+/**
+ * THIS FUNCTION IS DEPRECATED AND WILL BE REMOVED SOON. Use applib_activateAction instead.
+ *
+ * @deprecated
+ * Execute action from layer controller
+ *
+ * @param action string the desired action
+ *
+ * Example: app.layerAction("ACTION_DELETE_LAYER")
+ * deletes the current layer
+ */
+static int applib_layerAction(lua_State* L) {
+    Plugin* plugin = Plugin::getPluginFromLua(L);
+
+    const char* actionStr = luaL_checkstring(L, 1);
+    if (actionStr == nullptr) {
+        return luaL_error(L, "Missing action!");
+    }
+    ActionBackwardCompatibilityLayer::actionPerformed(plugin->getControl(), actionStr, true);
+
+    return 0;
+}
+
+/**
+ * Show the floating toolbox at the specified coordinates relative to the main window
+ *
+ * @param x integer x coordinate relative to main window
+ * @param y integer y coordinate relative to main window
+ *
+ * Example: app.showFloatingToolbox(100, 200)
+ * Shows the floating toolbox at position (100, 200) relative to the main window
+ *
+ * Note: Coordinates are automatically clamped to window bounds.
+ */
+static int applib_showFloatingToolbox(lua_State* L) {
+    Plugin* plugin = Plugin::getPluginFromLua(L);
+    int x = static_cast<int>(luaL_checkinteger(L, 1));
+    int y = static_cast<int>(luaL_checkinteger(L, 2));
+
+    plugin->getControl()->showFloatingToolbox(x, y);
+    return 0;
+}
+
+/**
+ * Helper function to handle a allowUndoRedoAction string parameter. allowUndoRedoAction can take the following values:
+ * - "grouped": the elements get a single undo-redo-action
+ * - "individual" each of the elements get an own undo-redo-action
+ * - "none": no undo-redo-action will be inserted
+ * If an invalid value is being passed as allowUndoRedoAction this function errors.
+ * If there are no elements emits a warning and does not add an UndoAction.
+ */
+static int handleUndoRedoActionHelper(lua_State* L, Control* control, const char* allowUndoRedoAction,
+                                      const std::vector<const Element*>& elements) {
+    if (elements.empty()) {
+        g_warning("No elements, therefore not adding an undo action");
+        return 0;
+    }
+    if (strcmp("grouped", allowUndoRedoAction) == 0) {
+        PageRef const& page = control->getCurrentPage();
+        Layer* layer = page->getSelectedLayer();
+        UndoRedoHandler* undo = control->getUndoRedoHandler();
+        undo->addUndoAction(std::make_unique<InsertsUndoAction>(page, layer, elements));
+    } else if (strcmp("individual", allowUndoRedoAction) == 0) {
+        PageRef const& page = control->getCurrentPage();
+        Layer* layer = page->getSelectedLayer();
+        UndoRedoHandler* undo = control->getUndoRedoHandler();
+        for (const Element* element: elements) {
+            undo->addUndoAction(std::make_unique<InsertUndoAction>(page, layer, element));
+        }
+    } else if (strcmp("none", allowUndoRedoAction) == 0) {
+        g_warning("Not allowing undo/redo action.");
+    } else {
+        return luaL_error(L, "Unrecognized undo/redo option: %s", allowUndoRedoAction);
+    }
+    return 0;
+}
+
+
+/**
+ * Helper function for API adding elements. Empties the stack and then pushes the pointers
+ * to all elements in the given vector into a table on the stack.
+ */
+static void refsHelper(lua_State* L, std::vector<const Element*> elements) {
+    lua_settop(L, 0);
+    lua_newtable(L);
+    size_t count = 0;
+    for (const Element* element: elements) {
+        lua_pushinteger(L, strict_cast<lua_Integer>(++count));                           // index
+        lua_pushlightuserdata(L, const_cast<void*>(static_cast<const void*>(element)));  // value
+        lua_settable(L, -3);                                                             // insert
+    }
+}
+
+/**
+ * Helper function for addStroke API. Parses pen settings from API call, taking
+ * in a Stroke and a chosen Layer, sets the pen settings, and applies the stroke.
+ */
+static void addStrokeHelper(lua_State* L, std::unique_ptr<Stroke> stroke) {
+    Plugin* plugin = Plugin::getPluginFromLua(L);
+    Control* ctrl = plugin->getControl();
+    PageRef const& page = ctrl->getCurrentPage();
+    Layer* layer = page->getSelectedLayer();
+
+    std::string size;
+    double thickness;
+    int fillOpacity;
+    bool filled;
+    Color color;
+    std::string lineStyle;
+    ToolHandler* toolHandler;
+    const char* tool;
+    std::string allowUndoRedoAction;
+
+    // Get attributes.
+    lua_getfield(L, -1, "tool");
+    lua_getfield(L, -2, "width");
+    lua_getfield(L, -3, "color");
+    lua_getfield(L, -4, "fill");
+    lua_getfield(L, -5, "lineStyle");
+    // stack now has following:
+    //   -6 = table
+    //   -5 = tool
+    //   -4 = width
+    //   -3 = color
+    //   -2 = fill
+    //   -1 = lineStyle
+
+    tool = luaL_optstring(L, -5, "");  // We're gonna need the tool type.
+
+    toolHandler = ctrl->getToolHandler();
+
+    // TODO: (willnilges) Handle DrawingType?
+    // TODO: (willnilges) Break out Eraser functionality into a new API call.
+
+    // Set tool type
+    if (strcmp("highlighter", tool) == 0) {
+        stroke->setToolType(StrokeTool::HIGHLIGHTER);
+
+        size = toolSizeToString(toolHandler->getHighlighterSize());
+        thickness = toolHandler->getToolThickness(TOOL_HIGHLIGHTER)[toolSizeFromString(size)];
+
+        fillOpacity = toolHandler->getHighlighterFill();
+        filled = toolHandler->getHighlighterFillEnabled();
+
+        Tool& tool = toolHandler->getTool(TOOL_HIGHLIGHTER);
+        color = tool.getColor();
+    } else {
+        if (!(strcmp("pen", tool) == 0)) {
+            g_warning("%s", FC(_F("Unknown stroke type: \"{1}\", defaulting to pen") % tool));
+        }
+        stroke->setToolType(StrokeTool::PEN);
+
+        size = toolSizeToString(toolHandler->getPenSize());
+        thickness = toolHandler->getToolThickness(TOOL_PEN)[toolSizeFromString(size)];
+
+        fillOpacity = toolHandler->getPenFill();
+        filled = toolHandler->getPenFillEnabled();
+
+        Tool& tool = toolHandler->getTool(TOOL_PEN);
+        color = tool.getColor();
+        lineStyle = StrokeStyle::formatStyle(tool.getLineStyle());
+    }
+
+    // Set width
+    if (lua_isnumber(L, -4)) {  // Check if the width was provided
+        stroke->setWidth(lua_tonumber(L, -4));
+    } else {
+        stroke->setWidth(thickness);
+    }
+
+    // Set color
+    if (lua_isinteger(L, -3)) {  // Check if the color was provided
+        stroke->setColor(static_cast<Color>(static_cast<uint32_t>(as_unsigned(lua_tointeger(L, -3)))));
+    } else {
+        stroke->setColor(color);
+    }
+
+    // Set fill
+    if (lua_isinteger(L, -2)) {  // Check if fill settings were provided
+        stroke->setFill(static_cast<int>(lua_tointeger(L, -2)));
+    } else if (filled) {
+        stroke->setFill(fillOpacity);
+    } else {
+        stroke->setFill(-1);  // No fill
+    }
+
+    // Set line style
+    if (lua_isstring(L, -1)) {  // Check if line style settings were provided
+        stroke->setLineStyle(StrokeStyle::parseStyle(lua_tostring(L, -1)));
+    } else {
+        stroke->setLineStyle(StrokeStyle::parseStyle(lineStyle.data()));
+    }
+
+    // stack cleanup is needed as this is a helper function
+    lua_pop(L, 5);  // Finally done with all that Lua data.
+
+    // Add the stroke
+    {
+        std::lock_guard lock(*ctrl->getDocument());
+        layer->addElement(std::move(stroke));
+    }
+    return;
+}
+
+/**
+ * Given a table containing a series of splines, draws a batch of strokes on the canvas.
+ * Expects a table of tables containing eight coordinate pairs, along with attributes of the stroke.
+ *
+ * @param opts {splines:{coordinates:number[], tool:string, width:number, color:integer, fill:number,
+ * linestyle:string}[], allowUndoRedoAction:string}
+ * @return lightuserdata[] references to the created strokes
+ *
+ * Required Arguments: splines
+ * Optional Arguments: pressure, tool, width, color, fill, lineStyle
+ *
+ * If optional arguments are not provided, the specified tool settings are used.
+ * If the tool is not provided, the current pen settings are used.
+ * The only tools supported are Pen and Highlighter.
+ *
+ * The function expects 8 points per spline segment. Due to the nature of cubic
+ * splines, you must pass your points in a repeating pattern:
+ * startX, startY, ctrl1X, ctrl1Y, ctrl2X, ctrl2Y, endX, endY, startX, startY, ...
+ *
+ * The function checks that the length of the coordinate table is divisible by eight, and will throw
+ * an error if it is not.
+ *
+ * Example: local refs = app.addSplines({
+ *            ["splines"] = { -- The outer table is a table of strokes
+ *                ["coordinates"] = { -- Each inner table is a coord stream that represents SplineSegments that can be
+ * assembled into a stroke
+ *                  [1] = 880.0, // Every eight coordinates (4 pairs) is a SplineSegment
+ *                  [2] = 874.0,
+ *                  [3] = 881.3295,
+ *                  [4] = 851.5736,
+ *                  [5] = 877.2915,
+ *                  [6] = 828.2946,
+ *                  [7] = 875.1697,
+ *                  [8] = 806.0,
+ *                  ... -- A spline can be made up of as many SplineSegments as is necessary.
+ *                },
+ *                -- Tool options are also specified per-stroke
+ *                ["width"] = 1.4,
+ *                ["color"] = 0xff0000,
+ *                ["fill"] = 0,
+ *                ["tool"] = "pen",
+ *                ["lineStyle"] = "plain"
+ *            },
+ *            ["allowUndoRedoAction"] = "grouped", -- Each batch of splines can be grouped into one undo/redo action (or
+ * "individual" or "none")
+ *        })
+ */
+static int applib_addSplines(lua_State* L) {
+    Plugin* plugin = Plugin::getPluginFromLua(L);
+    Control* ctrl = plugin->getControl();
+    std::vector<const Element*> strokes;
+    const char* allowUndoRedoAction;
+
+    // Discard any extra arguments passed in
+    lua_settop(L, 1);
+    luaL_checktype(L, 1, LUA_TTABLE);
+
+    lua_getfield(L, 1, "splines");
+    if (!lua_istable(L, -1)) {
+        return luaL_error(L, "Missing spline table!");
+    }
+
+    // stack now has following:
+    //  1 = table arg
+    // -1 = splines
+
+    size_t numSplines = lua_rawlen(L, -1);
+    for (size_t a = 1; a <= numSplines; a++) {
+        std::vector<double> coordStream;
+        auto stroke = std::make_unique<Stroke>();
+        // Get coordinates
+        lua_pushinteger(L, as_signed(a));
+        lua_gettable(L, -2);                 // get current spline from splines table
+        lua_getfield(L, -1, "coordinates");  // get coordinates of the current spline
+        if (!lua_istable(L, -1)) {
+            return luaL_error(L, "Missing coordinate table!");
+        }
+        size_t numCoords = lua_rawlen(L, -1);
+        for (size_t b = 1; b <= numCoords; b++) {
+            lua_pushinteger(L, as_signed(b));
+            lua_gettable(L, -2);  // get current coordinate from coordinates
+            double point = lua_tonumber(L, -1);
+            coordStream.push_back(point);  // Each segment is going to have multiples of 8 points.
+            lua_pop(L, 1);                 // cleanup fetched coordinate
+        }
+        // pop value + copy of key, leaving original key
+        lua_pop(L, 1);  // cleanup coordinates table
+        // Handle those points
+        // Check if the list is divisible by 8.
+        if (coordStream.size() % 8 != 0) {
+            return luaL_error(L, "Point table incomplete!");
+        }
+
+        // Now take that gigantic list of splines and create SplineSegments out of them.
+        long unsigned int i = 0;
+        while (i < coordStream.size()) {
+            // start, ctrl1, ctrl2, end
+            Point start = Point(coordStream.at(i), coordStream.at(i + 1), Point::NO_PRESSURE);
+            Point ctrl1 = Point(coordStream.at(i + 2), coordStream.at(i + 3), Point::NO_PRESSURE);
+            Point ctrl2 = Point(coordStream.at(i + 4), coordStream.at(i + 5), Point::NO_PRESSURE);
+            Point end = Point(coordStream.at(i + 6), coordStream.at(i + 7), Point::NO_PRESSURE);
+            i += 8;
+            SplineSegment segment = SplineSegment(start, ctrl1, ctrl2, end);
+            std::list<Point> raster = segment.toPointSequence();
+            for (Point point: raster) {
+                stroke->addPoint(point);
+            }
+            // TODO: (willnilges) Is there a way we can get Pressure with Splines?
+        }
+
+        if (stroke->getPointCount() >= 2) {
+            // Finish building the Stroke and apply it to the layer.
+            strokes.push_back(stroke.get());
+            addStrokeHelper(L, std::move(stroke));
+        } else {
+            g_warning("Stroke shorter than two points. Discarding. (Has %zu)", stroke->getPointCount());
+        }
+        // Onto the next stroke
+        lua_pop(L, 1);  // cleanup current spline
+    }
+
+    // Stack is now the same as it was on entry to this function
+    lua_pop(L, 1);  // cleanup splines table
+
+    // stack now has following:
+    //  1 = table arg
+
+    // Check how the user wants to handle undoing
+    lua_getfield(L, 1, "allowUndoRedoAction");
+    allowUndoRedoAction = luaL_optstring(L, -1, "grouped");
+    lua_pop(L, 1);
+    handleUndoRedoActionHelper(L, ctrl, allowUndoRedoAction, strokes);
+
+    refsHelper(L, strokes);
+    return 1;
+}
+
+/**
+ * Given a table of sets of points, draws a batch of strokes on the canvas.
+ * Expects three tables of equal length: one for X, one for Y, and one for
+ * stroke pressure, along with attributes of the stroke. Each stroke has
+ * attributes handled individually.
+ *
+ * @param opts {strokes:{X:number[], Y:number[], pressure:number[], tool:string, width:number, color:integer,
+ * fill:number, linestyle:string}[], allowUndoRedoAction:string}
+ * @return lightuserdata[] references to the created strokes
+ *
+ * Required Arguments: X, Y
+ * Optional Arguments: pressure, tool, width, color, fill, lineStyle
+ *
+ * If optional arguments are not provided, the specified tool settings are used.
+ * If the tool is not provided, the current pen settings are used.
+ * The only tools supported are Pen and Highlighter.
+ *
+ * The function checks for consistency among table lengths, and throws an
+ * error if there is a discrepancy
+ *
+ * Example:
+ *
+ * local refs = app.addStrokes({
+ *     ["strokes"] = { -- The outer table is a table of strokes
+ *         {   -- Inside a stroke are three tables of equivalent length that represent a series of points
+ *             ["x"]        = { [1] = 110.0, [2] = 120.0, [3] = 130.0, ... },
+ *             ["y"]        = { [1] = 200.0, [2] = 205.0, [3] = 210.0, ... },
+ *             ["pressure"] = { [1] = 0.8,   [2] = 0.9,   [3] = 1.1, ... },
+ *             -- Each stroke has individually handled options
+ *             ["tool"] = "pen",
+ *             ["width"] = 3.8,
+ *             ["color"] = 0xa000f0,
+ *             ["fill"] = 0,
+ *             ["lineStyle"] = "solid",
+ *         },
+ *         {
+ *             ["x"]        = { [1] = 310.0, [2] = 320.0, [3] = 330.0, ... },
+ *             ["y"]        = { [1] = 300.0, [2] = 305.0, [3] = 310.0, ... },
+ *             ["pressure"] = { [1] = 3.0,   [2] = 3.0,   [3] = 3.0, ... },
+ *             ["tool"] = "pen",
+ *             ["width"] = 1.21,
+ *             ["color"] = 0x808000,
+ *             ["fill"] = 0,
+ *             ["lineStyle"] = "solid",
+ *         },
+ *         {
+ *             ["x"]        = { [1] = 27.0,  [2] = 28.0,  [3] = 30.0, ... },
+ *             ["y"]        = { [1] = 100.0, [2] = 102.3, [3] = 102.5, ... },
+ *             ["pressure"] = { [1] = 1.0,   [2] = 1.0,   [3] = 1.0, ... },
+ *             ["tool"] = "pen",
+ *             ["width"] = 1.0,
+ *             ["color"] = 0x00aaaa,
+ *             ["fill"] = 0,
+ *             ["lineStyle"] = "dashdot",
+ *         },
+ *     },
+ *     ["allowUndoRedoAction"] = "grouped", -- Each batch of strokes can be grouped into one undo/redo action (or
+ * "individual" or "none")
+ * })
+ */
+static int applib_addStrokes(lua_State* L) {
+    Plugin* plugin = Plugin::getPluginFromLua(L);
+    Control* ctrl = plugin->getControl();
+    std::vector<const Element*> strokes;
+    const char* allowUndoRedoAction;
+
+    // Discard any extra arguments passed in
+    lua_settop(L, 1);
+    luaL_checktype(L, 1, LUA_TTABLE);
+
+    lua_getfield(L, 1, "strokes");
+    if (!lua_istable(L, -1)) {
+        return luaL_error(L, "Missing stroke table!");
+    }
+
+    // stack now has following:
+    //  1 = table arg
+    // -1 = strokes
+
+    size_t numStrokes = lua_rawlen(L, -1);
+    for (size_t a = 1; a <= numStrokes; a++) {
+        std::vector<double> xStream;
+        std::vector<double> yStream;
+        std::vector<double> pressureStream;
+        auto stroke = std::make_unique<Stroke>();
+
+        // Fetch table of X values from the Lua stack
+        lua_pushinteger(L, as_signed(a));
+        lua_gettable(L, -2);  // get current stroke
+
+        lua_getfield(L, -1, "x");  // get x array of current stroke
+        if (!lua_istable(L, -1)) {
+            return luaL_error(L, "Missing X-Coordinate table!");
+        }
+        size_t xPoints = lua_rawlen(L, -1);
+        for (size_t b = 1; b <= xPoints; b++) {
+            lua_pushinteger(L, as_signed(b));
+            lua_gettable(L, -2);  // get current x-Coordinate
+            double value = lua_tonumber(L, -1);
+            xStream.push_back(value);
+            lua_pop(L, 1);  // cleanup x-Coordinate
+        }
+        lua_pop(L, 1);  // cleanup x array
+
+        // Fetch table of Y values form the Lua stack
+        lua_getfield(L, -1, "y");  // get y array of current stroke
+        if (!lua_istable(L, -1)) {
+            return luaL_error(L, "Missing Y-Coordinate table!");
+        }
+        size_t yPoints = lua_rawlen(L, -1);
+        for (size_t b = 1; b <= yPoints; b++) {
+            lua_pushinteger(L, as_signed(b));
+            lua_gettable(L, -2);  // get current y-Coordinate
+            double value = lua_tonumber(L, -1);
+            yStream.push_back(value);
+            lua_pop(L, 1);  // cleanup y-Coordinate
+        }
+        lua_pop(L, 1);  // cleanup y array
+
+        // Fetch table of pressure values from the Lua stack
+        lua_getfield(L, -1, "pressure");
+        if (lua_istable(L, -1)) {
+            size_t pressurePoints = lua_rawlen(L, -1);
+            for (size_t b = 1; b <= pressurePoints; b++) {
+                lua_pushinteger(L, as_signed(b));
+                lua_gettable(L, -2);  // get current pressure
+                double value = lua_tonumber(L, -1);
+                pressureStream.push_back(value);
+                lua_pop(L, 1);  // cleanup pressure
+            }
+        }
+
+        lua_pop(L, 1);  // cleanup pressure array
+
+        // Handle those points
+        // Make sure all vectors are the same length.
+        if (xStream.size() != yStream.size()) {
+            return luaL_error(L, "X and Y vectors are not equal length!");
+        }
+        if (xStream.size() != pressureStream.size() && pressureStream.size() > 0) {
+            return luaL_error(L, "Pressure vector is not equal length!");
+        }
+
+        // Check and make sure there's enough points (need at least 2)
+        if (xStream.size() < 2) {
+            g_warning("Stroke shorter than two points. Discarding. (Has %zu/2)", xStream.size());
+            return 1;
+        }
+        // Add points to the stroke. Include pressure, if it exists.
+        if (pressureStream.size() > 0) {
+            for (long unsigned int i = 0; i < xStream.size(); i++) {
+                Point myPoint = Point(xStream.at(i), yStream.at(i), pressureStream.at(i));
+                stroke->addPoint(myPoint);
+            }
+        } else {
+            for (long unsigned int i = 0; i < xStream.size(); i++) {
+                Point myPoint = Point(xStream.at(i), yStream.at(i), Point::NO_PRESSURE);
+                stroke->addPoint(myPoint);
+            }
+        }
+
+        // Finish building the Stroke and apply it to the layer.
+        strokes.push_back(stroke.get());
+        addStrokeHelper(L, std::move(stroke));
+        // Onto the next stroke
+        lua_pop(L, 1);  // cleanup stroke table
+    }
+
+    // stack now has following:
+    //  1 = table arg
+    // -1 = strokes
+
+    // Check how the user wants to handle undoing
+    lua_getfield(L, 1, "allowUndoRedoAction");
+    allowUndoRedoAction = luaL_optstring(L, -1, "grouped");
+    if (strcmp("grouped", allowUndoRedoAction) == 0) {
+        PageRef const& page = ctrl->getCurrentPage();
+        Layer* layer = page->getSelectedLayer();
+        UndoRedoHandler* undo = ctrl->getUndoRedoHandler();
+        undo->addUndoAction(std::make_unique<InsertsUndoAction>(page, layer, strokes));
+    } else if (strcmp("individual", allowUndoRedoAction) == 0) {
+        PageRef const& page = ctrl->getCurrentPage();
+        Layer* layer = page->getSelectedLayer();
+        UndoRedoHandler* undo = ctrl->getUndoRedoHandler();
+        for (const Element* element: strokes) {
+            undo->addUndoAction(std::make_unique<InsertUndoAction>(page, layer, element));
+        }
+    } else if (strcmp("none", allowUndoRedoAction) == 0)
+        g_warning("Not allowing undo/redo action.");
+    else {
+        return luaL_error(L, "Unrecognized undo/redo option: %s", allowUndoRedoAction);
+    }
+    refsHelper(L, strokes);
+    return 1;
+}
+
+/**
+ * Adds textboxes as specified to the current layer.
+ *
+ * Global parameters:
+ *   - texts table: array of text-parameter-tables
+ *   - allowUndoRedoAction string: Decides how the change gets introduced into the undoRedo action list "individual",
+ * "grouped" or "none"
+ *
+ * @param opts {texts:{text:string, font:{name:string, size:number}, color:integer, x:number, y:number}[],
+ * allowUndoRedoAction:string}
+ * @return lightuserdata[] references to the created text elements
+ *
+ * Parameters per textbox:
+ *   - text string: content of the textbox (required)
+ *   - font table {name string, size number} (default: currently configured font/size from the settings)
+ *   - color integer: RGB hex code for the text-color (default: color of text tool)
+ *   - x number: x-position of the box (upper left corner) (required)
+ *   - y number: y-position of the box (upper left corner) (required)
+ *
+ * Example:
+ *
+ * local refs = app.addTexts{texts={
+ *   {
+ *     text="Hello World",
+ *     font={name="Noto Sans Mono Medium", size=8.0},
+ *     color=0x1259b9,
+ *     x = 50.0,
+ *     y = 50.0,
+ *   },
+ *   {
+ *     text="Testing",
+ *     font={name="Noto Sans Mono Medium", size=8.0},
+ *     color=0x0,
+ *     x = 150.0,
+ *     y = 50.0,
+ *   },
+ * }
+ */
+static int applib_addTexts(lua_State* L) {
+    Plugin* plugin = Plugin::getPluginFromLua(L);
+    Control* control = plugin->getControl();
+    PageRef const& page = control->getCurrentPage();
+    Layer* layer = page->getSelectedLayer();
+    Settings* settings = control->getSettings();
+
+    std::vector<const Element*> texts;
+
+    // Discard any extra arguments passed in
+    lua_settop(L, 1);
+    luaL_checktype(L, 1, LUA_TTABLE);
+
+    lua_getfield(L, 1, "texts");
+    if (!lua_istable(L, -1)) {
+        return luaL_error(L, "Missing text table!");
+    }
+
+    // stack now has following:
+    //  1 = table arg
+    // -1 = texts array
+
+    // get default color
+    ToolHandler* toolHandler = control->getToolHandler();
+    Tool& tool = toolHandler->getTool(TOOL_TEXT);
+    Color default_color = tool.getColor();
+    // default font
+    XojFont& default_font = settings->getFont();
+
+    size_t numTexts = lua_rawlen(L, -1);
+    for (size_t a = 1; a <= numTexts; a++) {
+        auto text = std::make_unique<Text>();
+
+        // Fetch table of X values from the Lua stack
+        lua_pushinteger(L, as_signed(a));
+        lua_gettable(L, -2);  // get current text
+        luaL_checktype(L, -1, LUA_TTABLE);
+
+        lua_getfield(L, -1, "text");
+
+        // handle font table
+        lua_getfield(L, -2, "font");  // {name="", size=0}
+        if (lua_istable(L, -1)) {
+            lua_getfield(L, -1, "name");
+            lua_getfield(L, -2, "size");
+        } else if (lua_isnil(L, -1)) {
+            // push two dummy values if font is unset/no table
+            lua_pushnil(L);
+            lua_pushnil(L);
+        } else {
+            return luaL_error(L, "'font' value must be a table!");
+        }
+
+        lua_getfield(L, -5, "color");
+        lua_getfield(L, -6, "x");
+        lua_getfield(L, -7, "y");
+
+        // stack now has following:
+        //    1 = global params table
+        //   -9 = texts array
+        //   -8 = current text-params table
+        //   -7 = text
+        //   -6 = font-table
+        //   -5 = fontname
+        //   -4 = fontsize
+        //   -3 = color
+        //   -2 = x
+        //   -1 = y
+
+        if (!lua_isstring(L, -7)) {
+            return luaL_error(L, "Missing text!/'text' must be a string");
+        }
+        text->setText(lua_tostring(L, -7));
+
+        XojFont font{};
+        font.setName(luaL_optstring(L, -5, default_font.getName().c_str()));
+        font.setSize(luaL_optnumber(L, -4, default_font.getSize()));
+        text->setFont(font);
+
+        if (lua_isinteger(L, -3)) {  // Check if the color was provided
+            uint32_t color = static_cast<uint32_t>(as_unsigned(lua_tointeger(L, -3)));
+            if (color > 0xffffff) {
+                std::stringstream msg;
+                msg << "Color 0x" << std::hex << color << " is no valid RGB color.";
+                return luaL_error(L, msg.str().c_str());  // luaL_error does not support %x for hex numbers
+            }
+            text->setColor(Color(color | 0xff000000U));
+        } else if (lua_isnil(L, -3)) {
+            text->setColor(default_color);
+        } else {
+            return luaL_error(L, "'color' must be an integer/hex-code or unset");
+        }
+
+        if (!lua_isnumber(L, -2)) {  // Check if x was provided
+            return luaL_error(L, "Missing X-Coordinate!/must be a number");
+        }
+        text->setX(lua_tonumber(L, -2));
+
+        if (!lua_isnumber(L, -1)) {  // Check if y was provided
+            return luaL_error(L, "Missing Y-Coordinate!/must be a number");
+        }
+        text->setY(lua_tonumber(L, -1));
+
+        lua_pop(L, 8);  // remove values read out from the text table + text-table itself
+
+        // Finish building the Text and apply it to the layer.
+        texts.push_back(text.get());
+        {
+            std::lock_guard lock(*control->getDocument());
+            layer->addElement(std::move(text));
+        }
+        // Onto the next text
+    }
+
+    // stack now has following:
+    //  1 = table arg
+    // -1 = texts array
+
+
+    lua_getfield(L, 1, "allowUndoRedoAction");
+    const char* allowUndoRedoAction = luaL_optstring(L, -1, "grouped");
+    lua_pop(L, 1);
+    handleUndoRedoActionHelper(L, control, allowUndoRedoAction, texts);
+
+    refsHelper(L, texts);
+    return 1;
+}
+
+/**
+ * Returns a list of lua table of the texts (from current selection / current layer).
+ * Is mostly inverse to app.addTexts (except getTexts will also retrieve the width/height of the textbox)
+ *
+ * @param type string "selection" or "layer"
+ * @return {text:string, font:{name:string, size:number}, color:integer, x:number, y:number, width:number,
+ * height:number, ref:lightuserdata}[] texts
+ *
+ * Required argument: type ("selection" or "layer")
+ *
+ * Example: local texts = app.getTexts("layer")
+ *
+ * possible return value:
+ * {
+ *   {
+ *     text = "Hello World",
+ *     font = {
+ *             name = "Noto Sans Mono Medium",
+ *             size = 8.0,
+ *            },
+ *     color = 0x1259b9,
+ *     x = 127.0,
+ *     y = 70.0,
+ *     width = 55.0,
+ *     height = 23.0,
+ *     ref = userdata: 0x5f644c0700d0
+ *   },
+ *   {
+ *     text = "Testing",
+ *     font = {
+ *             name = "Noto Sans Mono Medium",
+ *             size = 8.0,
+ *            },
+ *     color = 0x0,
+ *     x = 150.0,
+ *     y = 70.0,
+ *     width = 55.0,
+ *     height = 23.0,
+ *     ref = userdata: 0x5f644c0701e8
+ *   },
+ * }
+ *
+ */
+static int applib_getTexts(lua_State* L) {
+    Plugin* plugin = Plugin::getPluginFromLua(L);
+    std::string type = luaL_checkstring(L, 1);
+    Control* control = plugin->getControl();
+
+    // Discard any extra arguments passed in
+    lua_settop(L, 1);
+    luaL_checktype(L, 1, LUA_TSTRING);
+
+    const auto& [err, elements] = getElementsFromHelper(control, type);
+    if (err.has_value()) {
+        return luaL_error(L, err.value().c_str());
+    }
+
+    lua_newtable(L);  // create table of the elements
+    int currTextNo = 0;
+
+    // stack now has following:
+    //  1 = type (string)
+    // -1 = table of texts (to be returned)
+
+    for (const Element* e: elements) {
+        if (e->getType() == ELEMENT_TEXT) {
+            auto* t = static_cast<const Text*>(e);
+            lua_pushinteger(L, ++currTextNo);  // index for later (settable)
+            lua_newtable(L);                   // create text table
+
+            // stack now has following:
+            //  1 = type (string)
+            // -3 = table of texts (to be returned)
+            // -2 = index of the current text
+            // -1 = current text table
+
+            lua_pushstring(L, t->getText().c_str());
+            lua_setfield(L, -2, "text");  // add text to text element
+
+            lua_newtable(L);  // font table to stack
+            lua_pushstring(L, t->getFontName().c_str());
+            lua_setfield(L, -2, "name");  // add font to text
+            lua_pushnumber(L, t->getFontSize());
+            lua_setfield(L, -2, "size");  // add size to text
+            lua_setfield(L, -2, "font");  // insert font-table to text element
+
+            lua_pushinteger(L, as_signed(uint32_t(t->getColor()) & 0xffffffU));
+            lua_setfield(L, -2, "color");  // add color to text
+
+            lua_pushnumber(L, t->getX());
+            lua_setfield(L, -2, "x");  // add x coordindate to text
+
+            lua_pushnumber(L, t->getY());
+            lua_setfield(L, -2, "y");  // add y coordinate to text
+
+            lua_pushnumber(L, t->getElementWidth());
+            lua_setfield(L, -2, "width");  // add width to text
+
+            lua_pushnumber(L, t->getElementHeight());
+            lua_setfield(L, -2, "height");  // add height to text
+
+            lua_pushlightuserdata(L, const_cast<void*>(static_cast<const void*>(t)));
+            lua_setfield(L, -2, "ref");
+
+            lua_settable(L, -3);  // add text to elements
+        }
+    }
+    return 1;
+}
+
+/**
+ * Puts a Lua Table of the Strokes (from the selection tool / selected layer) onto the stack.
+ * Is inverse to app.addStrokes
+ *
+ * @param type string "selection" or "layer"
+ * @return {x:number[], y:number[], pressure:number[], tool:string, width:number, color:integer, fill:number,
+ * linestyle:string, ref:lightuserdata}[] strokes
+ *
+ * Required argument: type ("selection" or "layer")
+ *
+ * Example: local strokes = app.getStrokes("selection")
+ *
+ * possible return value:
+ * {
+ *         {   -- Inside a stroke are three tables of equivalent length that represent a series of points
+ *             ["x"]        = { [1] = 110.0, [2] = 120.0, [3] = 130.0, ... },
+ *             ["y"]        = { [1] = 200.0, [2] = 205.0, [3] = 210.0, ... },
+ *             -- pressure is only present if pressure is set -> pressure member might be nil
+ *             ["pressure"] = { [1] = 0.8,   [2] = 0.9,   [3] = 1.1, ... },
+ *             -- Each stroke has individually handled options
+ *             ["tool"] = "pen",
+ *             ["width"] = 3.8,
+ *             ["color"] = 0xa000f0,
+ *             ["fill"] = 0,
+ *             ["lineStyle"] = "plain",
+ *             ["ref"] = userdata: 0x5f644c02c538
+ *         },
+ *         {
+ *             ["x"]         = {207, 207.5, 315.2, 315.29, 207.5844},
+ *             ["y"]         = {108, 167.4, 167.4, 108.70, 108.7094},
+ *             ["tool"]      = "pen",
+ *             ["width"]     = 0.85,
+ *             ["color"]     = 16744448,
+ *             ["fill"]      = -1,
+ *             ["lineStyle"] = "plain",
+ *             ["ref"] = userdata: 0x5f644c02d440
+ *         },
+ *         {
+ *             ["x"]         = {387.60, 387.6042, 500.879, 500.87, 387.604},
+ *             ["y"]         = {153.14, 215.8661, 215.866, 153.14, 153.148},
+ *             ["tool"]      = "pen",
+ *             ["width"]     = 0.85,
+ *             ["color"]     = 16744448,
+ *             ["fill"]      = -1,
+ *             ["lineStyle"] = "plain",
+ *             ["ref"] = userdata: 0x5f644c0700d0
+ *         },
+ * }
+ */
+static int applib_getStrokes(lua_State* L) {
+    Plugin* plugin = Plugin::getPluginFromLua(L);
+    std::string type = luaL_checkstring(L, 1);
+    Control* control = plugin->getControl();
+
+    // Discard any extra arguments passed in
+    lua_settop(L, 1);
+    luaL_checktype(L, 1, LUA_TSTRING);
+
+    const auto& [err, elements] = getElementsFromHelper(control, type);
+    if (err.has_value()) {
+        return luaL_error(L, err.value().c_str());
+    }
+
+    lua_newtable(L);  // create table of the elements
+    int currStrokeNo = 0;
+    int currPointNo = 0;
+
+    // stack now has following:
+    //  1 = type (string)
+    // -1 = table of strokes (to be returned)
+
+    for (const Element* e: elements) {
+        if (e->getType() == ELEMENT_STROKE) {
+            auto* s = static_cast<const Stroke*>(e);
+            lua_pushinteger(L, ++currStrokeNo);  // index for later (settable)
+            lua_newtable(L);                     // create stroke table
+
+            // stack now has following:
+            //  1 = type (string)
+            // -3 = table of strokes (to be returned)
+            // -2 = index of the current stroke
+            // -1 = current stroke
+
+            lua_newtable(L);  // create table of x-coordinates
+            for (auto p: s->getPointVector()) {
+                lua_pushinteger(L, ++currPointNo);  // key
+                lua_pushnumber(L, p.x);             // value
+                lua_settable(L, -3);                // insert
+            }
+            lua_setfield(L, -2, "x");  // add x-coordinates to stroke
+            currPointNo = 0;
+
+            lua_newtable(L);  // create table for y-coordinates
+            for (auto p: s->getPointVector()) {
+                lua_pushinteger(L, ++currPointNo);  // key
+                lua_pushnumber(L, p.y);             // value
+                lua_settable(L, -3);                // insert
+            }
+            lua_setfield(L, -2, "y");  // add y-coordinates to stroke
+            currPointNo = 0;
+
+            if (s->hasPressure()) {
+                lua_newtable(L);  // create table for pressures
+                for (auto p: s->getPointVector()) {
+                    lua_pushinteger(L, ++currPointNo);  // key
+                    lua_pushnumber(L, p.z);             // value
+                    lua_settable(L, -3);                // insert
+                }
+                lua_setfield(L, -2, "pressure");  // add pressures to stroke
+                currPointNo = 0;
+            }
+
+            // stack now has following:
+            //  1 = type (string)
+            // -3 = table of strokes (to be returned)
+            // -2 = index of the current stroke
+            // -1 = current stroke
+
+            StrokeTool tool = s->getToolType();
+            if (tool == StrokeTool::PEN) {
+                lua_pushstring(L, "pen");
+            } else if (tool == StrokeTool::ERASER) {
+                lua_pushstring(L, "eraser");
+            } else if (tool == StrokeTool::HIGHLIGHTER) {
+                lua_pushstring(L, "highlighter");
+            } else {
+                return luaL_error(L, "Unknown StrokeTool::Value.");
+            }
+            lua_setfield(L, -2, "tool");  // add tool to stroke
+
+            lua_pushnumber(L, s->getWidth());
+            lua_setfield(L, -2, "width");  // add width to stroke
+
+            lua_pushinteger(L, as_signed(uint32_t(s->getColor()) & 0xffffffU));
+            lua_setfield(L, -2, "color");  // add color to stroke
+
+            lua_pushinteger(L, s->getFill());
+            lua_setfield(L, -2, "fill");  // add fill to stroke
+
+            lua_pushstring(L, StrokeStyle::formatStyle(s->getLineStyle()).c_str());
+            lua_setfield(L, -2, "lineStyle");  // add linestyle to stroke
+
+            lua_pushlightuserdata(L, const_cast<void*>(static_cast<const void*>(s)));
+            lua_setfield(L, -2, "ref");
+
+            lua_settable(L, -3);  // add stroke to returned table
+        }
+    }
+    return 1;
+}
+
+/**
+ * Notifies program of any updates to the working document caused
+ * by the API.
+ *
+ * Example: app.refreshPage()
+ */
+static int applib_refreshPage(lua_State* L) {
+    Plugin* plugin = Plugin::getPluginFromLua(L);
+    Control* ctrl = plugin->getControl();
+    PageRef const& page = ctrl->getCurrentPage();
+    if (page) {
+        page->firePageChanged();
+    } else {
+        return luaL_error(L, "Called applib_refreshPage, but there is no current page.");
+    }
+    return 0;
+}
+
+/**
+ * Change page background of current page
+ *
+ * @param background string backgroundType (e.g. "graph")
+ *
+ * Example: app.changeCurrentPageBackground("graph")
+ * changes the page background of the current page to graph paper
+ */
+static int applib_changeCurrentPageBackground(lua_State* L) {
+    PageType pt;
+    pt.format = PageTypeHandler::getPageTypeFormatForString(luaL_checkstring(L, 1));
+    pt.config = luaL_optstring(L, 2, "");
+
+    Plugin* plugin = Plugin::getPluginFromLua(L);
+    Control* ctrl = plugin->getControl();
+    PageBackgroundChangeController* pageBgCtrl = ctrl->getPageBackgroundChangeController();
+    pageBgCtrl->changeCurrentPageBackground(pt);
+
+    return 0;
+}
+
+/**
+ * Query all colors of the current palette.
+ *
+ * @return {color: integer, name: string}[] options
+ *
+ * Example: palette = app.getColorPalette()
+ * possible return value:
+ * {
+ *     [1] = {color = 0xffffff, name = "white" },
+ *     [2] = {color = 0x000000, name = "black" },
+ *     [3] = {color = 0xdc8a78, name = "Rosewater" },
+ * }
+ *
+ */
+static int applib_getColorPalette(lua_State* L) {
+    // discard any extra arguments passed in
+    lua_settop(L, 0);
+
+    Plugin* plugin = Plugin::getPluginFromLua(L);
+    const Palette& palette = plugin->getControl()->getPalette();
+
+
+    lua_newtable(L);  // return table
+    for (size_t i = 0; i < palette.size(); i++) {
+        lua_pushinteger(L, as_signed(i) + 1);  // index in return table
+        lua_newtable(L);                       // item table
+
+        const auto& col = palette.getColorAt(i);
+        lua_pushstring(L, col.getName().c_str());
+        lua_setfield(L, -2, "name");
+        lua_pushinteger(L, as_signed(uint32_t(col.getColor()) & 0xffffffU));
+        lua_setfield(L, -2, "color");
+
+        lua_settable(L, -3);
+    }
+    return 1;
+}
+
+/**
+ * Change color of a specified tool or of the current tool
+ *
+ * @param opts {color: integer, tool: string, selection: boolean} options (`selection=true` -> new color applies to
+ * active selection as well, `tool=nil` (unset) -> currently active tool is being used)
+ *
+ * Example 1: app.changeToolColor({["color"] = 0xff00ff, ["tool"] = "PEN"})
+ * changes the color of the pen tool to violet without applying this change to the current selection
+ *
+ * Example 2: app.changeToolColor({["color"] = 0xff0000, ["selection"] = true })
+ * changes the color of the current tool to red and also applies it to the current selection if there is one
+ */
+static int applib_changeToolColor(lua_State* L) {
+
+    // discard any extra arguments passed in
+    lua_settop(L, 1);
+    luaL_checktype(L, 1, LUA_TTABLE);
+
+    lua_getfield(L, 1, "selection"); /* either true or false, for changing selection color
+                                       defaults to false*/
+    lua_getfield(L, 1, "tool");      /* "pen", "highlighter", "text"
+                                      "select_rect", "select_object", "select_region"
+                                      if omitted, current Tool is used */
+    lua_getfield(L, 1, "color");     // an RGB hex code defining the color
+    // stack now has following:
+    //    1 = {["color"] = 0xff00ff, ["tool"] = "PEN", ["selection"] = true}
+    //   -3 = true
+    //   -2 = "pen"
+    //   -1 = 0xff0077
+
+    Plugin* plugin = Plugin::getPluginFromLua(L);
+    Control* ctrl = plugin->getControl();
+    ToolHandler* toolHandler = ctrl->getToolHandler();
+
+    bool selection = false;
+    if (lua_isboolean(L, -3)) {
+        selection = lua_toboolean(L, -3);
+    } else if (!lua_isnil(L, -3)) {
+        return luaL_error(L, ""
+                             "selection"
+                             " key should be a boolean value (or nil)");
+    }
+
+    ToolType toolType = toolHandler->getToolType();
+    const char* toolStr = luaL_optstring(L, -2, nullptr);
+    if (toolStr != nullptr) {
+        toolType = toolTypeFromString(toolStr);
+        if (toolType == TOOL_NONE) {  // for backwards compatibility
+            toolType = toolTypeFromString(StringUtils::toLowerCase(toolStr));
+        }
+    }
+
+    if (toolType == TOOL_NONE) {
+        lua_pop(L, 3);
+        return luaL_error(L, "tool \"%s\" is not valid or no tool has been selected",
+                          toolTypeToString(toolType).data());
+    }
+
+    uint32_t color = 0x000000;
+    if (lua_isinteger(L, -1)) {
+        color = static_cast<uint32_t>(as_unsigned(lua_tointeger(L, -1)));
+        if (color > 0xffffff) {
+            std::stringstream msg;
+            msg << "Color 0x" << std::hex << color << " is too large. Use 0xRRGGBB format.";
+            return luaL_error(L, msg.str().c_str());  // luaL_error does not support %x for hex numbers
+        }
+    } else if (!lua_isnil(L, -1)) {
+        return luaL_error(L, " "
+                             "color"
+                             " key should be an RGB hex code in the form 0xRRGGBB (or nil)");
+    }
+
+    Tool& tool = toolHandler->getTool(toolType);
+
+    if (tool.hasCapability(TOOL_CAP_COLOR)) {
+        uint8_t currentAlpha = tool.getColor().alpha;
+        Color newColor = Color(color | (static_cast<uint32_t>(currentAlpha) << 24));
+        tool.setColor(newColor);
+        ctrl->toolColorChanged();
+        if (selection) {
+            ctrl->changeColorOfSelection();
+        }
+    } else {
+        return luaL_error(L, "tool \"%s\" has no color capability", toolTypeToString(toolType).data());
+    }
+
+    return 0;
+}
+
+/**
+ * Select Background Pdf Page for Current Page
+ * First argument is an integer (page number) and the second argument is a boolean (isRelative)
+ * specifying whether the page number is relative to the current pdf page or absolute
+ *
+ * @param pageNr integer page-nunmber
+ * @param relative boolean should `pageNr` be interpreted relative?
+ *
+ * Example 1: app.changeBackgroundPdfPageNr(1, true)
+ * changes the pdf page to the next one (relative mode)
+ *
+ * Example 2: app.changeBackgroundPdfPageNr(7, false)
+ * changes the page background to the 7th pdf page (absolute mode)
+ */
+static int applib_changeBackgroundPdfPageNr(lua_State* L) {
+    Plugin* plugin = Plugin::getPluginFromLua(L);
+
+    size_t nr = as_unsigned(luaL_checkinteger(L, 1));
+    bool relative = true;
+    if (lua_isboolean(L, 2)) {
+        relative = lua_toboolean(L, 2);
+    }
+
+    Control* control = plugin->getControl();
+    Document* doc = control->getDocument();
+    PageRef const& page = control->getCurrentPage();
+
+    if (!page) {
+        return luaL_error(L, "No page!");
+    }
+
+    size_t selected = nr - 1;
+    if (relative) {
+        bool isPdf = page->getBackgroundType().isPdfPage();
+        if (isPdf) {
+            selected = page->getPdfPageNr() + nr;
+        } else {
+            return luaL_error(L, "Current page has no pdf background, cannot use relative mode!");
+        }
+    }
+    if (selected < doc->getPdfPageCount()) {
+        std::lock_guard lock(*doc);
+
+        // no need to set a type, if we set the page number the type is also set
+        page->setBackgroundPdfPageNr(selected);
+
+        XojPdfPageSPtr p = doc->getPdfPage(selected);
+        page->setSize(p->getWidth(), p->getHeight());
+    } else {
+        return luaL_error(L, "Pdf page number %d does not exist!", selected + 1);
+    }
+
+    return 0;
+}
+
+/*
+ * pushes an rectangle (width, height, x, y) to the lua stack as a new table
+ * in most cases you'll want to do a
+ * lua_newtable(L);  // create rectangle table
+ * before and a
+ * lua_setfield(L, -2, "rectangleTable");  // add rectangle table to other table
+ * after this function
+ */
+static void pushRectangleHelper(lua_State* L, xoj::util::Rectangle<double> rect) {
+    lua_pushnumber(L, rect.width);
+    lua_setfield(L, -2, "width");
+    lua_pushnumber(L, rect.height);
+    lua_setfield(L, -2, "height");
+    lua_pushnumber(L, rect.x);
+    lua_setfield(L, -2, "x");
+    lua_pushnumber(L, rect.y);
+    lua_setfield(L, -2, "y");
+}
+
+/**
+ * Returns a table encoding all info on the chosen tool (active, pen, highlighter, eraser or text) in a Lua table.
+ *
+ * @param tool string tool to get the information for
+ * @return {} info varies a lot depending on the tool
+ *
+ * The Lua table will be of one of the following shapes
+ *
+ * for pen:
+ * {
+ *   "size" = string
+ *   "color" = integer
+ *   "filled" = bool
+ *   "fillOpacity" = integer (0 to 255)
+ *   "drawingType" = string
+ *   "lineStyle" = string
+ * }
+ *
+ * See /src/control/ToolEnums.cpp for possible values of "size".
+ *
+ * for text:
+ * {
+ *   "font" = {
+ *     name = string.
+ *     size = number
+ *   }
+ *   "color" = integer
+ * }
+ *
+ * for active tool:
+ * {
+ *   "type" = string
+ *   "size" = {
+ *     name = string.
+ *     value = number
+ *   }
+ *   "color" = integer
+ *   "fillOpacity" = integer (0 to 255)
+ *   "drawingType" = string
+ *   "lineStyle" = string
+ *   "thickness" = number
+ * }
+ *
+ * See /src/control/ToolEnums.cpp for possible values of "type", "size", "drawingType" and "lineStyle".
+ *
+ * for eraser:
+ * {
+ *   "type" = string
+ *   "size" = string
+ * }
+ *
+ * See /src/control/ToolEnums.cpp for possible values of "type" and "size".
+ *
+ * for highlighter:
+ * {
+ *   "size" = string
+ *   "color" = integer
+ *   "filled" = bool
+ *   "fillOpacity" = integer (0 to 255)
+ *   "drawingType" = string
+ * }
+ *
+ * See /src/control/ToolEnums.cpp for possible values of "size".
+ *
+ * for selection:
+ * {
+ *   -- bounding box as drawn in the UI (includes padding on all sides)
+ *   "boundingBox" = {
+ *      "width"  = number
+ *      "height" = number
+ *      "x"      = number
+ *      "y"      = number
+ *   }
+ *   -- same as "boundingBox" but the state before any transformation was applied
+ *   "originalBounds" = {
+ *      "width"  = number
+ *      "height" = number
+ *      "x"      = number
+ *      "y"      = number
+ *   }
+ *   -- bounds used for snapping (doesn't include padding and doesn't account to line width)
+ *   -- for more information see https://github.com/xournalpp/xournalpp/pull/4359#issuecomment-1304395011
+ *   "snappedBounds" = {
+ *      "width"  = number
+ *      "height" = number
+ *      "x"      = number
+ *      "y"      = number
+ *   }
+ *   "rotation" = number
+ *   "isRotationSupported" = bool
+ * }
+ *
+ * Example 1: local penInfo = app.getToolInfo("pen")
+ *            local size = penInfo["size"]
+ *            local opacity = penInfo["fillOpacity"]
+ * *
+ * Example 2: local font = app.getToolInfo("text")["font"]
+ *            local fontname = font["name"]
+ *            local fontsize = font["size"]
+ *
+ * Example 3: local color = app.getToolInfo("text")["color"]
+ *            local red = color >> 16 & 0xff
+ *            local green = color >> 8 & 0xff
+ *            local blue = color & 0xff
+ *
+ * Example 4: local activeToolInfo = app.getToolInfo("active")
+ *            local thickness = activeToolInfo["thickness"]
+ *            local drawingType = activeToolInfo["drawingType"]
+ *
+ * Example 5: local eraserInfo = app.getToolInfo("eraser")
+ *            local type = eraserInfo["type"]
+ *            local size = eraserInfo["size"]
+ *            local sizeName = size["name"]
+ *            local thickness = size["value"]
+ *
+ * Example 6: local highlighterInfo = app.getToolInfo("highlighter")
+ *            local sizeName = highlighterInfo["size"]["name"]
+ *            local opacity = highlighterInfo["fillOpacity"]
+ *
+ * Example 7: local selectionInfo = app.getToolInfo("selection")
+ *            local rotation = selectionInfo["rotation"]
+ *            local boundingX = selectionInfo["boundingBox"]["x"]
+ *            local snappedBoundsWidth = selectionInfo["snappedBounds"]["width"]
+ */
+static int applib_getToolInfo(lua_State* L) {
+    Plugin* plugin = Plugin::getPluginFromLua(L);
+    Control* control = plugin->getControl();
+    ToolHandler* toolHandler = control->getToolHandler();
+
+    // discard any extra arguments passed in
+    lua_settop(L, 1);
+    luaL_checktype(L, 1, LUA_TSTRING);
+
+    const char* mode = luaL_checkstring(L, -1);
+    lua_newtable(L);  // return table
+
+    // stack now has following:
+    //    1 = mode
+    //   -1 = table to be returned
+
+    if (strcmp(mode, "active") == 0) {
+        auto toolType = toolTypeToString(toolHandler->getToolType());
+
+        auto toolSize = toolSizeToString(toolHandler->getSize());
+        double thickness = toolHandler->getThickness();
+
+        Color color = toolHandler->getColor();
+        int fillOpacity = toolHandler->getFill();
+        auto drawingType = drawingTypeToString(toolHandler->getDrawingType());
+        auto lineStyle = StrokeStyle::formatStyle(toolHandler->getLineStyle());
+
+
+        lua_pushstring(L, toolType.data());   // value
+        lua_setfield(L, -2, "type");          // insert
+
+        lua_newtable(L);  // beginning of "size" table
+
+        lua_pushstring(L, toolSize.data());   // value
+        lua_setfield(L, -2, "name");          // insert
+
+        lua_pushnumber(L, thickness);  // value
+        lua_setfield(L, -2, "value");  // insert
+
+        lua_setfield(L, -2, "size");  // end of "size" table
+
+        lua_pushinteger(L, as_signed(uint32_t(color) & 0xffffffU));  // value
+        lua_setfield(L, -2, "color");                                // insert
+
+        lua_pushinteger(L, fillOpacity);     // value
+        lua_setfield(L, -2, "fillOpacity");  // insert
+
+        lua_pushstring(L, drawingType.data());   // value
+        lua_setfield(L, -2, "drawingType");      // insert
+
+        lua_pushstring(L, lineStyle.data());   // value
+        lua_setfield(L, -2, "lineStyle");      // insert
+    } else if (strcmp(mode, "pen") == 0) {
+        auto size = toolSizeToString(toolHandler->getPenSize());
+        double thickness = toolHandler->getToolThickness(TOOL_PEN)[toolSizeFromString(size.data())];
+
+        int fillOpacity = toolHandler->getPenFill();
+        bool filled = toolHandler->getPenFillEnabled();
+
+        Tool& tool = toolHandler->getTool(TOOL_PEN);
+        Color color = tool.getColor();
+        auto drawingType = drawingTypeToString(tool.getDrawingType());
+        std::string lineStyle = StrokeStyle::formatStyle(tool.getLineStyle());
+
+        lua_newtable(L);  // beginning of "size" table
+
+        lua_pushstring(L, size.data());   // value
+        lua_setfield(L, -2, "name");      // insert
+
+        lua_pushnumber(L, thickness);  // value
+        lua_setfield(L, -2, "value");  // insert
+
+        lua_setfield(L, -2, "size");  // end of "size" table
+
+        lua_pushinteger(L, as_signed(uint32_t(color) & 0xffffffU));  // value
+        lua_setfield(L, -2, "color");                                // insert
+
+        lua_pushstring(L, drawingType.data());   // value
+        lua_setfield(L, -2, "drawingType");      // insert
+
+        lua_pushstring(L, lineStyle.c_str());  // value
+        lua_setfield(L, -2, "lineStyle");      // insert
+
+        lua_pushboolean(L, filled);     // value
+        lua_setfield(L, -2, "filled");  // insert
+
+        lua_pushinteger(L, fillOpacity);     // value
+        lua_setfield(L, -2, "fillOpacity");  // insert
+    } else if (strcmp(mode, "highlighter") == 0) {
+        auto size = toolSizeToString(toolHandler->getHighlighterSize());
+        double thickness = toolHandler->getToolThickness(TOOL_HIGHLIGHTER)[toolSizeFromString(size.data())];
+
+        int fillOpacity = toolHandler->getHighlighterFill();
+        bool filled = toolHandler->getHighlighterFillEnabled();
+
+        Tool& tool = toolHandler->getTool(TOOL_HIGHLIGHTER);
+        Color color = tool.getColor();
+        auto drawingType = drawingTypeToString(tool.getDrawingType());
+
+        lua_newtable(L);  // beginning of "size" table
+
+        lua_pushstring(L, size.data());   // value
+        lua_setfield(L, -2, "name");      // insert
+
+        lua_pushnumber(L, thickness);  // value
+        lua_setfield(L, -2, "value");  // insert
+
+        lua_setfield(L, -2, "size");  // end of "size" table
+
+        lua_pushinteger(L, as_signed(uint32_t(color) & 0xffffffU));  // value
+        lua_setfield(L, -2, "color");                                // insert
+
+        lua_pushstring(L, drawingType.data());   // value
+        lua_setfield(L, -2, "drawingType");      // insert
+
+        lua_pushboolean(L, filled);     // value
+        lua_setfield(L, -2, "filled");  // insert
+
+        lua_pushinteger(L, fillOpacity);     // value
+        lua_setfield(L, -2, "fillOpacity");  // insert
+    } else if (strcmp(mode, "eraser") == 0) {
+        auto type = eraserTypeToString(toolHandler->getEraserType());
+
+        auto size = toolSizeToString(toolHandler->getEraserSize());
+        double thickness = toolHandler->getToolThickness(ToolType::TOOL_ERASER)[toolSizeFromString(size.data())];
+
+        lua_pushstring(L, type.data());   // value
+        lua_setfield(L, -2, "type");      // insert
+
+        lua_newtable(L);  // beginning of "size" table
+
+        lua_pushstring(L, size.data());   // value
+        lua_setfield(L, -2, "name");      // insert
+
+        lua_pushnumber(L, thickness);  // value
+        lua_setfield(L, -2, "value");  // insert
+
+        lua_setfield(L, -2, "size");  // end of "size" table
+    } else if (strcmp(mode, "text") == 0) {
+        Settings* settings = control->getSettings();
+        XojFont& font = settings->getFont();
+        std::string fontname = font.getName();
+        double size = font.getSize();
+
+        Tool& tool = toolHandler->getTool(TOOL_TEXT);
+        Color color = tool.getColor();
+
+        lua_newtable(L);  // font table
+
+        lua_pushstring(L, fontname.c_str());  // value
+        lua_setfield(L, -2, "name");          // insert
+
+        lua_pushnumber(L, size);      // value
+        lua_setfield(L, -2, "size");  // insert
+
+        lua_setfield(L, -2, "font");  // insert font table
+
+        lua_pushinteger(L, as_signed(uint32_t(color) & 0xffffffU));  // value
+        lua_setfield(L, -2, "color");                                // insert
+        // results in {font={name="fontname", size=0}, color=0x0}
+    } else if (strcmp(mode, "selection") == 0) {
+        auto sel = control->getWindow()->getXournal()->getSelection();
+        if (!sel) {
+            return luaL_error(L, "There is no selection! ");
+        }
+        auto rect = sel->getRect();
+
+        lua_pushnumber(L, sel->getRotation());
+        lua_setfield(L, -2, "rotation");
+
+        lua_pushboolean(L, sel->isRotationSupported());
+        lua_setfield(L, -2, "isRotationSupported");
+
+        lua_newtable(L);  // create originalBounds table
+        pushRectangleHelper(L, sel->getOriginalBounds());
+        lua_setfield(L, -2, "originalBounds");  // add originalBounds table to return table
+
+        lua_newtable(L);  // create snappedBounds table
+        pushRectangleHelper(L, sel->getSnappedBounds());
+        lua_setfield(L, -2, "snappedBounds");  // add snappedBounds table to return table
+
+        lua_newtable(L);  // create boundingBox table
+        pushRectangleHelper(L, rect);
+        lua_setfield(L, -2, "boundingBox");  // add boundingBox table to return table
+    }
+    return 1;
+}
+
+/**
+ * Returns a table encoding the document structure in a Lua table.
+ *
+ * @return {pages:{pageWidth:number, pageHeight:number, isAnnotated:boolean, pageTypeFormat:string,
+ * pageTypeConfig:string, backgroundColor:integer, pdfBackgroundPageNo:integer, layers:{isVisible:boolean,
+ * isAnnotated:boolean}[], currentLayer:integer}[], currentPage:integer, pdfBackgroundFilename:string,
+ * xoppFilename:string}
+ *
+ * The shape of the returned Lua table will be:
+ * {
+ *   "pages" = {
+ *     {
+ *       "pageWidth" = number,
+ *       "pageHeight" = number,
+ *       "isAnnotated" = bool,
+ *       "pageTypeFormat" = string,
+ *       "pageTypeConfig" = string,
+ *       "backgroundColor" = integer,
+ *       "pdfBackgroundPageNo" = integer (0, if there is no pdf background page),
+ *       "layers" = {
+ *         [0] = {
+ *           "isVisible" = bool
+ *         },
+ *         [1] = {
+ *           "isVisible" = bool,
+ *           "isAnnotated" = bool
+ *         },
+ *         ...
+ *       },
+ *       "currentLayer" = integer
+ *     },
+ *     ...
+ *   }
+ *   "currentPage" = integer,
+ *   "pdfBackgroundFilename" = string (empty if there is none)
+ *   "xoppFilename" = string (empty if there is none)
+ * }
+ *
+ * Example: local docStructure = app.getDocumentStructure()
+ */
+static int applib_getDocumentStructure(lua_State* L) {
+    Plugin* plugin = Plugin::getPluginFromLua(L);
+    Control* control = plugin->getControl();
+    Document* doc = control->getDocument();
+
+    lua_newtable(L);
+
+    lua_pushliteral(L, "pages");
+    lua_newtable(L);  // beginning of pages table
+
+    // stack now has following:
+    //   -2 = table to be returned
+    //   -1 = pages table/array
+
+    // add pages
+    for (size_t p = 1; p <= doc->getPageCount(); ++p) {
+        auto page = doc->getPage(p - 1);
+        lua_pushinteger(L, as_signed(p));  // key of the page
+        lua_newtable(L);                   // beginning of table for page p
+
+        lua_pushnumber(L, page->getWidth());  // value
+        lua_setfield(L, -2, "pageWidth");     // insert
+
+        lua_pushnumber(L, page->getHeight());  // value
+        lua_setfield(L, -2, "pageHeight");     // insert
+
+        lua_pushboolean(L, page->isAnnotated());  // value
+        lua_setfield(L, -2, "isAnnotated");       // insert
+
+        PageType pt = page->getBackgroundType();
+        std::string pageTypeFormat = PageTypeHandler::getStringForPageTypeFormat(pt.format);
+        lua_pushstring(L, pageTypeFormat.c_str());  // value
+        lua_setfield(L, -2, "pageTypeFormat");      // insert
+
+        lua_pushstring(L, pt.config.c_str());   // value
+        lua_setfield(L, -2, "pageTypeConfig");  // insert
+
+        lua_pushinteger(L, as_signed(uint32_t(page->getBackgroundColor()) & 0xffffffU));  // value
+        lua_setfield(L, -2, "backgroundColor");                                           // insert
+
+        lua_pushinteger(L, as_signed(page->getPdfPageNr()) + 1);  // value
+        lua_setfield(L, -2, "pdfBackgroundPageNo");               // insert
+
+        lua_newtable(L);  // beginning of layers table
+
+        // add background layer
+        lua_pushinteger(L, 0);  // key of the layer
+        lua_newtable(L);        // beginning of table for background layer
+
+        lua_pushboolean(L, page->isLayerVisible(0U));  // value
+        lua_setfield(L, -2, "isVisible");              // insert
+
+        lua_pushstring(L, page->getBackgroundName().c_str());  // value
+        lua_setfield(L, -2, "name");                           // insert
+
+        lua_settable(L, -3);  // end of table for background layer
+
+        // add (non-background) layers
+        int currLayer = 0;
+
+        for (auto l: page->getLayers()) {
+            lua_pushinteger(L, ++currLayer);  // key of the layer
+            lua_newtable(L);                  // beginning of table for layer l
+
+            lua_pushstring(L, l->getName().c_str());  // value
+            lua_setfield(L, -2, "name");              // insert
+
+            lua_pushboolean(L, l->isVisible());  // value
+            lua_setfield(L, -2, "isVisible");    // insert
+
+            lua_pushboolean(L, l->isAnnotated());  // value
+            lua_setfield(L, -2, "isAnnotated");    // insert
+
+            lua_settable(L, -3);  // end of table for layer l
+        }
+        lua_setfield(L, -2, "layers");  // end of layers table
+
+        lua_pushinteger(L, as_signed(page->getSelectedLayerId()));  // value
+        lua_setfield(L, -2, "currentLayer");                        // insert
+
+        lua_settable(L, -3);  // end of table for page p
+    }
+    lua_settable(L, -3);  // end of pages table
+
+    lua_pushinteger(L, as_signed(control->getCurrentPageNo()) + 1);  // value
+    lua_setfield(L, -2, "currentPage");                              // insert
+
+    lua_pushstring(L, doc->getPdfFilepath().string().c_str());  // value
+    lua_setfield(L, -2, "pdfBackgroundFilename");               // insert
+
+    lua_pushstring(L, doc->getFilepath().string().c_str());  // value
+    lua_setfield(L, -2, "xoppFilename");                     // insert
+
+    return 1;
+}
+
+/**
+ * Scrolls to the page specified relatively or absolutely (by default)
+ * The page number is clamped to the range between the first and last page
+ *
+ * @param page integer (automatically clamped)
+ * @param relative boolean
+ *
+ * Example 1: app.scrollToPage(1, true)
+ * scrolls to the next page (relative mode)
+ *
+ * Example 2: app.scrollToPage(10)
+ * scrolls to page 10 (absolute mode)
+ **/
+static int applib_scrollToPage(lua_State* L) {
+    Plugin* plugin = Plugin::getPluginFromLua(L);
+    Control* control = plugin->getControl();
+
+    int val = static_cast<int>(luaL_checkinteger(L, 1));
+    bool relative = false;
+    if (lua_isboolean(L, 2)) {
+        relative = lua_toboolean(L, 2);
+    }
+    int page = (relative) ? static_cast<int>(control->getCurrentPageNo()) + val : val - 1;
+
+    const int first = 0;
+    const int last = static_cast<int>(control->getDocument()->getPageCount()) - 1;
+    control->getScrollHandler()->scrollToPage(static_cast<size_t>(std::clamp(page, first, last)));
+
+    return 0;
+}
+
+/**
+ * Scrolls to the position on the selected page specified relatively (by default) or absolutely
+ *
+ * @param x number
+ * @param y number
+ * @param relative boolean
+ *
+ * Example 1: app.scrollToPos(20,10)
+ * scrolls 20pt right and 10pt down (relative mode)
+ *
+ * Example 2: app.scrollToPos(200, 50, false)
+ * scrolls to page position 200pt right and 50pt down from the left page corner  (absolute mode)
+ **/
+static int applib_scrollToPos(lua_State* L) {
+    Plugin* plugin = Plugin::getPluginFromLua(L);
+    Control* control = plugin->getControl();
+    Layout* layout = control->getWindow()->getLayout();
+
+    double dx = luaL_checknumber(L, 1);
+    double dy = luaL_checknumber(L, 2);
+    bool relative = true;
+    if (lua_isboolean(L, 3)) {
+        relative = lua_toboolean(L, 3);
+    }
+
+    if (relative) {
+        layout->scrollRelative(dx, dy);
+    } else {
+        layout->scrollAbs(dx, dy);
+    }
+
+    return 0;
+}
+
+/**
+ * Obtains the label of the specified page in the pdf background.
+ *
+ * @param page integer
+ * @return string|nil Returns the label on success and (nil, message) if page number is out of range.
+ * @return string
+ *
+ * Example 1: local label = app.getPageLabel(10)
+ ' obtains the page label of page 10 in the background pdf
+ **/
+static int applib_getPageLabel(lua_State* L) {
+    const Plugin* plugin = Plugin::getPluginFromLua(L);
+    const Control* control = plugin->getControl();
+    const XojPdfDocument& doc = control->getDocument()->getPdfDocument();
+
+    const size_t pagenr = static_cast<size_t>(luaL_checkinteger(L, 1)) - 1;
+
+    if (pagenr >= doc.getPageCount()) {
+        lua_pushnil(L);
+        lua_pushfstring(L, "page nr %zu is out of range", pagenr);
+        return 2;
+    }
+
+    std::string label = doc.getPage(pagenr)->getPageLabel();
+    lua_pushlstring(L, label.c_str(), label.length());
+    return 1;
+}
+
+/**
+ * Sets the current page as indicated (without scrolling)
+ * The page number passed is clamped to the range between first page and last page
+ *
+ * @param pageNr integer (automatically clamped)
+ *
+ * Example: app.setCurrentPage(1)
+ * makes the first page the new current page
+ **/
+static int applib_setCurrentPage(lua_State* L) {
+    Plugin* plugin = Plugin::getPluginFromLua(L);
+    Control* control = plugin->getControl();
+    size_t pageId = as_unsigned(luaL_checkinteger(L, 1));
+    const size_t first = 1;
+    const size_t last = control->getDocument()->getPageCount();
+    control->firePageSelected(std::clamp(pageId, first, last) - 1);
+
+    return 0;
+}
+
+/**
+ * Sets the width and height of the current page in pt = 1/72 inch either relatively or absolutely (by default)
+ *
+ * @param width number
+ * @param height number
+ * @param relative boolean
+ *
+ * Example 1: app.setPageSize(595.275591, 841.889764)
+ * makes the current page have standard (A4 paper) width and height (absolute mode)
+ *
+ * Example 2: app.setPageSize(0, 14.17*6, true)
+ * adds 14.17*6 pt = 3cm to the height of the page (relative mode)
+ **/
+static int applib_setPageSize(lua_State* L) {
+    Plugin* plugin = Plugin::getPluginFromLua(L);
+    Control* control = plugin->getControl();
+    Document* doc = control->getDocument();
+    PageRef const& page = control->getCurrentPage();
+
+    if (!page) {
+        return luaL_error(L, "No page!");
+    }
+
+    double width = luaL_checknumber(L, 1);
+    double height = luaL_checknumber(L, 2);
+
+    bool relative = false;
+    if (lua_isboolean(L, 3)) {
+        relative = lua_toboolean(L, 3);
+    }
+
+    if (relative) {
+        width += page->getWidth();
+        height += page->getHeight();
+    }
+
+    if (width > 0 && height > 0) {
+        doc->lock();
+        double oldW = page->getWidth();
+        double oldH = page->getHeight();
+        Document::setPageSize(page, width, height);
+        doc->unlock();
+        control->getUndoRedoHandler()->addUndoAction(std::make_unique<PageSizeChangeUndoAction>(page, oldW, oldH));
+    }
+
+    size_t pageNo = doc->indexOf(page);
+    if (pageNo != npos && pageNo < doc->getPageCount()) {
+        control->firePageSizeChanged(pageNo);
+    }
+
+    return 0;
+}
+
+/**
+ * Sets the current layer of the current page as indicated and updates visibility if specified (by default it does not)
+ * Displays an error message, if the selected layer does not exist
+ *
+ * @param layerNr integer number of the (non-background) layer
+ * @param change_visibility boolean true -> makes all layers up to the selected one visible, all others invisible
+ *
+ * Example 1: app.setCurrentLayer(2, true)
+ * makes the second (non-background) layer the current layer and makes layers 1, 2 and the background layer visible, the
+ *others hidden
+ *
+ * Example 2: app.setCurrentLayer(2, false)
+ * makes the second (non-background) layer the current layer and does not change visibility
+ **/
+static int applib_setCurrentLayer(lua_State* L) {
+    Plugin* plugin = Plugin::getPluginFromLua(L);
+    Control* control = plugin->getControl();
+    PageRef const& page = control->getCurrentPage();
+
+    if (!page) {
+        return luaL_error(L, "No page!");
+    }
+
+    size_t layerCount = page->getLayerCount();
+    size_t layerId = as_unsigned(luaL_checkinteger(L, 1));
+
+    if (layerId > layerCount) {
+        return luaL_error(L, "No layer with layer ID %d", layerId);
+    }
+
+    bool update = false;
+    if (lua_isboolean(L, 2)) {
+        update = lua_toboolean(L, 2);
+    }
+
+    control->getLayerController()->switchToLay(layerId, update);
+
+    return 0;
+}
+
+/**
+ * Sets the visibility of the current layer
+ *
+ * @param visible boolean
+ *
+ * Example: app.setLayerVisibility(true)
+ * makes the current layer visible
+ */
+static int applib_setLayerVisibility(lua_State* L) {
+    Plugin* plugin = Plugin::getPluginFromLua(L);
+    Control* control = plugin->getControl();
+
+    bool enabled = true;
+    if (lua_isboolean(L, 1)) {
+        enabled = lua_toboolean(L, 1);
+    }
+
+    auto layerId = control->getCurrentPage()->getSelectedLayerId();
+    control->getLayerController()->setLayerVisible(layerId, enabled);
+    return 0;
+}
+
+/**
+ * Sets currently selected layer's name.
+ *
+ * @param name string
+ *
+ * Example: app.setCurrentLayerName("Custom name 1")
+ * Changes current layer name to "Custom name 1"
+ **/
+static int applib_setCurrentLayerName(lua_State* L) {
+    Plugin* plugin = Plugin::getPluginFromLua(L);
+    Control* control = plugin->getControl();
+
+    if (lua_isstring(L, 1)) {
+        auto name = lua_tostring(L, 1);
+        control->getLayerController()->setCurrentLayerName(name);
+    }
+
+    return 0;
+}
+
+/**
+ * Sets background name.
+ *
+ * @param name string
+ *
+ * Example: app.setBackgroundName("Custom name 1")
+ * Changes background name to "Custom name 1"
+ **/
+static int applib_setBackgroundName(lua_State* L) {
+    Plugin* plugin = Plugin::getPluginFromLua(L);
+    Control* control = plugin->getControl();
+    PageRef const& page = control->getCurrentPage();
+
+    if (!page) {
+        return luaL_error(L, "No page!");
+    }
+
+    if (lua_isstring(L, 1)) {
+        auto name = lua_tostring(L, 1);
+        std::lock_guard lock(*control->getDocument());
+        page->setBackgroundName(name);
+    }
+
+    return 0;
+}
+
+
+/**
+ * Gets the display DPI.
+ *
+ * @return integer displayDpi dpi of the display
+ *
+ * Example: app.getDisplayDpi()
+ **/
+static int applib_getDisplayDpi(lua_State* L) {
+    Plugin* plugin = Plugin::getPluginFromLua(L);
+    Control* control = plugin->getControl();
+    int dpi = round_cast<int>(control->getZoomControl()->getZoom100Value() * Util::DPI_NORMALIZATION_FACTOR);
+    lua_pushinteger(L, dpi);
+
+    return 1;
+}
+
+
+/**
+ * Gets the current zoom.
+ *
+ * @return double current zoom level
+ *
+ * Example: app.getZoom()
+ **/
+static int applib_getZoom(lua_State* L) {
+    Plugin* plugin = Plugin::getPluginFromLua(L);
+    Control* control = plugin->getControl();
+    double zoom = control->getZoomControl()->getZoomReal();
+    lua_pushnumber(L, zoom);
+
+    return 1;
+}
+
+
+/**
+ * Sets the current zoom.
+ *
+ * @param zoom number
+ *
+ * Example: app.setZoom(2.5)
+ * Changes zoom level to 2.5
+ **/
+static int applib_setZoom(lua_State* L) {
+    Plugin* plugin = Plugin::getPluginFromLua(L);
+    Control* control = plugin->getControl();
+    ZoomControl* zoomControl = control->getZoomControl();
+
+    double newZoom = luaL_checknumber(L, 1) * zoomControl->getZoom100Value();
+    zoomControl->setZoomFitMode(false);
+    zoomControl->startZoomSequence();
+    zoomControl->zoomSequenceChange(newZoom, false);
+    zoomControl->endZoomSequence();
+
+    return 0;
+}
+
+
+/**
+ * Exports the current document as a pdf or as a svg or png image
+ *
+ * @param opts {outputFile:string, range:string, background:string, progressiveMode: boolean}
+ *
+ * Example 1:
+ * app.export({["outputFile"] = "Test.pdf", ["range"] = "2-5; 7", ["background"] = "none", ["progressiveMode"] = true})
+ * uses progressiveMode, so for each page of the document, instead of rendering one PDF page, the page layers are
+ * rendered one by one to produce as many pages as there are layers.
+ *
+ * Example 2:
+ * app.export({["outputFile"] = "Test.svg", ["range"] = "3-", ["background"] = "unruled"})
+ *
+ * Example 3:
+ * app.export({["outputFile"] = "Test.png", ["layerRange"] = "1-2", ["background"] = "all", ["pngWidth"] = 800})
+ **/
+static int applib_export(lua_State* L) {
+    Plugin* plugin = Plugin::getPluginFromLua(L);
+    Control* control = plugin->getControl();
+    Document* doc = control->getDocument();
+
+    // discard any extra arguments passed in
+    lua_settop(L, 1);
+    luaL_checktype(L, 1, LUA_TTABLE);
+
+    lua_getfield(L, 1, "outputFile");
+    lua_getfield(L, 1, "range");
+    lua_getfield(L, 1, "layerRange");
+    lua_getfield(L, 1, "background");
+    lua_getfield(L, 1, "progressiveMode");
+    lua_getfield(L, 1, "pngDpi");
+    lua_getfield(L, 1, "pngWidth");
+    lua_getfield(L, 1, "dpiHeight");
+
+    // stack now has following:
+    //    1 = param table
+    //   -8 = outputFile
+    //   -7 = range
+    //   -6 = layerRange
+    //   -5 = background
+    //   -4 = progressiveMode
+    //   -3 = pngDpi
+    //   -2 = pngWidth
+    //   -1 = dpiHeight
+
+    const char* outputFile = luaL_optstring(L, -8, nullptr);
+    const char* range = luaL_optstring(L, -7, nullptr);
+    const char* layerRange = luaL_optstring(L, -6, nullptr);
+    const char* background = luaL_optstring(L, -5, "all");
+    bool progressiveMode = lua_toboolean(L, -4);  // true unless nil or false
+    int pngDpi = static_cast<int>(luaL_optinteger(L, -3, -1));
+    int pngWidth = static_cast<int>(luaL_optinteger(L, -2, -1));
+    int pngHeight = static_cast<int>(luaL_optinteger(L, -1, -1));
+
+    ExportBackgroundType bgType = EXPORT_BACKGROUND_ALL;
+    if (strcmp(background, "unruled") == 0) {
+        bgType = EXPORT_BACKGROUND_UNRULED;
+    } else if (strcmp(background, "none") == 0) {
+        bgType = EXPORT_BACKGROUND_NONE;
+    }
+
+    if (outputFile == nullptr) {
+        return luaL_error(L, "Missing output file!");
+    }
+
+    fs::path file = fs::path(outputFile);
+    auto extension = file.extension();
+
+    if (extension == ".pdf") {
+        ExportHelper::exportPdf(doc, outputFile, range, layerRange, bgType, progressiveMode);
+    } else if (extension == ".svg" || extension == ".png") {
+        ExportHelper::exportImg(doc, outputFile, range, layerRange, pngDpi, pngWidth, pngHeight, bgType);
+    }
+
+    return 0;
+}
+
+/**
+ * Opens a file and by default asks the user what to do with the old document.
+ * Returns true when successful, false otherwise.
+ *
+ * @param path string
+ * @param pageNr integer scroll to this page (defaults to 1)
+ * @param oldDocument boolean don't ask weather to save the old document? (defaults to false)
+ * @return boolean success
+ *
+ * Example 1: local success = app.openFile("home/username/bg.pdf")
+ *            asks what to do with the old document and loads the file afterwards, scrolls to top
+ *
+ * Example 2: local sucess = app.openFile("home/username/paintings.xopp", 3, true)
+ *            opens the file, scrolls to the 3rd page and does not ask to save the old document
+ */
+static int applib_openFile(lua_State* L) {
+    Plugin* plugin = Plugin::getPluginFromLua(L);
+    Control* control = plugin->getControl();
+
+    const char* filename = luaL_checkstring(L, 1);
+
+    int scrollToPage = 0;  // by default scroll to the same page like last time
+    if (lua_isinteger(L, 2)) {
+        scrollToPage = static_cast<int>(lua_tointeger(L, 2));
+    }
+
+    bool forceOpen = false;  // by default asks the user
+    if (lua_isboolean(L, 3)) {
+        forceOpen = lua_toboolean(L, 3);
+    }
+
+    control->openFile(fs::path(filename), [](bool) {}, scrollToPage - 1, forceOpen);
+    lua_pushboolean(L, true);  // Todo replace with callback
+    return 1;
+}
+
+/**
+ * Adds images from the provided paths or the provided image data on the current page on the current layer.
+ *
+ * @param opts {images:{path:string, data:string, x:number, y:number, maxHeight:number, maxWidth:number,
+ * aspectRatio:boolean}[], allowUndoRedoAction:string}
+ * @return lightuserdata|string[]
+ *
+ * Global parameters:
+ *  - images table: array of image-parameter-tables
+ *  - allowUndoRedoAction string: Decides how the change gets introduced into the undoRedo action list "individual",
+ *    "grouped" or "none"
+ *
+ * Parameters per image:
+ *  - path string: filepath to the image
+ *    or
+ * - data string: (file) content of the image (exactly one of path and data should be specified)
+ *  - x number: x-Coordinate where to place the left upper corner of the image (default: 0)
+ *  - y number: y-Coordinate where to place the left upper corner of the image (default: 0)
+ *  scaling options:
+ *  - maxWidth integer: sets the width of the image in pixels. If that is too large for the page the image gets scaled
+ *    down keeping the aspect-ratio provided by maxWidth/maxHeight (default: -1)
+ *  - maxHeight integer: sets the height of the image in pixels. If that is too large for the page the image gets scaled
+ *    down keeping the aspect-ratio provided by maxWidth/maxHeight (default: -1)
+ *  - aspectRatio boolean: should the image be scaled in the other dimension to preserve the aspect ratio? Is only set
+ *    to false if the parameter is false, nil leads to the default value of true (default: true)
+ *  - scale number: factor to apply to the both dimensions in the end after setting width/height (with/without
+ *    keeping aspect ratio) (default: 1)
+ *
+ * Note about scaling:
+ * If the maxHeight-, the maxWidth- as well as the aspectRatio-parameter are given, the image will fit into the
+ * rectangle specified with maxHeight/maxWidth. To preserve the aspect ratio, one dimension will be smaller than
+ * specified. Still, the scale parameter is applied after this width/height scaling and if after that the dimensions are
+ * too large for the page, the image still gets scaled down afterwards.
+ *
+ * Returns a table with as many values as images were passed. A value of type lightuserdata represents the reference to
+ * the image, while on error the value corresponding to the image will be a string with the error message. If the
+ * parameters don't fit at all, a real lua error might be thrown immediately.
+ *
+ * Example 1: local refs = app.addImages{images={{path="/media/data/myImg.png", x=10, y=20, scale=2},
+ *                                            {path="/media/data/myImg2.png", maxHeight=300, aspectRatio=true}},
+ *                                    allowUndoRedoAction="grouped",
+ *                                            }
+ * Example 2: local refs = app.addImages{images={{data="<binary image data>", x=100, y=200, maxHeight=300,
+ * maxWidth=400}}}
+ */
+static int applib_addImages(lua_State* L) {
+    Plugin* plugin = Plugin::getPluginFromLua(L);
+    Control* control = plugin->getControl();
+
+    // Discard any extra arguments passed in
+    lua_settop(L, 1);
+
+    luaL_checktype(L, 1, LUA_TTABLE);
+    lua_newtable(L);  // table for return values
+
+    lua_getfield(L, 1, "images");
+    if (!lua_istable(L, -1)) {
+        return luaL_error(L, "Missing image table!");
+    }
+    // stack now has the following:
+    //    1 = global params table
+    //    2 = table for return value
+    //    3 = images table
+
+    auto cntParams = static_cast<int>(lua_rawlen(L, -1));
+
+    std::vector<const Element*> images{};
+
+    for (int imgParam{1}; imgParam <= cntParams; imgParam++) {
+        lua_pushinteger(L, imgParam);
+        lua_gettable(L, -2);
+        luaL_checktype(L, -1, LUA_TTABLE);
+
+        lua_getfield(L, -1, "path");
+        lua_getfield(L, -2, "data");
+        lua_getfield(L, -3, "x");
+        lua_getfield(L, -4, "y");
+        lua_getfield(L, -5, "maxWidth");
+        lua_getfield(L, -6, "maxHeight");
+        lua_getfield(L, -7, "scale");
+        lua_getfield(L, -8, "aspectRatio");
+
+        // stack now has the following:
+        //    1 = global params table
+        //    2 = table for return value
+        //    3 = images table
+        //   -9 = current img-params table
+        //   -8 = filepath
+        //   -7 = image data
+        //   -6 = x coordinate
+        //   -5 = y coordinate
+        //   -4 = maxWidth (in pixel)
+        //   -3 = maxHeight (in pixel)
+        //   -2 = scale
+        //   -1 = aspectRatio
+
+        // fetch the parameters and check for validity. If parameter is invalid -> hard error
+        double x = luaL_optnumber(L, -6, 0);
+        double y = luaL_optnumber(L, -5, 0);
+
+        int maxHeightParam = static_cast<int>(luaL_optinteger(L, -3, -1));
+        if (maxHeightParam <= 0 && maxHeightParam != -1) {
+            return luaL_error(L, "Invalid height given, must be positive integer or -1 to deactivate manual setting.");
+        }
+
+        int maxWidthParam = static_cast<int>(luaL_optinteger(L, -4, -1));
+        if (maxWidthParam <= 0 && maxWidthParam != -1) {
+            return luaL_error(L, "Invalid width given, must be positive integer or -1 to deactivate manual setting.");
+        }
+
+        double scale = luaL_optnumber(L, -2, 1);
+        if (scale <= 0) {
+            return luaL_error(L, "Invalid scale given, must be a positive number.");
+        }
+
+        bool aspectRatio{true};
+        if (!lua_isnil(L, -1)) {
+            // use the typical lua version of booleans (everything different than false (any set value) is true)
+            aspectRatio = lua_toboolean(L, -1);
+        }
+
+        const char* path = luaL_optstring(L, -8, nullptr);
+        size_t dataLen = 0;
+        const char* data = luaL_optlstring(L, -7, nullptr, &dataLen);
+        if (!path && !data) {
+            return luaL_error(L, "no 'path' parameter and no image 'data' was provided.");
+        }
+        if (path && data) {
+            return luaL_error(L,
+                              "both 'path' parameter and image 'data' were provided. Only one should be specified. ");
+        }
+
+        lua_pop(L, 9);  // pop the params we fetched from the global param-table from the stack
+        // stack now has the following:
+        //    1 = global params table
+        //    2 = table for return value
+        //    3 = images table
+
+        lua_pushinteger(L, imgParam);  // index for return table entry
+
+        std::unique_ptr<Image> img;
+        if (path) {
+            fs::path p(path);
+            if (p.empty() || !fs::exists(p)) {
+                lua_pushfstring(L, "Error: file '%s' does not exist.", path);  // soft error
+                lua_settable(L, -4);                                           // insert
+                continue;
+            }
+
+            img = ImageHandler::createImageFromFile(p);
+            if (!img) {
+                lua_pushfstring(L, "Error: creating the image (%s) failed.", path);  // soft error
+                lua_settable(L, -4);                                                 // insert
+                continue;
+            }
+        } else {  // data was provided instead
+            img = std::make_unique<Image>();
+            img->setImage(std::string(data, dataLen));
+            img->getImage();  // render image first to get the proper width and height
+        }
+
+        auto [width, height] = img->getImageSize();
+        img->setX(x);
+        img->setY(y);
+
+        // apply width/height parameter
+        if (maxWidthParam != -1 && maxHeightParam != -1) {
+            // both width and height are set
+            if (aspectRatio) {
+                double scale_y{static_cast<double>(maxHeightParam) / static_cast<double>(height)};
+                double scale_x{static_cast<double>(maxWidthParam) / static_cast<double>(width)};
+                double scale{std::min(scale_y, scale_x)};
+
+                height = round_cast<int>(height * scale);
+                width = round_cast<int>(width * scale);
+            } else {
+                width = maxWidthParam;
+                height = maxHeightParam;
+            }
+        } else if (maxWidthParam != -1 && maxHeightParam == -1) {
+            // maxHeight is set
+            if (aspectRatio) {
+                height = round_cast<int>(static_cast<double>(height) / static_cast<double>(width) * maxWidthParam);
+            }
+            width = maxWidthParam;
+        } else if (maxHeightParam != -1 && maxWidthParam == -1) {
+            // maxWidth is set
+            if (aspectRatio) {
+                width = round_cast<int>(static_cast<double>(width) / static_cast<double>(height) * maxHeightParam);
+            }
+            height = maxHeightParam;
+        }
+
+        // apply scale option
+        width = round_cast<int>(width * scale);
+        height = round_cast<int>(height * scale);
+
+        PageRef page = control->getCurrentPage();
+
+        // scale down keeping the current aspect ratio after the manual scaling to fit the image on the page
+        // if the image already fits on the screen, no other scaling is applied here
+        // already sets width/height in the image
+        ImageHandler::automaticScaling(*img, page, width, height);
+
+        // store the image to later build the undo/redo action chain
+        images.push_back(img.get());
+
+        auto ptr = static_cast<void*>(img.get());
+        bool succ = ImageHandler::addImageToDocument(std::move(img), page, control, false);
+        if (!succ) {
+            lua_pushfstring(L, "Error: Inserting the image (%s) failed.", path);  // soft error
+            lua_settable(L, -4);
+        }
+        lua_pushlightuserdata(L, ptr);  // value
+        lua_settable(L, -4);            // insert
+    }
+    // Check how the user wants to handle undoing
+    lua_getfield(L, 1, "allowUndoRedoAction");
+    const char* allowUndoRedoAction = luaL_optstring(L, -1, "grouped");
+    lua_pop(L, 2);
+    handleUndoRedoActionHelper(L, control, allowUndoRedoAction, images);
+
+    return 1;
+}
+
+/**
+ * Puts a Lua Table of the Images (from the selection tool / selected layer) onto the stack.
+ * Is inverse to app.addImages
+ *
+ * @param type string "selection" or "layer"
+ * @return {x:number, y:number, width:number, height:number, data:string, format:string, imageWidth:number,
+ * imageHeight:number, ref:lightuserdata}[] images
+ *
+ * Required argument: type ("selection" or "layer")
+ *
+ * Example: local images = app.getImages("selection")
+ *
+ * return value:
+ * {
+ *     {
+ *         ["x"] = number,
+ *         ["y"] = number,
+ *         ["width"] = number,    (width when inserted into Xournal++)
+ *         ["height"] = number,   (height when inserted into Xournal++)
+ *         ["data"] = string,
+ *         ["format"] = string,
+ *         ["imageWidth"] = integer,
+ *         ["imageHeight"] = integer,
+ *         ["ref"] = userdata: 0x5f644c0700d0
+ *     },
+ *     {
+ *         ...
+ *     },
+ *     ...
+ * }
+ */
+static int applib_getImages(lua_State* L) {
+    Plugin* plugin = Plugin::getPluginFromLua(L);
+    std::string type = luaL_checkstring(L, 1);
+    Control* control = plugin->getControl();
+
+    // Discard any extra arguments passed in
+    lua_settop(L, 1);
+
+    const auto& [err, elements] = getElementsFromHelper(control, type);
+    if (err.has_value()) {
+        return luaL_error(L, err.value().c_str());
+    }
+
+    lua_newtable(L);  // create table of all images
+    int currImageNo = 0;
+
+    for (const Element* e: elements) {
+        if (e->getType() == ELEMENT_IMAGE) {
+            auto* im = static_cast<const Image*>(e);
+            lua_pushinteger(L, ++currImageNo);  // index for later (settable)
+            lua_newtable(L);                    // create table for current image
+
+            // "x": number
+            lua_pushnumber(L, im->getX());
+            lua_setfield(L, -2, "x");
+
+            // "y": number
+            lua_pushnumber(L, im->getY());
+            lua_setfield(L, -2, "y");
+
+            // "width": number
+            lua_pushnumber(L, im->getElementWidth());
+            lua_setfield(L, -2, "width");
+
+            // "height": number
+            lua_pushnumber(L, im->getElementHeight());
+            lua_setfield(L, -2, "height");
+
+            // data: string (can be optimized via lual_Buffer)
+            lua_pushlstring(L, reinterpret_cast<const char*>(im->getRawData()), im->getRawDataLength());
+            lua_setfield(L, -2, "data");
+
+            // format: string
+            lua_pushstring(L, gdk_pixbuf_format_get_name(im->getImageFormat()));
+            lua_setfield(L, -2, "format");
+
+            std::pair<int, int> imageSize = im->getImageSize();
+            // image width: integer
+            lua_pushinteger(L, imageSize.first);
+            lua_setfield(L, -2, "imageWidth");
+            // image height: integer
+            lua_pushinteger(L, imageSize.second);
+            lua_setfield(L, -2, "imageHeight");
+
+            lua_pushlightuserdata(L, const_cast<void*>(static_cast<const void*>(im)));
+            lua_setfield(L, -2, "ref");
+
+            lua_settable(L, -3);  // add image to table
+        }
+    }
+    return 1;
+}
+
+/**
+ * Get the plugin's folder for writing one of
+ * - config files
+ * - data files
+ * - state files
+ * and forces it to exist.
+ *
+ * @param type string "config", "data" or "state"
+ * @return string file path
+ *
+ * Example 1: local configFolder = app.getFolder("config")
+ *
+ * Example 2: local stateFolder = app.getFolder("state")
+ *
+ */
+static int applib_getFolder(lua_State* L) {
+    Plugin* plugin = Plugin::getPluginFromLua(L);
+    auto pluginName = plugin->getName();
+
+    // Discard any extra arguments passed in
+    lua_settop(L, 1);
+    const char* type = luaL_checkstring(L, 1);
+    fs::path p{};
+    if (strcmp(type, "config") == 0) {
+        p = Util::getConfigSubfolder("plugin-settings");
+    } else if (strcmp(type, "state") == 0) {
+        p = Util::getStateSubfolder("plugin-state");
+    } else if (strcmp(type, "data") == 0) {
+        p = Util::getDataSubfolder("plugin-data");
+    } else {
+        return luaL_error(L, "Unsupported folder type '%s'", type);
+    }
+    p /= pluginName;
+    Util::ensureFolderExists(p);
+    lua_pushstring(L, p.string().c_str());
+    return 1;
+}
+
+/**
+ * Clears a selection by releasing its elements to the current layer.
+ *
+ * Example: app.clearSelection()
+ *
+ */
+static int applib_clearSelection(lua_State* L) {
+    Plugin* plugin = Plugin::getPluginFromLua(L);
+    Control* control = plugin->getControl();
+    XournalView* xournal = control->getWindow()->getXournal();
+    xournal->clearSelection();
+    return 0;
+}
+
+/**
+ * Adds those elements from the current layer to the current selection,
+ * whose addresses are in refs. If there is no selection create one.
+ *
+ * @param refs lightuserdata[] references to elements from the current layer
+ *
+ * Required argument: refs
+ *
+ * Example: local refs = app.addStrokes( <some stroke data> )
+ *          app.addToSelection(refs)
+ *
+ */
+static int applib_addToSelection(lua_State* L) {
+    Plugin* plugin = Plugin::getPluginFromLua(L);
+    Control* control = plugin->getControl();
+    PageRef page = control->getCurrentPage();
+    XournalView* xournal = control->getWindow()->getXournal();
+    EditSelection* sel = xournal->getSelection();
+    XojPageView* view = xournal->getViewFor(control->getCurrentPageNo());
+
+    std::unordered_set<void*> refs;
+    // stack now contains: -1 => table
+    lua_pushnil(L);
+    // stack now contains: -1 => nil; -2 => table
+    while (lua_next(L, -2)) {
+        // stack now contains: -1 => value; -2 => key; -3 => table
+        void* ref = lua_touserdata(L, -1);
+        refs.emplace(ref);
+        lua_pop(L, 1);
+        // stack now contains: -1 => key; -2 => table
+    }
+    // stack now contains: -1 => table
+    lua_pop(L, 1);  // Stack is now the same as it was on entry to this function
+
+    InsertionOrderRef insertionOrder;
+    insertionOrder.reserve(refs.size());
+    Element::Index n = 0;
+    for (auto&& e: page->getSelectedLayer()->getElementsView()) {
+        if (refs.count(const_cast<void*>(static_cast<const void*>(e)))) {
+            insertionOrder.emplace_back(e, n++);
+        }
+    }
+
+    auto newSel = sel ? SelectionFactory::addElementsFromActiveLayer(control, sel, insertionOrder) :
+                        SelectionFactory::createFromElementsOnActiveLayer(control, page, view, insertionOrder);
+    xournal->setSelection(newSel.release());
+
+    return 0;
+}
+
+
+/**
+ * Registers a new placeholder label for the toolbar.
+ *
+ * @param id string: The placeholder ID (must be unique for each placeholder)
+ * @param description string: The label description shown in the toolbar
+ *
+ * Example:
+ *   app.registerPlaceholder("vi-mode", "Current mode")
+ *
+ * The placeholder can then be updated with app.setPlaceholderValue(id, value).
+ */
+static int applib_registerPlaceholder(lua_State* L) {
+    Plugin* plugin = Plugin::getPluginFromLua(L);
+    const char* id = luaL_checkstring(L, 1);
+    const char* description = luaL_checkstring(L, 2);
+    plugin->registerPlaceholder(id, description);
+    return 0;
+}
+
+
+/**
+ * Set the value of a plugin placeholder label in the toolbar.
+ *
+ * @param id string: The placeholder ID
+ * @param value string: The value to display
+ *
+ * Example: app.setPlaceholderValue("vi-mode", "Current mode")
+ * Updates the toolbar placeholder with the given value.
+ */
+static int applib_setPlaceholderValue(lua_State* L) {
+    Plugin* plugin = Plugin::getPluginFromLua(L);
+    const char* id = luaL_checkstring(L, 1);
+    const char* value = luaL_checkstring(L, 2);
+    plugin->setPlaceholderValue(id, value);
+    return 0;
+}
+
+/**
+ * Helper function to check if a font family exists on the system
+ *
+ * @param fontName The font family name to validate
+ * @return true if the font family exists, false otherwise
+ */
+static bool isFontFamilyAvailable(const std::string& fontName) {
+    if (fontName.empty()) {
+        return false;
+    }
+
+    PangoFontMap* fontMap = pango_cairo_font_map_get_default();
+    if (!fontMap) {
+        return false;
+    }
+
+    PangoFontFamily** families = nullptr;
+    int nFamilies = 0;
+    pango_font_map_list_families(fontMap, &families, &nFamilies);
+
+    if (!families) {
+        return false;
+    }
+
+    bool found = false;
+    for (int i = 0; i < nFamilies; i++) {
+        const char* familyName = pango_font_family_get_name(families[i]);
+        if (familyName && fontName == familyName) {
+            found = true;
+            break;
+        }
+    }
+
+    g_free(families);
+    return found;
+}
+
+/**
+ * Helper function to validate a complete font description including style, weight, etc.
+ *
+ * @param fontDescription The Pango font description string (e.g., "Arial Bold 12")
+ * @return true if the font can be loaded, false otherwise
+ */
+static bool isFontDescriptionValid(const std::string& fontDescription) {
+    if (fontDescription.empty()) {
+        return false;
+    }
+
+    PangoFontMap* fontMap = pango_cairo_font_map_get_default();
+    if (!fontMap) {
+        return false;
+    }
+
+    // Create a temporary Pango context
+    xoj::util::GObjectSPtr<PangoContext> context(pango_font_map_create_context(fontMap), xoj::util::adopt);
+    if (!context) {
+        return false;
+    }
+
+    // Parse the font description (PangoFontDescription is a boxed type, not GObject)
+    PangoFontDescription* desc = pango_font_description_from_string(fontDescription.c_str());
+    if (!desc) {
+        return false;
+    }
+
+    // Try to load the font - this will find the best match
+    // If the family doesn't exist at all, we should check that separately
+    const char* family = pango_font_description_get_family(desc);
+    bool familyValid = true;
+    if (family) {
+        familyValid = isFontFamilyAvailable(family);
+    }
+
+    // Load the font to verify it can be resolved with the specified attributes
+    bool result = false;
+    if (familyValid) {
+        xoj::util::GObjectSPtr<PangoFont> font(pango_font_map_load_font(fontMap, context.get(), desc),
+                                               xoj::util::adopt);
+        result = (font != nullptr);
+    }
+
+    // Free the font description
+    pango_font_description_free(desc);
+
+    // If we got a font back, the description is valid (Pango will find closest match for style/weight)
+    return result;
+}
+
+/**
+ * Get list of available font families on the system
+ *
+ * @return table: A table containing:
+ *                - families: array of font family names
+ *                - current: index of the currently selected font (or nil if not found)
+ *
+ * Example:
+ *   local fonts = app.getFonts()
+ *   for i, family in ipairs(fonts.families) do
+ *       print(i, family)
+ *   end
+ *   print("Current font index:", fonts.current)
+ */
+static int applib_getFonts(lua_State* L) {
+    Plugin* plugin = Plugin::getPluginFromLua(L);
+    Control* control = plugin->getControl();
+    Settings* settings = control->getSettings();
+
+    // Get the current font name for comparison
+    std::string currentFontName = settings->getFont().getName();
+
+    // Get the default Pango font map
+    PangoFontMap* fontMap = pango_cairo_font_map_get_default();
+    if (!fontMap) {
+        return luaL_error(L, "Failed to get font map");
+    }
+
+    // Get font families
+    PangoFontFamily** families = nullptr;
+    int nFamilies = 0;
+    pango_font_map_list_families(fontMap, &families, &nFamilies);
+
+    // Create result table
+    lua_newtable(L);
+
+    // Create families array
+    lua_newtable(L);
+    int currentIndex = -1;
+    for (int i = 0; i < nFamilies; i++) {
+        const char* familyName = pango_font_family_get_name(families[i]);
+        lua_pushstring(L, familyName);
+        lua_rawseti(L, -2, i + 1);  // Lua arrays are 1-indexed
+
+        // Check if this is the current font
+        if (currentIndex == -1 && currentFontName == familyName) {
+            currentIndex = i + 1;  // Lua is 1-indexed
+        }
+    }
+    lua_setfield(L, -2, "families");
+
+    // Set current index (or nil if not found)
+    if (currentIndex != -1) {
+        lua_pushinteger(L, currentIndex);
+    } else {
+        lua_pushnil(L);
+    }
+    lua_setfield(L, -2, "current");
+
+    // Free the families array
+    g_free(families);
+
+    return 1;
+}
+
+/**
+ * Get the current font for text tool
+ *
+ * @return table: A table with 'name' and 'size' fields representing the current font
+ *
+ * Example:
+ *   local font = app.getFont()
+ *   print(font.name)  -- "Arial"
+ *   print(font.size)  -- 12
+ */
+static int applib_getFont(lua_State* L) {
+    Plugin* plugin = Plugin::getPluginFromLua(L);
+    Control* control = plugin->getControl();
+    Settings* settings = control->getSettings();
+
+    XojFont& currentFont = settings->getFont();
+
+    lua_newtable(L);
+    lua_pushstring(L, currentFont.getName().c_str());
+    lua_setfield(L, -2, "name");
+    lua_pushnumber(L, currentFont.getSize());
+    lua_setfield(L, -2, "size");
+
+    return 1;
+}
+
+/**
+ * Set the current font for text tool
+ *
+ * @param font string|table: Either a Pango-style font description string (e.g., "Arial 12")
+ *                           or a table with 'name' and/or 'size' fields
+ *
+ * The font family name is validated against the system's available fonts.
+ * If the font is not available, an error is raised.
+ *
+ * Examples:
+ *   app.setFont("Arial 12")
+ *   app.setFont({name = "Arial", size = 12})
+ *   app.setFont({name = "Arial"})  -- Only change font name
+ *   app.setFont({size = 14})       -- Only change font size
+ */
+static int applib_setFont(lua_State* L) {
+    Plugin* plugin = Plugin::getPluginFromLua(L);
+    Control* control = plugin->getControl();
+    Settings* settings = control->getSettings();
+
+    // Ensure an argument was provided
+    if (lua_gettop(L) < 1) {
+        return luaL_error(L, "setFont requires one argument (string or table)");
+    }
+
+    XojFont newFont;
+
+    // Parse font specification based on argument type
+    if (lua_isstring(L, 1)) {
+        // Handle Pango font description string
+        const char* fontDesc = luaL_checkstring(L, 1);
+
+        // Validate the complete font description (family + style/weight)
+        if (!isFontDescriptionValid(fontDesc)) {
+            return luaL_error(L, "Font description '%s' is not valid or not available on this system", fontDesc);
+        }
+
+        newFont = XojFont(fontDesc);
+
+        // XojFont constructor handles format validation for string input
+        if (newFont.getName().empty() || newFont.getSize() <= 0) {
+            return luaL_error(L, "Invalid font specification");
+        }
+    } else if (lua_istable(L, 1)) {
+        // Handle table - allow partial updates
+        lua_getfield(L, 1, "name");
+        lua_getfield(L, 1, "size");
+
+        bool hasName = !lua_isnil(L, -2);
+        bool hasSize = !lua_isnil(L, -1);
+
+        // Validate inputs early
+        if (!hasName && !hasSize) {
+            lua_pop(L, 2);
+            return luaL_error(L, "Font table must contain at least 'name' or 'size' field");
+        }
+
+        // Get current font for partial updates
+        XojFont& currentFont = settings->getFont();
+        std::string currentName = currentFont.getName();
+        double currentSize = currentFont.getSize();
+
+        // Extract and validate name if provided
+        const char* name = currentName.c_str();
+        if (hasName) {
+            if (!lua_isstring(L, -2)) {
+                lua_pop(L, 2);
+                return luaL_error(L, "Font name must be a string");
+            }
+            name = lua_tostring(L, -2);
+            if (strlen(name) == 0) {
+                lua_pop(L, 2);
+                return luaL_error(L, "Font name cannot be empty");
+            }
+            // Validate that the font family exists on the system
+            if (!isFontFamilyAvailable(name)) {
+                lua_pop(L, 2);
+                return luaL_error(L, "Font family '%s' is not available on this system", name);
+            }
+        }
+
+        // Extract and validate size if provided
+        double size = currentSize;
+        if (hasSize) {
+            if (!lua_isnumber(L, -1)) {
+                lua_pop(L, 2);
+                return luaL_error(L, "Font size must be a number");
+            }
+            size = lua_tonumber(L, -1);
+            if (!std::isfinite(size)) {
+                lua_pop(L, 2);
+                return luaL_error(L, "Font size must be a finite number");
+            }
+            if (size <= 0) {
+                lua_pop(L, 2);
+                return luaL_error(L, "Font size must be positive");
+            }
+        }
+
+        lua_pop(L, 2);
+
+        newFont = XojFont(name, size);
+    } else {
+        return luaL_error(L, "Font must be either a string or a table with 'name' and/or 'size' fields");
+    }
+
+    // Set the font and trigger UI update
+    settings->setFont(newFont);
+    std::string fontStr = newFont.asString();
+    control->getActionDatabase()->fireChangeActionState(Action::FONT, fontStr.c_str());
+
+    return 0;
+}
+
+static const luaL_Reg applib[] = {
+        {"msgbox", applib_msgbox},  // Todo(gtk4) remove this deprecated function
+        {"openDialog", applib_openDialog},
+        {"getActionState", applib_getActionState},
+        {"changeActionState", applib_changeActionState},
+        {"activateAction", applib_activateAction},
+        {"getPageLabel", applib_getPageLabel},
+        {"glib_rename", applib_glib_rename},
+        {"saveAs", applib_saveAs},  // Todo(gtk4) remove this deprecated function
+        {"fileDialogSave", applib_fileDialogSave},
+        {"registerUi", applib_registerUi},
+        {"uiAction", applib_uiAction},            // Todo(gtk4) remove this deprecated function
+        {"sidebarAction", applib_sidebarAction},  // Todo(gtk4) remove this deprecated function
+        {"layerAction", applib_layerAction},      // Todo(gtk4) remove this deprecated function
+        {"showFloatingToolbox", applib_showFloatingToolbox},
+        {"changeToolColor", applib_changeToolColor},
+        {"getColorPalette", applib_getColorPalette},
+        {"changeCurrentPageBackground", applib_changeCurrentPageBackground},
+        {"changeBackgroundPdfPageNr", applib_changeBackgroundPdfPageNr},
+        {"getToolInfo", applib_getToolInfo},
+        {"getFolder", applib_getFolder},
+        {"getSidebarPageNo", applib_getSidebarPageNo},  // Todo(gtk4) remove this deprecated function
+        {"setSidebarPageNo", applib_setSidebarPageNo},  // Todo(gtk4) remove this deprecated function
+        {"getDocumentStructure", applib_getDocumentStructure},
+        {"scrollToPage", applib_scrollToPage},
+        {"scrollToPos", applib_scrollToPos},
+        {"setCurrentPage", applib_setCurrentPage},
+        {"setPageSize", applib_setPageSize},
+        {"setCurrentLayer", applib_setCurrentLayer},
+        {"setLayerVisibility", applib_setLayerVisibility},
+        {"setCurrentLayerName", applib_setCurrentLayerName},
+        {"setBackgroundName", applib_setBackgroundName},
+        {"getDisplayDpi", applib_getDisplayDpi},
+        {"getZoom", applib_getZoom},
+        {"setZoom", applib_setZoom},
+        {"export", applib_export},
+        {"addStrokes", applib_addStrokes},
+        {"addSplines", applib_addSplines},
+        {"addImages", applib_addImages},
+        {"addTexts", applib_addTexts},
+        {"addToSelection", applib_addToSelection},
+        {"clearSelection", applib_clearSelection},
+        {"getFilePath", applib_getFilePath},  // Todo(gtk4) remove this deprecated function
+        {"fileDialogOpen", applib_fileDialogOpen},
+        {"refreshPage", applib_refreshPage},
+        {"getStrokes", applib_getStrokes},
+        {"getImages", applib_getImages},
+        {"getTexts", applib_getTexts},
+        {"openFile", applib_openFile},
+        {"registerPlaceholder", applib_registerPlaceholder},
+        {"setPlaceholderValue", applib_setPlaceholderValue},
+        {"getFonts", applib_getFonts},
+        {"getFont", applib_getFont},
+        {"setFont", applib_setFont},
+        // Placeholder
+        // {"MSG_BT_OK", nullptr},
+        {nullptr, nullptr}};
+
+/**
+ * Open application Library
+ */
+inline int luaopen_app(lua_State* L) {
+    luaL_newlib(L, applib);
+
+    lua_newtable(L);  // table of constants
+    // ToolType enum
+    for (unsigned int i = 0; i < TOOL_END_ENTRY; i++) {
+        auto toolType = static_cast<ToolType>(i);
+        std::string s = toolTypeToString(toolType).data();
+        std::string key = "Tool_" + s;
+        lua_pushinteger(L, i);  // value
+        lua_setfield(L, -2, key.c_str());
+    }
+    // ToolSize enum
+    for (unsigned int i = 0; i <= TOOL_SIZE_NONE; i++) {
+        auto toolSize = static_cast<ToolSize>(i);
+        std::string s = toolSizeToString(toolSize).data();
+        std::string key = "ToolSize_" + s;
+        lua_pushinteger(L, i);  // value
+        lua_setfield(L, -2, key.c_str());
+    }
+    // EraserType enum
+    for (unsigned int i = 0; i <= ERASER_TYPE_DELETE_STROKE; i++) {
+        auto eraserType = static_cast<EraserType>(i);
+        std::string s = eraserTypeToString(eraserType).data();
+        std::string key = "EraserType_" + s;
+        lua_pushinteger(L, i);  // value
+        lua_setfield(L, -2, key.c_str());
+    }
+    // EditSelection::OrderChange enum
+    for (auto change: EditSelection::allChanges) {
+        std::string s = EditSelection::orderChangeToString(change).data();
+        std::string key = "OrderChange_" + s;
+        lua_pushinteger(L, static_cast<int>(change));  // value
+        lua_setfield(L, -2, key.c_str());
+    }
+
+    lua_setfield(L, -2, "C");
+
+    return 1;
+}
diff --git a/entry/src/main/cpp/src/core/undo/AddUndoAction.cpp b/entry/src/main/cpp/src/core/undo/AddUndoAction.cpp
new file mode 100644
index 0000000..bd891bf
--- /dev/null
+++ b/entry/src/main/cpp/src/core/undo/AddUndoAction.cpp
@@ -0,0 +1,103 @@
+#include "AddUndoAction.h"
+
+#include <memory>  // for __shared_ptr_access, __shared_pt...
+
+#include <glib.h>  // for g_warning
+
+#include "control/Control.h"
+#include "model/Document.h"
+#include "model/Element.h"           // for Element, ELEMENT_IMAGE, ELEMENT_...
+#include "model/Layer.h"             // for Layer
+#include "model/XojPage.h"           // for XojPage
+#include "undo/UndoAction.h"         // for UndoAction
+#include "util/i18n.h"               // for _
+
+AddUndoAction::AddUndoAction(const PageRef& page, bool eraser): UndoAction("AddUndoAction") {
+    this->page = page;
+    this->eraser = eraser;
+}
+
+void AddUndoAction::addElement(Layer* layer, Element* e, Element::Index pos) { elements.emplace(layer, e, pos); }
+
+auto AddUndoAction::redo(Control* control) -> bool {
+    if (elements.empty()) {
+        g_warning("Could not undo AddUndoAction, there is nothing to undo");
+
+        this->undone = true;
+        return false;
+    }
+
+    Document* doc = control->getDocument();
+    doc->lock();
+    for (const auto& elem: elements) {
+        elem.layer->insertElement(std::move(elem.elementOwn), elem.pos);
+    }
+    doc->unlock();
+    for (const auto& elem: elements) {
+        this->page->fireElementChanged(elem.element);
+    }
+
+    this->undone = true;
+    return true;
+}
+
+auto AddUndoAction::undo(Control* control) -> bool {
+    if (elements.empty()) {
+        g_warning("Could not redo AddUndoAction, there is nothing to redo");
+
+        this->undone = false;
+        return false;
+    }
+
+    Document* doc = control->getDocument();
+    doc->lock();
+    for (const auto& elem: elements) {
+        elem.elementOwn = elem.layer->removeElement(elem.element).e;
+    }
+    doc->unlock();
+    for (const auto& elem: elements) {
+        this->page->fireElementChanged(elem.element);
+    }
+    this->undone = false;
+
+    return true;
+}
+
+auto AddUndoAction::getText() -> std::string {
+    std::string text;
+
+    if (eraser) {
+        text = _("Erase stroke");
+    } else {
+        text = _("Paste");
+
+        if (!elements.empty()) {
+            ElementType type = elements.begin()->element->getType();
+
+            for (auto elemIter = ++elements.begin(); elemIter != elements.end(); ++elemIter) {
+                if (type != elemIter->element->getType()) {
+                    text += " ";
+                    text += _("elements");
+                    return text;
+                }
+            }
+
+            text += " ";
+            switch (type) {
+                case ELEMENT_STROKE:
+                    text += _("stroke");
+                    break;
+                case ELEMENT_IMAGE:
+                    text += _("image");
+                    break;
+                case ELEMENT_TEXIMAGE:
+                    text += _("latex");
+                    break;
+                case ELEMENT_TEXT:
+                    text += _("text");
+                    break;
+            }
+        }
+    }
+    return text;
+}
diff --git a/entry/src/main/cpp/src/core/undo/AddUndoAction.h b/entry/src/main/cpp/src/core/undo/AddUndoAction.h
new file mode 100644
index 0000000..ee1ee64
--- /dev/null
+++ b/entry/src/main/cpp/src/core/undo/AddUndoAction.h
@@ -0,0 +1,41 @@
+/*
+ * Xournal++
+ *
+ * Undo action for delete (eraser, delete)
+ *
+ * @author Xournal++ Team
+ * https://github.com/xournalpp/xournalpp
+ *
+ * @license GNU GPLv2 or later
+ */
+
+#pragma once
+
+#include <set>     // for multiset
+#include <string>  // for string
+
+#include "model/Element.h"  // for Element
+#include "model/PageRef.h"  // for PageRef
+
+#include "PageLayerPosEntry.h"  // for PageLayerPosEntry
+#include "UndoAction.h"         // for UndoAction
+
+class Control;
+class Layer;
+
+class AddUndoAction: public UndoAction {
+public:
+    AddUndoAction(const PageRef& page, bool eraser);
+
+public:
+    bool undo(Control* control) override;
+    bool redo(Control* control) override;
+
+    void addElement(Layer* layer, Element* e, Element::Index pos);
+
+    std::string getText() override;
+
+private:
+    std::multiset<PageLayerPosEntry<Element>> elements{};
+    bool eraser = false;
+};
diff --git a/entry/src/main/cpp/src/core/undo/ArrangeUndoAction.cpp b/entry/src/main/cpp/src/core/undo/ArrangeUndoAction.cpp
new file mode 100644
index 0000000..9614b0b
--- /dev/null
+++ b/entry/src/main/cpp/src/core/undo/ArrangeUndoAction.cpp
@@ -0,0 +1,59 @@
+#include "ArrangeUndoAction.h"
+
+#include <memory>  // for allocator, __shared_ptr_access, __share...
+#include <unordered_map>
+
+#include "control/Control.h"
+#include "model/Document.h"
+#include "model/Element.h"
+#include "model/Layer.h"      // for Layer
+#include "model/XojPage.h"    // for XojPage
+#include "undo/UndoAction.h"  // for UndoAction
+
+ArrangeUndoAction::ArrangeUndoAction(const PageRef& page, Layer* layer, std::string desc, InsertionOrderRef oldOrder,
+                                     InsertionOrderRef newOrder):
+        UndoAction("ArrangeUndoAction"),
+        layer(layer),
+        description(std::move(desc)),
+        oldOrder(std::move(oldOrder)),
+        newOrder(std::move(newOrder)) {
+    this->page = page;
+}
+
+ArrangeUndoAction::~ArrangeUndoAction() { this->page = nullptr; }
+
+bool ArrangeUndoAction::undo(Control* control) {
+    this->undone = true;
+    applyRearrange(control);
+    return true;
+}
+
+bool ArrangeUndoAction::redo(Control* control) {
+    this->undone = false;
+    applyRearrange(control);
+    return true;
+}
+
+void ArrangeUndoAction::applyRearrange(Control* control) {
+    // Convert source order into target order
+    const auto& srcOrder = this->undone ? this->newOrder : this->oldOrder;
+    const auto& tgtOrder = this->undone ? this->oldOrder : this->newOrder;
+
+    std::unordered_map<const Element*, ElementPtr> removedElements;
+    removedElements.reserve(srcOrder.size());
+
+    Document* doc = control->getDocument();
+    doc->lock();
+    for (const auto& [e, _]: srcOrder) {
+        removedElements.emplace(e, layer->removeElement(e).e);
+    }
+
+    for (const auto& [e, i]: tgtOrder) {
+        layer->insertElement(std::move(removedElements[e]), i);
+    }
+    doc->unlock();
+
+    this->page->firePageChanged();
+}
+
+std::string ArrangeUndoAction::getText() { return this->description; }
diff --git a/entry/src/main/cpp/src/core/undo/ArrangeUndoAction.h b/entry/src/main/cpp/src/core/undo/ArrangeUndoAction.h
new file mode 100644
index 0000000..e522cc7
--- /dev/null
+++ b/entry/src/main/cpp/src/core/undo/ArrangeUndoAction.h
@@ -0,0 +1,51 @@
+/*
+ * Xournal++
+ *
+ * Undo move action (EditSelection)
+ *
+ * @author Xournal++ Team
+ * https://github.com/xournalpp/xournalpp
+ *
+ * @license GNU GPLv2 or later
+ */
+
+#pragma once
+
+#include <deque>    // for deque
+#include <string>   // for string
+#include <utility>  // for pair
+#include <vector>   // for vector
+
+#include "model/Element.h"  // for Element::Index, Element
+#include "model/ElementInsertionPosition.h"  // for InsertionOrder
+#include "model/PageRef.h"  // for PageRef
+
+#include "UndoAction.h"  // for UndoAction
+
+class Control;
+class Layer;
+
+class ArrangeUndoAction: public UndoAction {
+public:
+    ArrangeUndoAction(const PageRef& page, Layer* layer, std::string desc, InsertionOrderRef oldOrder,
+                      InsertionOrderRef newOrder);
+    ~ArrangeUndoAction() override;
+
+public:
+    bool undo(Control* control) override;
+    bool redo(Control* control) override;
+    std::string getText() override;
+
+private:
+    void applyRearrange(Control* control);
+
+private:
+    Layer* layer;
+
+    /** Description of the ordering action. */
+    std::string description;
+
+    // These track the ordering of elements
+    InsertionOrderRef oldOrder;
+    InsertionOrderRef newOrder;
+};
diff --git a/entry/src/main/cpp/src/core/undo/ColorUndoAction.cpp b/entry/src/main/cpp/src/core/undo/ColorUndoAction.cpp
new file mode 100644
index 0000000..be4b168
--- /dev/null
+++ b/entry/src/main/cpp/src/core/undo/ColorUndoAction.cpp
@@ -0,0 +1,97 @@
+#include "ColorUndoAction.h"
+
+#include <algorithm>  // for max, min
+#include <memory>     // for __shared_ptr_access, __shared_ptr_acces...
+
+#include "control/Control.h"
+#include "model/Document.h"
+#include "model/Element.h"    // for Element
+#include "model/XojPage.h"    // for XojPage
+#include "undo/UndoAction.h"  // for UndoAction
+#include "util/Rectangle.h"   // for Rectangle
+#include "util/i18n.h"        // for _
+
+using xoj::util::Rectangle;
+
+class ColorUndoActionEntry {
+public:
+    ColorUndoActionEntry(Element* e, Color oldColor, Color newColor): e(e), oldColor(oldColor), newColor(newColor) {}
+    Element* e;
+    Color oldColor;
+    Color newColor;
+};
+
+ColorUndoAction::ColorUndoAction(const PageRef& page, Layer* layer): UndoAction("ColorUndoAction") {
+    this->page = page;
+    this->layer = layer;
+}
+
+ColorUndoAction::~ColorUndoAction() {
+    for (ColorUndoActionEntry* e: this->data) { delete e; }
+}
+
+void ColorUndoAction::addStroke(Element* e, Color originalColor, Color newColor) {
+    this->data.push_back(new ColorUndoActionEntry(e, originalColor, newColor));
+}
+
+auto ColorUndoAction::undo(Control* control) -> bool {
+    if (this->data.empty()) {
+        return true;
+    }
+
+    Document* doc = control->getDocument();
+    doc->lock();
+    ColorUndoActionEntry* e = this->data.front();
+    double x1 = e->e->getX();
+    double x2 = e->e->getX() + e->e->getElementWidth();
+    double y1 = e->e->getY();
+    double y2 = e->e->getY() + e->e->getElementHeight();
+
+    for (ColorUndoActionEntry* e: this->data) {
+        e->e->setColor(e->oldColor);
+
+        x1 = std::min(x1, e->e->getX());
+        x2 = std::max(x2, e->e->getX() + e->e->getElementWidth());
+        y1 = std::min(y1, e->e->getY());
+        y2 = std::max(y2, e->e->getY() + e->e->getElementHeight());
+    }
+
+    doc->unlock();
+
+    Rectangle rect(x1, y1, x2 - x1, y2 - y1);
+    this->page->fireRectChanged(rect);
+
+    return true;
+}
+
+auto ColorUndoAction::redo(Control* control) -> bool {
+    if (this->data.empty()) {
+        return true;
+    }
+
+    Document* doc = control->getDocument();
+    doc->lock();
+    ColorUndoActionEntry* e = this->data.front();
+    double x1 = e->e->getX();
+    double x2 = e->e->getX() + e->e->getElementWidth();
+    double y1 = e->e->getY();
+    double y2 = e->e->getY() + e->e->getElementHeight();
+
+    for (ColorUndoActionEntry* e: this->data) {
+        e->e->setColor(e->newColor);
+
+        x1 = std::min(x1, e->e->getX());
+        x2 = std::max(x2, e->e->getX() + e->e->getElementWidth());
+        y1 = std::min(y1, e->e->getY());
+        y2 = std::max(y2, e->e->getY() + e->e->getElementHeight());
+    }
+
+    doc->unlock();
+
+    Rectangle rect(x1, y1, x2 - x1, y2 - y1);
+    this->page->fireRectChanged(rect);
+
+    return true;
+}
+
+auto ColorUndoAction::getText() -> std::string { return _("Change color"); }
diff --git a/entry/src/main/cpp/src/core/undo/ColorUndoAction.h b/entry/src/main/cpp/src/core/undo/ColorUndoAction.h
new file mode 100644
index 0000000..de41fd3
--- /dev/null
+++ b/entry/src/main/cpp/src/core/undo/ColorUndoAction.h
@@ -0,0 +1,42 @@
+/*
+ * Xournal++
+ *
+ * Undo action for color changes (Edit selection)
+ *
+ * @author Xournal++ Team
+ * https://github.com/xournalpp/xournalpp
+ *
+ * @license GNU GPLv2 or later
+ */
+
+#pragma once
+
+#include <string>  // for string
+#include <vector>  // for vector
+
+#include "model/PageRef.h"  // for PageRef
+#include "util/Color.h"     // for Color
+
+#include "UndoAction.h"  // for UndoAction
+
+class ColorUndoActionEntry;
+class Element;
+class Layer;
+class Control;
+
+class ColorUndoAction: public UndoAction {
+public:
+    ColorUndoAction(const PageRef& page, Layer* layer);
+    ~ColorUndoAction() override;
+
+public:
+    bool undo(Control* control) override;
+    bool redo(Control* control) override;
+    std::string getText() override;
+
+    void addStroke(Element* e, Color originalColor, Color newColor);
+
+private:
+    std::vector<ColorUndoActionEntry*> data;
+    Layer* layer;
+};
diff --git a/entry/src/main/cpp/src/core/undo/DeleteUndoAction.cpp b/entry/src/main/cpp/src/core/undo/DeleteUndoAction.cpp
new file mode 100644
index 0000000..e7d76c4
--- /dev/null
+++ b/entry/src/main/cpp/src/core/undo/DeleteUndoAction.cpp
@@ -0,0 +1,105 @@
+#include "DeleteUndoAction.h"
+
+#include <memory>  // for __shared_ptr_access, __shared_pt...
+
+#include <glib.h>  // for g_warning
+
+#include "control/Control.h"
+#include "model/Document.h"
+#include "model/Element.h"           // for Element, ELEMENT_IMAGE, ELEMENT_...
+#include "model/Layer.h"             // for Layer
+#include "model/XojPage.h"           // for XojPage
+#include "undo/UndoAction.h"         // for UndoAction
+#include "util/i18n.h"               // for _
+
+
+DeleteUndoAction::DeleteUndoAction(const PageRef& page, bool eraser): UndoAction("DeleteUndoAction"), eraser(eraser) {
+    this->page = page;
+}
+
+void DeleteUndoAction::addElement(Layer* layer, ElementPtr e, Element::Index pos) {
+    elements.emplace(layer, std::move(e), pos);
+}
+
+auto DeleteUndoAction::undo(Control* control) -> bool {
+    if (elements.empty()) {
+        g_warning("Could not undo DeleteUndoAction, there is nothing to undo");
+
+        this->undone = true;
+        return false;
+    }
+
+    Document* doc = control->getDocument();
+    doc->lock();
+    for (auto& elem: elements) {
+        elem.layer->insertElement(std::move(elem.elementOwn), elem.pos);
+    }
+    doc->unlock();
+    for (const auto& elem: elements) {
+        this->page->fireElementChanged(elem.element);
+    }
+
+    this->undone = true;
+    return true;
+}
+
+auto DeleteUndoAction::redo(Control* control) -> bool {
+    if (elements.empty()) {
+        g_warning("Could not redo DeleteUndoAction, there is nothing to redo");
+
+        this->undone = false;
+        return false;
+    }
+
+    Document* doc = control->getDocument();
+    doc->lock();
+    for (auto& elem: elements) {
+        elem.elementOwn = elem.layer->removeElement(elem.element).e;
+    }
+    doc->unlock();
+    for (auto& elem: elements) {
+        this->page->fireElementChanged(elem.element);
+    }
+
+    this->undone = false;
+
+    return true;
+}
+
+auto DeleteUndoAction::getText() -> std::string {
+    if (eraser) {
+        return _("Erase stroke");
+    }
+
+    std::string text = _("Delete");
+
+    if (!elements.empty()) {
+        ElementType type = elements.begin()->element->getType();
+
+        for (auto elemIter = ++elements.begin(); elemIter != elements.end(); ++elemIter) {
+            if (type != elemIter->element->getType()) {
+                text += " ";
+                text += _("elements");
+                return text;
+            }
+        }
+
+        text += " ";
+        switch (type) {
+            case ELEMENT_STROKE:
+                text += _("stroke");
+                break;
+            case ELEMENT_IMAGE:
+                text += _("image");
+                break;
+            case ELEMENT_TEXIMAGE:
+                text += _("latex");
+                break;
+            case ELEMENT_TEXT:
+                text += _("text");
+                break;
+        }
+    }
+
+    return text;
+}
diff --git a/entry/src/main/cpp/src/core/undo/DeleteUndoAction.h b/entry/src/main/cpp/src/core/undo/DeleteUndoAction.h
new file mode 100644
index 0000000..3aaed36
--- /dev/null
+++ b/entry/src/main/cpp/src/core/undo/DeleteUndoAction.h
@@ -0,0 +1,42 @@
+/*
+ * Xournal++
+ *
+ * Undo action for delete (eraser, delete)
+ *
+ * @author Xournal++ Team
+ * https://github.com/xournalpp/xournalpp
+ *
+ * @license GNU GPLv2 or later
+ */
+
+#pragma once
+
+#include <set>     // for multiset
+#include <string>  // for string
+
+#include "model/Element.h"  // for Element, Element::Index
+#include "model/PageRef.h"  // for PageRef
+
+#include "PageLayerPosEntry.h"  // for PageLayerPosEntry
+#include "UndoAction.h"         // for UndoAction
+
+class Control;
+class Layer;
+
+class DeleteUndoAction: public UndoAction {
+public:
+    DeleteUndoAction(const PageRef& page, bool eraser);
+
+public:
+    bool undo(Control* control) override;
+    bool redo(Control* control) override;
+
+    void addElement(Layer* layer, ElementPtr e, Element::Index pos);
+
+    std::string getText() override;
+
+private:
+    // Todo (performance): replace by flat_multi_set / sorted_vector
+    std::multiset<PageLayerPosEntry<Element>> elements{};
+    bool eraser = true;
+};
diff --git a/entry/src/main/cpp/src/core/undo/EmergencySaveRestore.cpp b/entry/src/main/cpp/src/core/undo/EmergencySaveRestore.cpp
new file mode 100644
index 0000000..8b8b635
--- /dev/null
+++ b/entry/src/main/cpp/src/core/undo/EmergencySaveRestore.cpp
@@ -0,0 +1,22 @@
+#include "EmergencySaveRestore.h"
+
+#include "undo/UndoAction.h"  // for UndoAction
+#include "util/i18n.h"        // for _
+
+class Control;
+
+EmergencySaveRestore::EmergencySaveRestore(): UndoAction("EmergencySaveRestore") {}
+
+EmergencySaveRestore::~EmergencySaveRestore() = default;
+
+auto EmergencySaveRestore::redo(Control* control) -> bool {
+    // Does nothing, only used to mark the document as changed
+    return true;
+}
+
+auto EmergencySaveRestore::undo(Control* control) -> bool {
+    // Does nothing, only used to mark the document as changed
+    return true;
+}
+
+auto EmergencySaveRestore::getText() -> std::string { return _("Emergency saved document"); }
diff --git a/entry/src/main/cpp/src/core/undo/EmergencySaveRestore.h b/entry/src/main/cpp/src/core/undo/EmergencySaveRestore.h
new file mode 100644
index 0000000..ca1ff83
--- /dev/null
+++ b/entry/src/main/cpp/src/core/undo/EmergencySaveRestore.h
@@ -0,0 +1,34 @@
+/*
+ * Xournal++
+ *
+ * Element used to mark the document as changed, so it is changed after restore.
+ * Without this, it's unchanged and does not ask for save
+ *
+ * @author Xournal++ Team
+ * https://github.com/xournalpp/xournalpp
+ *
+ * @license GNU GPLv2 or later
+ */
+
+#pragma once
+
+#include <string>  // for string
+
+#include "UndoAction.h"  // for UndoAction
+
+class Control;
+
+
+class EmergencySaveRestore: public UndoAction {
+public:
+    EmergencySaveRestore();
+    ~EmergencySaveRestore() override;
+
+public:
+    bool undo(Control* control) override;
+    bool redo(Control* control) override;
+
+    std::string getText() override;
+
+private:
+};
diff --git a/entry/src/main/cpp/src/core/undo/EraseUndoAction.cpp b/entry/src/main/cpp/src/core/undo/EraseUndoAction.cpp
new file mode 100644
index 0000000..39f7879
--- /dev/null
+++ b/entry/src/main/cpp/src/core/undo/EraseUndoAction.cpp
@@ -0,0 +1,106 @@
+#include "EraseUndoAction.h"
+
+#include <memory>  // for __shared_ptr_access, __shar...
+#include <vector>  // for vector
+
+#include "control/Control.h"
+#include "model/Document.h"
+#include "model/Layer.h"                  // for Layer
+#include "model/Stroke.h"                 // for Stroke
+#include "model/XojPage.h"                // for XojPage
+#include "model/eraser/ErasableStroke.h"  // for ErasableStroke
+#include "undo/UndoAction.h"              // for UndoAction
+#include "util/i18n.h"                    // for _
+
+
+EraseUndoAction::EraseUndoAction(const PageRef& page): UndoAction("EraseUndoAction") { this->page = page; }
+
+void EraseUndoAction::addOriginal(Layer* layer, Stroke* element, Element::Index pos) {
+    original.emplace(layer, element, pos);
+}
+
+void EraseUndoAction::addEdited(Layer* layer, Stroke* element, Element::Index pos) {
+    edited.emplace(layer, element, pos);
+}
+
+void EraseUndoAction::removeEdited(Stroke* element) {
+    for (auto entryIter = edited.begin(); entryIter != edited.end(); ++entryIter) {
+        if (entryIter->element == element) {
+            edited.erase(entryIter);
+            return;
+        }
+    }
+}
+
+void EraseUndoAction::finalize() {
+    for (auto const& entry: original) {
+        if (entry.element->getPointCount() == 0) {
+            // TODO (Marmare314): is this really expected behaviour?
+            continue;
+        } else {
+            // Remove the original and add the copy
+            auto [own, pos] = entry.layer->removeElement(entry.element);
+            entry.elementOwn = std::move(own);
+
+            ErasableStroke* e = entry.element->getErasable();
+            std::vector<std::unique_ptr<Stroke>> strokeList = e->getStrokes();
+            for (auto& stroke: strokeList) {
+                // TODO (Marmare314): should use unique_ptr in layer
+                auto copy = std::move(stroke);
+                this->addEdited(entry.layer, copy.get(), pos);
+                entry.layer->insertElement(std::move(copy), pos);
+                pos++;
+            }
+
+            delete e;
+            e = nullptr;
+            entry.element->setErasable(nullptr);
+        }
+    }
+
+    this->page->firePageChanged();
+}
+
+auto EraseUndoAction::getText() -> std::string { return _("Erase stroke"); }
+
+auto EraseUndoAction::undo(Control* control) -> bool {
+    Document* doc = control->getDocument();
+    doc->lock();
+    for (auto const& entry: edited) {
+        entry.elementOwn = entry.layer->removeElement(entry.element).e;
+    }
+    for (auto const& entry: original) {
+        entry.layer->insertElement(std::move(entry.elementOwn), entry.pos);
+    }
+    doc->unlock();
+    for (auto const& entry: edited) {
+        this->page->fireElementChanged(entry.element);
+    }
+    for (auto const& entry: original) {
+        this->page->fireElementChanged(entry.element);
+    }
+
+    this->undone = true;
+    return true;
+}
+
+auto EraseUndoAction::redo(Control* control) -> bool {
+    Document* doc = control->getDocument();
+    doc->lock();
+    for (auto const& entry: original) {
+        entry.elementOwn = entry.layer->removeElement(entry.element).e;
+    }
+    for (auto const& entry: edited) {
+        entry.layer->insertElement(std::move(entry.elementOwn), entry.pos);
+    }
+    doc->unlock();
+    for (auto const& entry: original) {
+        this->page->fireElementChanged(entry.element);
+    }
+    for (auto const& entry: edited) {
+        this->page->fireElementChanged(entry.element);
+    }
+
+    this->undone = false;
+    return true;
+}
diff --git a/entry/src/main/cpp/src/core/undo/EraseUndoAction.h b/entry/src/main/cpp/src/core/undo/EraseUndoAction.h
new file mode 100644
index 0000000..5132c45
--- /dev/null
+++ b/entry/src/main/cpp/src/core/undo/EraseUndoAction.h
@@ -0,0 +1,45 @@
+/*
+ * Xournal++
+ *
+ * Undo action for eraser
+ *
+ * @author Xournal++ Team
+ * https://github.com/xournalpp/xournalpp
+ *
+ * @license GNU GPLv2 or later
+ */
+
+#pragma once
+
+#include <set>     // for multiset
+#include <string>  // for string
+
+#include "model/PageRef.h"  // for PageRef
+#include "model/Stroke.h"   // for Stroke
+
+#include "PageLayerPosEntry.h"  // for PageLayerPosEntry
+#include "UndoAction.h"         // for UndoAction
+
+class Control;
+class Layer;
+
+class EraseUndoAction: public UndoAction {
+public:
+    EraseUndoAction(const PageRef& page);
+
+public:
+    bool undo(Control* control) override;
+    bool redo(Control* control) override;
+
+    void addOriginal(Layer* layer, Stroke* element, Element::Index pos);
+    void addEdited(Layer* layer, Stroke* element, Element::Index pos);
+    [[maybe_unused]] void removeEdited(Stroke* element);
+
+    void finalize();
+
+    std::string getText() override;
+
+private:
+    std::multiset<PageLayerPosEntry<Stroke>> edited{};
+    std::multiset<PageLayerPosEntry<Stroke>> original{};
+};
diff --git a/entry/src/main/cpp/src/core/undo/FillUndoAction.cpp b/entry/src/main/cpp/src/core/undo/FillUndoAction.cpp
new file mode 100644
index 0000000..5294e07
--- /dev/null
+++ b/entry/src/main/cpp/src/core/undo/FillUndoAction.cpp
@@ -0,0 +1,88 @@
+#include "FillUndoAction.h"
+
+#include <memory>  // for allocator, __shared_ptr_access, __share...
+
+#include "control/Control.h"
+#include "model/Document.h"
+#include "model/Stroke.h"     // for Stroke
+#include "model/XojPage.h"    // for XojPage
+#include "undo/UndoAction.h"  // for UndoAction
+#include "util/Range.h"       // for Range
+#include "util/i18n.h"        // for _
+
+
+class FillUndoActionEntry {
+public:
+    FillUndoActionEntry(Stroke* s, int originalFill, int newFill) {
+        this->s = s;
+        this->originalFill = originalFill;
+        this->newFill = newFill;
+    }
+
+    ~FillUndoActionEntry() = default;
+    Stroke* s;
+    int originalFill;
+    int newFill;
+};
+
+FillUndoAction::FillUndoAction(const PageRef& page, Layer* layer): UndoAction("FillUndoAction") {
+    this->page = page;
+    this->layer = layer;
+}
+
+FillUndoAction::~FillUndoAction() {
+    for (FillUndoActionEntry* e: this->data) { delete e; }
+    this->data.clear();
+}
+
+void FillUndoAction::addStroke(Stroke* s, int originalFill, int newFill) {
+    this->data.push_back(new FillUndoActionEntry(s, originalFill, newFill));
+}
+
+auto FillUndoAction::undo(Control* control) -> bool {
+    if (this->data.empty()) {
+        return true;
+    }
+
+    Document* doc = control->getDocument();
+    doc->lock();
+    FillUndoActionEntry* e = this->data.front();
+    Range range(e->s->getX(), e->s->getY());
+
+    for (FillUndoActionEntry* e: this->data) {
+        e->s->setFill(e->originalFill);
+
+        range.addPoint(e->s->getX(), e->s->getY());
+        range.addPoint(e->s->getX() + e->s->getElementWidth(), e->s->getY() + e->s->getElementHeight());
+    }
+
+    doc->unlock();
+    this->page->fireRangeChanged(range);
+
+    return true;
+}
+
+auto FillUndoAction::redo(Control* control) -> bool {
+    if (this->data.empty()) {
+        return true;
+    }
+
+    Document* doc = control->getDocument();
+    doc->lock();
+    FillUndoActionEntry* e = this->data.front();
+    Range range(e->s->getX(), e->s->getY());
+
+    for (FillUndoActionEntry* e: this->data) {
+        e->s->setFill(e->newFill);
+
+        range.addPoint(e->s->getX(), e->s->getY());
+        range.addPoint(e->s->getX() + e->s->getElementWidth(), e->s->getY() + e->s->getElementHeight());
+    }
+
+    doc->unlock();
+    this->page->fireRangeChanged(range);
+
+    return true;
+}
+
+auto FillUndoAction::getText() -> std::string { return _("Change stroke fill"); }
diff --git a/entry/src/main/cpp/src/core/undo/FillUndoAction.h b/entry/src/main/cpp/src/core/undo/FillUndoAction.h
new file mode 100644
index 0000000..af2696f
--- /dev/null
+++ b/entry/src/main/cpp/src/core/undo/FillUndoAction.h
@@ -0,0 +1,42 @@
+/*
+ * Xournal++
+ *
+ * Undo action resize
+ *
+ * @author Xournal++ Team
+ * https://github.com/xournalpp/xournalpp
+ *
+ * @license GNU GPLv2 or later
+ */
+
+#pragma once
+
+#include <string>  // for string
+#include <vector>  // for vector
+
+#include "model/PageRef.h"  // for PageRef
+
+#include "UndoAction.h"  // for UndoAction
+
+class Layer;
+class FillUndoActionEntry;
+class Stroke;
+class Control;
+
+class FillUndoAction: public UndoAction {
+public:
+    FillUndoAction(const PageRef& page, Layer* layer);
+    ~FillUndoAction() override;
+
+public:
+    bool undo(Control* control) override;
+    bool redo(Control* control) override;
+    std::string getText() override;
+
+    void addStroke(Stroke* s, int originalFill, int newFill);
+
+private:
+    std::vector<FillUndoActionEntry*> data;
+
+    Layer* layer;
+};
diff --git a/entry/src/main/cpp/src/core/undo/FontUndoAction.cpp b/entry/src/main/cpp/src/core/undo/FontUndoAction.cpp
new file mode 100644
index 0000000..92888fc
--- /dev/null
+++ b/entry/src/main/cpp/src/core/undo/FontUndoAction.cpp
@@ -0,0 +1,118 @@
+#include "FontUndoAction.h"
+
+#include <algorithm>  // for max, min
+#include <memory>     // for __shared_ptr_access, __shared_ptr_acces...
+
+#include "control/Control.h"
+#include "model/Document.h"
+#include "model/Font.h"       // for XojFont
+#include "model/Text.h"       // for Text
+#include "model/XojPage.h"    // for XojPage
+#include "undo/UndoAction.h"  // for UndoAction
+#include "util/Rectangle.h"   // for Rectangle
+#include "util/i18n.h"        // for _
+
+using xoj::util::Rectangle;
+
+class FontUndoActionEntry {
+public:
+    FontUndoActionEntry(Text* e, const XojFont& oldFont, const XojFont& newFont) {
+        this->e = e;
+        this->oldFont = oldFont;
+        this->newFont = newFont;
+    }
+
+    Text* e;
+    XojFont oldFont;
+    XojFont newFont;
+};
+
+FontUndoAction::FontUndoAction(const PageRef& page, Layer* layer): UndoAction("FontUndoAction") {
+    this->page = page;
+    this->layer = layer;
+}
+
+FontUndoAction::~FontUndoAction() {
+    for (FontUndoActionEntry* e: this->data) { delete e; }
+    this->data.clear();
+}
+
+void FontUndoAction::addStroke(Text* e, const XojFont& oldFont, const XojFont& newFont) {
+    this->data.push_back(new FontUndoActionEntry(e, oldFont, newFont));
+}
+
+auto FontUndoAction::undo(Control* control) -> bool {
+    if (this->data.empty()) {
+        return true;
+    }
+
+    Document* doc = control->getDocument();
+    doc->lock();
+    FontUndoActionEntry* e = this->data.front();
+    double x1 = e->e->getX();
+    double x2 = e->e->getX() + e->e->getElementWidth();
+    double y1 = e->e->getY();
+    double y2 = e->e->getY() + e->e->getElementHeight();
+
+    for (FontUndoActionEntry* e: this->data) {
+        // size with old font
+        x1 = std::min(x1, e->e->getX());
+        x2 = std::max(x2, e->e->getX() + e->e->getElementWidth());
+        y1 = std::min(y1, e->e->getY());
+        y2 = std::max(y2, e->e->getY() + e->e->getElementHeight());
+
+        e->e->setFont(e->oldFont);
+
+        // size with new font
+        x1 = std::min(x1, e->e->getX());
+        x2 = std::max(x2, e->e->getX() + e->e->getElementWidth());
+        y1 = std::min(y1, e->e->getY());
+        y2 = std::max(y2, e->e->getY() + e->e->getElementHeight());
+    }
+
+    doc->unlock();
+
+    Rectangle<double> rect(x1, y1, x2 - x1, y2 - y1);
+    this->page->fireRectChanged(rect);
+
+    return true;
+}
+
+auto FontUndoAction::redo(Control* control) -> bool {
+    if (this->data.empty()) {
+        return true;
+    }
+
+    Document* doc = control->getDocument();
+    doc->lock();
+    FontUndoActionEntry* e = this->data.front();
+    double x1 = e->e->getX();
+    double x2 = e->e->getX() + e->e->getElementWidth();
+    double y1 = e->e->getY();
+    double y2 = e->e->getY() + e->e->getElementHeight();
+
+    for (FontUndoActionEntry* e: this->data) {
+        // size with old font
+        x1 = std::min(x1, e->e->getX());
+        x2 = std::max(x2, e->e->getX() + e->e->getElementWidth());
+        y1 = std::min(y1, e->e->getY());
+        y2 = std::max(y2, e->e->getY() + e->e->getElementHeight());
+
+        e->e->setFont(e->newFont);
+
+        // size with new font
+        x1 = std::min(x1, e->e->getX());
+        x2 = std::max(x2, e->e->getX() + e->e->getElementWidth());
+        y1 = std::min(y1, e->e->getY());
+        y2 = std::max(y2, e->e->getY() + e->e->getElementHeight());
+    }
+
+    doc->unlock();
+
+    Rectangle<double> rect(x1, y1, x2 - x1, y2 - y1);
+    this->page->fireRectChanged(rect);
+
+    return true;
+}
+
+auto FontUndoAction::getText() -> std::string { return _("Change font"); }
diff --git a/entry/src/main/cpp/src/core/undo/FontUndoAction.h b/entry/src/main/cpp/src/core/undo/FontUndoAction.h
new file mode 100644
index 0000000..0a27a12
--- /dev/null
+++ b/entry/src/main/cpp/src/core/undo/FontUndoAction.h
@@ -0,0 +1,43 @@
+/*
+ * Xournal++
+ *
+ * Undo action for font changes
+ *
+ * @author Xournal++ Team
+ * https://github.com/xournalpp/xournalpp
+ *
+ * @license GNU GPLv2 or later
+ */
+
+#pragma once
+
+#include <string>  // for string
+#include <vector>  // for vector
+
+#include "model/PageRef.h"  // for PageRef
+
+#include "UndoAction.h"  // for UndoAction
+
+class FontUndoActionEntry;
+class Layer;
+class Text;
+class XojFont;
+class Control;
+
+class FontUndoAction: public UndoAction {
+public:
+    FontUndoAction(const PageRef& page, Layer* layer);
+    ~FontUndoAction() override;
+
+public:
+    bool undo(Control* control) override;
+    bool redo(Control* control) override;
+    std::string getText() override;
+
+    void addStroke(Text* e, const XojFont& oldFont, const XojFont& newFont);
+
+private:
+    std::vector<FontUndoActionEntry*> data;
+
+    Layer* layer;
+};
diff --git a/entry/src/main/cpp/src/core/undo/GroupUndoAction.cpp b/entry/src/main/cpp/src/core/undo/GroupUndoAction.cpp
new file mode 100644
index 0000000..91e63f8
--- /dev/null
+++ b/entry/src/main/cpp/src/core/undo/GroupUndoAction.cpp
@@ -0,0 +1,52 @@
+#include "GroupUndoAction.h"
+
+#include <algorithm>  // for none_of
+#include <utility>    // for move
+
+#include "undo/UndoAction.h"  // for UndoAction
+
+class Control;
+
+GroupUndoAction::GroupUndoAction(): UndoAction("GroupUndoAction") {}
+
+void GroupUndoAction::addAction(std::unique_ptr<UndoAction> action) { actions.push_back(std::move(action)); }
+
+auto GroupUndoAction::getPages() -> std::vector<PageRef> {
+    std::vector<PageRef> pages;
+
+    for (std::unique_ptr<UndoAction>& a: actions) {
+        for (PageRef addPage: a->getPages()) {
+            if (!addPage) {
+                continue;
+            }
+
+            if (std::none_of(pages.begin(), pages.end(), [&](const PageRef& p) { return addPage == p; })) {
+                pages.push_back(addPage);
+            }
+        }
+    }
+
+    return pages;
+}
+
+auto GroupUndoAction::redo(Control* control) -> bool {
+    bool result = true;
+    for (auto& action: actions) { result = result && action->redo(control); }
+
+    return result;
+}
+
+auto GroupUndoAction::undo(Control* control) -> bool {
+    bool result = true;
+    for (auto& action: actions) { result = result && action->undo(control); }
+
+    return result;
+}
+
+auto GroupUndoAction::getText() -> std::string {
+    if (actions.empty()) {
+        return "!! NOTHING !!";
+    }
+
+    return actions[0]->getText();
+}
diff --git a/entry/src/main/cpp/src/core/undo/GroupUndoAction.h b/entry/src/main/cpp/src/core/undo/GroupUndoAction.h
new file mode 100644
index 0000000..778da23
--- /dev/null
+++ b/entry/src/main/cpp/src/core/undo/GroupUndoAction.h
@@ -0,0 +1,44 @@
+/*
+ * Xournal++
+ *
+ * Undo action to group a list of undo actions of the same type
+ *
+ * @author Xournal++ Team
+ * https://github.com/xournalpp/xournalpp
+ *
+ * @license GNU GPLv2 or later
+ */
+
+#pragma once
+
+#include <memory>  // for unique_ptr
+#include <string>  // for string
+#include <vector>  // for vector
+
+#include "model/PageRef.h"  // for PageRef
+
+#include "UndoAction.h"  // for UndoAction
+
+class Control;
+
+
+class GroupUndoAction: public UndoAction {
+public:
+    GroupUndoAction();
+
+public:
+    void addAction(std::unique_ptr<UndoAction> action);
+
+    /**
+     * Get the affected pages
+     */
+    std::vector<PageRef> getPages() override;
+
+    bool undo(Control* control) override;
+    bool redo(Control* control) override;
+
+    std::string getText() override;
+
+private:
+    std::vector<std::unique_ptr<UndoAction>> actions;
+};
diff --git a/entry/src/main/cpp/src/core/undo/InsertDeletePageUndoAction.cpp b/entry/src/main/cpp/src/core/undo/InsertDeletePageUndoAction.cpp
new file mode 100644
index 0000000..cf0deb5
--- /dev/null
+++ b/entry/src/main/cpp/src/core/undo/InsertDeletePageUndoAction.cpp
@@ -0,0 +1,88 @@
+#include "InsertDeletePageUndoAction.h"
+
+#include "control/Control.h"        // for Control
+#include "control/ScrollHandler.h"  // for ScrollHandler
+#include "gui/XournalppCursor.h"    // for XournalppCursor
+#include "model/Document.h"         // for Document
+#include "model/PageRef.h"          // for PageRef
+#include "undo/UndoAction.h"        // for UndoAction
+#include "util/Util.h"              // for npos
+#include "util/i18n.h"              // for _
+
+InsertDeletePageUndoAction::InsertDeletePageUndoAction(const PageRef& page, size_t pagePos, bool inserted):
+        UndoAction("InsertDeletePageUndoAction") {
+    this->inserted = inserted;
+    this->page = page;
+    this->pagePos = pagePos;
+}
+
+InsertDeletePageUndoAction::~InsertDeletePageUndoAction() { this->page = nullptr; }
+
+auto InsertDeletePageUndoAction::undo(Control* control) -> bool {
+    if (this->inserted) {
+        return deletePage(control);
+    }
+
+
+    return insertPage(control);
+}
+
+auto InsertDeletePageUndoAction::redo(Control* control) -> bool {
+    if (this->inserted) {
+        return insertPage(control);
+    }
+
+
+    return deletePage(control);
+}
+
+auto InsertDeletePageUndoAction::insertPage(Control* control) -> bool {
+    Document* doc = control->getDocument();
+
+    // just in case there would be a hang here,
+    // we'll clear the selection in redo as well
+    control->clearSelectionEndText();
+
+    doc->lock();
+    doc->insertPage(this->page, this->pagePos);
+    doc->unlock();
+
+    control->firePageInserted(this->pagePos);
+    control->getCursor()->updateCursor();
+    control->getScrollHandler()->scrollToPage(this->pagePos);
+
+    return true;
+}
+
+auto InsertDeletePageUndoAction::deletePage(Control* control) -> bool {
+    Document* doc = control->getDocument();
+
+    // in order to fix the hang, we need to get out
+    // of text mode
+    //***This might kill whatever we've got selected
+    control->clearSelectionEndText();
+
+    doc->lock_shared();
+    auto pNr = doc->indexOf(page);
+    doc->unlock_shared();
+    if (pNr == npos) {
+        // this should not happen
+        return false;
+    }
+
+    // first send event, then delete page...
+    control->firePageDeleted(pNr);
+    doc->lock();
+    doc->deletePage(pNr);
+    doc->unlock();
+    return true;
+}
+
+auto InsertDeletePageUndoAction::getText() -> std::string {
+    if (this->inserted) {
+        return _("Page inserted");
+    }
+
+
+    return _("Page deleted");
+}
diff --git a/entry/src/main/cpp/src/core/undo/InsertDeletePageUndoAction.h b/entry/src/main/cpp/src/core/undo/InsertDeletePageUndoAction.h
new file mode 100644
index 0000000..2cafac0
--- /dev/null
+++ b/entry/src/main/cpp/src/core/undo/InsertDeletePageUndoAction.h
@@ -0,0 +1,41 @@
+/*
+ * Xournal++
+ *
+ * Undo action for insert page / delete page
+ *
+ * @author Xournal++ Team
+ * https://github.com/xournalpp/xournalpp
+ *
+ * @license GNU GPLv2 or later
+ */
+
+#pragma once
+
+#include <string>  // for string
+
+#include "model/PageRef.h"  // for PageRef
+
+#include "UndoAction.h"  // for UndoAction
+
+class Control;
+
+
+class InsertDeletePageUndoAction: public UndoAction {
+public:
+    InsertDeletePageUndoAction(const PageRef& page, size_t pagePos, bool inserted);
+    ~InsertDeletePageUndoAction() override;
+
+public:
+    bool undo(Control* control) override;
+    bool redo(Control* control) override;
+
+    std::string getText() override;
+
+private:
+    bool insertPage(Control* control);
+    bool deletePage(Control* control);
+
+private:
+    bool inserted;
+    size_t pagePos;
+};
diff --git a/entry/src/main/cpp/src/core/undo/InsertLayerUndoAction.cpp b/entry/src/main/cpp/src/core/undo/InsertLayerUndoAction.cpp
new file mode 100644
index 0000000..117ca88
--- /dev/null
+++ b/entry/src/main/cpp/src/core/undo/InsertLayerUndoAction.cpp
@@ -0,0 +1,39 @@
+#include "InsertLayerUndoAction.h"
+
+#include "control/layer/LayerController.h"  // for LayerController
+#include "model/Layer.h"                    // for Layer, Layer::Index
+#include "model/PageRef.h"                  // for PageRef
+#include "undo/UndoAction.h"                // for UndoAction
+#include "util/i18n.h"                      // for _
+
+InsertLayerUndoAction::InsertLayerUndoAction(LayerController* layerController, const PageRef& page, Layer* layer,
+                                             Layer::Index layerPosition):
+        UndoAction("InsertLayerUndoAction"),
+        layerPosition(layerPosition),
+        layerController(layerController),
+        layer(layer) {
+    this->page = page;
+}
+
+InsertLayerUndoAction::~InsertLayerUndoAction() {
+    if (this->undone) {
+        // The layer was undone, also deleted
+        delete this->layer;
+    }
+}
+
+auto InsertLayerUndoAction::getText() -> std::string { return _("Insert layer"); }
+
+auto InsertLayerUndoAction::undo(Control* control) -> bool {
+    layerController->removeLayer(this->page, this->layer);
+    this->undone = true;
+
+    return true;
+}
+
+auto InsertLayerUndoAction::redo(Control* control) -> bool {
+    layerController->insertLayer(this->page, this->layer, layerPosition);
+    this->undone = false;
+
+    return true;
+}
diff --git a/entry/src/main/cpp/src/core/undo/InsertLayerUndoAction.h b/entry/src/main/cpp/src/core/undo/InsertLayerUndoAction.h
new file mode 100644
index 0000000..03f5335
--- /dev/null
+++ b/entry/src/main/cpp/src/core/undo/InsertLayerUndoAction.h
@@ -0,0 +1,40 @@
+/*
+ * Xournal++
+ *
+ * Undo action for insert  layer
+ *
+ * @author Xournal++ Team
+ * https://github.com/xournalpp/xournalpp
+ *
+ * @license GNU GPLv2 or later
+ */
+
+#pragma once
+
+#include <string>  // for string
+
+#include "model/Layer.h"    // for Layer, Layer::Index
+#include "model/PageRef.h"  // for PageRef
+
+#include "UndoAction.h"  // for UndoAction
+
+class LayerController;
+class Control;
+
+class InsertLayerUndoAction: public UndoAction {
+public:
+    InsertLayerUndoAction(LayerController* layerController, const PageRef& page, Layer* layer,
+                          Layer::Index layerPosition);
+    ~InsertLayerUndoAction() override;
+
+public:
+    bool undo(Control* control) override;
+    bool redo(Control* control) override;
+
+    std::string getText() override;
+
+private:
+    Layer::Index layerPosition;
+    LayerController* layerController;
+    Layer* layer;
+};
diff --git a/entry/src/main/cpp/src/core/undo/InsertUndoAction.cpp b/entry/src/main/cpp/src/core/undo/InsertUndoAction.cpp
new file mode 100644
index 0000000..3b5defe
--- /dev/null
+++ b/entry/src/main/cpp/src/core/undo/InsertUndoAction.cpp
@@ -0,0 +1,106 @@
+#include "InsertUndoAction.h"
+
+#include <memory>   // for allocator, __shared_ptr_access, __share...
+#include <utility>  // for move
+
+#include "control/Control.h"
+#include "model/Document.h"
+#include "model/Element.h"    // for Element, ELEMENT_IMAGE, ELEMENT_STROKE
+#include "model/Layer.h"      // for Layer
+#include "model/PageRef.h"    // for PageRef
+#include "model/XojPage.h"    // for XojPage
+#include "undo/UndoAction.h"  // for UndoAction
+#include "util/i18n.h"        // for _
+
+InsertUndoAction::InsertUndoAction(const PageRef& page, Layer* layer, const Element* element):
+        UndoAction("InsertUndoAction"), layer(layer), element(element), elementOwn(nullptr) {
+    this->page = page;
+}
+
+InsertUndoAction::~InsertUndoAction() = default;
+
+auto InsertUndoAction::getText() -> std::string {
+    switch (element->getType()) {
+        case ELEMENT_STROKE:
+            return _("Draw stroke");
+        case ELEMENT_TEXT:
+            return _("Write text");
+        case ELEMENT_IMAGE:
+            return _("Insert image");
+        case ELEMENT_TEXIMAGE:
+            return _("Insert latex");
+        default:
+            return "";
+    }
+}
+
+auto InsertUndoAction::undo(Control* control) -> bool {
+    Document* doc = control->getDocument();
+    doc->lock();
+    this->elementOwn = this->layer->removeElement(this->element).e;
+    doc->unlock();
+
+    this->page->fireElementChanged(this->element);
+
+    this->undone = true;
+
+    return true;
+}
+
+auto InsertUndoAction::redo(Control* control) -> bool {
+    Document* doc = control->getDocument();
+    doc->lock();
+    this->layer->addElement(std::move(this->elementOwn));
+    doc->unlock();
+
+    this->page->fireElementChanged(this->element);
+
+    this->undone = false;
+
+    return true;
+}
+
+InsertsUndoAction::InsertsUndoAction(const PageRef& page, Layer* layer, std::vector<const Element*> elements):
+        UndoAction("InsertsUndoAction"), layer(layer), elements(std::move(elements)), elementsOwn(0) {
+    this->page = page;
+}
+
+InsertsUndoAction::~InsertsUndoAction() = default;
+
+auto InsertsUndoAction::getText() -> std::string { return _("Insert elements"); }
+
+auto InsertsUndoAction::undo(Control* control) -> bool {
+    this->elementsOwn.reserve(this->elements.size());
+
+    Document* doc = control->getDocument();
+    doc->lock();
+    for (const Element* elem: this->elements) {
+        this->elementsOwn.emplace_back(this->layer->removeElement(elem).e);
+    }
+    doc->unlock();
+    for (const Element* elem: this->elements) {
+        this->page->fireElementChanged(elem);
+    }
+
+    this->undone = true;
+
+    return true;
+}
+
+auto InsertsUndoAction::redo(Control* control) -> bool {
+    Document* doc = control->getDocument();
+    doc->lock();
+    for (auto&& elem: this->elementsOwn) {
+        this->layer->addElement(std::move(elem));
+    }
+    doc->unlock();
+    this->elementsOwn = std::vector<ElementPtr>(0);
+
+    for (auto&& elem: this->elements) {
+        this->page->fireElementChanged(elem);
+    }
+
+    this->undone = false;
+
+    return true;
+}
diff --git a/entry/src/main/cpp/src/core/undo/InsertUndoAction.h b/entry/src/main/cpp/src/core/undo/InsertUndoAction.h
new file mode 100644
index 0000000..013dc81
--- /dev/null
+++ b/entry/src/main/cpp/src/core/undo/InsertUndoAction.h
@@ -0,0 +1,60 @@
+/*
+ * Xournal++
+ *
+ * Undo action for insert (write text, draw stroke...)
+ *
+ * @author Xournal++ Team
+ * https://github.com/xournalpp/xournalpp
+ *
+ * @license GNU GPLv2 or later
+ */
+
+#pragma once
+
+#include <string>  // for string
+#include <vector>  // for vector
+
+#include "model/Element.h"
+#include "model/PageRef.h"  // for PageRef
+
+#include "UndoAction.h"  // for UndoAction
+
+class Element;
+class Layer;
+class Control;
+
+using ElementPtr = std::unique_ptr<Element>;
+
+class InsertUndoAction: public UndoAction {
+public:
+    InsertUndoAction(const PageRef& page, Layer* layer, const Element* element);
+    ~InsertUndoAction() override;
+
+public:
+    bool undo(Control* control) override;
+    bool redo(Control* control) override;
+
+    std::string getText() override;
+
+private:
+    Layer* layer;
+    const Element* element;
+    ElementPtr elementOwn;
+};
+
+class InsertsUndoAction: public UndoAction {
+public:
+    InsertsUndoAction(const PageRef& page, Layer* layer, std::vector<const Element*> elements);
+    ~InsertsUndoAction() override;
+
+public:
+    bool undo(Control* control) override;
+    bool redo(Control* control) override;
+
+    std::string getText() override;
+
+private:
+    Layer* layer;
+    std::vector<const Element*> elements;
+    std::vector<ElementPtr> elementsOwn;
+};
diff --git a/entry/src/main/cpp/src/core/undo/LayerRenameUndoAction.cpp b/entry/src/main/cpp/src/core/undo/LayerRenameUndoAction.cpp
new file mode 100644
index 0000000..1c1bd46
--- /dev/null
+++ b/entry/src/main/cpp/src/core/undo/LayerRenameUndoAction.cpp
@@ -0,0 +1,38 @@
+#include "LayerRenameUndoAction.h"
+
+#include "control/Control.h"
+#include "control/layer/LayerController.h"  // for LayerController
+#include "model/Document.h"
+#include "model/Layer.h"                    // for Layer
+#include "undo/UndoAction.h"                // for UndoAction
+#include "util/i18n.h"                      // for _
+
+LayerRenameUndoAction::LayerRenameUndoAction(LayerController* layerController, Layer* layer, const std::string& newName,
+                                             const std::string& oldName):
+        UndoAction("LayerUndoAction"),
+        layer(layer),
+        layerController(layerController),
+        newName(newName),
+        oldName(oldName) {}
+
+LayerRenameUndoAction::~LayerRenameUndoAction() = default;
+
+auto LayerRenameUndoAction::getText() -> std::string { return _("Rename layer"); };
+
+auto LayerRenameUndoAction::undo(Control* control) -> bool {
+    Document* doc = control->getDocument();
+    doc->lock();
+    layer->setName(oldName);
+    doc->unlock();
+    layerController->fireRebuildLayerMenu();
+    return true;
+}
+
+auto LayerRenameUndoAction::redo(Control* control) -> bool {
+    Document* doc = control->getDocument();
+    doc->lock();
+    layer->setName(newName);
+    doc->unlock();
+    layerController->fireRebuildLayerMenu();
+    return true;
+}
diff --git a/entry/src/main/cpp/src/core/undo/LayerRenameUndoAction.h b/entry/src/main/cpp/src/core/undo/LayerRenameUndoAction.h
new file mode 100644
index 0000000..8d3859b
--- /dev/null
+++ b/entry/src/main/cpp/src/core/undo/LayerRenameUndoAction.h
@@ -0,0 +1,38 @@
+/*
+ * Xournal++
+ *
+ * Rename undo action for layer
+ *
+ * @author Xournal++ Team
+ * https://github.com/xournalpp/xournalpp
+ *
+ * @license GNU GPLv2 or later
+ */
+
+#pragma once
+
+#include <string>  // for string
+
+#include "UndoAction.h"  // for UndoAction
+
+class Layer;
+class Control;
+class LayerController;
+
+class LayerRenameUndoAction: public UndoAction {
+public:
+    LayerRenameUndoAction(LayerController* layerController, Layer* layer, const std::string& newName,
+                          const std::string& oldName);
+    ~LayerRenameUndoAction() override;
+
+public:
+    std::string getText() override;
+    bool undo(Control* control) override;
+    bool redo(Control* control) override;
+
+private:
+    Layer* layer;
+    LayerController* layerController;
+    std::string newName;
+    std::string oldName;
+};
diff --git a/entry/src/main/cpp/src/core/undo/LineStyleUndoAction.cpp b/entry/src/main/cpp/src/core/undo/LineStyleUndoAction.cpp
new file mode 100644
index 0000000..3259347
--- /dev/null
+++ b/entry/src/main/cpp/src/core/undo/LineStyleUndoAction.cpp
@@ -0,0 +1,86 @@
+#include "LineStyleUndoAction.h"
+
+#include <algorithm>  // for max, min
+#include <memory>     // for __shared_ptr_access, __shared_ptr_acces...
+
+#include "control/Control.h"
+#include "model/Document.h"
+#include "model/PageRef.h"    // for PageRef
+#include "model/Stroke.h"     // for Stroke
+#include "model/XojPage.h"    // for XojPage
+#include "undo/UndoAction.h"  // for UndoAction
+#include "util/Rectangle.h"   // for Rectangle
+#include "util/i18n.h"        // for _
+
+using xoj::util::Rectangle;
+
+LineStyleUndoAction::LineStyleUndoAction(const PageRef& page, Layer* layer): UndoAction("LineStyleUndoAction") {
+    this->page = page;
+    this->layer = layer;
+}
+
+void LineStyleUndoAction::addStroke(Stroke* s, LineStyle originalStyle, LineStyle newStyle) {
+    this->data.emplace_back(s, originalStyle, newStyle);
+}
+
+auto LineStyleUndoAction::undo(Control* control) -> bool {
+    if (this->data.empty()) {
+        return true;
+    }
+
+    Document* doc = control->getDocument();
+    doc->lock();
+    LineStyleUndoActionEntry e = this->data.front();
+    double x1 = e.s->getX();
+    double x2 = e.s->getX() + e.s->getElementWidth();
+    double y1 = e.s->getY();
+    double y2 = e.s->getY() + e.s->getElementHeight();
+
+    for (LineStyleUndoActionEntry& e: this->data) {
+        e.s->setLineStyle(e.oldStyle);
+
+        x1 = std::min(x1, e.s->getX());
+        x2 = std::max(x2, e.s->getX() + e.s->getElementWidth());
+        y1 = std::min(y1, e.s->getY());
+        y2 = std::max(y2, e.s->getY() + e.s->getElementHeight());
+    }
+
+    doc->unlock();
+
+    Rectangle rect(x1, y1, x2 - x1, y2 - y1);
+    this->page->fireRectChanged(rect);
+
+    return true;
+}
+
+auto LineStyleUndoAction::redo(Control* control) -> bool {
+    if (this->data.empty()) {
+        return true;
+    }
+
+    Document* doc = control->getDocument();
+    doc->lock();
+    LineStyleUndoActionEntry e = this->data.front();
+    double x1 = e.s->getX();
+    double x2 = e.s->getX() + e.s->getElementWidth();
+    double y1 = e.s->getY();
+    double y2 = e.s->getY() + e.s->getElementHeight();
+
+    for (LineStyleUndoActionEntry& e: this->data) {
+        e.s->setLineStyle(e.newStyle);
+
+        x1 = std::min(x1, e.s->getX());
+        x2 = std::max(x2, e.s->getX() + e.s->getElementWidth());
+        y1 = std::min(y1, e.s->getY());
+        y2 = std::max(y2, e.s->getY() + e.s->getElementHeight());
+    }
+
+    doc->unlock();
+
+    Rectangle rect(x1, y1, x2 - x1, y2 - y1);
+    this->page->fireRectChanged(rect);
+
+    return true;
+}
+
+auto LineStyleUndoAction::getText() -> std::string { return _("Change line style"); }
diff --git a/entry/src/main/cpp/src/core/undo/LineStyleUndoAction.h b/entry/src/main/cpp/src/core/undo/LineStyleUndoAction.h
new file mode 100644
index 0000000..066b592
--- /dev/null
+++ b/entry/src/main/cpp/src/core/undo/LineStyleUndoAction.h
@@ -0,0 +1,53 @@
+/*
+ * Xournal++
+ *
+ * Undo action for line style changes (Edit selection)
+ *
+ * @author Xournal++ Team
+ * https://github.com/xournalpp/xournalpp
+ *
+ * @license GNU GPLv2 or later
+ */
+
+#pragma once
+
+#include <string>  // for string
+#include <vector>  // for vector
+
+#include "model/LineStyle.h"  // for LineStyle
+#include "model/PageRef.h"    // for PageRef
+
+#include "UndoAction.h"  // for UndoAction
+
+class Stroke;
+class Layer;
+class Control;
+
+struct LineStyleUndoActionEntry {
+    LineStyleUndoActionEntry(Stroke* s, LineStyle oldStyle, LineStyle newStyle):
+            s(s), oldStyle(oldStyle), newStyle(newStyle) {}
+    Stroke* s;
+    LineStyle oldStyle;
+    LineStyle newStyle;
+};
+
+class LineStyleUndoAction: public UndoAction {
+public:
+    LineStyleUndoAction(const PageRef& page, Layer* layer);
+    LineStyleUndoAction(LineStyleUndoAction const&) = delete;
+    LineStyleUndoAction(LineStyleUndoAction&&) = delete;
+    LineStyleUndoAction& operator=(LineStyleUndoAction const&) = delete;
+    LineStyleUndoAction& operator=(LineStyleUndoAction&&) = delete;
+    ~LineStyleUndoAction() override = default;
+
+public:
+    bool undo(Control* control) override;
+    bool redo(Control* control) override;
+    std::string getText() override;
+
+    void addStroke(Stroke* s, LineStyle originalStyle, LineStyle newStyle);
+
+private:
+    std::vector<LineStyleUndoActionEntry> data;
+    Layer* layer;
+};
diff --git a/entry/src/main/cpp/src/core/undo/MergeLayerDownUndoAction.cpp b/entry/src/main/cpp/src/core/undo/MergeLayerDownUndoAction.cpp
new file mode 100644
index 0000000..ed23044
--- /dev/null
+++ b/entry/src/main/cpp/src/core/undo/MergeLayerDownUndoAction.cpp
@@ -0,0 +1,54 @@
+#include "MergeLayerDownUndoAction.h"
+
+#include <memory>  // for __shared_ptr_access
+#include <utility>
+#include <vector>  // for vector
+
+#include "control/layer/LayerController.h"  // for LayerController
+#include "model/Layer.h"                    // for Layer, Layer::Index
+#include "model/PageRef.h"                  // for PageRef
+#include "model/XojPage.h"                  // for XojPage
+#include "undo/UndoAction.h"                // for UndoAction
+#include "util/i18n.h"                      // for _
+
+class Element;
+
+namespace xoj {
+
+auto refElementContainer(const std::vector<ElementPtr>& elements) -> std::vector<Element*>;
+
+}  // namespace xoj
+
+MergeLayerDownUndoAction::MergeLayerDownUndoAction(LayerController* layerController, const PageRef& page,
+                                                   Layer* upperLayer, Layer::Index upperLayerPos, Layer* lowerLayer,
+                                                   size_t selectedPage):
+        UndoAction("MergeLayerDownUndoAction"),
+        layerController(layerController),
+        upperLayer(upperLayer),
+        upperLayerElements(this->upperLayer->getElementsView().clone()),
+        upperLayerPos(upperLayerPos),
+        upperLayerID(upperLayerPos + 1),
+        lowerLayer(lowerLayer),
+        lowerLayerID(upperLayerPos),
+        selectedPage(selectedPage) {
+    this->page = page;
+}
+
+auto MergeLayerDownUndoAction::getText() -> std::string { return _("Merge layer down"); }
+
+auto MergeLayerDownUndoAction::undo(Control* control) -> bool {
+    layerController->moveElementsFromLayerToFreeLayer(this->page, this->lowerLayer, this->upperLayerElements,
+                                                      this->upperLayer, this->upperLayerID);
+    this->page->setSelectedLayerId(this->upperLayerID);
+    this->undone = true;
+
+    return true;
+}
+
+auto MergeLayerDownUndoAction::redo(Control* control) -> bool {
+    layerController->mergeLayers(this->page, this->lowerLayer, this->upperLayer);
+    this->page->setSelectedLayerId(this->lowerLayerID);
+    this->undone = false;
+
+    return true;
+}
diff --git a/entry/src/main/cpp/src/core/undo/MergeLayerDownUndoAction.h b/entry/src/main/cpp/src/core/undo/MergeLayerDownUndoAction.h
new file mode 100644
index 0000000..4dfc05b
--- /dev/null
+++ b/entry/src/main/cpp/src/core/undo/MergeLayerDownUndoAction.h
@@ -0,0 +1,48 @@
+/*
+ * Xournal++
+ *
+ * Undo action for merging layer down
+ *
+ * @author Xournal++ Team
+ * https://github.com/xournalpp/xournalpp
+ *
+ * @license GNU GPLv2 or later
+ */
+
+#pragma once
+
+#include <cstddef>  // for size_t
+#include <string>   // for string
+
+#include "model/Layer.h"    // for Layer, Layer::Index
+#include "model/PageRef.h"  // for PageRef
+
+#include "UndoAction.h"  // for UndoAction
+
+class LayerController;
+class Control;
+
+class MergeLayerDownUndoAction: public UndoAction {
+public:
+    MergeLayerDownUndoAction(LayerController* layerController, const PageRef& page, Layer* upperLayer,
+                             Layer::Index upperLayerPos, Layer* lowerLayer, size_t selectedPage);
+
+public:
+    bool undo(Control* control) override;
+    bool redo(Control* control) override;
+
+    std::string getText() override;
+
+private:
+    LayerController* layerController;
+
+    Layer* upperLayer;
+    std::vector<const Element*> upperLayerElements;
+    Layer::Index upperLayerPos;
+    Layer::Index upperLayerID;
+
+    Layer* lowerLayer;
+    Layer::Index lowerLayerID;
+
+    size_t selectedPage;
+};
diff --git a/entry/src/main/cpp/src/core/undo/MissingPdfUndoAction.cpp b/entry/src/main/cpp/src/core/undo/MissingPdfUndoAction.cpp
new file mode 100644
index 0000000..1bf82a6
--- /dev/null
+++ b/entry/src/main/cpp/src/core/undo/MissingPdfUndoAction.cpp
@@ -0,0 +1,66 @@
+#include "MissingPdfUndoAction.h"
+
+#include "control/Control.h"                         // for Control
+#include "control/PageBackgroundChangeController.h"  // for PageBackGroundChangeController
+#include "gui/MainWindow.h"                          // for MainWindow
+#include "gui/XournalView.h"                         // for XournalView
+#include "model/Document.h"                          // for Document
+#include "model/PageType.h"                          // for PageTypeFormat
+#include "model/XojPage.h"                           // for XojPage
+#include "undo/UndoAction.h"                         // for UndoAction
+#include "util/i18n.h"                               // for _
+
+MissingPdfUndoAction::MissingPdfUndoAction(const fs::path& oldFilepath, bool oldAttachPdf):
+        UndoAction("MissingPdfUndoAction"), filepath(oldFilepath), attachPdf(oldAttachPdf) {}
+
+MissingPdfUndoAction::~MissingPdfUndoAction() = default;
+
+auto MissingPdfUndoAction::undo(Control* control) -> bool {
+    Document* doc = control->getDocument();
+
+    fs::path redoFilepath = doc->getPdfFilepath();
+    bool redoAttachPdf = doc->isAttachPdf();
+
+    doc->lock();
+    doc->resetPdf();
+    doc->setPdfAttributes(this->filepath, this->attachPdf);
+    doc->unlock();
+
+    control->getWindow()->getXournal()->recreatePdfCache();
+
+    for (size_t p = 0; p < doc->getPageCount(); p++) {
+        if (doc->getPage(p)->getBackgroundType().format == PageTypeFormat::Pdf) {
+            control->firePageChanged(p);
+        }
+    }
+
+    this->filepath = std::move(redoFilepath);
+    this->attachPdf = redoAttachPdf;
+
+    return true;
+}
+
+auto MissingPdfUndoAction::redo(Control* control) -> bool {
+    Document* doc = control->getDocument();
+
+    doc->lock();
+    fs::path undoFilepath = doc->getPdfFilepath();
+    bool undoAttachPdf = doc->isAttachPdf();
+    doc->unlock();
+
+    doc->readPdf(this->filepath, false, this->attachPdf);
+    control->getWindow()->getXournal()->recreatePdfCache();
+
+    for (size_t p = 0; p < doc->getPageCount(); p++) {
+        if (doc->getPage(p)->getBackgroundType().format == PageTypeFormat::Pdf) {
+            control->firePageChanged(p);
+        }
+    }
+
+    this->filepath = std::move(undoFilepath);
+    this->attachPdf = undoAttachPdf;
+
+    return true;
+}
+
+auto MissingPdfUndoAction::getText() -> std::string { return _("Replace missing PDF"); }
diff --git a/entry/src/main/cpp/src/core/undo/MissingPdfUndoAction.h b/entry/src/main/cpp/src/core/undo/MissingPdfUndoAction.h
new file mode 100644
index 0000000..9982a2e
--- /dev/null
+++ b/entry/src/main/cpp/src/core/undo/MissingPdfUndoAction.h
@@ -0,0 +1,33 @@
+/*
+ * Xournal++
+ *
+ * Undo action for replacing a missing PDF file
+ *
+ * @author Xournal++ Team
+ * https://github.com/xournalpp/xournalpp
+ *
+ * @license GNU GPLv2 or later
+ */
+
+#pragma once
+
+#include "UndoAction.h"  // for UndoAction
+#include "filesystem.h"  // for path
+
+class Control;
+
+class MissingPdfUndoAction: public UndoAction {
+public:
+    MissingPdfUndoAction(const fs::path& oldFilepath, bool oldAttachPdf);
+    ~MissingPdfUndoAction() override;
+
+public:
+    bool undo(Control* control) override;
+    bool redo(Control* control) override;
+
+    std::string getText() override;
+
+private:
+    fs::path filepath;
+    bool attachPdf;
+};
diff --git a/entry/src/main/cpp/src/core/undo/MoveLayerUndoAction.cpp b/entry/src/main/cpp/src/core/undo/MoveLayerUndoAction.cpp
new file mode 100644
index 0000000..404d7c2
--- /dev/null
+++ b/entry/src/main/cpp/src/core/undo/MoveLayerUndoAction.cpp
@@ -0,0 +1,38 @@
+#include "MoveLayerUndoAction.h"
+
+#include "control/layer/LayerController.h"  // for LayerController
+#include "model/Layer.h"                    // for Layer, Layer::Index
+#include "model/PageRef.h"                  // for PageRef
+#include "undo/UndoAction.h"                // for UndoAction
+#include "util/i18n.h"                      // for _
+
+MoveLayerUndoAction::MoveLayerUndoAction(LayerController* layerController, const PageRef& page, Layer* layer,
+                                         Layer::Index oldLayerPos, Layer::Index newLayerPos):
+        UndoAction("MoveLayerUndoAction"),
+        oldLayerPos(oldLayerPos),
+        newLayerPos(newLayerPos),
+        layerController(layerController) {
+    this->page = page;
+    this->layer = layer;
+}
+
+MoveLayerUndoAction::~MoveLayerUndoAction() {
+    this->layerController = nullptr;
+    this->layer = nullptr;
+}
+
+auto MoveLayerUndoAction::getText() -> std::string { return _("Move layer"); }
+
+auto MoveLayerUndoAction::undo(Control* control) -> bool {
+    layerController->moveLayer(this->page, this->layer, oldLayerPos);
+    this->undone = true;
+
+    return true;
+}
+
+auto MoveLayerUndoAction::redo(Control* control) -> bool {
+    layerController->moveLayer(this->page, this->layer, newLayerPos);
+    this->undone = false;
+
+    return true;
+}
diff --git a/entry/src/main/cpp/src/core/undo/MoveLayerUndoAction.h b/entry/src/main/cpp/src/core/undo/MoveLayerUndoAction.h
new file mode 100644
index 0000000..3ca3e9c
--- /dev/null
+++ b/entry/src/main/cpp/src/core/undo/MoveLayerUndoAction.h
@@ -0,0 +1,41 @@
+/*
+ * Xournal++
+ *
+ * Undo action for insert  layer
+ *
+ * @author Xournal++ Team
+ * https://github.com/xournalpp/xournalpp
+ *
+ * @license GNU GPLv2 or later
+ */
+
+#pragma once
+
+#include <string>  // for string
+
+#include "model/Layer.h"    // for Layer, Layer::Index
+#include "model/PageRef.h"  // for PageRef
+
+#include "UndoAction.h"  // for UndoAction
+
+class LayerController;
+class Control;
+
+class MoveLayerUndoAction: public UndoAction {
+public:
+    MoveLayerUndoAction(LayerController* layerController, const PageRef& page, Layer* layer, Layer::Index oldLayerPos,
+                        Layer::Index newLayerPos);
+    ~MoveLayerUndoAction() override;
+
+public:
+    bool undo(Control* control) override;
+    bool redo(Control* control) override;
+
+    std::string getText() override;
+
+private:
+    Layer::Index oldLayerPos;
+    Layer::Index newLayerPos;
+    LayerController* layerController;
+    Layer* layer;
+};
diff --git a/entry/src/main/cpp/src/core/undo/MoveSelectionToLayerUndoAction.cpp b/entry/src/main/cpp/src/core/undo/MoveSelectionToLayerUndoAction.cpp
new file mode 100644
index 0000000..3127a5a
--- /dev/null
+++ b/entry/src/main/cpp/src/core/undo/MoveSelectionToLayerUndoAction.cpp
@@ -0,0 +1,68 @@
+#include "MoveSelectionToLayerUndoAction.h"
+
+#include <memory>  // for __shared_ptr_access, __shared_pt...
+
+#include <glib.h>  // for g_warning
+
+#include "control/Control.h"
+#include "model/Document.h"
+#include "model/Element.h"           // for Element, ELEMENT_IMAGE, ELEMENT_...
+#include "model/Layer.h"             // for Layer
+#include "model/PageRef.h"           // for PageRef
+#include "model/XojPage.h"           // for XojPage
+#include "undo/PageLayerPosEntry.h"  // for PageLayerPosEntry, operator<
+#include "undo/UndoAction.h"         // for UndoAction
+#include "util/i18n.h"               // for _
+
+MoveSelectionToLayerUndoAction::MoveSelectionToLayerUndoAction(const PageRef& page, LayerController* layerController, Layer* oldLayer, size_t oldLayerNo, size_t newLayerNo):
+        UndoAction("MoveSelectionToLayerUndoAction"),
+        layerController(layerController),
+        oldLayer(oldLayer),
+        oldLayerNo(oldLayerNo),
+        newLayerNo(newLayerNo) {
+    this->page = page;
+}
+
+auto MoveSelectionToLayerUndoAction::getText() -> std::string {
+    return "Move selection to layer";
+}
+
+auto MoveSelectionToLayerUndoAction::undo(Control* control) -> bool {
+    if (elements.empty()) {
+        this->undone = false;
+        return false;
+    }
+
+    Document* doc = control->getDocument();
+    doc->lock();
+    for (const auto& elem: elements) {
+        this->oldLayer->addElement(elem.layer->removeElement(elem.element).e);
+    }
+
+    this->layerController->switchToLay(oldLayerNo + 1);
+    doc->unlock();
+    this->undone = false;
+    return true;
+}
+
+auto MoveSelectionToLayerUndoAction::redo(Control* control) -> bool {
+    if (elements.empty()) {
+        this->undone = true;
+        return false;
+    }
+
+    Document* doc = control->getDocument();
+    doc->lock();
+    for (const auto& elem: elements) {
+        elem.layer->insertElement(this->oldLayer->removeElement(elem.element).e, elem.pos);
+    }
+
+    this->layerController->switchToLay(newLayerNo + 1);
+    doc->unlock();
+    this->undone = true;
+    return true;
+}
+
+void MoveSelectionToLayerUndoAction::addElement(Layer* layer, const Element* e, Element::Index pos) {
+    elements.emplace(layer, e, pos);
+}
diff --git a/entry/src/main/cpp/src/core/undo/MoveSelectionToLayerUndoAction.h b/entry/src/main/cpp/src/core/undo/MoveSelectionToLayerUndoAction.h
new file mode 100644
index 0000000..7634e47
--- /dev/null
+++ b/entry/src/main/cpp/src/core/undo/MoveSelectionToLayerUndoAction.h
@@ -0,0 +1,45 @@
+/*
+ * Xournal++
+ *
+ * Undo action for moving selection between layers
+ *
+ * @author Xournal++ Team
+ * https://github.com/xournalpp/xournalpp
+ *
+ * @license GNU GPLv2 or later
+ */
+
+#pragma once
+
+#include <set>     // for multiset
+#include <string>  // for string
+
+#include "model/Element.h"  // for Element
+#include "model/PageRef.h"  // for PageRef
+
+#include "control/layer/LayerController.h"  // for LayerController
+#include "PageLayerPosEntry.h"  // for PageLayerPosEntry
+#include "UndoAction.h"  // for UndoAction
+
+class Control;
+class Layer;
+
+class MoveSelectionToLayerUndoAction: public UndoAction {
+public:
+    MoveSelectionToLayerUndoAction(const PageRef& page, LayerController* layerController, Layer* oldLayer, size_t oldLayerNo, size_t newLayerNo);
+
+public:
+    bool undo(Control* control) override;
+    bool redo(Control* control) override;
+
+    void addElement(Layer* layer, const Element* e, Element::Index pos);
+
+    std::string getText() override;
+
+private:
+    std::multiset<PageLayerPosEntry<const Element>> elements{};
+    LayerController* layerController;
+    Layer* oldLayer;
+    size_t oldLayerNo;
+    size_t newLayerNo;
+};
diff --git a/entry/src/main/cpp/src/core/undo/MoveUndoAction.cpp b/entry/src/main/cpp/src/core/undo/MoveUndoAction.cpp
new file mode 100644
index 0000000..584653d
--- /dev/null
+++ b/entry/src/main/cpp/src/core/undo/MoveUndoAction.cpp
@@ -0,0 +1,96 @@
+#include "MoveUndoAction.h"
+
+#include <memory>  // for allocator, operator!=, __shared_ptr_access
+#include <utility>
+
+#include "control/Control.h"
+#include "model/Document.h"
+#include "model/Element.h"    // for Element
+#include "model/Layer.h"      // for Layer
+#include "model/PageRef.h"    // for PageRef
+#include "model/XojPage.h"    // for XojPage
+#include "undo/UndoAction.h"  // for UndoAction
+#include "util/i18n.h"        // for _
+
+MoveUndoAction::MoveUndoAction(Layer* sourceLayer, const PageRef& sourcePage, std::vector<Element*> selected, double mx,
+                               double my, Layer* targetLayer, PageRef targetPage):
+        UndoAction("MoveUndoAction"),
+        elements(std::move(selected)),
+        sourceLayer(sourceLayer),
+        text(_("Move")),
+        dx(mx),
+        dy(my) {
+    this->page = sourcePage;
+
+    if (this->page != targetPage) {
+        this->targetPage = std::move(targetPage);
+        this->targetLayer = targetLayer;
+    }
+}
+
+MoveUndoAction::~MoveUndoAction() = default;
+
+void MoveUndoAction::move() {
+    if (this->undone) {
+        for (Element* e: this->elements) { e->move(dx, dy); }
+    } else {
+        for (Element* e: this->elements) { e->move(-dx, -dy); }
+    }
+}
+
+auto MoveUndoAction::undo(Control* control) -> bool {
+    Document* doc = control->getDocument();
+    doc->lock();
+    if (this->sourceLayer != this->targetLayer && this->targetLayer != nullptr) {
+        switchLayer(&this->elements, this->targetLayer, this->sourceLayer);
+    }
+
+    move();
+    doc->unlock();
+    repaint();
+    this->undone = true;
+
+    return true;
+}
+
+auto MoveUndoAction::redo(Control* control) -> bool {
+    Document* doc = control->getDocument();
+    doc->lock();
+    if (this->sourceLayer != this->targetLayer && this->targetLayer != nullptr) {
+        switchLayer(&this->elements, this->sourceLayer, this->targetLayer);
+    }
+
+    move();
+    doc->unlock();
+    repaint();
+    this->undone = false;
+
+    return true;
+}
+
+void MoveUndoAction::switchLayer(std::vector<Element*>* entries, Layer* oldLayer, Layer* newLayer) {
+    for (Element* e: this->elements) {
+        newLayer->addElement(oldLayer->removeElement(e).e);
+    }
+}
+
+void MoveUndoAction::repaint() {
+    if (this->elements.empty()) {
+        return;
+    }
+
+    this->page->firePageChanged();
+
+    if (this->targetPage) {
+        this->targetPage->firePageChanged();
+    }
+}
+
+auto MoveUndoAction::getPages() -> std::vector<PageRef> {
+    std::vector<PageRef> pages;
+    pages.push_back(this->page);
+    pages.push_back(this->targetPage);
+    return pages;
+}
+
+auto MoveUndoAction::getText() -> std::string { return text; }
diff --git a/entry/src/main/cpp/src/core/undo/MoveUndoAction.h b/entry/src/main/cpp/src/core/undo/MoveUndoAction.h
new file mode 100644
index 0000000..3a08a38
--- /dev/null
+++ b/entry/src/main/cpp/src/core/undo/MoveUndoAction.h
@@ -0,0 +1,53 @@
+/*
+ * Xournal++
+ *
+ * Undo move action (EditSelection)
+ *
+ * @author Xournal++ Team
+ * https://github.com/xournalpp/xournalpp
+ *
+ * @license GNU GPLv2 or later
+ */
+
+#pragma once
+
+#include <string>  // for string
+#include <vector>  // for vector
+
+#include "model/PageRef.h"  // for PageRef
+
+#include "UndoAction.h"  // for UndoAction
+
+class Layer;
+class Control;
+class Element;
+
+class MoveUndoAction: public UndoAction {
+public:
+    MoveUndoAction(Layer* sourceLayer, const PageRef& sourcePage, std::vector<Element*> selected, double mx, double my,
+                   Layer* targetLayer, PageRef targetPage);
+    ~MoveUndoAction() override;
+
+public:
+    bool undo(Control* control) override;
+    bool redo(Control* control) override;
+    std::vector<PageRef> getPages() override;
+    std::string getText() override;
+
+private:
+    void switchLayer(std::vector<Element*>* entries, Layer* oldLayer, Layer* newLayer);
+    void repaint();
+    void move();
+
+private:
+    std::vector<Element*> elements;
+    PageRef targetPage;
+
+    Layer* sourceLayer = nullptr;
+    Layer* targetLayer = nullptr;
+
+    std::string text;
+
+    double dx = 0;
+    double dy = 0;
+};
diff --git a/entry/src/main/cpp/src/core/undo/PageBackgroundChangedUndoAction.cpp b/entry/src/main/cpp/src/core/undo/PageBackgroundChangedUndoAction.cpp
new file mode 100644
index 0000000..8d2966b
--- /dev/null
+++ b/entry/src/main/cpp/src/core/undo/PageBackgroundChangedUndoAction.cpp
@@ -0,0 +1,97 @@
+#include "PageBackgroundChangedUndoAction.h"
+
+#include <memory>   // for __shared_ptr_access, allocator
+#include <utility>  // for move
+
+#include "control/Control.h"  // for Control
+#include "model/Document.h"   // for Document
+#include "model/XojPage.h"    // for XojPage
+#include "undo/UndoAction.h"  // for UndoAction
+#include "util/Util.h"        // for npos
+#include "util/i18n.h"        // for _
+
+PageBackgroundChangedUndoAction::PageBackgroundChangedUndoAction(const PageRef& page, const PageType& origType,
+                                                                 size_t origPdfPage,
+                                                                 BackgroundImage origBackgroundImage, double origW,
+                                                                 double origH):
+        UndoAction("PageBackgroundChangedUndoAction") {
+    this->page = page;
+    this->origType = origType;
+    this->origPdfPage = origPdfPage;
+    this->origBackgroundImage = std::move(origBackgroundImage);
+    this->origW = origW;
+    this->origH = origH;
+    this->newType.format = PageTypeFormat::Plain;
+}
+
+PageBackgroundChangedUndoAction::~PageBackgroundChangedUndoAction() = default;
+
+auto PageBackgroundChangedUndoAction::undo(Control* control) -> bool {
+    Document* doc = control->getDocument();
+    doc->lock();
+    this->newType = this->page->getBackgroundType();
+    this->newPdfPage = this->page->getPdfPageNr();
+    this->newBackgroundImage = this->page->getBackgroundImage();
+    this->newW = this->page->getWidth();
+    this->newH = this->page->getHeight();
+
+    auto pageNr = doc->indexOf(this->page);
+    if (pageNr == npos) {
+        doc->unlock();
+        return false;
+    }
+
+    bool pageSizeChanged = this->newW != this->origW || this->newH != this->origH;
+    if (pageSizeChanged) {
+        this->page->setSize(this->origW, this->origH);
+    }
+
+    this->page->setBackgroundType(this->origType);
+    if (this->origType.isPdfPage()) {
+        this->page->setBackgroundPdfPageNr(this->origPdfPage);
+    } else if (this->origType.isImagePage()) {
+        this->page->setBackgroundImage(this->origBackgroundImage);
+    }
+
+    doc->unlock();
+    if (pageSizeChanged) {
+        control->firePageSizeChanged(pageNr);
+    }
+    control->firePageChanged(pageNr);
+
+    return true;
+}
+
+auto PageBackgroundChangedUndoAction::redo(Control* control) -> bool {
+    Document* doc = control->getDocument();
+    doc->lock();
+
+    auto pageNr = doc->indexOf(this->page);
+
+    if (pageNr == npos) {
+        doc->unlock();
+        return false;
+    }
+
+    bool pageSizeChanged = this->newW != this->origW || this->newH != this->origH;
+    if (pageSizeChanged) {
+        this->page->setSize(this->newW, this->newH);
+    }
+
+    this->page->setBackgroundType(this->newType);
+    if (this->newType.isPdfPage()) {
+        this->page->setBackgroundPdfPageNr(this->newPdfPage);
+    } else if (this->newType.isImagePage()) {
+        this->page->setBackgroundImage(this->newBackgroundImage);
+    }
+
+    doc->unlock();
+    if (pageSizeChanged) {
+        control->firePageSizeChanged(pageNr);
+    }
+    control->firePageChanged(pageNr);
+
+    return true;
+}
+
+auto PageBackgroundChangedUndoAction::getText() -> std::string { return _("Page background changed"); }
diff --git a/entry/src/main/cpp/src/core/undo/PageBackgroundChangedUndoAction.h b/entry/src/main/cpp/src/core/undo/PageBackgroundChangedUndoAction.h
new file mode 100644
index 0000000..ffdf21f
--- /dev/null
+++ b/entry/src/main/cpp/src/core/undo/PageBackgroundChangedUndoAction.h
@@ -0,0 +1,50 @@
+/*
+ * Xournal++
+ *
+ * Undo action for background change
+ *
+ * @author Xournal++ Team
+ * https://github.com/xournalpp/xournalpp
+ *
+ * @license GNU GPLv2 or later
+ */
+
+#pragma once
+
+#include <string>  // for string
+
+#include "model/BackgroundImage.h"  // for BackgroundImage
+#include "model/PageRef.h"          // for PageRef
+#include "model/PageType.h"         // for PageType
+#include "util/Util.h"              // for npos
+
+#include "UndoAction.h"  // for UndoAction
+
+class Control;
+
+
+class PageBackgroundChangedUndoAction: public UndoAction {
+public:
+    PageBackgroundChangedUndoAction(const PageRef& page, const PageType& origType, size_t origPdfPage,
+                                    BackgroundImage origBackgroundImage, double origW, double origH);
+    ~PageBackgroundChangedUndoAction() override;
+
+public:
+    bool undo(Control* control) override;
+    bool redo(Control* control) override;
+
+    std::string getText() override;
+
+private:
+    PageType origType;
+    size_t origPdfPage;
+    BackgroundImage origBackgroundImage;
+    double origW;
+    double origH;
+
+    PageType newType;
+    size_t newPdfPage = npos;
+    BackgroundImage newBackgroundImage;
+    double newW = 0;
+    double newH = 0;
+};
diff --git a/entry/src/main/cpp/src/core/undo/PageLayerPosEntry.h b/entry/src/main/cpp/src/core/undo/PageLayerPosEntry.h
new file mode 100644
index 0000000..eadc940
--- /dev/null
+++ b/entry/src/main/cpp/src/core/undo/PageLayerPosEntry.h
@@ -0,0 +1,43 @@
+/*
+ * Xournal++
+ *
+ * Position entry for undo / redo handling
+ *
+ * @author Xournal++ Team
+ * https://github.com/xournalpp/xournalpp
+ *
+ * @license GNU GPLv2 or later
+ */
+
+#pragma once
+
+#include <memory>
+#include <utility>
+
+#include "model/Element.h"
+
+class Layer;
+
+template <class T>
+struct PageLayerPosEntry {
+    // TODO (cpp20): constructor could be removed with C++20
+    explicit PageLayerPosEntry(Layer* layer, std::unique_ptr<T> element, typename T::Index pos):
+            pos(pos),
+            layer(layer),  //
+            element(element.get()),
+            elementOwn(std::move(element)) {}
+    explicit PageLayerPosEntry(Layer* layer, T* element, typename T::Index pos):
+            pos(pos),
+            layer(layer),  //
+            element(element) {}
+
+    typename T::Index pos{};
+    Layer* layer{};
+    T* element{};
+    mutable std::unique_ptr<Element> elementOwn{};
+};
+
+template <typename T>
+constexpr auto operator<(const PageLayerPosEntry<T>& lhs, const PageLayerPosEntry<T>& rhs) -> bool {
+    return lhs.pos < rhs.pos;
+}
diff --git a/entry/src/main/cpp/src/core/undo/PageSizeChangeUndoAction.cpp b/entry/src/main/cpp/src/core/undo/PageSizeChangeUndoAction.cpp
new file mode 100644
index 0000000..046fed0
--- /dev/null
+++ b/entry/src/main/cpp/src/core/undo/PageSizeChangeUndoAction.cpp
@@ -0,0 +1,42 @@
+#include "PageSizeChangeUndoAction.h"
+
+#include <memory>  // for __shared_ptr_access, allocator
+
+#include "control/Control.h"  // for Control
+#include "model/Document.h"   // for Document
+#include "model/XojPage.h"    // for XojPage
+#include "undo/UndoAction.h"  // for UndoAction
+#include "util/Util.h"        // for npos
+#include "util/i18n.h"        // for _
+
+PageSizeChangeUndoAction::PageSizeChangeUndoAction(const PageRef& page, double origW, double origH):
+        UndoAction("PageSizeChangeUndoAction"), otherWidth(origW), otherHeight(origH) {
+    this->page = page;
+}
+
+PageSizeChangeUndoAction::~PageSizeChangeUndoAction() = default;
+
+auto PageSizeChangeUndoAction::swapSizes(Control* control) -> bool {
+    Document* doc = control->getDocument();
+
+    doc->lock();
+    auto pageNr = doc->indexOf(this->page);
+    if (pageNr == npos) {
+        return false;
+    }
+
+    double w = this->page->getWidth();
+    double h = this->page->getHeight();
+
+    this->page->setSize(std::exchange(this->otherWidth, w), std::exchange(this->otherHeight, h));
+    doc->unlock();
+
+    control->firePageSizeChanged(pageNr);
+
+    return true;
+}
+
+auto PageSizeChangeUndoAction::undo(Control* control) -> bool { return swapSizes(control); }
+auto PageSizeChangeUndoAction::redo(Control* control) -> bool { return swapSizes(control); }
+
+auto PageSizeChangeUndoAction::getText() -> std::string { return _("Page size changed"); }
diff --git a/entry/src/main/cpp/src/core/undo/PageSizeChangeUndoAction.h b/entry/src/main/cpp/src/core/undo/PageSizeChangeUndoAction.h
new file mode 100644
index 0000000..fccafc1
--- /dev/null
+++ b/entry/src/main/cpp/src/core/undo/PageSizeChangeUndoAction.h
@@ -0,0 +1,38 @@
+/*
+ * Xournal++
+ *
+ * Undo action for page size change
+ *
+ * @author Xournal++ Team
+ * https://github.com/xournalpp/xournalpp
+ *
+ * @license GNU GPLv2 or later
+ */
+
+#pragma once
+
+#include <string>  // for string
+
+#include "model/PageRef.h"  // for PageRef
+
+#include "UndoAction.h"  // for UndoAction
+
+class Control;
+
+
+class PageSizeChangeUndoAction: public UndoAction {
+public:
+    PageSizeChangeUndoAction(const PageRef& page, double origW, double origH);
+    ~PageSizeChangeUndoAction() override;
+
+public:
+    bool undo(Control* control) override;
+    bool redo(Control* control) override;
+
+    std::string getText() override;
+
+private:
+    bool swapSizes(Control* ctrl);
+    double otherWidth;
+    double otherHeight;
+};
diff --git a/entry/src/main/cpp/src/core/undo/RecognizerUndoAction.cpp b/entry/src/main/cpp/src/core/undo/RecognizerUndoAction.cpp
new file mode 100644
index 0000000..259d9ae
--- /dev/null
+++ b/entry/src/main/cpp/src/core/undo/RecognizerUndoAction.cpp
@@ -0,0 +1,61 @@
+#include "RecognizerUndoAction.h"
+
+#include <memory>  // for __shared_ptr_access, __shared_ptr_acces...
+#include <utility>
+
+#include <glib.h>  // for g_warning
+
+#include "control/Control.h"
+#include "model/Document.h"
+#include "model/Element.h"
+#include "model/Layer.h"      // for Layer
+#include "model/Stroke.h"     // for Stroke
+#include "model/XojPage.h"    // for XojPage
+#include "undo/UndoAction.h"  // for UndoAction
+#include "util/i18n.h"        // for _
+
+RecognizerUndoAction::RecognizerUndoAction(const PageRef& page, Layer* layer, ElementPtr original, Element* recognized):
+        UndoAction("RecognizerUndoAction"),
+        layer(layer),
+        original(original.get()),
+        originalOwned(std::move(original)),
+        recognized(recognized) {
+    this->page = page;
+}
+
+RecognizerUndoAction::~RecognizerUndoAction() = default;
+
+auto RecognizerUndoAction::undo(Control* control) -> bool {
+    Document* doc = control->getDocument();
+    doc->lock();
+    auto [owned, pos] = this->layer->removeElement(this->recognized);
+    this->recognizedOwned = std::move(owned);
+
+    this->layer->insertElement(std::move(this->originalOwned), pos);
+    doc->unlock();
+
+    this->page->fireElementChanged(this->recognized);
+    this->page->fireElementChanged(original);
+
+    this->undone = true;
+    return true;
+}
+
+auto RecognizerUndoAction::redo(Control* control) -> bool {
+    Element::Index pos = 0;
+
+    Document* doc = control->getDocument();
+    doc->lock();
+    auto [owned, posi] = this->layer->removeElement(original);
+    this->originalOwned = std::move(owned);
+    this->layer->insertElement(std::move(this->recognizedOwned), pos);
+    doc->unlock();
+
+    this->page->fireElementChanged(original);
+    this->page->fireElementChanged(this->recognized);
+
+    this->undone = false;
+    return true;
+}
+
+auto RecognizerUndoAction::getText() -> std::string { return _("Shape Recognizer"); }
diff --git a/entry/src/main/cpp/src/core/undo/RecognizerUndoAction.h b/entry/src/main/cpp/src/core/undo/RecognizerUndoAction.h
new file mode 100644
index 0000000..418d44e
--- /dev/null
+++ b/entry/src/main/cpp/src/core/undo/RecognizerUndoAction.h
@@ -0,0 +1,44 @@
+/*
+ * Xournal++
+ *
+ * Undo action for stroke recognizer
+ *
+ * @author Xournal++ Team
+ * https://github.com/xournalpp/xournalpp
+ *
+ * @license GNU GPLv2 or later
+ */
+
+#pragma once
+
+#include <memory>  // for unique_ptr
+#include <string>  // for string
+#include <vector>  // for vector
+
+#include "model/PageRef.h"  // for PageRef
+
+#include "UndoAction.h"  // for UndoAction
+
+class Layer;
+class Stroke;
+class Control;
+class Element;
+
+class RecognizerUndoAction: public UndoAction {
+public:
+    RecognizerUndoAction(const PageRef& page, Layer* layer, std::unique_ptr<Element> original, Element* recognized);
+    ~RecognizerUndoAction() override;
+
+public:
+    bool undo(Control* control) override;
+    bool redo(Control* control) override;
+
+    std::string getText() override;
+
+private:
+    Layer* layer;
+    Element* original;
+    std::unique_ptr<Element> originalOwned;
+    Element* recognized;
+    std::unique_ptr<Element> recognizedOwned;
+};
diff --git a/entry/src/main/cpp/src/core/undo/RemoveLayerUndoAction.cpp b/entry/src/main/cpp/src/core/undo/RemoveLayerUndoAction.cpp
new file mode 100644
index 0000000..c50a787
--- /dev/null
+++ b/entry/src/main/cpp/src/core/undo/RemoveLayerUndoAction.cpp
@@ -0,0 +1,37 @@
+#include "RemoveLayerUndoAction.h"
+
+#include "control/layer/LayerController.h"  // for LayerController
+#include "model/Layer.h"                    // for Layer, Layer::Index
+#include "model/PageRef.h"                  // for PageRef
+#include "undo/UndoAction.h"                // for UndoAction
+#include "util/i18n.h"                      // for _
+
+RemoveLayerUndoAction::RemoveLayerUndoAction(LayerController* layerController, const PageRef& page, Layer* layer,
+                                             Layer::Index layerPos):
+        UndoAction("RemoveLayerUndoAction"), layerController(layerController), layer(layer), layerPos(layerPos) {
+    this->page = page;
+}
+
+RemoveLayerUndoAction::~RemoveLayerUndoAction() {
+    if (!this->undone) {
+        // The layer was NOT undone, also NOT restored
+        delete this->layer;
+    }
+    this->layer = nullptr;
+}
+
+auto RemoveLayerUndoAction::getText() -> std::string { return _("Delete layer"); }
+
+auto RemoveLayerUndoAction::undo(Control* control) -> bool {
+    layerController->insertLayer(this->page, this->layer, this->layerPos);
+    this->undone = true;
+
+    return true;
+}
+
+auto RemoveLayerUndoAction::redo(Control* control) -> bool {
+    layerController->removeLayer(page, layer);
+    this->undone = false;
+
+    return true;
+}
diff --git a/entry/src/main/cpp/src/core/undo/RemoveLayerUndoAction.h b/entry/src/main/cpp/src/core/undo/RemoveLayerUndoAction.h
new file mode 100644
index 0000000..a242b35
--- /dev/null
+++ b/entry/src/main/cpp/src/core/undo/RemoveLayerUndoAction.h
@@ -0,0 +1,39 @@
+/*
+ * Xournal++
+ *
+ * Undo action for remove layer
+ *
+ * @author Xournal++ Team
+ * https://github.com/xournalpp/xournalpp
+ *
+ * @license GNU GPLv2 or later
+ */
+
+#pragma once
+
+#include <string>  // for string
+
+#include "model/Layer.h"    // for Layer, Layer::Index
+#include "model/PageRef.h"  // for PageRef
+
+#include "UndoAction.h"  // for UndoAction
+
+class LayerController;
+class Control;
+
+class RemoveLayerUndoAction: public UndoAction {
+public:
+    RemoveLayerUndoAction(LayerController* layerController, const PageRef& page, Layer* layer, Layer::Index layerPos);
+    ~RemoveLayerUndoAction() override;
+
+public:
+    bool undo(Control* control) override;
+    bool redo(Control* control) override;
+
+    std::string getText() override;
+
+private:
+    LayerController* layerController;
+    Layer* layer;
+    Layer::Index layerPos;
+};
diff --git a/entry/src/main/cpp/src/core/undo/RotateUndoAction.cpp b/entry/src/main/cpp/src/core/undo/RotateUndoAction.cpp
new file mode 100644
index 0000000..897e87a
--- /dev/null
+++ b/entry/src/main/cpp/src/core/undo/RotateUndoAction.cpp
@@ -0,0 +1,58 @@
+#include "RotateUndoAction.h"
+
+#include <memory>  // for allocator, __shared_ptr_access, __share...
+
+#include "control/Control.h"
+#include "model/Document.h"
+#include "model/Element.h"    // for Element
+#include "model/PageRef.h"    // for PageRef
+#include "model/XojPage.h"    // for XojPage
+#include "undo/UndoAction.h"  // for UndoAction
+#include "util/Range.h"       // for Range
+#include "util/i18n.h"        // for _
+
+RotateUndoAction::RotateUndoAction(const PageRef& page, std::vector<Element*>* elements, double x0, double y0,
+                                   double rotation):
+        UndoAction("RotateUndoAction") {
+    this->page = page;
+    this->elements = *elements;
+    this->x0 = x0;
+    this->y0 = y0;
+    this->rotation = rotation;
+}
+
+RotateUndoAction::~RotateUndoAction() { this->page = nullptr; }
+
+auto RotateUndoAction::undo(Control* control) -> bool {
+    applyRotation(-this->rotation, control->getDocument());
+    this->undone = true;
+    return true;
+}
+
+auto RotateUndoAction::redo(Control* control) -> bool {
+    applyRotation(this->rotation, control->getDocument());
+    this->undone = false;
+    return true;
+}
+
+void RotateUndoAction::applyRotation(double rotation, Document* doc) {
+    if (this->elements.empty()) {
+        return;
+    }
+
+    doc->lock();
+    Range r(elements.front()->getX(), elements.front()->getY());
+
+    for (Element* e: this->elements) {
+        r.addPoint(e->getX(), e->getY());
+        r.addPoint(e->getX() + e->getElementWidth(), e->getY() + e->getElementHeight());
+        e->rotate(this->x0, this->y0, rotation);
+        r.addPoint(e->getX(), e->getY());
+        r.addPoint(e->getX() + e->getElementWidth(), e->getY() + e->getElementHeight());
+    }
+
+    doc->unlock();
+    this->page->fireRangeChanged(r);
+}
+
+auto RotateUndoAction::getText() -> std::string { return _("Rotation"); }
diff --git a/entry/src/main/cpp/src/core/undo/RotateUndoAction.h b/entry/src/main/cpp/src/core/undo/RotateUndoAction.h
new file mode 100644
index 0000000..4207a42
--- /dev/null
+++ b/entry/src/main/cpp/src/core/undo/RotateUndoAction.h
@@ -0,0 +1,44 @@
+/*
+ * Xournal++
+ *
+ * Undo action for rotate (EditSelection)
+ *
+ * @author Xournal++ Team
+ * https://github.com/xournalpp/xournalpp
+ *
+ * @license GNU GPLv2 or later
+ */
+
+#pragma once
+
+#include <string>  // for string
+#include <vector>  // for vector
+
+#include "model/PageRef.h"  // for PageRef
+
+#include "UndoAction.h"  // for UndoAction
+
+class Control;
+class Document;
+class Element;
+
+class RotateUndoAction: public UndoAction {
+public:
+    RotateUndoAction(const PageRef& page, std::vector<Element*>* elements, double x0, double y0, double rotation);
+    ~RotateUndoAction() override;
+
+public:
+    bool undo(Control* control) override;
+    bool redo(Control* control) override;
+    std::string getText() override;
+
+private:
+    void applyRotation(double rotation, Document* doc);
+
+private:
+    std::vector<Element*> elements;
+
+    double x0;
+    double y0;
+    double rotation = 0;
+};
diff --git a/entry/src/main/cpp/src/core/undo/ScaleUndoAction.cpp b/entry/src/main/cpp/src/core/undo/ScaleUndoAction.cpp
new file mode 100644
index 0000000..ed9923f
--- /dev/null
+++ b/entry/src/main/cpp/src/core/undo/ScaleUndoAction.cpp
@@ -0,0 +1,62 @@
+#include "ScaleUndoAction.h"
+
+#include <cmath>   // for isfinite
+#include <memory>  // for allocator, __shared_ptr_access, __share...
+
+#include "control/Control.h"
+#include "model/Document.h"
+#include "model/Element.h"    // for Element
+#include "model/PageRef.h"    // for PageRef
+#include "model/XojPage.h"    // for XojPage
+#include "undo/UndoAction.h"  // for UndoAction
+#include "util/Range.h"       // for Range
+#include "util/i18n.h"        // for _
+
+ScaleUndoAction::ScaleUndoAction(const PageRef& page, std::vector<Element*>* elements, double x0, double y0, double fx,
+                                 double fy, double rotation, bool restoreLineWidth):
+        UndoAction("ScaleUndoAction") {
+    this->page = page;
+    this->elements = *elements;
+    this->x0 = x0;
+    this->y0 = y0;
+    this->fx = std::isfinite(fx) ? fx : 1.0;
+    this->fy = std::isfinite(fy) ? fy : 1.0;
+    this->rotation = rotation;
+    this->restoreLineWidth = restoreLineWidth;
+}
+
+ScaleUndoAction::~ScaleUndoAction() { this->page = nullptr; }
+
+auto ScaleUndoAction::undo(Control* control) -> bool {
+    applyScale(1 / this->fx, 1 / this->fy, restoreLineWidth, control->getDocument());
+    this->undone = true;
+    return true;
+}
+
+auto ScaleUndoAction::redo(Control* control) -> bool {
+    applyScale(this->fx, this->fy, restoreLineWidth, control->getDocument());
+    this->undone = false;
+    return true;
+}
+
+void ScaleUndoAction::applyScale(double fx, double fy, bool restoreLineWidth, Document* doc) {
+    if (this->elements.empty()) {
+        return;
+    }
+
+    doc->lock();
+    Range r(elements.front()->getX(), elements.front()->getY());
+
+    for (Element* e: this->elements) {
+        r.addPoint(e->getX(), e->getY());
+        r.addPoint(e->getX() + e->getElementWidth(), e->getY() + e->getElementHeight());
+        e->scale(this->x0, this->y0, fx, fy, this->rotation, restoreLineWidth);
+        r.addPoint(e->getX(), e->getY());
+        r.addPoint(e->getX() + e->getElementWidth(), e->getY() + e->getElementHeight());
+    }
+    doc->unlock();
+
+    this->page->fireRangeChanged(r);
+}
+
+auto ScaleUndoAction::getText() -> std::string { return _("Scale"); }
diff --git a/entry/src/main/cpp/src/core/undo/ScaleUndoAction.h b/entry/src/main/cpp/src/core/undo/ScaleUndoAction.h
new file mode 100644
index 0000000..1eebfe7
--- /dev/null
+++ b/entry/src/main/cpp/src/core/undo/ScaleUndoAction.h
@@ -0,0 +1,48 @@
+/*
+ * Xournal++
+ *
+ * Undo action for rescale (EditSelection)
+ *
+ * @author Xournal++ Team
+ * https://github.com/xournalpp/xournalpp
+ *
+ * @license GNU GPLv2 or later
+ */
+
+#pragma once
+
+#include <string>  // for string
+#include <vector>  // for vector
+
+#include "model/PageRef.h"  // for PageRef
+
+#include "UndoAction.h"  // for UndoAction
+
+class Control;
+class Document;
+class Element;
+
+class ScaleUndoAction: public UndoAction {
+public:
+    ScaleUndoAction(const PageRef& page, std::vector<Element*>* elements, double x0, double y0, double fx, double fy,
+                    double rotation, bool restoreLineWidth);
+    ~ScaleUndoAction() override;
+
+public:
+    bool undo(Control* control) override;
+    bool redo(Control* control) override;
+    std::string getText() override;
+
+private:
+    void applyScale(double fx, double fy, bool restoreLineWidth, Document* doc);
+
+private:
+    std::vector<Element*> elements;
+
+    double x0;
+    double y0;
+    double fx;
+    double fy;
+    double rotation;
+    bool restoreLineWidth;
+};
diff --git a/entry/src/main/cpp/src/core/undo/SizeUndoAction.cpp b/entry/src/main/cpp/src/core/undo/SizeUndoAction.cpp
new file mode 100644
index 0000000..e9275a9
--- /dev/null
+++ b/entry/src/main/cpp/src/core/undo/SizeUndoAction.cpp
@@ -0,0 +1,118 @@
+#include "SizeUndoAction.h"
+
+#include <memory>   // for allocator, __shared_ptr_access, __share...
+#include <utility>  // for move
+
+#include "control/Control.h"
+#include "model/Document.h"
+#include "model/Point.h"      // for Point
+#include "model/Stroke.h"     // for Stroke
+#include "model/XojPage.h"    // for XojPage
+#include "undo/UndoAction.h"  // for UndoAction
+#include "util/Assert.h"      // for xoj_assert
+#include "util/Range.h"       // for Range
+#include "util/i18n.h"        // for _
+
+using std::vector;
+
+class SizeUndoActionEntry {
+public:
+    SizeUndoActionEntry(Stroke* s, double originalWidth, double newWidth, vector<double> originalPressure,
+                        vector<double> newPressure, size_t pressureCount) {
+        this->s = s;
+        this->originalWidth = originalWidth;
+        this->newWidth = newWidth;
+        this->originalPressure = std::move(originalPressure);
+        this->newPressure = std::move(newPressure);
+        this->pressureCount = pressureCount;
+    }
+
+    ~SizeUndoActionEntry() = default;
+    Stroke* s;
+    double originalWidth;
+    double newWidth;
+
+    vector<double> originalPressure;
+    vector<double> newPressure;
+    size_t pressureCount;
+};
+
+SizeUndoAction::SizeUndoAction(const PageRef& page, Layer* layer): UndoAction("SizeUndoAction") {
+    this->page = page;
+    this->layer = layer;
+}
+
+SizeUndoAction::~SizeUndoAction() {
+    for (SizeUndoActionEntry* e: this->data) { delete e; }
+    this->data.clear();
+}
+
+auto SizeUndoAction::getPressure(Stroke* s) -> vector<double> {
+    size_t count = s->getPointCount();
+    xoj_assert(count >= 2);
+    vector<double> data;
+    data.reserve(count);
+    for (size_t i = 0; i < count; i++) {
+        data.push_back(s->getPoint(i).z);
+    }
+
+    return data;
+}
+
+void SizeUndoAction::addStroke(Stroke* s, double originalWidth, double newWidth, vector<double> originalPressure,
+                               vector<double> newPressure, size_t pressureCount) {
+    this->data.push_back(new SizeUndoActionEntry(s, originalWidth, newWidth, std::move(originalPressure),
+                                                 std::move(newPressure), pressureCount));
+}
+
+auto SizeUndoAction::undo(Control* control) -> bool {
+    if (this->data.empty()) {
+        return true;
+    }
+
+    Document* doc = control->getDocument();
+    doc->lock();
+
+    Range range;
+    for (SizeUndoActionEntry* e: this->data) {
+        range = range.unite(Range(e->s->boundingRect()));
+
+        e->s->setWidth(e->originalWidth);
+        e->s->setPressure(e->originalPressure);
+
+        range = range.unite(Range(e->s->boundingRect()));
+    }
+
+    doc->unlock();
+
+    this->page->fireRangeChanged(range);
+
+    return true;
+}
+
+auto SizeUndoAction::redo(Control* control) -> bool {
+    if (this->data.empty()) {
+        return true;
+    }
+
+    Document* doc = control->getDocument();
+    doc->lock();
+
+    Range range;
+    for (SizeUndoActionEntry* e: this->data) {
+        range = range.unite(Range(e->s->boundingRect()));
+
+        e->s->setWidth(e->newWidth);
+        e->s->setPressure(e->newPressure);
+
+        range = range.unite(Range(e->s->boundingRect()));
+    }
+
+    doc->unlock();
+
+    this->page->fireRangeChanged(range);
+
+    return true;
+}
+
+auto SizeUndoAction::getText() -> std::string { return _("Change stroke width"); }
diff --git a/entry/src/main/cpp/src/core/undo/SizeUndoAction.h b/entry/src/main/cpp/src/core/undo/SizeUndoAction.h
new file mode 100644
index 0000000..04322f3
--- /dev/null
+++ b/entry/src/main/cpp/src/core/undo/SizeUndoAction.h
@@ -0,0 +1,46 @@
+/*
+ * Xournal++
+ *
+ * Undo action resize
+ *
+ * @author Xournal++ Team
+ * https://github.com/xournalpp/xournalpp
+ *
+ * @license GNU GPLv2 or later
+ */
+
+#pragma once
+
+#include <string>  // for string
+#include <vector>  // for vector
+
+#include "model/PageRef.h"  // for PageRef
+
+#include "UndoAction.h"  // for UndoAction
+
+class Layer;
+class SizeUndoActionEntry;
+class Stroke;
+class Control;
+
+class SizeUndoAction: public UndoAction {
+public:
+    SizeUndoAction(const PageRef& page, Layer* layer);
+    ~SizeUndoAction() override;
+
+public:
+    bool undo(Control* control) override;
+    bool redo(Control* control) override;
+    std::string getText() override;
+
+    void addStroke(Stroke* s, double originalWidth, double newWidth, std::vector<double> originalPressure,
+                   std::vector<double> newPressure, size_t pressureCount);
+
+public:
+    static std::vector<double> getPressure(Stroke* s);
+
+private:
+    std::vector<SizeUndoActionEntry*> data;
+
+    Layer* layer;
+};
diff --git a/entry/src/main/cpp/src/core/undo/SwapUndoAction.cpp b/entry/src/main/cpp/src/core/undo/SwapUndoAction.cpp
new file mode 100644
index 0000000..b803b7c
--- /dev/null
+++ b/entry/src/main/cpp/src/core/undo/SwapUndoAction.cpp
@@ -0,0 +1,67 @@
+#include "SwapUndoAction.h"
+
+#include <utility>  // for swap
+
+#include <glib.h>  // for gint
+
+#include "control/Control.h"        // for Control
+#include "control/ScrollHandler.h"  // for ScrollHandler
+#include "model/Document.h"         // for Document
+#include "undo/UndoAction.h"        // for UndoAction
+#include "util/i18n.h"              // for _
+
+SwapUndoAction::SwapUndoAction(size_t pageNr, bool moveUp, const PageRef& swappedPage, const PageRef& otherPage):
+        UndoAction("SwapUndoAction") {
+    this->pageNr = pageNr;
+    this->moveUp = moveUp;
+    this->swappedPage = swappedPage;
+    this->otherPage = otherPage;
+}
+
+SwapUndoAction::~SwapUndoAction() = default;
+
+auto SwapUndoAction::undo(Control* control) -> bool {
+    swap(control);
+    this->undone = true;
+
+    return true;
+}
+
+auto SwapUndoAction::redo(Control* control) -> bool {
+    swap(control);
+    this->undone = false;
+
+    return true;
+}
+
+void SwapUndoAction::swap(Control* control) {
+    Document* doc = control->getDocument();
+
+    doc->lock();
+
+    size_t insertPos = this->pageNr;
+    size_t deletePos = this->pageNr + 1;
+
+    if (moveUp != this->undone) {
+        std::swap(insertPos, deletePos);
+    }
+
+    doc->deletePage(deletePos);
+    doc->insertPage(this->swappedPage, insertPos);
+    doc->unlock();
+
+    control->firePageDeleted(deletePos);
+    control->firePageInserted(insertPos);
+    control->firePageSelected(insertPos);
+
+    control->getScrollHandler()->scrollToPage(insertPos);
+}
+
+auto SwapUndoAction::getPages() -> std::vector<PageRef> {
+    std::vector<PageRef> pages;
+    pages.push_back(this->swappedPage);
+    pages.push_back(this->otherPage);
+    return pages;
+}
+
+auto SwapUndoAction::getText() -> std::string { return moveUp ? _("Move page upwards") : _("Move page downwards"); }
diff --git a/entry/src/main/cpp/src/core/undo/SwapUndoAction.h b/entry/src/main/cpp/src/core/undo/SwapUndoAction.h
new file mode 100644
index 0000000..1035781
--- /dev/null
+++ b/entry/src/main/cpp/src/core/undo/SwapUndoAction.h
@@ -0,0 +1,44 @@
+/*
+ * Xournal++
+ *
+ * Undo page swap action
+ *
+ * @author Xournal++ Team
+ * https://github.com/xournalpp/xournalpp
+ *
+ * @license GNU GPLv2 or later
+ */
+
+#pragma once
+
+#include <cstddef>  // for size_t
+#include <string>   // for string
+#include <vector>   // for vector
+
+#include "model/PageRef.h"  // for PageRef
+
+#include "UndoAction.h"  // for UndoAction
+
+class Control;
+
+class SwapUndoAction: public UndoAction {
+public:
+    SwapUndoAction(size_t pageNr, bool moveUp, const PageRef& swappedPage, const PageRef& otherPage);
+
+    ~SwapUndoAction() override;
+
+public:
+    bool undo(Control* control) override;
+    bool redo(Control* control) override;
+    std::vector<PageRef> getPages() override;
+    std::string getText() override;
+
+private:
+    void swap(Control* control);
+
+private:
+    size_t pageNr;
+    PageRef swappedPage;
+    PageRef otherPage;
+    bool moveUp;
+};
diff --git a/entry/src/main/cpp/src/core/undo/TextBoxUndoAction.cpp b/entry/src/main/cpp/src/core/undo/TextBoxUndoAction.cpp
new file mode 100644
index 0000000..ab1ef4a
--- /dev/null
+++ b/entry/src/main/cpp/src/core/undo/TextBoxUndoAction.cpp
@@ -0,0 +1,48 @@
+#include "TextBoxUndoAction.h"
+
+#include <algorithm>  // for max, min
+#include <memory>     // for allocator, __shared_ptr_access, __share...
+#include <utility>
+
+#include "control/Control.h"
+#include "model/Document.h"
+#include "model/Element.h"    // for Element
+#include "model/Layer.h"      // for Layer
+#include "model/PageRef.h"    // for PageRef
+#include "model/XojPage.h"    // for XojPage
+#include "undo/UndoAction.h"  // for UndoAction
+#include "util/Rectangle.h"   // for Rectangle
+#include "util/i18n.h"        // for _
+
+using xoj::util::Rectangle;
+
+TextBoxUndoAction::TextBoxUndoAction(const PageRef& page, Layer* layer, Element* element, ElementPtr oldelement):
+        UndoAction("TextBoxUndoAction"), layer(layer), element(element), oldelement(std::move(oldelement)) {
+    this->page = page;
+}
+
+TextBoxUndoAction::~TextBoxUndoAction() = default;
+
+auto TextBoxUndoAction::getText() -> std::string { return _("Edit text"); }
+
+auto TextBoxUndoAction::undo(Control* control) -> bool {
+    Document* doc = control->getDocument();
+    doc->lock();
+    auto rect = element->boundingRect();
+    rect.unite(oldelement->boundingRect());
+
+    // swap them to be memory safe
+    auto elementPtr = this->layer->removeElement(std::exchange(this->element, this->oldelement.get())).e;
+    this->layer->addElement(std::exchange(this->oldelement, std::move(elementPtr)));
+    doc->unlock();
+    this->page->fireRectChanged(rect);
+
+    this->undone = true;
+    return true;
+}
+
+auto TextBoxUndoAction::redo(Control* control) -> bool {
+    undo(control);
+    this->undone = false;
+    return true;
+}
diff --git a/entry/src/main/cpp/src/core/undo/TextBoxUndoAction.h b/entry/src/main/cpp/src/core/undo/TextBoxUndoAction.h
new file mode 100644
index 0000000..9f662a7
--- /dev/null
+++ b/entry/src/main/cpp/src/core/undo/TextBoxUndoAction.h
@@ -0,0 +1,41 @@
+/*
+ * Xournal++
+ *
+ * Undo action for insert (write text, draw stroke...)
+ *
+ * @author Xournal++ Team
+ * https://github.com/xournalpp/xournalpp
+ *
+ * @license GNU GPLv2 or later
+ */
+
+#pragma once
+
+#include <string>  // for string
+
+#include "model/PageRef.h"  // for PageRef
+
+#include "UndoAction.h"  // for UndoAction
+
+class Element;
+class Layer;
+class Control;
+
+using ElementPtr = std::unique_ptr<Element>;
+
+class TextBoxUndoAction: public UndoAction {
+public:
+    TextBoxUndoAction(const PageRef& page, Layer* layer, Element* element, ElementPtr oldelement);
+    ~TextBoxUndoAction() override;
+
+public:
+    auto undo(Control* control) -> bool override;
+    auto redo(Control* control) -> bool override;
+
+    auto getText() -> std::string override;
+
+private:
+    Layer* layer;
+    Element* element;
+    ElementPtr oldelement;
+};
diff --git a/entry/src/main/cpp/src/core/undo/UndoAction.cpp b/entry/src/main/cpp/src/core/undo/UndoAction.cpp
new file mode 100644
index 0000000..de56c4c
--- /dev/null
+++ b/entry/src/main/cpp/src/core/undo/UndoAction.cpp
@@ -0,0 +1,13 @@
+#include "UndoAction.h"
+
+#include <utility>  // for move
+
+UndoAction::UndoAction(std::string className): className(std::move(className)) {}
+
+auto UndoAction::getPages() -> std::vector<PageRef> {
+    std::vector<PageRef> pages;
+    pages.push_back(this->page);
+    return pages;
+}
+
+auto UndoAction::getClassName() const -> std::string const& { return this->className; }
diff --git a/entry/src/main/cpp/src/core/undo/UndoAction.h b/entry/src/main/cpp/src/core/undo/UndoAction.h
new file mode 100644
index 0000000..93837d4
--- /dev/null
+++ b/entry/src/main/cpp/src/core/undo/UndoAction.h
@@ -0,0 +1,47 @@
+/*
+ * Xournal++
+ *
+ * Abstract undo action
+ *
+ * @author Xournal++ Team
+ * https://github.com/xournalpp/xournalpp
+ *
+ * @license GNU GPLv2 or later
+ */
+
+#pragma once
+
+#include <memory>  // for unique_ptr
+#include <string>  // for string
+#include <vector>  // for vector
+
+#include "model/PageRef.h"  // for PageRef
+
+class Control;
+
+class UndoAction {
+public:
+    UndoAction(std::string className);  // NOLINT
+    virtual ~UndoAction() = default;
+
+public:
+    virtual bool undo(Control* control) = 0;
+    virtual bool redo(Control* control) = 0;
+
+    virtual std::string getText() = 0;
+
+    /**
+     * Get the affected pages
+     */
+    virtual std::vector<PageRef> getPages();
+
+    auto getClassName() const -> std::string const&;
+
+protected:
+    // This is only for debugging / Testing purpose
+    std::string className;
+    PageRef page;
+    bool undone = false;
+};
+
+using UndoActionPtr = std::unique_ptr<UndoAction>;
diff --git a/entry/src/main/cpp/src/core/undo/UndoRedoHandler.cpp b/entry/src/main/cpp/src/core/undo/UndoRedoHandler.cpp
new file mode 100644
index 0000000..0acd321
--- /dev/null
+++ b/entry/src/main/cpp/src/core/undo/UndoRedoHandler.cpp
@@ -0,0 +1,229 @@
+#include "UndoRedoHandler.h"
+
+#include <algorithm>  // for find_if
+#include <cinttypes>  // for PRIu64
+#include <cstdint>    // for uint64_t
+#include <iterator>   // for end, begin
+#include <memory>     // for unique_ptr, allocator_traits<>::value_type
+#include <utility>    // for move
+
+#include <glib.h>  // for g_message
+
+#include "control/Control.h"  // for Control
+#include "model/Document.h"   // for Document
+#include "undo/UndoAction.h"  // for UndoActionPtr, UndoAction
+#include "util/Assert.h"      // for xoj_assert
+#include "util/XojMsgBox.h"   // for XojMsgBox
+#include "util/i18n.h"        // for _, FS, _F
+
+using std::string;
+
+
+template <typename T>
+T* GetPtr(T* ptr) {
+    return ptr;
+}
+
+template <typename T>
+T* GetPtr(const std::unique_ptr<T>& ptr) {
+    return ptr.get();
+}
+
+template <typename PtrType>
+inline void printAction(PtrType& action, size_t n = 666) {
+    if (action) {
+        g_message("%3zu -- %p / %s", n, GetPtr(action), action->getClassName().c_str());
+    } else {
+        g_message("%3zu -- (null)", n);
+    }
+}
+
+template <typename PtrType>
+inline void printUndoList(const std::deque<PtrType>& list) {
+    size_t n = 1;
+    for (const auto& action: list) {
+        printAction(action, n++);
+    }
+}
+
+#ifdef UNDO_TRACE
+constexpr bool UNDO_TRACE_BOOL = true;
+#else
+constexpr bool UNDO_TRACE_BOOL = false;
+#endif
+
+void UndoRedoHandler::printContents() {
+    if constexpr (UNDO_TRACE_BOOL)  // NOLINT
+    {
+        g_message("redoList");             // NOLINT
+        printUndoList(this->redoList);     // NOLINT
+        g_message("undoList");             // NOLINT
+        printUndoList(this->undoList);     // NOLINT
+        g_message("savedUndo");            // NOLINT
+        if (this->savedUndo)               // NOLINT
+        {                                  // NOLINT
+            printAction(this->savedUndo);  // NOLINT
+        }                                  // NOLINT
+    }
+}
+
+UndoRedoHandler::UndoRedoHandler(Control* control): control(control) {}
+
+UndoRedoHandler::~UndoRedoHandler() { clearContents(); }
+
+void UndoRedoHandler::clearContents() {
+#ifdef UNDO_TRACE
+    for (auto const& undoAction: this->undoList) {
+        g_message("clearContents()::Delete UndoAction: %p / %s", undoAction.get(), undoAction->getClassName().c_str());
+    }
+#endif  // UNDO_TRACE
+
+    undoList.clear();
+    clearRedo();
+
+    this->savedUndo = nullptr;
+    this->autosavedUndo = nullptr;
+
+    printContents();
+}
+
+void UndoRedoHandler::clearRedo() {
+#ifdef UNDO_TRACE
+    for (auto const& undoAction: this->redoList) {
+        g_message("clearRedo()::Delete UndoAction: %p / %s", undoAction.get(), undoAction->getClassName().c_str());
+    }
+#endif
+    redoList.clear();
+    printContents();
+}
+
+void UndoRedoHandler::undo() {
+    if (this->undoList.empty()) {
+        return;
+    }
+
+    xoj_assert(this->undoList.back());
+
+    auto& undoAction = *this->undoList.back();
+    this->redoList.emplace_back(std::move(this->undoList.back()));
+    this->undoList.pop_back();
+
+    bool undoResult = undoAction.undo(this->control);
+
+    if (!undoResult) {
+        string msg = FS(_F("Could not undo \"{1}\"\n"
+                           "Something went wrong… Please write a bug report…") %
+                        undoAction.getText());
+        XojMsgBox::showErrorToUser(control->getGtkWindow(), msg);
+    }
+
+    fireUpdateUndoRedoButtons(undoAction.getPages());
+
+    printContents();
+}
+
+void UndoRedoHandler::redo() {
+    if (this->redoList.empty()) {
+        return;
+    }
+
+    xoj_assert(this->redoList.back());
+
+    UndoAction& redoAction = *this->redoList.back();
+
+    this->undoList.emplace_back(std::move(this->redoList.back()));
+    this->redoList.pop_back();
+
+    bool redoResult = redoAction.redo(this->control);
+
+    if (!redoResult) {
+        string msg = FS(_F("Could not redo \"{1}\"\n"
+                           "Something went wrong… Please write a bug report…") %
+                        redoAction.getText());
+        XojMsgBox::showErrorToUser(control->getGtkWindow(), msg);
+    }
+
+    fireUpdateUndoRedoButtons(redoAction.getPages());
+
+    printContents();
+}
+
+auto UndoRedoHandler::canUndo() -> bool { return !this->undoList.empty(); }
+
+auto UndoRedoHandler::canRedo() -> bool { return !this->redoList.empty(); }
+
+/**
+ * Adds an undo Action to the list, or if nullptr does nothing
+ */
+void UndoRedoHandler::addUndoAction(UndoActionPtr action) {
+    if (!action) {
+        return;
+    }
+
+    this->undoList.emplace_back(std::move(action));
+    clearRedo();
+    fireUpdateUndoRedoButtons(this->undoList.back()->getPages());
+
+    printContents();
+}
+
+auto UndoRedoHandler::undoDescription() -> string {
+    if (!this->undoList.empty()) {
+        UndoAction& a = *this->undoList.back();
+        if (!a.getText().empty()) {
+            string txt = _("Undo: ");
+            txt += a.getText();
+            return txt;
+        }
+    }
+    return _("Undo");
+}
+
+auto UndoRedoHandler::redoDescription() -> string {
+    if (!this->redoList.empty()) {
+        UndoAction& a = *this->redoList.back();
+        if (!a.getText().empty()) {
+            string txt = _("Redo: ");
+            txt += a.getText();
+            return txt;
+        }
+    }
+    return _("Redo");
+}
+
+void UndoRedoHandler::fireUpdateUndoRedoButtons(const std::vector<PageRef>& pages) {
+    for (auto&& undoRedoListener: this->listener) { undoRedoListener->undoRedoChanged(); }
+
+    for (PageRef page: pages) {
+        if (!page) {
+            continue;
+        }
+
+        for (auto&& undoRedoListener: this->listener) { undoRedoListener->undoRedoPageChanged(page); }
+    }
+}
+
+void UndoRedoHandler::addUndoRedoListener(UndoRedoListener* listener) { this->listener.emplace_back(listener); }
+
+auto UndoRedoHandler::isChanged() -> bool {
+    if (this->undoList.empty()) {
+        return this->savedUndo;
+    }
+
+    return this->savedUndo != this->undoList.back().get();
+}
+
+auto UndoRedoHandler::isChangedAutosave() -> bool {
+    if (this->undoList.empty()) {
+        return this->autosavedUndo;
+    }
+    return this->autosavedUndo != this->undoList.back().get();
+}
+
+void UndoRedoHandler::documentAutosaved() {
+    this->autosavedUndo = this->undoList.empty() ? nullptr : this->undoList.back().get();
+}
+
+void UndoRedoHandler::documentSaved() {
+    this->savedUndo = this->undoList.empty() ? nullptr : this->undoList.back().get();
+}
diff --git a/entry/src/main/cpp/src/core/undo/UndoRedoHandler.h b/entry/src/main/cpp/src/core/undo/UndoRedoHandler.h
new file mode 100644
index 0000000..1859786
--- /dev/null
+++ b/entry/src/main/cpp/src/core/undo/UndoRedoHandler.h
@@ -0,0 +1,72 @@
+/*
+ * Xournal++
+ *
+ * Handles Undo and Redo
+ *
+ * @author Xournal++ Team
+ * https://github.com/xournalpp/xournalpp
+ *
+ * @license GNU GPLv2 or later
+ */
+
+#pragma once
+
+#include <deque>   // for deque
+#include <string>  // for string
+#include <vector>  // for vector
+
+#include "model/PageRef.h"  // for PageRef
+
+#include "UndoAction.h"  // for UndoActionPtr
+
+class Control;
+
+class UndoRedoListener {
+public:
+    virtual void undoRedoChanged() = 0;
+    virtual void undoRedoPageChanged(PageRef page) = 0;
+
+    virtual ~UndoRedoListener() = default;
+};
+
+class UndoRedoHandler {
+public:
+    explicit UndoRedoHandler(Control* control);
+    virtual ~UndoRedoHandler();
+
+    void undo();
+    void redo();
+
+    bool canUndo();
+    bool canRedo();
+
+    void addUndoAction(UndoActionPtr action);
+
+    std::string undoDescription();
+    std::string redoDescription();
+
+    void clearContents();
+
+    void fireUpdateUndoRedoButtons(const std::vector<PageRef>& pages);
+    void addUndoRedoListener(UndoRedoListener* listener);
+
+    bool isChanged();
+    bool isChangedAutosave();
+    void documentAutosaved();
+    void documentSaved();
+
+private:
+    void clearRedo();
+    void printContents();
+
+private:
+    std::deque<UndoActionPtr> undoList;
+    std::deque<UndoActionPtr> redoList;
+
+    UndoAction* savedUndo = nullptr;
+    UndoAction* autosavedUndo = nullptr;
+
+    std::vector<UndoRedoListener*> listener;
+
+    Control* control = nullptr;
+};
diff --git a/entry/src/main/cpp/src/core/view/CompassView.cpp b/entry/src/main/cpp/src/core/view/CompassView.cpp
new file mode 100644
index 0000000..cb492d5
--- /dev/null
+++ b/entry/src/main/cpp/src/core/view/CompassView.cpp
@@ -0,0 +1,156 @@
+#include "CompassView.h"
+
+#include <algorithm>  // for max, min
+#include <cmath>      // for isnan, sqrt, cos, sin, atan2
+#include <iomanip>
+#include <sstream>
+#include <utility>  // for move
+
+#include <glib.h>  // for g_error, g_warning
+
+#include "model/Compass.h"            // for Compass
+#include "model/Stroke.h"             // for Stroke
+#include "util/Assert.h"              // for xoj_assert
+#include "util/raii/CairoWrappers.h"  // for CairoSaveGuard
+#include "util/safe_casts.h"          // for round_cast
+#include "view/Repaintable.h"         // for Repaintable
+#include "view/View.h"                // for Context
+
+#include "StrokeView.h"  // for StrokeView
+
+using namespace xoj::view;
+
+// all lengths are in centimeter
+constexpr double FONT_SIZE = .2;
+constexpr double CIRCLE_RAD = .3;
+constexpr double TICK_SMALL = .1;
+constexpr double TICK_LARGE = .2;
+constexpr double RELATIVE_CIRCLE_POS = .8;
+constexpr double RELATIVE_ANGULAR_CAPTION_POS = .3;
+constexpr double OFFSET_CIRCLE_POS = .4;
+constexpr const char* FONT_FAMILY = "Arial";
+
+CompassView::CompassView(const Compass* compass, Repaintable* parent, ZoomControl* zoomControl):
+        GeometryToolView(compass, parent, zoomControl) {
+    this->registerToPool(compass->getViewPool());
+}
+
+CompassView::~CompassView() noexcept { this->unregisterFromPool(); };
+
+
+void CompassView::on(FlagDirtyRegionRequest, const Range& rg) { this->parent->flagDirtyRegion(rg); }
+
+void CompassView::on(UpdateValuesRequest, double h, double rot, cairo_matrix_t m) {
+    xoj_assert_message(h > 0, "Non-positive compass height");
+    height = h;
+    rotation = rot;
+    matrix = m;
+    circlePos = height * RELATIVE_CIRCLE_POS - OFFSET_CIRCLE_POS;
+    angularCaptionPos = height * RELATIVE_ANGULAR_CAPTION_POS;
+    maxHmark = round_cast<int>(height * 10.0);
+    drawRotationDisplay = height >= 2.;
+    drawRadialCaption = height >= 1.5;
+    angularOffset = (height >= 2.) ? 1 : (height >= 1.2) ? 2 : (height >= 0.8) ? 5 : 10;
+    angularCaptionOffset = (height >= 3.) ? 30 : (height >= 1.5) ? 45 : (height >= 1.) ? 90 : 360;
+}
+
+void CompassView::deleteOn(CompassView::FinalizationRequest, const Range& rg) {
+    this->parent->drawAndDeleteToolView(this, rg);
+}
+
+void CompassView::drawGeometryTool(cairo_t* cr) const {
+    xoj::util::CairoSaveGuard saveGuard(cr);
+    cairo_scale(cr, CM, CM);
+
+    cairo_set_line_width(cr, LINE_WIDTH_IN_CM);
+    cairo_set_fill_rule(cr, CAIRO_FILL_RULE_EVEN_ODD);
+    cairo_select_font_face(cr, FONT_FAMILY, CAIRO_FONT_SLANT_NORMAL, CAIRO_FONT_WEIGHT_NORMAL);
+    cairo_set_font_size(cr, FONT_SIZE);
+
+    cairo_set_source_rgb(cr, 1, 0, 0);  // red
+    drawOutline(cr);
+
+    cairo_set_source_rgb(cr, .0, .0, 1.);  // blue
+    drawHorizontalMarks(cr);
+
+    cairo_set_source_rgb(cr, .5, 0, .5);  // violet
+    drawAngularMarks(cr);
+}
+
+void CompassView::drawDisplays(cairo_t* cr) const {
+    xoj::util::CairoSaveGuard saveGuard(cr);
+    cairo_transform(cr, &matrix);
+    cairo_set_line_width(cr, LINE_WIDTH_IN_CM);
+    cairo_select_font_face(cr, FONT_FAMILY, CAIRO_FONT_SLANT_NORMAL, CAIRO_FONT_WEIGHT_NORMAL);
+    cairo_set_font_size(cr, FONT_SIZE);
+
+    cairo_set_source_rgb(cr, 0, .5, .5);  // turquoise
+    drawRotation(cr);
+}
+
+void CompassView::drawOutline(cairo_t* cr) const {
+    xoj::util::CairoSaveGuard saveGuard(cr);
+    cairo_move_to(cr, .0, .0);
+    cairo_arc(cr, .0, .0, this->height, .0, 2. * M_PI);
+    cairo_stroke_preserve(cr);
+
+    cairo_set_source_rgba(cr, .2, .2, .2, .1);  // transparent gray
+    cairo_fill(cr);
+}
+
+void CompassView::drawRotation(cairo_t* cr) const {
+    if (!drawRotationDisplay) {
+        return;
+    }
+    xoj::util::CairoSaveGuard saveGuard(cr);
+    // write the angle within a small circle
+    std::stringstream ss;
+    ss << std::fixed << std::setprecision(1) << std::abs(std::remainder(deg(this->rotation), 180.));
+    cairo_move_to(cr, .0, -this->circlePos);
+    showTextCenteredAndRotated(cr, ss.str(), -deg(this->rotation));
+
+    cairo_move_to(cr, .0, -this->circlePos);
+    cairo_new_sub_path(cr);
+    cairo_arc(cr, .0, -this->circlePos, CIRCLE_RAD, .0, 2. * M_PI);
+    cairo_stroke(cr);
+}
+
+void CompassView::drawAngularMarks(cairo_t* cr) const {
+    xoj::util::CairoSaveGuard saveGuard(cr);
+
+    for (int i = angularOffset; i < 360; i += angularOffset) {
+        const double cs = std::cos(rad(i));
+        const double si = std::sin(rad(i));
+        const double tick = (i % 5 == 0) ? TICK_LARGE : TICK_SMALL;
+        cairo_move_to(cr, this->height * cs, this->height * si);
+        if (i % angularCaptionOffset == 0) {
+            const double radTickEnd = (i == 270) ? (this->circlePos + 1.5 * CIRCLE_RAD) : (angularCaptionPos + 0.3);
+            cairo_line_to(cr, radTickEnd * cs, radTickEnd * si);
+            cairo_move_to(cr, angularCaptionPos * cs, angularCaptionPos * si);
+            showTextCenteredAndRotated(cr, std::to_string(360 - i), i + 90);
+        } else {
+            cairo_rel_line_to(cr, -tick * cs, -tick * si);
+        }
+    }
+    cairo_stroke(cr);
+}
+
+void CompassView::drawHorizontalMarks(cairo_t* cr) const {
+    xoj::util::CairoSaveGuard saveGuard(cr);
+    // BEGIN: radial measuring marks
+
+    for (int i = 0; i <= this->maxHmark; i++) {
+        const double tick = (i % 5 == 0) ? TICK_LARGE : TICK_SMALL;
+        // draw marks
+        cairo_move_to(cr, static_cast<double>(i) / 10.0, .0);
+        cairo_rel_line_to(cr, .0, tick);
+        if (i % 10 == 0 && drawRadialCaption) {
+            // draw numbers
+            cairo_rel_move_to(cr, .0, FONT_SIZE / 2.);
+            const auto text = std::to_string(std::abs(i / 10));
+            showTextCenteredAndRotated(cr, text.c_str(), .0);
+        }
+    }
+    cairo_stroke(cr);
+    // END: radial measuring marks
+}
diff --git a/entry/src/main/cpp/src/core/view/CompassView.h b/entry/src/main/cpp/src/core/view/CompassView.h
new file mode 100644
index 0000000..15c1be9
--- /dev/null
+++ b/entry/src/main/cpp/src/core/view/CompassView.h
@@ -0,0 +1,105 @@
+/*
+ * Xournal++
+ *
+ * A Compass view
+ *
+ * @author Xournal++ Team
+ * https://github.com/xournalpp/xournalpp
+ *
+ * @license GNU GPLv2 or later
+ */
+
+#pragma once
+
+#include <cairo.h>  // for cairo_t
+
+#include "model/Compass.h"  // for Compass
+#include "util/DispatchPool.h"
+#include "util/safe_casts.h"  // for floor_cast
+#include "view/overlays/BaseStrokeToolView.h"
+
+#include "GeometryToolView.h"
+
+class Stroke;
+class OverlayBase;
+class ZoomControl;
+
+/**
+ * @brief A class that renders a compass
+ *
+ * The compass has vertical, horizontal and angular marks.
+ * The intersection angle with the x-axis is displayed as well.
+ *
+ * See the file development/documentation/Compass_Readme.md for
+ * details how the Compass is rendered.
+ *
+ * A temporary stroke is displayed when it is created near the
+ * outline of the Compass or at the marked radius (with angle 0).
+ */
+
+namespace xoj::view {
+class Repaintable;
+
+class CompassView: public GeometryToolView {
+
+public:
+    CompassView(const Compass* s, Repaintable* parent, ZoomControl* zoomControl);
+    ~CompassView() noexcept override;
+
+    void on(FlagDirtyRegionRequest, const Range& rg) override;
+    void on(UpdateValuesRequest, double h, double rot, cairo_matrix_t m) override;
+    void deleteOn(FinalizationRequest, const Range& rg) override;
+
+private:
+    void drawGeometryTool(cairo_t* cr) const override;
+    void drawDisplays(cairo_t* cr) const override;
+
+    double height = Compass::INITIAL_HEIGHT;
+    double rotation = 0.;
+    cairo_matrix_t matrix{CM, 0., 0., CM, 0., 0.};
+
+    /**
+     * @brief the distance of the circle containing the rotation angle display from the center
+     * of the compass
+     */
+    double circlePos = 2.;
+
+    /**
+     * @brief the distance of the angular captions (written numbers) for certain angles
+     */
+    double angularCaptionPos = .9;
+
+    /**
+     * @brief the index of the last horizontal mark to be drawn
+     */
+    int maxHmark = floor_cast<int>(10. * Compass::INITIAL_HEIGHT);
+
+    /**
+     * @brief after how many degrees should a new small angular mark be drawn
+     */
+    int angularOffset = 1;
+
+    /**
+     * @brief after how many degrees should a new big angular mark be drawn and a number be added
+     */
+    int angularCaptionOffset = 30;
+
+    /**
+     * @brief should the numbers along the measuring marks be drawn
+     */
+    bool drawRadialCaption = true;
+
+    /**
+     * @brief should the display of the rotation be drawn
+     */
+    bool drawRotationDisplay = true;
+
+    void drawHorizontalMarks(cairo_t* cr) const;
+    void drawAngularMarks(cairo_t* cr) const;
+    void drawOutline(cairo_t* cr) const;
+    void drawRotation(cairo_t* cr) const;
+
+public:
+    static constexpr double LINE_WIDTH_IN_CM = .02;
+};
+};  // namespace xoj::view
diff --git a/entry/src/main/cpp/src/core/view/DebugShowRepaintBounds.h b/entry/src/main/cpp/src/core/view/DebugShowRepaintBounds.h
new file mode 100644
index 0000000..40e40af
--- /dev/null
+++ b/entry/src/main/cpp/src/core/view/DebugShowRepaintBounds.h
@@ -0,0 +1,9 @@
+#pragma once
+
+#include "config-debug.h"
+
+#ifdef DEBUG_SHOW_REPAINT_BOUNDS
+#define IF_DEBUG_REPAINT(f) f
+#else
+#define IF_DEBUG_REPAINT(f)
+#endif
diff --git a/entry/src/main/cpp/src/core/view/DocumentView.cpp b/entry/src/main/cpp/src/core/view/DocumentView.cpp
new file mode 100644
index 0000000..c6a98fb
--- /dev/null
+++ b/entry/src/main/cpp/src/core/view/DocumentView.cpp
@@ -0,0 +1,115 @@
+#include "DocumentView.h"
+
+#include <map>
+#include <memory>  // for __shared_ptr_access, uni...
+#include <vector>  // for vector
+
+#include <glib.h>  // for g_message
+
+#include "model/Layer.h"                     // for Layer
+#include "model/XojPage.h"                   // for XojPage
+#include "view/DebugShowRepaintBounds.h"     // for IF_DEBUG_REPAINT
+#include "view/View.h"                       // for EditionTreatment, NORMAL...
+#include "view/background/BackgroundView.h"  // for BackgroundFlags, Backgro...
+
+#include "LayerView.h"  // for LayerView
+
+/**
+ * Mark stroke with Audio
+ */
+void DocumentView::setMarkAudioStroke(bool markAudioStroke) { this->markAudioStroke = markAudioStroke; }
+
+void DocumentView::setPdfCache(PdfCache* cache) { pdfCache = cache; }
+
+/**
+ * Drawing first step
+ * @param page The page to draw
+ * @param cr Draw to this context
+ * @param dontRenderEditingStroke false to draw currently drawing stroke
+ */
+void DocumentView::initDrawing(ConstPageRef page, cairo_t* cr, bool dontRenderEditingStroke) {
+    this->cr = cr;
+    this->page = page;
+    this->dontRenderEditingStroke = dontRenderEditingStroke;
+}
+
+/**
+ * Last step in drawing
+ */
+void DocumentView::finializeDrawing() {
+    IF_DEBUG_REPAINT({
+        double minX;
+        double maxX;
+        double minY;
+        double maxY;
+        cairo_clip_extents(cr, &minX, &minY, &maxX, &maxY);
+        if (minX > 1 || minY > 1 || maxX < page->getWidth() - 1 || maxY < page->getHeight() - 1) {
+            g_message("DBG:rerender area: %6.2f < x < %6.2f ; %6.2f < y < %6.2f", minX, maxX, minY, maxY);
+            cairo_set_source_rgb(cr, 1, 0, 0);
+            cairo_set_line_width(cr, 1);
+            cairo_rectangle(cr, minX + 3, minY + 3, maxX - minX - 6, maxY - minY - 6);
+            cairo_stroke(cr);
+        } else {
+            g_message("DBG:rerender complete");
+        }
+    });
+
+    this->page = nullptr;
+    this->cr = nullptr;
+}
+
+/**
+ * Draw the background
+ */
+void DocumentView::drawBackground(xoj::view::BackgroundFlags bgFlags) const {
+    auto bgView = xoj::view::BackgroundView::createForPage(page, bgFlags, pdfCache);
+    bgView->draw(cr);
+}
+
+void DocumentView::drawPage(ConstPageRef page, cairo_t* cr, bool dontRenderEditingStroke,
+                            xoj::view::BackgroundFlags flags) {
+    initDrawing(page, cr, dontRenderEditingStroke);
+
+    drawBackground(flags);
+
+    xoj::view::Context context{cr, (xoj::view::NonAudioTreatment)this->markAudioStroke,
+                               (xoj::view::EditionTreatment) !this->dontRenderEditingStroke, xoj::view::NORMAL_COLOR};
+    for (const Layer* layer: page->getLayersView()) {
+        if (layer->isVisible()) {
+            xoj::view::LayerView layerView(layer);
+            layerView.draw(context);
+        }
+    }
+
+    finializeDrawing();
+}
+
+
+void DocumentView::drawLayersOfPage(const LayerRangeVector& layerRange, ConstPageRef page, cairo_t* cr,
+                                    bool dontRenderEditingStroke, xoj::view::BackgroundFlags flags) {
+    initDrawing(page, cr, dontRenderEditingStroke);
+
+    drawBackground(flags);
+
+    size_t layerCount = page->getLayerCount();
+    std::map<size_t, const Layer*> visibleLayers;
+
+    for (LayerRangeEntry e: layerRange) {
+        auto last = e.last;
+        if (last >= layerCount) {
+            last = layerCount - 1;
+        }
+        for (size_t x = e.first; x <= last; x++) {
+            visibleLayers[x] = page->getLayersView()[x];
+        }
+    }
+
+    xoj::view::Context context{cr, (xoj::view::NonAudioTreatment)this->markAudioStroke,
+                               (xoj::view::EditionTreatment) !this->dontRenderEditingStroke, xoj::view::NORMAL_COLOR};
+    for (auto&& [_, l]: visibleLayers) {
+        xoj::view::LayerView layerView(l);
+        layerView.draw(context);
+    }
+
+    finializeDrawing();
+}
diff --git a/entry/src/main/cpp/src/core/view/DocumentView.h b/entry/src/main/cpp/src/core/view/DocumentView.h
new file mode 100644
index 0000000..c8df500
--- /dev/null
+++ b/entry/src/main/cpp/src/core/view/DocumentView.h
@@ -0,0 +1,93 @@
+/*
+ * Xournal++
+ *
+ * Paints a page to a cairo context
+ *
+ * @author Xournal++ Team
+ * https://github.com/xournalpp/xournalpp
+ *
+ * @license GNU GPLv2 or later
+ */
+
+#pragma once
+
+#include <cairo.h>  // for cairo_t
+
+#include "model/PageRef.h"  // for ConstPageRef
+#include "util/ElementRange.h"
+#include "view/background/BackgroundFlags.h"
+
+class PdfCache;
+
+namespace xoj::view {
+struct BackgroundFlags;
+};
+
+class DocumentView {
+public:
+    DocumentView() = default;
+    virtual ~DocumentView() = default;
+
+public:
+    /**
+     * Draw the full page, usually you would like to call this method
+     * @param page The page to draw
+     * @param cr Draw to thgis context
+     * @param dontRenderEditingStroke false to draw currently drawing stroke
+     * @param flags show/hide various background components
+     */
+    void drawPage(ConstPageRef page, cairo_t* cr, bool dontRenderEditingStroke,
+                  xoj::view::BackgroundFlags flags = xoj::view::BACKGROUND_SHOW_ALL);
+
+    /**
+     * Only draws the prescribed layers of the given page, regardless of the layer's current visibility.
+     * @param layerRange Range of layers to draw
+     * @param page The page to draw
+     * @param cr Draw to this context
+     * @param dontRenderEditingStroke false to draw currently drawing stroke
+     * @param flags show/hide various background components
+     */
+    void drawLayersOfPage(const LayerRangeVector& layerRange, ConstPageRef page, cairo_t* cr,
+                          bool dontRenderEditingStroke,
+                          xoj::view::BackgroundFlags flags = xoj::view::BACKGROUND_SHOW_ALL);
+
+    /**
+     * Mark stroke with Audio
+     */
+    void setMarkAudioStroke(bool markAudioStroke);
+
+    // API for special drawing, usually you won't call this methods
+public:
+    void setPdfCache(PdfCache* cache);
+
+    /**
+     * Drawing first step
+     * @param page The page to draw
+     * @param cr Draw to thgis context
+     * @param dontRenderEditingStroke false to draw currently drawing stroke
+     */
+    void initDrawing(ConstPageRef page, cairo_t* cr, bool dontRenderEditingStroke);
+
+    /**
+     * Draw the background
+     */
+    void drawBackground(xoj::view::BackgroundFlags bgFlags) const;
+
+    /**
+     * Draw background if there is no background shown, like in GIMP etc.
+     */
+    void drawTransparentBackgroundPattern();
+
+    /**
+     * Last step in drawing
+     */
+    void finializeDrawing();
+
+private:
+    cairo_t* cr = nullptr;
+    ConstPageRef page = nullptr;
+    PdfCache* pdfCache = nullptr;
+    bool dontRenderEditingStroke = false;
+    bool markAudioStroke = false;
+
+};
diff --git a/entry/src/main/cpp/src/core/view/ElementContainerView.cpp b/entry/src/main/cpp/src/core/view/ElementContainerView.cpp
new file mode 100644
index 0000000..a9b8256
--- /dev/null
+++ b/entry/src/main/cpp/src/core/view/ElementContainerView.cpp
@@ -0,0 +1,20 @@
+#include "ElementContainerView.h"
+
+#include <memory>  // for unique_ptr
+
+#include "model/ElementContainer.h"  // for ElementContainer
+
+#include "View.h"  // for ElementView
+
+class Element;
+
+using namespace xoj::view;
+
+ElementContainerView::ElementContainerView(const ElementContainer* container): container(container) {}
+
+void ElementContainerView::draw(const Context& ctx) const {
+    container->forEachElement([&ctx](const Element* e) {
+        auto elementView = ElementView::createFromElement(e);
+        elementView->draw(ctx);
+    });
+}
diff --git a/entry/src/main/cpp/src/core/view/ElementContainerView.h b/entry/src/main/cpp/src/core/view/ElementContainerView.h
new file mode 100644
index 0000000..6649924
--- /dev/null
+++ b/entry/src/main/cpp/src/core/view/ElementContainerView.h
@@ -0,0 +1,31 @@
+/*
+ * Xournal++
+ *
+ * Displays the content of a selection
+ *
+ * @author Xournal++ Team
+ * https://github.com/xournalpp/xournalpp
+ *
+ * @license GNU GPLv2 or later
+ */
+
+#pragma once
+
+class ElementContainer;
+
+namespace xoj::view {
+class Context;
+
+class ElementContainerView {
+public:
+    ElementContainerView(const ElementContainer* container);
+
+    /**
+     * @brief Draws the container to the given context
+     */
+    void draw(const Context& ctx) const;
+
+private:
+    const ElementContainer* container;
+};
+};  // namespace xoj::view
diff --git a/entry/src/main/cpp/src/core/view/ElementView.cpp b/entry/src/main/cpp/src/core/view/ElementView.cpp
new file mode 100644
index 0000000..4dfeef1
--- /dev/null
+++ b/entry/src/main/cpp/src/core/view/ElementView.cpp
@@ -0,0 +1,32 @@
+#include <memory>  // for make_unique, unique_ptr
+
+#include "model/Element.h"   // for Element, ELEMENT_IMAGE, ELEMENT_STROKE
+#include "model/Image.h"     // for Image
+#include "model/Stroke.h"    // for Stroke
+#include "model/TexImage.h"  // for TexImage
+#include "model/Text.h"      // for Text
+#include "util/Assert.h"     // for xoj_assert
+
+#include "ImageView.h"     // for ImageView
+#include "StrokeView.h"    // for StrokeView
+#include "TexImageView.h"  // for TexImageView
+#include "TextView.h"      // for TextView
+#include "View.h"          // for ElementView, view
+
+using namespace xoj::view;
+
+auto ElementView::createFromElement(const Element* e) -> std::unique_ptr<ElementView> {
+    switch (e->getType()) {
+        case ELEMENT_STROKE:
+            return std::make_unique<StrokeView>(dynamic_cast<const Stroke*>(e));
+        case ELEMENT_TEXT:
+            return std::make_unique<TextView>(dynamic_cast<const Text*>(e));
+        case ELEMENT_IMAGE:
+            return std::make_unique<ImageView>(dynamic_cast<const Image*>(e));
+        case ELEMENT_TEXIMAGE:
+            return std::make_unique<TexImageView>(dynamic_cast<const TexImage*>(e));
+        default:
+            xoj_assert_message(false, "ElementView::getFromElement: Unknown element type!");
+            return nullptr;
+    }
+}
diff --git a/entry/src/main/cpp/src/core/view/ErasableStrokeView.cpp b/entry/src/main/cpp/src/core/view/ErasableStrokeView.cpp
new file mode 100644
index 0000000..bc5601d
--- /dev/null
+++ b/entry/src/main/cpp/src/core/view/ErasableStrokeView.cpp
@@ -0,0 +1,309 @@
+#include "ErasableStrokeView.h"
+
+#include <cmath>     // for ceil
+#include <iosfwd>    // for ptrdiff_t
+#include <iterator>  // for next
+#include <memory>    // for allocator_traits<>::value_type
+#include <vector>    // for vector
+
+#include "model/LineStyle.h"              // for LineStyle
+#include "model/PathParameter.h"          // for PathParameter
+#include "model/Point.h"                  // for Point
+#include "model/Stroke.h"                 // for Stroke, StrokeTool::HIGHLIG...
+#include "model/eraser/ErasableStroke.h"  // for ErasableStroke, ErasableStr...
+#include "util/Assert.h"                  // for xoj_assert
+#include "util/Color.h"                   // for cairo_set_source_rgbi
+#include "util/Interval.h"                // for Interval
+#include "util/Rectangle.h"               // for Rectangle
+#include "util/Util.h"                    // for cairo_set_dash_from_vector
+
+#include "Mask.h"          // for Mask
+#include "StrokeView.h"    // for StrokeView, StrokeView::CAI...
+#include "config-debug.h"  // for DEBUG_ERASABLE_STROKE_BOXES
+
+using xoj::util::Rectangle;
+using namespace xoj::view;
+
+ErasableStrokeView::ErasableStrokeView(const ErasableStroke& erasableStroke): erasableStroke(erasableStroke) {}
+
+void ErasableStrokeView::draw(cairo_t* cr) const {
+    std::vector<ErasableStroke::SubSection> sections = erasableStroke.getRemainingSubSectionsVector();
+
+    if (sections.empty()) {
+        return;
+    }
+
+    const Stroke& stroke = this->erasableStroke.stroke;
+
+    const auto& dashes = stroke.getLineStyle().getDashes();
+
+    const std::vector<Point>& data = stroke.getPointVector();
+
+    xoj::util::CairoSaveGuard guard(cr);
+
+    if (stroke.hasPressure()) {
+        double dashOffset = 0;
+        for (const auto& interval: sections) {
+            Point p = stroke.getPoint(interval.min);
+            cairo_set_line_width(cr, p.z);
+            cairo_move_to(cr, p.x, p.y);
+
+            const Point* lastPoint = &p;
+
+            auto endIt = std::next(data.cbegin(), (std::ptrdiff_t)interval.max.index + 1);
+            for (auto it = std::next(data.cbegin(), (std::ptrdiff_t)interval.min.index + 1); it != endIt; ++it) {
+                if (!dashes.empty()) {
+                    Util::cairo_set_dash_from_vector(cr, dashes, dashOffset);
+                    dashOffset += lastPoint->lineLengthTo(*it);
+                    lastPoint = &(*it);
+                }
+                cairo_line_to(cr, it->x, it->y);
+                cairo_stroke(cr);
+                cairo_set_line_width(cr, it->z);
+                cairo_move_to(cr, it->x, it->y);
+            }
+
+            if (!dashes.empty()) {
+                Util::cairo_set_dash_from_vector(cr, dashes, dashOffset);
+            }
+
+            Point q = stroke.getPoint(interval.max);
+            cairo_line_to(cr, q.x, q.y);
+            cairo_stroke(cr);
+        }
+    } else {
+        cairo_set_line_width(cr, stroke.getWidth());
+        Util::cairo_set_dash_from_vector(cr, dashes, 0);
+
+        bool mergeFirstAndLast = this->erasableStroke.isClosedStroke() &&
+                                 stroke.getToolType() == StrokeTool::HIGHLIGHTER && sections.size() >= 2 &&
+                                 sections.front().min == PathParameter(0, 0.0) &&
+                                 sections.back().max == PathParameter(data.size() - 2, 1.0);
+
+        auto sectionIt = sections.cbegin();
+        auto sectionEndIt = sections.cend();
+
+        if (mergeFirstAndLast) {
+            /**
+             * Draw the first and last section as one
+             */
+            const ErasableStroke::SubSection& first = sections.front();
+            const ErasableStroke::SubSection& last = sections.back();
+            Point p = stroke.getPoint(last.min);
+            cairo_move_to(cr, p.x, p.y);
+
+            auto endIt = data.cend();
+            for (auto it = std::next(data.cbegin(), (std::ptrdiff_t)last.min.index + 1); it != endIt; ++it) {
+                cairo_line_to(cr, it->x, it->y);
+            }
+            endIt = std::next(data.cbegin(), (std::ptrdiff_t)first.max.index + 1);
+            for (auto it = data.cbegin(); it != endIt; ++it) { cairo_line_to(cr, it->x, it->y); }
+
+            Point q = stroke.getPoint(first.max);
+            cairo_line_to(cr, q.x, q.y);
+            cairo_stroke(cr);
+
+            // Avoid drawing those sections again
+            ++sectionIt;
+            --sectionEndIt;
+        }
+
+        for (; sectionIt != sectionEndIt; ++sectionIt) {
+            Point p = stroke.getPoint(sectionIt->min);
+            cairo_move_to(cr, p.x, p.y);
+
+            auto endIt = std::next(data.cbegin(), (std::ptrdiff_t)sectionIt->max.index + 1);
+            for (auto it = std::next(data.cbegin(), (std::ptrdiff_t)sectionIt->min.index + 1); it != endIt; ++it) {
+                cairo_line_to(cr, it->x, it->y);
+            }
+
+            Point q = stroke.getPoint(sectionIt->max);
+            cairo_line_to(cr, q.x, q.y);
+            cairo_stroke(cr);
+        }
+    }
+
+#ifdef DEBUG_ERASABLE_STROKE_BOXES
+    if (!this->erasableStroke.debugMask.isInitialized()) {
+        cairo_matrix_t matrix;
+        cairo_get_matrix(cr, &matrix);
+
+        Range extents(0, 0, stroke.getElementWidth(), stroke.getElementHeight());
+        extents.addPadding(5 * stroke.getWidth());
+        erasableStroke.debugMask = Mask(cairo_get_target(cr), extents, matrix.xx, CAIRO_CONTENT_COLOR_ALPHA);
+        cairo_set_line_width(this->erasableStroke.debugMask.get(), 2);
+    } else {
+        cairo_set_operator(cr, CAIRO_OPERATOR_OVER);
+        this->erasableStroke.debugMask.paintTo(cr);
+    }
+#endif
+}
+
+void ErasableStrokeView::drawFilling(cairo_t* cr) const {
+    std::vector<ErasableStroke::SubSection> sections = erasableStroke.getRemainingSubSectionsVector();
+
+    if (sections.empty()) {
+        return;
+    }
+
+    const Stroke& stroke = this->erasableStroke.stroke;
+    const std::vector<Point>& data = stroke.getPointVector();
+
+    bool mergeFirstAndLast = this->erasableStroke.isClosedStroke() && sections.size() >= 2 &&
+                             sections.front().min == PathParameter(0, 0.0) &&
+                             sections.back().max == PathParameter(data.size() - 2, 1.0);
+
+    auto sectionIt = sections.cbegin();
+    auto sectionEndIt = sections.cend();
+
+    if (mergeFirstAndLast) {
+        /**
+         * Draw the first and last sections as one
+         */
+        const ErasableStroke::SubSection& first = sections.front();
+        const ErasableStroke::SubSection& last = sections.back();
+        Point p = stroke.getPoint(last.min);
+        cairo_move_to(cr, p.x, p.y);
+
+        auto endIt = data.cend();
+        for (auto it = std::next(data.cbegin(), (std::ptrdiff_t)last.min.index + 1); it != endIt; ++it) {
+            cairo_line_to(cr, it->x, it->y);
+        }
+        endIt = std::next(data.cbegin(), (std::ptrdiff_t)first.max.index + 1);
+        for (auto it = data.cbegin(); it != endIt; ++it) { cairo_line_to(cr, it->x, it->y); }
+
+        Point q = stroke.getPoint(first.max);
+        cairo_line_to(cr, q.x, q.y);
+        cairo_fill(cr);
+
+        // Avoid drawing those sections again
+        ++sectionIt;
+        --sectionEndIt;
+    }
+
+    for (; sectionIt != sectionEndIt; ++sectionIt) {
+        Point p = stroke.getPoint(sectionIt->min);
+        cairo_move_to(cr, p.x, p.y);
+
+        auto endIt = std::next(data.cbegin(), (std::ptrdiff_t)sectionIt->max.index + 1);
+        for (auto it = std::next(data.cbegin(), (std::ptrdiff_t)sectionIt->min.index + 1); it != endIt; ++it) {
+            cairo_line_to(cr, it->x, it->y);
+        }
+
+        Point q = stroke.getPoint(sectionIt->max);
+        cairo_line_to(cr, q.x, q.y);
+        cairo_fill(cr);
+    }
+}
+
+void ErasableStrokeView::paintFilledHighlighter(cairo_t* cr) const {
+    const Stroke& stroke = erasableStroke.stroke;
+    std::vector<ErasableStroke::SubSection> sections = erasableStroke.getRemainingSubSectionsVector();
+
+    if (sections.empty()) {
+        return;
+    }
+
+    xoj::util::CairoSaveGuard guard(cr);
+
+    const auto linecap = StrokeView::CAIRO_LINE_CAP[stroke.getStrokeCapStyle()];
+
+    /**
+     * We create a mask for each subsection, paint on it and blit them all.
+     * We need to rescale the mask according to the scaling of the target cairo context.
+     * We find out this scaling by looking at the transformation matrix
+     */
+    cairo_matrix_t matrix;
+    cairo_get_matrix(cr, &matrix);
+    // We assume the matrix is an homothety
+    xoj_assert(matrix.xx == matrix.yy && matrix.xy == 0 && matrix.yx == 0);
+
+    // Initialise the cairo context
+    cairo_set_operator(cr, CAIRO_OPERATOR_MULTIPLY);
+    Util::cairo_set_source_rgbi(cr, stroke.getColor(), static_cast<double>(stroke.getFill()) / 255.0);
+
+    const std::vector<Point>& data = stroke.getPointVector();
+
+    bool mergeFirstAndLast = erasableStroke.isClosedStroke() && sections.size() >= 2 &&
+                             sections.front().min == PathParameter(0, 0.0) &&
+                             sections.back().max == PathParameter(data.size() - 2, 1.0);
+
+    auto sectionIt = sections.cbegin();
+    auto sectionEndIt = sections.cend();
+
+    if (mergeFirstAndLast) {
+        /**
+         * Draw the first and last sections as one
+         */
+        const ErasableStroke::SubSection& first = sections.front();
+        const ErasableStroke::SubSection& last = sections.back();
+
+        /**
+         * Create a mask tailored to the union of the sections' bounding boxes
+         */
+        Range box = erasableStroke.getSubSectionBoundingBox(first).unite(erasableStroke.getSubSectionBoundingBox(last));
+
+        Mask mask = createMask(cr, box, matrix.xx);
+        cairo_t* crMask = mask.get();
+        cairo_set_line_cap(crMask, linecap);
+
+        // Paint to the mask
+        Point p = stroke.getPoint(last.min);
+        cairo_move_to(crMask, p.x, p.y);
+
+        auto endIt = data.cend();
+        for (auto it = std::next(data.cbegin(), (std::ptrdiff_t)last.min.index + 1); it != endIt; ++it) {
+            cairo_line_to(crMask, it->x, it->y);
+        }
+        endIt = std::next(data.cbegin(), (std::ptrdiff_t)first.max.index + 1);
+        for (auto it = data.cbegin(); it != endIt; ++it) { cairo_line_to(crMask, it->x, it->y); }
+
+        Point q = stroke.getPoint(first.max);
+        cairo_line_to(crMask, q.x, q.y);
+
+        cairo_fill_preserve(crMask);
+        cairo_stroke(crMask);
+
+        mask.blitTo(cr);
+
+        // Avoid drawing those sections again
+        ++sectionIt;
+        --sectionEndIt;
+    }
+
+    for (; sectionIt != sectionEndIt; ++sectionIt) {
+        // Create a mask
+        Mask mask = createMask(cr, erasableStroke.getSubSectionBoundingBox(*sectionIt), matrix.xx);
+        cairo_t* crMask = mask.get();
+        cairo_set_line_cap(crMask, linecap);
+
+        // Paint to the mask
+        Point p = stroke.getPoint(sectionIt->min);
+        cairo_move_to(crMask, p.x, p.y);
+
+        auto endIt = std::next(data.cbegin(), (std::ptrdiff_t)sectionIt->max.index + 1);
+        for (auto it = std::next(data.cbegin(), (std::ptrdiff_t)sectionIt->min.index + 1); it != endIt; ++it) {
+            cairo_line_to(crMask, it->x, it->y);
+        }
+
+        Point q = stroke.getPoint(sectionIt->max);
+        cairo_line_to(crMask, q.x, q.y);
+
+        cairo_fill_preserve(crMask);
+        cairo_stroke(crMask);
+
+        mask.blitTo(cr);
+    }
+}
+
+auto ErasableStrokeView::createMask(cairo_t* target, const Range& box, double zoom) const -> Mask {
+    Mask mask(cairo_get_target(target), box, zoom);
+
+    cairo_t* crMask = mask.get();
+    cairo_set_line_join(crMask, CAIRO_LINE_JOIN_ROUND);
+    cairo_set_source_rgba(crMask, 1, 1, 1, 1);
+    cairo_set_operator(crMask, CAIRO_OPERATOR_SOURCE);
+    cairo_set_line_width(crMask, this->erasableStroke.stroke.getWidth());
+
+    return mask;
+}
diff --git a/entry/src/main/cpp/src/core/view/ErasableStrokeView.h b/entry/src/main/cpp/src/core/view/ErasableStrokeView.h
new file mode 100644
index 0000000..c7dea37
--- /dev/null
+++ b/entry/src/main/cpp/src/core/view/ErasableStrokeView.h
@@ -0,0 +1,62 @@
+/*
+ * Xournal++
+ *
+ * Draw stroke
+ *
+ * @author Xournal++ Team
+ * https://github.com/xournalpp/xournalpp
+ *
+ * @license GNU GPLv2 or later
+ */
+
+#pragma once
+
+#include <utility>  // for pair
+
+#include <cairo.h>  // for cairo_t
+
+class ErasableStroke;
+class Range;
+
+namespace xoj {
+namespace view {
+class Mask;
+
+class ErasableStrokeView {
+public:
+    ErasableStrokeView(const ErasableStroke& erasableStroke);
+    ~ErasableStrokeView() = default;
+
+    /**
+     * @brief Draw the erasable stroke assuming the cairo context is all set
+     * @param cr The cairo context to draw to
+     */
+    void draw(cairo_t* cr) const;
+
+    /**
+     * @brief Draw the filling of the erasable stroke  assuming the cairo context is all set
+     * @param cr The cairo context
+     */
+    void drawFilling(cairo_t* cr) const;
+
+    /**
+     * @brief Paint the erasable stroke, after setting up the cairo context, assuming the stroke is filled and made with
+     * the highlighter tool
+     * @param cr The cairo context
+     */
+    void paintFilledHighlighter(cairo_t* cr) const;
+
+private:
+    /**
+     * @brief Create a cairo mask for a given rectangle and sets up a context for drawing on it
+     * @param target A cairo context on which the mask would be used
+     * @param box The range delimiting the mask
+     * @param zoom A zoom ratio to apply to the mask
+     */
+    xoj::view::Mask createMask(cairo_t* target, const Range& box, double zoom) const;
+
+private:
+    const ErasableStroke& erasableStroke;
+};
+};  // namespace view
+};  // namespace xoj
diff --git a/entry/src/main/cpp/src/core/view/GeometryToolView.cpp b/entry/src/main/cpp/src/core/view/GeometryToolView.cpp
new file mode 100644
index 0000000..0e5f2a4
--- /dev/null
+++ b/entry/src/main/cpp/src/core/view/GeometryToolView.cpp
@@ -0,0 +1,71 @@
+#include "GeometryToolView.h"
+
+#include "control/zoom/ZoomControl.h"
+#include "model/GeometryTool.h"       // for GeometryTool
+#include "model/Stroke.h"             // for Stroke
+#include "util/raii/CairoWrappers.h"  // for CairoSaveGuard
+#include "view/Repaintable.h"         // for Repaintable
+#include "view/View.h"                // for Context
+
+#include "StrokeView.h"  // for StrokeView
+
+using namespace xoj::view;
+
+GeometryToolView::GeometryToolView(const GeometryTool* geometryTool, Repaintable* parent, ZoomControl* zoomControl):
+        ToolView(parent), geometryTool(geometryTool), zoomControl(zoomControl) {
+    zoomControl->addZoomListener(this);
+}
+
+GeometryToolView::~GeometryToolView() { zoomControl->removeZoomListener(this); }
+
+void GeometryToolView::draw(cairo_t* cr) const {
+    xoj::util::CairoSaveGuard saveGuard(cr);
+    cairo_save(cr);
+
+    if (!mask.isInitialized()) {
+        // Initialize the mask on first call, when the geometry tool changes size and when zooming
+        mask = createMask(cr);
+        this->drawGeometryTool(mask.get());
+    }
+    cairo_translate(cr, geometryTool->getOrigin().x, geometryTool->getOrigin().y);
+    cairo_rotate(cr, geometryTool->getRotation());
+    mask.paintTo(cr);
+    cairo_restore(cr);
+    this->drawDisplays(cr);
+    this->drawTemporaryStroke(cr);
+}
+
+bool GeometryToolView::isViewOf(const OverlayBase* overlay) const { return overlay == this->geometryTool; }
+
+void GeometryToolView::drawTemporaryStroke(cairo_t* cr) const {
+    if (geometryTool->getStroke()) {
+        auto context = xoj::view::Context::createDefault(cr);
+        xoj::view::StrokeView strokeView(geometryTool->getStroke());
+        strokeView.draw(context);
+    }
+}
+
+auto GeometryToolView::createMask(cairo_t* targetCr) const -> Mask {
+    const double zoom = this->parent->getZoom();
+    Range rg = geometryTool->getToolRange(false);
+    return Mask(cairo_get_target(targetCr), rg, zoom, CAIRO_CONTENT_COLOR_ALPHA);
+}
+
+void GeometryToolView::on(ResetMaskRequest) { mask.reset(); }
+
+void GeometryToolView::showTextCenteredAndRotated(cairo_t* cr, const std::string& text, double angle) const {
+    xoj::util::CairoSaveGuard saveGuard(cr);
+    cairo_text_extents_t te;
+    cairo_text_extents(cr, text.c_str(), &te);
+    const double dx = te.x_bearing + te.width / 2.0;
+    const double dy = te.y_bearing + te.height / 2.0;
+
+    cairo_rotate(cr, rad(angle));
+    cairo_rel_move_to(cr, -dx, -dy);
+    cairo_text_path(cr, text.c_str());
+}
+
+void GeometryToolView::zoomChanged() {
+    // If zooming in, the mask needs redrawing. Otherwise it gets blurry.
+    mask.reset();
+}
diff --git a/entry/src/main/cpp/src/core/view/GeometryToolView.h b/entry/src/main/cpp/src/core/view/GeometryToolView.h
new file mode 100644
index 0000000..629dc8e
--- /dev/null
+++ b/entry/src/main/cpp/src/core/view/GeometryToolView.h
@@ -0,0 +1,132 @@
+/*
+ * Xournal++
+ *
+ * A GeometryTool view
+ *
+ * @author Xournal++ Team
+ * https://github.com/xournalpp/xournalpp
+ *
+ * @license GNU GPLv2 or later
+ */
+
+#pragma once
+
+#include <cmath>
+
+#include <cairo.h>  // for cairo_t
+
+#include "control/zoom/ZoomListener.h"
+#include "model/GeometryTool.h"  // for GeometryTool
+#include "view/overlays/BaseStrokeToolView.h"
+
+#include "Mask.h"
+
+class Stroke;
+class OverlayBase;
+class ZoomControl;
+
+/**
+ * @brief A class that renders a geometry tool
+ */
+
+namespace xoj::view {
+class Repaintable;
+
+constexpr double rad(double n) { return n * M_PI / 180.; }
+constexpr double rad(int n) { return rad(static_cast<double>(n)); }
+constexpr double deg(double a) { return a * 180.0 / M_PI; }
+inline double cathete(double h, double o) { return std::sqrt(std::pow(h, 2) - std::pow(o, 2)); }
+
+class GeometryToolView: public ToolView, public ZoomListener, public xoj::util::Listener<GeometryToolView> {
+
+public:
+    GeometryToolView(const GeometryTool* geometryTool, Repaintable* parent, ZoomControl* zoomControl);
+    virtual ~GeometryToolView();
+
+    /**
+     * Zoom interface
+     */
+    void zoomChanged() override;
+
+    /**
+     * Listener interface
+     */
+    static constexpr struct FlagDirtyRegionRequest {
+    } FLAG_DIRTY_REGION = {};
+    virtual void on(FlagDirtyRegionRequest, const Range& rg) = 0;
+
+    static constexpr struct UpdateValuesRequest {
+    } UPDATE_VALUES = {};
+    virtual void on(UpdateValuesRequest, double h, double rot, cairo_matrix_t m) = 0;
+
+    static constexpr struct FinalizationRequest {
+    } FINALIZATION_REQUEST = {};
+    /**
+     * @brief Called before the corresponding GeometryTool's destruction
+     * @param rg The bounding box of the entire geometry tool
+     */
+    virtual void deleteOn(FinalizationRequest, const Range& rg) = 0;
+
+    static constexpr struct ResetMaskRequest {
+    } RESET_MASK = {};
+    void on(ResetMaskRequest);
+
+    /**
+     * @brief draws the geometry tool and temporary stroke to a cairo context
+     * @param cr the cairo context
+     */
+    void draw(cairo_t* cr) const override;
+
+    bool isViewOf(const OverlayBase* overlay) const override;
+
+private:
+    /**
+     * @brief draws the GeometryTool to a cairo context
+     * @param cr the cairo context drawn to
+     */
+    virtual void drawGeometryTool(cairo_t* cr) const = 0;
+
+    /**
+     * @brief draws displays (that may change with rotation and/or translation)
+     * of the geometry tool
+     *
+     * @param cr the cairo context drawn to
+     */
+    virtual void drawDisplays(cairo_t* cr) const = 0;
+
+    /**
+     * @brief draws the temporary stroke to a cairo context
+     * @param cr the cairo context drawn to
+     */
+    void drawTemporaryStroke(cairo_t* cr) const;
+
+    /**
+     * @brief Creates a mask for caching the drawing of the geometry tool (without stroke)
+     */
+    Mask createMask(cairo_t* targetCr) const;
+
+protected:
+    /**
+     * @brief the underlying GeometryTool
+     */
+    const GeometryTool* geometryTool;
+
+    /**
+     * @brief The stroke drawn aligned to the longest side of the GeometryTool or ending at the midpoint of the longest
+     * side of the GeometryTool
+     */
+    Stroke* stroke = nullptr;
+
+    /**
+     * @brief renders text centered and possibly rotated at the current position on a cairo context
+     * @param cr the cairo context
+     * @param text the text string
+     * @param angle the rotation angle
+     */
+    void showTextCenteredAndRotated(cairo_t* cr, const std::string& text, double angle) const;
+
+private:
+    mutable Mask mask;
+    ZoomControl* zoomControl;
+};
+};  // namespace xoj::view
\ No newline at end of file
diff --git a/entry/src/main/cpp/src/core/view/ImageView.cpp b/entry/src/main/cpp/src/core/view/ImageView.cpp
new file mode 100644
index 0000000..d9308a9
--- /dev/null
+++ b/entry/src/main/cpp/src/core/view/ImageView.cpp
@@ -0,0 +1,39 @@
+#include "ImageView.h"
+
+#include <cairo.h>  // for cairo_image_surface_get_height, cairo_image...
+
+#include "model/Image.h"  // for Image
+#include "view/View.h"    // for Context, OPACITY_NO_AUDIO, view
+
+using namespace xoj::view;
+
+ImageView::ImageView(const Image* image): image(image) {}
+
+ImageView::~ImageView() = default;
+
+void ImageView::draw(const Context& ctx) const {
+    cairo_t* cr = ctx.cr;
+
+    cairo_save(cr);
+
+    cairo_surface_t* img = image->getImage();
+    int width = cairo_image_surface_get_width(img);
+    int height = cairo_image_surface_get_height(img);
+
+    cairo_set_operator(cr, CAIRO_OPERATOR_OVER);
+
+    double xFactor = image->getElementWidth() / width;
+    double yFactor = image->getElementHeight() / height;
+
+    cairo_scale(cr, xFactor, yFactor);
+
+    cairo_set_source_surface(cr, img, image->getX() / xFactor, image->getY() / yFactor);
+    // make images translucent when highlighting elements with audio, as they can not have audio
+    if (ctx.fadeOutNonAudio) {
+        cairo_paint_with_alpha(cr, OPACITY_NO_AUDIO);
+    } else {
+        cairo_paint(cr);
+    }
+
+    cairo_restore(cr);
+}
diff --git a/entry/src/main/cpp/src/core/view/ImageView.h b/entry/src/main/cpp/src/core/view/ImageView.h
new file mode 100644
index 0000000..7fa5215
--- /dev/null
+++ b/entry/src/main/cpp/src/core/view/ImageView.h
@@ -0,0 +1,30 @@
+/*
+ * Xournal++
+ *
+ * Displays a Image Element
+ *
+ * @author Xournal++ Team
+ * https://github.com/xournalpp/xournalpp
+ *
+ * @license GNU GPLv2 or later
+ */
+
+#pragma once
+
+#include "View.h"
+
+class Image;
+
+class xoj::view::ImageView: public xoj::view::ElementView {
+public:
+    ImageView(const Image* image);
+    virtual ~ImageView();
+
+    /**
+     * Draws an Image element
+     */
+    void draw(const Context& ctx) const override;
+
+private:
+    const Image* image;
+};
diff --git a/entry/src/main/cpp/src/core/view/LayerView.cpp b/entry/src/main/cpp/src/core/view/LayerView.cpp
new file mode 100644
index 0000000..c4d7197
--- /dev/null
+++ b/entry/src/main/cpp/src/core/view/LayerView.cpp
@@ -0,0 +1,48 @@
+#include "LayerView.h"
+
+#include <memory>  // for unique_ptr
+
+#include <cairo.h>  // for cairo_clip_extents, cairo_rectangle
+#include <glib.h>   // for g_message
+
+#include "model/Element.h"  // for Element
+#include "model/Layer.h"    // for Layer
+
+#include "DebugShowRepaintBounds.h"  // for IF_DEBUG_REPAINT
+#include "View.h"                    // for Context, ElementView
+
+using namespace xoj::view;
+
+LayerView::LayerView(const Layer* layer): layer(layer) {}
+
+const Layer* LayerView::getLayer() const { return layer; }
+
+void LayerView::draw(const Context& ctx) const {
+    IF_DEBUG_REPAINT(int drawn = 0; int notDrawn = 0;);
+
+    // Get the bounds of the mask, in page coordinates
+    double minX;
+    double maxX;
+    double minY;
+    double maxY;
+    cairo_clip_extents(ctx.cr, &minX, &minY, &maxX, &maxY);
+
+    for (auto const& e: layer->getElementsView()) {
+
+        IF_DEBUG_REPAINT({
+            auto cr = ctx.cr;
+            cairo_set_operator(cr, CAIRO_OPERATOR_SOURCE);
+            cairo_set_source_rgb(cr, 0, 1, 0);
+            cairo_set_line_width(cr, 1);
+            cairo_rectangle(cr, e->getX(), e->getY(), e->getElementWidth(), e->getElementHeight());
+            cairo_stroke(cr);
+        });
+
+        if (e->intersectsArea(minX, minY, maxX - minX, maxY - minY)) {
+            ElementView::createFromElement(e)->draw(ctx);
+            IF_DEBUG_REPAINT(drawn++;);
+        }
+        IF_DEBUG_REPAINT(else { notDrawn++; });
+    }
+    IF_DEBUG_REPAINT(g_message("DBG:LayerView::draw: draw %i / not draw %i", drawn, notDrawn););
+}
diff --git a/entry/src/main/cpp/src/core/view/LayerView.h b/entry/src/main/cpp/src/core/view/LayerView.h
new file mode 100644
index 0000000..e442e47
--- /dev/null
+++ b/entry/src/main/cpp/src/core/view/LayerView.h
@@ -0,0 +1,32 @@
+/*
+ * Xournal++
+ *
+ * Displays a Layer
+ *
+ * @author Xournal++ Team
+ * https://github.com/xournalpp/xournalpp
+ *
+ * @license GNU GPLv2 or later
+ */
+
+#pragma once
+
+class Layer;
+namespace xoj::view {
+class Context;
+
+class LayerView {
+public:
+    LayerView(const Layer* layer);
+
+    /**
+     * @brief Draws the entire Layer
+     */
+    void draw(const Context& ctx) const;
+
+    const Layer* getLayer() const;
+
+private:
+    const Layer* layer;
+};
+};  // namespace xoj::view
diff --git a/entry/src/main/cpp/src/core/view/Mask.cpp b/entry/src/main/cpp/src/core/view/Mask.cpp
new file mode 100644
index 0000000..682812d
--- /dev/null
+++ b/entry/src/main/cpp/src/core/view/Mask.cpp
@@ -0,0 +1,211 @@
+#include "Mask.h"
+
+#include <iostream>
+
+#include <cairo.h>
+
+#include "util/Assert.h"
+#include "util/Range.h"
+#include "util/safe_casts.h"  // for ceil_cast, floor_cast
+
+#include "config-debug.h"
+
+using namespace xoj::view;
+
+#ifdef DEBUG_MASKS
+#include <string>
+namespace {  // cairo helper functions, for handling various surface types
+std::string getSurfaceTypeName(cairo_surface_t*);
+};
+#define IF_DBG_MASKS(f) f
+#else
+#define IF_DBG_MASKS(f)
+#endif
+
+Mask::Mask(cairo_surface_t* target, const Range& extent, double zoom, cairo_content_t contentType):
+        xOffset(floor_cast<int>(extent.minX * zoom)), yOffset(floor_cast<int>(extent.minY * zoom)), zoom(zoom) {
+    constructorImpl(target, extent, zoom, contentType);
+}
+
+Mask::Mask(int DPIScaling, const Range& extent, double zoom, cairo_content_t contentType):
+        xOffset(floor_cast<int>(extent.minX * zoom)), yOffset(floor_cast<int>(extent.minY * zoom)), zoom(zoom) {
+    constructorImpl(DPIScaling, extent, zoom, contentType);
+}
+
+template <typename DPIInfoType>
+class SurfaceCreator {};
+template <>
+class SurfaceCreator<cairo_surface_t*> {
+public:
+    static constexpr auto create = [](cairo_surface_t* other, cairo_content_t content, int width,
+                                      int height) -> cairo_surface_t* {
+        return cairo_surface_create_similar(other, content, width, height);
+    };
+};
+template <>
+class SurfaceCreator<int> {
+public:
+    static cairo_surface_t* create(int DPIScaling, cairo_content_t contentType, int width, int height) {
+        cairo_surface_t* surf =
+                cairo_image_surface_create(contentType == CAIRO_CONTENT_ALPHA ? CAIRO_FORMAT_A8 : CAIRO_FORMAT_ARGB32,
+                                           width * DPIScaling, height * DPIScaling);
+        cairo_surface_set_device_scale(surf, DPIScaling, DPIScaling);
+        return surf;
+    }
+};
+
+template <typename DPIInfoType>
+void Mask::constructorImpl(DPIInfoType dpiInfo, const Range& extent, double zoom, cairo_content_t contentType) {
+    xoj_assert(dpiInfo);
+    xoj_assert_message(extent.isValid(), std::string("Invalid range in Mask(): X  ") + std::to_string(extent.minX) +
+                                                 " -- " + std::to_string(extent.maxX) +
+                                                 "\n                             Y  " + std::to_string(extent.minY) +
+                                                 " -- " + std::to_string(extent.maxY));
+    xoj_assert(zoom > 0.0);
+
+    const int width = ceil_cast<int>(extent.maxX * zoom) - xOffset;
+    const int height = ceil_cast<int>(extent.maxY * zoom) - yOffset;
+
+    /*
+     * Create the most suitable kind of surface.
+     *
+     * Note that width and height are in device space coordinates (i.e. before DPI scaling).
+     * If `dpiInfo` asks for a device scaling, then the number of pixels in the resulting surface will be multiplied
+     * accordingly, and the scaling is applied to the new surface.
+     */
+    cairo_surface_t* surf = SurfaceCreator<DPIInfoType>::create(dpiInfo, contentType, width, height);
+
+    IF_DBG_MASKS({
+        std::cout << "Creating mask of type: " << getSurfaceTypeName(surf) << std::endl;
+        std::cout << "  Its size: " << width << " x " << height << " (in device space)" << std::endl;
+        double x;
+        double y;
+        cairo_surface_get_device_scale(surf, &x, &y);
+        std::cout << "  Its DPI scaling: " << x << " x " << y << std::endl;
+    });
+
+    this->cr.reset(cairo_create(surf), xoj::util::adopt);
+    cairo_surface_destroy(surf);  // surf is now owned by this->cr
+
+    cairo_translate(this->cr.get(), -xOffset, -yOffset);
+    cairo_scale(this->cr.get(), zoom, zoom);
+
+    IF_DBG_MASKS({
+        xoj::util::CairoSaveGuard saveGuard(cr.get());
+        cairo_set_operator(cr.get(), CAIRO_OPERATOR_OVER);
+        cairo_set_source_rgba(cr.get(), 1.0, 0.0, 0.0, 0.3);
+        cairo_paint(cr.get());
+    });
+}
+
+auto Mask::get() -> cairo_t* { return cr.get(); }
+
+bool Mask::isInitialized() const { return cr; }
+
+void Mask::blitTo(cairo_t* targetCr) const {
+    xoj_assert(isInitialized());
+    xoj::util::CairoSaveGuard guard(targetCr);
+    cairo_scale(targetCr, 1. / zoom, 1. / zoom);
+    cairo_mask_surface(targetCr, cairo_get_target(const_cast<cairo_t*>(cr.get())), xOffset, yOffset);
+}
+
+void Mask::paintTo(cairo_t* targetCr) const {
+    xoj_assert(isInitialized());
+    xoj::util::CairoSaveGuard guard(targetCr);
+    cairo_scale(targetCr, 1. / zoom, 1. / zoom);
+    cairo_set_source_surface(targetCr, cairo_get_target(const_cast<cairo_t*>(cr.get())), xOffset, yOffset);
+    cairo_paint(targetCr);
+}
+
+void Mask::paintToWithAlpha(cairo_t* targetCr, uint8_t alpha) const {
+    xoj_assert(isInitialized());
+    xoj::util::CairoSaveGuard guard(targetCr);
+    cairo_scale(targetCr, 1. / zoom, 1. / zoom);
+    cairo_set_source_surface(targetCr, cairo_get_target(const_cast<cairo_t*>(cr.get())), xOffset, yOffset);
+    cairo_paint_with_alpha(targetCr, alpha / 255.0);
+}
+
+void Mask::wipe() {
+    xoj_assert(isInitialized());
+    xoj::util::CairoSaveGuard saveGuard(cr.get());
+    cairo_set_operator(cr.get(), CAIRO_OPERATOR_CLEAR);
+    cairo_paint(cr.get());
+    IF_DBG_MASKS({
+        cairo_set_operator(cr.get(), CAIRO_OPERATOR_OVER);
+        cairo_set_source_rgba(cr.get(), 1.0, 0.0, 0.0, 0.3);
+        cairo_paint(cr.get());
+    });
+}
+
+void Mask::wipeRange(const Range& rg) {
+    xoj_assert(isInitialized());
+    xoj::util::CairoSaveGuard saveGuard(cr.get());
+    cairo_rectangle(cr.get(), rg.minX, rg.minY, rg.getWidth(), rg.getHeight());
+    cairo_clip(cr.get());
+    wipe();
+}
+
+void Mask::reset() { cr.reset(); }
+
+#ifdef DEBUG_MASKS
+namespace {
+auto getSurfaceTypeName(cairo_surface_t* surf) -> std::string {
+    auto surftype = cairo_surface_get_type(surf);
+    switch (surftype) {
+        // Strings from https://cairographics.org/manual/cairo-cairo-surface-t.html#cairo-surface-type-t
+        case CAIRO_SURFACE_TYPE_IMAGE:
+            return "image";
+        case CAIRO_SURFACE_TYPE_PDF:
+            return "pdf";
+        case CAIRO_SURFACE_TYPE_PS:
+            return "ps";
+        case CAIRO_SURFACE_TYPE_XLIB:
+            return "xlib";
+        case CAIRO_SURFACE_TYPE_XCB:
+            return "xcb";
+        case CAIRO_SURFACE_TYPE_GLITZ:
+            return "glitz";
+        case CAIRO_SURFACE_TYPE_QUARTZ:
+            return "quartz";
+        case CAIRO_SURFACE_TYPE_WIN32:
+            return "win32";
+        case CAIRO_SURFACE_TYPE_BEOS:
+            return "beos";
+        case CAIRO_SURFACE_TYPE_DIRECTFB:
+            return "directfb";
+        case CAIRO_SURFACE_TYPE_SVG:
+            return "svg";
+        case CAIRO_SURFACE_TYPE_OS2:
+            return "os2";
+        case CAIRO_SURFACE_TYPE_WIN32_PRINTING:
+            return "win32 printing surface";
+        case CAIRO_SURFACE_TYPE_QUARTZ_IMAGE:
+            return "quartz_image";
+        case CAIRO_SURFACE_TYPE_SCRIPT:
+            return "script";
+        case CAIRO_SURFACE_TYPE_QT:
+            return "Qt";
+        case CAIRO_SURFACE_TYPE_RECORDING:
+            return "recording";
+        case CAIRO_SURFACE_TYPE_VG:
+            return "OpenVG surface";
+        case CAIRO_SURFACE_TYPE_GL:
+            return "OpenGL";
+        case CAIRO_SURFACE_TYPE_DRM:
+            return "Direct Render Manager";
+        case CAIRO_SURFACE_TYPE_TEE:
+            return "'tee' (a multiplexing surface)";
+        case CAIRO_SURFACE_TYPE_XML:
+            return "XML (for debugging)";
+        case CAIRO_SURFACE_TYPE_SKIA:
+            return "CAIRO_SURFACE_TYPE_SKIA";
+        case CAIRO_SURFACE_TYPE_SUBSURFACE:
+            return "subsurface created with cairo_surface_create_for_rectangle()";
+        case CAIRO_SURFACE_TYPE_COGL:
+            return "Cogl";
+        default:
+            return "Unknown surface type";
+    }
+}
+};  // namespace
+#endif
diff --git a/entry/src/main/cpp/src/core/view/Mask.h b/entry/src/main/cpp/src/core/view/Mask.h
new file mode 100644
index 0000000..a6a7448
--- /dev/null
+++ b/entry/src/main/cpp/src/core/view/Mask.h
@@ -0,0 +1,91 @@
+/*
+ * Xournal++
+ *
+ * Virtual class for showing overlays (e.g. active tools, selections and so on)
+ *
+ * @author Xournal++ Team
+ * https://github.com/xournalpp/xournalpp
+ *
+ * @license GNU GPLv2 or later
+ */
+
+#pragma once
+
+#include <cairo.h>
+#include <gdk/gdk.h>
+
+#include "util/raii/CairoWrappers.h"
+
+class Range;
+
+namespace xoj::view {
+
+/**
+ * @brief Mask class: a cairo surface and its context to draw on, with the later purpose of blitting or using as a
+ * buffer.
+ */
+class Mask {
+public:
+    Mask() = default;
+    /**
+     * @brief Create a mask tailored for the specified target
+     * @param target A cairo surface similar to that on which the mask will be used
+     * @param extent The extent of the mask, in local coordinates (i.e. in the coordinates of the cairo context(s) on
+     * which the mask will be used).
+     * @param zoom The local zoom ratio (zoom ratio of the cairo context(s) on which the mask will be used).
+     * @param contentType The intended content of the mask
+     */
+    Mask(cairo_surface_t* target, const Range& extent, double zoom, cairo_content_t contentType = CAIRO_CONTENT_ALPHA);
+
+    /**
+     * @brief Create a mask tailored for the specified target
+     * @param DPIScaling The DPI scaling of the targeted use monitor
+     * @param extent The extent of the mask, in local coordinates (i.e. in the coordinates of the cairo context(s) on
+     * which the mask will be used).
+     * @param zoom The local zoom ratio (zoom ratio of the cairo context(s) on which the mask will be used).
+     * @param contentType The intended content of the mask
+     */
+    Mask(int DPIScaling, const Range& extent, double zoom, cairo_content_t contentType = CAIRO_CONTENT_ALPHA);
+
+    cairo_t* get();
+    bool isInitialized() const;
+    /**
+     * @brief Use the surface as a mask
+     */
+    void blitTo(cairo_t* targetCr) const;
+    /**
+     * @brief Paint the content of the surface to the target cairo context
+     */
+    void paintTo(cairo_t* targetCr) const;
+    /**
+     * @brief Paint the content of the surface to the target cairo context
+     */
+    void paintToWithAlpha(cairo_t* targetCr, uint8_t alpha) const;
+    /**
+     * @brief Erase all the surface's content
+     */
+    void wipe();
+
+    /**
+     * @brief Erase part the surface's content
+     * @param rg The part to erase, in Page coordinates
+     */
+    void wipeRange(const Range& rg);
+
+    /**
+     * @brief Delete the mask
+     */
+    void reset();
+
+    inline double getZoom() const { return zoom; }
+
+private:
+    template <typename DPIInfoType>
+    void constructorImpl(DPIInfoType dpiInfo, const Range& extent, double zoom, cairo_content_t contentType);
+
+    xoj::util::CairoSPtr cr;
+    int xOffset = 0;
+    int yOffset = 0;
+    double zoom = 1.0;
+};
+};  // namespace xoj::view
diff --git a/entry/src/main/cpp/src/core/view/Repaintable.h b/entry/src/main/cpp/src/core/view/Repaintable.h
new file mode 100644
index 0000000..14c880f
--- /dev/null
+++ b/entry/src/main/cpp/src/core/view/Repaintable.h
@@ -0,0 +1,68 @@
+/*
+ * Xournal++
+ *
+ *
+ *
+ * @author Xournal++ Team
+ * https://github.com/xournalpp/xournalpp
+ *
+ * @license GNU GPLv2 or later
+ */
+#pragma once
+
+class Range;
+class ZoomControl;
+
+namespace xoj::util {
+template <typename T>
+class Rectangle;
+};
+
+namespace xoj::view {
+class OverlayView;
+class ToolView;
+
+class Repaintable {
+public:
+    Repaintable() = default;
+    virtual ~Repaintable() = default;
+
+    Repaintable(const Repaintable&) = delete;
+    Repaintable(Repaintable&&) = delete;
+
+    /**
+     * @brief Get the Repaintable's visible part, in local coordinates
+     * @return A range. It could be empty.
+     */
+    virtual Range getVisiblePart() const = 0;
+
+    // Get the current zoom.
+    virtual double getZoom() const = 0;
+    virtual ZoomControl* getZoomControl() const = 0;
+
+    // Width and height, in local coordinates
+    virtual double getWidth() const = 0;
+    virtual double getHeight() const = 0;
+
+    // Convert a rectangle from local coordinates to global coordinates
+    virtual xoj::util::Rectangle<double> toWindowCoordinates(const xoj::util::Rectangle<double>& r) const = 0;
+
+    /**
+     * @brief Flag a region as dirty. Dirty regions will get redrawn at the next screen refresh.
+     */
+    virtual void flagDirtyRegion(const Range& rg) const = 0;
+
+    /**
+     * @brief Draw the ToolView to the repaintable buffer (if any), remove a tool view and repaint the given range
+     *      Called just before the tool sequence ends and the handler is deleted.
+     */
+    virtual void drawAndDeleteToolView(ToolView* v, const Range& rg) = 0;
+
+    /**
+     * @brief Remove a overlay view and repaint the given range
+     *      The given range is supposed to be big enough so that repainting this area will indeed erase the overlay from
+     * the display
+     */
+    virtual void deleteOverlayView(OverlayView* v, const Range& rg) = 0;
+};
+};  // namespace xoj::view
diff --git a/entry/src/main/cpp/src/core/view/SetsquareView.cpp b/entry/src/main/cpp/src/core/view/SetsquareView.cpp
new file mode 100644
index 0000000..e599a0b
--- /dev/null
+++ b/entry/src/main/cpp/src/core/view/SetsquareView.cpp
@@ -0,0 +1,293 @@
+#include "SetsquareView.h"
+
+#include <algorithm>  // for max, min
+#include <cmath>      // for isnan, sqrt, cos, sin, atan2
+#include <iomanip>
+#include <sstream>
+#include <utility>  // for move
+
+#include <glib.h>  // for g_error, g_warning
+
+#include "model/Setsquare.h"          // for Setsquare
+#include "model/Stroke.h"             // for Stroke
+#include "util/Assert.h"              // for xoj_assert
+#include "util/raii/CairoWrappers.h"  // for CairoSaveGuard
+#include "util/safe_casts.h"          // for floor_cast
+#include "view/Repaintable.h"         // for Repaintable
+#include "view/View.h"                // for Context
+
+#include "StrokeView.h"  // for StrokeView
+
+using namespace xoj::view;
+
+// all lengths are in centimeter
+constexpr double FONT_SIZE = .2;
+constexpr double CIRCLE_RAD = .3;
+constexpr double TICK_SMALL = .1;
+constexpr double TICK_LARGE = .2;
+constexpr double MAX_HOR_POS_VMARKS = 2.5;
+constexpr int MIN_OFFSET_ANG_MARKS = 2;
+constexpr double RELATIVE_CIRCLE_POS = .75;
+constexpr double RELATIVE_MAX_HOR_POS_VMARKS = .6;
+constexpr double HMARK_POS = 2.;
+constexpr double MIN_DIST_FROM_HMARK = .2;
+constexpr int MIN_VMARK_SMALL = 3;
+constexpr int MIN_VMARK_LARGE = 5;
+constexpr int OFFSET_FROM_SEMICIRCLE = 2.;
+constexpr double ZERO_MARK_TICK = .5;
+constexpr int SKIPPED_HMARKS = 8;
+constexpr const char* FONT_FAMILY = "Arial";
+
+SetsquareView::SetsquareView(const Setsquare* setsquare, Repaintable* parent, ZoomControl* zoomControl):
+        GeometryToolView(setsquare, parent, zoomControl) {
+    this->registerToPool(setsquare->getViewPool());
+}
+
+SetsquareView::~SetsquareView() noexcept { this->unregisterFromPool(); };
+
+void SetsquareView::on(FlagDirtyRegionRequest, const Range& rg) { this->parent->flagDirtyRegion(rg); }
+
+void SetsquareView::on(UpdateValuesRequest, double h, double rot, cairo_matrix_t m) {
+    xoj_assert_message(h > 0, "Non-positive setsquare height");
+    height = h;
+    rotation = rot;
+    matrix = m;
+    radius = Setsquare::radiusFromHeight(height);
+    circlePos = height * RELATIVE_CIRCLE_POS;
+    horPosVmarks = std::min(MAX_HOR_POS_VMARKS, radius * RELATIVE_MAX_HOR_POS_VMARKS);
+    minVmark = (std::abs(horPosVmarks - HMARK_POS - TICK_SMALL / 2.) < MIN_DIST_FROM_HMARK - TICK_SMALL / 2.) ?
+                       MIN_VMARK_LARGE :
+                       MIN_VMARK_SMALL;
+    maxVmark = floor_cast<int>(cathete(radius, horPosVmarks) * 10.0) - OFFSET_FROM_SEMICIRCLE;
+
+    // The following computation of the angular marks offset is based on experimentation.
+    offset = std::max(MIN_OFFSET_ANG_MARKS,
+                      static_cast<int>(256.0 / std::pow(height, 2)));  // larger offset for small height
+    if (std ::abs(radius - std::round(radius)) < .2) {  // larger offset when semicircle comes close to big hmarks
+        offset = std::max(offset, static_cast<int>(24.0 / radius));
+    }
+    maxHmark = floor_cast<int>(height * 10.0) - SKIPPED_HMARKS;
+}
+
+void SetsquareView::deleteOn(SetsquareView::FinalizationRequest, const Range& rg) {
+    this->parent->drawAndDeleteToolView(this, rg);
+}
+
+void SetsquareView::drawGeometryTool(cairo_t* cr) const {
+    xoj::util::CairoSaveGuard saveGuard(cr);
+    cairo_scale(cr, CM, CM);
+
+    cairo_set_line_width(cr, LINE_WIDTH_IN_CM);
+    cairo_set_fill_rule(cr, CAIRO_FILL_RULE_EVEN_ODD);
+    cairo_select_font_face(cr, FONT_FAMILY, CAIRO_FONT_SLANT_NORMAL, CAIRO_FONT_WEIGHT_NORMAL);
+    cairo_set_font_size(cr, FONT_SIZE);
+
+    // clip to slightly enlarged setsquare for performance reasons
+    const double enlargedHeight = this->height + LINE_WIDTH_IN_CM;
+    cairo_move_to(cr, enlargedHeight, -LINE_WIDTH_IN_CM);
+    cairo_line_to(cr, -enlargedHeight, -LINE_WIDTH_IN_CM);
+    cairo_line_to(cr, .0, enlargedHeight);
+    cairo_close_path(cr);
+    cairo_clip(cr);
+
+    cairo_set_source_rgb(cr, 1., .0, .0);  // red
+    drawOutline(cr);
+
+    cairo_set_source_rgb(cr, .0, .0, 1.);  // blue
+    drawHorizontalMarks(cr);
+
+    cairo_set_source_rgb(cr, .0, .5, .0);  // green
+    drawVerticalMarks(cr);
+
+    cairo_set_source_rgb(cr, .5, .0, .5);  // violet
+    drawAngularMarks(cr);
+}
+
+void SetsquareView::drawDisplays(cairo_t* cr) const {
+    xoj::util::CairoSaveGuard saveGuard(cr);
+    cairo_transform(cr, &matrix);
+    cairo_set_line_width(cr, LINE_WIDTH_IN_CM);
+    cairo_select_font_face(cr, FONT_FAMILY, CAIRO_FONT_SLANT_NORMAL, CAIRO_FONT_WEIGHT_NORMAL);
+    cairo_set_font_size(cr, FONT_SIZE);
+
+    cairo_set_source_rgb(cr, .0, .5, .5);  // turquoise
+    drawRotation(cr);
+}
+
+void SetsquareView::drawOutline(cairo_t* cr) const {
+    xoj::util::CairoSaveGuard saveGuard(cr);
+    cairo_move_to(cr, this->height, .0);
+    cairo_line_to(cr, -this->height, .0);
+    cairo_line_to(cr, .0, this->height);
+    cairo_close_path(cr);
+    cairo_stroke_preserve(cr);
+
+    cairo_set_source_rgba(cr, .2, .2, .2, .1);  // transparent gray
+    cairo_fill(cr);
+}
+
+void SetsquareView::drawRotation(cairo_t* cr) const {
+    xoj::util::CairoSaveGuard saveGuard(cr);
+
+    // write the angle between hypotenuse and horizontal axis within a small circle
+    std::stringstream ss;
+    ss << std::fixed << std::setprecision(1) << std::abs(std::remainder(deg(this->rotation), 180.));
+    cairo_move_to(cr, .0, this->circlePos);
+    showTextCenteredAndRotated(cr, ss.str(), -deg(this->rotation));
+
+    cairo_move_to(cr, .0, this->circlePos);
+    cairo_new_sub_path(cr);
+    cairo_arc(cr, .0, this->circlePos, CIRCLE_RAD, .0, 2. * M_PI);
+    cairo_stroke(cr);
+}
+
+void SetsquareView::drawAngularMarks(cairo_t* cr) const {
+    xoj::util::CairoSaveGuard saveGuard(cr);
+    // BEGIN: 45 degree marks
+    clipHorizontalStripes(cr);
+    clipVerticalStripes(cr);
+
+    for (int i: {45, 135}) {
+        const double cs = std::cos(rad(i));
+        const double si = std::sin(rad(i));
+
+        // inside semicircle
+        const double radInsideUpper = this->radius - .3;  // 4.2
+        cairo_move_to(cr, cs, si);
+        cairo_line_to(cr, radInsideUpper * cs, radInsideUpper * si);
+
+        // outside semicircle
+        const double radOutsideLower = this->radius + .3;                  // 4.8
+        const double radOutsideUpper = this->height / std::sqrt(2.) - .3;  // 5.4
+        cairo_move_to(cr, radOutsideLower * cs, radOutsideLower * si);
+        cairo_line_to(cr, radOutsideUpper * cs, radOutsideUpper * si);
+    }
+    cairo_stroke(cr);
+    cairo_reset_clip(cr);
+    // END: 45 degree marks
+
+    // BEGIN: marks and numbers around semicircle
+    for (int i = 1; i < 180; i++) {
+        // the radius corresponding to the point with angle i on one of the short sides of the setsquare
+        // it is computed using the law of sines
+        const double radCath = this->height * std::sin(rad(45)) / std::sin(rad(i > 90 ? i - 45 : 135 - i));
+        const double cs = std::cos(rad(i));
+        const double si = std::sin(rad(i));
+        const double tick = (i % 5 == 0) ? TICK_LARGE : TICK_SMALL;
+        cairo_move_to(cr, radCath * cs, radCath * si);  // move to one of the short sides of the set square
+        if (i % 10 == 0 && i > this->offset && i < 180 - this->offset) {
+            // large tick near short side of set square
+            const double radTickEnd = (i == 90) ? (this->circlePos + .5) : (this->radius + .8);
+            cairo_line_to(cr, radTickEnd * cs, radTickEnd * si);
+
+            // show increasing numbers near semi-circle
+            const double radInc = this->radius + 0.3;
+            cairo_move_to(cr, radInc * cs, radInc * si);
+            showTextCenteredAndRotated(cr, std::to_string(i), i + 270);
+
+            // show decreasing numbers a bit further from semi-circle
+            if (i != 90) {
+                const double radDec = this->radius + 0.6;
+                cairo_move_to(cr, radDec * cs, radDec * si);
+                showTextCenteredAndRotated(cr, std::to_string(180 - i), i + 270);
+            }
+        } else {
+            cairo_rel_line_to(cr, -tick * cs, -tick * si);  // just a tick near short side of set square
+        }
+
+        if (i > this->offset && i < 180 - this->offset) {
+            // tick near semi-circle
+            cairo_move_to(cr, this->radius * cs, this->radius * si);
+            cairo_rel_line_to(cr, tick * cs, tick * si);
+        }
+    }
+    cairo_stroke(cr);
+    // END: marks and numbers around semicircle
+}
+
+void SetsquareView::drawVerticalMarks(cairo_t* cr) const {
+    xoj::util::CairoSaveGuard saveGuard(cr);
+    const auto max = this->maxVmark / 10;  // number of full centimeters
+
+    // BEGIN: VERTICAL marks within semicircle
+    clipVerticalStripes(cr);
+
+    // draw vertical marks
+    for (double i = .5; i <= max; i += .5) {
+        const double x = cathete(this->radius - .25, i);
+        cairo_move_to(cr, -x, i);
+        cairo_line_to(cr, x, i);
+        cairo_stroke(cr);
+    }
+    cairo_reset_clip(cr);
+    // END: VERTICAL marks within circle
+
+
+    // BEGIN: vertical measuring marks with numbers
+    for (int i = this->minVmark; i <= this->maxVmark; i++) {
+        const double y = static_cast<double>(i) / 10.;
+        const double tick = (i % 5 == 0) ? TICK_LARGE : TICK_SMALL;
+
+        // marks and numbers (left and right)
+        for (const double sign: {-1., 1.}) {
+            cairo_move_to(cr, sign * this->horPosVmarks, y);
+            cairo_rel_line_to(cr, -sign * tick, .0);
+            if (i % 10 == 0) {
+                const auto text = std::to_string(i / 10);
+                cairo_rel_move_to(cr, -sign * TICK_SMALL, .0);
+                showTextCenteredAndRotated(cr, text, .0);
+            };
+        }
+    }
+    cairo_stroke(cr);
+    // END: vertical measuring marks with numbers
+}
+
+void SetsquareView::drawHorizontalMarks(cairo_t* cr) const {
+    xoj::util::CairoSaveGuard saveGuard(cr);
+    const auto max = this->maxVmark / 10;  // number of full centimeters
+
+    // BEGIN: line indicating horizontal 0
+    for (auto i = 1; i <= max; i++) {
+        cairo_move_to(cr, .0, static_cast<double>(i) - ZERO_MARK_TICK / 2.);
+        cairo_rel_line_to(cr, .0, ZERO_MARK_TICK);
+    }
+    cairo_stroke(cr);
+    // END: line indicating horizontal 0
+
+    // BEGIN: measuring marks on top
+    for (int i = -this->maxHmark; i <= this->maxHmark; i++) {
+        const double tick = (i % 5 == 0) ? TICK_LARGE : TICK_SMALL;
+        // draw marks
+        cairo_move_to(cr, static_cast<double>(i) / 10., .0);
+        cairo_rel_line_to(cr, .0, tick);
+        if (i % 10 == 0) {
+            // draw numbers
+            cairo_rel_move_to(cr, .0, FONT_SIZE / 2.);
+            const auto text = std::to_string(std::abs(i / 10));
+            showTextCenteredAndRotated(cr, text.c_str(), .0);
+        }
+    }
+    cairo_stroke(cr);
+    // END: measuring marks on top
+}
+
+void SetsquareView::clipVerticalStripes(cairo_t* cr) const {
+    // y-coordinate of the highest vertical mark
+    const auto y = static_cast<double>(this->maxVmark) / 10.;
+
+    cairo_rectangle(cr, -this->horPosVmarks - .25, .0, .75, y + .5);          // left stripe
+    cairo_rectangle(cr, this->horPosVmarks - .5, .0, .75, y + .5);            // right stripe
+    cairo_rectangle(cr, -.25, .0, .5, y + .5);                                // middle stripe
+    cairo_rectangle(cr, -this->height, .0, 2. * this->height, this->height);  // clip to the outside
+    cairo_clip(cr);
+}
+
+void SetsquareView::clipHorizontalStripes(cairo_t* cr) const {
+    for (auto i = .5; i <= static_cast<double>(this->maxVmark) / 10.0; i += .5) {
+        double x = cathete(this->radius - .25, i);
+        cairo_rectangle(cr, -x, i - .15, 2. * x, .3);
+    }
+    cairo_rectangle(cr, -this->height, .0, 2. * this->height, this->height);  // clip to the outside
+    cairo_clip(cr);
+}
diff --git a/entry/src/main/cpp/src/core/view/SetsquareView.h b/entry/src/main/cpp/src/core/view/SetsquareView.h
new file mode 100644
index 0000000..84b479c
--- /dev/null
+++ b/entry/src/main/cpp/src/core/view/SetsquareView.h
@@ -0,0 +1,113 @@
+/*
+ * Xournal++
+ *
+ * A setsquare view
+ *
+ * @author Xournal++ Team
+ * https://github.com/xournalpp/xournalpp
+ *
+ * @license GNU GPLv2 or later
+ */
+
+#pragma once
+
+#include <cmath>
+
+#include <cairo.h>  // for cairo_t
+
+#include "model/Setsquare.h"  // for Setsquare
+#include "util/DispatchPool.h"
+#include "view/overlays/BaseStrokeToolView.h"
+
+#include "GeometryToolView.h"
+
+class Stroke;
+class OverlayBase;
+class ZoomControl;
+
+/**
+ * @brief A class that renders a setsquare
+ *
+ * The setsquare has vertical, horizontal and angular marks.
+ * The intersection angle with the x-axis is displayed as well.
+ *
+ * See the file development/documentation/Setsquare_Readme.md for
+ * details how the setsquare is rendered.
+ *
+ * A temporary stroke is displayed when it is created near the
+ * longest side of the setsquare or from a point to the mid point
+ * of the longest side of the setsquare.
+ */
+
+namespace xoj::view {
+class Repaintable;
+
+class SetsquareView: public GeometryToolView {
+
+public:
+    SetsquareView(const Setsquare* s, Repaintable* parent, ZoomControl* zoomControl);
+    ~SetsquareView() noexcept override;
+
+    void on(FlagDirtyRegionRequest, const Range& rg) override;
+    void on(UpdateValuesRequest, double h, double rot, cairo_matrix_t m) override;
+    void deleteOn(FinalizationRequest, const Range& rg) override;
+
+private:
+    void drawGeometryTool(cairo_t* cr) const override;
+    void drawDisplays(cairo_t* cr) const override;
+
+    double height = Setsquare::INITIAL_HEIGHT;
+    double rotation = 0.;
+    cairo_matrix_t matrix{CM, 0., 0., CM, 0., 0.};
+
+
+    /**
+     * @brief the radius of the semi-circle for the angular marks
+     */
+    double radius = 4.5;
+
+    /**
+     * @brief the distance of the circle containing the rotation angle display from the mid point of the longest side of
+     * the setsquare
+     */
+    double circlePos = 6.0;
+
+    /**
+     * @brief the distance (in cm) of the vertical marks from the symmetry axis of the setsquare
+     */
+    double horPosVmarks = 2.5;
+
+    /**
+     * @brief the index of the first vertical mark which should be drawn (which should not overlap with the measuring
+     * marks)
+     */
+    int minVmark = 3;
+
+    /**
+     * @brief the index of the last vertical mark to be drawn
+     */
+    int maxVmark = 35;
+
+    /**
+     * @brief the number of angular marks that are left away on both ends (in order not to overlap with the measuring
+     * marks)
+     */
+    int offset = 4;
+
+    /**
+     * @brief the index of the last horizontal mark to be drawn
+     */
+    int maxHmark = 70;
+
+    void drawVerticalMarks(cairo_t* cr) const;
+    void drawHorizontalMarks(cairo_t* cr) const;
+    void drawAngularMarks(cairo_t* cr) const;
+    void drawOutline(cairo_t* cr) const;
+    void drawRotation(cairo_t* cr) const;
+    void clipVerticalStripes(cairo_t* cr) const;
+    void clipHorizontalStripes(cairo_t* cr) const;
+
+public:
+    static constexpr double LINE_WIDTH_IN_CM = .02;
+};
+};  // namespace xoj::view
diff --git a/entry/src/main/cpp/src/core/view/StrokeView.cpp b/entry/src/main/cpp/src/core/view/StrokeView.cpp
new file mode 100644
index 0000000..6b20d9a
--- /dev/null
+++ b/entry/src/main/cpp/src/core/view/StrokeView.cpp
@@ -0,0 +1,169 @@
+#include "StrokeView.h"
+
+#include <algorithm>  // for max
+#include <cmath>      // for ceil
+
+#include <glib.h>  // for g_warning
+
+#include "model/Stroke.h"    // for Stroke, StrokeTool::HIGHLIGHTER
+#include "util/Assert.h"     // for xoj_assert
+#include "util/Color.h"      // for cairo_set_source_rgbi
+#include "util/Rectangle.h"  // for Rectangle
+#include "view/Mask.h"       // for Mask
+#include "view/View.h"       // for Context, OPACITY_NO_AUDIO, view
+
+#include "ErasableStrokeView.h"  // for ErasableStrokeView
+#include "StrokeViewHelper.h"
+#include "filesystem.h"  // for path
+
+class ErasableStroke;
+
+using xoj::util::Rectangle;
+using namespace xoj::view;
+
+StrokeView::StrokeView(const Stroke* s): s(s) {}
+
+void StrokeView::draw(const Context& ctx) const {
+
+    if (s->getPointCount() < 2) {
+        // Should not happen
+        g_warning("View::StrokeView::draw empty stroke...");
+        return;
+    }
+
+    const bool highlighter = s->getToolType() == StrokeTool::HIGHLIGHTER;
+    const bool filledHighlighter = highlighter && s->getFill() != -1;
+    const bool drawTranslucent = ctx.fadeOutNonAudio && s->getAudioFilename().empty();
+    const bool useMask = (!ctx.noColor && filledHighlighter) || drawTranslucent;
+
+    if (ctx.showCurrentEdition && filledHighlighter && s->getErasable() != nullptr) {
+        // Currently being erased filled highlighter strokes need a special treatment
+        ErasableStrokeView erasableStrokeView(*s->getErasable());
+        erasableStrokeView.paintFilledHighlighter(ctx.cr);
+        return;
+    }
+
+    // The mask will be colorblind
+    const bool noColor = ctx.noColor || useMask;
+
+    xoj::util::CairoSaveGuard saveGuard(ctx.cr);
+
+    Mask mask;
+
+    // If not using a mask, draw directly onto the given cairo context
+    cairo_t* cr = ctx.cr;
+
+    if (useMask) {
+        /**
+         * To avoid visual glitches when different translucent cairo_stroke are painted,
+         * they are painted without colors to a mask which will in turn be blitted (see below)
+         */
+
+        /**
+         * Infer the zoom level from context.
+         */
+        cairo_matrix_t matrix;
+        cairo_get_matrix(ctx.cr, &matrix);
+        // We assume the matrix is diagonal (i.e. only scaling, no rotation)
+        xoj_assert(matrix.xy == 0 && matrix.yx == 0);
+
+        const double zoom = std::max(matrix.xx, matrix.yy);
+
+        /**
+         * Create a mask tailored to the stroke's bounding box
+         */
+        mask = Mask(cairo_get_target(ctx.cr), Range(s->boundingRect()), zoom);
+        cr = mask.get();
+    }
+
+    cairo_set_line_join(cr, CAIRO_LINE_JOIN_ROUND);
+    cairo_set_line_cap(cr, CAIRO_LINE_CAP[s->getStrokeCapStyle()]);
+
+    if (auto fill = s->getFill(); fill != -1) {
+        /**
+         * Paint the filling
+         */
+        if (noColor) {
+            // Painting on an Alpha-only mask. No need for colors.
+            if (filledHighlighter) {
+                cairo_set_source_rgba(cr, 1, 1, 1, 1);
+            } else {
+                cairo_set_source_rgba(cr, 1, 1, 1, static_cast<double>(fill) / 255.0);
+            }
+        } else {
+            Util::cairo_set_source_rgbi(cr, s->getColor(), static_cast<double>(fill) / 255.0);
+        }
+        cairo_set_operator(cr, useMask ? CAIRO_OPERATOR_SOURCE : CAIRO_OPERATOR_OVER);
+
+        if (ErasableStroke* erasable = s->getErasable(); erasable != nullptr && ctx.showCurrentEdition) {
+            // don't render erasable for previews
+            ErasableStrokeView erasableStrokeView(*erasable);
+            erasableStrokeView.drawFilling(cr);
+        } else {
+            StrokeViewHelper::pathToCairo(cr, s->getPointVector());
+            cairo_fill(cr);
+        }
+    }
+
+    /**
+     * Picking the colors and alpha values, and the operator
+     */
+    if (noColor) {
+        /**
+         * No color: painting onto an alpha mask. Colors will be applied upon blitting.
+         */
+        cairo_set_source_rgba(cr, 1, 1, 1, 1);
+        cairo_set_operator(cr, CAIRO_OPERATOR_SOURCE);
+    } else if (highlighter) {
+        /**
+         * Highlighter without filling.
+         */
+        Util::cairo_set_source_rgbi(cr, s->getColor(), OPACITY_HIGHLIGHTER);
+        cairo_set_operator(cr, CAIRO_OPERATOR_MULTIPLY);
+    } else {
+        /**
+         * Normal pen
+         */
+        Util::cairo_set_source_rgbi(cr, s->getColor());
+        cairo_set_operator(cr, CAIRO_OPERATOR_SOURCE);
+    }
+
+    if (ErasableStroke* erasable = s->getErasable(); erasable != nullptr && ctx.showCurrentEdition) {
+        // don't render erasable for previews
+        ErasableStrokeView erasableStrokeView(*erasable);
+        erasableStrokeView.draw(cr);
+    } else if (s->hasPressure() && !highlighter) {
+        StrokeViewHelper::drawWithPressure(cr, s->getPointVector(), s->getLineStyle());
+    } else {
+        StrokeViewHelper::drawNoPressure(cr, s->getPointVector(), s->getWidth(), s->getLineStyle());
+    }
+
+    if (useMask) {
+        /**
+         * Blit the mask onto the target cairo context.
+         */
+
+        /**
+         * Opacity for the mask's content: the base value depends on the tool:
+         * Pen                     : 1
+         * Highlighter (no filling): OPACITY_HIGHLIGHTER
+         * Highlighter (filled)    : s->getFill() / 255
+         */
+        double groupAlpha =
+                highlighter ? (filledHighlighter ? static_cast<double>(s->getFill()) / 255.0 : OPACITY_HIGHLIGHTER) :
+                              1.0;
+
+        // If the stroke has no audio attached, we draw it (even more) translucent
+        if (drawTranslucent) {
+            groupAlpha *= OPACITY_NO_AUDIO;
+            groupAlpha = std::max(MINIMAL_ALPHA, groupAlpha);
+        }
+
+        // Blit the mask onto the given cairo context
+        cairo_set_operator(ctx.cr, highlighter ? CAIRO_OPERATOR_MULTIPLY : CAIRO_OPERATOR_OVER);
+
+        Util::cairo_set_source_rgbi(ctx.cr, s->getColor(), groupAlpha);
+
+        mask.blitTo(ctx.cr);
+    }
+}
diff --git a/entry/src/main/cpp/src/core/view/StrokeView.h b/entry/src/main/cpp/src/core/view/StrokeView.h
new file mode 100644
index 0000000..6d18449
--- /dev/null
+++ b/entry/src/main/cpp/src/core/view/StrokeView.h
@@ -0,0 +1,45 @@
+/*
+ * Xournal++
+ *
+ * Draw stroke
+ *
+ * @author Xournal++ Team
+ * https://github.com/xournalpp/xournalpp
+ *
+ * @license GNU GPLv2 or later
+ */
+
+#pragma once
+
+#include <cairo.h>  // for cairo_t, CAIRO_LINE_CAP_BUTT, CAIRO_LINE_CAP_ROUND
+
+#include "View.h"  // for ElementView
+
+class Stroke;
+
+class xoj::view::StrokeView: public xoj::view::ElementView {
+public:
+    StrokeView(const Stroke* s);
+    ~StrokeView() = default;
+
+public:
+    /**
+     * @brief Paint the given stroke.
+     * @param dontRenderEditingStroke If true, and if the stroke is currently being (partially) erased, then render only
+     * the not-yet-erased parts. (Typically set to true, except for previews and export jobs)
+     * @param markAudioStroke If true, the stroke is faded out if it has no audio playback attached.
+     * @param noColor If true, paint as if on a colorblind mask (only the alpha values are painted).
+     */
+    void draw(const Context& ctx) const override;
+
+private:
+    const Stroke* s;
+
+public:
+    static constexpr double OPACITY_HIGHLIGHTER = 0.47;
+    static constexpr double MINIMAL_ALPHA = 0.04;
+
+    //  Must match the enum StrokeCapStyle in Stroke.h
+    static constexpr cairo_line_cap_t CAIRO_LINE_CAP[] = {CAIRO_LINE_CAP_ROUND, CAIRO_LINE_CAP_BUTT,
+                                                          CAIRO_LINE_CAP_SQUARE};
+};
diff --git a/entry/src/main/cpp/src/core/view/StrokeViewHelper.cpp b/entry/src/main/cpp/src/core/view/StrokeViewHelper.cpp
new file mode 100644
index 0000000..ccce5e6
--- /dev/null
+++ b/entry/src/main/cpp/src/core/view/StrokeViewHelper.cpp
@@ -0,0 +1,73 @@
+#include "StrokeViewHelper.h"
+
+#include "model/LineStyle.h"
+#include "model/Point.h"
+#include "model/StrokeContour.h"
+#include "util/Assert.h"
+#include "util/LoopUtil.h"
+#include "util/PairView.h"
+#include "util/Util.h"  // for cairo_set_dash_from_vector
+
+void xoj::view::StrokeViewHelper::pathToCairo(cairo_t* cr, const std::vector<Point>& pts) {
+    for_first_then_each(
+            pts, [cr](auto const& first) { cairo_move_to(cr, first.x, first.y); },
+            [cr](auto const& other) { cairo_line_to(cr, other.x, other.y); });
+}
+
+/**
+ * No pressure sensitivity, one line is drawn
+ */
+void xoj::view::StrokeViewHelper::drawNoPressure(cairo_t* cr, const std::vector<Point>& pts, const double strokeWidth,
+                                                 const LineStyle& lineStyle, double dashOffset) {
+    cairo_set_line_width(cr, strokeWidth);
+
+    const auto& dashes = lineStyle.getDashes();
+    Util::cairo_set_dash_from_vector(cr, dashes, dashOffset);
+
+    pathToCairo(cr, pts);
+    cairo_stroke(cr);
+}
+
+/**
+ * Draw a stroke with pressure, for this multiple lines with different widths needs to be drawn
+ */
+double xoj::view::StrokeViewHelper::drawWithPressure(cairo_t* cr, const std::vector<Point>& pts,
+                                                     const LineStyle& lineStyle, double dashOffset) {
+    const auto& dashes = lineStyle.getDashes();
+    if (cairo_surface_get_type(cairo_get_target(cr)) == CAIRO_SURFACE_TYPE_PDF) {
+        // PDF documents have an equivalent of cairo_stroke(). We use it to get smaller PDF files
+        auto drawSegment = [cr](const Point& p, const Point& q) {
+            xoj_assert(p.z > 0.0);
+            cairo_set_line_width(cr, p.z);
+            cairo_move_to(cr, p.x, p.y);
+            cairo_line_to(cr, q.x, q.y);
+            cairo_stroke(cr);
+        };
+        if (!dashes.empty()) {
+            /*
+             * Because the width varies, we need to call cairo_stroke() once per segment
+             */
+            for (const auto& [p, q]: PairView(pts)) {
+                Util::cairo_set_dash_from_vector(cr, dashes, dashOffset);
+                dashOffset += p.lineLengthTo(q);
+                drawSegment(p, q);
+            }
+        } else {
+            cairo_set_dash(cr, nullptr, 0, 0.0);
+            for (const auto& [p, q]: PairView(pts)) {
+                drawSegment(p, q);
+            };
+        }
+    } else {
+        if (pts.size() == 2 && pts.front().equalsPos(pts.back())) {
+            // Single dot
+            cairo_arc(cr, pts.front().x, pts.front().y, .5 * pts.front().z, 0, 2. * M_PI);
+        } else if (!dashes.empty()) {
+            dashOffset = StrokeContourDashes(pts, dashes).addToCairo(cr, dashOffset);
+        } else {
+            StrokeContour(pts).addToCairo(cr);
+        }
+        cairo_fill(cr);
+    }
+    return dashOffset;
+}
diff --git a/entry/src/main/cpp/src/core/view/StrokeViewHelper.h b/entry/src/main/cpp/src/core/view/StrokeViewHelper.h
new file mode 100644
index 0000000..f32ef9f
--- /dev/null
+++ b/entry/src/main/cpp/src/core/view/StrokeViewHelper.h
@@ -0,0 +1,40 @@
+/*
+ * Xournal++
+ *
+ * Draw stroke
+ *
+ * @author Xournal++ Team
+ * https://github.com/xournalpp/xournalpp
+ *
+ * @license GNU GPLv2 or later
+ */
+
+#pragma once
+
+#include <vector>
+
+#include <cairo.h>
+
+class LineStyle;
+class Point;
+
+namespace xoj::view::StrokeViewHelper {
+
+/**
+ * @brief Simply adds the points to a cairo context, as a single path
+ */
+void pathToCairo(cairo_t* cr, const std::vector<Point>& pts);
+
+/**
+ * @brief No pressure sensitivity, one line is drawn, with given width and line style (dashes)
+ */
+void drawNoPressure(cairo_t* cr, const std::vector<Point>& pts, const double strokeWidth, const LineStyle& lineStyle,
+                    double dashOffset = 0);
+
+/**
+ * @brief Draw a stroke with pressure, for this multiple lines with different widths needs to be drawn.
+ * @return New dash offset, if one wants to keep on drawing the same stroke.
+ *      Effectively, the return value equals dashOffset + length of the path.
+ */
+double drawWithPressure(cairo_t* cr, const std::vector<Point>& pts, const LineStyle& lineStyle, double dashOffset = 0);
+};  // namespace xoj::view::StrokeViewHelper
diff --git a/entry/src/main/cpp/src/core/view/TexImageView.cpp b/entry/src/main/cpp/src/core/view/TexImageView.cpp
new file mode 100644
index 0000000..9d72ebf
--- /dev/null
+++ b/entry/src/main/cpp/src/core/view/TexImageView.cpp
@@ -0,0 +1,92 @@
+#include "TexImageView.h"
+
+#include <string>  // for string
+
+#include <cairo.h>             // for cairo_paint_with_alpha, cairo_scale
+#include <glib.h>              // for g_warning
+#include <poppler.h>           // for PopplerPage, PopplerDocument, g_clear_...
+
+#include "model/TexImage.h"  // for TexImage
+#include "view/View.h"       // for Context, OPACITY_NO_AUDIO, view
+
+using namespace xoj::view;
+
+TexImageView::TexImageView(const TexImage* texImage): texImage(texImage) {}
+
+TexImageView::~TexImageView() = default;
+
+void TexImageView::draw(const Context& ctx) const {
+
+    cairo_t* cr = ctx.cr;
+    cairo_save(cr);
+
+    PopplerDocument* pdf = texImage->getPdf();
+    cairo_surface_t* img = texImage->getImage();
+
+    if (pdf != nullptr) {
+        if (poppler_document_get_n_pages(pdf) < 1) {
+            g_warning("Got latex PDF without pages!: %s", texImage->getText().c_str());
+            return;
+        }
+
+        PopplerPage* page = poppler_document_get_page(pdf, 0);
+
+        double pageWidth = 0;
+        double pageHeight = 0;
+        poppler_page_get_size(page, &pageWidth, &pageHeight);
+
+        double xFactor = texImage->getElementWidth() / pageWidth;
+        double yFactor = texImage->getElementHeight() / pageHeight;
+
+        cairo_set_operator(cr, CAIRO_OPERATOR_OVER);
+        cairo_translate(cr, texImage->getX(), texImage->getY());
+        cairo_scale(cr, xFactor, yFactor);
+
+        auto surfType = cairo_surface_get_type(cairo_get_target(cr));
+        auto pageRenderFunction =
+                surfType == CAIRO_SURFACE_TYPE_PDF || surfType == CAIRO_SURFACE_TYPE_PS ||
+                                surfType == CAIRO_SURFACE_TYPE_SVG || surfType == CAIRO_SURFACE_TYPE_SCRIPT ||
+                                surfType == CAIRO_SURFACE_TYPE_WIN32_PRINTING || surfType == CAIRO_SURFACE_TYPE_XML ||
+                                surfType == CAIRO_SURFACE_TYPE_RECORDING ?
+                        poppler_page_render_for_printing :
+                        poppler_page_render;
+
+        // Make TeX images translucent when highlighting audio strokes as they can not have audio
+        if (ctx.fadeOutNonAudio) {
+            /**
+             * Switch to a temporary surface, render the page, then switch back.
+             * This sets the current pattern to the temporary surface.
+             */
+            cairo_push_group(cr);
+            pageRenderFunction(page, cr);
+            cairo_pop_group_to_source(cr);
+
+            // paint the temporary surface with opacity level
+            cairo_paint_with_alpha(cr, OPACITY_NO_AUDIO);
+        } else {
+            pageRenderFunction(page, cr);
+        }
+
+        g_clear_object(&page);
+    } else if (img != nullptr) {
+        int width = cairo_image_surface_get_width(img);
+        int height = cairo_image_surface_get_height(img);
+
+        cairo_set_operator(cr, CAIRO_OPERATOR_OVER);
+
+        double xFactor = texImage->getElementWidth() / width;
+        double yFactor = texImage->getElementHeight() / height;
+
+        cairo_scale(cr, xFactor, yFactor);
+
+        cairo_set_source_surface(cr, img, texImage->getX() / xFactor, texImage->getY() / yFactor);
+        // Make TeX images translucent when highlighting audio strokes as they can not have audio
+        if (ctx.fadeOutNonAudio) {
+            cairo_paint_with_alpha(cr, OPACITY_NO_AUDIO);
+        } else {
+            cairo_paint(cr);
+        }
+    }
+
+    cairo_restore(cr);
+}
diff --git a/entry/src/main/cpp/src/core/view/TexImageView.h b/entry/src/main/cpp/src/core/view/TexImageView.h
new file mode 100644
index 0000000..75613fa
--- /dev/null
+++ b/entry/src/main/cpp/src/core/view/TexImageView.h
@@ -0,0 +1,30 @@
+/*
+ * Xournal++
+ *
+ * Displays a TexImage Element
+ *
+ * @author Xournal++ Team
+ * https://github.com/xournalpp/xournalpp
+ *
+ * @license GNU GPLv2 or later
+ */
+
+#pragma once
+
+#include "View.h"
+
+class TexImage;
+
+class xoj::view::TexImageView: public xoj::view::ElementView {
+public:
+    TexImageView(const TexImage* texImage);
+    virtual ~TexImageView();
+
+    /**
+     * Draws a TexImage model
+     */
+    void draw(const Context& ctx) const override;
+
+private:
+    const TexImage* texImage;
+};
diff --git a/entry/src/main/cpp/src/core/view/TextView.cpp b/entry/src/main/cpp/src/core/view/TextView.cpp
new file mode 100644
index 0000000..9c3d546
--- /dev/null
+++ b/entry/src/main/cpp/src/core/view/TextView.cpp
@@ -0,0 +1,53 @@
+#include "TextView.h"
+
+#include <algorithm>  // for max
+#include <cstddef>    // for size_t
+
+#include "model/Text.h"           // for Text
+#include "util/Color.h"           // for cairo_set_source_rgbi
+#include "util/StringUtils.h"     // for StringUtils
+#include "util/raii/CairoWrappers.h"
+#include "util/raii/GObjectSPtr.h"
+#include "view/View.h"            // for Context, OPACITY_NO_AUDIO, view
+
+#include "filesystem.h"  // for path
+
+using namespace xoj::view;
+
+TextView::TextView(const Text* text): text(text) {}
+
+TextView::~TextView() = default;
+
+auto TextView::initPango(cairo_t* cr, const Text* t) -> xoj::util::GObjectSPtr<PangoLayout> {
+    auto layout = t->createPangoLayout();
+    pango_cairo_update_layout(cr, layout.get());
+    pango_context_set_matrix(pango_layout_get_context(layout.get()), nullptr);
+
+    return layout;
+}
+
+void TextView::draw(const Context& ctx) const {
+    if (text->isInEditing()) {
+        // The drawing is handled by gui/TextEditor
+        return;
+    }
+
+    xoj::util::CairoSaveGuard saveGuard(ctx.cr);
+
+    // make elements without audio translucent when highlighting elements with audio
+    if (ctx.fadeOutNonAudio && text->getAudioFilename().empty()) {
+        cairo_set_operator(ctx.cr, CAIRO_OPERATOR_OVER);
+        Util::cairo_set_source_rgbi(ctx.cr, text->getColor(), OPACITY_NO_AUDIO);
+    } else {
+        cairo_set_operator(ctx.cr, CAIRO_OPERATOR_SOURCE);
+        Util::cairo_set_source_rgbi(ctx.cr, text->getColor());
+    }
+
+    cairo_translate(ctx.cr, text->getX(), text->getY());
+
+    auto layout = initPango(ctx.cr, text);
+    const std::string& content = text->getText();
+    pango_layout_set_text(layout.get(), content.c_str(), static_cast<int>(content.length()));
+
+    pango_cairo_show_layout(ctx.cr, layout.get());
+}
diff --git a/entry/src/main/cpp/src/core/view/TextView.h b/entry/src/main/cpp/src/core/view/TextView.h
new file mode 100644
index 0000000..d80c15a
--- /dev/null
+++ b/entry/src/main/cpp/src/core/view/TextView.h
@@ -0,0 +1,42 @@
+/*
+ * Xournal++
+ *
+ * Displays a text Element
+ *
+ * @author Xournal++ Team
+ * https://github.com/xournalpp/xournalpp
+ *
+ * @license GNU GPLv2 or later
+ */
+
+#pragma once
+
+#include <string>  // for string
+#include <vector>  // for vector
+
+#include <pango/pangocairo.h>  // for PangoLayout, cairo_t
+
+#include "util/raii/GObjectSPtr.h"
+
+#include "View.h"  // for ElementView
+
+class Text;
+
+class xoj::view::TextView: public xoj::view::ElementView {
+public:
+    TextView(const Text* t);
+    virtual ~TextView();
+
+    /**
+     * Draws a Text model to a cairo surface
+     */
+    void draw(const Context& ctx) const override;
+
+    /**
+     * Initialize a Pango layout
+     */
+    static xoj::util::GObjectSPtr<PangoLayout> initPango(cairo_t* cr, const Text* t);
+
+private:
+    const Text* text;
+};
diff --git a/entry/src/main/cpp/src/core/view/View.h b/entry/src/main/cpp/src/core/view/View.h
new file mode 100644
index 0000000..87dd7c4
--- /dev/null
+++ b/entry/src/main/cpp/src/core/view/View.h
@@ -0,0 +1,52 @@
+/*
+ * Xournal++
+ *
+ * Namespace for view related classes
+ *
+ * @author Xournal++ Team
+ * https://github.com/xournalpp/xournalpp
+ *
+ * @license GNU GPLv2 or later
+ */
+
+#pragma once
+
+#include <memory>
+
+#include <gtk/gtk.h>
+
+class Element;
+
+namespace xoj {
+namespace view {
+
+enum NonAudioTreatment : bool { FADE_OUT_NON_AUDIO_ = true, NORMAL_NON_AUDIO = false };
+enum EditionTreatment : bool { SHOW_CURRENT_EDITING = true, HIDE_CURRENT_EDITING = false };
+enum ColorTreatment : bool { COLORBLIND = true, NORMAL_COLOR = false };
+
+class Context {
+public:
+    cairo_t* cr;
+    NonAudioTreatment fadeOutNonAudio;
+    EditionTreatment showCurrentEdition;
+    ColorTreatment noColor;
+
+    static Context createDefault(cairo_t* cr) { return {cr, NORMAL_NON_AUDIO, HIDE_CURRENT_EDITING, NORMAL_COLOR}; }
+    static Context createColorBlind(cairo_t* cr) { return {cr, NORMAL_NON_AUDIO, HIDE_CURRENT_EDITING, COLORBLIND}; }
+};
+
+class ElementView {
+public:
+    virtual ~ElementView() = default;
+    virtual void draw(const Context& ctx) const = 0;
+    static std::unique_ptr<ElementView> createFromElement(const Element* e);
+};
+
+class TexImageView;
+class ImageView;
+class StrokeView;
+class TextView;
+
+constexpr double OPACITY_NO_AUDIO = 0.3;
+};  // namespace view
+};  // namespace xoj
diff --git a/entry/src/main/cpp/src/core/view/background/BackgroundFlags.h b/entry/src/main/cpp/src/core/view/background/BackgroundFlags.h
new file mode 100644
index 0000000..077b1cb
--- /dev/null
+++ b/entry/src/main/cpp/src/core/view/background/BackgroundFlags.h
@@ -0,0 +1,37 @@
+/*
+ * Xournal++
+ *
+ * Flags for background painting
+ *
+ * @author Xournal++ Team
+ * https://github.com/xournalpp/xournalpp
+ *
+ * @license GNU GPLv2 or later
+ */
+
+#pragma once
+
+namespace xoj::view {
+
+enum PDFBackgroundTreatment : bool { SHOW_PDF_BACKGROUND = true, HIDE_PDF_BACKGROUND = false };
+enum ImageBackgroundTreatment : bool { SHOW_IMAGE_BACKGROUND = true, HIDE_IMAGE_BACKGROUND = false };
+enum RulingBackgroundTreatment : bool { SHOW_RULING_BACKGROUND = true, HIDE_RULING_BACKGROUND = false };
+enum BackgroundColorTreatment : bool { FORCE_AT_LEAST_BACKGROUND_COLOR = true, DONT_FORCE_BACKGROUND_COLOR = false };
+enum VisibilityTreatment : bool { FORCE_VISIBLE = true, USE_DOCUMENT_VISIBILITY = false };
+
+struct BackgroundFlags {
+    PDFBackgroundTreatment showPDF;
+    ImageBackgroundTreatment showImage;
+    RulingBackgroundTreatment showRuling;
+    BackgroundColorTreatment forceBackgroundColor = DONT_FORCE_BACKGROUND_COLOR;
+    VisibilityTreatment forceVisible = USE_DOCUMENT_VISIBILITY;
+};
+
+static constexpr BackgroundFlags BACKGROUND_SHOW_ALL = {SHOW_PDF_BACKGROUND, SHOW_IMAGE_BACKGROUND,
+                                                        SHOW_RULING_BACKGROUND, DONT_FORCE_BACKGROUND_COLOR,
+                                                        USE_DOCUMENT_VISIBILITY};
+
+static constexpr BackgroundFlags BACKGROUND_FORCE_PAINT_BACKGROUND_COLOR_ONLY = {
+        HIDE_PDF_BACKGROUND, HIDE_IMAGE_BACKGROUND, HIDE_RULING_BACKGROUND, FORCE_AT_LEAST_BACKGROUND_COLOR,
+        FORCE_VISIBLE};
+}  // namespace xoj::view
diff --git a/entry/src/main/cpp/src/core/view/background/BackgroundView.cpp b/entry/src/main/cpp/src/core/view/background/BackgroundView.cpp
new file mode 100644
index 0000000..3d8ae00
--- /dev/null
+++ b/entry/src/main/cpp/src/core/view/background/BackgroundView.cpp
@@ -0,0 +1,95 @@
+#include "BackgroundView.h"
+
+#include <glib.h>  // for g_warning
+
+#include "model/PageType.h"                          // for PageType, PageTy...
+#include "model/XojPage.h"                           // for XojPage
+#include "view/background/OneColorBackgroundView.h"  // for OneColorBackgrou...
+
+#include "DottedBackgroundView.h"                   // for DottedBackground...
+#include "GraphBackgroundView.h"                    // for GraphBackgroundView
+#include "ImageBackgroundView.h"                    // for ImageBackgroundView
+#include "IsoDottedBackgroundView.h"                // for IsoDottedBackgro...
+#include "IsoGraphBackgroundView.h"                 // for IsoGraphBackgrou...
+#include "LinedBackgroundView.h"                    // for LinedBackgroundView
+#include "PdfBackgroundView.h"                      // for PdfBackgroundView
+#include "PlainBackgroundView.h"                    // for PlainBackgroundView
+#include "RuledBackgroundView.h"                    // for RuledBackgroundView
+#include "StavesBackgroundView.h"                   // for StavesBackground...
+#include "TransparentCheckerboardBackgroundView.h"  // for TransparentCheck...
+
+using namespace xoj::view;
+
+auto BackgroundView::createRuled(double width, double height, Color backgroundColor, const PageType& pt,
+                                 double lineWidthFactor) -> std::unique_ptr<BackgroundView> {
+    std::unique_ptr<OneColorBackgroundView> res;
+    switch (pt.format) {
+        case PageTypeFormat::Plain:
+            return std::make_unique<PlainBackgroundView>(width, height, backgroundColor);
+        case PageTypeFormat::Ruled:
+            res = std::make_unique<RuledBackgroundView>(width, height, backgroundColor, pt.config);
+            break;
+        case PageTypeFormat::Lined:
+            res = std::make_unique<LinedBackgroundView>(width, height, backgroundColor, pt.config);
+            break;
+        case PageTypeFormat::Graph:
+            res = std::make_unique<GraphBackgroundView>(width, height, backgroundColor, pt.config);
+            break;
+        case PageTypeFormat::Staves:
+            res = std::make_unique<StavesBackgroundView>(width, height, backgroundColor, pt.config);
+            break;
+        case PageTypeFormat::Dotted:
+            res = std::make_unique<DottedBackgroundView>(width, height, backgroundColor, pt.config);
+            break;
+        case PageTypeFormat::IsoGraph:
+            res = std::make_unique<IsoGraphBackgroundView>(width, height, backgroundColor, pt.config);
+            break;
+        case PageTypeFormat::IsoDotted:
+            res = std::make_unique<IsoDottedBackgroundView>(width, height, backgroundColor, pt.config);
+            break;
+        default:
+            g_warning("BackgroundView::createForPage unknowntype: %d", static_cast<int>(pt.format));
+            return nullptr;
+    }
+    // In page template previews, the line width is multiplied to make the lines actually visible.
+    res->multiplyLineWidth(lineWidthFactor);
+    return res;
+}
+
+auto BackgroundView::createForPage(ConstPageRef page, BackgroundFlags bgFlags, PdfCache* pdfCache)
+        -> std::unique_ptr<BackgroundView> {
+    const double width = page->getWidth();
+    const double height = page->getHeight();
+    if (!bgFlags.forceVisible && !page->isLayerVisible(0)) {
+        return std::make_unique<TransparentCheckerboardBackgroundView>(width, height);
+    }
+
+    const auto pt = page->getBackgroundType();
+    if (pt.isSpecial()) {
+        switch (pt.format) {
+            case PageTypeFormat::Image:
+                if (bgFlags.showImage) {
+                    return std::make_unique<ImageBackgroundView>(width, height, page->getBackgroundImage());
+                }
+                break;
+            case PageTypeFormat::Pdf:
+                if (bgFlags.showPDF) {
+                    return std::make_unique<PdfBackgroundView>(width, height, page->getPdfPageNr(), pdfCache);
+                }
+                break;
+            default:
+                g_warning("BackgroundView::createForPage unknown type: %d\n", static_cast<int>(pt.format));
+                return nullptr;
+        }
+    } else {
+        if (bgFlags.showRuling) {
+            return createRuled(width, height, page->getBackgroundColor(), pt);
+        }
+    }
+
+    if (bgFlags.forceBackgroundColor) {
+        return std::make_unique<PlainBackgroundView>(width, height, page->getBackgroundColor());
+    } else {
+        return std::make_unique<BackgroundView>(width, height);  // Dummy no-op view
+    }
+}
diff --git a/entry/src/main/cpp/src/core/view/background/BackgroundView.h b/entry/src/main/cpp/src/core/view/background/BackgroundView.h
new file mode 100644
index 0000000..58c796c
--- /dev/null
+++ b/entry/src/main/cpp/src/core/view/background/BackgroundView.h
@@ -0,0 +1,52 @@
+/*
+ * Xournal++
+ *
+ * Displays a background
+ *
+ * @author Xournal++ Team
+ * https://github.com/xournalpp/xournalpp
+ *
+ * @license GNU GPLv2 or later
+ */
+
+#pragma once
+
+#include <memory>  // for unique_ptr
+
+#include <cairo.h>  // for cairo_t
+
+#include "model/PageRef.h"  // for ConstPageRef
+#include "util/Color.h"     // for Color
+
+#include "BackgroundFlags.h"
+
+class PdfCache;
+class PageType;
+
+namespace xoj {
+namespace view {
+class BackgroundView {
+public:
+    BackgroundView(double pageWidth, double pageHeight): pageWidth(pageWidth), pageHeight(pageHeight) {}
+    virtual ~BackgroundView() = default;
+
+    /**
+     * @brief Draws the background on the entire mask represented by the cairo context cr
+     *
+     * Does nothing in the base class - used when the background drawing is suppressed.
+     */
+    virtual void draw(cairo_t* cr) const {}
+
+    [[nodiscard]] static std::unique_ptr<BackgroundView> createRuled(double width, double height, Color backgroundColor,
+                                                                     const PageType& pt, double lineWidthFactor = 1.0);
+
+    [[nodiscard]] static std::unique_ptr<BackgroundView> createForPage(ConstPageRef page,
+                                                                       xoj::view::BackgroundFlags bgFlags,
+                                                                       PdfCache* pdfCache = nullptr);
+
+protected:
+    double pageWidth;
+    double pageHeight;
+};
+};  // namespace view
+};  // namespace xoj
diff --git a/entry/src/main/cpp/src/core/view/background/BaseIsometricBackgroundView.cpp b/entry/src/main/cpp/src/core/view/background/BaseIsometricBackgroundView.cpp
new file mode 100644
index 0000000..b363e2c
--- /dev/null
+++ b/entry/src/main/cpp/src/core/view/background/BaseIsometricBackgroundView.cpp
@@ -0,0 +1,86 @@
+#include "BaseIsometricBackgroundView.h"
+
+#include <cmath>   // for floor, sqrt
+#include <memory>  // for allocator
+
+#include "model/BackgroundConfig.h"                  // for BackgroundConfig
+#include "util/safe_casts.h"                         // for floor_cast
+#include "view/background/BackgroundView.h"          // for view
+#include "view/background/OneColorBackgroundView.h"  // for OneColorBackgrou...
+#include "view/background/PlainBackgroundView.h"     // for PlainBackgroundView
+
+using namespace background_config_strings;
+using namespace xoj::view;
+
+BaseIsometricBackgroundView::BaseIsometricBackgroundView(double pageWidth, double pageHeight, Color backgroundColor,
+                                                         const BackgroundConfig& config, double defaultLineWidth):
+        OneColorBackgroundView(pageWidth, pageHeight, backgroundColor, config, defaultLineWidth, DEFAULT_LINE_COLOR,
+                               ALT_DEFAULT_LINE_COLOR) {
+
+    config.loadValue(CFG_RASTER, triangleSize);
+}
+
+void BaseIsometricBackgroundView::draw(cairo_t* cr) const {
+    // Paint the background color
+    PlainBackgroundView::draw(cr);
+
+    const double xstep = std::sqrt(3.0) / 2.0 * triangleSize;
+    const double ystep = triangleSize / 2.0;
+
+    // Deduce the maximum grid size
+    const double margin = triangleSize;
+    int cols = floor_cast<int>((pageWidth - 2 * margin) / xstep);
+    int rows = floor_cast<int>((pageHeight - 2 * margin) / ystep);
+
+    // Center the grid on the page
+    const double contentWidth = cols * xstep;
+    const double contentHeight = rows * ystep;
+    double contentXOffset = (pageWidth - contentWidth) / 2;
+    double contentYOffset = (pageHeight - contentHeight) / 2;
+
+    // Get the bounds of the mask, in page coordinates
+    double minX;
+    double maxX;
+    double minY;
+    double maxY;
+    cairo_clip_extents(cr, &minX, &minY, &maxX, &maxY);
+
+    // Get the indices we need to paint (= on or near the mask)
+    const double halfLineWidth = 0.5 * lineWidth;
+    auto [indexMinX, indexMaxX] =
+            getIndexBounds(minX - halfLineWidth - xstep - contentXOffset, maxX + halfLineWidth + xstep - contentXOffset,
+                           xstep, 0.0, contentWidth);
+    auto [indexMinY, indexMaxY] =
+            getIndexBounds(minY - halfLineWidth - ystep - contentYOffset, maxY + halfLineWidth + ystep - contentYOffset,
+                           ystep, 0.0, contentHeight);
+
+    if ((indexMinY + indexMinX) % 2) {
+        /** The painted area should start with \/\/\/...
+         *                                     /\/\/\/..
+         *
+         * Enlarge by 1 so that it starts with /\/\/...
+         *                                     \/\/\/..
+         */
+        if (indexMinX) {
+            --indexMinX;
+        } else {
+            --indexMinY;
+        }
+    }
+
+    // Compute the offset and the number of steps within the mask
+    contentXOffset += indexMinX * xstep;
+    contentYOffset += indexMinY * ystep;
+
+    cols = indexMaxX - indexMinX;
+    rows = indexMaxY - indexMinY;
+
+    paintGrid(cr, cols, rows, xstep, ystep, contentXOffset, contentYOffset);
+
+    cairo_save(cr);
+    Util::cairo_set_source_rgbi(cr, foregroundColor);
+    cairo_set_line_width(cr, lineWidth);
+    cairo_set_line_cap(cr, CAIRO_LINE_CAP_ROUND);
+    cairo_stroke(cr);
+    cairo_restore(cr);
+}
diff --git a/entry/src/main/cpp/src/core/view/background/BaseIsometricBackgroundView.h b/entry/src/main/cpp/src/core/view/background/BaseIsometricBackgroundView.h
new file mode 100644
index 0000000..0ff3bcb
--- /dev/null
+++ b/entry/src/main/cpp/src/core/view/background/BaseIsometricBackgroundView.h
@@ -0,0 +1,41 @@
+/*
+ * Xournal++
+ *
+ * Base class for isometric backgrounds
+ *
+ * @author Xournal++ Team
+ * https://github.com/xournalpp/xournalpp
+ *
+ * @license GNU GPLv2 or later
+ */
+
+#pragma once
+
+#include <cairo.h>  // for cairo_t
+
+#include "util/Color.h"  // for Color
+
+#include "OneColorBackgroundView.h"  // for OneColorBackgroundView
+
+class BackgroundConfig;
+
+namespace xoj::view {
+class BaseIsometricBackgroundView: public OneColorBackgroundView {
+public:
+    BaseIsometricBackgroundView(double pageWidth, double pageHeight, Color backgroundColor,
+                                const BackgroundConfig& config, double defaultLineWidth);
+    virtual ~BaseIsometricBackgroundView() = default;
+
+    virtual void draw(cairo_t* cr) const override;
+
+protected:
+    virtual void paintGrid(cairo_t* cr, int cols, int rows, double xstep, double ystep, double xOffset,
+                           double yOffset) const = 0;
+
+protected:
+    double triangleSize = 14.17;  // 5mm
+
+    constexpr static Color DEFAULT_LINE_COLOR = Colors::xopp_silver;
+    constexpr static Color ALT_DEFAULT_LINE_COLOR = Colors::xopp_darkslategray;
+};
+};  // namespace xoj::view
diff --git a/entry/src/main/cpp/src/core/view/background/DottedBackgroundView.cpp b/entry/src/main/cpp/src/core/view/background/DottedBackgroundView.cpp
new file mode 100644
index 0000000..b2ed67e
--- /dev/null
+++ b/entry/src/main/cpp/src/core/view/background/DottedBackgroundView.cpp
@@ -0,0 +1,57 @@
+#include "DottedBackgroundView.h"
+
+#include <memory>  // for allocator
+
+#include "model/BackgroundConfig.h"                  // for BackgroundConfig
+#include "view/background/BackgroundView.h"          // for view
+#include "view/background/OneColorBackgroundView.h"  // for OneColorBackgrou...
+#include "view/background/PlainBackgroundView.h"     // for PlainBackgroundView
+
+using namespace background_config_strings;
+using namespace xoj::view;
+
+DottedBackgroundView::DottedBackgroundView(double pageWidth, double pageHeight, Color backgroundColor,
+                                           const BackgroundConfig& config):
+        OneColorBackgroundView(pageWidth, pageHeight, backgroundColor, config, DEFAULT_LINE_WIDTH, DEFAULT_LINE_COLOR,
+                               ALT_DEFAULT_LINE_COLOR) {
+
+    config.loadValue(CFG_RASTER, squareSize);
+}
+
+void DottedBackgroundView::draw(cairo_t* cr) const {
+    // Paint the background color
+    PlainBackgroundView::draw(cr);
+
+    // Get the bounds of the mask, in page coordinates
+    double minX;
+    double maxX;
+    double minY;
+    double maxY;
+    cairo_clip_extents(cr, &minX, &minY, &maxX, &maxY);
+
+    const double halfLineWidth = 0.5 * lineWidth;
+    /*  1- Add a halfLineWidth padding in case the line is just outside the mask but its thickness still makes it
+     *     (partially) visible
+     *  2- Set clearance so no dot is half-drawn on the edge of the sheet
+     */
+    auto [indexMinX, indexMaxX] =
+            getIndexBounds(minX - halfLineWidth, maxX + halfLineWidth, squareSize, halfLineWidth, pageWidth);
+    auto [indexMinY, indexMaxY] =
+            getIndexBounds(minY - halfLineWidth, maxY + halfLineWidth, squareSize, halfLineWidth, pageHeight);
+
+    for (int i = indexMinX; i <= indexMaxX; ++i) {
+        double x = i * squareSize;
+        for (int j = indexMinY; j <= indexMaxY; ++j) {
+            double y = j * squareSize;
+            cairo_move_to(cr, x, y);
+            cairo_line_to(cr, x, y);
+        }
+    }
+
+    cairo_save(cr);
+    Util::cairo_set_source_rgbi(cr, foregroundColor);
+    cairo_set_line_width(cr, lineWidth);
+    cairo_set_line_cap(cr, CAIRO_LINE_CAP_ROUND);
+    cairo_stroke(cr);
+    cairo_restore(cr);
+}
diff --git a/entry/src/main/cpp/src/core/view/background/DottedBackgroundView.h b/entry/src/main/cpp/src/core/view/background/DottedBackgroundView.h
new file mode 100644
index 0000000..42524e5
--- /dev/null
+++ b/entry/src/main/cpp/src/core/view/background/DottedBackgroundView.h
@@ -0,0 +1,37 @@
+/*
+ * Xournal++
+ *
+ * Class for graph backgrounds
+ *
+ * @author Xournal++ Team
+ * https://github.com/xournalpp/xournalpp
+ *
+ * @license GNU GPLv2 or later
+ */
+
+#pragma once
+
+#include <cairo.h>  // for cairo_t
+
+#include "util/Color.h"  // for Color
+
+#include "OneColorBackgroundView.h"  // for OneColorBackgroundView
+
+class BackgroundConfig;
+
+namespace xoj::view {
+class DottedBackgroundView: public OneColorBackgroundView {
+public:
+    DottedBackgroundView(double pageWidth, double pageHeight, Color backgroundColor, const BackgroundConfig& config);
+    virtual ~DottedBackgroundView() = default;
+
+    virtual void draw(cairo_t* cr) const override;
+
+protected:
+    double squareSize = 14.17;  // 5mm
+
+    constexpr static Color DEFAULT_LINE_COLOR = Colors::xopp_silver;
+    constexpr static Color ALT_DEFAULT_LINE_COLOR = Colors::xopp_darkslategray;
+    constexpr static double DEFAULT_LINE_WIDTH = 1.5;
+};
+};  // namespace xoj::view
diff --git a/entry/src/main/cpp/src/core/view/background/GraphBackgroundView.cpp b/entry/src/main/cpp/src/core/view/background/GraphBackgroundView.cpp
new file mode 100644
index 0000000..ca8ff90
--- /dev/null
+++ b/entry/src/main/cpp/src/core/view/background/GraphBackgroundView.cpp
@@ -0,0 +1,136 @@
+#include "GraphBackgroundView.h"
+
+#include <algorithm>  // for max, min
+#include <cmath>      // for floor
+#include <memory>     // for allocator
+
+#include "model/BackgroundConfig.h"                  // for BackgroundConfig
+#include "view/background/BackgroundView.h"          // for view
+#include "view/background/OneColorBackgroundView.h"  // for OneColorBackgrou...
+#include "view/background/PlainBackgroundView.h"     // for PlainBackgroundView
+
+using namespace background_config_strings;
+using namespace xoj::view;
+
+GraphBackgroundView::GraphBackgroundView(double pageWidth, double pageHeight, Color backgroundColor,
+                                         const BackgroundConfig& config):
+        OneColorBackgroundView(pageWidth, pageHeight, backgroundColor, config, DEFAULT_LINE_WIDTH, DEFAULT_LINE_COLOR,
+                               ALT_DEFAULT_LINE_COLOR) {
+
+    config.loadValue(CFG_RASTER, squareSize);
+    config.loadValue(CFG_MARGIN, margin);
+    config.loadValue(CFG_BOLD_LINE_INTERVAL, boldLineInterval);
+    config.loadValue(CFG_BOLD_LINE_WIDTH, boldLineWidth);
+
+    if (int roundToGrid = 0; margin > 0.0 && config.loadValue(CFG_ROUND_MARGIN, roundToGrid) && roundToGrid) {
+        roundUpMargin = true;
+    }
+}
+
+void GraphBackgroundView::draw(cairo_t* cr) const {
+    // Paint the background color
+    PlainBackgroundView::draw(cr);
+
+    // Get the bounds of the mask, in page coordinates
+    double minX;
+    double maxX;
+    double minY;
+    double maxY;
+    cairo_clip_extents(cr, &minX, &minY, &maxX, &maxY);
+
+    if (margin > 0.0) {
+        minX = std::max(minX, margin);
+        maxX = std::min(maxX, pageWidth - margin);
+        minY = std::max(minY, margin);
+        maxY = std::min(maxY, pageHeight - margin);
+    }
+
+    const double halfLineWidth = 0.5 * (boldLineInterval > 0 ? boldLineWidth : lineWidth);
+    const double clearance = std::max(margin, halfLineWidth);
+    /*  1- Add a halfLineWidth padding in case the line is just outside the mask but its thickness still makes it
+     *     (partially) visible
+     *  2- Set clearance so no line is drawn in the margin or to close to the edge of the sheet
+     */
+    auto [indexMinX, indexMaxX] =
+            getIndexBounds(minX - halfLineWidth, maxX + halfLineWidth, squareSize, clearance, pageWidth);
+    auto [indexMinY, indexMaxY] =
+            getIndexBounds(minY - halfLineWidth, maxY + halfLineWidth, squareSize, clearance, pageHeight);
+
+    if (roundUpMargin) {
+        auto [pageIndexMinX, pageIndexMaxX] = getIndexBounds(margin - halfLineWidth, pageWidth - margin + halfLineWidth,
+                                                             squareSize, clearance, pageWidth);
+        auto [pageIndexMinY, pageIndexMaxY] = getIndexBounds(
+                margin - halfLineWidth, pageHeight - margin + halfLineWidth, squareSize, clearance, pageHeight);
+        minX = std::max(minX, squareSize * pageIndexMinX);
+        maxX = std::min(maxX, squareSize * pageIndexMaxX);
+        minY = std::max(minY, squareSize * pageIndexMinY);
+        maxY = std::min(maxY, squareSize * pageIndexMaxY);
+    }
+
+    cairo_save(cr);
+    Util::cairo_set_source_rgbi(cr, foregroundColor);
+    cairo_set_line_cap(cr, CAIRO_LINE_CAP_SQUARE);
+
+    if (boldLineInterval > 0) {
+        cairo_set_line_width(cr, lineWidth);
+        if (minY < maxY) {
+            for (int i = indexMinX; i <= indexMaxX; ++i) {
+                if (i % boldLineInterval != 0) {
+                    double x = i * squareSize;
+                    cairo_move_to(cr, x, minY);
+                    cairo_line_to(cr, x, maxY);
+                }
+            }
+        }
+        if (minX < maxX) {
+            for (int i = indexMinY; i <= indexMaxY; ++i) {
+                if (i % boldLineInterval != 0) {
+                    double y = i * squareSize;
+                    cairo_move_to(cr, minX, y);
+                    cairo_line_to(cr, maxX, y);
+                }
+            }
+        }
+        cairo_stroke(cr);
+
+        cairo_set_line_width(cr, boldLineWidth);
+        if (minY < maxY) {
+            for (int i = indexMinX; i <= indexMaxX; ++i) {
+                if (i % boldLineInterval == 0) {
+                    double x = i * squareSize;
+                    cairo_move_to(cr, x, minY);
+                    cairo_line_to(cr, x, maxY);
+                }
+            }
+        }
+        if (minX < maxX) {
+            for (int i = indexMinY; i <= indexMaxY; ++i) {
+                if (i % boldLineInterval == 0) {
+                    double y = i * squareSize;
+                    cairo_move_to(cr, minX, y);
+                    cairo_line_to(cr, maxX, y);
+                }
+            }
+        }
+        cairo_stroke(cr);
+    } else {
+        cairo_set_line_width(cr, lineWidth);
+        if (minY < maxY) {
+            for (int i = indexMinX; i <= indexMaxX; ++i) {
+                double x = i * squareSize;
+                cairo_move_to(cr, x, minY);
+                cairo_line_to(cr, x, maxY);
+            }
+        }
+        if (minX < maxX) {
+            for (int i = indexMinY; i <= indexMaxY; ++i) {
+                double y = i * squareSize;
+                cairo_move_to(cr, minX, y);
+                cairo_line_to(cr, maxX, y);
+            }
+        }
+        cairo_stroke(cr);
+    }
+
+    cairo_restore(cr);
+}
diff --git a/entry/src/main/cpp/src/core/view/background/GraphBackgroundView.h b/entry/src/main/cpp/src/core/view/background/GraphBackgroundView.h
new file mode 100644
index 0000000..434cc8b
--- /dev/null
+++ b/entry/src/main/cpp/src/core/view/background/GraphBackgroundView.h
@@ -0,0 +1,42 @@
+/*
+ * Xournal++
+ *
+ * Class for graph backgrounds
+ *
+ * @author Xournal++ Team
+ * https://github.com/xournalpp/xournalpp
+ *
+ * @license GNU GPLv2 or later
+ */
+
+#pragma once
+
+#include <cairo.h>  // for cairo_t
+
+#include "util/Color.h"  // for Color
+
+#include "OneColorBackgroundView.h"  // for OneColorBackgroundView
+
+class BackgroundConfig;
+
+namespace xoj::view {
+class GraphBackgroundView: public OneColorBackgroundView {
+public:
+    GraphBackgroundView(double pageWidth, double pageHeight, Color backgroundColor, const BackgroundConfig& config);
+    virtual ~GraphBackgroundView() = default;
+
+    virtual void draw(cairo_t* cr) const override;
+
+protected:
+    bool roundUpMargin = false;
+    double margin = 0.0;
+    double squareSize = 14.17;  // 5mm
+    int boldLineInterval = 0;   // 0 means no bold lines, otherwise every Nth line is bold
+    double boldLineWidth = 1.5;
+
+    constexpr static Color DEFAULT_LINE_COLOR = Colors::xopp_silver;
+    constexpr static Color ALT_DEFAULT_LINE_COLOR = Colors::xopp_darkslategray;
+    constexpr static double DEFAULT_LINE_WIDTH = 0.5;
+    constexpr static double DEFAULT_BOLD_LINE_WIDTH = 1.5;
+};
+};  // namespace xoj::view
diff --git a/entry/src/main/cpp/src/core/view/background/ImageBackgroundView.cpp b/entry/src/main/cpp/src/core/view/background/ImageBackgroundView.cpp
new file mode 100644
index 0000000..8f37e0a
--- /dev/null
+++ b/entry/src/main/cpp/src/core/view/background/ImageBackgroundView.cpp
@@ -0,0 +1,33 @@
+#include "ImageBackgroundView.h"
+
+#include <gdk-pixbuf/gdk-pixbuf.h>  // for gdk_pixbuf_get_height
+#include <gdk/gdk.h>                // for gdk_cairo_set_source_pixbuf
+
+#include "model/BackgroundImage.h"           // for BackgroundImage
+#include "view/background/BackgroundView.h"  // for BackgroundView, view
+
+using namespace xoj::view;
+
+ImageBackgroundView::ImageBackgroundView(double pageWidth, double pageHeight, const BackgroundImage& image):
+        BackgroundView(pageWidth, pageHeight), image(image) {}
+
+void ImageBackgroundView::draw(cairo_t* cr) const {
+    const GdkPixbuf* pixbuff = this->image.getPixbuf();
+    if (pixbuff) {
+        cairo_matrix_t matrix = {0};
+        cairo_get_matrix(cr, &matrix);
+
+        int width = gdk_pixbuf_get_width(pixbuff);
+        int height = gdk_pixbuf_get_height(pixbuff);
+
+        double sx = this->pageWidth / width;
+        double sy = this->pageHeight / height;
+
+        cairo_scale(cr, sx, sy);
+
+        gdk_cairo_set_source_pixbuf(cr, pixbuff, 0, 0);
+        cairo_paint(cr);
+
+        cairo_set_matrix(cr, &matrix);
+    }
+}
diff --git a/entry/src/main/cpp/src/core/view/background/ImageBackgroundView.h b/entry/src/main/cpp/src/core/view/background/ImageBackgroundView.h
new file mode 100644
index 0000000..95926b4
--- /dev/null
+++ b/entry/src/main/cpp/src/core/view/background/ImageBackgroundView.h
@@ -0,0 +1,33 @@
+/*
+ * Xournal++
+ *
+ * Displays a background image
+ *
+ * @author Xournal++ Team
+ * https://github.com/xournalpp/xournalpp
+ *
+ * @license GNU GPLv2 or later
+ */
+
+#pragma once
+
+#include <cairo.h>  // for cairo_t
+
+#include "BackgroundView.h"  // for BackgroundView
+
+struct BackgroundImage;
+
+namespace xoj::view {
+class ImageBackgroundView: public BackgroundView {
+public:
+    ImageBackgroundView(double pageWidth, double pageHeight, const BackgroundImage& image);
+
+    /**
+     * @brief Draws the background on the entire mask represented by the cairo context ctx.cr
+     */
+    virtual void draw(cairo_t* cr) const override;
+
+private:
+    const BackgroundImage& image;
+};
+};  // namespace xoj::view
diff --git a/entry/src/main/cpp/src/core/view/background/IsoDottedBackgroundView.cpp b/entry/src/main/cpp/src/core/view/background/IsoDottedBackgroundView.cpp
new file mode 100644
index 0000000..af90c48
--- /dev/null
+++ b/entry/src/main/cpp/src/core/view/background/IsoDottedBackgroundView.cpp
@@ -0,0 +1,34 @@
+#include "IsoDottedBackgroundView.h"
+
+#include "model/BackgroundConfig.h"                       // for BackgroundC...
+#include "view/background/BackgroundView.h"               // for view
+#include "view/background/BaseIsometricBackgroundView.h"  // for BaseIsometr...
+
+using namespace xoj::view;
+
+IsoDottedBackgroundView::IsoDottedBackgroundView(double pageWidth, double pageHeight, Color backgroundColor,
+                                                 const BackgroundConfig& config):
+        BaseIsometricBackgroundView(pageWidth, pageHeight, backgroundColor, config, DEFAULT_LINE_WIDTH) {}
+
+
+void IsoDottedBackgroundView::paintGrid(cairo_t* cr, int cols, int rows, double xstep, double ystep, double xOffset,
+                                        double yOffset) const {
+
+    auto drawDot = [&](double x, double y) {
+        cairo_move_to(cr, xOffset + x, yOffset + y);
+        cairo_line_to(cr, xOffset + x, yOffset + y);
+    };
+
+    for (int col = 0; col <= cols; ++col) {
+        const auto x = col * xstep;
+
+        const auto evenCol = col % 2 == 0;
+        const auto yoffset = evenCol ? ystep : 0.0;
+        const auto rowsInCol = evenCol ? rows - 2 : rows;
+
+        for (int row = 0; row <= rowsInCol; row += 2) {
+            const auto y = yoffset + row * ystep;
+            drawDot(x, y);
+        }
+    }
+}
diff --git a/entry/src/main/cpp/src/core/view/background/IsoDottedBackgroundView.h b/entry/src/main/cpp/src/core/view/background/IsoDottedBackgroundView.h
new file mode 100644
index 0000000..b2adfb2
--- /dev/null
+++ b/entry/src/main/cpp/src/core/view/background/IsoDottedBackgroundView.h
@@ -0,0 +1,35 @@
+/*
+ * Xournal++
+ *
+ * Class for isometric graph backgrounds
+ *
+ * @author Xournal++ Team
+ * https://github.com/xournalpp/xournalpp
+ *
+ * @license GNU GPLv2 or later
+ */
+
+#pragma once
+
+#include <cairo.h>  // for cairo_t
+
+#include "util/Color.h"  // for Color
+
+#include "BaseIsometricBackgroundView.h"  // for BaseIsometricBackgroundView
+
+class BackgroundConfig;
+
+namespace xoj::view {
+class IsoDottedBackgroundView: public BaseIsometricBackgroundView {
+public:
+    IsoDottedBackgroundView(double pageWidth, double pageHeight, Color backgroundColor, const BackgroundConfig& config);
+    virtual ~IsoDottedBackgroundView() = default;
+
+protected:
+    virtual void paintGrid(cairo_t* cr, int cols, int rows, double xstep, double ystep, double xOffset,
+                           double yOffset) const override;
+
+protected:
+    constexpr static double DEFAULT_LINE_WIDTH = 1.5;
+};
+};  // namespace xoj::view
diff --git a/entry/src/main/cpp/src/core/view/background/IsoGraphBackgroundView.cpp b/entry/src/main/cpp/src/core/view/background/IsoGraphBackgroundView.cpp
new file mode 100644
index 0000000..7f417cc
--- /dev/null
+++ b/entry/src/main/cpp/src/core/view/background/IsoGraphBackgroundView.cpp
@@ -0,0 +1,89 @@
+#include "IsoGraphBackgroundView.h"
+
+#include "model/BackgroundConfig.h"                       // for BackgroundC...
+#include "util/safe_casts.h"                              // for floor_cast
+#include "view/background/BackgroundView.h"               // for view
+#include "view/background/BaseIsometricBackgroundView.h"  // for BaseIsometr...
+
+using namespace xoj::view;
+
+IsoGraphBackgroundView::IsoGraphBackgroundView(double pageWidth, double pageHeight, Color backgroundColor,
+                                               const BackgroundConfig& config):
+        BaseIsometricBackgroundView(pageWidth, pageHeight, backgroundColor, config, DEFAULT_LINE_WIDTH) {}
+
+
+void IsoGraphBackgroundView::paintGrid(cairo_t* cr, int cols, int rows, double xstep, double ystep, double xOffset,
+                                       double yOffset) const {
+
+    auto drawLine = [&](double x1, double y1, double x2, double y2) {
+        cairo_move_to(cr, xOffset + x1, yOffset + y1);
+        cairo_line_to(cr, xOffset + x2, yOffset + y2);
+    };
+
+    const auto contentWidth = cols * xstep;
+    const auto contentHeight = rows * ystep;
+
+    // Draw Horizontal line on top and bottom
+    // NB: if we're drawing only a portion of the page that does not touch the upper or lower edge, those lines are not
+    // at their rightful place. They are also out of the cairo mask's clip, so the following is a no-op.
+    drawLine(0.0, 0.0, contentWidth, 0.0);
+    drawLine(0.0, contentHeight, contentWidth, contentHeight);
+
+    for (int col = 0; col <= cols; ++col) {
+        const auto x = col * xstep;
+        drawLine(x, 0.0, x, contentHeight);
+    }
+
+    // Determine the number of diagonals to draw
+    auto hdiags = floor_cast<int>(cols / 2);
+    auto vdiags = floor_cast<int>(rows / 2);
+    auto diags = hdiags + vdiags;
+    auto hcorr = cols - 2 * hdiags;
+    auto vcorr = rows - 2 * vdiags;
+
+    // Draw diagonals starting in the top left corner (left-down)
+    for (int d = 0; d < diags + hcorr * vcorr; ++d) {
+        // Point 1 travels horizontally from top left to top right,
+        // then from top right to bottom right.
+        double x1 = contentWidth, y1 = 0.0;
+        if (d < hdiags) {
+            x1 = xstep + d * 2 * xstep;
+        } else {
+            y1 = ystep + (d - hdiags) * 2 * ystep - hcorr * ystep;
+        }
+
+        // Point 2 travels vertically from top left to bottom left,
+        // then from bottom left to bottom right.
+        double x2 = 0.0, y2 = contentHeight;
+        if (d < vdiags) {
+            y2 = ystep + d * 2 * ystep;
+        } else {
+            x2 = xstep + (d - vdiags) * 2 * xstep - vcorr * xstep;
+        }
+
+        drawLine(x1, y1, x2, y2);
+    }
+
+    // Draw diagonals starting in the top right corner (right-down)
+    for (int d = 0; d < diags; ++d) {
+        // Point 1 travels horizontally from top right to top left,
+        // then from top left to bottom left.
+        double x1 = 0.0, y1 = 0.0;
+        if (d < hdiags) {
+            x1 = contentWidth - (xstep + d * 2 * xstep) - hcorr * xstep;
+        } else {
+            y1 = ystep + (d - hdiags) * 2 * ystep;
+        }
+
+        // Point 2 travels vertically from top right to bottom right,
+        // then from top bottom right to bottom left.
+        double x2 = contentWidth, y2 = contentHeight;
+        if (d < vdiags) {
+            y2 = ystep + d * 2 * ystep + hcorr * ystep;
+        } else {
+            x2 = contentWidth - (xstep + (d - vdiags) * 2 * xstep) + (vcorr - hcorr) * xstep;
+        }
+
+        drawLine(x1, y1, x2, y2);
+    }
+}
diff --git a/entry/src/main/cpp/src/core/view/background/IsoGraphBackgroundView.h b/entry/src/main/cpp/src/core/view/background/IsoGraphBackgroundView.h
new file mode 100644
index 0000000..e2da042
--- /dev/null
+++ b/entry/src/main/cpp/src/core/view/background/IsoGraphBackgroundView.h
@@ -0,0 +1,35 @@
+/*
+ * Xournal++
+ *
+ * Class for isometric graph backgrounds
+ *
+ * @author Xournal++ Team
+ * https://github.com/xournalpp/xournalpp
+ *
+ * @license GNU GPLv2 or later
+ */
+
+#pragma once
+
+#include <cairo.h>  // for cairo_t
+
+#include "util/Color.h"  // for Color
+
+#include "BaseIsometricBackgroundView.h"  // for BaseIsometricBackgroundView
+
+class BackgroundConfig;
+
+namespace xoj::view {
+class IsoGraphBackgroundView: public BaseIsometricBackgroundView {
+public:
+    IsoGraphBackgroundView(double pageWidth, double pageHeight, Color backgroundColor, const BackgroundConfig& config);
+    virtual ~IsoGraphBackgroundView() = default;
+
+protected:
+    virtual void paintGrid(cairo_t* cr, int cols, int rows, double xstep, double ystep, double xOffset,
+                           double yOffset) const override;
+
+protected:
+    constexpr static double DEFAULT_LINE_WIDTH = 1.0;
+};
+};  // namespace xoj::view
diff --git a/entry/src/main/cpp/src/core/view/background/LinedBackgroundView.cpp b/entry/src/main/cpp/src/core/view/background/LinedBackgroundView.cpp
new file mode 100644
index 0000000..90a4950
--- /dev/null
+++ b/entry/src/main/cpp/src/core/view/background/LinedBackgroundView.cpp
@@ -0,0 +1,42 @@
+#include "LinedBackgroundView.h"
+
+#include <memory>  // for allocator
+
+#include "model/BackgroundConfig.h"               // for BackgroundConfig
+#include "view/background/BackgroundView.h"       // for view
+#include "view/background/RuledBackgroundView.h"  // for RuledBackgroundView
+
+using namespace background_config_strings;
+using namespace xoj::view;
+
+LinedBackgroundView::LinedBackgroundView(double pageWidth, double pageHeight, Color backgroundColor,
+                                         const BackgroundConfig& config):
+        RuledBackgroundView(pageWidth, pageHeight, backgroundColor, config) {
+
+    if (backgroundColor.isLight()) {
+        vLineColor = getColorOr(config, CFG_FOREGROUND_COLOR_2, DEFAULT_V_LINE_COLOR);
+    } else {
+        vLineColor = getColorOr(config, CFG_ALT_FOREGROUND_COLOR_2, ALT_DEFAULT_V_LINE_COLOR);
+    }
+
+    config.loadValue(CFG_MARGIN, margin);
+    if (margin < 0) {
+        // A negative value puts the margin line on the right hand side
+        margin += pageWidth;
+    }
+}
+
+void LinedBackgroundView::draw(cairo_t* cr) const {
+    // Paint the horizontal lines
+    RuledBackgroundView::draw(cr);
+
+    // Add the vertical line
+    cairo_save(cr);
+    Util::cairo_set_source_rgbi(cr, vLineColor);
+    cairo_set_line_width(cr, lineWidth);
+    cairo_set_line_cap(cr, CAIRO_LINE_CAP_BUTT);
+    cairo_move_to(cr, margin, 0);
+    cairo_line_to(cr, margin, pageHeight);
+    cairo_stroke(cr);
+    cairo_restore(cr);
+}
diff --git a/entry/src/main/cpp/src/core/view/background/LinedBackgroundView.h b/entry/src/main/cpp/src/core/view/background/LinedBackgroundView.h
new file mode 100644
index 0000000..66a940a
--- /dev/null
+++ b/entry/src/main/cpp/src/core/view/background/LinedBackgroundView.h
@@ -0,0 +1,36 @@
+/*
+ * Xournal++
+ *
+ * Class for lined backgrounds (= ruled + vertical margin line)
+ *
+ * @author Xournal++ Team
+ * https://github.com/xournalpp/xournalpp
+ *
+ * @license GNU GPLv2 or later
+ */
+
+#pragma once
+
+#include <cairo.h>  // for cairo_t
+
+#include "model/BackgroundConfig.h"  // for BackgroundConfig
+#include "util/Color.h"              // for Color
+
+#include "RuledBackgroundView.h"  // for RuledBackgroundView
+
+namespace xoj::view {
+class LinedBackgroundView: public RuledBackgroundView {
+public:
+    LinedBackgroundView(double pageWidth, double pageHeight, Color backgroundColor, const BackgroundConfig& config);
+    virtual ~LinedBackgroundView() = default;
+
+    virtual void draw(cairo_t* cr) const override;
+
+protected:
+    Color vLineColor;
+    double margin = 72.0;  // default = 1 inch. Negative values put the margin on the right hand side.
+
+    constexpr static Color DEFAULT_V_LINE_COLOR = Colors::xopp_deeppink;
+    constexpr static Color ALT_DEFAULT_V_LINE_COLOR = Colors::xopp_midnightblue;
+};
+};  // namespace xoj::view
diff --git a/entry/src/main/cpp/src/core/view/background/OneColorBackgroundView.cpp b/entry/src/main/cpp/src/core/view/background/OneColorBackgroundView.cpp
new file mode 100644
index 0000000..c8d5fd2
--- /dev/null
+++ b/entry/src/main/cpp/src/core/view/background/OneColorBackgroundView.cpp
@@ -0,0 +1,34 @@
+#include "OneColorBackgroundView.h"
+
+#include <cstdint>  // for uint32_t
+
+#include "model/BackgroundConfig.h"               // for BackgroundConfig
+#include "view/background/BackgroundView.h"       // for view
+#include "view/background/PlainBackgroundView.h"  // for PlainBackgroundView
+
+using namespace background_config_strings;
+using namespace xoj::view;
+
+OneColorBackgroundView::OneColorBackgroundView(double pageWidth, double pageHeight, Color backgroundColor,
+                                               const BackgroundConfig& config, double defaultLineWidth,
+                                               Color defaultLineColor, Color altDefaultLineColor):
+        PlainBackgroundView(pageWidth, pageHeight, backgroundColor), lineWidth(defaultLineWidth) {
+
+    config.loadValue(CFG_LINE_WIDTH, lineWidth);
+
+    if (backgroundColor.isLight()) {
+        foregroundColor = getColorOr(config, CFG_FOREGROUND_COLOR_1, defaultLineColor);
+    } else {
+        foregroundColor = getColorOr(config, CFG_ALT_FOREGROUND_COLOR_1, altDefaultLineColor);
+    }
+}
+
+void xoj::view::OneColorBackgroundView::multiplyLineWidth(double factor) { lineWidth *= factor; }
+
+Color OneColorBackgroundView::getColorOr(const BackgroundConfig& config, const std::string& str,
+                                         const Color& defaultColor) {
+    if (uint32_t hexColor; config.loadValueHex(str, hexColor)) {
+        return Color(hexColor);
+    }
+    return defaultColor;
+}
diff --git a/entry/src/main/cpp/src/core/view/background/OneColorBackgroundView.h b/entry/src/main/cpp/src/core/view/background/OneColorBackgroundView.h
new file mode 100644
index 0000000..e4ab39b
--- /dev/null
+++ b/entry/src/main/cpp/src/core/view/background/OneColorBackgroundView.h
@@ -0,0 +1,42 @@
+/*
+ * Xournal++
+ *
+ * Class for backgrounds with lineWidth and a line color
+ *
+ * @author Xournal++ Team
+ * https://github.com/xournalpp/xournalpp
+ *
+ * @license GNU GPLv2 or later
+ */
+
+#pragma once
+
+#include <string>  // for string
+
+#include "util/Color.h"  // for Color
+
+#include "PlainBackgroundView.h"  // for PlainBackgroundView
+
+class BackgroundConfig;
+
+namespace xoj::view {
+class OneColorBackgroundView: public PlainBackgroundView {
+public:
+    OneColorBackgroundView(double pageWidth, double pageHeight, Color backgroundColor, const BackgroundConfig& config,
+                           double defaultLineWidth, Color defaultLineColor, Color altDefaultLineColor);
+    virtual ~OneColorBackgroundView() = default;
+
+    void multiplyLineWidth(double factor);
+
+protected:
+    /**
+     * @brief Get the config's Hex value associated to the config string and make it a color.
+     * Fallback to defaultColor if the value does not exist in config.
+     */
+    static Color getColorOr(const BackgroundConfig& config, const std::string& str, const Color& defaultColor);
+
+protected:
+    Color foregroundColor;
+    double lineWidth;
+};
+};  // namespace xoj::view
diff --git a/entry/src/main/cpp/src/core/view/background/PdfBackgroundView.cpp b/entry/src/main/cpp/src/core/view/background/PdfBackgroundView.cpp
new file mode 100644
index 0000000..32c7403
--- /dev/null
+++ b/entry/src/main/cpp/src/core/view/background/PdfBackgroundView.cpp
@@ -0,0 +1,30 @@
+#include "PdfBackgroundView.h"
+
+#include <glib.h>  // for g_warning
+
+#include "control/PdfCache.h"                // for PdfCache
+#include "util/Assert.h"                     // for xoj_assert
+#include "view/background/BackgroundView.h"  // for BackgroundView, view
+
+using namespace xoj::view;
+
+PdfBackgroundView::PdfBackgroundView(double pageWidth, double pageHeight, size_t pageNo, PdfCache* pdfCache):
+        BackgroundView(pageWidth, pageHeight), pageNo(pageNo), pdfCache(pdfCache) {}
+
+void PdfBackgroundView::draw(cairo_t* cr) const {
+    if (pdfCache) {
+        // get zoom from cairo
+        cairo_matrix_t matrix = {0};
+        cairo_get_matrix(cr, &matrix);
+        xoj_assert(matrix.xx == matrix.yy && matrix.xy == 0.0 && matrix.yx == 0.0);  // Homothety matrix
+        double scaleX;
+        double scaleY;
+        cairo_surface_get_device_scale(cairo_get_target(cr), &scaleX, &scaleY);
+        xoj_assert(scaleX == scaleY);
+        double pixelsPerPageUnit = matrix.xx * scaleX;
+        pdfCache->render(cr, pageNo, pixelsPerPageUnit, pageWidth, pageHeight);
+    } else {
+        g_warning("PdfBackgroundView::draw Missing pdf cache: cannot render the pdf page");
+        PdfCache::renderMissingPdfPage(cr, pageWidth, pageHeight);
+    }
+}
diff --git a/entry/src/main/cpp/src/core/view/background/PdfBackgroundView.h b/entry/src/main/cpp/src/core/view/background/PdfBackgroundView.h
new file mode 100644
index 0000000..35a4a3a
--- /dev/null
+++ b/entry/src/main/cpp/src/core/view/background/PdfBackgroundView.h
@@ -0,0 +1,41 @@
+/*
+ * Xournal++
+ *
+ * Displays a pdf background
+ *
+ * @author Xournal++ Team
+ * https://github.com/xournalpp/xournalpp
+ *
+ * @license GNU GPLv2 or later
+ */
+
+#pragma once
+
+#include <cstddef>  // for size_t
+
+#include <cairo.h>  // for cairo_t
+
+#include "BackgroundView.h"  // for BackgroundView
+
+class PdfCache;
+
+namespace xoj {
+namespace view {
+
+class PdfBackgroundView: public BackgroundView {
+public:
+    PdfBackgroundView(double pageWidth, double pageHeight, size_t pageNo, PdfCache* pdfCache = nullptr);
+    virtual ~PdfBackgroundView() = default;
+
+    /**
+     * @brief Draws the background on the entire mask represented by the cairo context cr
+     */
+    void draw(cairo_t* cr) const override;
+
+private:
+    size_t pageNo;
+    PdfCache* pdfCache = nullptr;
+};
+
+};  // namespace view
+};  // namespace xoj
diff --git a/entry/src/main/cpp/src/core/view/background/PlainBackgroundView.cpp b/entry/src/main/cpp/src/core/view/background/PlainBackgroundView.cpp
new file mode 100644
index 0000000..bbc6a9e
--- /dev/null
+++ b/entry/src/main/cpp/src/core/view/background/PlainBackgroundView.cpp
@@ -0,0 +1,21 @@
+#include "PlainBackgroundView.h"
+
+#include <algorithm>  // for max, min
+
+#include "util/safe_casts.h"                 // for ceil_cast, floor_cast
+#include "view/background/BackgroundView.h"  // for BackgroundView, view
+
+using namespace xoj::view;
+
+PlainBackgroundView::PlainBackgroundView(double pageWidth, double pageHeight, Color backgroundColor):
+        BackgroundView(pageWidth, pageHeight), backgroundColor(backgroundColor) {}
+
+void PlainBackgroundView::draw(cairo_t* cr) const {
+    Util::cairo_set_source_rgbi(cr, this->backgroundColor);
+    cairo_paint(cr);
+}
+
+std::pair<int, int> PlainBackgroundView::getIndexBounds(double min, double max, double step, double margin,
+                                                        double length) {
+    return {ceil_cast<int>(std::max(min, margin) / step), floor_cast<int>(std::min(max, length - margin) / step)};
+}
diff --git a/entry/src/main/cpp/src/core/view/background/PlainBackgroundView.h b/entry/src/main/cpp/src/core/view/background/PlainBackgroundView.h
new file mode 100644
index 0000000..8cf584b
--- /dev/null
+++ b/entry/src/main/cpp/src/core/view/background/PlainBackgroundView.h
@@ -0,0 +1,35 @@
+/*
+ * Xournal++
+ *
+ * Class for plain backgrounds
+ *
+ * @author Xournal++ Team
+ * https://github.com/xournalpp/xournalpp
+ *
+ * @license GNU GPLv2 or later
+ */
+
+#pragma once
+
+#include <utility>  // for pair
+
+#include <cairo.h>  // for cairo_t
+
+#include "util/Color.h"  // for Color
+
+#include "BackgroundView.h"  // for BackgroundView
+
+namespace xoj::view {
+class PlainBackgroundView: public BackgroundView {
+public:
+    PlainBackgroundView(double pageWidth, double pageHeight, Color backgroundColor);
+    virtual ~PlainBackgroundView() = default;
+
+    virtual void draw(cairo_t* cr) const override;
+
+protected:
+    Color backgroundColor;
+
+    static std::pair<int, int> getIndexBounds(double min, double max, double step, double margin, double length);
+};
+};  // namespace xoj::view
diff --git a/entry/src/main/cpp/src/core/view/background/RuledBackgroundView.cpp b/entry/src/main/cpp/src/core/view/background/RuledBackgroundView.cpp
new file mode 100644
index 0000000..2b87f04
--- /dev/null
+++ b/entry/src/main/cpp/src/core/view/background/RuledBackgroundView.cpp
@@ -0,0 +1,48 @@
+#include "RuledBackgroundView.h"
+
+#include <memory>  // for allocator
+
+#include "model/BackgroundConfig.h"                  // for BackgroundConfig
+#include "view/background/BackgroundView.h"          // for view
+#include "view/background/OneColorBackgroundView.h"  // for OneColorBackgrou...
+#include "view/background/PlainBackgroundView.h"     // for PlainBackgroundView
+
+using namespace background_config_strings;
+using namespace xoj::view;
+
+RuledBackgroundView::RuledBackgroundView(double pageWidth, double pageHeight, Color backgroundColor,
+                                         const BackgroundConfig& config):
+        OneColorBackgroundView(pageWidth, pageHeight, backgroundColor, config, DEFAULT_LINE_WIDTH, DEFAULT_H_LINE_COLOR,
+                               ALT_DEFAULT_H_LINE_COLOR) {
+    config.loadValue(CFG_RASTER, lineSpacing);
+}
+
+void RuledBackgroundView::draw(cairo_t* cr) const {
+    // Paint the background color
+    PlainBackgroundView::draw(cr);
+
+    // Get the bounds of the mask, in page coordinates
+    double minX;
+    double maxX;
+    double minY;
+    double maxY;
+    cairo_clip_extents(cr, &minX, &minY, &maxX, &maxY);
+
+    //  Add a 0.5 * lineWidth padding in case the line is just outside the mask but its thickness still makes it
+    //  (partially) visible
+    auto [indexMinY, indexMaxY] =
+            getIndexBounds(minY - HEADER_SIZE - 0.5 * lineWidth, maxY - HEADER_SIZE + 0.5 * lineWidth, lineSpacing, 0.0,
+                           pageHeight - HEADER_SIZE - FOOTER_SIZE);
+
+    for (int i = indexMinY; i <= indexMaxY; ++i) {
+        cairo_move_to(cr, minX, HEADER_SIZE + i * lineSpacing);
+        cairo_line_to(cr, maxX, HEADER_SIZE + i * lineSpacing);
+    }
+
+    cairo_save(cr);
+    Util::cairo_set_source_rgbi(cr, foregroundColor);
+    cairo_set_line_width(cr, lineWidth);
+    cairo_set_line_cap(cr, CAIRO_LINE_CAP_BUTT);
+    cairo_stroke(cr);
+    cairo_restore(cr);
+}
diff --git a/entry/src/main/cpp/src/core/view/background/RuledBackgroundView.h b/entry/src/main/cpp/src/core/view/background/RuledBackgroundView.h
new file mode 100644
index 0000000..1b31934
--- /dev/null
+++ b/entry/src/main/cpp/src/core/view/background/RuledBackgroundView.h
@@ -0,0 +1,40 @@
+/*
+ * Xournal++
+ *
+ * Class for ruled backgrounds
+ *
+ * @author Xournal++ Team
+ * https://github.com/xournalpp/xournalpp
+ *
+ * @license GNU GPLv2 or later
+ */
+
+#pragma once
+
+#include <cairo.h>  // for cairo_t
+
+#include "util/Color.h"  // for Color
+
+#include "OneColorBackgroundView.h"  // for OneColorBackgroundView
+
+class BackgroundConfig;
+
+namespace xoj::view {
+class RuledBackgroundView: public OneColorBackgroundView {
+public:
+    RuledBackgroundView(double pageWidth, double pageHeight, Color backgroundColor, const BackgroundConfig& config);
+    virtual ~RuledBackgroundView() = default;
+
+    virtual void draw(cairo_t* cr) const override;
+
+protected:
+    double lineSpacing = 24.0;  // Between two horizontal lines
+
+    constexpr static Color DEFAULT_H_LINE_COLOR = Colors::xopp_dodgerblue;
+    constexpr static Color ALT_DEFAULT_H_LINE_COLOR = Colors::xopp_darkslategray;
+    constexpr static double DEFAULT_LINE_WIDTH = 0.5;
+
+    constexpr static double HEADER_SIZE = 80.0;
+    constexpr static double FOOTER_SIZE = 60.0;
+};
+};  // namespace xoj::view
diff --git a/entry/src/main/cpp/src/core/view/background/StavesBackgroundView.cpp b/entry/src/main/cpp/src/core/view/background/StavesBackgroundView.cpp
new file mode 100644
index 0000000..638f541
--- /dev/null
+++ b/entry/src/main/cpp/src/core/view/background/StavesBackgroundView.cpp
@@ -0,0 +1,55 @@
+#include "StavesBackgroundView.h"
+
+#include "model/BackgroundConfig.h"                  // for BackgroundConfig
+#include "view/background/BackgroundView.h"          // for view
+#include "view/background/OneColorBackgroundView.h"  // for OneColorBackgrou...
+#include "view/background/PlainBackgroundView.h"     // for PlainBackgroundView
+
+using namespace background_config_strings;
+using namespace xoj::view;
+
+StavesBackgroundView::StavesBackgroundView(double pageWidth, double pageHeight, Color backgroundColor,
+                                           const BackgroundConfig& config):
+        OneColorBackgroundView(pageWidth, pageHeight, backgroundColor, config, DEFAULT_LINE_WIDTH, DEFAULT_LINE_COLOR,
+                               ALT_DEFAULT_LINE_COLOR) {}
+
+void StavesBackgroundView::draw(cairo_t* cr) const {
+    // Paint the background color
+    PlainBackgroundView::draw(cr);
+
+    // Get the bounds of the mask, in page coordinates
+    double minX;
+    double maxX;
+    double minY;
+    double maxY;
+    cairo_clip_extents(cr, &minX, &minY, &maxX, &maxY);
+
+    const double staffHeight = lineWidth + 4 * LINES_SPACING;
+
+    // The `+ 4 * lineWidth` is here as a legacy and it does not make a lot of sense.
+    // Still, we must keep it so that we do not alter how staves are displayed in pre-existing documents
+    const double vOffsetBetweenStaves = STAVES_SPACING + staffHeight + 4 * lineWidth;
+
+    auto [indexMinY, indexMaxY] = getIndexBounds(minY - HEADER_SIZE - staffHeight, maxY + 0.5 * lineWidth - HEADER_SIZE,
+                                                 vOffsetBetweenStaves, 0.0, pageHeight - HEADER_SIZE - FOOTER_SIZE);
+
+    auto drawStaff = [cr, w = this->pageWidth](double offset) {
+        for (int i = 0; i < 5; ++i) {
+            double y = offset + i * LINES_SPACING;
+            cairo_move_to(cr, MARGIN, y);
+            cairo_line_to(cr, w - MARGIN, y);
+        }
+        cairo_line_to(cr, w - MARGIN, offset);
+        cairo_move_to(cr, MARGIN, offset);
+        cairo_line_to(cr, MARGIN, offset + 4 * LINES_SPACING);
+    };
+
+    for (int i = indexMinY; i <= indexMaxY; ++i) { drawStaff(HEADER_SIZE + i * vOffsetBetweenStaves); }
+
+    cairo_save(cr);
+    Util::cairo_set_source_rgbi(cr, foregroundColor);
+    cairo_set_line_width(cr, lineWidth);
+    cairo_set_line_cap(cr, CAIRO_LINE_CAP_SQUARE);
+    cairo_stroke(cr);
+    cairo_restore(cr);
+}
diff --git a/entry/src/main/cpp/src/core/view/background/StavesBackgroundView.h b/entry/src/main/cpp/src/core/view/background/StavesBackgroundView.h
new file mode 100644
index 0000000..ecd98d9
--- /dev/null
+++ b/entry/src/main/cpp/src/core/view/background/StavesBackgroundView.h
@@ -0,0 +1,41 @@
+/*
+ * Xournal++
+ *
+ * Class for staves backgrounds
+ *
+ * @author Xournal++ Team
+ * https://github.com/xournalpp/xournalpp
+ *
+ * @license GNU GPLv2 or later
+ */
+
+#pragma once
+
+#include <cairo.h>  // for cairo_t
+
+#include "util/Color.h"  // for Color
+
+#include "OneColorBackgroundView.h"  // for OneColorBackgroundView
+
+class BackgroundConfig;
+
+namespace xoj::view {
+class StavesBackgroundView: public OneColorBackgroundView {
+public:
+    StavesBackgroundView(double pageWidth, double pageHeight, Color backgroundColor, const BackgroundConfig& config);
+    virtual ~StavesBackgroundView() = default;
+
+    virtual void draw(cairo_t* cr) const override;
+
+protected:
+    constexpr static Color DEFAULT_LINE_COLOR = Colors::black;
+    constexpr static Color ALT_DEFAULT_LINE_COLOR = Colors::white;
+    constexpr static double DEFAULT_LINE_WIDTH = 0.5;
+
+    constexpr static double HEADER_SIZE = 80.0;
+    constexpr static double FOOTER_SIZE = 60.0;
+    constexpr static double MARGIN = 50.0;
+    constexpr static double STAVES_SPACING = 40.0;  // Between two staves
+    constexpr static double LINES_SPACING = 5.0;    // Between two lines within a staff
+};
+};  // namespace xoj::view
diff --git a/entry/src/main/cpp/src/core/view/background/TransparentCheckerboardBackgroundView.cpp b/entry/src/main/cpp/src/core/view/background/TransparentCheckerboardBackgroundView.cpp
new file mode 100644
index 0000000..837a36a
--- /dev/null
+++ b/entry/src/main/cpp/src/core/view/background/TransparentCheckerboardBackgroundView.cpp
@@ -0,0 +1,43 @@
+#include "TransparentCheckerboardBackgroundView.h"
+
+#include "view/background/BackgroundView.h"  // for BackgroundView, view
+
+using namespace xoj::view;
+
+TransparentCheckerboardBackgroundView::TransparentCheckerboardBackgroundView(double pageWidth, double pageHeight):
+        BackgroundView(pageWidth, pageHeight), pattern(createPattern()) {}
+
+TransparentCheckerboardBackgroundView::~TransparentCheckerboardBackgroundView() noexcept {
+    cairo_pattern_destroy(pattern);
+}
+
+auto TransparentCheckerboardBackgroundView::createPattern() -> cairo_pattern_t* {
+    cairo_surface_t* surf = cairo_image_surface_create(CAIRO_FORMAT_RGB24, 2 * CHECKER_SIZE, 2 * CHECKER_SIZE);
+    cairo_t* cr = cairo_create(surf);
+
+    Util::cairo_set_source_rgbi(cr, LIGHT_GREY);
+    cairo_paint(cr);
+
+    Util::cairo_set_source_rgbi(cr, DARK_GREY);
+    cairo_rectangle(cr, CHECKER_SIZE, 0, CHECKER_SIZE, CHECKER_SIZE);
+    cairo_rectangle(cr, 0, CHECKER_SIZE, CHECKER_SIZE, CHECKER_SIZE);
+    cairo_fill(cr);
+
+    cairo_destroy(cr);
+
+    cairo_pattern_t* pattern = cairo_pattern_create_for_surface(surf);
+
+    cairo_surface_destroy(surf);  // The surface is now owned by the pattern
+
+    cairo_pattern_set_filter(pattern, CAIRO_FILTER_NEAREST);
+    cairo_pattern_set_extend(pattern, CAIRO_EXTEND_REPEAT);
+
+    return pattern;
+}
+
+void TransparentCheckerboardBackgroundView::draw(cairo_t* cr) const {
+    cairo_save(cr);
+    cairo_set_source(cr, this->pattern);
+    cairo_paint(cr);
+    cairo_restore(cr);
+}
diff --git a/entry/src/main/cpp/src/core/view/background/TransparentCheckerboardBackgroundView.h b/entry/src/main/cpp/src/core/view/background/TransparentCheckerboardBackgroundView.h
new file mode 100644
index 0000000..9fcbe2a
--- /dev/null
+++ b/entry/src/main/cpp/src/core/view/background/TransparentCheckerboardBackgroundView.h
@@ -0,0 +1,37 @@
+/*
+ * Xournal++
+ *
+ * Class for transparent backgrounds (checkerboard pattern)
+ *
+ * @author Xournal++ Team
+ * https://github.com/xournalpp/xournalpp
+ *
+ * @license GNU GPLv2 or later
+ */
+
+#pragma once
+
+#include <cairo.h>  // for cairo_pattern_t, cairo_t
+
+#include "util/Color.h"  // for Color
+
+#include "BackgroundView.h"  // for BackgroundView
+
+namespace xoj::view {
+class TransparentCheckerboardBackgroundView: public BackgroundView {
+public:
+    TransparentCheckerboardBackgroundView(double pageWidth, double pageHeight);
+    virtual ~TransparentCheckerboardBackgroundView() noexcept;
+
+    void draw(cairo_t* cr) const override;
+
+private:
+    cairo_pattern_t* pattern = nullptr;
+
+protected:
+    static cairo_pattern_t* createPattern();
+    static constexpr int CHECKER_SIZE = 8;
+    static constexpr Color DARK_GREY{Colors::gray};
+    static constexpr Color LIGHT_GREY{Colors::silver};
+};
+};  // namespace xoj::view
diff --git a/entry/src/main/cpp/src/core/view/overlays/BaseShapeOrSplineToolView.cpp b/entry/src/main/cpp/src/core/view/overlays/BaseShapeOrSplineToolView.cpp
new file mode 100644
index 0000000..1fab5a2
--- /dev/null
+++ b/entry/src/main/cpp/src/core/view/overlays/BaseShapeOrSplineToolView.cpp
@@ -0,0 +1,85 @@
+#include "BaseShapeOrSplineToolView.h"
+
+#include "control/tools/InputHandler.h"
+#include "model/LineStyle.h"
+#include "model/Stroke.h"
+#include "util/Assert.h"
+#include "util/Color.h"
+#include "util/Util.h"  // for cairo_set_dash_from_vector
+
+using namespace xoj::view;
+
+/**
+ * @brief To avoid rendering artefact (due to antialiasing?) we add a padding when clearing out the mask (for filled
+ * highlighter only)
+ */
+constexpr double MASK_CLEARANCE_PADDING = 1;
+
+static const Stroke& safeGetStroke(const InputHandler* h) {
+    xoj_assert(h);
+    xoj_assert(h->getStroke());
+    return *h->getStroke();
+}
+
+static double getFillingAlpha(const InputHandler* h) {
+    auto f = safeGetStroke(h).getFill();
+    return f == -1 ? 0.0 : f / 255.0;
+}
+
+BaseShapeOrSplineToolView::BaseShapeOrSplineToolView(const InputHandler* toolHandler, Repaintable* parent):
+        BaseStrokeToolView(parent, safeGetStroke(toolHandler)),
+        fillingAlpha(getFillingAlpha(toolHandler)),
+        needMask(this->fillingAlpha != 0.0 && safeGetStroke(toolHandler).getToolType() == StrokeTool::HIGHLIGHTER) {}
+
+BaseShapeOrSplineToolView::~BaseShapeOrSplineToolView() noexcept = default;
+
+cairo_t* BaseShapeOrSplineToolView::prepareContext(cairo_t* cr) const {
+    cairo_set_operator(cr, this->cairoOp);
+
+    if (needMask) {
+        // The mask is only for filled highlighter strokes, to avoid artefacts as in
+        // https://github.com/xournalpp/xournalpp/issues/3709
+        if (!mask.isInitialized()) {
+            mask = createMask(cr);
+            const auto& dashes = this->lineStyle.getDashes();
+            Util::cairo_set_dash_from_vector(mask.get(), dashes, 0);
+            cairo_set_line_width(mask.get(), this->strokeWidth);
+            // operator is already set by createMask().
+        } else {
+            // Clear the mask
+            maskWipeExtent.addPadding(MASK_CLEARANCE_PADDING);
+            mask.wipeRange(maskWipeExtent);
+            maskWipeExtent = Range();
+        }
+        return mask.get();
+    } else {
+        cairo_set_line_cap(cr, CAIRO_LINE_CAP_ROUND);
+        cairo_set_line_join(cr, CAIRO_LINE_JOIN_ROUND);
+        cairo_set_line_width(cr, this->strokeWidth);
+
+        const auto& dashes = this->lineStyle.getDashes();
+        Util::cairo_set_dash_from_vector(cr, dashes, 0.0);
+        return cr;
+    }
+}
+
+void BaseShapeOrSplineToolView::commitDrawing(cairo_t* cr) const {
+    if (fillingAlpha != 0.0) {
+        if (mask.isInitialized()) {
+            cairo_fill_preserve(mask.get());
+        } else {
+            // Not need when using a mask: transparency will be applied upon blitting.
+            Util::cairo_set_source_rgbi(cr, strokeColor, fillingAlpha);
+            cairo_fill_preserve(cr);
+        }
+    }
+
+    Util::cairo_set_source_argb(cr, this->strokeColor);
+
+    if (mask.isInitialized()) {
+        cairo_stroke(mask.get());
+        mask.blitTo(cr);
+    } else {
+        cairo_stroke(cr);
+    }
+}
diff --git a/entry/src/main/cpp/src/core/view/overlays/BaseShapeOrSplineToolView.h b/entry/src/main/cpp/src/core/view/overlays/BaseShapeOrSplineToolView.h
new file mode 100644
index 0000000..325dc46
--- /dev/null
+++ b/entry/src/main/cpp/src/core/view/overlays/BaseShapeOrSplineToolView.h
@@ -0,0 +1,45 @@
+/*
+ * Xournal++
+ *
+ * Base view for shapes or spline tools
+ *
+ * @author Xournal++ Team
+ * https://github.com/xournalpp/xournalpp
+ *
+ * @license GNU GPLv2 or later
+ */
+#pragma once
+
+#include <cairo.h>
+
+#include "util/Range.h"
+#include "view/Mask.h"
+
+#include "BaseStrokeToolView.h"
+
+class InputHandler;
+
+namespace xoj::view {
+class Repaintable;
+
+class BaseShapeOrSplineToolView: public BaseStrokeToolView {
+
+public:
+    BaseShapeOrSplineToolView(const InputHandler* handler, Repaintable* parent);
+    ~BaseShapeOrSplineToolView() noexcept override;
+
+protected:
+    cairo_t* prepareContext(cairo_t* cr) const;
+
+    void commitDrawing(cairo_t* cr) const;
+
+    const double fillingAlpha;
+
+    // The mask is only for filled highlighter strokes, to avoid artefacts as in
+    // https://github.com/xournalpp/xournalpp/issues/3709
+    mutable Mask mask;
+    const bool needMask;
+    /// @brief The part of the mask that needs to be wiped to ensure the filling is correctly drawn.
+    mutable Range maskWipeExtent;
+};
+};  // namespace xoj::view
diff --git a/entry/src/main/cpp/src/core/view/overlays/BaseStrokeToolView.cpp b/entry/src/main/cpp/src/core/view/overlays/BaseStrokeToolView.cpp
new file mode 100644
index 0000000..d9bb529
--- /dev/null
+++ b/entry/src/main/cpp/src/core/view/overlays/BaseStrokeToolView.cpp
@@ -0,0 +1,58 @@
+#include "BaseStrokeToolView.h"
+
+#include <cmath>
+
+#include <cairo.h>
+
+#include "model/Stroke.h"
+#include "util/Range.h"
+#include "view/Mask.h"
+#include "view/Repaintable.h"
+#include "view/overlays/OverlayView.h"
+
+using namespace xoj::view;
+
+BaseStrokeToolView::BaseStrokeToolView(Repaintable* parent, const Stroke& stroke):
+        ToolView(parent),
+        cairoOp(stroke.getToolType() == StrokeTool::HIGHLIGHTER ? CAIRO_OPERATOR_MULTIPLY : CAIRO_OPERATOR_OVER),
+        strokeColor(strokeColorWithAlpha(stroke)),
+        lineStyle(stroke.getLineStyle()),
+        strokeWidth(stroke.getWidth()) {}
+
+BaseStrokeToolView::~BaseStrokeToolView() noexcept = default;
+
+Color BaseStrokeToolView::strokeColorWithAlpha(const Stroke& s) {
+    Color c = s.getColor();
+    if (s.getToolType() == StrokeTool::HIGHLIGHTER) {
+        c.alpha = s.getFill() == -1 ? 120U : static_cast<uint8_t>(s.getFill());
+    } else {
+        c.alpha = 255U;
+    }
+    return c;
+}
+
+auto BaseStrokeToolView::createMask(cairo_t* tgtcr) const -> Mask {
+    const double zoom = this->parent->getZoom();
+    Range visibleRange = this->parent->getVisiblePart();
+
+    if (!visibleRange.isValid()) {
+        /*
+         * The user might be drawing on a page that is not visible at all:
+         * e.g. https://github.com/xournalpp/xournalpp/pull/4158#issuecomment-1385954494
+         */
+        return Mask();
+    }
+
+    // Add a small padding, to avoid visual artefacts if scrolling right after finishing a stroke touching the visible
+    // area's border
+    visibleRange.addPadding(0.5 * this->strokeWidth);
+
+    Mask mask(cairo_get_target(tgtcr), visibleRange, zoom);
+    cairo_t* cr = mask.get();
+
+    cairo_set_source_rgba(cr, 1, 1, 1, 1);
+    cairo_set_operator(cr, CAIRO_OPERATOR_OVER);
+    cairo_set_line_cap(cr, CAIRO_LINE_CAP_ROUND);
+    cairo_set_line_join(cr, CAIRO_LINE_JOIN_ROUND);
+    return mask;
+}
diff --git a/entry/src/main/cpp/src/core/view/overlays/BaseStrokeToolView.h b/entry/src/main/cpp/src/core/view/overlays/BaseStrokeToolView.h
new file mode 100644
index 0000000..f763355
--- /dev/null
+++ b/entry/src/main/cpp/src/core/view/overlays/BaseStrokeToolView.h
@@ -0,0 +1,51 @@
+/*
+ * Xournal++
+ *
+ * Virtual class for showing overlays (e.g. active tools, selections and so on)
+ *
+ * @author Xournal++ Team
+ * https://github.com/xournalpp/xournalpp
+ *
+ * @license GNU GPLv2 or later
+ */
+
+#pragma once
+
+#include <cairo.h>
+
+#include "model/LineStyle.h"
+#include "util/Color.h"
+#include "view/overlays/OverlayView.h"
+
+class Stroke;
+
+namespace xoj::view {
+class Mask;
+class Repaintable;
+
+class BaseStrokeToolView: public ToolView {
+protected:
+    BaseStrokeToolView(Repaintable* parent, const Stroke& stroke);
+    ~BaseStrokeToolView() noexcept override;
+
+    /**
+     * @brief Creates a mask corresponding to the parent's visible area.
+     * The mask is optimized (?) to be blitted to a surface of the same type as cairo_get_target(targetCr).
+     * If targetCr == nullptr, the surface is of CAIRO_SURFACE_TYPE_IMAGE.
+     */
+    Mask createMask(cairo_t* targetCr) const;
+
+    /**
+     * @brief Helper function to get a color whose alpha value depends on the tool's properties
+     */
+    static Color strokeColorWithAlpha(const Stroke& s);
+
+    /**
+     * @brief All that's required to draw a stroke in cairo
+     */
+    const cairo_operator_t cairoOp;
+    const Color strokeColor;
+    const LineStyle lineStyle;
+    double strokeWidth;
+};
+};  // namespace xoj::view
diff --git a/entry/src/main/cpp/src/core/view/overlays/ImageSizeSelectionView.cpp b/entry/src/main/cpp/src/core/view/overlays/ImageSizeSelectionView.cpp
new file mode 100644
index 0000000..7f5acc4
--- /dev/null
+++ b/entry/src/main/cpp/src/core/view/overlays/ImageSizeSelectionView.cpp
@@ -0,0 +1,57 @@
+#include "ImageSizeSelectionView.h"
+
+#include "control/tools/ImageSizeSelection.h"  // for ImageSizeSelection
+#include "util/Rectangle.h"                    // for Rectangle
+#include "util/raii/CairoWrappers.h"           // for cairo_save
+#include "view/Repaintable.h"                  // for Repaintable
+
+using namespace xoj::view;
+
+
+ImageSizeSelectionView::ImageSizeSelectionView(const ImageSizeSelection* imageSizeSelection, Repaintable* parent,
+                                               Color selectionColor):
+        OverlayView(parent), imageSizeSelection(imageSizeSelection), selectionColor(selectionColor) {
+    this->registerToPool(imageSizeSelection->getViewPool());
+}
+
+ImageSizeSelectionView::~ImageSizeSelectionView() noexcept = default;
+
+
+void ImageSizeSelectionView::draw(cairo_t* cr) const {
+    const xoj::util::Rectangle space = this->imageSizeSelection->getSelectedSpace();
+
+    xoj::util::CairoSaveGuard const saveGuard(cr);  // cairo_save
+
+    cairo_set_line_width(cr, BORDER_WIDTH_IN_PIXELS / this->parent->getZoom());
+    cairo_set_dash(cr, DASH_PATTERN.data(), DASH_PATTERN.size(), 0);
+    Util::cairo_set_source_rgbi(cr, selectionColor);
+
+    cairo_new_path(cr);
+
+    // these lines form the outline of the space rectangle
+    cairo_line_to(cr, space.x, space.y);
+    cairo_line_to(cr, space.x, space.y + space.height);
+    cairo_line_to(cr, space.x + space.width, space.y + space.height);
+    cairo_line_to(cr, space.x + space.width, space.y);
+
+
+    cairo_close_path(cr);
+
+    cairo_stroke_preserve(cr);
+    Util::cairo_set_source_rgbi(cr, selectionColor, OPACITY_FOR_FILL);
+    cairo_fill(cr);
+}
+
+auto ImageSizeSelectionView::isViewOf(const OverlayBase* overlay) const -> bool {
+    return overlay == this->imageSizeSelection;
+}
+
+void ImageSizeSelectionView::on(ImageSizeSelectionView::FlagDirtyRegionRequest, Range rg) {
+    rg.addPadding(BORDER_WIDTH_IN_PIXELS / this->parent->getZoom());
+    this->parent->flagDirtyRegion(rg);
+}
+
+void ImageSizeSelectionView::deleteOn(ImageSizeSelectionView::FinalizationRequest, Range rg) {
+    rg.addPadding(BORDER_WIDTH_IN_PIXELS / this->parent->getZoom());
+    this->parent->deleteOverlayView(this, rg);
+}
diff --git a/entry/src/main/cpp/src/core/view/overlays/ImageSizeSelectionView.h b/entry/src/main/cpp/src/core/view/overlays/ImageSizeSelectionView.h
new file mode 100644
index 0000000..0eb4969
--- /dev/null
+++ b/entry/src/main/cpp/src/core/view/overlays/ImageSizeSelectionView.h
@@ -0,0 +1,56 @@
+/*
+ * Xournal++
+ *
+ * Displays a Rectangle to see while selecting space for an image
+ *
+ * @author Xournal++ Team
+ * https://github.com/xournalpp/xournalpp
+ *
+ * @license GNU GPLv2 or later
+ */
+#pragma once
+
+#include <array>  // for std::array
+
+#include "util/Color.h"         // for Color
+#include "util/DispatchPool.h"  // for Listener
+
+#include "OverlayView.h"  // for OverlayView
+
+class ImageSizeSelection;
+class Range;
+
+namespace xoj::view {
+class Repaintable;
+
+class ImageSizeSelectionView: public OverlayView, public xoj::util::Listener<ImageSizeSelectionView> {
+public:
+    ImageSizeSelectionView(const ImageSizeSelection* imageSizeSelection, Repaintable* parent, Color selectionColor);
+    virtual ~ImageSizeSelectionView() noexcept;
+
+    /**
+     * @brief Draws the overlay to the given context
+     */
+    void draw(cairo_t* cr) const override;
+
+    auto isViewOf(const OverlayBase* overlay) const -> bool override;
+
+    // Listener
+    static constexpr struct FlagDirtyRegionRequest {
+    } FLAG_DIRTY_REGION = {};
+    void on(FlagDirtyRegionRequest, Range rg);
+
+    static constexpr struct FinalizationRequest {
+    } FINALIZATION_REQUEST = {};
+    void deleteOn(FinalizationRequest, Range rg);
+
+private:
+    const ImageSizeSelection* imageSizeSelection;
+    const Color selectionColor;
+
+    static constexpr int BORDER_WIDTH_IN_PIXELS = 1;
+    static constexpr double OPACITY_FOR_FILL = 0.1;
+    static constexpr std::array<const double, 2> DASH_PATTERN = {6.0, 4.0};
+};
+
+};  // namespace xoj::view
\ No newline at end of file
diff --git a/entry/src/main/cpp/src/core/view/overlays/LaserPointerView.cpp b/entry/src/main/cpp/src/core/view/overlays/LaserPointerView.cpp
new file mode 100644
index 0000000..517033e
--- /dev/null
+++ b/entry/src/main/cpp/src/core/view/overlays/LaserPointerView.cpp
@@ -0,0 +1,85 @@
+#include "LaserPointerView.h"
+
+#include "control/tools/LaserPointerHandler.h"
+#include "control/tools/StrokeHandler.h"
+#include "model/Stroke.h"
+#include "util/Range.h"
+#include "util/raii/CairoWrappers.h"
+#include "view/Repaintable.h"
+#include "view/View.h"
+
+#include "StrokeToolView.h"
+
+using namespace xoj::view;
+
+LaserPointerView::LaserPointerView(const LaserPointerHandler* handler, Repaintable* parent):
+        OverlayView(parent), handler(handler) {
+    this->registerToPool(handler->getViewPool());
+}
+
+LaserPointerView::~LaserPointerView() noexcept { this->unregisterFromPool(); }
+
+void LaserPointerView::draw(cairo_t* cr) const {
+    if (this->mask.isInitialized()) {
+        xoj::util::CairoSaveGuard saveGuard(cr);
+        cairo_set_operator(cr, CAIRO_OPERATOR_OVER);
+        this->mask.paintToWithAlpha(cr, this->alpha);
+    } else {
+        this->mask = createMask(cr);
+    }
+    if (this->activeStrokeView) {
+        this->activeStrokeView->draw(cr);
+    }
+}
+
+bool LaserPointerView::isViewOf(const OverlayBase* overlay) const { return overlay == this->handler; }
+
+void xoj::view::LaserPointerView::on(StartNewStrokeRequest, StrokeHandler* handler) {
+    this->activeStrokeView = std::make_unique<StrokeToolView>(handler, *handler->getStroke(), parent);
+    if (!this->extents.empty()) {
+        on(SET_ALPHA_REQUEST, 255);
+    }
+}
+
+void xoj::view::LaserPointerView::on(SetAlphaRequest, uint8_t alpha) {
+    this->alpha = alpha;
+    this->parent->flagDirtyRegion(this->extents);
+}
+
+void xoj::view::LaserPointerView::on(FinishStrokeRequest, const Range& strokeBox) {
+    xoj_assert(this->activeStrokeView);
+    if (this->mask.isInitialized()) {
+        this->activeStrokeView->draw(this->mask.get());
+    }
+    this->activeStrokeView.reset();
+    this->extents = this->extents.unite(strokeBox);
+}
+
+void xoj::view::LaserPointerView::on(InputCancellationRequest, const Range& rg) {
+    this->activeStrokeView.reset();
+    this->parent->flagDirtyRegion(rg);
+}
+
+void xoj::view::LaserPointerView::deleteOn(FinalizationRequest) {
+    this->parent->deleteOverlayView(this, this->extents);
+}
+
+
+auto xoj::view::LaserPointerView::createMask(cairo_t* tgtcr) const -> Mask {
+    const double zoom = this->parent->getZoom();
+    Range visibleRange = this->parent->getVisiblePart();
+
+    if (!visibleRange.isValid()) {
+        /*
+         * The user might be drawing on a page that is not visible at all:
+         * e.g. https://github.com/xournalpp/xournalpp/pull/4158#issuecomment-1385954494
+         */
+        return Mask();
+    }
+
+    Mask mask(cairo_get_target(tgtcr), visibleRange, zoom, CAIRO_CONTENT_COLOR_ALPHA);
+    cairo_t* cr = mask.get();
+
+    cairo_set_operator(cr, CAIRO_OPERATOR_OVER);
+    return mask;
+}
diff --git a/entry/src/main/cpp/src/core/view/overlays/LaserPointerView.h b/entry/src/main/cpp/src/core/view/overlays/LaserPointerView.h
new file mode 100644
index 0000000..9068e4b
--- /dev/null
+++ b/entry/src/main/cpp/src/core/view/overlays/LaserPointerView.h
@@ -0,0 +1,83 @@
+/*
+ * Xournal++
+ *
+ * View active Laser pointer strokes
+ *
+ * @author Xournal++ Team
+ * https://github.com/xournalpp/xournalpp
+ *
+ * @license GNU GPLv2 or later
+ */
+#pragma once
+
+#include <cstdint>
+
+#include <cairo.h>
+
+#include "util/DispatchPool.h"
+#include "util/Range.h"
+#include "view/Mask.h"
+#include "view/overlays/OverlayView.h"
+
+class OverlayBase;
+class Settings;
+class ZoomControl;
+class LaserPointerHandler;
+class StrokeHandler;
+
+namespace xoj::view {
+class Repaintable;
+class StrokeToolView;
+
+class LaserPointerView final: public OverlayView, public xoj::util::Listener<LaserPointerView> {
+
+public:
+    LaserPointerView(const LaserPointerHandler* handler, Repaintable* parent);
+    ~LaserPointerView() noexcept override;
+
+    /**
+     * @brief Draws the overlay to the given context
+     */
+    void draw(cairo_t* cr) const override;
+
+    bool isViewOf(const OverlayBase* overlay) const override;
+
+    /**
+     * Listener interface
+     */
+    static constexpr struct InputCancellationRequest {
+    } INPUT_CANCELLATION_REQUEST = {};
+    void on(InputCancellationRequest, const Range& rg);
+
+    static constexpr struct StartNewStrokeRequest {
+    } START_NEW_STROKE_REQUEST = {};
+    void on(StartNewStrokeRequest, StrokeHandler* handler);
+
+    static constexpr struct FinishStrokeRequest {
+    } FINISH_STROKE_REQUEST = {};
+    /// Deletes the TemporaryStrokeView and all references to the handler's StrokeHandler
+    void on(FinishStrokeRequest, const Range& strokeBox);
+
+    /// For fade out
+    static constexpr struct SetAlphaRequest {
+    } SET_ALPHA_REQUEST = {};
+    void on(SetAlphaRequest, uint8_t alpha);
+
+    static constexpr struct FinalizationRequest {
+    } FINALIZATION_REQUEST = {};
+    void deleteOn(FinalizationRequest);
+
+private:
+    Mask createMask(cairo_t* tgtcr) const;
+
+private:
+    const LaserPointerHandler* handler;
+
+    std::unique_ptr<StrokeToolView> activeStrokeView;
+
+    mutable Mask mask;
+
+    uint8_t alpha = 255;  ///< for fadeout
+    Range extents;        ///< for fadeout repaints
+};
+};  // namespace xoj::view
diff --git a/entry/src/main/cpp/src/core/view/overlays/OverlayView.h b/entry/src/main/cpp/src/core/view/overlays/OverlayView.h
new file mode 100644
index 0000000..9fca660
--- /dev/null
+++ b/entry/src/main/cpp/src/core/view/overlays/OverlayView.h
@@ -0,0 +1,45 @@
+/*
+ * Xournal++
+ *
+ * Virtual class for showing overlays (e.g. active tools, selections and so on)
+ *
+ * @author Xournal++ Team
+ * https://github.com/xournalpp/xournalpp
+ *
+ * @license GNU GPLv2 or later
+ */
+
+#pragma once
+
+#include <cairo.h>
+
+class OverlayBase;
+
+namespace xoj::view {
+class Repaintable;
+class OverlayView {
+public:
+    OverlayView(Repaintable* parent): parent(parent) {}
+    virtual ~OverlayView() = default;
+
+    /**
+     * @brief Draws the overlay to the given context
+     */
+    virtual void draw(cairo_t* cr) const = 0;
+
+    virtual bool isViewOf(const OverlayBase* overlay) const = 0;
+
+protected:
+    Repaintable* parent;
+};
+
+class ToolView: public OverlayView {
+public:
+    ToolView(Repaintable* parent): OverlayView(parent) {}
+
+    /**
+     * @brief Draws without putative drawing aids (e.g. spline knots and tangents, text frame)
+     */
+    virtual void drawWithoutDrawingAids(cairo_t* cr) const { this->draw(cr); }
+};
+};  // namespace xoj::view
diff --git a/entry/src/main/cpp/src/core/view/overlays/PdfElementSelectionView.cpp b/entry/src/main/cpp/src/core/view/overlays/PdfElementSelectionView.cpp
new file mode 100644
index 0000000..77c4e16
--- /dev/null
+++ b/entry/src/main/cpp/src/core/view/overlays/PdfElementSelectionView.cpp
@@ -0,0 +1,37 @@
+#include "PdfElementSelectionView.h"
+
+#include "control/tools/PdfElemSelection.h"
+#include "util/raii/CairoWrappers.h"
+#include "view/Repaintable.h"
+
+class Range;
+
+using namespace xoj::view;
+
+PdfElementSelectionView::PdfElementSelectionView(const PdfElemSelection* selection, Repaintable* parent,
+                                                 Color selectionColor):
+        OverlayView(parent), selection(selection), selectionColor(selectionColor) {
+    this->registerToPool(selection->getViewPool());
+}
+
+PdfElementSelectionView::~PdfElementSelectionView() noexcept { this->unregisterFromPool(); }
+
+void PdfElementSelectionView::draw(cairo_t* cr) const {
+    xoj::util::CairoSaveGuard saveGuard(cr);
+
+    if (auto reg = selection->getSelectedRegion(); reg && !cairo_region_is_empty(reg)) {
+        gdk_cairo_region(cr, reg);
+        Util::cairo_set_source_rgbi(cr, selectionColor, SELECTION_OPACITY);
+        cairo_fill(cr);
+    }
+}
+
+bool PdfElementSelectionView::isViewOf(const OverlayBase* overlay) const { return overlay == this->selection; }
+
+void PdfElementSelectionView::on(PdfElementSelectionView::FlagDirtyRegionRequest, const Range& rg) const {
+    this->parent->flagDirtyRegion(rg);
+}
+
+void PdfElementSelectionView::deleteOn(PdfElementSelectionView::CancelSelectionRequest, const Range& rg) {
+    this->parent->deleteOverlayView(this, rg);
+}
diff --git a/entry/src/main/cpp/src/core/view/overlays/PdfElementSelectionView.h b/entry/src/main/cpp/src/core/view/overlays/PdfElementSelectionView.h
new file mode 100644
index 0000000..2837deb
--- /dev/null
+++ b/entry/src/main/cpp/src/core/view/overlays/PdfElementSelectionView.h
@@ -0,0 +1,57 @@
+/*
+ * Xournal++
+ *
+ * View pdf selections
+ *
+ * @author Xournal++ Team
+ * https://github.com/xournalpp/xournalpp
+ *
+ * @license GNU GPLv2 or later
+ */
+#pragma once
+
+#include <cairo.h>  // for cairo_t
+
+#include "util/Color.h"
+#include "util/DispatchPool.h"  // for Listener
+#include "view/overlays/OverlayView.h"
+
+class OverlayBase;
+class PdfElemSelection;
+class Range;
+
+namespace xoj::view {
+class Repaintable;
+
+class PdfElementSelectionView final: public OverlayView, public xoj::util::Listener<PdfElementSelectionView> {
+
+public:
+    PdfElementSelectionView(const PdfElemSelection* selection, Repaintable* parent, Color selectionColor);
+    ~PdfElementSelectionView() noexcept override;
+
+    /**
+     * @brief Draws the overlay to the given context
+     */
+    void draw(cairo_t* cr) const override;
+
+    bool isViewOf(const OverlayBase* overlay) const override;
+
+    /**
+     * Listener interface
+     */
+    static constexpr struct CancelSelectionRequest {
+    } CANCEL_SELECTION_REQUEST = {};
+    void deleteOn(CancelSelectionRequest, const Range& rg);
+    static constexpr struct FlagDirtyRegionRequest {
+    } FLAG_DIRTY_REGION_REQUEST = {};
+    void on(FlagDirtyRegionRequest, const Range& rg) const;
+
+private:
+    const PdfElemSelection* selection;
+    const Color selectionColor;
+
+public:
+    // Opacity of the background
+    static constexpr double SELECTION_OPACITY = 0.3;
+};
+};  // namespace xoj::view
diff --git a/entry/src/main/cpp/src/core/view/overlays/SearchResultView.cpp b/entry/src/main/cpp/src/core/view/overlays/SearchResultView.cpp
new file mode 100644
index 0000000..b98e0b2
--- /dev/null
+++ b/entry/src/main/cpp/src/core/view/overlays/SearchResultView.cpp
@@ -0,0 +1,47 @@
+#include "SearchResultView.h"
+
+#include "control/SearchControl.h"
+#include "util/Range.h"
+#include "util/raii/CairoWrappers.h"
+#include "view/Repaintable.h"
+
+using namespace xoj::view;
+
+SearchResultView::SearchResultView(const SearchControl* searchControl, Repaintable* parent, Color frameColor,
+                                   Color frameHighlightColor):
+        OverlayView(parent),
+        searchControl(searchControl),
+        frameColor(frameColor),
+        frameHighlightColor(frameHighlightColor) {
+    this->registerToPool(searchControl->getViewPool());
+}
+
+SearchResultView::~SearchResultView() noexcept { this->unregisterFromPool(); }
+
+void SearchResultView::draw(cairo_t* cr) const {
+    const XojPdfRectangle* highlightRect = this->searchControl->getHighlightRect();
+    xoj::util::CairoSaveGuard saveGuard(cr);
+
+    cairo_set_line_width(cr, BORDER_WIDTH_IN_PIXELS / this->parent->getZoom());
+
+    for (const XojPdfRectangle& rect: this->searchControl->getResults()) {
+        cairo_rectangle(cr, rect.x1, rect.y1, rect.x2 - rect.x1, rect.y2 - rect.y1);
+        Color color = frameColor;
+        if (&rect == highlightRect) {
+            color = frameHighlightColor;
+        }
+        Util::cairo_set_source_rgbi(cr, color);
+        cairo_stroke_preserve(cr);
+        Util::cairo_set_source_rgbi(cr, color, BACKGROUND_OPACITY);
+        cairo_fill(cr);
+    }
+}
+
+bool SearchResultView::isViewOf(const OverlayBase* overlay) const { return overlay == this->searchControl; }
+
+void SearchResultView::on(SearchResultView::SearchChangedNotification) {
+    Range rg = this->parent->getVisiblePart();
+    if (!rg.empty()) {
+        this->parent->flagDirtyRegion(this->parent->getVisiblePart());
+    }
+}
diff --git a/entry/src/main/cpp/src/core/view/overlays/SearchResultView.h b/entry/src/main/cpp/src/core/view/overlays/SearchResultView.h
new file mode 100644
index 0000000..a389437
--- /dev/null
+++ b/entry/src/main/cpp/src/core/view/overlays/SearchResultView.h
@@ -0,0 +1,57 @@
+/*
+ * Xournal++
+ *
+ * View highlighting search results
+ *
+ * @author Xournal++ Team
+ * https://github.com/xournalpp/xournalpp
+ *
+ * @license GNU GPLv2 or later
+ */
+#pragma once
+
+#include <cairo.h>  // for cairo_t
+
+#include "util/Color.h"
+#include "util/DispatchPool.h"  // for Listener
+#include "view/overlays/OverlayView.h"
+
+class OverlayBase;
+class SearchControl;
+
+namespace xoj::view {
+class Repaintable;
+
+class SearchResultView final: public OverlayView, public xoj::util::Listener<SearchResultView> {
+
+public:
+    SearchResultView(const SearchControl* searchControl, Repaintable* parent, Color frameColor,
+                     Color frameHighlightColor);
+    ~SearchResultView() noexcept override;
+
+    /**
+     * @brief Draws the overlay to the given context
+     */
+    void draw(cairo_t* cr) const override;
+
+    bool isViewOf(const OverlayBase* overlay) const override;
+
+    /**
+     * Listener interface
+     */
+    static constexpr struct SearchChangedNotification {
+    } SEARCH_CHANGED_NOTIFICATION = {};
+    void on(SearchChangedNotification);
+
+private:
+    const SearchControl* searchControl;
+    const Color frameColor;
+    const Color frameHighlightColor;
+
+public:
+    // Width of the line delimiting moved elements
+    static constexpr int BORDER_WIDTH_IN_PIXELS = 1;
+    // Opacity of the background
+    static constexpr double BACKGROUND_OPACITY = 0.3;
+};
+};  // namespace xoj::view
diff --git a/entry/src/main/cpp/src/core/view/overlays/SelectorView.cpp b/entry/src/main/cpp/src/core/view/overlays/SelectorView.cpp
new file mode 100644
index 0000000..fa895bc
--- /dev/null
+++ b/entry/src/main/cpp/src/core/view/overlays/SelectorView.cpp
@@ -0,0 +1,56 @@
+#include "SelectorView.h"
+
+#include <vector>
+
+#include "control/tools/Selector.h"
+#include "util/Color.h"
+#include "util/LoopUtil.h"
+#include "util/Range.h"
+#include "util/raii/CairoWrappers.h"
+#include "view/Repaintable.h"
+
+using namespace xoj::view;
+
+SelectorView::SelectorView(const Selector* selector, Repaintable* parent, Color selectorColor):
+        OverlayView(parent), selector(selector), selectorColor(selectorColor) {
+    this->registerToPool(selector->getViewPool());
+}
+
+SelectorView::~SelectorView() noexcept { this->unregisterFromPool(); }
+
+void SelectorView::draw(cairo_t* cr) const {
+    auto pts = this->selector->getBoundary();
+    if (pts.size() < 3) {
+        // To few points to draw
+        return;
+    }
+
+    xoj::util::CairoSaveGuard saveGuard(cr);  // cairo_save
+
+    // set the line always the same size on display
+    cairo_set_line_width(cr, BORDER_WIDTH_IN_PIXELS / this->parent->getZoom());
+
+    Util::cairo_set_source_rgbi(cr, selectorColor);
+
+    cairo_new_path(cr);
+    for (auto& p: pts) {
+        cairo_line_to(cr, p.x, p.y);
+    }
+    cairo_close_path(cr);
+
+    cairo_stroke_preserve(cr);
+    Util::cairo_set_source_rgbi(cr, selectorColor, FILLING_OPACITY);
+    cairo_fill(cr);
+}
+
+bool SelectorView::isViewOf(const OverlayBase* overlay) const { return overlay == this->selector; }
+
+void SelectorView::on(SelectorView::FlagDirtyRegionRequest, Range rg) {
+    rg.addPadding(BORDER_WIDTH_IN_PIXELS / this->parent->getZoom());
+    this->parent->flagDirtyRegion(rg);
+}
+
+void xoj::view::SelectorView::deleteOn(xoj::view::SelectorView::DeleteViewsRequest, Range rg) {
+    rg.addPadding(BORDER_WIDTH_IN_PIXELS / this->parent->getZoom());
+    this->parent->deleteOverlayView(this, rg);
+}
diff --git a/entry/src/main/cpp/src/core/view/overlays/SelectorView.h b/entry/src/main/cpp/src/core/view/overlays/SelectorView.h
new file mode 100644
index 0000000..cab4028
--- /dev/null
+++ b/entry/src/main/cpp/src/core/view/overlays/SelectorView.h
@@ -0,0 +1,51 @@
+/*
+ * Xournal++
+ *
+ * Displays the content of a selection
+ *
+ * @author Xournal++ Team
+ * https://github.com/xournalpp/xournalpp
+ *
+ * @license GNU GPLv2 or later
+ */
+#pragma once
+
+#include "util/Color.h"
+#include "util/DispatchPool.h"
+
+#include "OverlayView.h"
+#include "cairo.h"
+
+class Selector;
+class Range;
+
+namespace xoj::view {
+class Repaintable;
+
+class SelectorView: public OverlayView, public xoj::util::Listener<SelectorView> {
+public:
+    SelectorView(const Selector* selector, Repaintable* parent, Color selectorColor);
+    virtual ~SelectorView() noexcept;
+
+    /**
+     * @brief Draws the container to the given context
+     */
+    void draw(cairo_t* cr) const override;
+    bool isViewOf(const OverlayBase* overlay) const override;
+
+    static constexpr struct FlagDirtyRegionRequest {
+    } FLAG_DIRTY_REGION = {};
+    void on(FlagDirtyRegionRequest, Range rg);
+
+    static constexpr struct DeleteViewsRequest {
+    } DELETE_VIEWS_REQUEST = {};
+    void deleteOn(DeleteViewsRequest, Range rg);
+
+private:
+    const Selector* selector;
+    Color selectorColor;
+
+    static constexpr double BORDER_WIDTH_IN_PIXELS = 1;
+    static constexpr double FILLING_OPACITY = 0.3;
+};
+};  // namespace xoj::view
diff --git a/entry/src/main/cpp/src/core/view/overlays/ShapeToolView.cpp b/entry/src/main/cpp/src/core/view/overlays/ShapeToolView.cpp
new file mode 100644
index 0000000..fadd809
--- /dev/null
+++ b/entry/src/main/cpp/src/core/view/overlays/ShapeToolView.cpp
@@ -0,0 +1,45 @@
+#include "ShapeToolView.h"
+
+#include <vector>
+
+#include "control/tools/BaseShapeHandler.h"
+#include "util/raii/CairoWrappers.h"
+#include "view/Repaintable.h"
+#include "view/StrokeViewHelper.h"
+
+using namespace xoj::view;
+
+ShapeToolView::ShapeToolView(const BaseShapeHandler* toolHandler, Repaintable* parent):
+        BaseShapeOrSplineToolView(toolHandler, parent), toolHandler(toolHandler) {
+    this->registerToPool(toolHandler->getViewPool());
+}
+
+ShapeToolView::~ShapeToolView() noexcept { this->unregisterFromPool(); }
+
+void ShapeToolView::draw(cairo_t* cr) const {
+    const auto& pts = this->toolHandler->getShape();
+
+    if (pts.empty()) {
+        // The input sequence has been cancelled. This view should soon be deleted
+        return;
+    }
+
+    xoj::util::CairoSaveGuard saveGuard(cr);  // cairo_save
+
+    cairo_t* effCr = this->prepareContext(cr);
+
+    StrokeViewHelper::pathToCairo(effCr, pts);
+
+    this->commitDrawing(cr);
+}
+
+bool ShapeToolView::isViewOf(const OverlayBase* overlay) const { return overlay == this->toolHandler; }
+
+void ShapeToolView::on(ShapeToolView::FlagDirtyRegionRequest, const Range& rg) {
+    maskWipeExtent = maskWipeExtent.unite(rg);
+    this->parent->flagDirtyRegion(rg);
+}
+
+void ShapeToolView::deleteOn(ShapeToolView::FinalizationRequest, const Range& rg) {
+    this->parent->drawAndDeleteToolView(this, rg);
+}
diff --git a/entry/src/main/cpp/src/core/view/overlays/ShapeToolView.h b/entry/src/main/cpp/src/core/view/overlays/ShapeToolView.h
new file mode 100644
index 0000000..0dfd781
--- /dev/null
+++ b/entry/src/main/cpp/src/core/view/overlays/ShapeToolView.h
@@ -0,0 +1,58 @@
+/*
+ * Xournal++
+ *
+ * View active shape tools (rectangle, ellipse and so on)
+ *
+ * @author Xournal++ Team
+ * https://github.com/xournalpp/xournalpp
+ *
+ * @license GNU GPLv2 or later
+ */
+#pragma once
+
+#include <cairo.h>  // for cairo_t
+
+#include "util/DispatchPool.h"  // for Listener
+
+#include "BaseShapeOrSplineToolView.h"
+
+class BaseShapeHandler;
+class OverlayBase;
+class Range;
+
+namespace xoj::view {
+class Repaintable;
+
+class ShapeToolView final: public BaseShapeOrSplineToolView, public xoj::util::Listener<ShapeToolView> {
+
+public:
+    ShapeToolView(const BaseShapeHandler* handler, Repaintable* parent);
+    ~ShapeToolView() noexcept override;
+
+    /**
+     * @brief Draws the overlay to the given context
+     */
+    void draw(cairo_t* cr) const override;
+
+    bool isViewOf(const OverlayBase* overlay) const override;
+
+    /**
+     * Listener interface
+     */
+    static constexpr struct FlagDirtyRegionRequest {
+    } FLAG_DIRTY_REGION = {};
+    void on(FlagDirtyRegionRequest, const Range& rg);
+
+
+    static constexpr struct FinalizationRequest {
+    } FINALIZATION_REQUEST = {};
+    /**
+     * @brief Called before the corresponding BaseShapeHandler's destruction
+     * @param rg The bounding box of the entire stroke
+     */
+    void deleteOn(FinalizationRequest, const Range& rg);
+
+private:
+    const BaseShapeHandler* toolHandler;
+};
+};  // namespace xoj::view
diff --git a/entry/src/main/cpp/src/core/view/overlays/SplineToolView.cpp b/entry/src/main/cpp/src/core/view/overlays/SplineToolView.cpp
new file mode 100644
index 0000000..92fe2a1
--- /dev/null
+++ b/entry/src/main/cpp/src/core/view/overlays/SplineToolView.cpp
@@ -0,0 +1,135 @@
+#include "SplineToolView.h"
+
+#include <algorithm>  // for for_each
+#include <cmath>
+#include <cstdio>
+#include <optional>
+#include <vector>
+
+#include "control/tools/SplineHandler.h"
+#include "control/zoom/ZoomControl.h"
+#include "model/Point.h"
+#include "model/SplineSegment.h"
+#include "util/Assert.h"
+#include "util/raii/CairoWrappers.h"
+#include "view/Repaintable.h"
+
+class OverlayBase;
+
+using namespace xoj::view;
+
+SplineToolView::SplineToolView(const SplineHandler* splineHandler, Repaintable* parent):
+        BaseShapeOrSplineToolView(splineHandler, parent), splineHandler(splineHandler) {
+    this->registerToPool(splineHandler->getViewPool());
+    this->parent->getZoomControl()->addZoomListener(this);
+}
+
+SplineToolView::~SplineToolView() noexcept {
+    this->unregisterFromPool();
+    this->parent->getZoomControl()->removeZoomListener(this);
+}
+
+void SplineToolView::draw(cairo_t* cr) const {
+    auto data = this->splineHandler->getData();
+    if (!data) {
+        return;
+    }
+    xoj_assert(!data->knots.empty() && data->knots.size() == data->tangents.size());
+
+    const double lineWidth = LINE_WIDTH_WITHOUT_ZOOM / this->parent->getZoom();
+
+    xoj::util::CairoSaveGuard saveGuard(cr);
+    cairo_set_line_width(cr, lineWidth);
+
+    const Point& firstKnot = data->knots.front();
+    const Point& lastKnot = data->knots.back();
+    const Point& firstTangent = data->tangents.front();
+    const Point& lastTangent = data->tangents.back();
+
+    auto drawCircle = [cr, radius = data->knotsAttractionRadius](const Point& center) {
+        cairo_new_sub_path(cr);
+        cairo_arc(cr, center.x, center.y, radius, 0, 2 * M_PI);
+    };
+
+    // draw circles around knot points
+    Util::cairo_set_source_argb(cr, NODE_CIRCLE_COLOR);
+    std::for_each(std::next(data->knots.begin()), data->knots.end(), drawCircle);
+    cairo_stroke(cr);
+
+    Util::cairo_set_source_argb(cr, FIRST_NODE_CIRCLE_COLOR);
+    drawCircle(firstKnot);
+    if (data->closedSpline) {  // current point lies within the circle around the first knot
+        cairo_fill_preserve(cr);
+    }
+    cairo_stroke(cr);
+
+    // draw dynamically changing segment
+    Util::cairo_set_source_argb(cr, DYNAMIC_OBJECTS_COLOR);
+    const Point& cp1 = Point(lastKnot.x + lastTangent.x, lastKnot.y + lastTangent.y);
+    const Point& cp2 =
+            data->closedSpline ? Point(firstKnot.x - firstTangent.x, firstKnot.y - firstTangent.y) : data->currPoint;
+    const Point& otherKnot = data->closedSpline ? firstKnot : data->currPoint;
+    SplineSegment(lastKnot, cp1, cp2, otherKnot).draw(cr);
+    cairo_stroke(cr);
+
+
+    Util::cairo_set_source_argb(cr, TANGENT_VECTOR_COLOR);
+    // draw dynamically changing tangent vector
+    cairo_move_to(cr, lastKnot.x - lastTangent.x, lastKnot.y - lastTangent.y);
+    cairo_line_to(cr, lastKnot.x + lastTangent.x, lastKnot.y + lastTangent.y);
+
+    // draw other tangent vectors
+    for (size_t i = 0; i < data->knots.size() - 1; i++) {
+        cairo_move_to(cr, data->knots[i].x - data->tangents[i].x, data->knots[i].y - data->tangents[i].y);
+        cairo_line_to(cr, data->knots[i].x + data->tangents[i].x, data->knots[i].y + data->tangents[i].y);
+    }
+    cairo_stroke(cr);
+
+    this->drawSpline(cr, data.value());
+}
+
+void SplineToolView::drawWithoutDrawingAids(cairo_t* cr) const {
+    auto data = this->splineHandler->getData();
+    if (!data) {
+        return;
+    }
+    xoj_assert(!data->knots.empty() && data->knots.size() == data->tangents.size());
+
+    xoj::util::CairoSaveGuard saveGuard(cr);
+    this->drawSpline(cr, data.value());
+}
+
+void SplineToolView::drawSpline(cairo_t* cr, const SplineHandlerData& data) const {
+    if (data.knots.size() > 1) {
+        cairo_t* effCr = this->prepareContext(cr);
+
+        const Point& firstKnot = data.knots.front();
+        cairo_move_to(effCr, firstKnot.x, firstKnot.y);
+
+        auto itKnot1 = data.knots.begin();
+        auto itKnot2 = std::next(itKnot1);
+        auto itTgt1 = data.tangents.begin();
+        auto itTgt2 = std::next(itTgt1);
+        for (; itKnot2 != data.knots.end(); ++itKnot1, ++itKnot2, ++itTgt1, ++itTgt2) {
+            cairo_curve_to(effCr, itKnot1->x + itTgt1->x, itKnot1->y + itTgt1->y, itKnot2->x - itTgt2->x,
+                           itKnot2->y - itTgt2->y, itKnot2->x, itKnot2->y);
+        }
+
+        this->commitDrawing(cr);
+    }
+}
+
+bool SplineToolView::isViewOf(const OverlayBase* overlay) const { return overlay == this->splineHandler; }
+
+void SplineToolView::zoomChanged() { this->mask.reset(); }
+
+void SplineToolView::on(FlagDirtyRegionRequest, Range rg) {
+    maskWipeExtent = maskWipeExtent.unite(rg);
+    rg.addPadding(LINE_WIDTH_WITHOUT_ZOOM / (2.0 * this->parent->getZoom()));
+    this->parent->flagDirtyRegion(rg);
+}
+
+void SplineToolView::deleteOn(SplineToolView::FinalizationRequest, Range rg) {
+    rg.addPadding(LINE_WIDTH_WITHOUT_ZOOM / (2.0 * this->parent->getZoom()));
+    this->parent->drawAndDeleteToolView(this, rg);
+}
diff --git a/entry/src/main/cpp/src/core/view/overlays/SplineToolView.h b/entry/src/main/cpp/src/core/view/overlays/SplineToolView.h
new file mode 100644
index 0000000..7625353
--- /dev/null
+++ b/entry/src/main/cpp/src/core/view/overlays/SplineToolView.h
@@ -0,0 +1,79 @@
+/*
+ * Xournal++
+ *
+ * View active spline tool
+ *
+ * @author Xournal++ Team
+ * https://github.com/xournalpp/xournalpp
+ *
+ * @license GNU GPLv2 or later
+ */
+#pragma once
+
+#include <cairo.h>
+
+#include "control/zoom/ZoomListener.h"
+#include "util/Color.h"
+#include "util/DispatchPool.h"
+
+#include "BaseShapeOrSplineToolView.h"
+
+class SplineHandler;
+struct SplineHandlerData;
+class OverlayBase;
+class Range;
+class ZoomControl;
+
+namespace xoj::view {
+class Repaintable;
+
+class SplineToolView:
+        public BaseShapeOrSplineToolView,
+        public ZoomListener,
+        public xoj::util::Listener<SplineToolView> {
+
+public:
+    SplineToolView(const SplineHandler* splineHandler, Repaintable* parent);
+    virtual ~SplineToolView() noexcept;
+
+    /**
+     * @brief Draws the overlay to the given context
+     */
+    void draw(cairo_t* cr) const override;
+    void drawWithoutDrawingAids(cairo_t* cr) const override;
+
+    bool isViewOf(const OverlayBase* overlay) const override;
+
+    /**
+     * Zoom interface
+     */
+    void zoomChanged() override;
+
+    /**
+     * Listener interface
+     */
+    static constexpr struct FlagDirtyRegionRequest {
+    } FLAG_DIRTY_REGION = {};
+    void on(FlagDirtyRegionRequest, Range rg);
+
+    /**
+     * @brief Called before the corresponding SplineHandler's destruction
+     * @param rg The bounding box of the entire spline + drawing aids, to be repainted
+     */
+    static constexpr struct FinalizationRequest {
+    } FINALIZATION_REQUEST = {};
+    void deleteOn(FinalizationRequest, Range rg);
+
+private:
+    void drawSpline(cairo_t* cr, const SplineHandlerData& data) const;
+
+    const SplineHandler* splineHandler;
+
+public:
+    static constexpr double LINE_WIDTH_WITHOUT_ZOOM = 2.0;  // for tangent vectors & dynamic spline seg.
+    static constexpr Color NODE_CIRCLE_COLOR = Colors::gray;
+    static constexpr Color FIRST_NODE_CIRCLE_COLOR = Colors::red;
+    static constexpr Color TANGENT_VECTOR_COLOR = Colors::lawngreen;
+    static constexpr Color DYNAMIC_OBJECTS_COLOR = Colors::gray;
+};
+};  // namespace xoj::view
diff --git a/entry/src/main/cpp/src/core/view/overlays/StrokeToolFilledHighlighterView.cpp b/entry/src/main/cpp/src/core/view/overlays/StrokeToolFilledHighlighterView.cpp
new file mode 100644
index 0000000..64acbc5
--- /dev/null
+++ b/entry/src/main/cpp/src/core/view/overlays/StrokeToolFilledHighlighterView.cpp
@@ -0,0 +1,73 @@
+#include "StrokeToolFilledHighlighterView.h"
+
+#include <vector>
+
+#include "model/Point.h"
+#include "util/Color.h"
+#include "util/Range.h"
+#include "util/raii/CairoWrappers.h"
+#include "view/StrokeViewHelper.h"
+
+using namespace xoj::view;
+
+StrokeToolFilledHighlighterView::StrokeToolFilledHighlighterView(const StrokeHandler* strokeHandler,
+                                                                 const Stroke& stroke, Repaintable* parent):
+        StrokeToolFilledView(strokeHandler, stroke, parent) {}
+
+StrokeToolFilledHighlighterView::~StrokeToolFilledHighlighterView() noexcept = default;
+
+void StrokeToolFilledHighlighterView::draw(cairo_t* cr) const {
+
+    std::vector<Point> pts = this->flushBuffer();
+    if (pts.empty()) {
+        // The input sequence has probably been cancelled. This view should soon be deleted
+        return;
+    }
+
+    this->filling.appendSegments(pts);
+
+    if (!this->mask.isInitialized()) {
+        // Initialize mask on first call
+        this->mask = this->createMask(cr);
+        if (!mask.isInitialized()) {
+            /*
+             * The user might be drawing on a page that is not visible at all:
+             * e.g. https://github.com/xournalpp/xournalpp/pull/4158#issuecomment-1385954494
+             */
+            return;
+        }
+    }
+
+    if (this->singleDot) {
+        this->drawDot(this->mask.get(), pts.back());
+    } else {
+        /*
+         * Upon adding a segment, the filling can actually shrink.
+         * We wipe the portion of the mask that can change: the convex hull of the added points + the first point
+         */
+        Range wipe(filling.firstPoint.x, filling.firstPoint.y);
+
+        for (auto& p: pts) {
+            wipe.addPoint(p.x, p.y);
+        }
+
+        if (wipe.isValid()) {
+            this->mask.wipeRange(wipe);
+        }
+
+
+        /*
+         * Draw both the filling and the stroke alike on the mask
+         */
+        cairo_set_line_width(this->mask.get(), this->strokeWidth);
+        StrokeViewHelper::pathToCairo(this->mask.get(), this->filling.contour);
+        cairo_fill_preserve(this->mask.get());
+        cairo_stroke(this->mask.get());
+    }
+
+    xoj::util::CairoSaveGuard saveGuard(cr);
+    Util::cairo_set_source_argb(cr, this->strokeColor);
+    cairo_set_operator(cr, this->cairoOp);
+
+    this->mask.blitTo(cr);
+}
diff --git a/entry/src/main/cpp/src/core/view/overlays/StrokeToolFilledHighlighterView.h b/entry/src/main/cpp/src/core/view/overlays/StrokeToolFilledHighlighterView.h
new file mode 100644
index 0000000..34aacf6
--- /dev/null
+++ b/entry/src/main/cpp/src/core/view/overlays/StrokeToolFilledHighlighterView.h
@@ -0,0 +1,25 @@
+/*
+ * Xournal++
+ *
+ * View active stroke tool -- for filled highlighter only
+ *      In this case, the mask needs to be wiped at every iteration, and repainted to avoid artefacts like in
+ *          https://github.com/xournalpp/xournalpp/issues/3709
+ *
+ * @author Xournal++ Team
+ * https://github.com/xournalpp/xournalpp
+ *
+ * @license GNU GPLv2 or later
+ */
+#pragma once
+
+#include "StrokeToolFilledView.h"
+
+namespace xoj::view {
+class StrokeToolFilledHighlighterView: public StrokeToolFilledView {
+public:
+    StrokeToolFilledHighlighterView(const StrokeHandler* strokeHandler, const Stroke& stroke, Repaintable* parent);
+    virtual ~StrokeToolFilledHighlighterView() noexcept;
+
+    void draw(cairo_t* cr) const override;
+};
+};  // namespace xoj::view
diff --git a/entry/src/main/cpp/src/core/view/overlays/StrokeToolFilledView.cpp b/entry/src/main/cpp/src/core/view/overlays/StrokeToolFilledView.cpp
new file mode 100644
index 0000000..175232b
--- /dev/null
+++ b/entry/src/main/cpp/src/core/view/overlays/StrokeToolFilledView.cpp
@@ -0,0 +1,62 @@
+#include "StrokeToolFilledView.h"
+
+#include <algorithm>
+
+#include "model/Stroke.h"
+#include "util/Assert.h"
+#include "util/Color.h"
+#include "util/Range.h"
+#include "view/Repaintable.h"
+#include "view/StrokeViewHelper.h"
+
+using namespace xoj::view;
+
+static const Point& setupFirstPoint(const Stroke& s) {
+    const auto& pts = s.getPointVector();
+    xoj_assert(!pts.empty());
+    return pts.front();
+}
+
+StrokeToolFilledView::StrokeToolFilledView(const StrokeHandler* strokeHandler, const Stroke& stroke,
+                                           Repaintable* parent):
+        StrokeToolView(strokeHandler, stroke, parent), filling(stroke.getFill() / 255.0, setupFirstPoint(stroke)) {}
+
+StrokeToolFilledView::~StrokeToolFilledView() noexcept = default;
+
+void StrokeToolFilledView::drawFilling(cairo_t* cr, const std::vector<Point>& pts) const {
+    this->filling.appendSegments(pts);
+    /*
+     * Draw the filling directly (not through the mask)
+     *   Upon adding a segment, the filling can actually shrink, making it easier to redraw the filling every time.
+     */
+    StrokeViewHelper::pathToCairo(cr, this->filling.contour);
+    Util::cairo_set_source_rgbi(cr, strokeColor, this->filling.alpha);
+    cairo_fill(cr);
+}
+
+void StrokeToolFilledView::on(StrokeToolView::AddPointRequest, const Point& p) {
+    this->singleDot = false;
+    xoj_assert(!this->pointBuffer.empty());
+    Point lastPoint = this->pointBuffer.back();
+    this->pointBuffer.emplace_back(p);
+    auto rg = this->getRepaintRange(lastPoint, p);
+    // Add the first point, so that the range covers all the filling changes
+    rg.addPoint(this->filling.firstPoint.x, this->filling.firstPoint.y);
+    this->parent->flagDirtyRegion(rg);
+}
+
+void StrokeToolFilledView::on(StrokeToolView::StrokeReplacementRequest, const Stroke& newStroke) {
+    StrokeToolView::on(STROKE_REPLACEMENT_REQUEST, newStroke);
+    this->filling.contour = this->pointBuffer;
+    if (!this->pointBuffer.empty()) {
+        const Point& fp = this->pointBuffer.front();
+        this->filling.firstPoint = xoj::util::Point<double>(fp.x, fp.y);
+    }
+}
+
+void StrokeToolFilledView::FillingData::appendSegments(const std::vector<Point>& pts) {
+    xoj_assert(!pts.empty());
+    // Add new points to the contour
+    // contour.back() == pts.front(), so we skip it.
+    std::copy(std::next(pts.begin()), pts.end(), std::back_inserter(contour));
+}
diff --git a/entry/src/main/cpp/src/core/view/overlays/StrokeToolFilledView.h b/entry/src/main/cpp/src/core/view/overlays/StrokeToolFilledView.h
new file mode 100644
index 0000000..2359106
--- /dev/null
+++ b/entry/src/main/cpp/src/core/view/overlays/StrokeToolFilledView.h
@@ -0,0 +1,59 @@
+/*
+ * Xournal++
+ *
+ * View active stroke tool -- filled strokes, but not filled highlighter.
+ *
+ * @author Xournal++ Team
+ * https://github.com/xournalpp/xournalpp
+ *
+ * @license GNU GPLv2 or later
+ */
+#pragma once
+
+#include <vector>
+
+#include <cairo.h>
+
+#include "model/Point.h"
+#include "util/Point.h"
+
+#include "StrokeToolView.h"
+
+namespace xoj::view {
+class StrokeToolFilledHighlighterView;
+
+/**
+ * @brief View active stroke tool -- with a filling
+ *
+ * In draw, the filling is painted directly, while the stroke itself is blitted from the mask
+ */
+class StrokeToolFilledView: public StrokeToolView {
+public:
+    StrokeToolFilledView(const StrokeHandler* strokeHandler, const Stroke& stroke, Repaintable* parent);
+    virtual ~StrokeToolFilledView() noexcept;
+
+    void drawFilling(cairo_t* cr, const std::vector<Point>& pts) const override;
+
+    void on(AddPointRequest, const Point& p) override;
+    void on(StrokeReplacementRequest, const Stroke& newStroke) override;
+
+protected:
+    class FillingData {
+    public:
+        FillingData(double alpha, const Point& p): alpha(alpha), firstPoint(p.x, p.y), contour{p} {}
+
+        const double alpha;
+        xoj::util::Point<double> firstPoint;  // Store a copy for safe concurrent access
+
+
+        void appendSegments(const std::vector<Point>& pts);
+
+        /**
+         * @brief Filling contour (i.e. the stroke's entire path)
+         */
+        std::vector<Point> contour;
+    };
+
+    mutable FillingData filling;
+};
+};  // namespace xoj::view
diff --git a/entry/src/main/cpp/src/core/view/overlays/StrokeToolView.cpp b/entry/src/main/cpp/src/core/view/overlays/StrokeToolView.cpp
new file mode 100644
index 0000000..d96fac5
--- /dev/null
+++ b/entry/src/main/cpp/src/core/view/overlays/StrokeToolView.cpp
@@ -0,0 +1,147 @@
+#include "StrokeToolView.h"
+
+#include <functional>
+#include <memory>
+#include <numeric>
+
+#include "control/tools/StrokeHandler.h"
+#include "model/LineStyle.h"
+#include "model/Stroke.h"
+#include "util/Assert.h"
+#include "util/Color.h"
+#include "util/PairView.h"
+#include "util/Range.h"
+#include "util/raii/CairoWrappers.h"  // for CairoSaveGuard
+#include "view/Repaintable.h"
+#include "view/StrokeViewHelper.h"
+
+using namespace xoj::view;
+
+StrokeToolView::StrokeToolView(const StrokeHandler* strokeHandler, const Stroke& stroke, Repaintable* parent):
+        BaseStrokeToolView(parent, stroke), strokeHandler(strokeHandler), pointBuffer(stroke.getPointVector()) {
+    this->registerToPool(strokeHandler->getViewPool());
+    parent->flagDirtyRegion(Range(stroke.boundingRect()));
+}
+
+StrokeToolView::~StrokeToolView() noexcept { this->unregisterFromPool(); }
+
+bool StrokeToolView::isViewOf(const OverlayBase* overlay) const { return overlay == this->strokeHandler; }
+
+void StrokeToolView::draw(cairo_t* cr) const {
+
+    std::vector<Point> pts = this->flushBuffer();
+    if (pts.empty()) {
+        // The input sequence has probably been cancelled. This view should soon be deleted
+        return;
+    }
+    // pts.front() is the last point we painted on the mask during the last iteration (see flushBuffer())
+
+    if (!mask.isInitialized()) {
+        // Initialize the mask on first call
+        mask = createMask(cr);
+        if (!mask.isInitialized()) {
+            /*
+             * The user might be drawing on a page that is not visible at all:
+             * e.g. https://github.com/xournalpp/xournalpp/pull/4158#issuecomment-1385954494
+             */
+            return;
+        }
+    }
+
+    xoj::util::CairoSaveGuard saveGuard(cr);
+    cairo_set_operator(cr, this->cairoOp);
+
+    this->drawFilling(cr, pts);  // Noop in the base class.
+
+    Util::cairo_set_source_argb(cr, strokeColor);
+
+    if (pts.size() > 1) {
+        // Draw the new segments on the mask
+        if (pts.front().z == Point::NO_PRESSURE) {
+            StrokeViewHelper::drawNoPressure(this->mask.get(), pts, this->strokeWidth, this->lineStyle,
+                                             this->dashOffset);
+            if (this->lineStyle.hasDashes()) {
+                // Keep the offset up to date, so we do not have to redraw the entire stroke every time.
+                PairView segments(pts);
+                this->dashOffset =
+                        std::transform_reduce(segments.begin(), segments.end(), this->dashOffset, std::plus<>(),
+                                              [](auto& seg) { return seg.front().lineLengthTo(seg.back()); });
+            }
+        } else {
+            this->dashOffset =
+                    StrokeViewHelper::drawWithPressure(this->mask.get(), pts, this->lineStyle, this->dashOffset);
+        }
+    } else if (this->singleDot) {
+        this->drawDot(this->mask.get(), pts.back());
+    }
+
+    this->mask.blitTo(cr);
+}
+
+void StrokeToolView::on(StrokeToolView::AddPointRequest, const Point& p) {
+    this->singleDot = false;
+    xoj_assert(!this->pointBuffer.empty());  // front() is the last point we painted on the mask (see flushBuffer())
+    Point lastPoint = this->pointBuffer.back();
+    this->pointBuffer.emplace_back(p);
+    this->parent->flagDirtyRegion(this->getRepaintRange(lastPoint, p));
+}
+
+void StrokeToolView::on(StrokeToolView::ThickenFirstPointRequest, double newWidth) {
+    xoj_assert(newWidth > 0.0);
+    xoj_assert(this->pointBuffer.size() == 1);
+    Point& p = this->pointBuffer.back();
+    xoj_assert(p.z <= newWidth);  // Thicken means thicken
+    p.z = newWidth;
+    Range rg = Range(p.x, p.y);
+    rg.addPadding(0.5 * newWidth);
+    this->parent->flagDirtyRegion(rg);
+}
+
+void StrokeToolView::deleteOn(StrokeToolView::CancellationRequest, const Range& rg) {
+    this->pointBuffer.clear();
+    this->parent->drawAndDeleteToolView(this, rg);
+}
+
+void StrokeToolView::on(StrokeToolView::StrokeReplacementRequest, const Stroke& newStroke) {
+    if (this->mask.isInitialized()) {
+        // only wipe mask it actually exists (the view has already been drawn at least once)
+        this->mask.wipe();
+    }
+    this->pointBuffer = newStroke.getPointVector();
+    this->dashOffset = 0;
+    this->strokeWidth = newStroke.getWidth();
+    xoj_assert(this->strokeColor == strokeColorWithAlpha(newStroke));
+    xoj_assert(this->lineStyle == newStroke.getLineStyle());
+    xoj_assert(this->cairoOp ==
+               (newStroke.getToolType() == StrokeTool::HIGHLIGHTER ? CAIRO_OPERATOR_MULTIPLY : CAIRO_OPERATOR_OVER));
+}
+
+void StrokeToolView::deleteOn(StrokeToolView::FinalizationRequest, const Range& rg) {
+    this->parent->drawAndDeleteToolView(this, rg);
+}
+
+auto StrokeToolView::getRepaintRange(const Point& lastPoint, const Point& addedPoint) const -> Range {
+    const double width = lastPoint.z == Point::NO_PRESSURE ? this->strokeWidth : lastPoint.z;
+    Range rg(lastPoint.x, lastPoint.y);
+    rg.addPoint(addedPoint.x, addedPoint.y);
+    rg.addPadding(0.5 * width);
+    return rg;
+}
+
+void StrokeToolView::drawDot(cairo_t* cr, const Point& p) const {
+    cairo_set_line_width(cr, p.z == Point::NO_PRESSURE ? this->strokeWidth : p.z);
+    cairo_set_line_cap(cr, CAIRO_LINE_CAP_ROUND);
+    cairo_move_to(cr, p.x, p.y);
+    cairo_line_to(cr, p.x, p.y);
+    cairo_stroke(cr);
+}
+
+std::vector<Point> StrokeToolView::flushBuffer() const {
+    std::vector<Point> pts;
+    std::swap(this->pointBuffer, pts);
+    if (!pts.empty()) {
+        // Keep the last point in the buffer - to be used in the next iteration
+        this->pointBuffer.emplace_back(pts.back());
+    }
+    return pts;
+}
diff --git a/entry/src/main/cpp/src/core/view/overlays/StrokeToolView.h b/entry/src/main/cpp/src/core/view/overlays/StrokeToolView.h
new file mode 100644
index 0000000..4ee7831
--- /dev/null
+++ b/entry/src/main/cpp/src/core/view/overlays/StrokeToolView.h
@@ -0,0 +1,108 @@
+/*
+ * Xournal++
+ *
+ * View active stroke tool - abstract base class
+ *
+ * @author Xournal++ Team
+ * https://github.com/xournalpp/xournalpp
+ *
+ * @license GNU GPLv2 or later
+ */
+#pragma once
+
+#include <vector>
+
+#include <cairo.h>
+
+#include "util/DispatchPool.h"
+#include "view/Mask.h"
+
+#include "BaseStrokeToolView.h"
+
+class StrokeHandler;
+class Point;
+class Range;
+class Stroke;
+class OverlayBase;
+
+namespace xoj::view {
+class Repaintable;
+
+class StrokeToolView: public BaseStrokeToolView, public xoj::util::Listener<StrokeToolView> {
+public:
+    StrokeToolView(const StrokeHandler* strokeHandler, const Stroke& stroke, Repaintable* parent);
+    virtual ~StrokeToolView() noexcept;
+
+    bool isViewOf(const OverlayBase* overlay) const override;
+
+    void draw(cairo_t* cr) const override;
+
+    /**
+     * Listener interface
+     */
+    static constexpr struct AddPointRequest {
+    } ADD_POINT_REQUEST = {};
+    virtual void on(AddPointRequest, const Point& p);
+
+    static constexpr struct ThickenFirstPointRequest {
+    } THICKEN_FIRST_POINT_REQUEST = {};
+    void on(ThickenFirstPointRequest, double newPressure);
+
+    static constexpr struct StrokeReplacementRequest {
+    } STROKE_REPLACEMENT_REQUEST = {};
+    virtual void on(StrokeReplacementRequest, const Stroke& newStroke);
+
+    static constexpr struct CancellationRequest {
+    } CANCELLATION_REQUEST = {};
+    void deleteOn(CancellationRequest, const Range& rg);
+
+    /**
+     * @brief Called before the corresponding StrokeHandler's destruction
+     */
+    static constexpr struct FinalizationRequest {
+    } FINALIZATION_REQUEST = {};
+    void deleteOn(FinalizationRequest, const Range& rg);
+
+protected:
+    /**
+     * @brief Compute the bounding box of the given segment, taking stroke width into account.
+     */
+    auto getRepaintRange(const Point& lastPoint, const Point& addedPoint) const -> Range;
+
+    void drawDot(cairo_t* cr, const Point& p) const;
+
+    /**
+     * @brief (Thread-safe) Flush the communication buffer and returns its content.
+     */
+    std::vector<Point> flushBuffer() const;
+
+    // Nothing in the base class
+    virtual void drawFilling(cairo_t*, const std::vector<Point>&) const {}
+
+protected:
+    const StrokeHandler* strokeHandler;
+
+protected:
+    bool singleDot = true;
+
+    /**
+     * @brief offset for drawing dashes (if any)
+     *      In effect, this stores the length of the path already drawn to the mask.
+     */
+    mutable double dashOffset = 0;
+
+    /**
+     * @brief Controller/View communication buffer
+     *      Those are in the same thread. Add mutex protection if this changes
+     */
+    mutable std::vector<Point> pointBuffer;  // Todo: implement a lock-free fifo?
+
+    /**
+     * @brief Drawing mask.
+     *
+     * The stroke is drawn to the mask and the mask is then blitted wherever needed.
+     * Upon calls to draw(), the buffer is flushed and the corresponding part of stroke is added to the mask.
+     */
+    mutable Mask mask;
+};
+};  // namespace xoj::view
diff --git a/entry/src/main/cpp/src/core/view/overlays/TextEditionView.cpp b/entry/src/main/cpp/src/core/view/overlays/TextEditionView.cpp
new file mode 100644
index 0000000..9c3868c
--- /dev/null
+++ b/entry/src/main/cpp/src/core/view/overlays/TextEditionView.cpp
@@ -0,0 +1,90 @@
+#include "TextEditionView.h"
+
+#include "control/tools/TextEditor.h"
+#include "model/Text.h"
+#include "util/Color.h"
+#include "util/raii/CairoWrappers.h"
+#include "view/Repaintable.h"
+
+using namespace xoj::view;
+
+TextEditionView::TextEditionView(const TextEditor* textEditor, Repaintable* parent):
+        ToolView(parent), textEditor(textEditor) {
+    this->registerToPool(textEditor->getViewPool());
+    this->on(FLAG_DIRTY_REGION, textEditor->getContentBoundingBox());
+}
+
+TextEditionView::~TextEditionView() noexcept { this->unregisterFromPool(); }
+
+void TextEditionView::draw(cairo_t* cr) const {
+    xoj::util::CairoSaveGuard saveGuard(cr);
+
+    // Draw the frame
+    double zoom = parent->getZoom();
+    cairo_set_line_width(cr, BORDER_WIDTH_IN_PIXELS / zoom);
+    Util::cairo_set_source_argb(cr, this->textEditor->getSelectionColor());
+    Range frame = textEditor->getContentBoundingBox();
+    frame.addPadding(PADDING_IN_PIXELS / zoom);
+    cairo_rectangle(cr, frame.getX(), frame.getY(), frame.getWidth(), frame.getHeight());
+    cairo_stroke(cr);
+
+    // Draw the text itself
+    this->drawWithoutDrawingAids(cr);
+
+    // Draw the cursor
+    if (this->textEditor->isCursorVisible()) {
+        auto cursorBox = this->textEditor->getCursorBox();
+        if (cursorBox.getWidth() == 0.0) {
+            const double shift = 0.5 * INSERTION_CURSOR_WIDTH_IN_PIXELS / zoom;
+            cursorBox.minX -= shift;
+            cursorBox.maxX += shift;
+        }
+        cairo_set_operator(cr, CAIRO_OPERATOR_DIFFERENCE);
+        cairo_set_source_rgb(cr, 1, 1, 1);
+        const Text* textElement = this->textEditor->getTextElement();
+        cairo_rectangle(cr, cursorBox.minX + textElement->getX(), cursorBox.minY + textElement->getY(),
+                        cursorBox.getWidth(), cursorBox.getHeight());
+        cairo_fill(cr);
+    }
+}
+
+void TextEditionView::drawWithoutDrawingAids(cairo_t* cr) const {
+    xoj::util::CairoSaveGuard saveGuard(cr);
+
+    const Text* textElement = this->textEditor->getTextElement();
+    Util::cairo_set_source_rgbi(cr, textElement->getColor());
+
+    // From now on, coordinates are in textElement coordinates
+    cairo_translate(cr, textElement->getX(), textElement->getY());
+
+    // The data is owned by textEditor
+    PangoLayout* layout = this->textEditor->getUpToDateLayout();
+
+    // The cairo context might have changed. Update the pango layout
+    pango_cairo_update_layout(cr, layout);
+
+    pango_context_set_matrix(pango_layout_get_context(layout), nullptr);
+
+    pango_cairo_show_layout(cr, layout);
+}
+
+bool TextEditionView::isViewOf(const OverlayBase* overlay) const { return overlay == this->textEditor; }
+
+auto TextEditionView::toWindowCoordinates(const xoj::util::Rectangle<double>& r) const -> xoj::util::Rectangle<double> {
+    auto* textElement = this->textEditor->getTextElement();
+    return parent->toWindowCoordinates(r.translated(textElement->getX(), textElement->getY()));
+}
+
+void TextEditionView::on(TextEditionView::FlagDirtyRegionRequest, Range rg) {
+    const double padding = std::max(BORDER_WIDTH_IN_PIXELS + PADDING_IN_PIXELS, INSERTION_CURSOR_WIDTH_IN_PIXELS) /
+                           this->parent->getZoom();
+    rg.addPadding(padding);
+    this->parent->flagDirtyRegion(rg);
+}
+
+void TextEditionView::deleteOn(TextEditionView::FinalizationRequest, Range rg) {
+    const double padding = std::max(BORDER_WIDTH_IN_PIXELS + PADDING_IN_PIXELS, INSERTION_CURSOR_WIDTH_IN_PIXELS) /
+                           this->parent->getZoom();
+    rg.addPadding(padding);
+    this->parent->drawAndDeleteToolView(this, rg);
+}
diff --git a/entry/src/main/cpp/src/core/view/overlays/TextEditionView.h b/entry/src/main/cpp/src/core/view/overlays/TextEditionView.h
new file mode 100644
index 0000000..52bf13b
--- /dev/null
+++ b/entry/src/main/cpp/src/core/view/overlays/TextEditionView.h
@@ -0,0 +1,68 @@
+/*
+ * Xournal++
+ *
+ * View active text edition
+ *
+ * @author Xournal++ Team
+ * https://github.com/xournalpp/xournalpp
+ *
+ * @license GNU GPLv2 or later
+ */
+#pragma once
+
+#include <cairo.h>  // for cairo_t
+
+#include "util/DispatchPool.h"  // for Listener
+#include "view/overlays/OverlayView.h"
+
+class OverlayBase;
+class TextEditor;
+class Range;
+
+namespace xoj::util {
+template <typename T>
+class Rectangle;
+};
+
+namespace xoj::view {
+class Repaintable;
+
+class TextEditionView final: public ToolView, public xoj::util::Listener<TextEditionView> {
+
+public:
+    TextEditionView(const TextEditor* handler, Repaintable* parent);
+    ~TextEditionView() noexcept override;
+
+    /**
+     * @brief Draws the overlay to the given context
+     */
+    void draw(cairo_t* cr) const override;
+    void drawWithoutDrawingAids(cairo_t* cr) const override;
+
+    bool isViewOf(const OverlayBase* overlay) const override;
+
+    xoj::util::Rectangle<double> toWindowCoordinates(const xoj::util::Rectangle<double>& r) const;
+
+    /**
+     * Listener interface
+     */
+    static constexpr struct FlagDirtyRegionRequest {
+    } FLAG_DIRTY_REGION = {};
+    void on(FlagDirtyRegionRequest, Range rg);
+
+    static constexpr struct FinalizationRequest {
+    } FINALIZATION_REQUEST = {};
+    void deleteOn(FinalizationRequest, Range rg);
+
+private:
+    const TextEditor* textEditor;
+
+public:
+    // Padding between the text logical box and the frame
+    static constexpr int PADDING_IN_PIXELS = 5;
+    // Width of the lines making the frame
+    static constexpr int BORDER_WIDTH_IN_PIXELS = 1;
+    // Width of the cursor in insertion mode (or at the end of a line)
+    static constexpr int INSERTION_CURSOR_WIDTH_IN_PIXELS = 2;
+};
+};  // namespace xoj::view
diff --git a/entry/src/main/cpp/src/core/view/overlays/VerticalToolView.cpp b/entry/src/main/cpp/src/core/view/overlays/VerticalToolView.cpp
new file mode 100644
index 0000000..9ad1d86
--- /dev/null
+++ b/entry/src/main/cpp/src/core/view/overlays/VerticalToolView.cpp
@@ -0,0 +1,127 @@
+#include "VerticalToolView.h"
+
+#include "control/settings/Settings.h"
+#include "control/zoom/ZoomControl.h"
+#include "util/raii/CairoWrappers.h"
+#include "view/ElementContainerView.h"
+#include "view/Repaintable.h"
+#include "view/View.h"
+
+using namespace xoj::view;
+
+VerticalToolView::VerticalToolView(const VerticalToolHandler* handler, Repaintable* parent, ZoomControl* zoomControl,
+                                   const Settings* settings):
+        ToolView(parent), toolHandler(handler), zoomControl(zoomControl), aidColor(settings->getSelectionColor()) {
+    this->registerToPool(handler->getViewPool());
+    zoomControl->addZoomListener(this);
+}
+
+VerticalToolView::~VerticalToolView() noexcept {
+    zoomControl->removeZoomListener(this);
+    this->unregisterFromPool();
+}
+
+void VerticalToolView::draw(cairo_t* cr) const {
+    xoj::util::CairoSaveGuard saveGuard(cr);
+
+    const double startY = toolHandler->getStartY();
+    const double endY = toolHandler->getEndY();
+
+    cairo_rectangle(cr, 0, startY, toolHandler->getPageWidth(), endY - startY);
+
+    cairo_set_line_width(cr, BORDER_WIDTH_IN_PIXELS / this->parent->getZoom());
+    Util::cairo_set_source_rgbi(cr, this->aidColor);
+    cairo_stroke_preserve(cr);
+
+    Util::cairo_set_source_rgbi(cr, this->aidColor, BACKGROUND_OPACITY);
+    cairo_fill(cr);
+
+    this->drawWithoutDrawingAids(cr);
+}
+
+void VerticalToolView::drawWithoutDrawingAids(cairo_t* cr) const {
+    xoj::util::CairoSaveGuard saveGuard(cr);
+
+    if (!mask.isInitialized()) {
+        // Initialize the mask on first call, when changing sides or upon zoom change
+        mask = createMask(cr);
+        xoj::view::ElementContainerView v(this->toolHandler);
+        v.draw(xoj::view::Context::createDefault(mask.get()));
+    }
+
+    cairo_translate(cr, 0, toolHandler->getEndY() - toolHandler->getStartY());
+
+    mask.paintTo(cr);
+}
+
+bool VerticalToolView::isViewOf(const OverlayBase* overlay) const { return overlay == this->toolHandler; }
+
+void VerticalToolView::on(VerticalToolView::SetVerticalShiftRequest, double shift) {
+    Range rg = this->parent->getVisiblePart();
+    auto side = this->toolHandler->getSide();
+
+    // Padding for taking into account the drawing aid line width
+    const double padding = 0.5 * BORDER_WIDTH_IN_PIXELS / this->parent->getZoom();
+    if (side == VerticalToolHandler::Side::Above) {
+        rg.maxY = std::clamp(std::max(shift, this->lastShift) + padding, rg.minY, rg.maxY);
+    } else {
+        rg.minY = std::clamp(std::min(shift, this->lastShift) - padding, rg.minY, rg.maxY);
+    }
+    this->parent->flagDirtyRegion(rg);
+    this->lastShift = shift;
+}
+
+void VerticalToolView::on(VerticalToolView::SwitchDirectionRequest) {
+    mask.reset();
+    this->parent->flagDirtyRegion(this->parent->getVisiblePart());
+}
+
+void VerticalToolView::deleteOn(VerticalToolView::FinalizationRequest) {
+    double startY = toolHandler->getStartY();
+    double endY = toolHandler->getEndY();
+    auto [minY, maxY] = std::minmax(startY, endY);
+
+    // Padding for taking into account the drawing aid line width
+    const double padding = 0.5 * BORDER_WIDTH_IN_PIXELS / this->parent->getZoom();
+
+    // Get a range containing exactly the drawing aid blue rectangle
+    Range rg(std::numeric_limits<double>::lowest(), minY - padding, std::numeric_limits<double>::max(), maxY + padding);
+    rg = rg.intersect(this->parent->getVisiblePart());
+
+    this->parent->drawAndDeleteToolView(this, rg);
+}
+
+Mask VerticalToolView::createMask(cairo_t* tgtcr) const {
+    auto side = toolHandler->getSide();
+    auto startY = toolHandler->getStartY();
+    /*
+     * Create a mask that
+     *      * starts at startY if side == Side::Below
+     *      * ends at startY if side == Side::Above
+     *      * has height and width those of the visible area
+     * This mask is as small as possible, and still allows the user to see all elements go up or down, as long as the
+     * cursor remains in the affected page.
+     * TODO find a way to have the mask big enough for all situations:
+     *              * If the previous page is partially visible, the mask is to short
+     *              * If the cursor goes into the toolbar, the mask is to short
+     *              * If several views are implemented, the mask size should depend on the possible cursor positions
+     *                within the acted upon view, not the current view
+     *                      (the entire page is not an option for infinite pages...)
+     */
+    const double zoom = this->parent->getZoom();
+    Range range = this->parent->getVisiblePart();
+
+    if (side == VerticalToolHandler::Side::Above) {
+        range.translate(0, startY - range.maxY);
+    } else {
+        range.translate(0, startY - range.minY);
+    }
+
+    return Mask(cairo_get_target(tgtcr), range, zoom, CAIRO_CONTENT_COLOR_ALPHA);
+}
+
+void VerticalToolView::zoomChanged() {
+    // If zooming in, the mask needs redrawing to get a suitable definition
+    // If zooming out, the mask needs redrawing to cover a bigger part of the page
+    mask.reset();
+}
diff --git a/entry/src/main/cpp/src/core/view/overlays/VerticalToolView.h b/entry/src/main/cpp/src/core/view/overlays/VerticalToolView.h
new file mode 100644
index 0000000..fccb986
--- /dev/null
+++ b/entry/src/main/cpp/src/core/view/overlays/VerticalToolView.h
@@ -0,0 +1,82 @@
+/*
+ * Xournal++
+ *
+ * View active VerticalTool (move elements up and down)
+ *
+ * @author Xournal++ Team
+ * https://github.com/xournalpp/xournalpp
+ *
+ * @license GNU GPLv2 or later
+ */
+#pragma once
+
+#include <cairo.h>  // for cairo_t
+
+#include "control/tools/VerticalToolHandler.h"  // for Side
+#include "control/zoom/ZoomListener.h"
+#include "util/Color.h"
+#include "util/DispatchPool.h"  // for Listener
+#include "view/Mask.h"
+#include "view/overlays/OverlayView.h"
+
+class OverlayBase;
+class Range;
+class Settings;
+class ZoomControl;
+
+namespace xoj::view {
+class Repaintable;
+
+class VerticalToolView final: public ToolView, public ZoomListener, public xoj::util::Listener<VerticalToolView> {
+
+public:
+    VerticalToolView(const VerticalToolHandler* handler, Repaintable* parent, ZoomControl* zoomControl,
+                     const Settings* settings);
+    ~VerticalToolView() noexcept override;
+
+    /**
+     * @brief Draws the overlay to the given context
+     */
+    void draw(cairo_t* cr) const override;
+    void drawWithoutDrawingAids(cairo_t* cr) const override;
+
+    bool isViewOf(const OverlayBase* overlay) const override;
+
+    /**
+     * Zoom interface
+     */
+    void zoomChanged() override;
+
+    /**
+     * Listener interface
+     */
+    static constexpr struct SetVerticalShiftRequest {
+    } SET_VERTICAL_SHIFT_REQUEST = {};
+    void on(SetVerticalShiftRequest, double shift);
+
+    static constexpr struct SwitchDirectionRequest {
+    } SWITCH_DIRECTION_REQUEST = {};
+    void on(SwitchDirectionRequest);
+
+    static constexpr struct FinalizationRequest {
+    } FINALIZATION_REQUEST = {};
+    void deleteOn(FinalizationRequest);
+
+private:
+    Mask createMask(cairo_t* tgtcr) const;
+
+private:
+    const VerticalToolHandler* toolHandler;
+    ZoomControl* zoomControl;
+    double lastShift = 0.0;
+    const Color aidColor;
+
+    mutable Mask mask;
+
+public:
+    // Width of the line delimiting moved elements
+    static constexpr int BORDER_WIDTH_IN_PIXELS = 1;
+    // Opacity of the background
+    static constexpr double BACKGROUND_OPACITY = 0.3;
+};
+};  // namespace xoj::view
diff --git a/entry/src/main/cpp/src/exe/Xournalpp-wrapper.cpp b/entry/src/main/cpp/src/exe/Xournalpp-wrapper.cpp
new file mode 100644
index 0000000..32fd8a5
--- /dev/null
+++ b/entry/src/main/cpp/src/exe/Xournalpp-wrapper.cpp
@@ -0,0 +1,244 @@
+/*
+ * Xournal++
+ *
+ * The main application
+ *
+ * @author Xournal++ Team
+ * https://github.com/xournalpp/xournalpp
+ *
+ * @license GNU GPLv2
+ */
+
+#include <iostream>
+#include <regex>
+#include <sstream>
+#include <string>
+
+#include <gio/gio.h>
+#include <gtk/gtk.h>
+
+#ifdef _WIN32
+// clang-format off
+#include <windows.h>
+#include <shellapi.h>
+// clang-format on
+#endif
+
+#include "util/PathUtil.h"
+#include "util/VersionInfo.h"
+#include "util/XojMsgBox.h"
+#include "util/glib_casts.h"
+#include "util/gtk4_helper.h"
+#include "util/raii/CStringWrapper.h"
+#include "util/raii/GObjectSPtr.h"
+
+#include "config.h"
+#include "filesystem.h"
+
+static constexpr const char* UI_RESOURCE = "/org/xournalpp/wrapper/ui/crashDialog.glade";
+
+// See CrashHandler::emergencySave()
+static constexpr const char* EMERGENCY_SAVE_MSG_REGEX = "Successfully saved document to \"(.*)\"";
+
+static auto escape(const std::string& str) {
+    return xoj::util::OwnedCString::assumeOwnership(g_uri_escape_string(str.c_str(), nullptr, true));
+}
+
+/// Create a URL which opens a crash report on github, pre-filled with the data we can get
+static std::string makeCrashReportURL() {
+    // See .github/ISSUE_TEMPLATE/crash_report.yml for the keywords (id)
+    std::stringstream str;
+    str.imbue(std::locale::classic());
+
+    str << PROJECT_CRASHREPORT;
+    str << "&os=" << escape(xoj::util::getOsInfo()).get();
+
+#ifdef __linux__
+    auto getEnvTruncated = [](const char* var) {
+        if (auto* value = std::getenv(var); value) {
+            auto d = std::string(value);
+            if (d.length() > 20) {
+                // No control over the environment variable: limit the length
+                d.resize(20);
+            }
+            return d;
+        } else {
+            return std::string("unknown");
+        }
+    };
+    str << "&desktop=" << escape(getEnvTruncated("DESKTOP_SESSION") + " " + getEnvTruncated("XDG_SESSION_TYPE")).get();
+    str << "&displayserver=" << escape(xoj::util::getGdkBackend()).get();
+#endif
+
+    str << "&version=" << escape(xoj::util::getXournalppVersion()).get();
+    str << "&gtk=" << gtk_major_version << "." << gtk_minor_version << "." << gtk_micro_version;
+
+    return str.str();
+}
+
+static void activate(GtkApplication* app, std::string* str) {
+    xoj::util::GObjectSPtr<GtkBuilder> builder(gtk_builder_new_from_resource(UI_RESOURCE), xoj::util::adopt);
+    auto* window = GTK_WIDGET(gtk_builder_get_object(builder.get(), "crashDialog"));
+    gtk_application_add_window(app, GTK_WINDOW(window));
+    auto* view = GTK_TEXT_VIEW(gtk_builder_get_object(builder.get(), "textViewLog"));
+    gtk_text_buffer_set_text(gtk_text_view_get_buffer(view), str->data(), -1);
+
+    auto* entry = GTK_ENTRY(gtk_builder_get_object(builder.get(), "entryPathEmergencySave"));
+    std::smatch res;
+    std::regex_search(*str, res, std::regex(EMERGENCY_SAVE_MSG_REGEX));
+    if (res.empty()) {
+        gtk_editable_set_text(GTK_EDITABLE(entry), "FAILED");
+        gtk_widget_add_css_class(GTK_WIDGET(entry), "error");
+    } else {
+        gtk_editable_set_text(GTK_EDITABLE(entry), res[1].str().c_str());
+    }
+
+    g_signal_connect_object(gtk_builder_get_object(builder.get(), "closeBtn"), "clicked",
+                            G_CALLBACK(+[](GtkButton* btn, gpointer w) { gtk_window_close(GTK_WINDOW(w)); }), window,
+                            GConnectFlags(0));
+    g_signal_connect_object(gtk_builder_get_object(builder.get(), "reportBtn"), "clicked",
+                            G_CALLBACK(+[](GtkButton* btn, gpointer w) {
+                                XojMsgBox::openURL(GTK_WINDOW(w), makeCrashReportURL().c_str());
+                            }),
+                            window, GConnectFlags(0));
+    gtk_window_present(GTK_WINDOW(window));
+}
+
+auto main(int argc, char* argv[]) -> int {
+    GError* err = nullptr;
+    std::stringstream errorlog;
+    errorlog.imbue(std::locale::classic());
+
+    auto p = [&]() {
+        static constexpr auto FLAGS = GSubprocessFlags(G_SUBPROCESS_FLAGS_STDOUT_PIPE
+#ifdef _WIN32  // On Windows, STDERR_MERGE does not work. See https://gitlab.gnome.org/GNOME/glib/-/issues/3723
+                                                       | G_SUBPROCESS_FLAGS_STDERR_PIPE
+#else
+                                                       | G_SUBPROCESS_FLAGS_STDERR_MERGE
+#endif
+        );
+
+        std::vector<const char*> subargv;
+        std::cout << Util::getExePath() << std::endl;
+
+        const std::u8string path = (Util::getExePath() / "xournalpp").u8string();
+        subargv.emplace_back(char_cast(path.c_str()));  // Data is owned by `path` - Do not delete it
+        errorlog << "Executing \"" << char_cast(path);
+
+#ifdef _WIN32
+        std::vector<std::string> utf8_args;
+
+        LPWSTR* szArglist;
+        int nArgs;
+        szArglist = CommandLineToArgvW(GetCommandLineW(), &nArgs);
+
+        if (szArglist != nullptr) {
+            // Start from 1 to skip program name
+            for (int i = 1; i < nArgs; i++) {
+                // Calculate required buffer size for UTF-8
+                int size_needed = WideCharToMultiByte(CP_UTF8, 0, szArglist[i], -1, nullptr, 0, nullptr, nullptr);
+                if (size_needed > 0) {
+                    std::string utf8_arg(size_needed - 1, 0);  // -1 to exclude null terminator
+                    WideCharToMultiByte(CP_UTF8, 0, szArglist[i], -1, &utf8_arg[0], size_needed, nullptr, nullptr);
+                    utf8_args.push_back(std::move(utf8_arg));
+                }
+            }
+            LocalFree(szArglist);
+
+            // Add UTF-8 encoded arguments
+            for (const auto& arg: utf8_args) {
+                subargv.emplace_back(arg.c_str());
+                errorlog << " " << arg;
+            }
+        } else {
+            // Fallback to original argv if CommandLineToArgvW fails
+            for (int i = 1; i < argc; i++) {
+                subargv.emplace_back(argv[i]);
+                errorlog << " " << argv[i];
+            }
+        }
+#else
+        for (int i = 1; i < argc; i++) {
+            subargv.emplace_back(argv[i]);
+            errorlog << " " << argv[i];
+        }
+#endif
+        subargv.emplace_back(nullptr);
+        errorlog << "\"" << std::endl;
+
+        xoj::util::GObjectSPtr<GSubprocessLauncher> launcher(g_subprocess_launcher_new(FLAGS), xoj::util::adopt);
+        g_subprocess_launcher_set_environ(launcher.get(), nullptr);  // Copies the host's environment
+        g_subprocess_launcher_setenv(launcher.get(), "G_MESSAGES_DEBUG", G_LOG_DOMAIN, false);  // Print xopp debug
+
+        return xoj::util::GObjectSPtr<GSubprocess>(g_subprocess_launcher_spawnv(launcher.get(), subargv.data(), &err),
+                                                   xoj::util::adopt);
+    }();
+
+    int exitstatus = -1;
+
+    if (err) {
+        printf("Failed to start\n");
+        errorlog << "Failed to start: " << err->message << std::endl;
+        g_error_free(err);
+        err = nullptr;
+    } else {
+        xoj::util::OwnedCString stdoutBuffer;
+#ifdef _WIN32  // On Windows, STDERR_MERGE does not work. See https://gitlab.gnome.org/GNOME/glib/-/issues/3723
+        xoj::util::OwnedCString stderrBuffer;
+#endif
+
+        std::cout << "Xournal++ started with PID: " << g_subprocess_get_identifier(p.get()) << std::endl;
+        errorlog << "Xournal++ started with PID: " << g_subprocess_get_identifier(p.get()) << std::endl;
+
+        g_subprocess_communicate_utf8(p.get(), nullptr, nullptr, stdoutBuffer.contentReplacer(),
+#ifdef _WIN32  // On Windows, STDERR_MERGE does not work. See https://gitlab.gnome.org/GNOME/glib/-/issues/3723
+                                      stderrBuffer.contentReplacer(),
+#else
+                                      nullptr,
+#endif
+                                      &err);
+
+        if (g_subprocess_get_if_exited(p.get())) {
+            exitstatus = g_subprocess_get_exit_status(p.get());
+            if (exitstatus == 0) [[likely]] {
+                std::cout << "Execution completed normally" << std::endl;
+                return 0;
+            } else {
+                std::cout << "Exited with error status: " << exitstatus << std::endl;
+                errorlog << "Exited with error status: " << exitstatus << std::endl;
+            }
+        }
+        if (g_subprocess_get_if_signaled(p.get())) {
+            auto sig = g_subprocess_get_term_sig(p.get());
+            std::cout << "Crashed with signal: " << sig << std::endl;
+            errorlog << "Crashed with signal: " << sig << std::endl;
+        }
+
+        if (err) {
+            errorlog << "    Error: " << err->message << std::endl;
+            g_error_free(err);
+            err = nullptr;
+        }
+
+        time_t lt = time(nullptr);
+        errorlog << "    Date: " << ctime(&lt) << std::endl;
+
+        errorlog << xoj::util::getVersionInfo();
+        errorlog << "  (The GDK backend is probably printed out below)\n";
+
+        errorlog << "\n*** Output: ***\n\n" << stdoutBuffer.get();
+
+#ifdef _WIN32
+        errorlog << "\n\n*** Cerr: ***\n\n" << stderrBuffer.get();
+#endif
+    }
+
+    GtkApplication* app = gtk_application_new("com.github.xournalpp.xournalpp", G_APPLICATION_FLAGS_NONE);
+    g_signal_connect_data(app, "activate", xoj::util::wrap_for_g_callback_v<activate>, new std::string(errorlog.str()),
+                          xoj::util::closure_notify_cb<std::string>, GConnectFlags(0));
+
+    g_application_run(G_APPLICATION(app), 0, nullptr);
+    g_object_unref(app);
+
+    return exitstatus;
+}
diff --git a/entry/src/main/cpp/src/exe/Xournalpp.cpp b/entry/src/main/cpp/src/exe/Xournalpp.cpp
new file mode 100644
index 0000000..e593fd7
--- /dev/null
+++ b/entry/src/main/cpp/src/exe/Xournalpp.cpp
@@ -0,0 +1,60 @@
+/*
+ * Xournal++
+ *
+ * The main application
+ *
+ * @author Xournal++ Team
+ * https://github.com/xournalpp/xournalpp
+ *
+ * @license GNU GPLv2
+ */
+
+#include "control/CrashHandler.h"  // for installCrashHandlers
+#include "control/XournalMain.h"   // for run
+
+#ifdef __APPLE__
+#include "osx/setup-env.h"
+#endif
+
+#ifdef _WIN32
+#include <cstdlib>
+
+#include "win32/console.h"
+#endif
+
+auto main(int argc, char* argv[]) -> int {
+#ifdef _WIN32
+    // Attach to the console here. Otherwise, gspawn-win32-helper will create annoying console popups,
+    // e.g. in the LaTeX tool after every change in the formula
+    attachConsole();
+#endif
+
+    // init crash handler
+    installCrashHandlers();
+
+#ifdef DEV_CALL_LOG
+    Log::initlog();
+#endif
+
+#ifdef _WIN32
+    // Switch to the FontConfig backend for Pango - See #3371
+    _putenv_s("PANGOCAIRO_BACKEND", "fc");
+#endif
+
+#ifdef __APPLE__
+    // Setup the environment variables, in particular so that the pixbuf loaders are found
+    setupEnvironment();
+#endif
+
+    // Use this two line to test the crash handler...
+    // int* crash = nullptr;
+    // *crash = 0;
+
+    int result = XournalMain::run(argc, argv);
+
+#ifdef DEV_CALL_LOG
+    Log::closelog();
+#endif
+
+    return result;
+}
diff --git a/entry/src/main/cpp/src/exe/osx/setup-env.cpp b/entry/src/main/cpp/src/exe/osx/setup-env.cpp
new file mode 100644
index 0000000..52fda9b
--- /dev/null
+++ b/entry/src/main/cpp/src/exe/osx/setup-env.cpp
@@ -0,0 +1,130 @@
+#include "setup-env.h"
+
+#include <string>
+
+#include <CoreFoundation/CoreFoundation.h>
+#include <glib.h>
+#include <poppler-global.h>
+
+#include "util/PathUtil.h"
+
+#include "filesystem.h"
+
+namespace {
+void prependPathToEnvVar(const char* name, fs::path const& path) {
+    const char* currentVal = g_getenv(name);
+    std::string newVar;
+    if (currentVal == nullptr || strlen(currentVal) == 0) {
+        newVar = path.string();
+    } else {
+        newVar = path.string() + ":" + currentVal;
+    }
+    g_setenv(name, newVar.c_str(), 1);
+}
+
+void prependPathToLua(const char* name, const std::string& path) {
+    const char* currentVal = g_getenv(name);
+    std::string newVar;
+    if (currentVal == nullptr || strlen(currentVal) == 0) {
+        newVar = std::string(Util::toGFilename(path).c_str()) + ";;";
+    } else {
+        newVar = std::string(Util::toGFilename(path).c_str()) + ";" + currentVal;
+    }
+    g_setenv(name, newVar.c_str(), true);
+}
+}  // end namespace
+
+void setupEnvironment() {
+    /**
+     * see https://gitlab.gnome.org/GNOME/gtk-mac-bundler/-/blob/master/examples/gtk3-launcher.sh
+     * and https://gitlab.gnome.org/GNOME/gtk-mac-bundler/-/issues/12
+     */
+    auto base = Util::getExePath().parent_path();  // Xournal++.app/Contents or $HOME/gtk/inst or e.g. build/inst (via
+                                                   // Homebrew or MacPorts)
+
+    std::error_code err;
+    bool isAppBundle = fs::exists(base / "Resources", err);
+    if (err) {
+        g_warning("Failed to determine if the app runs as an app bundle: %s", err.message().c_str());
+    }
+    bool underJHBuild = g_strcmp0(g_getenv("UNDER_JHBUILD"), "true") == 0;
+
+    if (isAppBundle) {
+        base = base / "Resources";  // Now base is Xournal++.app/Contents/Resources
+    }
+
+    auto libPath = base / "lib";
+    auto dataPath = base / "share";
+
+    if (isAppBundle) {
+        // Set poppler data directory for (relocatable) app bundles. Otherwise a compile time value is used.
+        auto popplerDataDir = dataPath / "poppler";
+        poppler::set_data_dir(popplerDataDir.string().c_str());
+
+        auto imModuleFile = libPath / "gtk-3.0" / "3.0.0" / "immodules.cache";
+        auto pixbufModuleFile = libPath / "gdk-pixbuf-2.0" / "2.10.0" / "loaders.cache";
+
+        auto typelibPath = libPath / "girepository-1.0";
+        auto xdgPath = base / "etc" / "xdg";
+
+        prependPathToEnvVar("XDG_CONFIG_DIRS", xdgPath);
+        prependPathToEnvVar("XDG_DATA_DIRS", dataPath);
+        g_setenv("GTK_DATA_PREFIX", Util::toGFilename(base).c_str(), 1);
+        g_setenv("GTK_EXE_PREFIX", Util::toGFilename(base).c_str(), 1);
+        g_setenv("GTK_PATH", Util::toGFilename(base).c_str(), 1);
+
+        g_setenv("GTK_IM_MODULE_FILE", Util::toGFilename(imModuleFile).c_str(), 0);
+        g_setenv("GDK_PIXBUF_MODULE_FILE", Util::toGFilename(pixbufModuleFile).c_str(), 0);
+
+        g_setenv("GI_TYPELIB_PATH", Util::toGFilename(typelibPath).c_str(), 0);
+    }
+
+    if (isAppBundle || underJHBuild) {  // in both cases we have non-standard paths for Lua
+        std::string luaPath = std::string(Util::toGFilename(dataPath).c_str()) + "/lua/5.4/?.lua";
+        std::string luaCPath = std::string(Util::toGFilename(libPath).c_str()) + "/lua/5.4/?.so";
+
+        prependPathToLua("LUA_PATH", luaPath);
+        prependPathToLua("LUA_CPATH", luaCPath);
+    }
+
+    const char* usedPixbufModuleFile = g_getenv("GDK_PIXBUF_MODULE_FILE");
+    const char* usedXDGDataDirs = g_getenv("XDG_DATA_DIRS");
+    const char* usedTypelibPath = g_getenv("GI_TYPELIB_PATH");
+    // The DYLD_LIBRARY_PATH is only read when the process is started, so it can't be set here. It is set in
+    // the Info.plist therefore, which only takes effect when running the App from Finder or using the "open" command.
+    const char* usedDYLDLibraryPath = g_getenv("DYLD_LIBRARY_PATH");
+    const char* usedLuaPath = g_getenv("LUA_PATH");
+    const char* usedLuaCPath = g_getenv("LUA_CPATH");
+    g_debug("Continue with:\n"
+            "GDK_PIXBUF_MODULE_FILE = %s\n"
+            "XDG_DATA_DIRS = %s\n"
+            "GI_TYPELIB_PATH = %s\n"
+            "DYLD_LIBRARY_PATH = %s\n"
+            "LUA_PATH = %s\n"
+            "LUA_CPATH = %s",
+            usedPixbufModuleFile, usedXDGDataDirs, usedTypelibPath, usedDYLDLibraryPath, usedLuaPath, usedLuaCPath);
+
+    /**
+     * set LANG and LC_MESSAGES in order to detect the default language
+     * Use the equivalent of 'defaults read -g "AppleLanguages"' executed in the terminal, also visible in System
+     * settings -> Language and Region
+     */
+    CFArrayRef languages =
+            (CFArrayRef)CFPreferencesCopyAppValue(CFSTR("AppleLanguages"), kCFPreferencesCurrentApplication);
+    if (languages && CFArrayGetCount(languages)) {
+        CFStringRef langCode = (CFStringRef)CFArrayGetValueAtIndex(languages, 0);
+        if (langCode) {
+            char buffer[128];
+            if (CFStringGetCString(langCode, buffer, sizeof(buffer), kCFStringEncodingUTF8)) {
+                std::string lang = buffer;  // e.g. "de-DE"
+                if (auto pos = lang.find("-"); pos != std::string::npos) {
+                    lang.replace(pos, 1, "_");  // e.g. "de_DE"
+                }
+                lang += ".UTF-8";  // e.g. "de_DE.UTF-8"
+                g_message("Setting LANG and LC_MESSAGES to %s", lang.c_str());
+                g_setenv("LANG", lang.c_str(), 0);
+                g_setenv("LC_MESSAGES", lang.c_str(), 0);
+            }
+        }
+    }
+}
diff --git a/entry/src/main/cpp/src/exe/osx/setup-env.h b/entry/src/main/cpp/src/exe/osx/setup-env.h
new file mode 100644
index 0000000..f2a897c
--- /dev/null
+++ b/entry/src/main/cpp/src/exe/osx/setup-env.h
@@ -0,0 +1,6 @@
+#pragma once
+
+/**
+ * Sets up all environment variables.
+ */
+void setupEnvironment();
diff --git a/entry/src/main/cpp/src/exe/win32/console.cpp b/entry/src/main/cpp/src/exe/win32/console.cpp
new file mode 100644
index 0000000..620d6e1
--- /dev/null
+++ b/entry/src/main/cpp/src/exe/win32/console.cpp
@@ -0,0 +1,73 @@
+#include "console.h"
+
+#include <windows.h>
+
+void attachConsole() {
+    if (GetConsoleWindow() != NULL) {
+        // Console is already attached.
+        return;
+    }
+
+    // Make sure the console starts hidden.
+    STARTUPINFOW startupInfo = {0};
+    startupInfo.dwFlags = STARTF_USESHOWWINDOW;
+    startupInfo.wShowWindow = SW_HIDE;
+    startupInfo.cb = sizeof(startupInfo);
+
+    PROCESS_INFORMATION processInformation = {0};
+
+    bool consoleAttached = false;
+
+    if (CreateProcessW(L"C:\\Windows\\System32\\cmd.exe", NULL, NULL, NULL, FALSE, 0, NULL, NULL, &startupInfo,
+                       &processInformation)) {
+        HANDLE job = CreateJobObject(NULL, NULL);
+
+        if (job != NULL) {
+            // Terminate the console process automatically when Xournal++ exits.
+            JOBOBJECT_EXTENDED_LIMIT_INFORMATION jobInformation = {0};
+            jobInformation.BasicLimitInformation.LimitFlags = JOB_OBJECT_LIMIT_KILL_ON_JOB_CLOSE;
+
+            if (!SetInformationJobObject(job, JobObjectExtendedLimitInformation, &jobInformation,
+                                         sizeof(jobInformation)) ||
+                !AssignProcessToJobObject(job, processInformation.hProcess)) {
+                TerminateProcess(processInformation.hProcess, 0);
+                CloseHandle(processInformation.hProcess);
+                CloseHandle(processInformation.hThread);
+                CloseHandle(job);
+                processInformation.hProcess = processInformation.hThread = job = NULL;
+            } else {
+                // It takes a short time before the console becomes ready to be attached, unfortunately
+                // there is no API that would let us wait for it.
+                for (unsigned short i = 0; i < 20; i++) {
+                    if (AttachConsole(processInformation.dwProcessId)) {
+                        consoleAttached = true;
+                        break;
+                    }
+                    Sleep(50);
+                }
+            }
+        } else {
+            TerminateProcess(processInformation.hProcess, 0);
+            CloseHandle(processInformation.hProcess);
+            CloseHandle(processInformation.hThread);
+            processInformation.hProcess = processInformation.hThread = NULL;
+        }
+
+        if (processInformation.hProcess != NULL) {
+            if (!consoleAttached) {
+                TerminateProcess(processInformation.hProcess, 0);
+                CloseHandle(job);
+            }
+
+            CloseHandle(processInformation.hProcess);
+            CloseHandle(processInformation.hThread);
+        }
+    }
+
+    if (!consoleAttached) {
+        // Could not attach to the manually created console process, request one from the system instead.
+        // This will make the console window flash briefly before we hide it.
+        AllocConsole();
+        ShowWindow(GetConsoleWindow(), SW_HIDE);
+    }
+}
diff --git a/entry/src/main/cpp/src/exe/win32/console.h b/entry/src/main/cpp/src/exe/win32/console.h
new file mode 100644
index 0000000..83b7601
--- /dev/null
+++ b/entry/src/main/cpp/src/exe/win32/console.h
@@ -0,0 +1,6 @@
+#pragma once
+
+/**
+ * Allocates a new (hidden) console and associates the standard input and output handles with it.
+ */
+void attachConsole();
diff --git a/entry/src/main/cpp/src/exe/win32/gui_main.cpp b/entry/src/main/cpp/src/exe/win32/gui_main.cpp
new file mode 100644
index 0000000..668c257
--- /dev/null
+++ b/entry/src/main/cpp/src/exe/win32/gui_main.cpp
@@ -0,0 +1,16 @@
+// Only for Windows GUI applications, compiled with MSVC.
+#ifdef _MSC_VER
+
+#include <cstdlib>
+
+#include <combaseapi.h>
+#include <windows.h>
+
+auto main(int argc, char* argv[]) -> int;
+
+int WINAPI WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, PSTR lpCmdLine, int nCmdShow) {
+    // Call main:
+    return main(__argc, __argv);
+}
+
+#endif
diff --git a/entry/src/main/cpp/src/exe/win32/xpp.rc.in b/entry/src/main/cpp/src/exe/win32/xpp.rc.in
new file mode 100644
index 0000000..f8667bf
--- /dev/null
+++ b/entry/src/main/cpp/src/exe/win32/xpp.rc.in
@@ -0,0 +1,31 @@
+#include "winver.h"
+
+0 ICON "xournalpp.ico"
+
+VS_VERSION_INFO VERSIONINFO
+FILEVERSION ${PROJECT_VERSION_MAJOR}, ${PROJECT_VERSION_MINOR}, ${PROJECT_VERSION_PATCH}, 0
+PRODUCTVERSION ${PROJECT_VERSION_MAJOR}, ${PROJECT_VERSION_MINOR}, ${PROJECT_VERSION_PATCH}, 0
+FILEOS VOS__WINDOWS32
+FILETYPE VFT_APP
+BEGIN
+    BLOCK "StringFileInfo"
+	BEGIN
+		/* Lang = US English, Charset = Multilingual */
+		BLOCK "040904E4"
+		BEGIN
+			VALUE "CompanyName", "The Xournal++ Team\0"
+			VALUE "FileDescription", "Xournal++\0"
+			VALUE "FileVersion", "${PROJECT_VERSION}\0"
+			VALUE "ProductVersion", "${PROJECT_VERSION}\0"
+			VALUE "ProductName", "Xournal++\0"
+			VALUE "LegalCopyright", "\0"
+			VALUE "LegalTrademarks", "\0"
+			VALUE "Comments", "\0"
+		END
+	END
+
+	BLOCK "VarFileInfo"
+	BEGIN
+		VALUE "Translation", 0x409, 1252
+	END
+END
\ No newline at end of file
diff --git a/entry/src/main/cpp/src/exe/xournalpp-wrapper.gresource.xml b/entry/src/main/cpp/src/exe/xournalpp-wrapper.gresource.xml
new file mode 100644
index 0000000..749fe97
--- /dev/null
+++ b/entry/src/main/cpp/src/exe/xournalpp-wrapper.gresource.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<gresources>
+  <gresource prefix="/org/xournalpp/wrapper">
+    <file compressed="false">ui/crashDialog.glade</file>
+  </gresource>
+</gresources>
diff --git a/entry/src/main/cpp/src/util/Assert.cpp b/entry/src/main/cpp/src/util/Assert.cpp
new file mode 100644
index 0000000..00202a3
--- /dev/null
+++ b/entry/src/main/cpp/src/util/Assert.cpp
@@ -0,0 +1,15 @@
+#include "util/Assert.h"
+
+#include <cstdlib>
+
+#include <glib.h>
+
+#ifndef NDEBUG
+namespace xoj::util {
+void assertFailure(const char* expr, const std::string& msg, const char* fileName, int line, const char* funcName) {
+    g_critical("Assertion failed: %s\n%s    in function %s\n    at line %d of %s", expr,
+               (!msg.empty() ? std::string("    Message: ") + msg + "\n" : "").c_str(), funcName, line, fileName);
+    std::abort();
+}
+};  // namespace xoj::util
+#endif
diff --git a/entry/src/main/cpp/src/util/CMakeLists.txt b/entry/src/main/cpp/src/util/CMakeLists.txt
new file mode 100644
index 0000000..cff5bdc
--- /dev/null
+++ b/entry/src/main/cpp/src/util/CMakeLists.txt
@@ -0,0 +1,13 @@
+cmake_minimum_required(VERSION 3.12)
+cmake_policy(VERSION 3.12)
+
+# Util is pretty small so GLOB_RECURSE is sufficient
+unset(util_SOURCES)
+file(GLOB_RECURSE util_SOURCES *.cpp *.h)
+
+add_library(util STATIC ${util_SOURCES})
+target_link_libraries(util PUBLIC xoj::defaults xoj::external_modules)
+target_compile_features(util PUBLIC ${PROJECT_CXX_FEATURES})
+target_compile_features(util PUBLIC cxx_std_20)
+target_include_directories(util PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>)
+add_library(xoj::util ALIAS util)
diff --git a/entry/src/main/cpp/src/util/Color.cpp b/entry/src/main/cpp/src/util/Color.cpp
new file mode 100644
index 0000000..0f003e4
--- /dev/null
+++ b/entry/src/main/cpp/src/util/Color.cpp
@@ -0,0 +1,31 @@
+#include "util/Color.h"
+
+#include <algorithm>  // for max, min
+#include <iomanip>    // for operator<<, setfill, setw
+#include <sstream>    // for operator<<, stringstream, basic_ostream, char_t...
+
+#include "util/Assert.h"  // for xoj_assert
+#include "util/serdesstream.h"  // for serdes_stream
+
+float Util::as_grayscale_color(Color color) {
+    GdkRGBA components = rgb_to_GdkRGBA(color);
+    float componentAvg = static_cast<float>(components.red + components.green + components.blue) / 3.0f;
+
+    return componentAvg;
+}
+
+float Util::get_color_contrast(Color color1, Color color2) {
+    float grayscale1 = as_grayscale_color(color1);
+    float grayscale2 = as_grayscale_color(color2);
+
+    return std::max(grayscale1, grayscale2) - std::min(grayscale1, grayscale2);
+}
+
+auto Util::rgb_to_hex_string(Color rgb) -> std::string {
+    auto s = serdes_stream<std::ostringstream>();
+    auto tmp_color = rgb;
+    tmp_color.alpha = 0;
+    s << "#" << std::hex << std::setfill('0') << std::setw(6) << std::right << tmp_color;
+
+    return s.str();
+}
diff --git a/entry/src/main/cpp/src/util/ElementRange.cpp b/entry/src/main/cpp/src/util/ElementRange.cpp
new file mode 100644
index 0000000..a1f7a60
--- /dev/null
+++ b/entry/src/main/cpp/src/util/ElementRange.cpp
@@ -0,0 +1,110 @@
+#include "util/ElementRange.h"
+
+#include <charconv>   // for from_chars
+#include <cstddef>    // for size_t
+#include <regex>      // for regex_match, match_results<>::_Unchecked, regex
+#include <stdexcept>  // for invalid_argument, logic_error
+#include <string>     // for basic_string, string
+
+#include "util/i18n.h"  // for _
+
+/**
+ * @brief Parse a string of page ranges.
+ *
+ * This function parses a string of page ranges into a vector of pairs of page
+ * numbers. A page range is of the form n, n-, -m, n-m where n, m are positive
+ * integers. The input - is also accepted. Page ranges are separated by `,`, `;`
+ * and `:`. Whitespace is ignored. The parameter 'pageCount' is the largest page
+ * number that may be refered to. The function silently corrects page numbers
+ * equal to 0 or larger than pageCount by truncating to the nearest
+ * acceptable integer.
+ *
+ * Example input and output:
+ *
+ *     parse("1, 2-, -3, 4-5, -, 0-42", 10)
+ *     ===>
+ *     {0, 0}, {1, 9}, {0, 2}, {3, 4}, {0, 9}, {0, 9}
+ *
+ * Note that the page numbers are parsed in the format 1 - pageCount
+ * (permissive) and the return values are in the range 0 - (pageCount-1).
+ *
+ * @param s The string containing page ranges to parse.
+ * @param maxCount The largest element index that is possible to refer to.
+ * @exception std::logic_error If `pageCount == 0`.
+ * @exception std::invalid_argument If the input doesn't match any acceptable
+ * page ranges.
+ * @return A vector containing the page ranges.
+ */
+ElementRangeVector ElementRange::parse(const std::string& s, size_t maxCount) {
+    // break the string into comma (or ;:) separated tokens.
+    const std::regex separators("[,;:]");
+    auto begin = std::sregex_token_iterator(s.cbegin(), s.cend(), separators, -1);
+    auto end = std::sregex_token_iterator();
+
+    ElementRangeVector entries;
+    if (maxCount == 0) {
+        throw std::logic_error("ElementRange::parse(): maxCount is zero.");
+    }
+
+    /* The following input cases are considered:
+     *
+     *   1) n,   parsed by singlePage,
+     *   2) n-,  parsed by rightOpenRange,
+     *   3) -m,  parsed by leftOpenRange,
+     *   4) n-m, parsed by pageRange,
+     *   5) -,   parsed by bothOpenRange,
+     *   6) For everything else, an exception is thrown.
+     */
+    const std::regex singlePage("\\s*(\\d+)\\s*");
+    const std::regex rightOpenRange("\\s*(\\d+)\\s*-\\s*");
+    const std::regex leftOpenRange("\\s*-\\s*(\\d+)\\s*");
+    const std::regex pageRange("\\s*(\\d+)\\s*-\\s*(\\d+)\\s*");
+    const std::regex bothOpenRange("\\s*-\\s*");
+
+    // for each token separated by `separators`
+    for (auto it = begin; it != end; it++) {
+        std::smatch match;
+        ElementRangeEntry entry;
+        const std::string str = it->str();
+        // This if-else block determines which case of 1) through 6) we deal with
+        if (std::regex_match(str, match, singlePage)) {
+            const auto token = match[1].str();
+            std::from_chars(token.data(), token.data() + token.size(), entry.first);
+            entry.last = entry.first;
+        } else if (std::regex_match(str, match, rightOpenRange)) {
+            const auto token = match[1].str();
+            std::from_chars(token.data(), token.data() + token.size(), entry.first);
+            entry.last = maxCount;
+        } else if (std::regex_match(str, match, leftOpenRange)) {
+            const auto token = match[1].str();
+            std::from_chars(token.data(), token.data() + token.size(), entry.last);
+            entry.first = 1;
+        } else if (std::regex_match(str, match, pageRange)) {
+            const auto tokenFirst = match[1].str();
+            const auto tokenLast = match[2].str();
+            std::from_chars(tokenFirst.data(), tokenFirst.data() + tokenFirst.size(), entry.first);
+            std::from_chars(tokenLast.data(), tokenLast.data() + tokenLast.size(), entry.last);
+        } else if (std::regex_match(str, match, bothOpenRange)) {
+            entry.first = 1;
+            entry.last = maxCount;
+        } else {
+            throw std::invalid_argument(_("ElementRange::parse(): invalid element range."));
+        }
+
+        if (entry.first > maxCount || entry.last > maxCount) {
+            throw std::invalid_argument(_("ElementRange::parse(): given element index is larger than maximum count."));
+        }
+        if (entry.last < entry.first) {
+            throw std::invalid_argument(_("ElementRange::parse(): interval bounds must be in increasing order."));
+        }
+        if (entry.first == 0) {  // entry.last cannot be 0 unless entry.first is.
+            throw std::invalid_argument(_("ElementRange::parse(): element indices start with 1"));
+        }
+
+        // decrease the ranges because they should start from 0 instead of 1
+        entry.first--;  // Cannot already be 0
+        entry.last--;   // Cannot already be 0
+        entries.push_back(entry);
+    }
+    return entries;
+}
diff --git a/entry/src/main/cpp/src/util/GtkUtil.cpp b/entry/src/main/cpp/src/util/GtkUtil.cpp
new file mode 100644
index 0000000..08355c2
--- /dev/null
+++ b/entry/src/main/cpp/src/util/GtkUtil.cpp
@@ -0,0 +1,177 @@
+#include "util/GtkUtil.h"
+
+#include <algorithm>
+#include <string>
+#include <string_view>
+
+#include <gtk/gtk.h>
+
+#include "util/Assert.h"
+#include "util/raii/GVariantSPtr.h"
+
+namespace xoj::util::gtk {
+
+static GAction* findAction(GtkActionable* w) {
+    const char* name = gtk_actionable_get_action_name(w);
+    if (!name) {
+        g_warning("xoj::util::gtk::findAction: No action name set");
+        return nullptr;
+    }
+    std::string_view namesv = name;
+    size_t dotpos = namesv.find(".");
+    if (dotpos == std::string_view::npos) {
+        g_warning("xoj::util::gtk::findAction: Action name is not of the form \"namespace.name\": %s", name);
+        return nullptr;
+    }
+    std::string groupname(namesv.substr(0, dotpos));
+    GActionGroup* win = gtk_widget_get_action_group(GTK_WIDGET(w), groupname.c_str());
+    if (!win) {
+        // Most likely the widget just got removed from the toplevel
+        g_debug("xoj::util::gtk::findAction: could not find action group \"%s\"", groupname.data());
+        return nullptr;
+    }
+    if (!G_IS_ACTION_MAP(win)) {
+        g_warning("xoj::util::gtk::findAction: GActionGroup is not a GActionMap");
+        return nullptr;
+    }
+    auto shortname = namesv.substr(dotpos + 1);
+    return g_action_map_lookup_action(G_ACTION_MAP(win), shortname.data());
+}
+
+void setToggleButtonUnreleasable(GtkToggleButton* btn) {
+    // "hierarchy-change" is emitted when the widget is added to/removed from a toplevel's descendance
+    // We use this to connect to the suitable GAction signals once the widget has been added to the toolbar
+    g_signal_connect(btn, "hierarchy-changed", G_CALLBACK(+[](GtkWidget* btn, GtkWidget*, gpointer) {
+                         if (!GTK_IS_WINDOW(gtk_widget_get_toplevel(btn))) {
+                             return;  // The widget was removed from the hierarchy
+                         }
+                         GAction* action = findAction(GTK_ACTIONABLE(btn));
+                         if (!action) {
+                             return;
+                         }
+
+                         g_signal_connect_object(
+                                 btn, "toggled", G_CALLBACK(+[](GtkToggleButton* btn, gpointer a) {
+                                     xoj::util::GVariantSPtr state(g_action_get_state(G_ACTION(a)), xoj::util::adopt);
+                                     GVariant* target = gtk_actionable_get_action_target_value(GTK_ACTIONABLE(btn));
+                                     if (bool active = g_variant_equal(state.get(), target);
+                                         active && !gtk_toggle_button_get_active(btn)) {
+                                         gtk_toggle_button_set_active(btn, true);
+                                     }
+                                 }),
+                                 action, GConnectFlags(0));
+                     }),
+                     nullptr);
+}
+
+void setWidgetFollowActionEnabled(GtkWidget* w, GAction* a) {
+    g_signal_connect_object(a, "notify::enabled", G_CALLBACK(+[](GObject* a, GParamSpec*, gpointer w) {
+                                bool b = g_action_get_enabled(G_ACTION(a));
+                                gtk_widget_set_sensitive(GTK_WIDGET(w), b);
+                            }),
+                            w, GConnectFlags(0));
+    gtk_widget_set_sensitive(w, g_action_get_enabled(a));
+}
+
+std::optional<double> getWidgetDPI(GtkWidget* w) {
+    GdkWindow* win = gtk_widget_get_window(w);
+    GdkDisplay* disp = gtk_widget_get_display(w);
+    if (win && disp) {
+        GdkMonitor* mon = gdk_display_get_monitor_at_window(disp, win);
+        if (mon) {
+            int h = gdk_monitor_get_height_mm(mon);
+            GdkRectangle r;
+            gdk_monitor_get_geometry(mon, &r);
+            auto res = static_cast<double>(r.height) * 25.4 / static_cast<double>(h);
+            g_debug("Automatic DPI conf: monitor height %d mm - DPI = %f", h, res);
+            // I assume some monitors may not return the right value: clamp to avoid wild values that could cause very
+            // bad performances. Not sure what good clamping values should be here.
+            // DPI > 720 should use HiDPI scaling but smaller devices (tablet/phone) can have high DPI values
+            res = std::clamp(res, 36., 720.);
+            return res;
+        }
+    }
+    return std::nullopt;
+}
+
+
+#if GTK_MAJOR_VERSION == 3
+void setRadioButtonActionName(GtkRadioButton* btn, const char* actionNamespace, const char* actionName) {
+    // "hierarchy-change" is emitted when the widget is added to/removed from a toplevel's descendance
+    // We use this to connect to the suitable GAction signals once the widget has been added to the toolbar
+    struct Data {
+        std::string actionNamespace;
+        std::string actionName;
+    };
+    g_signal_connect_data(
+            btn, "hierarchy-changed", G_CALLBACK(+[](GtkWidget* btn, GtkWidget*, gpointer d) {
+                if (!GTK_IS_WINDOW(gtk_widget_get_toplevel(btn))) {
+                    return;  // The widget was removed from the hierarchy
+                }
+                Data* data = static_cast<Data*>(d);
+                GActionGroup* win = gtk_widget_get_action_group(btn, data->actionNamespace.c_str());
+                if (!win) {
+                    g_warning("Could not find action group \"%s\"", data->actionNamespace.c_str());
+                    return;
+                }
+                xoj_assert(G_IS_ACTION_MAP(win));
+                auto* action = g_action_map_lookup_action(G_ACTION_MAP(win), data->actionName.c_str());
+                if (!action) {
+                    g_warning("Could not find action \"win.%s\"", data->actionName.c_str());
+                    return;
+                }
+
+                {
+                    // btn owns the return GVariant of gtk_actionable_get_action_target_value()
+                    GVariant* target = gtk_actionable_get_action_target_value(GTK_ACTIONABLE(btn));
+                    // action does not own the return GVariant and it is not floating either!
+                    xoj::util::GVariantSPtr state(g_action_get_state(G_ACTION(action)), xoj::util::adopt);
+                    gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(btn), g_variant_equal(target, state.get()));
+                }
+
+                static auto toggledCallback = +[](GtkToggleButton* btn, gpointer action) {
+                    xoj_assert(gtk_actionable_get_action_target_value(GTK_ACTIONABLE(btn)));
+                    if (gtk_toggle_button_get_active(btn)) {
+                        g_action_change_state(G_ACTION(action),
+                                              gtk_actionable_get_action_target_value(GTK_ACTIONABLE(btn)));
+                    }
+                };
+                g_signal_connect_object(btn, "toggled", G_CALLBACK(toggledCallback), action, GConnectFlags(0));
+
+                g_signal_connect_object(
+                        action, "notify::state", G_CALLBACK(+[](GObject* action, GParamSpec*, gpointer btn) {
+                            // btn owns the return GVariant of gtk_actionable_get_action_target_value()
+                            GVariant* target = gtk_actionable_get_action_target_value(GTK_ACTIONABLE(btn));
+                            // action does not own the return GVariant and it is not floating either!
+                            xoj::util::GVariantSPtr state(g_action_get_state(G_ACTION(action)), xoj::util::adopt);
+                            xoj_assert(target);
+                            xoj_assert(state);
+                            if (g_variant_equal(target, state.get()) &&
+                                !gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(btn))) {
+                                g_signal_handlers_block_by_func(btn, (gpointer)toggledCallback, action);
+                                gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(btn), true);
+                                g_signal_handlers_unblock_by_func(btn, (gpointer)toggledCallback, action);
+                            }
+                        }),
+                        btn, GConnectFlags(0));
+
+                setWidgetFollowActionEnabled(btn, action);
+            }),
+            new Data{actionNamespace, actionName}, +[](gpointer d, GClosure*) { delete static_cast<Data*>(d); },
+            GConnectFlags(0));
+}
+
+void fixActionableInitialSensitivity(GtkActionable* w) {
+    g_signal_connect(w, "hierarchy-changed", G_CALLBACK(+[](GtkWidget* w, GtkWidget*, gpointer) {
+                         if (!GTK_IS_WINDOW(gtk_widget_get_toplevel(w))) {
+                             return;  // The widget was removed from the hierarchy
+                         }
+                         if (GAction* action = findAction(GTK_ACTIONABLE(w)); action) {
+                             gtk_widget_set_sensitive(w, g_action_get_enabled(action));
+                         }
+                     }),
+                     nullptr);
+}
+
+#endif
+};  // namespace xoj::util::gtk
diff --git a/entry/src/main/cpp/src/util/GzUtil.cpp b/entry/src/main/cpp/src/util/GzUtil.cpp
new file mode 100644
index 0000000..b09685c
--- /dev/null
+++ b/entry/src/main/cpp/src/util/GzUtil.cpp
@@ -0,0 +1,11 @@
+#include "util/GzUtil.h"
+
+auto GzUtil::openPath(const fs::path& path, const std::string& flags) -> gzFile {
+#ifdef _WIN32
+    gzFile fp = gzopen_w(path.c_str(), flags.c_str());
+
+    return fp;
+#else
+    return gzopen(path.c_str(), flags.c_str());
+#endif
+}
diff --git a/entry/src/main/cpp/src/util/NamedColor.cpp b/entry/src/main/cpp/src/util/NamedColor.cpp
new file mode 100644
index 0000000..3e3c618
--- /dev/null
+++ b/entry/src/main/cpp/src/util/NamedColor.cpp
@@ -0,0 +1,65 @@
+#include "util/NamedColor.h"
+
+#include <cstdint>    // for uint16_t, uint8_t
+#include <sstream>    // for istringstream, basic_istream, basic_i...
+#include <stdexcept>  // for invalid_argument
+#include <utility>    // for move
+
+#include "util/StringUtils.h"   // for StringUtils
+#include "util/i18n.h"          // for fetch_translation
+#include "util/serdesstream.h"  // for serdes_stream
+
+
+NamedColor::NamedColor():
+        paletteIndex{0}, name{"Custom Color"}, colorU16{ColorU16{}}, color{Color(0u)}, isPaletteColor{false} {}
+
+NamedColor::NamedColor(size_t paletteIndex):
+        paletteIndex{paletteIndex},
+        name{"Fallback Color"},
+        colorU16{ColorU16{}},
+        color{Color(0u)},
+        isPaletteColor{true} {}
+
+NamedColor::NamedColor(Color color):
+        paletteIndex{0},
+        name{"Custom Color"},
+        colorU16(Util::argb_to_ColorU16(color)),
+        color(color),
+        isPaletteColor{false} {};
+
+auto operator>>(std::istream& str, NamedColor& namedColor) -> std::istream& {
+    std::string line;
+    NamedColor tmp;
+    if (std::getline(str, line)) {
+        auto iss = serdes_stream<std::istringstream>(line);
+        uint16_t r{}, g{}, b{};
+        if (iss >> r >> g >> b && std::getline(iss, tmp.name)) {
+            if (r > 255 || g > 255 || b > 255) {
+                throw std::invalid_argument("RGB values bigger than 255 are not supported.");
+            }
+            tmp.color = Color(uint8_t(r), uint8_t(g), uint8_t(b));
+            tmp.name = fetch_translation_context("Color", StringUtils::trim(tmp.name).c_str());
+            tmp.colorU16 = Util::argb_to_ColorU16(tmp.color);
+            tmp.isPaletteColor = true;
+            tmp.paletteIndex = namedColor.paletteIndex;
+            // All read operations worked
+            namedColor = std::move(tmp);
+        } else {
+            /*
+             * One operation failed.
+             * So set the state on the main stream
+             * to indicate failure.
+             */
+            str.setstate(std::ios::failbit);
+        }
+    }
+    return str;
+}
+
+auto NamedColor::getColorU16() const -> ColorU16 { return colorU16; }
+
+auto NamedColor::getColor() const -> Color { return color; }
+
+auto NamedColor::getIndex() const -> size_t { return paletteIndex; };
+
+auto NamedColor::getName() const -> std::string const& { return name; };
diff --git a/entry/src/main/cpp/src/util/OutputStream.cpp b/entry/src/main/cpp/src/util/OutputStream.cpp
new file mode 100644
index 0000000..508cf7a
--- /dev/null
+++ b/entry/src/main/cpp/src/util/OutputStream.cpp
@@ -0,0 +1,76 @@
+#include "util/OutputStream.h"
+
+#include <cassert>
+#include <cerrno>
+#include <cstring>  // for strlen
+#include <utility>  // for move
+
+#include "util/GzUtil.h"  // for GzUtil
+#include "util/i18n.h"    // for FS, _F
+#include "util/safe_casts.h"
+
+OutputStream::OutputStream() = default;
+
+OutputStream::~OutputStream() = default;
+
+void OutputStream::write(const std::string& str) { write(str.c_str(), str.length()); }
+
+void OutputStream::write(const char* str) { write(str, std::strlen(str)); }
+
+////////////////////////////////////////////////////////
+/// GzOutputStream /////////////////////////////////////
+////////////////////////////////////////////////////////
+
+GzOutputStream::GzOutputStream(fs::path file): file(std::move(file)) {
+    this->fp = GzUtil::openPath(this->file, "w");
+    if (this->fp == nullptr) {
+        this->error = FS(_F("Error opening file: \"{1}\"") % this->file.u8string());
+        this->error = this->error + "\n" + std::strerror(errno);
+    }
+}
+
+GzOutputStream::~GzOutputStream() {
+    if (this->fp) {
+        close();
+    }
+    this->fp = nullptr;
+}
+
+auto GzOutputStream::getLastError() const -> const std::string& { return this->error; }
+
+void GzOutputStream::write(const char* data, size_t len) {
+    xoj_assert(len != 0 && this->fp);
+    auto written = gzwrite(this->fp, data, strict_cast<unsigned int>(len));
+    if (as_unsigned(written) != len) {
+        int errnum = 0;
+        const char* error = gzerror(this->fp, &errnum);
+        if (errnum != Z_OK) {
+            this->error = FS(_F("Error writing data to file: \"{1}\"") % this->file.u8string());
+            this->error += "\n" + FS(_F("Error code {1}. Message:") % errnum) + "\n";
+            if (errnum == Z_ERRNO) {
+                // fs error. Fetch the precise message
+                this->error += std::strerror(errno);
+            } else {
+                this->error += error;
+            }
+        }
+    }
+}
+
+void GzOutputStream::close() {
+    if (!this->fp) {
+        return;
+    }
+
+    auto errnum = gzclose(this->fp);
+    this->fp = nullptr;
+
+    if (errnum != Z_OK) {
+        this->error = FS(_F("Error occurred while closing file: \"{1}\"") % this->file.u8string());
+        this->error += "\n" + FS(_F("Error code {1}") % errnum);
+        if (errnum == Z_ERRNO) {
+            // fs error. Fetch the precise message
+            this->error = this->error + "\n" + std::strerror(errno);
+        }
+    }
+}
diff --git a/entry/src/main/cpp/src/util/PathUtil.cpp b/entry/src/main/cpp/src/util/PathUtil.cpp
new file mode 100644
index 0000000..52927f8
--- /dev/null
+++ b/entry/src/main/cpp/src/util/PathUtil.cpp
@@ -0,0 +1,535 @@
+#include "util/PathUtil.h"
+
+#include <algorithm>
+#include <cstdlib>      // for system
+#include <fstream>      // for ifstream, char_traits, basic_ist...
+#include <iterator>     // for begin
+#include <sstream>      // for stringstream
+#include <stdexcept>    // for runtime_error
+#include <string_view>  // for basic_string_view, operator""sv
+#include <type_traits>  // for remove_reference<>::type
+#include <utility>      // for move
+#include <variant>
+
+#include <config-paths.h>  // for PROJECT_INSTALL_DIR
+#include <glib.h>          // for gchar, g_free, g_filename_to_uri
+
+#include "util/PlaceholderString.h"  // for PlaceholderString
+#include "util/StringUtils.h"        // for replace_pair, StringUtils
+#include "util/Util.h"               // for getPid, execInUiThread
+#include "util/XojMsgBox.h"          // for XojMsgBox
+#include "util/i18n.h"               // for FS, _F, FORMAT_STR
+#include "util/raii/CStringWrapper.h"
+#include "util/safe_casts.h"  // for as_signed
+#include "util/utf8_view.h"   // for utf8_view
+
+#include "config.h"  // for PROJECT_NAME
+
+#ifdef _WIN32
+#include <Windows.h>
+#else
+#include <unistd.h>  // for readlink, ssize_t
+#ifdef __APPLE__
+#include <glib.h>
+#include <mach-o/dyld.h>
+#else
+#include <climits>  // for PATH_MAX
+#endif
+#endif
+
+#ifdef GHC_FILESYSTEM
+// Fix of ghc::filesystem bug (path::operator/=() won't support string_views)
+constexpr auto const* CONFIG_FOLDER_NAME = "xournalpp";
+#else
+using namespace std::string_view_literals;
+constexpr auto CONFIG_FOLDER_NAME = "xournalpp"sv;
+#endif
+
+#ifdef _WIN32
+auto Util::getLongPath(const fs::path& path) -> fs::path {
+    auto asWString = path.wstring();
+    DWORD wLongPathSz = GetLongPathNameW(asWString.c_str(), nullptr, 0);
+
+    if (wLongPathSz == 0) {
+        return path;
+    }
+
+    std::wstring wLongPath(wLongPathSz, L'\0');
+    GetLongPathNameW(asWString.c_str(), wLongPath.data(), static_cast<DWORD>(wLongPath.size()));
+    wLongPath.pop_back();
+    return {std::move(wLongPath)};
+}
+#else
+auto Util::getLongPath(const fs::path& path) -> fs::path { return path; }
+#endif
+
+
+#ifdef _WIN32
+fs::path Util::getExePath() {
+    wchar_t szFileName[MAX_PATH + 1];
+    GetModuleFileNameW(nullptr, szFileName, MAX_PATH + 1);
+
+    return fs::path{szFileName}.parent_path();
+}
+#else
+#ifdef __APPLE__
+fs::path Util::getExePath() {
+    char c;
+    uint32_t size = 0;
+    _NSGetExecutablePath(&c, &size);
+
+    char* path = new char[size + 1];
+    if (_NSGetExecutablePath(path, &size) == 0) {
+        fs::path p(path);
+        delete[] path;
+        return p.parent_path();
+    }
+
+    g_error("Could not get executable path!");
+
+    delete[] path;
+    return "";
+}
+#else
+auto Util::getExePath() -> fs::path {
+#ifndef PATH_MAX
+    // This is because PATH_MAX is (per posix) not defined if there is
+    // no limit, e.g., on GNU Hurd. The "right" workaround is to not use
+    // PATH_MAX, instead stat the link and use stat.st_size for
+    // allocating the buffer.
+#define PATH_MAX 4096
+#endif
+    std::array<char, PATH_MAX> result{};
+    ssize_t count = readlink("/proc/self/exe", result.data(), PATH_MAX);
+    return fs::path{std::string(result.data(), as_unsigned(std::max(ssize_t{0}, count)))}.parent_path();
+}
+#endif
+#endif
+
+
+/**
+ * Read a file to a string
+ *
+ * @param path Path to read
+ * @param showErrorToUser Show an error to the user, if the file could not be read
+ * @param openmode Mode to open the file
+ *
+ * @return contents if the file was read, std::nullopt if not
+ */
+auto Util::readString(fs::path const& path, bool showErrorToUser, std::ios_base::openmode openmode)
+        -> std::optional<std::string> {
+    try {
+        std::stringstream buffer;
+        std::ifstream ifs{path, openmode};
+        if (!ifs) {
+            throw std::runtime_error{FS(_F("Could not open file: {1}") % std::strerror(errno))};
+        }
+        ifs.exceptions(std::ios::failbit | std::ios::badbit);
+        buffer << ifs.rdbuf();
+        return buffer.str();
+    } catch (const std::exception& e) {
+        if (showErrorToUser) {
+            const auto msg = FS(_F("Error reading \"{1}\":\n{2}") % path.u8string() % e.what());
+            XojMsgBox::showErrorToUser(nullptr, msg);
+        }
+    }
+    return std::nullopt;
+}
+
+auto Util::getEscapedPath(const fs::path& path) -> std::string {
+    std::string escaped = path.string();
+    StringUtils::replaceAllChars(escaped, {replace_pair('\\', "\\\\"), replace_pair('\"', "\\\"")});
+    return escaped;
+}
+
+auto Util::hasXournalFileExt(const fs::path& path) -> bool {
+    auto extension = StringUtils::toLowerCase(path.extension().string());
+    return extension == ".xoj" || extension == ".xopp";
+}
+
+auto Util::hasPdfFileExt(const fs::path& path) -> bool {
+    return StringUtils::toLowerCase(path.extension().string()) == ".pdf";
+}
+
+auto Util::hasPngFileExt(const fs::path& path) -> bool {
+    return StringUtils::toLowerCase(path.extension().string()) == ".png";
+}
+
+auto Util::isAbsolute(const fs::path& path) -> bool {
+#if defined(__GLIBCXX__) && defined(_WIN32)
+    if (path.is_absolute()) {
+        return true;
+    }
+
+    // Check for UNC paths like \\server\foo\bar.
+    // This works around a libstdc++ bug: https://gcc.gnu.org/bugzilla/show_bug.cgi?id=99333
+    const auto& str = path.native();
+    if (str.size() < 3) {
+        return false;
+    }
+    // support both forward and backward slashes
+    return (str[0] == '\\' || str[0] == '/') && (str[1] == '\\' || str[1] == '/');
+#else
+    return path.is_absolute();
+#endif
+}
+
+auto Util::clearExtensions(fs::path& path, const std::string& ext) -> void {
+    auto rm_ext = [&path](const std::string ext) {
+        if (StringUtils::toLowerCase(path.extension().string()) == StringUtils::toLowerCase(ext)) {
+            path.replace_extension("");
+        }
+    };
+
+    rm_ext(".xoj");
+    rm_ext(".xopp");
+    if (!ext.empty()) {
+        rm_ext(ext);
+    }
+}
+
+Util::GFilename::GFilename(const fs::path& p) {
+#ifndef _WIN32  // On Windows, g_filename are always in UTF8
+    if (!g_get_filename_charsets(nullptr)) {
+        // g_filename are NOT utf-8 encoded
+        GError* err = nullptr;
+        value = xoj::util::OwnedCString::assumeOwnership(
+                g_filename_from_utf8(char_cast(p.u8string().c_str()), -1, nullptr, nullptr, &err));
+        if (err) {
+            g_warning("Failed to convert g_filename from utf8 with error code: %d\n%s", err->code, err->message);
+            g_error_free(err);
+            value = u8"";
+        }
+    } else
+#endif
+    {
+        value = p.u8string();
+    }
+}
+
+Util::GFilename::GFilename(const char* p): value(p) {}
+
+auto Util::GFilename::assumeOwnerhip(char* p) -> GFilename {
+    GFilename f;
+    f.value = xoj::util::OwnedCString::assumeOwnership(p);
+    return f;
+}
+const char* Util::GFilename::c_str() const {
+    if (const auto* p = get_if<xoj::util::OwnedCString>(&value); p) {
+        return p->get();
+    } else if (const auto* q = get_if<const char*>(&value); q) {
+        return *q;
+    }
+    return char_cast(get<std::u8string>(value).c_str());
+}
+
+std::optional<fs::path> Util::GFilename::toPath() const {
+#ifndef _WIN32  // On Windows, g_filename are always in UTF8
+    if (!g_get_filename_charsets(nullptr)) {
+        // g_filename are NOT utf-8 encoded
+        GError* err = nullptr;
+        auto utf8 =
+                xoj::util::OwnedCString::assumeOwnership(g_filename_to_utf8(this->c_str(), -1, nullptr, nullptr, &err));
+        if (err) {
+            g_warning("Failed to convert g_filename to utf8 with error code: %d\n%s", err->code, err->message);
+            g_error_free(err);
+            return std::nullopt;
+        }
+        if (utf8) {
+            return fs::path(xoj::util::utf8(utf8.get()));
+        } else {
+            // Conversion failed?
+            g_warning("Failed to convert g_filename to utf8: the resulting string is empty");
+            return std::nullopt;
+        }
+    } else
+#endif
+    {
+        if (const char* p = this->c_str(); p) {
+            return fs::path(xoj::util::utf8(p));
+        } else {
+            return std::nullopt;
+        }
+    }
+}
+
+// Uri must be ASCII-encoded!
+auto Util::fromUri(const std::string& uri) -> std::optional<fs::path> {
+    if (!StringUtils::startsWith(uri, "file://")) {
+        return std::nullopt;
+    }
+    return GFilename::assumeOwnerhip(g_filename_from_uri(uri.c_str(), nullptr, nullptr)).toPath();
+}
+
+auto Util::toUri(const fs::path& path) -> std::optional<std::string> {
+    GError* error{};
+    char* uri = [&] {
+        if (isAbsolute(path)) {
+            return g_filename_to_uri(GFilename(path).c_str(), nullptr, &error);
+        }
+        return g_filename_to_uri(GFilename(fs::absolute(path)).c_str(), nullptr, &error);
+    }();
+
+    if (error != nullptr) {
+        g_warning("Util::toUri: could not parse path to URI, error: %s\n", error->message);
+        g_error_free(error);
+        return std::nullopt;
+    }
+
+    if (!uri) {
+        g_warning("Util::toUri: path results in empty URI");
+        return std::nullopt;
+    }
+
+    std::string uriString(uri);
+    g_free(uri);
+    return {std::move(uriString)};
+}
+
+auto Util::fromGFile(GFile* file) -> fs::path {
+    return GFilename(g_file_peek_path(file)).toPath().value_or(fs::path());
+}
+
+auto Util::toGFile(fs::path const& path) -> xoj::util::GObjectSPtr<GFile> {
+    return xoj::util::GObjectSPtr<GFile>(g_file_new_for_path(GFilename(path).c_str()), xoj::util::adopt);
+}
+
+auto Util::fromGFilename(const char* path) -> fs::path { return GFilename(path).toPath().value_or(fs::path()); }
+
+auto Util::toGFilename(fs::path const& path) -> GFilename { return GFilename(path); }
+
+auto Util::getGettextFilepath(fs::path const& localeDir) -> fs::path {
+    /// documentation of g_getenv is wrong, its UTF-8, see #5640
+    const char* gettextEnv = g_getenv("TEXTDOMAINDIR");
+
+    auto dir = [&]() -> std::optional<fs::path> {
+        if (gettextEnv) {
+            // Only consider first path in environment variable
+            std::string_view directories(gettextEnv);
+            size_t firstDot = directories.find(G_SEARCHPATH_SEPARATOR);
+            if (firstDot != std::string::npos) {
+                return GFilename::assumeOwnerhip(g_strndup(gettextEnv, firstDot)).toPath();
+            } else {
+                return GFilename(gettextEnv).toPath();
+            }
+        } else {
+            return std::nullopt;
+        }
+    }();
+    g_debug("TEXTDOMAINDIR = %s, Platform-specific locale dir = %s, chosen directory = %s", gettextEnv,
+            localeDir.string().c_str(), dir.value_or(localeDir).string().c_str());
+    return dir.value_or(localeDir);
+}
+
+auto Util::getAutosaveFilepath() -> fs::path {
+    fs::path p(getCacheSubfolder("autosaves"));
+    p /= std::to_string(getPid()) + ".xopp";
+    return p;
+}
+
+auto Util::getConfigFolder() -> fs::path {
+    auto p = GFilename(g_get_user_config_dir()).toPath().value_or(fs::path());
+    return (p /= CONFIG_FOLDER_NAME);
+}
+
+auto Util::getConfigSubfolder(const fs::path& subfolder) -> fs::path {
+    fs::path p = getConfigFolder();
+    p /= subfolder;
+
+    return Util::ensureFolderExists(p);
+}
+
+auto Util::getCacheSubfolder(const fs::path& subfolder) -> fs::path {
+    auto p = GFilename(g_get_user_cache_dir()).toPath().value_or(fs::path());
+    p /= CONFIG_FOLDER_NAME;
+    p /= subfolder;
+
+    return Util::ensureFolderExists(p);
+}
+
+auto Util::getDataSubfolder(const fs::path& subfolder) -> fs::path {
+    auto p = GFilename(g_get_user_data_dir()).toPath().value_or(fs::path());
+    p /= CONFIG_FOLDER_NAME;
+    p /= subfolder;
+
+    return Util::ensureFolderExists(p);
+}
+
+static auto buildUserStateDir() -> fs::path {
+#if _WIN32
+    // Windows: state directory is same as data directory (and the path is necessarily in utf-8)
+    return fs::path(xoj::util::utf8(g_get_user_data_dir()));
+#else
+    // Unix: $XDG_STATE_HOME or ~/.local/state
+    const char* xdgStateHome = std::getenv("XDG_STATE_HOME");
+    if (xdgStateHome && xdgStateHome[0]) {
+        // environment variable exists and is non-empty
+        return Util::GFilename(xdgStateHome).toPath().value_or(fs::path());
+    }
+
+    auto path = Util::GFilename(g_get_home_dir()).toPath().value_or(fs::path());
+    return path / ".local/state";
+#endif
+}
+
+static auto getUserStateDir() -> const fs::path& {
+    // The GLib function g_get_user_state_dir is not supported on GLib < 2.72,
+    // so we implement our version here.
+
+    // Cache fs::path so it is only computed once.
+    static std::optional<const fs::path> userStateDir;
+    if (!userStateDir.has_value()) {
+        userStateDir.emplace(buildUserStateDir());
+    }
+    return *userStateDir;
+}
+
+auto Util::getStateSubfolder(const fs::path& subfolder) -> fs::path {
+    auto p = getUserStateDir();
+    p /= CONFIG_FOLDER_NAME;
+    p /= subfolder;
+
+    return Util::ensureFolderExists(p);
+}
+
+auto Util::getConfigFile(const fs::path& relativeFileName) -> fs::path {
+    fs::path p = getConfigSubfolder(relativeFileName.parent_path());
+    p /= relativeFileName.filename();
+    return p;
+}
+
+auto Util::getCacheFile(const fs::path& relativeFileName) -> fs::path {
+    fs::path p = getCacheSubfolder(relativeFileName.parent_path());
+    p /= relativeFileName.filename();
+    return p;
+}
+
+auto Util::getTmpDirSubfolder(const fs::path& subfolder) -> fs::path {
+    auto p = GFilename(g_get_tmp_dir()).toPath().value_or(fs::path());
+    p /= FS(_F("xournalpp-{1}") % Util::getPid());
+    p /= subfolder;
+    return Util::ensureFolderExists(p);
+}
+
+auto Util::ensureFolderExists(const fs::path& p) -> fs::path {
+    try {
+        fs::create_directories(p);
+    } catch (const fs::filesystem_error& fe) {
+        std::string msg = FS(_F("Could not create folder: {1}\nFailed with error: {2}") % p.u8string() % fe.what());
+        Util::execInUiThread([msg = std::move(msg)]() { XojMsgBox::showErrorToUser(nullptr, msg); });
+    }
+    return p;
+}
+
+auto Util::normalizeAssetPath(const fs::path& asset, const fs::path& base, PathStorageMode mode) -> std::u8string {
+    try {
+        if (mode == PathStorageMode::AS_RELATIVE_PATH) {
+            fs::path basenormal = base.empty() ? fs::current_path() : fs::absolute(base).lexically_normal();
+            return fs::absolute(asset).lexically_proximate(basenormal).lexically_normal().generic_u8string();
+        } else {
+            xoj_assert(mode == PathStorageMode::AS_ABSOLUTE_PATH);
+            return fs::absolute(asset).lexically_normal().generic_u8string();
+        }
+    } catch (const fs::filesystem_error& fe) {
+        g_warning("Could not normalize path: %s\nFailed with error: %s", char_cast(asset.u8string().c_str()),
+                  fe.what());
+        return asset.generic_u8string();
+    }
+}
+
+auto Util::isChildOrEquivalent(fs::path const& path, fs::path const& base) -> bool {
+    auto safeCanonical = [](fs::path const& p) {
+        try {
+            return fs::weakly_canonical(p);
+        } catch (const fs::filesystem_error& fe) {
+            g_warning("Util::isChildOrEquivalent: Error resolving paths, failed with %s.\nFalling back to "
+                      "lexicographical path",
+                      fe.what());
+            return p;
+        }
+    };
+    auto relativePath = safeCanonical(path).lexically_relative(safeCanonical(base));
+    return !relativePath.empty() && *std::begin(relativePath) != "..";
+}
+
+bool Util::safeRenameFile(fs::path const& from, fs::path const& to) {
+    if (!fs::is_regular_file(from)) {
+        return false;
+    }
+
+    // Due to https://github.com/xournalpp/xournalpp/issues/1122,
+    // we first attempt to move the file with fs::rename.
+    // If this fails, we then copy and delete the source, as
+    // discussed in the issue
+    // Use target default perms; the source partition may have different file
+    // system attributes than the target, and we don't want anything bad in the
+    // autosave directory
+
+    // Attempt move
+    try {
+        fs::remove(to);
+        fs::rename(from, to);
+    } catch (const fs::filesystem_error& fe) {
+        // Attempt copy and delete
+        g_warning("Renaming file %s to %s failed with %s. This may happen when source and target are on different "
+                  "filesystems. Attempt to copy the file.",
+                  char_cast(fe.path1().u8string().c_str()), char_cast(fe.path2().u8string().c_str()), fe.what());
+        fs::copy_file(from, to, fs::copy_options::overwrite_existing);
+        fs::remove(from);
+    }
+    return true;
+}
+
+void Util::safeReplaceExtension(fs::path& p, const char* newExtension) {
+    try {
+        p.replace_extension(newExtension);
+    } catch (const fs::filesystem_error& fe) {
+        g_warning("Could not replace extension of file \"%s\"! Failed with %s", char_cast(p.u8string().c_str()),
+                  fe.what());
+    }
+}
+
+auto Util::getDataPath() -> fs::path {
+#if defined(__APPLE__)
+    fs::path p = getExePath().parent_path();
+    if (fs::exists(p / "Resources")) {
+        return p / "Resources";
+    }
+#endif
+
+    return getExePath().parent_path() / "share" / PROJECT_NAME;
+}
+
+auto Util::getLocalePath() -> fs::path {
+#ifdef __APPLE__
+    fs::path p = getExePath().parent_path();
+    if (fs::exists(p / "Resources")) {
+        return p / "Resources" / "share" / "locale";
+    }
+#endif
+
+    return getDataPath().parent_path() / "locale";
+}
+
+auto Util::getInstallUiPath() -> fs::path {
+    fs::path p = PROJECT_INSTALL_DIR;
+    return p / "share" / PROJECT_NAME / "ui";
+}
+
+auto Util::getBuiltInPaletteDirectoryPath() -> fs::path { return getDataPath() / "palettes"; }
+
+auto Util::getCustomPaletteDirectoryPath() -> fs::path { return getConfigSubfolder("palettes"); }
+
+auto Util::listFilesSorted(fs::path directory) -> std::vector<fs::path> {
+    std::vector<fs::path> filePaths{};
+    if (!exists(directory)) {
+        g_warning("Directory %s does not exist.", char_cast(directory.u8string().c_str()));
+        return filePaths;
+    }
+
+    for (const fs::directory_entry& p: fs::directory_iterator(directory)) {
+        filePaths.push_back(p.path());
+    }
+    std::sort(filePaths.begin(), filePaths.end());
+    return filePaths;
+}
diff --git a/entry/src/main/cpp/src/util/PlaceholderString.cpp b/entry/src/main/cpp/src/util/PlaceholderString.cpp
new file mode 100644
index 0000000..684cf7d
--- /dev/null
+++ b/entry/src/main/cpp/src/util/PlaceholderString.cpp
@@ -0,0 +1,107 @@
+#include "util/PlaceholderString.h"
+
+#include <charconv>
+#include <exception>  // for exception
+#include <string>
+
+#include <glib.h>  // for g_error
+
+#include "util/safe_casts.h"  // for as_unsigned
+
+///////////////////////////////////////////////////////////////////////////////
+///////////////////////////////////////////////////////////////////////////////
+///////////////////////////////////////////////////////////////////////////////
+
+PlaceholderString::PlaceholderString(std::string_view text): text(text) {}
+
+auto PlaceholderString::formatPart(std::string_view format) const -> std::string {
+    std::string formatDef;
+
+    std::size_t comma = format.find(',');
+    if (comma != std::string::npos) {
+        formatDef = format.substr(comma + 1);
+        format = format.substr(0, comma);
+    }
+
+    int index = 0;
+
+    auto res = std::from_chars(format.data(), format.data() + format.size(), index);
+    if (res.ec != std::errc()) {
+        g_error("Could not parse \"%s\" as int, error: %i", format.data(), int(res.ec));
+    }
+
+    // Placeholder index starting at 1, vector at 0
+    index--;
+
+    if (index < 0 || index >= static_cast<int>(data.size())) {
+        std::string notFound = "{";
+        notFound += std::to_string(index + 1);
+        notFound += "}";
+        return notFound;
+    }
+
+    auto const& pe = data[as_unsigned(index)];
+
+    return pe->format(formatDef);
+}
+
+void PlaceholderString::process() const {
+    if (!processed.empty()) {
+        return;
+    }
+
+    bool openBracket = false;
+    bool closeBacket = false;
+    std::string formatString;
+
+    // Should work, also for UTF-8
+    for (char c: text) {
+        if (c == '{') {
+            closeBacket = false;
+            if (openBracket) {
+                openBracket = false;
+                processed += '{';
+                continue;
+            }
+            openBracket = true;
+            continue;
+        }
+
+        if (c == '}') {
+            if (closeBacket) {
+                processed += '}';
+                closeBacket = false;
+                continue;
+            }
+
+            closeBacket = true;
+            if (openBracket) {
+                processed += formatPart(formatString);
+                openBracket = false;
+                formatString = "";
+            }
+            continue;
+        }
+
+        if (openBracket) {
+            formatString += c;
+            continue;
+        }
+
+
+        closeBacket = false;
+        processed += c;
+    }
+}
+
+auto PlaceholderString::str() const -> std::string {
+    process();
+    return processed;
+}
+
+auto PlaceholderString::c_str() const -> const char* {
+    process();
+    return processed.c_str();
+}
+
+auto operator<<(std::ostream& os, PlaceholderString& ps) -> std::ostream& { return os << ps.str(); }
diff --git a/entry/src/main/cpp/src/util/Range.cpp b/entry/src/main/cpp/src/util/Range.cpp
new file mode 100644
index 0000000..456eaab
--- /dev/null
+++ b/entry/src/main/cpp/src/util/Range.cpp
@@ -0,0 +1,60 @@
+#include "util/Range.h"
+
+#include <algorithm>  // for max, min
+
+#include "util/Rectangle.h"
+
+
+Range::Range(const xoj::util::Rectangle<double>& r): minX(r.x), minY(r.y), maxX(r.x + r.width), maxY(r.y + r.height) {}
+
+void Range::addPoint(double x, double y) {
+    this->minX = std::min(this->minX, x);
+    this->maxX = std::max(this->maxX, x);
+
+    this->minY = std::min(this->minY, y);
+    this->maxY = std::max(this->maxY, y);
+}
+
+Range Range::unite(const Range& o) const {
+    return Range(std::min(minX, o.minX), std::min(minY, o.minY), std::max(maxX, o.maxX), std::max(maxY, o.maxY));
+}
+
+Range Range::intersect(const Range& o) const {
+    Range rg(std::max(minX, o.minX), std::max(minY, o.minY), std::min(maxX, o.maxX), std::min(maxY, o.maxY));
+    return rg.isValid() ? rg : Range();
+}
+
+auto Range::getX() const -> double { return this->minX; }
+
+auto Range::getY() const -> double { return this->minY; }
+
+auto Range::getWidth() const -> double { return this->maxX - this->minX; }
+
+auto Range::getHeight() const -> double { return this->maxY - this->minY; }
+
+void Range::addPadding(double padding) {
+    this->minX -= padding;
+    this->maxX += padding;
+    this->minY -= padding;
+    this->maxY += padding;
+}
+
+void Range::translate(double dx, double dy) {
+    this->minX += dx;
+    this->maxX += dx;
+    this->minY += dy;
+    this->maxY += dy;
+}
+
+auto Range::empty() const -> bool {
+    Range empty;
+    return this->minX == empty.minX && this->minY == empty.minY && this->maxX == empty.maxX && this->maxY == empty.maxY;
+}
+
+bool Range::isValid() const { return minX <= maxX && minY <= maxY; }
+
+bool Range::contains(double x, double y) const { return x >= minX && x <= maxX && y >= minY && y <= maxY; }
+
+bool Range::contains(const xoj::util::Rectangle<double>& r) const {
+    return this->minX <= r.x && this->maxX >= r.x + r.width && this->minY <= r.y && this->maxY >= r.y + r.height;
+}
diff --git a/entry/src/main/cpp/src/util/Recolor.cpp b/entry/src/main/cpp/src/util/Recolor.cpp
new file mode 100644
index 0000000..b769615
--- /dev/null
+++ b/entry/src/main/cpp/src/util/Recolor.cpp
@@ -0,0 +1,57 @@
+#include "util/Recolor.h"
+
+#include "util/Color.h"
+
+Recolor::Recolor(const ColorU8& light, const ColorU8& dark): dark(dark), light(light) { recalcDiffAndOff(); }
+
+const ColorU8& Recolor::getDark() const { return dark; }
+
+const ColorU8& Recolor::getLight() const { return light; }
+
+void Recolor::recalcDiffAndOff() {
+    difference = ColorU8{
+            static_cast<uint8_t>(std::abs(static_cast<int16_t>(dark.red) - static_cast<int16_t>(light.red))),
+            static_cast<uint8_t>(std::abs(static_cast<int16_t>(dark.green) - static_cast<int16_t>(light.green))),
+            static_cast<uint8_t>(std::abs(static_cast<int16_t>(dark.blue) - static_cast<int16_t>(light.blue)))};
+
+    offset = ColorU8{std::min(dark.red, light.red), std::min(dark.green, light.green), std::min(dark.blue, light.blue)};
+    ref = ColorU8{
+            static_cast<uint8_t>((light.red < dark.red ? 255 : 0)),
+            static_cast<uint8_t>((light.green < dark.green ? 255 : 0)),
+            static_cast<uint8_t>((light.blue < dark.blue ? 255 : 0)),
+    };
+}
+
+ColorU8 Recolor::convertColor(const ColorU8& other) const {
+    return ColorU8{
+            static_cast<uint8_t>(
+                    std::min(255, std::min(255, std::abs(static_cast<int>(ref.red) - static_cast<int>(other.red)) *
+                                                        static_cast<int>(difference.red) / 255) +
+                                          offset.red)),
+            static_cast<uint8_t>(
+                    std::min(255, std::min(255, std::abs(static_cast<int>(ref.green) - static_cast<int>(other.green)) *
+                                                        static_cast<int>(difference.green) / 255) +
+                                          offset.green)),
+            static_cast<uint8_t>(
+                    std::min(255, std::min(255, std::abs(static_cast<int>(ref.blue) - static_cast<int>(other.blue)) *
+                                                        static_cast<int>(difference.blue) / 255) +
+                                          offset.blue)),
+    };
+}
+
+void Recolor::recolorCurrentCairoRegion(cairo_t* cr) const {
+    // Apply inversion
+    cairo_set_operator(cr, CAIRO_OPERATOR_DIFFERENCE);
+    Util::cairo_set_source_rgbi(cr, ref);
+    cairo_paint(cr);
+
+    // Scale the spectrum
+    cairo_set_operator(cr, CAIRO_OPERATOR_MULTIPLY);
+    Util::cairo_set_source_rgbi(cr, difference);
+    cairo_paint(cr);
+
+    // Move the spectrum
+    cairo_set_operator(cr, CAIRO_OPERATOR_ADD);
+    Util::cairo_set_source_rgbi(cr, offset);
+    cairo_paint(cr);
+}
diff --git a/entry/src/main/cpp/src/util/SaveNameUtils.cpp b/entry/src/main/cpp/src/util/SaveNameUtils.cpp
new file mode 100644
index 0000000..9259030
--- /dev/null
+++ b/entry/src/main/cpp/src/util/SaveNameUtils.cpp
@@ -0,0 +1,48 @@
+#include "util/SaveNameUtils.h"
+
+#include "util/PathUtil.h"  // for clearExtensions
+
+
+auto SaveNameUtils::parseFilenameFromWildcardString(std::u8string_view wildcardString, const fs::path& PdfPath,
+                                                    const fs::path& FilePath) -> std::u8string {
+    std::u8string saveString = wildcardString.data();
+    size_t pos = saveString.find(DEFAULT_WILDCARD_START);
+
+    // parse all wildcards until none are left
+    while (pos != std::string::npos) {
+        size_t wildcardStartLength = std::u8string_view(DEFAULT_WILDCARD_START).length();
+        size_t endPos = saveString.find(DEFAULT_WILDCARD_END, pos + wildcardStartLength);
+        if (endPos == std::u8string::npos) {
+            break;
+        }
+        std::u8string parsedWildcard = parseWildcard(
+                saveString.substr(pos + wildcardStartLength, endPos - pos - wildcardStartLength), PdfPath, FilePath);
+        saveString.replace(pos, endPos + 1 - pos, parsedWildcard);
+        pos += parsedWildcard.size();
+        pos = saveString.find(DEFAULT_WILDCARD_START, pos);
+    }
+
+    return saveString;
+}
+
+auto SaveNameUtils::parseWildcard(std::u8string_view wildcard, const fs::path& PdfPath, const fs::path& FilePath)
+        -> std::u8string {
+    if (wildcard == WILDCARD_PDF_NAME) {
+        fs::path path = PdfPath;
+        Util::clearExtensions(path, ".pdf");
+        return path.u8string();
+    }
+
+    if (wildcard == WILDCARD_FILE_NAME) {
+        fs::path path = FilePath;
+        Util::clearExtensions(path, "");
+        return path.u8string();
+    }
+
+    if (wildcard == WILDCARD_DATE || wildcard == WILDCARD_TIME) {
+        // Backwards compatibility: redirect to std::chrono placeholders
+        return wildcard == WILDCARD_DATE ? u8"%F" : u8"%X";
+    }
+    // not a valid wildcard
+    return u8"";
+}
diff --git a/entry/src/main/cpp/src/util/Stacktrace.cpp b/entry/src/main/cpp/src/util/Stacktrace.cpp
new file mode 100644
index 0000000..852e41f
--- /dev/null
+++ b/entry/src/main/cpp/src/util/Stacktrace.cpp
@@ -0,0 +1,21 @@
+#include "util/Stacktrace.h"
+
+#include "config-features.h"
+#ifdef ENABLE_CPPTRACE
+#include <cpptrace/cpptrace.hpp>
+#endif
+
+Stacktrace::Stacktrace() = default;
+
+Stacktrace::~Stacktrace() = default;
+
+
+void Stacktrace::printStacktrace(std::ostream& stream) {
+#ifdef ENABLE_CPPTRACE
+    cpptrace::generate_trace().print(stream);
+#else
+    stream << "No stacktrace library or symbols available" << std::endl;
+#endif
+}
+
+void Stacktrace::printStacktrace() { printStacktrace(std::cerr); }
diff --git a/entry/src/main/cpp/src/util/StringUtils.cpp b/entry/src/main/cpp/src/util/StringUtils.cpp
new file mode 100644
index 0000000..58d8e70
--- /dev/null
+++ b/entry/src/main/cpp/src/util/StringUtils.cpp
@@ -0,0 +1,85 @@
+#include "util/StringUtils.h"
+
+#include <cstring>
+#include <sstream>  // std::istringstream
+#include <utility>
+
+#include <glib.h>
+
+#include "util/safe_casts.h"  // for as_signed
+
+using std::string;
+using std::vector;
+
+auto StringUtils::toLowerCase(const string& input) -> string {
+    char* lower = g_utf8_strdown(input.c_str(), as_signed(input.size()));
+    string lowerStr = lower;
+    g_free(lower);
+    return lowerStr;
+}
+
+void StringUtils::replaceAllChars(string& input, const std::vector<replace_pair>& replaces) {
+    string out;
+    bool found = false;
+    for (char c: input) {
+        for (const replace_pair& p: replaces) {
+            if (c == p.first) {
+                out += p.second;
+                found = true;
+                break;
+            }
+        }
+        if (!found) {
+            out += c;
+        }
+        found = false;
+    }
+    input = out;
+}
+
+auto StringUtils::split(const string& input, char delimiter) -> vector<string> {
+    vector<string> tokens;
+    string token;
+    std::istringstream tokenStream(input);
+    while (std::getline(tokenStream, token, delimiter)) {
+        tokens.push_back(token);
+    }
+    return tokens;
+}
+
+auto StringUtils::startsWith(std::string_view str, std::string_view start) -> bool {
+    return str.compare(0, start.length(), start) == 0;
+}
+
+auto StringUtils::endsWith(std::string_view str, std::string_view end) -> bool {
+    if (end.size() > str.size()) {
+        return false;
+    }
+
+    return str.compare(str.length() - end.length(), end.length(), end) == 0;
+}
+
+const std::string TRIM_CHARS = "\t\n\v\f\r ";
+
+auto StringUtils::ltrim(std::string str) -> std::string {
+    str.erase(0, str.find_first_not_of(TRIM_CHARS));
+    return str;
+}
+
+auto StringUtils::rtrim(std::string str) -> std::string {
+    str.erase(str.find_last_not_of(TRIM_CHARS) + 1);
+    return str;
+}
+
+auto StringUtils::trim(std::string str) -> std::string { return ltrim(rtrim(std::move(str))); }
+
+auto StringUtils::iequals(const string& a, const string& b) -> bool {
+    gchar* ca = g_utf8_casefold(a.c_str(), as_signed(a.size()));
+    gchar* cb = g_utf8_casefold(b.c_str(), as_signed(b.size()));
+    int result = strcmp(ca, cb);
+    g_free(ca);
+    g_free(cb);
+
+
+    return result == 0;
+}
diff --git a/entry/src/main/cpp/src/util/Util.cpp b/entry/src/main/cpp/src/util/Util.cpp
new file mode 100644
index 0000000..3e0ec7d
--- /dev/null
+++ b/entry/src/main/cpp/src/util/Util.cpp
@@ -0,0 +1,81 @@
+#include "util/Util.h"
+
+#include <array>    // for array
+#include <cstdlib>  // for system
+#include <string>   // for allocator, string
+#include <utility>  // for move
+#include <vector>   // for vector
+
+#include <gdk/gdk.h>  // for gdk_cairo_set_source_rgba, gdk_t...
+
+#include "util/Color.h"              // for argb_to_GdkRGBA, rgb_to_GdkRGBA
+#include "util/OutputStream.h"       // for OutputStream
+#include "util/PlaceholderString.h"  // for PlaceholderString
+#include "util/XojMsgBox.h"          // for XojMsgBox
+#include "util/i18n.h"               // for FS, _F
+
+#if defined(_MSC_VER)
+#include <windows.h>
+#else
+#include <unistd.h>  // for getpid, pid_t
+#endif
+
+
+void Util::cairo_set_source_rgbi(cairo_t* cr, Color color, double alpha) {
+    auto rgba = argb_to_GdkRGBA(color, alpha);
+    gdk_cairo_set_source_rgba(cr, &rgba);
+}
+
+void Util::cairo_set_source_argb(cairo_t* cr, Color color) {
+    auto rgba = argb_to_GdkRGBA(color);
+    gdk_cairo_set_source_rgba(cr, &rgba);
+}
+
+auto Util::getPid() -> PID {
+#if defined(_MSC_VER)
+    return GetCurrentProcessId();
+#else
+    return ::getpid();
+#endif
+}
+
+auto Util::paintBackgroundWhite(GtkWidget* widget, cairo_t* cr, void*) -> gboolean {
+    GtkAllocation alloc;
+    gtk_widget_get_allocation(widget, &alloc);
+    cairo_set_source_rgb(cr, 1, 1, 1);
+    cairo_rectangle(cr, 0, 0, alloc.width, alloc.height);
+    cairo_fill(cr);
+    return false;
+}
+
+xoj::util::Point<double> Util::toWidgetCoords(GtkWidget* widget, xoj::util::Point<double> absolute_coords) {
+    int rx, ry;
+    // X11 uses absolute screen coordinates while Wayland uses absolute window coordinates.
+    // Converting them to widget-local coordinates will cancel out this difference.
+    // `gtk_widget_get_window` doesn't return the actual window, but the local widget-window.
+    // GTK4 renames `gdk_window_get_root_coords()` to `gdk_surface_get_root_coords()`
+    gdk_window_get_root_coords(gtk_widget_get_window(widget), 0, 0, &rx, &ry);
+    return xoj::util::Point<double>{absolute_coords.x - rx, absolute_coords.y - ry};
+}
+
+void Util::cairo_set_dash_from_vector(cairo_t* cr, const std::vector<double>& dashes, double offset) {
+    cairo_set_dash(cr, dashes.data(), static_cast<int>(dashes.size()), offset);
+}
+
+void Util::writeCoordinateString(OutputStream* out, double xVal, double yVal) {
+    std::array<char, G_ASCII_DTOSTR_BUF_SIZE> coordString{};
+    g_ascii_formatd(coordString.data(), G_ASCII_DTOSTR_BUF_SIZE, Util::PRECISION_FORMAT_STRING, xVal);
+    out->write(coordString.data());
+    out->write(" ");
+    g_ascii_formatd(coordString.data(), G_ASCII_DTOSTR_BUF_SIZE, Util::PRECISION_FORMAT_STRING, yVal);
+    out->write(coordString.data());
+}
+
+void Util::systemWithMessage(const char* command) {
+    if (auto errc = std::system(command); errc != 0) {
+        std::string msg = FS(_F("Error {1} executing system command: {2}") % errc % command);
+        XojMsgBox::showErrorToUser(nullptr, msg);
+    }
+}
+
+bool Util::isFlatpakInstallation() { return fs::exists("/.flatpak-info"); }
diff --git a/entry/src/main/cpp/src/util/VersionInfo.cpp b/entry/src/main/cpp/src/util/VersionInfo.cpp
new file mode 100644
index 0000000..c935869
--- /dev/null
+++ b/entry/src/main/cpp/src/util/VersionInfo.cpp
@@ -0,0 +1,120 @@
+#include "util/VersionInfo.h"
+
+#include <sstream>
+
+#include <glib.h>
+#include <gtk/gtk.h>
+
+#include "util/raii/CStringWrapper.h"
+
+#include "config-git.h"
+#include "config.h"
+
+#ifdef GDK_WINDOWING_X11
+#include <gdk/gdkx.h>
+static bool isX11() { return GDK_IS_X11_DISPLAY(gdk_display_get_default()); }
+#else
+static bool isX11() { return false; }
+#endif
+
+#ifdef GDK_WINDOWING_WAYLAND
+#include <gdk/gdkwayland.h>
+static bool isWayland() { return GDK_IS_WAYLAND_DISPLAY(gdk_display_get_default()); }
+#else
+static bool isWayland() { return false; }
+#endif
+
+#ifdef GDK_WINDOWING_QUARTZ
+#include <gdk/gdkquartz.h>
+static bool isQuartz() { return GDK_IS_QUARTZ_DISPLAY(gdk_display_get_default()); }
+#else
+static bool isQuartz() { return false; }
+#endif
+
+#ifdef GDK_WINDOWING_BROADWAY
+#include <gdk/gdkbroadway.h>
+static bool isBroadway() { return GDK_IS_BROADWAY_DISPLAY(gdk_display_get_default()); }
+#else
+static bool isBroadway() { return false; }
+#endif
+
+#ifdef GDK_WINDOWING_WIN32
+#include <gdk/gdkwin32.h>
+static bool isWin32() { return GDK_IS_WIN32_DISPLAY(gdk_display_get_default()); }
+#else
+static bool isWin32() { return false; }
+#endif
+
+namespace xoj::util {
+const char* getGdkBackend() {
+    if (gdk_display_get_default()) {
+        if (isX11()) {
+            return "X11";
+        } else if (isWayland()) {
+            return "Wayland";
+        } else if (isBroadway()) {
+            return "Broadway";
+        } else if (isQuartz()) {
+            return "Quartz";
+        } else if (isWin32()) {
+            return "Win32";
+        } else {
+            return "Unknown GDK backend!!";
+        }
+    } else {
+        return nullptr;
+    }
+}
+
+std::string getXournalppVersion() {
+    auto str = std::string(PROJECT_NAME) + " " + PROJECT_VERSION;
+    if (!std::string(GIT_COMMIT_ID).empty()) {
+        str = str + " (" + GIT_COMMIT_ID + " from " + GIT_ORIGIN_OWNER + "/" + GIT_BRANCH + ")";
+    }
+    return str;
+}
+
+std::string getOsInfo() {
+    auto osInfo = xoj::util::OwnedCString::assumeOwnership(g_get_os_info(G_OS_INFO_KEY_NAME));
+    if (!osInfo) {
+        osInfo = xoj::util::OwnedCString::assumeOwnership(g_get_os_info(G_OS_INFO_KEY_PRETTY_NAME));
+    }
+    if (osInfo) {
+        xoj::util::OwnedCString osVersion;
+        for (auto key: {G_OS_INFO_KEY_VERSION, G_OS_INFO_KEY_VERSION_ID, G_OS_INFO_KEY_VERSION_CODENAME}) {
+            osVersion = xoj::util::OwnedCString::assumeOwnership(g_get_os_info(key));
+            if (osVersion) {
+                break;
+            }
+        }
+        if (osVersion) {
+            return std::string(osInfo.get()) + " " + osVersion.get();
+        } else {
+            return std::string(osInfo.get());
+        }
+    }
+    return std::string();
+}
+
+
+std::string getVersionInfo() {
+    std::stringstream str;
+    str.imbue(std::locale::classic());
+
+    str << getXournalppVersion() << std::endl;
+
+    str << "├──libgtk: " << gtk_get_major_version() << "." << gtk_get_minor_version() << "." << gtk_get_micro_version()
+        << std::endl;
+    str << "├──glib: " << glib_major_version << "." << glib_minor_version << "." << glib_micro_version << std::endl;
+    str << "├──cairo:  " << cairo_version_string() << std::endl;
+
+
+    if (const char* backend = getGdkBackend(); backend) {
+        str << "├──GDK backend: " << backend << std::endl;
+    }
+
+    str << "└──OS info: " << getOsInfo() << std::endl;
+
+    return str.str();
+}
+};  // namespace xoj::util
diff --git a/entry/src/main/cpp/src/util/XojMsgBox.cpp b/entry/src/main/cpp/src/util/XojMsgBox.cpp
new file mode 100644
index 0000000..85a1cc7
--- /dev/null
+++ b/entry/src/main/cpp/src/util/XojMsgBox.cpp
@@ -0,0 +1,222 @@
+#include "util/XojMsgBox.h"
+
+#include <utility>  // for move
+
+#include <glib-object.h>  // for g_object_set_property, g_value_init, g_valu...
+#include <glib.h>         // for g_free, g_markup_escape_text, g_error_free
+
+#include "util/PopupWindowWrapper.h"
+#include "util/Util.h"
+#include "util/gtk4_helper.h"
+#include "util/i18n.h"  // for _, FS, _F
+#include "util/raii/CStringWrapper.h"
+
+#ifdef _WIN32
+// Needed for help dialog workaround on Windows; see XojMsgBox::showHelp
+#include <windows.h>
+// <windows.h> must be included first
+#include <shellapi.h>  // for ShellExecute
+#endif
+
+GtkWindow* defaultWindow = nullptr;
+
+XojMsgBox::XojMsgBox(GtkDialog* dialog, xoj::util::move_only_function<void(int)> callback, CallbackPolicy pol):
+        window(reinterpret_cast<GtkWindow*>(dialog)), callback(std::move(callback)), policy(pol) {
+    this->signalId =
+            g_signal_connect(dialog, "response", G_CALLBACK(+[](GtkDialog* dialog, int response, gpointer data) {
+                                 auto* self = static_cast<XojMsgBox*>(data);
+
+                                 if (self->policy == IMMEDIATE) {
+                                     self->callback(response);
+                                 } else {  // POSTPONED
+                                     // We sometimes need to call gtk_window_close() before invoking the callback,
+                                     // because if the callback pops up another dialog, the first one won't close...
+                                     // But since gtk_window_close() triggers the destruction of *self, we first move
+                                     // the callback
+                                     Util::execInUiThread([cb = std::move(self->callback), r = response]() { cb(r); });
+                                 }
+
+                                 // Closing the window causes another "response" signal, which we want to ignore
+                                 g_signal_handler_disconnect(dialog, self->signalId);
+                                 gtk_window_close(self->getWindow());  // Destroys *self. Beware!
+                             }),
+                             this);
+}
+
+
+/**
+ * Set window for messages without window
+ */
+void XojMsgBox::setDefaultWindow(GtkWindow* win) { defaultWindow = win; }
+
+void XojMsgBox::showMarkupMessageToUser(GtkWindow* win, const std::string_view& markupTitle, const std::string& msg,
+                                        GtkMessageType type) {
+    if (win == nullptr) {
+        win = defaultWindow;
+    }
+
+    GtkWidget* dialog = gtk_message_dialog_new_with_markup(win, GTK_DIALOG_MODAL, type, GTK_BUTTONS_OK, nullptr);
+
+    gtk_message_dialog_set_markup(GTK_MESSAGE_DIALOG(dialog), markupTitle.data());
+
+    if (!msg.empty()) {
+        gtk_message_dialog_format_secondary_text(GTK_MESSAGE_DIALOG(dialog), "%s", msg.c_str());
+    }
+
+    xoj::popup::PopupWindowWrapper<XojMsgBox> popup(GTK_DIALOG(dialog));
+    popup.show(win);
+}
+
+void XojMsgBox::showMessageToUser(GtkWindow* win, const std::string& title, const std::string& msg,
+                                  GtkMessageType type) {
+    auto escapedTitle = xoj::util::OwnedCString::assumeOwnership(g_markup_escape_text(title.c_str(), -1));
+    showMarkupMessageToUser(win, escapedTitle.get(), msg, type);
+}
+
+void XojMsgBox::showMessageToUser(GtkWindow* win, const std::string& msg, GtkMessageType type) {
+    showMessageToUser(win, msg, std::string(), type);
+}
+
+void XojMsgBox::showErrorToUser(GtkWindow* win, const std::string& msg) {
+    showMessageToUser(win, msg, GTK_MESSAGE_ERROR);
+    g_warning("%s", msg.c_str());
+}
+
+void XojMsgBox::askQuestion(GtkWindow* win, const std::string& maintext, const std::string& secondarytext,
+                            const std::vector<Button>& buttons, xoj::util::move_only_function<void(int)> callback) {
+
+    auto formattedMsg = xoj::util::OwnedCString::assumeOwnership(g_markup_escape_text(maintext.c_str(), -1));
+    askQuestionWithMarkup(win, std::string_view(formattedMsg), secondarytext, buttons, std::move(callback));
+}
+
+void XojMsgBox::askQuestionWithMarkup(GtkWindow* win, std::string_view maintext, const std::string& secondarytext,
+                                      const std::vector<Button>& buttons,
+                                      xoj::util::move_only_function<void(int)> callback) {
+    if (win == nullptr) {
+        win = defaultWindow;
+    }
+
+    GtkWidget* dialog =
+            gtk_message_dialog_new_with_markup(win, GTK_DIALOG_MODAL, GTK_MESSAGE_QUESTION, GTK_BUTTONS_NONE, nullptr);
+
+    for (auto& b: buttons) {
+        gtk_dialog_add_button(GTK_DIALOG(dialog), b.label.c_str(), b.response);
+    }
+
+    gtk_message_dialog_set_markup(GTK_MESSAGE_DIALOG(dialog), maintext.data());
+
+    gtk_message_dialog_format_secondary_text(GTK_MESSAGE_DIALOG(dialog), "%s", secondarytext.c_str());
+
+    xoj::popup::PopupWindowWrapper<XojMsgBox> popup(GTK_DIALOG(dialog), std::move(callback));
+    popup.show(win);
+}
+
+void XojMsgBox::showErrorAndQuit(std::string& msg, int exitCode) {
+    GtkWidget* dialog = gtk_message_dialog_new_with_markup(defaultWindow, GTK_DIALOG_MODAL, GTK_MESSAGE_ERROR,
+                                                           GTK_BUTTONS_OK, nullptr);
+
+    gtk_message_dialog_set_markup(GTK_MESSAGE_DIALOG(dialog), msg.c_str());
+
+    // We use a hack to ensure the app does not exit until the user has read the error message and closed the popup
+    bool done = false;
+
+    xoj::popup::PopupWindowWrapper<XojMsgBox> popup(GTK_DIALOG(dialog), [&done](int) { done = true; });
+
+    popup.show(defaultWindow);
+
+    while (!done) {
+        // Let the main loop run so the popup pops up and can be interacted with
+        g_main_context_iteration(g_main_context_default(), true);
+    }
+
+    exit(exitCode);
+}
+
+void XojMsgBox::showPluginMessage(const std::string& pluginName, const std::string& msg, bool error) {
+    auto header = std::string("Xournal++ Plugin «") + pluginName + "»";
+    auto escapedHeader = xoj::util::OwnedCString::assumeOwnership(g_markup_escape_text(header.c_str(), -1));
+    header = (error ? std::string("<b>Error in </b>") : "") + escapedHeader.get();
+
+    showMarkupMessageToUser(nullptr, header, msg, error ? GTK_MESSAGE_ERROR : GTK_MESSAGE_INFO);
+}
+
+auto XojMsgBox::askPluginQuestion(const std::string& pluginName, const std::string& msg,
+                                  const std::vector<Button>& buttons, bool error) -> int {
+    /*
+     * Todo(gtk4): Remove this function entirely.
+     */
+    std::string header = "<i>Warning: The plugin interface function msgbox() is deprecated and will soon be removed. "
+                         "Please adapt your plugin to use the function openDialog() instead</i>\n\n";
+    header += (error ? std::string("<b>Error in </b>") : "") + std::string("Xournal++ Plugin «") + pluginName + "»";
+
+    GtkWidget* dialog = gtk_message_dialog_new_with_markup(defaultWindow, GTK_DIALOG_MODAL,
+                                                           error ? GTK_MESSAGE_ERROR : GTK_MESSAGE_QUESTION,
+                                                           GTK_BUTTONS_NONE, nullptr);
+
+    gtk_message_dialog_set_markup(GTK_MESSAGE_DIALOG(dialog), header.c_str());
+
+    if (defaultWindow != nullptr) {
+        gtk_window_set_transient_for(GTK_WINDOW(dialog), defaultWindow);
+    }
+
+    GValue val = G_VALUE_INIT;
+    g_value_init(&val, G_TYPE_STRING);
+    g_value_set_string(&val, msg.c_str());
+    g_object_set_property(G_OBJECT(dialog), "secondary-text", &val);
+    g_value_unset(&val);
+
+    for (auto& b: buttons) {
+        gtk_dialog_add_button(GTK_DIALOG(dialog), b.label.c_str(), b.response);
+    }
+
+    int res = gtk_dialog_run(GTK_DIALOG(dialog));
+    gtk_widget_destroy(dialog);
+    return res;
+}
+
+void XojMsgBox::replaceFileQuestion(GtkWindow* win, fs::path file,
+                                    xoj::util::move_only_function<void(const fs::path&)> writeTofile) {
+    if (!fs::exists(file)) {
+        writeTofile(file);
+        return;
+    }
+
+    GtkWidget* dialog = gtk_message_dialog_new(
+            win, GTK_DIALOG_MODAL, GTK_MESSAGE_QUESTION, GTK_BUTTONS_NONE, "%s",
+            FS(_F("The file {1} already exists! Do you want to replace it?") % file.filename().u8string()).c_str());
+    if (win != nullptr) {
+        gtk_window_set_transient_for(GTK_WINDOW(dialog), win);
+    }
+    gtk_dialog_add_button(GTK_DIALOG(dialog), _("Select another name"), GTK_RESPONSE_CANCEL);
+    gtk_dialog_add_button(GTK_DIALOG(dialog), _("Replace"), GTK_RESPONSE_OK);
+
+    xoj::popup::PopupWindowWrapper<XojMsgBox> popup(
+            GTK_DIALOG(dialog), [overwrite = std::move(writeTofile), file = std::move(file)](int response) mutable {
+                if (response == GTK_RESPONSE_OK) {
+                    overwrite(file);
+                }
+            });
+    popup.show(win);
+}
+
+constexpr auto* XOJ_HELP = "https://xournalpp.github.io/community/help/";
+
+void XojMsgBox::showHelp(GtkWindow* win) { openURL(win, XOJ_HELP); }
+
+void XojMsgBox::openURL(GtkWindow* win, const char* url) {
+#ifdef _WIN32
+    // gvfs is not in MSYS repositories, so we can't use gtk_show_uri_on_window.
+    // Instead, we use the native API.
+    ShellExecute(nullptr, "open", url, nullptr, nullptr, SW_SHOW);
+#else
+    GError* error = nullptr;
+    gtk_show_uri_on_window(win, url, gtk_get_current_event_time(), &error);
+
+    if (error) {
+        std::string msg = FS(_F("Unable to open the link: {1}\n{2}") % url % error->message);
+        XojMsgBox::showErrorToUser(win, msg);
+
+        g_error_free(error);
+    }
+#endif
+}
diff --git a/entry/src/main/cpp/src/util/XojPreviewExtractor.cpp b/entry/src/main/cpp/src/util/XojPreviewExtractor.cpp
new file mode 100644
index 0000000..a82e4e7
--- /dev/null
+++ b/entry/src/main/cpp/src/util/XojPreviewExtractor.cpp
@@ -0,0 +1,174 @@
+#include "util/XojPreviewExtractor.h"
+
+#include <array>    // for array
+#include <cstring>  // for strlen, strncmp
+#include <string>   // for allocator, string
+
+#include <glib.h>     // for g_free, g_base64_decode, g_malloc, gsize
+#include <zip.h>      // for zip_close, zip_fclose, zip_stat_t, zip_fopen
+#include <zipconf.h>  // for zip_int64_t, zip_uint64_t
+#include <zlib.h>     // for gzclose, gzread, gzFile
+
+#include "util/GzUtil.h"      // for GzUtil
+#include "util/PathUtil.h"    // for hasXournalFileExt
+#include "util/StringUtils.h"  // for char_cast
+#include "util/safe_casts.h"  // for as_signed
+
+#include "filesystem.h"  // for path
+
+const char* TAG_PREVIEW_NAME = "preview";
+const size_t TAG_PREVIEW_NAME_LEN = strlen(TAG_PREVIEW_NAME);
+const char* TAG_PAGE_NAME = "page";
+const size_t TAG_PAGE_NAME_LEN = strlen(TAG_PAGE_NAME);
+const char* TAG_PREVIEW_END_NAME = "/preview";
+const size_t TAG_PREVIEW_END_NAME_LEN = strlen(TAG_PREVIEW_END_NAME);
+// max png size is: (1.02*(3*128+1)*128)+68 approx 50334
+// see https://stackoverflow.com/a/22507715/2907484
+// max base64-overhead is ceil(50334/3)*4 = 67112
+// see https://stackoverflow.com/a/4715480/2907484
+// round it up a bit
+constexpr auto BUF_SIZE = 68000;
+
+XojPreviewExtractor::XojPreviewExtractor() = default;
+
+XojPreviewExtractor::~XojPreviewExtractor() {
+    g_free(data);
+    data = nullptr;
+    dataLen = 0;
+}
+
+/**
+ * @return The preview data, should be a binary PNG
+ */
+auto XojPreviewExtractor::getData(gsize& dataLen) -> unsigned char* {
+    dataLen = this->dataLen;
+    return this->data;
+}
+
+/**
+ * Try to read the preview from byte buffer
+ * @param buffer Buffer
+ * @param len Buffer len
+ * @return If an image was read, or the error
+ */
+auto XojPreviewExtractor::readPreview(char* buffer, int len) -> PreviewExtractResult {
+    bool inTag = false;
+    int startTag = 0;
+    int startPreview = -1;
+    int endPreview = -1;
+    int pageStart = -1;
+    for (int i = 0; i < len; i++) {
+        if (inTag) {
+            if (buffer[i] == '>') {
+                inTag = false;
+                int tagLen = i - startTag;
+                if (tagLen == as_signed(TAG_PREVIEW_NAME_LEN) &&
+                    strncmp(TAG_PREVIEW_NAME, buffer + startTag, TAG_PREVIEW_NAME_LEN) == 0) {
+                    startPreview = i + 1;
+                }
+                if (tagLen == as_signed(TAG_PREVIEW_END_NAME_LEN) &&
+                    strncmp(TAG_PREVIEW_END_NAME, buffer + startTag, TAG_PREVIEW_END_NAME_LEN) == 0) {
+                    endPreview = i - static_cast<int>(TAG_PREVIEW_END_NAME_LEN) - 1;
+                    break;
+                }
+                if (tagLen >= as_signed(TAG_PAGE_NAME_LEN) &&
+                    strncmp(TAG_PAGE_NAME, buffer + startTag, TAG_PAGE_NAME_LEN) == 0) {
+                    pageStart = i;
+                    break;
+                }
+            }
+            continue;
+        }
+
+        if (buffer[i] == '<') {
+            inTag = true;
+            startTag = i + 1;
+            continue;
+        }
+    }
+
+    if (startPreview != -1 && endPreview != -1) {
+        buffer[endPreview] = 0;
+        this->data = g_base64_decode(buffer + startPreview, &dataLen);
+        return PREVIEW_RESULT_IMAGE_READ;
+    }
+
+    if (pageStart != -1) {
+        return PREVIEW_RESULT_NO_PREVIEW;
+    }
+
+    return PREVIEW_RESULT_ERROR_READING_PREVIEW;
+}
+
+/**
+ * Try to read the preview from file
+ * @param file .xoj File
+ * @return true if a preview was read, false if not
+ */
+auto XojPreviewExtractor::readFile(const fs::path& file) -> PreviewExtractResult {
+    // check file extensions
+    if (!Util::hasXournalFileExt(file)) {
+        return PREVIEW_RESULT_BAD_FILE_EXTENSION;
+    }
+    // read the new file format
+    int zipError = 0;
+    zip_t* zipFp = zip_open(char_cast(file.u8string().c_str()), ZIP_RDONLY, &zipError);
+
+    if (!zipFp && zipError == ZIP_ER_NOZIP) {
+        gzFile fp = GzUtil::openPath(file, "r");
+        if (!fp) {
+            return PREVIEW_RESULT_COULD_NOT_OPEN_FILE;
+        }
+
+        // The <preview> Tag is within the first 179 Bytes
+
+        std::array<char, BUF_SIZE> buffer{};
+        int readLen = gzread(fp, buffer.data(), BUF_SIZE);
+
+        PreviewExtractResult result = readPreview(buffer.data(), readLen);
+
+        gzclose(fp);
+        return result;
+    }
+    if (!zipFp) {
+        return PREVIEW_RESULT_COULD_NOT_OPEN_FILE;
+    }
+
+    zip_stat_t thumbStat;
+    int statStatus = zip_stat(zipFp, "thumbnails/thumbnail.png", 0, &thumbStat);
+    if (statStatus != 0) {
+        zip_close(zipFp);
+        return PREVIEW_RESULT_NO_PREVIEW;
+    }
+
+    if (thumbStat.valid & ZIP_STAT_SIZE) {
+        dataLen = thumbStat.size;
+    } else {
+        zip_close(zipFp);
+        return PREVIEW_RESULT_ERROR_READING_PREVIEW;
+    }
+
+    zip_file_t* thumb = zip_fopen(zipFp, "thumbnails/thumbnail.png", 0);
+
+    if (!thumb) {
+        zip_close(zipFp);
+        return PREVIEW_RESULT_ERROR_READING_PREVIEW;
+    }
+
+    data = static_cast<unsigned char*>(g_malloc(thumbStat.size));
+    zip_uint64_t readBytes = 0;
+    while (readBytes < dataLen) {
+        zip_int64_t read = zip_fread(thumb, data, thumbStat.size);
+        if (read == -1) {
+            g_free(data);
+            zip_fclose(thumb);
+            zip_close(zipFp);
+            return PREVIEW_RESULT_ERROR_READING_PREVIEW;
+        }
+        readBytes += static_cast<zip_uint64_t>(read);
+    }
+
+    zip_fclose(thumb);
+    zip_close(zipFp);
+    return PREVIEW_RESULT_IMAGE_READ;
+}
diff --git a/entry/src/main/cpp/src/util/gdk4_helper.cpp b/entry/src/main/cpp/src/util/gdk4_helper.cpp
new file mode 100644
index 0000000..67c02da
--- /dev/null
+++ b/entry/src/main/cpp/src/util/gdk4_helper.cpp
@@ -0,0 +1,32 @@
+#include "util/gdk4_helper.h"
+
+#include "util/Assert.h"
+
+/*** GdkEvent ***/
+GdkModifierType gdk_event_get_modifier_state(GdkEvent* event) {
+    GdkModifierType state;
+    gdk_event_get_state(event, &state);
+    return state;
+}
+
+
+/*** GdkKeyEvent ***/
+GdkModifierType gdk_key_event_get_consumed_modifiers(GdkEvent* event) {
+    auto keymap = gdk_keymap_get_for_display(gdk_display_get_default());
+    GdkModifierType consumed;
+    /*
+     According to https://docs.gtk.org/gdk3/method.Keymap.translate_keyboard_state.html    *  *
+     consumed modifiers should be masked out. For instance, on a US keyboard, the plus symbol is shifted, so when
+     comparing a key press to a <Control>plus accelerator <Shift> should be masked out.
+     */
+    gdk_keymap_translate_keyboard_state(keymap, event->key.hardware_keycode,
+                                        static_cast<GdkModifierType>(event->key.state), event->key.group, nullptr,
+                                        nullptr, nullptr, &consumed);
+    return consumed;
+}
+
+guint gdk_key_event_get_keyval(GdkEvent* event) {
+    guint res = 0;
+    gdk_event_get_keyval(event, &res);
+    return res;
+}
diff --git a/entry/src/main/cpp/src/util/gtk4_helper.cpp b/entry/src/main/cpp/src/util/gtk4_helper.cpp
new file mode 100644
index 0000000..870cc00
--- /dev/null
+++ b/entry/src/main/cpp/src/util/gtk4_helper.cpp
@@ -0,0 +1,196 @@
+#include "util/gtk4_helper.h"
+
+#include <gtk/gtk.h>
+
+#include "util/Assert.h"
+#include "util/raii/CStringWrapper.h"
+
+namespace {
+void set_child(GtkContainer* c, GtkWidget* child) {
+    gtk_container_foreach(
+            c, +[](GtkWidget* child, gpointer c) { gtk_container_remove(GTK_CONTAINER(c), child); }, c);
+    if (child) {
+        gtk_container_add(c, child);
+    }
+}
+};  // namespace
+
+/**** GtkBox ****/
+
+void gtk_box_append(GtkBox* box, GtkWidget* child) {
+    constexpr auto default_expand = false;
+    gtk_box_pack_start(GTK_BOX(box), child, default_expand, true, 0);
+}
+
+void gtk_box_prepend(GtkBox* box, GtkWidget* child) {
+    gtk_box_append(box, child);
+    gtk_box_reorder_child(box, child, 0);
+}
+
+void gtk_box_remove(GtkBox* box, GtkWidget* child) { gtk_container_remove(GTK_CONTAINER(box), child); }
+
+/**** GtkWindow ****/
+
+void gtk_window_destroy(GtkWindow* win) { gtk_widget_destroy(GTK_WIDGET(win)); }
+
+/**** GtkWidget ****/
+
+void gtk_widget_add_css_class(GtkWidget* widget, const char* css_class) {
+    gtk_style_context_add_class(gtk_widget_get_style_context(widget), css_class);
+}
+
+void gtk_widget_remove_css_class(GtkWidget* widget, const char* css_class) {
+    gtk_style_context_remove_class(gtk_widget_get_style_context(widget), css_class);
+}
+
+int gtk_widget_get_width(GtkWidget* widget) {
+    GtkAllocation allocation;
+    gtk_widget_get_allocation(widget, &allocation);
+    if (allocation.width <= 1 && allocation.height <= 1) {
+        return 0;
+    } else {
+        return allocation.width;
+    }
+}
+
+GtkClipboard* gtk_widget_get_clipboard(GtkWidget* widget) {
+    return gtk_widget_get_clipboard(widget, GDK_SELECTION_CLIPBOARD);
+}
+
+/*** GtkDrawingArea ****/
+
+void gtk_drawing_area_set_draw_func(GtkDrawingArea* area, GtkDrawingAreaDrawFunc draw_func, gpointer user_data,
+                                    GDestroyNotify destroy) {
+    xoj_assert(draw_func != nullptr);
+    struct Data {
+        gpointer data;
+        GtkDrawingAreaDrawFunc draw_func;
+        GDestroyNotify destroy;
+    };
+    Data* data = new Data{user_data, draw_func, destroy};
+    g_signal_connect_data(area, "draw", G_CALLBACK(+[](GtkDrawingArea* self, cairo_t* cr, Data* d) {
+                              GtkAllocation alloc;
+                              gtk_widget_get_allocation(GTK_WIDGET(self), &alloc);
+                              d->draw_func(self, cr, alloc.width, alloc.height, d->data);
+                          }),
+                          data, GClosureNotify(+[](gpointer d, GClosure*) {
+                              auto* data = static_cast<Data*>(d);
+                              if (data && data->destroy) {
+                                  data->destroy(data->data);
+                              }
+                              delete data;
+                          }),
+                          GConnectFlags(0U));  // 0 = G_CONNECT_DEFAULT only introduced in GObject 2.74
+}
+
+/**** GtkScale ****/
+
+void gtk_scale_set_format_value_func(GtkScale* scale, GtkScaleFormatValueFunc func, gpointer user_data,
+                                     GDestroyNotify destroy_notify) {
+    xoj_assert(func != nullptr);
+    struct Data {
+        gpointer data;
+        GtkScaleFormatValueFunc func;
+        GDestroyNotify destroy;
+    };
+    Data* data = new Data{user_data, func, destroy_notify};
+    g_signal_connect_data(scale, "format-value", G_CALLBACK(+[](GtkScale* self, gdouble value, gpointer user_data) {
+                              auto* data = static_cast<Data*>(user_data);
+                              return data->func(self, value, data->data);
+                          }),
+                          data, GClosureNotify(+[](gpointer d, GClosure*) {
+                              auto* data = static_cast<Data*>(d);
+                              if (data && data->destroy) {
+                                  data->destroy(data->data);
+                              }
+                              delete data;
+                          }),
+                          GConnectFlags(0U));  // 0 = G_CONNECT_DEFAULT only introduced in GObject 2.74
+}
+
+/**** GtkScrolledWindow ****/
+
+GtkWidget* gtk_scrolled_window_new() { return gtk_scrolled_window_new(nullptr, nullptr); }
+void gtk_scrolled_window_set_child(GtkScrolledWindow* win, GtkWidget* child) { set_child(GTK_CONTAINER(win), child); }
+GtkWidget* gtk_scrolled_window_get_child(GtkScrolledWindow* win) { return gtk_bin_get_child(GTK_BIN(win)); }
+
+/**** GtkCheckButton ****/
+
+void gtk_check_button_set_child(GtkCheckButton* button, GtkWidget* child) { set_child(GTK_CONTAINER(button), child); }
+
+void gtk_check_button_set_label(GtkCheckButton* button, const char* label) {
+    gtk_check_button_set_child(GTK_CHECK_BUTTON(button), gtk_label_new(label));
+}
+
+bool gtk_check_button_get_active(GtkCheckButton* bt) { return gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(bt)); }
+
+void gtk_check_button_set_active(GtkCheckButton* bt, bool state) {
+    gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(bt), state);
+}
+
+/**** GtkMenuButton ****/
+
+void gtk_menu_button_set_label(GtkMenuButton* button, const char* label) {
+    set_child(GTK_CONTAINER(button), gtk_label_new(label));
+}
+
+/**** GtkButton ****/
+
+void gtk_button_set_child(GtkButton* button, GtkWidget* child) { set_child(GTK_CONTAINER(button), child); }
+GtkWidget* gtk_button_get_child(GtkButton* button) { return gtk_bin_get_child(GTK_BIN(button)); }
+
+void gtk_button_set_icon_name(GtkButton* button, const char* iconName) {
+    // Is GTK_ICON_SIZE_LARGE_TOOLBAR i the right size??
+    gtk_button_set_image(button, gtk_image_new_from_icon_name(iconName, GTK_ICON_SIZE_LARGE_TOOLBAR));
+}
+
+/**** GtkPopover ****/
+
+GtkWidget* gtk_popover_new() { return gtk_popover_new(nullptr); }
+void gtk_popover_set_child(GtkPopover* popover, GtkWidget* child) { set_child(GTK_CONTAINER(popover), child); }
+GtkWidget* gtk_popover_menu_new_from_model(GMenuModel* model) { return gtk_popover_new_from_model(nullptr, model); }
+
+/**** GtkLabel ****/
+void gtk_label_set_wrap(GtkLabel* label, gboolean wrap) { gtk_label_set_line_wrap(label, wrap); }
+void gtk_label_set_wrap_mode(GtkLabel* label, PangoWrapMode wrap_mode) {
+    gtk_label_set_line_wrap_mode(label, wrap_mode);
+}
+
+/**** GtkIMContext ****/
+void gtk_im_context_set_client_widget(GtkIMContext* context, GtkWidget* widget) {
+    gtk_im_context_set_client_window(context, widget ? gtk_widget_get_parent_window(widget) : nullptr);
+}
+gboolean gtk_im_context_filter_keypress(GtkIMContext* context, GdkEvent* event) {
+    return gtk_im_context_filter_keypress(context, (GdkEventKey*)event);
+}
+
+
+/**** GtkFileChooserDialog ****/
+gboolean gtk_file_chooser_add_shortcut_folder(GtkFileChooser* chooser, GFile* file, GError** error) {
+    auto uri = xoj::util::OwnedCString::assumeOwnership(g_file_get_uri(file));
+    return gtk_file_chooser_add_shortcut_folder(chooser, uri.get(), error);
+}
+gboolean gtk_file_chooser_set_current_folder(GtkFileChooser* chooser, GFile* file, GError** error) {
+    return gtk_file_chooser_set_current_folder_file(chooser, file, error);
+}
+
+/**** GtkFixed ****/
+void gtk_fixed_remove(GtkFixed* fixed, GtkWidget* child) { gtk_container_remove(GTK_CONTAINER(fixed), child); }
+
+/**** GtkListBox ****/
+void gtk_list_box_append(GtkListBox* box, GtkWidget* widget) { gtk_container_add(GTK_CONTAINER(box), widget); }
+void gtk_list_box_row_set_child(GtkListBoxRow* row, GtkWidget* w) { set_child(GTK_CONTAINER(row), w); }
+GtkWidget* gtk_list_box_row_get_child(GtkListBoxRow* row) { return gtk_bin_get_child(GTK_BIN(row)); }
+
+/**** GtkEventController ****/
+GdkEvent* gtk_event_controller_get_current_event(GtkEventController*) { return gtk_get_current_event(); }
+
+/**** GtkEditable ****/
+const char* gtk_editable_get_text(GtkEditable* e) {
+    xoj_assert(GTK_IS_ENTRY(e));
+    return gtk_entry_get_text(GTK_ENTRY(e));
+}
+void gtk_editable_set_text(GtkEditable* e, const char* text) {
+    xoj_assert(GTK_IS_ENTRY(e));
+    return gtk_entry_set_text(GTK_ENTRY(e), text);
+}
diff --git a/entry/src/main/cpp/src/util/include/filesystem.h b/entry/src/main/cpp/src/util/include/filesystem.h
new file mode 100644
index 0000000..230a073
--- /dev/null
+++ b/entry/src/main/cpp/src/util/include/filesystem.h
@@ -0,0 +1,17 @@
+/*
+ * Xournal++
+ *
+ * Paths to resources
+ *
+ * @author Xournal++ Team
+ * https://github.com/xournalpp/xournalpp
+ *
+ * @license GNU GPLv2 or later
+ */
+
+#pragma once
+
+#include <filesystem>  // IWYU pragma: export
+
+// enable fs
+namespace fs = std::filesystem;  // NOLINT(misc-unused-alias-decls)
diff --git a/entry/src/main/cpp/src/util/include/util/Assert.h b/entry/src/main/cpp/src/util/include/util/Assert.h
new file mode 100644
index 0000000..ef57eb1
--- /dev/null
+++ b/entry/src/main/cpp/src/util/include/util/Assert.h
@@ -0,0 +1,28 @@
+/*
+ * Xournal++
+ *
+ * assert
+ *
+ * @author Xournal++ Team
+ * https://github.com/xournalpp/xournalpp
+ *
+ * @license GNU GPLv2 or later
+ */
+#pragma once
+
+#include <string>
+
+#ifdef NDEBUG
+#define xoj_assert(expr) static_cast<void>(0)
+#define xoj_assert_message(expr, msg) static_cast<void>(0)
+#else
+namespace xoj::util {
+[[noreturn]] void assertFailure(const char* expr, const std::string& msg, const char* fileName, int line,
+                                const char* funcName);
+};
+
+#define xoj_assert_message(expr, msg)                 \
+    (static_cast<bool>(expr) ? static_cast<void>(0) : \
+                               xoj::util::assertFailure(#expr, msg, __FILE__, __LINE__, __func__))
+#define xoj_assert(expr) xoj_assert_message(expr, "")
+#endif
diff --git a/entry/src/main/cpp/src/util/include/util/BasePointerIterator.h b/entry/src/main/cpp/src/util/include/util/BasePointerIterator.h
new file mode 100644
index 0000000..311a3af
--- /dev/null
+++ b/entry/src/main/cpp/src/util/include/util/BasePointerIterator.h
@@ -0,0 +1,81 @@
+/*
+ * Xournal++
+ *
+ * Basic iterator based on pointer arithmetics
+ *
+ * @author Xournal++ Team
+ * https://github.com/xournalpp/xournalpp
+ *
+ * @license GNU GPLv2 or later
+ */
+
+#pragma once
+
+#include <cstddef>
+#include <iterator>
+
+#include "TypeIfThenElse.h"
+
+template <typename T, bool is_const>
+class BasePointerIterator {
+public:
+    using iterator_category = std::random_access_iterator_tag;
+    using value_type = T;
+    using qualified_value_type = typename const_if<T, is_const>::type;
+    using pointer = qualified_value_type*;
+    using reference = qualified_value_type&;
+    using difference_type = std::ptrdiff_t;
+    BasePointerIterator() = default;
+    ~BasePointerIterator() = default;
+    BasePointerIterator(const BasePointerIterator&) = default;
+    BasePointerIterator(pointer p): p(p) {}
+
+    reference operator*() const { return *p; }
+    pointer operator->() const { return p; }
+
+    BasePointerIterator& operator++() {
+        ++p;
+        return *this;
+    }
+    BasePointerIterator operator++(int) {
+        auto tmp = *this;
+        ++p;
+        return tmp;
+    }
+    BasePointerIterator& operator--() {
+        --p;
+        return *this;
+    }
+    BasePointerIterator operator--(int) {
+        auto tmp = *this;
+        --p;
+        return tmp;
+    }
+    BasePointerIterator& operator+=(difference_type n) {
+        p += n;
+        return *this;
+    }
+    BasePointerIterator& operator-=(difference_type n) {
+        p -= n;
+        return *this;
+    }
+
+    BasePointerIterator operator+(difference_type n) const { return BasePointerIterator(p + n); }
+    BasePointerIterator operator-(difference_type n) const { return BasePointerIterator(p - n); }
+    difference_type operator-(const BasePointerIterator& other) const { return p - other.p; }
+
+    reference operator[](difference_type n) const { return *(p + n); }
+
+    bool operator==(const BasePointerIterator& other) const { return p == other.p; }
+    bool operator!=(const BasePointerIterator& other) const { return p != other.p; }
+
+    bool operator<(const BasePointerIterator& other) const { return p < other.p; }
+    bool operator>(const BasePointerIterator& other) const { return other < *this; }
+    bool operator<=(const BasePointerIterator& other) const { return !(other < *this); }
+    bool operator>=(const BasePointerIterator& other) const { return !(*this < other); }
+
+    friend BasePointerIterator operator+(difference_type n, const BasePointerIterator& it) { return it + n; }
+
+private:
+    pointer p = nullptr;
+};
diff --git a/entry/src/main/cpp/src/util/include/util/CircularBuffer.h b/entry/src/main/cpp/src/util/include/util/CircularBuffer.h
new file mode 100644
index 0000000..63363f6
--- /dev/null
+++ b/entry/src/main/cpp/src/util/include/util/CircularBuffer.h
@@ -0,0 +1,49 @@
+/*
+ * Xournal++
+ *
+ * A rudimentary circular buffer
+ *
+ * @author Xournal++ Team
+ * https://github.com/xournalpp/xournalpp
+ *
+ * @license GNU GPLv2 or later
+ */
+#pragma once
+
+#include <cstddef>
+#include <vector>
+
+template <class T>
+class CircularBuffer: private std::vector<T> {
+public:
+    CircularBuffer(size_t length): std::vector<T>(length > 1 ? length : 1), length(length > 1 ? length : 1) {}
+    ~CircularBuffer() = default;
+    T front() { return (*this)[head]; }
+    T back() {
+        if (head == 0) {
+            return (*this)[length - 1];
+        }
+        return (*this)[head - 1];
+    }
+    void push_front(const T& ev) {
+        head++;
+        head %= length;
+        (*this)[head] = ev;
+    }
+    void assign(const T& ev) {
+        for (T& e: *this) { e = ev; }
+    }
+    size_t size() { return length; }
+
+    /**
+     * Beware: begin and end are not related to the position of the head
+     */
+    using std::vector<T>::cbegin;
+    using std::vector<T>::begin;
+    using std::vector<T>::cend;
+    using std::vector<T>::end;
+
+private:
+    const size_t length;
+    size_t head = length - 1;
+};
diff --git a/entry/src/main/cpp/src/util/include/util/Color.h b/entry/src/main/cpp/src/util/include/util/Color.h
new file mode 100644
index 0000000..d952f24
--- /dev/null
+++ b/entry/src/main/cpp/src/util/include/util/Color.h
@@ -0,0 +1,247 @@
+/*
+ * Xournal++
+ *
+ * Color utility, does color conversions
+ *
+ * @author Xournal++ Team
+ * https://github.com/xournalpp/xournalpp
+ *
+ * @license GNU GPLv2 or later
+ */
+
+#pragma once
+
+#include <cstdint>     // for uint32_t, uint8_t, uint16_t
+#include <cstring>     // for size_t
+#include <functional>  // for hash
+#include <iostream>    // for istream, ostream, basic_istream<>::__istream_...
+#include <limits>      // for numeric_limits
+#include <string>      // for string
+
+#include <cairo.h>    // for cairo_t
+#include <gdk/gdk.h>  // for GdkRGBA
+
+
+struct ColorU8 {
+    uint8_t red{};
+    uint8_t green{};
+    uint8_t blue{};
+    uint8_t alpha{};
+
+    constexpr ColorU8() = default;
+    constexpr ColorU8(uint8_t r, uint8_t g, uint8_t b, uint8_t a = 0xffU): red(r), green(g), blue(b), alpha(a) {}
+    constexpr explicit ColorU8(uint32_t val):
+            // Legacy ordering for serdes: 0xAARRGGBB
+            red(uint8_t((val >> 16U) & 0xffU)),
+            green(uint8_t((val >> 8U) & 0xffU)),
+            blue(uint8_t((val >> 0U) & 0xffU)),
+            alpha(uint8_t((val >> 24U) & 0xffU)) {}
+
+    constexpr explicit operator uint32_t() const {
+        // Legacy ordering for serdes: 0xAARRGGBB
+        uint32_t val = (uint32_t(red) << 16U) | (uint32_t(green) << 8U) | uint32_t(blue) | (uint32_t(alpha) << 24U);
+        return val;
+    }
+
+    constexpr auto operator=(uint32_t rhs) -> ColorU8& {
+        *this = ColorU8(rhs);
+        return *this;
+    }
+
+    constexpr friend bool operator==(ColorU8 const& lhs, ColorU8 const& rhs) { return uint32_t(lhs) == uint32_t(rhs); }
+    constexpr friend bool operator!=(ColorU8 const& lhs, ColorU8 const& rhs) { return uint32_t(lhs) != uint32_t(rhs); }
+    constexpr friend bool operator<(ColorU8 const& lhs, ColorU8 const& rhs) { return uint32_t(lhs) < uint32_t(rhs); }
+
+    constexpr friend bool operator==(ColorU8 const& lhs, uint32_t rhs) { return uint32_t(lhs) == rhs; }
+    constexpr friend bool operator!=(ColorU8 const& lhs, uint32_t rhs) { return uint32_t(lhs) != rhs; }
+    constexpr friend bool operator<(ColorU8 const& lhs, uint32_t rhs) { return uint32_t(lhs) < rhs; }
+
+    inline friend std::ostream& operator<<(std::ostream& os, ColorU8 rhs) { return os << uint32_t(rhs); }
+    inline friend std::istream& operator>>(std::istream& is, ColorU8& rhs) {
+        uint32_t val{};
+        is >> val;
+        rhs = val;
+        return is;
+    };
+
+    constexpr auto isLight() const -> bool { return uint32_t(red) + uint32_t(green) + uint32_t(blue) > 0x180U; }
+};
+
+static_assert(sizeof(ColorU8) == sizeof(uint32_t), "Color is not 32 bit");
+using Color = ColorU8;
+
+namespace std {
+template <>
+struct hash<Color> {
+    size_t operator()(Color c) const noexcept { return uint32_t(c); }
+};
+
+}  // namespace std
+
+struct ColorU16 {
+    uint16_t red{};
+    uint16_t green{};
+    uint16_t blue{};
+    uint16_t alpha{};
+};
+
+inline std::ostream& operator<<(std::ostream& os, ColorU16 rhs) {
+    return os << rhs.red << rhs.green << rhs.blue << rhs.alpha;
+}
+inline std::istream& operator>>(std::istream& is, ColorU16& rhs) {
+    return is >> rhs.red >> rhs.green >> rhs.blue >> rhs.alpha;
+}
+
+namespace Util {
+
+constexpr auto rgb_to_GdkRGBA(Color color) -> GdkRGBA;
+constexpr auto argb_to_GdkRGBA(Color color) -> GdkRGBA;
+constexpr auto argb_to_GdkRGBA(Color color, double alpha) -> GdkRGBA;
+constexpr auto GdkRGBA_to_argb(const GdkRGBA& color) -> Color;
+constexpr auto GdkRGBA_to_rgb(const GdkRGBA& color) -> Color;
+
+constexpr auto ColorU16_to_argb(const ColorU16& color) -> Color;
+constexpr auto argb_to_ColorU16(const Color& color) -> ColorU16;
+constexpr auto GdkRGBA_to_ColorU16(const GdkRGBA& color) -> ColorU16;
+
+/// Set the color of a cairo context -- uses alpha as alpha value
+void cairo_set_source_rgbi(cairo_t* cr, Color color, double alpha = 1.0);
+
+/// Set the color of a cairo context -- uses color.alpha as alpha value
+void cairo_set_source_argb(cairo_t* cr, Color color);  // Use color.alpha
+
+constexpr auto floatToUIntColor(double color) -> uint8_t;
+
+/**
+ * @param color Color to convert to grayscale.
+ * @return Given color converted to grayscale 1.0 -> white, 0.0 -> black.
+ */
+float as_grayscale_color(Color color);
+
+/**
+ *  Get the fraction by which the grayscale value of color1 contrasts
+ * with color2 (0.0 = no contrast, 1.0 = maximum contrast).
+ * Does not take a color's alpha channel into account.
+ * @return Scale factor by which the two given colors differ. Must be in
+ *          [0.0, 1.0].
+ */
+float get_color_contrast(Color color1, Color color2);
+
+/**
+ * @param rgb Color to get a representation for, while ignoring the alpha channel.
+ * @return a CSS-style representation of the color, in hex. For example,
+ *          red might be #ff0000, green, #00ff00, and blue, #0000ff.
+ */
+std::string rgb_to_hex_string(Color rgb);
+}  // namespace Util
+
+constexpr auto Util::rgb_to_GdkRGBA(Color color) -> GdkRGBA {  //
+    color.alpha = 0xFF;
+    return Util::argb_to_GdkRGBA(color);
+}
+
+constexpr auto Util::argb_to_GdkRGBA(const Color color) -> GdkRGBA {
+    return {color.red / 255.0,    //
+            color.green / 255.0,  //
+            color.blue / 255.0,   //
+            color.alpha / 255.0};
+}
+
+constexpr auto Util::argb_to_GdkRGBA(Color color, double alpha) -> GdkRGBA {
+    return {color.red / 255.0,    //
+            color.green / 255.0,  //
+            color.blue / 255.0,   //
+            alpha};
+}
+
+constexpr auto Util::GdkRGBA_to_argb(const GdkRGBA& color) -> Color {
+    auto ret = GdkRGBA_to_rgb(color);
+    ret.alpha = floatToUIntColor(color.alpha);
+    return ret;
+}
+
+constexpr auto Util::GdkRGBA_to_rgb(const GdkRGBA& color) -> Color {
+    return Color{floatToUIntColor(color.red),    //
+                 floatToUIntColor(color.green),  //
+                 floatToUIntColor(color.blue)};
+}
+
+constexpr auto Util::argb_to_ColorU16(const Color& color) -> ColorU16 {
+    /* 0xff should map to 0xffff in 16 bit. Therefore multipliing by 257 instead of 256*/
+    return {static_cast<uint16_t>((color.red << 8U) + color.red),
+            static_cast<uint16_t>((color.green << 8U) + color.green),
+            static_cast<uint16_t>((color.blue << 8U) + color.blue),
+            static_cast<uint16_t>((color.alpha << 8U) + color.alpha)};
+}
+
+constexpr auto Util::ColorU16_to_argb(const ColorU16& color) -> Color {
+    return Color{static_cast<uint8_t>(color.red >> 8U), static_cast<uint8_t>(color.green >> 8U),
+                 static_cast<uint8_t>(color.blue >> 8U), static_cast<uint8_t>(color.alpha >> 8U)};
+}
+
+constexpr auto Util::floatToUIntColor(const double color) -> uint8_t {
+    /*
+     * Splits the double into a equal sized distribution between [0,256[ and rounding down
+     * inspired by, which isn't completely correct:
+     * https://stackoverflow.com/questions/1914115/converting-color-value-from-float-0-1-to-byte-0-255
+     */
+    constexpr double MAX_COLOR = 256.0 - std::numeric_limits<double>::epsilon() * 128;
+    static_assert(MAX_COLOR < 256.0, "MAX_COLOR isn't smaller than 256");
+    return static_cast<uint8_t>(color * MAX_COLOR);
+}
+
+constexpr auto Util::GdkRGBA_to_ColorU16(const GdkRGBA& color) -> ColorU16 {
+    auto floatToColorU16 = [](double color) {
+        constexpr double MAX_COLOR = 65536.0 - std::numeric_limits<double>::epsilon() * (65536.0 / 2.0);
+        static_assert(MAX_COLOR < 65536.0, "MAX_COLOR isn't smaller than 65536");
+        return static_cast<uint16_t>(color * MAX_COLOR);
+    };
+
+    return {floatToColorU16(color.red),    //
+            floatToColorU16(color.green),  //
+            floatToColorU16(color.blue),   //
+            floatToColorU16(color.alpha)};
+}
+
+namespace Colors {
+/*
+ * A palette of predefined colors. The names are the relevant CSS4 named
+ * color, if exists, else the name of the named color with the smallest
+ * distance from it as an (r, g, b) vector with the prefix "xopp_",
+ * see https://www.w3.org/TR/css-color-4/#named-colors
+ */
+constexpr Color black{0xff000000U};
+constexpr Color gray{0xff808080U};
+constexpr Color green{0xff008000U};
+constexpr Color lawngreen(0xff7cfc00U);
+constexpr Color lime{0xff00ff00U};
+constexpr Color magenta{0xffff00ffU};
+constexpr Color red{0xffff0000U};
+constexpr Color silver{0xffc0c0c0};
+constexpr Color white{0xffffffffU};
+constexpr Color yellow{0xffffff00U};
+constexpr Color xopp_antiquewhite{0xfff8ead3U};
+constexpr Color xopp_aquamarine{0xff80ffc0U};
+constexpr Color xopp_bisque{0xfffee7c4U};
+constexpr Color xopp_cornflowerblue{0xff729fcfU};
+constexpr Color xopp_darkorange{0xffff8000U};
+constexpr Color xopp_darkslategray{0xff434343U};
+constexpr Color xopp_deeppink{0xffff0080U};
+constexpr Color xopp_deepskyblue{0xff00c0ffU};
+constexpr Color xopp_dodgerblue{0xff40a0ffU};
+constexpr Color xopp_gainsboro{0xffdadcdaU};
+constexpr Color xopp_gainsboro02{0xffdcdad5U};
+constexpr Color xopp_gainsboro03{0xffe6d8e4U};
+constexpr Color xopp_khaki{0xffffff80U};
+constexpr Color xopp_lavender{0xffd4e2f0U};
+constexpr Color xopp_lemonchifon{0xfffef8c9U};
+constexpr Color xopp_lightpink{0xfffabebeU};
+constexpr Color xopp_lightsalmon{0xffffc080U};
+constexpr Color xopp_midnightblue{0xff220080U};
+constexpr Color xopp_palegoldenrod{0xffdcf6c1U};
+constexpr Color xopp_paleturqoise{0xffa0e8ffU};
+constexpr Color xopp_pink{0xffffc0d4U};
+constexpr Color xopp_royalblue{0xff3333ccU};
+constexpr Color xopp_silver{0xffbdbdbdU};
+constexpr Color xopp_snow{0xfffafaf9U};
+}  // namespace Colors
diff --git a/entry/src/main/cpp/src/util/include/util/DispatchPool.h b/entry/src/main/cpp/src/util/include/util/DispatchPool.h
new file mode 100644
index 0000000..66d58fa
--- /dev/null
+++ b/entry/src/main/cpp/src/util/include/util/DispatchPool.h
@@ -0,0 +1,142 @@
+/*
+ * Xournal++
+ *
+ * Template class for a dispatch pool and listeners
+ *
+ * @author Xournal++ Team
+ * https://github.com/xournalpp/xournalpp
+ *
+ * @license GNU GPLv2 or later
+ */
+
+#pragma once
+
+#include <algorithm>
+#include <memory>
+#include <utility>
+#include <vector>
+
+#include "util/Assert.h"
+
+namespace xoj::util {
+
+/**
+ * @brief Utility class for dispatching a method call to multiple "listeners".
+ *
+ * The listeners must implement functions
+ *      void on(Arg&&...);
+ * that the dispatcher will call through dispatch() and/or functions
+ *      void deleteOn(Arg&&...);
+ * that the dispatcher will call through dispatchAndClear();
+ *
+ * The `on()`s must not delete the listener, or even remove it from the pool.
+ * The `deleteOn()`s must make sure the listener no longer references the pool (for instance by deleting the listener)
+ */
+template <class ListenerT>
+class DispatchPool final {
+public:
+    using listener_type = ListenerT;
+
+    /**
+     * @brief Invokes the `on()` method of all registered `ListenerT`s.
+     */
+    template <typename... Args>
+    void dispatch(Args&&... args) const {
+        for (auto* v: this->pool) {
+            v->on(std::forward<Args>(args)...);
+        }
+    }
+
+    /**
+     * @brief Invokes the `deleteOn()` method of all registered `ListenerT`s and clears the pool.
+     * A call to v->deleteOn() is supposed to delete the listener v
+     * (or at the very least remove any reference to the dispatcher in the listener v)
+     */
+    template <typename... Args>
+    void dispatchAndClear(Args&&... args) const {
+        // We cannot iterate on the this->pool: the listener's deletion would trigger calls to DispatchPool::remove()
+        // leading to possible segfaults.
+        auto p = std::move(this->pool);
+        for (auto* v: p) {
+            v->deleteOn(std::forward<Args>(args)...);
+        }
+    }
+
+    /**
+     * @brief Adds a new listener to the pool.
+     * The listener must not already be registered.
+     */
+    void add(listener_type* v) {
+        xoj_assert_message(v != nullptr, "Adding nullptr listener");
+        xoj_assert_message(std::find(this->pool.begin(), this->pool.end(), v) == this->pool.end(),
+                           "Listener is already listed");
+        this->pool.emplace_back(v);
+    }
+
+    void remove(listener_type* v) {
+        xoj_assert_message(v != nullptr, "Removing nullptr listener");
+        auto it = std::find(this->pool.begin(), this->pool.end(), v);
+        if (it != this->pool.end()) {
+            this->pool.erase(it);
+        }
+    }
+
+    [[nodiscard]] bool empty() const { return pool.empty(); }
+    [[nodiscard]] const listener_type& front() const { return *pool.front(); }
+
+private:
+    std::vector<listener_type*> pool;
+};
+
+/**
+ * @brief CRTP-style class for listener
+ * Usage:
+ *  class A: Listener<A> {
+ *      (virtual) ~A() { unregisterFromPool(); }
+ *      void on(...);  // Signal receiver
+ *  };
+ *
+ * WARNING: Always unregisterFromPool() in derived class destructor.
+ *
+ * For listening to several type of dispatchers do:
+ *     class A : public Listener<A> {...};  // virtual void on(...); in here
+ *     class B : public Listener<B> {...};  // virtual void on(...); in here - types must differ from the ones in A
+ *     class C : public A, public B {...};  // overload everything here
+ */
+template <class T>
+class Listener {
+private:
+    // Keep the constructor private: only T can inherit Listener<T> (for the static_cast<T*>(this) below).
+    Listener() = default;
+    friend T;
+
+    using pool_type = xoj::util::DispatchPool<T>;
+
+public:
+    /**
+     * @brief Register to a new dispatch pool. Unregisters from any pool the listener was previously registered to.
+     */
+    void registerToPool(const std::shared_ptr<pool_type>& newpool) {
+        if (auto p = this->pool.lock()) {
+            p->remove(static_cast<T*>(this));
+        }
+        newpool->add(static_cast<T*>(this));
+        this->pool = newpool;
+    }
+
+    /**
+     * @brief Unregisters from the current pool (if any).
+     */
+    void unregisterFromPool() {
+        if (auto p = this->pool.lock()) {
+            p->remove(static_cast<T*>(this));
+        }
+        this->pool.reset();
+    }
+
+    [[nodiscard]] auto getPool() const -> std::shared_ptr<pool_type> { return this->pool.lock(); }
+
+private:
+    std::weak_ptr<pool_type> pool;
+};
+};  // namespace xoj::util
diff --git a/entry/src/main/cpp/src/util/include/util/ElementRange.h b/entry/src/main/cpp/src/util/include/util/ElementRange.h
new file mode 100644
index 0000000..7f60794
--- /dev/null
+++ b/entry/src/main/cpp/src/util/include/util/ElementRange.h
@@ -0,0 +1,37 @@
+/*
+ * Xournal++
+ *
+ * A page range for PDF export etc. (e.g. 1-2,5,7)
+ *
+ * @author Xournal++ Team
+ * https://github.com/xournalpp/xournalpp
+ *
+ * @license GNU GPLv2 or later
+ */
+
+#pragma once
+
+#include <cstddef>  // for size_t
+#include <string>   // for string
+#include <vector>   // for vector
+
+struct ElementRangeEntry {
+    ElementRangeEntry() = default;                                             // pre c++20 requirement
+    ElementRangeEntry(size_t first, size_t last): first(first), last(last) {}  // pre c++20 requirement
+    size_t first{};
+    size_t last{};
+};
+
+using ElementRangeVector = std::vector<ElementRangeEntry>;
+
+namespace ElementRange {
+ElementRangeVector parse(const std::string& str, size_t maxCount);
+};  // namespace ElementRange
+
+/**
+ * Aliases for page and layer ranges
+ */
+using PageRangeEntry = ElementRangeEntry;
+using PageRangeVector = ElementRangeVector;
+using LayerRangeEntry = ElementRangeEntry;
+using LayerRangeVector = ElementRangeVector;
diff --git a/entry/src/main/cpp/src/util/include/util/EnumIndexedArray.h b/entry/src/main/cpp/src/util/include/util/EnumIndexedArray.h
new file mode 100644
index 0000000..03113a8
--- /dev/null
+++ b/entry/src/main/cpp/src/util/include/util/EnumIndexedArray.h
@@ -0,0 +1,39 @@
+/*
+ * Xournal++
+ *
+ * An array indexed by a CONTIGUOUS scoped enum from 0 to ENUMERATOR_COUNT-1
+ *
+ * @author Xournal++ Team
+ * https://github.com/xournalpp/xournalpp
+ *
+ * @license GNU GPLv2 or later
+ */
+
+#pragma once
+
+#include <array>
+#include <type_traits>
+
+#include "util/Assert.h"
+#include "util/safe_casts.h"  // for to_underlying Todo(cpp20) use <utility>
+
+
+template <class T, typename enum_class,
+          std::enable_if_t<std::is_enum_v<enum_class> && std::is_unsigned_v<std::underlying_type_t<enum_class>> &&
+                                   !std::is_convertible_v<enum_class, std::underlying_type_t<enum_class>>,
+                           bool> = true>
+class EnumIndexedArray: private std::array<T, xoj::to_underlying(enum_class::ENUMERATOR_COUNT)> {
+public:
+    using underlying_array_type = std::array<T, xoj::to_underlying(enum_class::ENUMERATOR_COUNT)>;
+
+    T& operator[](enum_class value) {
+        xoj_assert(value < enum_class::ENUMERATOR_COUNT);
+        return underlying_array_type::operator[](xoj::to_underlying(value));
+    }
+    const T& operator[](enum_class value) const {
+        xoj_assert(value < enum_class::ENUMERATOR_COUNT);
+        return underlying_array_type::operator[](xoj::to_underlying(value));
+    }
+    using underlying_array_type::begin;
+    using underlying_array_type::end;
+};
diff --git a/entry/src/main/cpp/src/util/include/util/GListView.h b/entry/src/main/cpp/src/util/include/util/GListView.h
new file mode 100644
index 0000000..99dfae6
--- /dev/null
+++ b/entry/src/main/cpp/src/util/include/util/GListView.h
@@ -0,0 +1,88 @@
+/*
+ * Xournal++
+ *
+ * GListView, a c++ wrapper around GList
+ * Provides a begin iterator and a Sentinel
+ *
+ * @author Xournal++ Team
+ * https://github.com/xournalpp/xournalpp
+ *
+ * @license GNU GPLv2 or later
+ */
+
+#pragma once
+
+#include <tuple>
+
+#include <glib.h>
+
+template <class ListType, typename T>
+struct ListView {
+    struct GListViewIter {
+        using iterator_category = std::forward_iterator_tag;
+        using value_type = T;
+        using pointer = T*;
+        using reference = T&;
+        using difference_type = std::ptrdiff_t;
+
+        constexpr auto operator++() -> GListViewIter& {
+            this->list = list->next;
+            return *this;
+        }
+
+        constexpr auto operator++(int) -> GListViewIter {
+            GListViewIter ret = *this;
+            ++(*this);
+            return ret;
+        }
+
+        constexpr friend auto operator==(GListViewIter const& lhs, GListViewIter const& rhs) -> bool {
+            return lhs.list == rhs.list;
+        }
+
+        constexpr friend auto operator!=(GListViewIter const& lhs, GListViewIter const& rhs) -> bool {
+            return !(lhs == rhs);
+        }
+
+        constexpr T& operator*() { return *static_cast<T*>(list->data); }
+
+        constexpr T* operator->() { return static_cast<T*>(list->data); }
+
+        ListType* list{};
+    };
+
+    struct GListViewSentinel {
+        constexpr friend bool operator==(GListViewIter const& iter, GListViewSentinel const&) {
+            return iter.list == nullptr;
+        }
+        constexpr friend bool operator==(GListViewSentinel const&, GListViewIter const& iter) {
+            return iter.list == nullptr;
+        }
+        constexpr friend bool operator!=(GListViewIter const& iter, GListViewSentinel const&) {
+            return iter.list != nullptr;
+        }
+        constexpr friend bool operator!=(GListViewSentinel const&, GListViewIter const& iter) {
+            return iter.list != nullptr;
+        }
+    };
+
+    constexpr ListView(ListType* list): list(list) {}
+
+    constexpr auto begin() -> GListViewIter { return {list}; }
+    // /// Slow, iterates over all elements to find the end
+    // Todo(if required): constexpr auto rbegin() -> GListViewRevIter { return {g_list_last(list)}; }
+
+    constexpr auto end() -> GListViewSentinel { return {}; }
+    // Todo(if required): constexpr auto rend() -> GListViewSentinel { return {}; }
+
+    /// Convenient way to iterate over a GListView, DO NOT REVERSE IT
+    constexpr auto end_iter() -> GListViewIter { return {nullptr}; }
+
+private:
+    ListType* list;
+};
+
+template <typename T>
+using GListView = ListView<GList, T>;
+template <typename T>
+using GSListView = ListView<GSList, T>;
diff --git a/entry/src/main/cpp/src/util/include/util/GVariantTemplate.h b/entry/src/main/cpp/src/util/include/util/GVariantTemplate.h
new file mode 100644
index 0000000..5a79cf6
--- /dev/null
+++ b/entry/src/main/cpp/src/util/include/util/GVariantTemplate.h
@@ -0,0 +1,129 @@
+/*
+ * Xournal++
+ *
+ *
+ * @author Xournal++ Team
+ * https://github.com/xournalpp/xournalpp
+ *
+ * @license GNU GPLv2 or later
+ */
+
+#pragma once
+
+#include <bitset>
+#include <string>
+#include <type_traits>
+
+#include <glib.h>
+
+#include "util/Color.h"
+
+namespace detail {
+template <class T>
+constexpr inline bool match_guint32() {
+    return std::is_integral_v<T> && std::is_unsigned_v<T> && sizeof(T) == sizeof(guint32);
+}
+template <class T>
+constexpr inline bool match_gint32() {
+    return std::is_integral_v<T> && std::is_signed_v<T> && sizeof(T) == sizeof(gint32);
+}
+template <class T>
+constexpr inline bool match_guint64() {
+    return std::is_integral_v<T> && std::is_unsigned_v<T> && sizeof(T) == sizeof(guint64);
+}
+template <class T>
+constexpr inline bool match_gint64() {
+    return std::is_integral_v<T> && std::is_signed_v<T> && sizeof(T) == sizeof(gint64);
+}
+
+template <class T, class U = void>
+struct GVariantWrapperImpl {};
+
+template <>
+struct GVariantWrapperImpl<bool> {
+    static inline bool getValue(GVariant* v) { return g_variant_get_boolean(v); }
+    static inline const GVariantType* getType() { return G_VARIANT_TYPE_BOOLEAN; }
+    static inline GVariant* make(bool v) { return g_variant_new_boolean(v); }
+};
+template <>
+struct GVariantWrapperImpl<const char*> {
+    static inline const char* getValue(GVariant* v) { return g_variant_get_string(v, nullptr); }
+    static inline const GVariantType* getType() { return G_VARIANT_TYPE_STRING; }
+    static inline GVariant* make(const char* v) { return g_variant_new_string(v); }
+};
+template <>
+struct GVariantWrapperImpl<double> {
+    static inline double getValue(GVariant* v) { return g_variant_get_double(v); }
+    static inline const GVariantType* getType() { return G_VARIANT_TYPE_DOUBLE; }
+    static inline GVariant* make(double v) { return g_variant_new_double(v); }
+};
+
+template <>
+struct GVariantWrapperImpl<GVariant*> {
+    static inline GVariant* getValue(GVariant* v) { return v; }
+    static inline const GVariantType* getType() { return G_VARIANT_TYPE_VARIANT; }
+    static inline GVariant* make(GVariant* v) { return v; }
+};
+
+template <class T>
+struct GVariantWrapperImpl<T, std::enable_if_t<match_gint32<T>(), void>> {
+    static inline T getValue(GVariant* v) { return g_variant_get_int32(v); }
+    static inline const GVariantType* getType() { return G_VARIANT_TYPE_INT32; }
+    static inline GVariant* make(T v) { return g_variant_new_int32(v); }
+};
+template <class T>
+struct GVariantWrapperImpl<T, std::enable_if_t<match_guint32<T>(), void>> {
+    static inline T getValue(GVariant* v) { return g_variant_get_uint32(v); }
+    static inline const GVariantType* getType() { return G_VARIANT_TYPE_UINT32; }
+    static inline GVariant* make(T v) { return g_variant_new_uint32(v); }
+};
+template <class T>
+struct GVariantWrapperImpl<T, std::enable_if_t<match_gint64<T>(), void>> {
+    static inline T getValue(GVariant* v) { return g_variant_get_int64(v); }
+    static inline const GVariantType* getType() { return G_VARIANT_TYPE_INT64; }
+    static inline GVariant* make(T v) { return g_variant_new_int64(v); }
+};
+template <class T>
+struct GVariantWrapperImpl<T, std::enable_if_t<match_guint64<T>(), void>> {
+    static inline T getValue(GVariant* v) { return g_variant_get_uint64(v); }
+    static inline const GVariantType* getType() { return G_VARIANT_TYPE_UINT64; }
+    static inline GVariant* make(T v) { return g_variant_new_uint64(v); }
+};
+
+template <class T>
+struct GVariantWrapperImpl<T, std::enable_if_t<std::is_enum_v<T>, void>> {  // enum types are stored as guint64
+    static inline T getValue(GVariant* v) { return static_cast<T>(g_variant_get_uint64(v)); }
+    static inline const GVariantType* getType() { return G_VARIANT_TYPE_UINT64; }
+    static inline GVariant* make(T v) { return g_variant_new_uint64(static_cast<guint64>(v)); }
+};
+
+template <>
+struct GVariantWrapperImpl<Color> {
+    static_assert(sizeof(guint32) == sizeof(Color));
+    static inline Color getValue(GVariant* v) { return static_cast<Color>(g_variant_get_uint32(v)); }
+    static inline const GVariantType* getType() { return G_VARIANT_TYPE_UINT32; }
+    static inline GVariant* make(Color v) { return g_variant_new_uint32(static_cast<guint32>(v)); }
+};
+};  // namespace detail
+
+template <class T>
+inline T getGVariantValue(GVariant* v) {
+    return detail::GVariantWrapperImpl<T>::getValue(v);
+}
+template <class T>
+inline const GVariantType* gVariantType() {
+    return detail::GVariantWrapperImpl<T>::getType();
+}
+template <class T>
+inline GVariant* makeGVariant(T v) {
+    return detail::GVariantWrapperImpl<T>::make(v);
+}
+
+template <>
+inline GVariant* makeGVariant(const std::string& v) {
+    return g_variant_new_string(v.c_str());
+}
+template <>
+inline const GVariantType* gVariantType<const std::string&>() {
+    return G_VARIANT_TYPE_STRING;
+}
diff --git a/entry/src/main/cpp/src/util/include/util/GtkUtil.h b/entry/src/main/cpp/src/util/include/util/GtkUtil.h
new file mode 100644
index 0000000..7b38cac
--- /dev/null
+++ b/entry/src/main/cpp/src/util/include/util/GtkUtil.h
@@ -0,0 +1,54 @@
+/*
+ * Xournal++
+ * Helper function for setting up some GtkWidget
+ *
+ * @author Xournal++ Team
+ * https://github.com/xournalpp/xournalpp
+ *
+ * @license GNU GPLv2 or later
+ */
+
+#pragma once
+
+#include <optional>
+
+#include <gtk/gtk.h>
+
+namespace xoj::util::gtk {
+/**
+ * @brief if `btn` has the GtkActionable properties action-name and action-target set, and a corresponding action has
+ * been added to any ascendent's GActionMap, then make the ToggleButton to never be unset when clicking on it. Only
+ * changing the action state can unset the button (e.g. by clicking on another button with the same action but a
+ * different state).
+ */
+void setToggleButtonUnreleasable(GtkToggleButton* btn);
+
+/**
+ * @brief Make so a widget is automatically enabled/disabled whenever the given action is
+ */
+void setWidgetFollowActionEnabled(GtkWidget* w, GAction* a);
+
+/**
+ * @brief returns the user-space DPI (i.e. scaled by HiDPI scaling) of the monitor the widget is on.
+ * Return std::nullopt if the widget is not realized
+ */
+std::optional<double> getWidgetDPI(GtkWidget* w);
+
+#if GTK_MAJOR_VERSION == 3
+/**
+ * @brief RadioButton's and GAction don't work as expected in GTK3:
+ * * Without setting the group, the RadioButtons are simply always ticked (all of them)
+ * * With the group properly set, when a RadioButton is "un-selected" (because we selected another one), it still
+ *   changes the GAction's state (it should only do that when being selected). This leads to infinite callback loops
+ *
+ * To circumvent this, we make our own GAction/RadioButton interactions. Don't forget to group the buttons together.
+ */
+void setRadioButtonActionName(GtkRadioButton* btn, const char* actionNamespace, const char* actionName);
+
+/**
+ * @brief some Gtk3 GtkActionable implementations (e.g. GtkMEnuItem) do not set their sensitivity properly on startup
+ * Fixes that
+ */
+void fixActionableInitialSensitivity(GtkActionable* w);
+#endif
+};  // namespace xoj::util::gtk
diff --git a/entry/src/main/cpp/src/util/include/util/GzUtil.h b/entry/src/main/cpp/src/util/include/util/GzUtil.h
new file mode 100644
index 0000000..8bc6b19
--- /dev/null
+++ b/entry/src/main/cpp/src/util/include/util/GzUtil.h
@@ -0,0 +1,27 @@
+/*
+ * Xournal++
+ *
+ * Gzip Helper
+ *
+ * @author Xournal++ Team
+ * https://github.com/xournalpp/xournalpp
+ *
+ * @license GNU GPLv2 or later
+ */
+
+#pragma once
+
+#include <string>  // for string
+
+#include <zlib.h>  // for gzFile
+
+#include "filesystem.h"  // for path
+
+class GzUtil {
+private:
+    GzUtil();
+    virtual ~GzUtil();
+
+public:
+    static gzFile openPath(const fs::path& path, const std::string& flags);
+};
diff --git a/entry/src/main/cpp/src/util/include/util/Interval.h b/entry/src/main/cpp/src/util/include/util/Interval.h
new file mode 100644
index 0000000..869f412
--- /dev/null
+++ b/entry/src/main/cpp/src/util/include/util/Interval.h
@@ -0,0 +1,108 @@
+/*
+ * Xournal++
+ *
+ * A interval data structure over a numeric data type.
+ *
+ * @author Xournal++ Team
+ * https://github.com/xournalpp/xournalpp
+ *
+ * @license GNU GPLv2 or later
+ */
+
+#pragma once
+
+#include <algorithm>
+#include <optional>
+
+/**
+ * @brief A templated class for (half open) intervals (a,b]
+ */
+template <class T>
+class Interval {
+public:
+    /**
+     * The interval bounds.
+     *
+     * Do not change the order: the class IntervalIteratable below relies on it.
+     */
+    T min{};
+    T max{};
+
+    Interval() = default;
+
+    /**
+     * @brief Initialize the interval to (min,max]
+     * @param min the lower bound
+     * @param max the upper bound
+     */
+    Interval(const T& min, const T& max): min(min), max(max) {}
+
+    /**
+     * @brief Get the interval (a,b] or (b,a], depending on which is greater
+     * @param a One bound
+     * @param b The other bound
+     * @return The interval
+     */
+    static inline Interval getInterval(const T& a, const T& b) { return a < b ? Interval(a, b) : Interval(b, a); }
+
+    /**
+     * @brief Computes the convex envelop of this and the other interval
+     * @param other The other interval
+     */
+    [[maybe_unused]] void envelop(const Interval& other) {
+        min = std::min(min, other.min);
+        max = std::max(max, other.max);
+    }
+
+    /**
+     * @brief Computes the convex envelop of this and another value
+     * @param t The other value
+     */
+    [[maybe_unused]] void envelop(const T& t) {
+        max = std::max(max, t);
+        min = std::min(min, t);
+    }
+
+    /**
+     * @brief Test if this interval contains a value
+     * @param t The value
+     * @return true if t lies in *this, false otherwise
+     */
+    [[maybe_unused]] bool contains(const T& t) const { return t > min && t <= max; }
+
+    /**
+     * @brief Test if this interval is contained in another
+     * @param other The other interval
+     * @return true if *this lies inside other, false otherwise
+     */
+    [[maybe_unused]] bool isContainedIn(const Interval& other) const { return min >= other.min && max <= other.max; }
+
+    /**
+     * @brief Test if this interval intersects another
+     * @param other The other interval
+     * @return true if *this and other intersect, false otherwise
+     */
+    [[maybe_unused]] std::optional<Interval<T>> intersect(const Interval& other) const {
+        T newMin = std::max(min, other.min);
+        T newMax = std::min(max, other.max);
+        return (newMin < newMax) ? std::optional(Interval(newMin, newMax)) : std::nullopt;
+    }
+
+    /**
+     * @brief Compute the length of the interval
+     * @return The length
+     */
+    [[maybe_unused]] T length() const { return max - min; }
+
+    bool operator==(const Interval<T>& other) const { return min == other.min && max == other.max; }
+    bool operator!=(const Interval<T>& other) const { return min != other.min || max != other.max; }
+    /**
+     * Lexicographic order for intervals
+     */
+    bool operator<=(const Interval<T>& other) const {
+        return min < other.min || (min == other.min && max <= other.max);
+    }
+    bool operator>=(const Interval<T>& other) const { return other <= *this; }
+    bool operator<(const Interval<T>& other) const { return !(other <= *this); }
+    bool operator>(const Interval<T>& other) const { return !(*this <= other); }
+};
diff --git a/entry/src/main/cpp/src/util/include/util/LoopUtil.h b/entry/src/main/cpp/src/util/include/util/LoopUtil.h
new file mode 100644
index 0000000..d7b197b
--- /dev/null
+++ b/entry/src/main/cpp/src/util/include/util/LoopUtil.h
@@ -0,0 +1,31 @@
+/*
+ * Xournal++
+ *
+ * Utility for loops
+ *
+ * @author Xournal++ Team
+ * https://github.com/xournalpp/xournalpp
+ *
+ * @license GNU GPLv2 or later
+ */
+
+#pragma once
+
+#include <algorithm>
+#include <iterator>
+#include <utility>
+
+/**
+ *	for_first_then_each
+ *	loop over the container from begin to end but handles the first element
+ *	differently.
+ */
+template <typename Container, typename Fun1, typename Fun2>
+void for_first_then_each(Container&& c, Fun1 f1, Fun2&& f2) {
+    auto begi = begin(c);
+    auto endi = end(c);
+    if (begi == endi)
+        return;
+    f1(*begi);
+    std::for_each(std::next(begi), endi, std::forward<Fun2&&>(f2));
+};
diff --git a/entry/src/main/cpp/src/util/include/util/NamedColor.h b/entry/src/main/cpp/src/util/include/util/NamedColor.h
new file mode 100644
index 0000000..8587dcd
--- /dev/null
+++ b/entry/src/main/cpp/src/util/include/util/NamedColor.h
@@ -0,0 +1,113 @@
+/**
+ * Xournal++
+ *
+ * Part of the customizable toolbars
+ *
+ * @author Xournal++ Team
+ * https://github.com/xournalpp/xournalpp
+ *
+ * @license GNU GPLv2 or later
+ * @brief Struct for NamedColor
+ */
+
+#pragma once
+#include <cstddef>  // for size_t
+#include <iosfwd>   // for istream
+#include <string>   // for string, basic_string
+
+#include "util/Color.h"  // for Color, ColorU16, ColorU8
+
+/**
+ * @brief NamedColor is an object for a color with name and an optional index which refers to the index of the color
+ * inside a given palette.
+ * If the NamedColor does not come from a Color palette isColorPalette is set to false and the palettIndex is 0.
+ *
+ */
+struct NamedColor {
+    /**
+     * @brief Default Construct a new Named Color instance
+     * This is only needed for the input operator implementation
+     *
+     */
+    NamedColor();
+
+    /**
+     * @brief Construct a new NamedColor instance for a Color Palette
+     * The paletteIndex should be the index which the color will have in the palette.
+     * This is to be used as:
+     *
+     *     NamedColor color{namedColors.size()};
+     *     std::istringstream iss{line};
+     *     if (iss >> color) {
+     *        ...
+     *     }
+     *
+     * @param paletteIndex
+     */
+    explicit NamedColor(size_t paletteIndex);
+
+    /**
+     * @brief Construct a new NamedColor instance
+     * This automatically sets the isPaletteColor to negative as NamedColors from a color palette can only be
+     * constructed using the input operator.
+     * As it is no paletteColor the Name of the Color will be set to "Custom Color" and the paletteIndex to 0.
+     *
+     * @param color color to set for the custom NamedColor instance
+     */
+    explicit NamedColor(Color color);
+
+    /**
+     * @brief Input operator for parsing NamedColor from input string stream
+     *
+     * @param str input string stream
+     * @param namedColor output for parsed NamedColor
+     * @return std::istream& which is the rest of the input string stream after parsing
+     */
+    friend auto operator>>(std::istream& str, NamedColor& namedColor) -> std::istream&;
+
+    /**
+     * @brief Get the color formatted as ColorU16 object
+     *
+     * @return ColorU16
+     */
+    auto getColorU16() const -> ColorU16;
+
+    /**
+     * @brief Get the color formatted as Color object
+     *
+     * @return Color
+     */
+    auto getColor() const -> Color;
+
+    /**
+     * @brief Get the Index of the NamedColor inside the Palette
+     *
+     * @return size_t index
+     */
+    auto getIndex() const -> size_t;
+
+    /**
+     * @brief Get the Name of the NamedColor
+     *
+     * @return std::string name
+     */
+    auto getName() const -> std::string const&;
+
+private:
+    /**
+     * @brief Index of the Namedcolor inside the palette
+     * This is useful for loading the toolbar from the toolbar.ini
+     *
+     */
+    size_t paletteIndex;
+
+    std::string name;
+    ColorU16 colorU16;
+    Color color;
+
+    /**
+     * @brief Flag whether a color comes from a palette or is a custom color.
+     *
+     */
+    bool isPaletteColor;
+};
diff --git a/entry/src/main/cpp/src/util/include/util/OutputStream.h b/entry/src/main/cpp/src/util/include/util/OutputStream.h
new file mode 100644
index 0000000..9c2a2f1
--- /dev/null
+++ b/entry/src/main/cpp/src/util/include/util/OutputStream.h
@@ -0,0 +1,50 @@
+/*
+ * Xournal++
+ *
+ * Output streams for writing
+ *
+ * @author Xournal++ Team
+ * https://github.com/xournalpp/xournalpp
+ *
+ * @license GNU GPLv2 or later
+ */
+
+#pragma once
+
+#include <string>  // for string
+
+#include <zlib.h>  // for gzFile
+
+#include "filesystem.h"  // for path
+
+class OutputStream {
+public:
+    OutputStream();
+    virtual ~OutputStream();
+
+public:
+    void write(const char* str);
+    void write(const std::string& str);
+
+    virtual void write(const char* data, size_t len) = 0;
+    virtual void close() = 0;
+};
+
+class GzOutputStream: public OutputStream {
+public:
+    GzOutputStream(fs::path file);
+    ~GzOutputStream() override;
+
+public:
+    void write(const char* data, size_t len) override;
+
+    void close() override;
+
+    const std::string& getLastError() const;
+
+private:
+    gzFile fp = nullptr;
+
+    std::string error;
+    fs::path file;
+};
diff --git a/entry/src/main/cpp/src/util/include/util/PairView.h b/entry/src/main/cpp/src/util/include/util/PairView.h
new file mode 100644
index 0000000..d3758c0
--- /dev/null
+++ b/entry/src/main/cpp/src/util/include/util/PairView.h
@@ -0,0 +1,133 @@
+/*
+ * Xournal++
+ *
+ * C++20-like view to iterate on pairs of consecutive elements
+ *
+ * @author Xournal++ Team
+ * https://github.com/xournalpp/xournalpp
+ *
+ * @license GNU GPLv2 or later
+ */
+#pragma once
+
+#include <array>
+#include <iterator>
+#include <type_traits>
+
+#include "TypeIfThenElse.h"
+
+/**
+ * @brief view to iterate on pairs of consecutive elements. The pairs overlap:
+ * On an array x[N], you'll get the pairs (x[0],x[1]), (x[1],x[2]), ... , (x[n-2],x[n-1])
+ * @param contiguous_container_type Must be a contiguous container
+ */
+template <typename contiguous_container_type>
+class PairView {
+    // C++ 20
+    // static_assert(is_same<typename std::iterator_traits<typename
+    // contiguous_container_type::iterator>::iterator_category, contiguous_iterator_tag>::value, "">);
+public:
+    using sub_value_type = typename contiguous_container_type::value_type;
+    static_assert(!std::is_same<sub_value_type, bool>::value, "bool arrays are not contiguous");
+    using value_type = std::array<sub_value_type, 2>;
+    PairView(contiguous_container_type& c): container(c){};
+
+private:
+    contiguous_container_type& container;
+
+    template <bool is_const>
+    class BaseIterator {
+    public:
+        using iterator_category = std::random_access_iterator_tag;
+        using value_type = typename PairView::value_type;
+        using qualified_value_type = typename const_if<value_type, is_const>::type;
+        using qualified_sub_value_type = typename const_if<sub_value_type, is_const>::type;
+        using pointer = qualified_value_type*;
+        using reference = qualified_value_type&;
+        using difference_type = std::ptrdiff_t;
+        using container_iterator_type =
+                typename type_or_type<typename contiguous_container_type::const_iterator,
+                                      typename contiguous_container_type::iterator, is_const>::type;
+
+        BaseIterator() = default;
+        ~BaseIterator() = default;
+        BaseIterator(const BaseIterator&) = default;
+        BaseIterator(container_iterator_type it): it(it) {}
+
+        reference operator*() const { return *reinterpret_cast<pointer>(&*it); }
+        qualified_sub_value_type& first() const { return *it; }
+        qualified_sub_value_type& second() const { return it[1]; }
+
+        BaseIterator& operator++() {
+            ++it;
+            return *this;
+        }
+        BaseIterator operator++(int) {
+            auto tmp = *this;
+            ++it;
+            return tmp;
+        }
+        BaseIterator& operator--() {
+            --it;
+            return *this;
+        }
+        BaseIterator operator--(int) {
+            auto tmp = *this;
+            --it;
+            return tmp;
+        }
+        BaseIterator& operator+=(difference_type n) {
+            it += n;
+            return *this;
+        }
+        BaseIterator& operator-=(difference_type n) {
+            it -= n;
+            return *this;
+        }
+
+        BaseIterator operator+(difference_type n) const { return BaseIterator(std::next(it, n)); }
+        BaseIterator operator-(difference_type n) const { return BaseIterator(std::prev(it, n)); }
+        difference_type operator-(const BaseIterator& other) const { return std::distance(it, other.it); }
+
+        reference operator[](difference_type n) const { return *(*this + n); }
+
+        bool operator==(const BaseIterator& other) const { return it == other.it; }
+        bool operator!=(const BaseIterator& other) const { return it != other.it; }
+
+        bool operator<(const BaseIterator& other) const { return it < other.it; }
+        bool operator>(const BaseIterator& other) const { return other < *this; }
+        bool operator<=(const BaseIterator& other) const { return !(other < *this); }
+        bool operator>=(const BaseIterator& other) const { return !(*this < other); }
+
+        friend BaseIterator operator+(difference_type n, BaseIterator& it) { return it + n; }
+
+    private:
+        container_iterator_type it;
+    };
+
+    using const_iterator = BaseIterator<true>;
+    using iterator = BaseIterator<false>;
+
+public:
+    const_iterator begin() const { return const_iterator(container.begin()); }
+
+    template <class T = contiguous_container_type, std::enable_if_t<!std::is_const<T>::value, int> = 0>
+    iterator begin() {
+        return iterator(container.begin());
+    }
+
+    const_iterator end() const {
+        if (container.empty()) {
+            return begin();
+        }
+        return const_iterator(std::prev(container.end()));
+    }
+
+    template <class T = contiguous_container_type, std::enable_if_t<!std::is_const<T>::value, int> = 0>
+    iterator end() {
+        if (container.empty()) {
+            return begin();
+        }
+        return iterator(std::prev(container.end()));
+    }
+};
diff --git a/entry/src/main/cpp/src/util/include/util/PathUtil.h b/entry/src/main/cpp/src/util/include/util/PathUtil.h
new file mode 100644
index 0000000..9ae503d
--- /dev/null
+++ b/entry/src/main/cpp/src/util/include/util/PathUtil.h
@@ -0,0 +1,173 @@
+/*
+ * Xournal++
+ *
+ * Helper for reading / writing files
+ *
+ * @author Xournal++ Team
+ * https://github.com/xournalpp/xournalpp
+ *
+ * @license GNU GPLv2 or later
+ */
+
+#pragma once
+
+#include <cstring>   // for strlen, size_t
+#include <optional>  // for optional
+#include <string>    // for string, allocator, basic_string
+#include <variant>   // for variant
+#include <vector>    // for vector
+
+#include <gio/gio.h>  // for GFile
+#include <glib.h>     // for g_free, GError, g_error_free, g_filename_fro...
+
+#include "util/StringUtils.h"
+#include "util/raii/CStringWrapper.h"
+#include "util/raii/GObjectSPtr.h"
+#include "util/safe_casts.h"  // for as_signed
+
+#include "filesystem.h"  // for path
+
+
+namespace Util {
+/**
+ * Read a file to a string
+ *
+ * @param path Path to read
+ * @param showErrorToUser Show an error to the user, if the file could not be read
+ * @param openmode Mode to open the file
+ *
+ * @return contents if the file was read, std::nullopt if not
+ */
+[[maybe_unused]] [[nodiscard]] std::optional<std::string> readString(fs::path const& path, bool showErrorToUser = true,
+                                                                     std::ios_base::openmode openmode = std::ios::in);
+
+/**
+ * Get escaped path, all " and \ are escaped
+ */
+[[maybe_unused]] [[nodiscard]] std::string getEscapedPath(const fs::path& path);
+
+/**
+ * @return true if this file has .xopp or .xoj extension
+ */
+[[maybe_unused]] [[nodiscard]] bool hasXournalFileExt(const fs::path& path);
+
+/**
+ * @return true if this file has a pdf extension
+ */
+[[nodiscard]] bool hasPdfFileExt(const fs::path& path);
+
+/**
+ * @return true if this file has a png extension
+ */
+[[nodiscard]] bool hasPngFileExt(const fs::path& path);
+
+/**
+ * Check if a path is absolute.
+ *
+ * Use this over fs::path::is_absolute to avoid a bug in libstdc++
+ * regarding UNC paths on Windows.
+ */
+[[nodiscard]] bool isAbsolute(const fs::path& path);
+
+/**
+ * Clear the xournal extensions ignoring case (.xoj, .xopp)
+ *
+ * @param ext An extension to clear additionally, eg .pdf (would also clear
+ *  .PDF.xopp etc.)
+ */
+void clearExtensions(fs::path& path, const std::string& ext = "");
+
+// Uri must be ASCII-encoded!
+[[maybe_unused]] [[nodiscard]] std::optional<fs::path> fromUri(const std::string& uri);
+
+[[maybe_unused]] [[nodiscard]] std::optional<std::string> toUri(const fs::path& path);
+
+
+[[maybe_unused]] [[nodiscard]] fs::path fromGFile(GFile* file);
+[[maybe_unused]] [[nodiscard]] xoj::util::GObjectSPtr<GFile> toGFile(fs::path const& path);
+
+/**
+ * Stores a string in the encoding used by glib for filepaths
+ * (see https://docs.gtk.org/glib/func.get_filename_charsets.html)
+ */
+class GFilename {
+public:
+    explicit GFilename(const fs::path& p);
+    /// Assumes the string is in g_filename encoding. The string is NOT copied and is owned by the caller.
+    explicit GFilename(const char* p);
+
+    /// Assumes the string is in g_filename encoding. Takes ownership of the given string.
+    [[nodiscard]] static GFilename assumeOwnerhip(char* p);
+
+    [[nodiscard]] const char* c_str() const;
+
+    [[nodiscard]] std::optional<fs::path> toPath() const;
+
+private:
+    GFilename() = default;
+
+    /// We use a variant to minimize the number of copies of the string
+    std::variant<const char*, xoj::util::OwnedCString, std::u8string> value;
+};
+[[maybe_unused]] [[nodiscard]] fs::path fromGFilename(const char* path);
+[[maybe_unused]] [[nodiscard]] GFilename toGFilename(fs::path const& path);
+
+[[maybe_unused]] [[nodiscard]] bool isChildOrEquivalent(fs::path const& path, fs::path const& base);
+
+[[maybe_unused]] bool safeRenameFile(fs::path const& from, fs::path const& to);
+[[maybe_unused]] void safeReplaceExtension(fs::path& p, const char* nexExtension);
+
+[[maybe_unused]] fs::path ensureFolderExists(const fs::path& p);
+
+enum class PathStorageMode { AS_ABSOLUTE_PATH, AS_RELATIVE_PATH };
+/**
+ * A Xournalpp file may include references to other PDF, PNG, etc. files on disk. This function converts an asset path
+ * to a string destined for storage (e.g. in a .xopp file).
+ *
+ * If mode == ABSOLUTE, the path is made absolute before being converted to string
+ * If mode == RELATIVE, this function assumes the .xopp file is in the directory `base` and it attempts to convert
+ *      `assetPath` to a relative path, relative to `base`.
+ *      If it is unable to create a relative path, it will return the path unchanged
+ *
+ * The result is a utf-8 string with '/' as directory delimiter
+ */
+[[nodiscard]] std::u8string normalizeAssetPath(const fs::path& assetPath, const fs::path& base, PathStorageMode mode);
+
+/**
+ * Convert to platform compatible path. Call this before
+ * passing a path to another program.
+ */
+fs::path getLongPath(const fs::path& path);
+
+[[deprecated("can produce invalid strings on windows, use fs::path::native()")]] [[nodiscard]]  //
+auto system_single_byte_filename(const fs::path& path) -> std::string;
+
+/**
+ * Return the configuration folder path (may not be guaranteed to exist).
+ */
+[[maybe_unused]] [[nodiscard]] fs::path getConfigFolder();
+[[maybe_unused]] [[nodiscard]] fs::path getConfigSubfolder(const fs::path& subfolder = "");
+[[maybe_unused]] [[nodiscard]] fs::path getCacheSubfolder(const fs::path& subfolder = "");
+[[maybe_unused]] [[nodiscard]] fs::path getDataSubfolder(const fs::path& subfolder = "");
+[[maybe_unused]] [[nodiscard]] fs::path getStateSubfolder(const fs::path& subfolder = "");
+[[maybe_unused]] [[nodiscard]] fs::path getConfigFile(const fs::path& relativeFileName = "");
+[[maybe_unused]] [[nodiscard]] fs::path getCacheFile(const fs::path& relativeFileName = "");
+[[maybe_unused]] [[nodiscard]] fs::path getTmpDirSubfolder(const fs::path& subfolder = "");
+[[maybe_unused]] [[nodiscard]] fs::path getAutosaveFilepath();
+[[maybe_unused]] [[nodiscard]] fs::path getGettextFilepath(fs::path const& localeDir);
+[[maybe_unused]] [[nodiscard]] fs::path getDataPath();
+[[maybe_unused]] [[nodiscard]] fs::path getLocalePath();
+[[maybe_unused]] [[nodiscard]] fs::path getInstallUiPath();
+[[maybe_unused]] [[nodiscard]] fs::path getExePath();  ///< folder containing the executable
+fs::path getBuiltInPaletteDirectoryPath();
+fs::path getCustomPaletteDirectoryPath();
+
+/**
+ * List all files in a directory sorted alphabetically
+ *
+ * If the directory does not exist it returns an empty list.
+ * @param directory to search
+ * @return files in directory
+ */
+std::vector<fs::path> listFilesSorted(fs::path directory);
+}  // namespace Util
diff --git a/entry/src/main/cpp/src/util/include/util/PlaceholderString.h b/entry/src/main/cpp/src/util/include/util/PlaceholderString.h
new file mode 100644
index 0000000..996c23e
--- /dev/null
+++ b/entry/src/main/cpp/src/util/include/util/PlaceholderString.h
@@ -0,0 +1,140 @@
+/*
+ * Xournal++
+ *
+ * Internationalization module
+ *
+ * @author Xournal++ Team
+ * https://github.com/xournalpp/xournalpp
+ *
+ * @license GNU GPLv2 or later
+ */
+
+// Todo(fabian): replace with cpp20 format library or https://github.com/fmtlib/fmt which are the same
+//               also using python like format string syntax
+
+#pragma once
+
+#include <cstddef>  // for size_t
+#include <cstdint>  // for int64_t
+#include <memory>   // for unique_ptr
+#include <ostream>  // for ostream
+#include <string>   // for string
+#include <string_view>
+#include <type_traits>
+#include <utility>  // for move
+#include <vector>   // for vector
+
+#include <glib.h>  // for g_error
+
+#include "util/StringUtils.h"
+
+template <typename C>
+concept Character = std::is_same_v<char, std::remove_cv_t<C>> ||      //
+                    std::is_same_v<wchar_t, std::remove_cv_t<C>> ||   //
+                    std::is_same_v<char8_t, std::remove_cv_t<C>> ||   //
+                    std::is_same_v<char16_t, std::remove_cv_t<C>> ||  //
+                    std::is_same_v<char32_t, std::remove_cv_t<C>>;
+
+template <typename StringType>
+concept StringLike = requires(StringType s) {
+    { s.c_str() };
+    { s.size() };
+};
+
+
+/**
+ * Base class for Formatting
+ */
+class PlaceholderElement {
+public:
+    virtual ~PlaceholderElement() = default;
+    PlaceholderElement() = default;
+    PlaceholderElement(PlaceholderElement const& p) = default;
+    PlaceholderElement(PlaceholderElement&& p) = default;
+    PlaceholderElement& operator=(PlaceholderElement const&) = default;
+    PlaceholderElement& operator=(PlaceholderElement&&) = default;
+    virtual auto format(std::string_view format) const -> std::string = 0;
+};
+
+
+/**
+ * Format String
+ */
+class PlaceholderElementString: public PlaceholderElement {
+public:
+    explicit PlaceholderElementString(std::string_view text): text(text) {}
+
+    auto format(std::string_view format) const -> std::string override { return {text.begin(), text.end()}; }
+
+private:
+    std::string_view text;
+};
+
+/**
+ * Format int
+ */
+template <typename T>
+class PlaceholderElementInt: public PlaceholderElement {
+public:
+    explicit PlaceholderElementInt(T value): value(value) {}
+
+    auto format(std::string_view format) const -> std::string override { return std::to_string(value); }
+
+private:
+    T value;
+};
+
+
+/**
+ * Placeholder String, used for formatting. Support Placeholder like
+ * {1}, {2} etc. Use {{ for {
+ */
+struct PlaceholderString {
+
+    explicit PlaceholderString(std::string_view text);
+
+    // Placeholder methods
+    template <typename T>
+    auto operator%(T const& value) -> PlaceholderString& {
+        if constexpr (std::is_integral_v<T>) {
+            data.emplace_back(std::make_unique<PlaceholderElementInt<T>>(value));
+        } else if constexpr (std::is_same_v<std::u8string, T> || std::is_same_v<std::u8string_view, T>) {
+            data.emplace_back(std::make_unique<PlaceholderElementString>(char_cast(value)));
+        } else if constexpr (std::is_same_v<char const&, T>) {
+            data.emplace_back(std::make_unique<PlaceholderElementString>(std::string_view(&value, 1)));
+        } else {
+            data.emplace_back(std::make_unique<PlaceholderElementString>(value));
+        }
+        return *this;
+    }
+
+    // Process Method
+    auto str() const -> std::string;
+    auto c_str() const -> char const*;  // NOLINT(readability-identifier-naming)
+
+private:
+    auto formatPart(std::string_view format) const -> std::string;
+    void process() const;
+
+    /**
+     * Values for Placeholder
+     */
+    std::vector<std::unique_ptr<PlaceholderElement>> data;
+
+    /**
+     * Input text
+     */
+    std::string_view text;
+
+    /**
+     * Processed String
+     */
+    mutable std::string processed;
+};
+
+template <class String>
+static auto makePlaceholderString(String&& val) {
+    return PlaceholderString(std::forward<String>(val));
+}
+
+auto operator<<(std::ostream& os, PlaceholderString& ps) -> std::ostream&;
diff --git a/entry/src/main/cpp/src/util/include/util/Point.h b/entry/src/main/cpp/src/util/include/util/Point.h
new file mode 100644
index 0000000..5d5c837
--- /dev/null
+++ b/entry/src/main/cpp/src/util/include/util/Point.h
@@ -0,0 +1,53 @@
+/*
+ * Xournal++
+ *
+ * Range
+ *
+ * @author Xournal++ Team
+ * https://github.com/xournalpp/xournalpp
+ *
+ * @license GNU GPLv2 or later
+ */
+
+#pragma once
+
+#include <cmath>
+#include <tuple>
+
+namespace xoj::util {
+
+template <typename T>
+struct Point {
+
+    // Todo (c++20): remove constructors
+    constexpr Point() = default;
+    constexpr Point(T x, T y): x(x), y(y) {}
+
+    [[maybe_unused]] constexpr auto distance(Point p) const -> double {
+        return std::hypot(p.x - this->x, p.y - this->y);
+    }
+
+    [[maybe_unused]] constexpr auto operator-(Point p) const -> Point { return {this->x - p.x, this->y - p.y}; }
+    [[maybe_unused]] constexpr auto operator-=(Point p) -> Point& { return *this = *this - p; }
+
+    [[maybe_unused]] constexpr auto operator+(Point p) const -> Point { return {this->x + p.x, this->y + p.y}; }
+    [[maybe_unused]] constexpr auto operator+=(Point p) -> Point& { return *this = *this + p; }
+
+    [[maybe_unused]] constexpr auto operator/(T k) const -> Point { return {this->x / k, this->y / k}; }
+    [[maybe_unused]] constexpr auto operator/=(T k) -> Point& { return *this = *this / k; }
+
+    [[maybe_unused]] constexpr auto operator*(T k) const -> Point { return {this->x * k, this->y * k}; }
+    [[maybe_unused]] constexpr auto operator*=(T k) -> Point& { return *this = *this * k; }
+
+    [[maybe_unused]] constexpr friend auto operator==(Point const& lhs, Point const& rhs) -> bool {
+        return std::tie(lhs.x, lhs.y) == std::tie(rhs.x, rhs.y);
+    }
+
+    [[maybe_unused]] constexpr friend auto operator!=(Point const& lhs, Point const& rhs) -> bool {
+        return !(lhs == rhs);
+    }
+
+    T x{};
+    T y{};
+};
+}  // namespace xoj::util
diff --git a/entry/src/main/cpp/src/util/include/util/PointerContainerView.h b/entry/src/main/cpp/src/util/include/util/PointerContainerView.h
new file mode 100644
index 0000000..ef637ad
--- /dev/null
+++ b/entry/src/main/cpp/src/util/include/util/PointerContainerView.h
@@ -0,0 +1,92 @@
+/*
+ * Xournal++
+ *
+ * A C++20-style view for containers with values pointer
+ * Such a view is not allowed to modify the pointed objects.
+ *
+ * @author Xournal++ Team
+ * https://github.com/xournalpp/xournalpp
+ *
+ * @license GNU GPLv2 or later
+ */
+
+#pragma once
+
+#include <memory>
+#include <type_traits>
+
+#include "util/ViewIteratorBase.h"
+#include "util/safe_casts.h"
+
+namespace xoj::util {
+template <typename container_type>
+class PointerContainerView {
+public:
+    using value_type = const typename std::pointer_traits<typename container_type::value_type>::element_type*;
+    using reference = const value_type&;
+    using pointer = const value_type*;
+    using difference_type = typename container_type::difference_type;
+    using size_type = typename container_type::size_type;
+
+    template <typename base_it>
+    class iterator_impl: public ViewIteratorBase<iterator_impl<base_it>, base_it> {
+    public:
+        using value_type = const typename std::pointer_traits<typename container_type::value_type>::element_type*;
+        using reference = const value_type&;
+        using pointer = const value_type*;
+
+        iterator_impl() = default;
+        iterator_impl(const iterator_impl& o) = default;
+        iterator_impl(iterator_impl&& o) = default;
+        iterator_impl& operator=(const iterator_impl& o) = default;
+        iterator_impl& operator=(iterator_impl&& o) = default;
+
+        iterator_impl(base_it it): ViewIteratorBase<iterator_impl<base_it>, base_it>(it) {}
+
+        // We must return by value
+        value_type operator*() const { return std::to_address(*ViewIteratorBase<iterator_impl<base_it>, base_it>::it); }
+        value_type operator[](difference_type n) const {
+            return std::to_address(ViewIteratorBase<iterator_impl<base_it>, base_it>::it[n]);
+        }
+
+        /*
+         * operator->() is not required by std::random_access_iterator but Clang's libc++20 seems to rely on
+         * std::to_address to implement the constructor std::vector::vector(It b, It e). So we add it.
+         *
+         * Also, operator*() returns by value, so we cannot only return a value_type*
+         */
+        std::unique_ptr<value_type> operator->() const { return std::make_unique<value_type>(operator*()); }
+    };
+    using iterator = iterator_impl<typename container_type::const_iterator>;
+    using const_iterator = iterator;
+    using reverse_iterator = std::reverse_iterator<iterator>;
+
+    PointerContainerView(const container_type& container): b(container.cbegin()), e(container.cend()) {}
+
+    iterator begin() const { return b; }
+    iterator end() const { return e; }
+    reverse_iterator rbegin() const { return reverse_iterator(e); }
+    reverse_iterator rend() const { return reverse_iterator(b); }
+    value_type operator[](size_type n) const { return b[static_cast<typename iterator::difference_type>(n)]; }
+    value_type front() const { return *b; }
+    value_type back() const { return e[-1]; }
+
+    size_t size() const { return as_unsigned(std::distance(b, e)); }
+
+    /// Clones the view into a vector. The pointed elements are not cloned.
+    std::vector<value_type> clone() const { return std::vector<value_type>(begin(), end()); }
+
+private:
+    const iterator b;
+    const iterator e;
+};
+
+static_assert(std::ranges::random_access_range<PointerContainerView<std::vector<std::unique_ptr<const int>>>>);
+static_assert(std::random_access_iterator<PointerContainerView<std::vector<std::unique_ptr<const int>>>::iterator>);
+static_assert(std::is_same_v<PointerContainerView<std::vector<int*>>::value_type, const int*>);
+static_assert(std::is_same_v<PointerContainerView<std::vector<const int*>>::value_type, const int*>);
+static_assert(std::is_same_v<PointerContainerView<std::vector<std::unique_ptr<int>>>::value_type, const int*>);
+static_assert(std::is_same_v<PointerContainerView<std::vector<std::unique_ptr<const int>>>::value_type, const int*>);
+static_assert(std::is_same_v<PointerContainerView<std::vector<std::shared_ptr<int>>>::value_type, const int*>);
+static_assert(std::is_same_v<PointerContainerView<std::vector<std::shared_ptr<const int>>>::value_type, const int*>);
+}  // namespace xoj::util
diff --git a/entry/src/main/cpp/src/util/include/util/PopupWindowWrapper.h b/entry/src/main/cpp/src/util/include/util/PopupWindowWrapper.h
new file mode 100644
index 0000000..58db2b4
--- /dev/null
+++ b/entry/src/main/cpp/src/util/include/util/PopupWindowWrapper.h
@@ -0,0 +1,79 @@
+/*
+ * Xournal++
+ *
+ * PopupWindow base class
+ *
+ * @author Xournal++ Team
+ * https://github.com/xournalpp/xournalpp
+ *
+ * @license GNU GPLv2 or later
+ */
+
+#pragma once
+
+#include <memory>
+
+#include <gtk/gtk.h>
+
+#include "util/Assert.h"
+#include "util/gtk4_helper.h"
+
+namespace xoj::popup {
+
+/**
+ * @brief The class PopupWindowWrapper allows a safe non-blocking creation and display of a popup window.
+ * It shows the popup (upon a call to show()) and tasks a callback function to actually delete the popup once it has
+ * been closed by the user.
+ */
+template <class PopupType>
+class PopupWindowWrapper {
+public:
+    PopupWindowWrapper() = delete;
+    PopupWindowWrapper(const PopupWindowWrapper&) = delete;
+    PopupWindowWrapper(PopupWindowWrapper&&) = delete;
+
+    template <class... Args>
+    PopupWindowWrapper(Args&&... args) {
+        popup = new PopupType(std::forward<Args>(args)...);
+    }
+    ~PopupWindowWrapper() { delete popup; }
+
+    void show(GtkWindow* parent) {
+        gtk_window_set_transient_for(popup->getWindow(), parent);
+        gtk_window_set_modal(popup->getWindow(), true);
+
+#if GTK_MAJOR_VERSION == 3
+        gtk_window_set_position(popup->getWindow(), GTK_WIN_POS_CENTER_ON_PARENT);
+        gtk_widget_show(GTK_WIDGET(popup->getWindow()));
+        g_signal_connect(popup->getWindow(), "delete-event",
+                         G_CALLBACK(+[](GtkWidget*, GdkEvent*, gpointer popup) -> gboolean {
+                             delete reinterpret_cast<PopupType*>(popup);
+                             return true;  // Block the default callback: we destroy the window via ~GtkWindowUPtr()
+                         }),
+                         popup);
+#else
+        gtk_widget_show(GTK_WIDGET(popup->getWindow()));
+        g_signal_connect(popup->getWindow(), "close-request", G_CALLBACK(+[](GtkWindow*, gpointer popup) -> gboolean {
+                             delete reinterpret_cast<PopupType*>(popup);
+                             return true;  // Block the default callback: we destroy the window via ~GtkWindowUPtr()
+                         }),
+                         popup);
+#endif
+
+        /*
+         * The actual popup must outlive this wrapper (so the main loop can go on).
+         * As a consequence, once the popup is shown, this wrapper does not own the popup anymore.
+         * The popup will get destroy by the signal connected above.
+         */
+        popup = nullptr;
+    }
+
+    PopupType* getPopup() const {
+        xoj_assert_message(popup, "Do not call getPopup() after show()!");
+        return popup;
+    }
+
+private:
+    PopupType* popup = nullptr;
+};
+};  // namespace xoj::popup
diff --git a/entry/src/main/cpp/src/util/include/util/Range.h b/entry/src/main/cpp/src/util/include/util/Range.h
new file mode 100644
index 0000000..b3ec0ce
--- /dev/null
+++ b/entry/src/main/cpp/src/util/include/util/Range.h
@@ -0,0 +1,50 @@
+/*
+ * Xournal++
+ *
+ * Range
+ *
+ * @author Xournal++ Team
+ * https://github.com/xournalpp/xournalpp
+ *
+ * @license GNU GPLv2 or later
+ */
+
+#pragma once
+
+#include <limits>
+
+namespace xoj::util {
+template <typename Float>
+class Rectangle;
+};
+
+class Range final {
+public:
+    Range() = default;  // Empty range
+    Range(double x, double y): minX(x), minY(y), maxX(x), maxY(y) {}
+    Range(double minX, double minY, double maxX, double maxY): minX(minX), minY(minY), maxX(maxX), maxY(maxY) {}
+    explicit Range(const xoj::util::Rectangle<double>& r);
+
+    void addPoint(double x, double y);
+
+    [[nodiscard]] Range unite(const Range& other) const;
+    [[nodiscard]] Range intersect(const Range& other) const;
+
+    [[nodiscard]] double getX() const;
+    [[nodiscard]] double getY() const;
+    [[nodiscard]] double getWidth() const;
+    [[nodiscard]] double getHeight() const;
+
+    void addPadding(double padding);
+    void translate(double dx, double dy);
+
+    [[nodiscard]] bool empty() const;
+    [[nodiscard]] bool isValid() const;
+    [[nodiscard]] bool contains(double x, double y) const;
+    [[nodiscard]] bool contains(const xoj::util::Rectangle<double>& r) const;
+
+    double minX = std::numeric_limits<double>::max();
+    double minY = std::numeric_limits<double>::max();
+    double maxX = std::numeric_limits<double>::lowest();
+    double maxY = std::numeric_limits<double>::lowest();
+};
diff --git a/entry/src/main/cpp/src/util/include/util/Recolor.h b/entry/src/main/cpp/src/util/include/util/Recolor.h
new file mode 100644
index 0000000..fba9a04
--- /dev/null
+++ b/entry/src/main/cpp/src/util/include/util/Recolor.h
@@ -0,0 +1,55 @@
+/*
+ * Xournal++
+ *
+ * Color utility, does color conversions
+ *
+ * @author Xournal++ Team
+ * https://github.com/xournalpp/xournalpp
+ *
+ * @license GNU GPLv2 or later
+ */
+
+#pragma once
+#include "util/Color.h"
+
+
+class Recolor {
+
+public:
+    Recolor(const ColorU8& light, const ColorU8& dark);
+    Recolor() = default;
+
+public:
+    const ColorU8& getDark() const;
+    const ColorU8& getLight() const;
+
+    ColorU8 convertColor(const ColorU8& other) const;
+
+    /**
+     * recolors the current cairo region (may be preceeded by clip)
+     * recoloring is done by
+     * 1. invert the whole background
+     * 2. scale (multiply) the color spectrum to fit between low/dark and high/light
+     * 3. move (add) the color spectrum to lay exactly in range low/dark and high/light
+     *
+     * @param cr the cairo context to work on
+     */
+    void recolorCurrentCairoRegion(cairo_t* cr) const;
+
+private:
+    constexpr friend bool operator==(Recolor const& lhs, Recolor const& rhs) {
+        return lhs.difference == rhs.difference && lhs.offset == rhs.offset && lhs.ref == rhs.ref;
+    }
+
+    void recalcDiffAndOff();
+
+private:
+    // parameters set by the user also needed to save the settings to file
+    ColorU8 dark = {};
+    ColorU8 light = {};
+
+    // calculated from above parameters to avoid having to calculate them for every recoloring all over again
+    ColorU8 difference = {};  // abs(dark - light)
+    ColorU8 offset = {};      // min(dark, light)
+    ColorU8 ref = {};         // for recoloring light
+};
diff --git a/entry/src/main/cpp/src/util/include/util/Rectangle.h b/entry/src/main/cpp/src/util/include/util/Rectangle.h
new file mode 100644
index 0000000..f176043
--- /dev/null
+++ b/entry/src/main/cpp/src/util/include/util/Rectangle.h
@@ -0,0 +1,92 @@
+/*
+ * Xournal++
+ *
+ * A rectangle data structure over a numeric data type.
+ *
+ * @author Xournal++ Team
+ * https://github.com/xournalpp/xournalpp
+ *
+ * @license GNU GPLv2 or later
+ */
+
+#pragma once
+
+#include <algorithm>
+#include <iosfwd>
+#include <optional>
+
+#include "util/Range.h"
+
+namespace xoj::util {  // Rectangle is already defined in windows.h
+
+template <class T>
+class Rectangle final {
+public:
+    constexpr Rectangle() = default;
+    constexpr Rectangle(T x, T y, T width, T height): x(x), y(y), width(width), height(height) {}
+    constexpr explicit Rectangle(const Range& rect):
+            x(rect.getX()), y(rect.getY()), width(rect.getWidth()), height(rect.getHeight()) {}
+
+    constexpr auto operator==(const Rectangle& other) const -> bool {
+        return x == other.x && y == other.y && width == other.width && height == other.height;
+    }
+
+    /**
+     * Returns whether this rectangle intersects another and the intersection
+     * @param other the other rectangle
+     * @return whether the rectangles intersect and if so, the intersection
+     */
+    constexpr auto intersects(const Rectangle& other) const -> std::optional<Rectangle> {
+        auto x1 = std::max(this->x, other.x);
+        auto y1 = std::max(this->y, other.y);
+        auto x2 = std::min(this->x + this->width, other.x + other.width);
+        auto y2 = std::min(this->y + this->height, other.y + other.height);
+        if (x2 > x1 && y2 > y1) {
+            return {{x1, y1, x2 - x1, y2 - y1}};
+        }
+        return std::nullopt;
+    }
+
+    /**
+     * Returns a new Rectangle with an offset specified
+     * by the function arguments
+     */
+    constexpr auto translated(T dx, T dy) const -> Rectangle {
+        return Rectangle(this->x + dx, this->y + dy, this->width, this->height);
+    }
+
+    /**
+     * Computes the union of this and the other rectangle
+     */
+    constexpr void unite(const Rectangle& other) {
+        this->width = std::max(this->x + this->width, other.x + other.width);
+        this->height = std::max(this->y + this->height, other.y + other.height);
+        this->x = std::min(this->x, other.x);
+        this->y = std::min(this->y, other.y);
+        this->width -= this->x;
+        this->height -= this->y;
+    }
+
+    /**
+     * Applies a scalar to this rectangle
+     */
+    constexpr auto operator*=(T factor) -> Rectangle& {
+        x *= factor;
+        y *= factor;
+        width *= factor;
+        height *= factor;
+        return *this;
+    }
+
+    /**
+     * Calculates the area
+     */
+    constexpr auto area() const -> T { return width * height; }
+
+    T x{};
+    T y{};
+    T width{};
+    T height{};
+};
+
+}  // namespace xoj::util
diff --git a/entry/src/main/cpp/src/util/include/util/SaveNameUtils.h b/entry/src/main/cpp/src/util/include/util/SaveNameUtils.h
new file mode 100644
index 0000000..196503f
--- /dev/null
+++ b/entry/src/main/cpp/src/util/include/util/SaveNameUtils.h
@@ -0,0 +1,36 @@
+/*
+ * Xournal++
+ *
+ * Save-name parsing utility, does wildcard-string to save-name conversions
+ *
+ * @author Xournal++ Team
+ * https://github.com/xournalpp/xournalpp
+ *
+ * @license GNU GPLv2 or later
+ */
+
+#pragma once
+
+#include <string>       // for string
+
+#include "filesystem.h"       // for path
+
+constexpr auto DEFAULT_WILDCARD_START = u8"%{";
+constexpr auto DEFAULT_WILDCARD_END = u8"}";
+
+// wildcard options
+constexpr auto WILDCARD_PDF_NAME = u8"name";  ///< default store name, e.g. original pdf name
+
+constexpr auto WILDCARD_FILE_NAME = u8"file";  ///< name of the file itself
+
+constexpr auto WILDCARD_DATE = u8"date";  ///< current date - Deprecated: prefer using %F instead of %{date}
+constexpr auto WILDCARD_TIME = u8"time";  ///< current time - Deprecated: prefer using %X instead of %{time}
+
+class SaveNameUtils {
+public:
+    static std::u8string parseFilenameFromWildcardString(std::u8string_view wildcardString, const fs::path& PdfPath,
+                                                         const fs::path& FilePath);
+
+private:
+    static std::u8string parseWildcard(std::u8string_view wildcard, const fs::path& PdfPath, const fs::path& FilePath);
+};
diff --git a/entry/src/main/cpp/src/util/include/util/SmallVector.h b/entry/src/main/cpp/src/util/include/util/SmallVector.h
new file mode 100644
index 0000000..e2b9416
--- /dev/null
+++ b/entry/src/main/cpp/src/util/include/util/SmallVector.h
@@ -0,0 +1,227 @@
+/*
+ * Xournal++
+ *
+ * A small-vector-optimized data structure, with data in the stack when it's small enough, in the heap otherwise
+ *
+ * @author Xournal++ Team
+ * https://github.com/xournalpp/xournalpp
+ *
+ * @license GNU GPLv2 or later
+ */
+
+#pragma once
+
+#include <algorithm>
+#include <cstddef>
+#include <initializer_list>
+#include <iterator>
+#include <memory>
+#include <utility>
+#include <vector>
+
+#include "util/Assert.h"
+
+#include "BasePointerIterator.h"
+#include "TinyVector.h"
+
+/**
+ * @brief A small-vector-optimized data structure, with data in the stack when it's small enough, in the heap otherwise
+ * If the size of the container often passes from > N to <= N and vice-versa, don't use this class (or pick a better N)
+ * This would result in a lot of unnecessary data moves between stack and heap, thus poorer performance.
+ */
+template <class T, size_t N>
+class SmallVector {
+public:
+    using size_type = size_t;
+    using value_type = T;
+    using reference = T&;
+    using iterator = BasePointerIterator<T, false>;
+    using const_iterator = BasePointerIterator<T, true>;
+    using difference_type = ptrdiff_t;
+
+    SmallVector() = default;
+    ~SmallVector() {
+        if (nb <= N) {
+            dataArrayClear();
+        }
+    }
+    SmallVector(const SmallVector& other) {
+        if (other.size() > N) {
+            // Avoid moving from stack to heap
+            dataVector = other.dataVector;
+        } else {
+            std::uninitialized_copy(other.begin(), other.end(), dataArray.data());
+        }
+        nb = other.size();
+    }
+    SmallVector(SmallVector&& other) {
+        if (other.size() > N) {
+            dataVector = std::move(other.dataVector);
+            nb = other.size();
+            other.nb = 0;
+        } else {
+            std::uninitialized_move(other.begin(), other.end(), dataArray.data());
+            nb = other.size();
+            other.clear();
+        }
+    }
+    SmallVector& operator=(const SmallVector& other) {
+        if (this == &other) {
+            return *this;
+        }
+        clear();
+        if (other.size() > N) {
+            // Avoid moving from stack to heap
+            dataVector = other.dataVector;
+        } else {
+            std::uninitialized_copy(other.begin(), other.end(), dataArray.data());
+        }
+        nb = other.size();
+        return *this;
+    }
+    SmallVector& operator=(SmallVector&& other) {
+        if (this == &other) {
+            return *this;
+        }
+        clear();
+        if (other.size() > N) {
+            dataVector = std::move(other.dataVector);
+            nb = other.size();
+            other.nb = 0;
+        } else {
+            std::uninitialized_move(other.begin(), other.end(), dataArray.data());
+            nb = other.size();
+            other.clear();
+        }
+        return *this;
+    }
+
+    SmallVector(std::initializer_list<T> list) {
+        nb = static_cast<size_type>(list.size());
+        if (nb <= N) {
+            std::uninitialized_move(list.begin(), list.end(), dataArray.data());
+        } else {
+            dataVector = list;  //{list.begin(), list.end()};
+        }
+    }
+    SmallVector& operator=(std::initializer_list<T> list) {
+        clear();
+        nb = static_cast<size_type>(list.size());
+        if (nb <= N) {
+            std::uninitialized_move(list.begin(), list.end(), dataArray.data());
+        } else {
+            dataVector = list;  //{list.begin(), list.end()};
+        }
+        return *this;
+    }
+
+    size_type size() const { return nb; }
+    bool empty() const { return nb == 0; }
+
+    T& operator[](size_type pos) { return nb <= N ? dataArray[pos] : dataVector[pos]; }
+    const T& operator[](size_type pos) const { return nb <= N ? dataArray[pos] : dataVector[pos]; }
+    T& front() { return nb <= N ? *dataArray.data() : dataVector.front(); }
+    const T& front() const { return nb <= N ? *dataArray.data() : dataVector.front(); }
+    T& back() { return nb <= N ? *(dataArray.data() + nb - 1) : dataVector.back(); }
+    const T& back() const { return nb <= N ? *(dataArray.data() + nb - 1) : dataVector.back(); }
+
+    T* data() { return nb <= N ? dataArray.data() : dataVector.data(); }
+    const T* data() const { return nb <= N ? dataArray.data() : dataVector.data(); }
+
+    iterator begin() { return nb <= N ? dataArray.data() : dataVector.data(); }
+    const_iterator begin() const { return nb <= N ? dataArray.data() : dataVector.data(); }
+    iterator end() { return nb <= N ? dataArray.data() + nb : dataVector.data() + nb; }
+    const_iterator end() const { return nb <= N ? dataArray.data() + nb : dataVector.data() + nb; }
+
+    template <class... Args>
+    void emplace_back(Args&&... args) {
+        if (nb < N) {
+            ::new (&dataArray[nb]) T(std::forward<Args>(args)...);
+        } else if (nb == N) {
+            xoj_assert(end() == begin() + N);
+            dataVector.reserve(N + 1);
+            std::move(dataArrayBegin(), dataArrayEnd(), std::back_inserter(dataVector));
+            dataArrayClear();
+            dataVector.emplace_back(std::forward<Args>(args)...);
+        } else {
+            dataVector.emplace_back(std::forward<Args>(args)...);
+        }
+        ++nb;
+    }
+    void push_back(const T& value) { emplace_back(value); }
+    void push_back(T&& value) { emplace_back(std::move(value)); }
+
+    void pop_back() {
+        if (nb > N) {
+            if (nb == N + 1) {
+                std::uninitialized_move(dataVector.begin(), std::prev(dataVector.end()), dataArray.data());
+                dataVector = std::vector<value_type>(0);
+            } else {
+                dataVector.pop_back();
+            }
+        } else {
+            xoj_assert(nb != 0);
+            std::destroy_at(dataArray.data() + nb - 1);
+        }
+        --nb;
+    }
+    void clear() {
+        if (nb > N) {
+            dataVector = std::vector<value_type>(0);
+        } else {
+            dataArrayClear();
+        }
+        nb = 0;
+    }
+
+    void swap(SmallVector& other) {
+        if (nb > N) {
+            dataVector.swap(other.dataVector);
+            if (other.nb <= N) {  // Handle stack data
+                std::uninitialized_move(other.dataArrayBegin(), other.dataArrayEnd(), dataArray.data());
+                other.dataArrayClear();
+            }
+            std::swap(nb, other.nb);
+            return;
+        }
+
+        if (other.nb > N) {
+            dataVector.swap(other.dataVector);
+            std::uninitialized_move(dataArrayBegin(), dataArrayEnd(), other.dataArray.data());
+            dataArrayClear();
+            std::swap(nb, other.nb);
+            return;
+        }
+
+        // Both in stack
+        if (nb < other.nb) {
+            iterator it = std::swap_ranges(dataArrayBegin(), dataArrayEnd(), other.dataArray.data());
+            std::uninitialized_move(it, other.dataArrayEnd(), dataArrayEnd());
+            std::destroy(it, other.dataArrayEnd());
+        } else {
+            iterator it = std::swap_ranges(other.dataArrayBegin(), other.dataArrayEnd(), dataArray.data());
+            std::uninitialized_move(it, dataArrayEnd(), other.dataArrayEnd());
+            std::destroy(it, dataArrayEnd());
+        }
+        std::swap(nb, other.nb);
+    }
+
+private:
+    iterator dataArrayBegin() { return dataArray.data(); }
+    iterator dataArrayEnd() {
+        xoj_assert(nb <= N);
+        return dataArray.data() + nb;
+    }
+    void dataArrayClear() { std::destroy(dataArrayBegin(), dataArrayEnd()); }
+
+    UninitializedStorage<T, N> dataArray{};
+    std::vector<T> dataVector{};
+    size_type nb = 0;
+};
+
+namespace std {
+template <typename T, size_t N>
+void swap(SmallVector<T, N>& a, SmallVector<T, N>& b) {
+    a.swap(b);
+}
+}  // namespace std
diff --git a/entry/src/main/cpp/src/util/include/util/Stacktrace.h b/entry/src/main/cpp/src/util/include/util/Stacktrace.h
new file mode 100644
index 0000000..79a74cd
--- /dev/null
+++ b/entry/src/main/cpp/src/util/include/util/Stacktrace.h
@@ -0,0 +1,26 @@
+/*
+ * Xournal++
+ *
+ * Prints a Stacktrace
+ *
+ * @author Xournal++ Team
+ * https://github.com/xournalpp/xournalpp
+ *
+ * @license GNU GPLv2 or later
+ */
+
+#pragma once
+
+#include <iostream>
+
+#include "filesystem.h"
+
+class Stacktrace final {
+private:
+    Stacktrace();
+    ~Stacktrace();
+
+public:
+    static void printStacktrace();
+    static void printStacktrace(std::ostream& stream);
+};
diff --git a/entry/src/main/cpp/src/util/include/util/StringUtils.h b/entry/src/main/cpp/src/util/include/util/StringUtils.h
new file mode 100644
index 0000000..f9fdb5e
--- /dev/null
+++ b/entry/src/main/cpp/src/util/include/util/StringUtils.h
@@ -0,0 +1,38 @@
+/*
+ * Xournal++
+ *
+ * String utilities
+ *
+ * @author Xournal++ Team
+ * https://github.com/xournalpp/xournalpp
+ *
+ * @license GNU GPLv2 or later
+ */
+
+#pragma once
+
+#include <string>   // for string, basic_string
+#include <utility>  // for pair
+#include <vector>   // for vector
+
+typedef std::pair<char, std::string> replace_pair;
+
+class StringUtils {
+public:
+    static std::string toLowerCase(const std::string& input);
+    static void replaceAllChars(std::string& input, const std::vector<replace_pair>& replaces);
+    static std::vector<std::string> split(const std::string& input, char delimiter);
+    static bool startsWith(std::string_view str, std::string_view start);
+    static bool endsWith(std::string_view str, std::string_view end);
+    static std::string ltrim(std::string str);
+    static std::string rtrim(std::string str);
+    static std::string trim(std::string str);
+    static bool iequals(const std::string& a, const std::string& b);
+    static bool isNumber(const std::string& input);
+};
+
+inline auto char_cast(std::u8string_view str) -> std::string_view {
+    return {reinterpret_cast<const char*>(str.data()), str.size()};
+}
+
+inline auto char_cast(char8_t const* str) -> char const* { return reinterpret_cast<const char*>(str); }
diff --git a/entry/src/main/cpp/src/util/include/util/TinyVector.h b/entry/src/main/cpp/src/util/include/util/TinyVector.h
new file mode 100644
index 0000000..cee0352
--- /dev/null
+++ b/entry/src/main/cpp/src/util/include/util/TinyVector.h
@@ -0,0 +1,134 @@
+/*
+ * Xournal++
+ *
+ * A tiny vector stored in the stack, with a small maximal size
+ *
+ * @author Xournal++ Team
+ * https://github.com/xournalpp/xournalpp
+ *
+ * @license GNU GPLv2 or later
+ */
+
+#pragma once
+
+#include <algorithm>
+#include <array>
+#include <cstddef>
+#include <iterator>
+#include <memory>
+#include <type_traits>
+#include <utility>
+
+#include "util/Assert.h"
+
+#include "BasePointerIterator.h"
+
+template <class T, size_t N>
+class UninitializedStorage {
+public:
+    using size_type = size_t;
+    using value_type = T;
+    using reference = T&;
+
+    T& operator[](size_type pos) { return *std::launder(reinterpret_cast<T*>(&dataArray[pos])); }
+    const T& operator[](size_type pos) const { return *std::launder(reinterpret_cast<const T*>(&dataArray[pos])); }
+
+    T* data() { return std::launder(reinterpret_cast<T*>(dataArray.data())); }
+    const T* data() const { return std::launder(reinterpret_cast<const T*>(dataArray.data())); }
+
+protected:
+    std::array<typename std::aligned_storage<sizeof(T), alignof(T)>::type, N> dataArray;
+};
+
+template <class T, size_t N>
+class TinyVector: public UninitializedStorage<T, N> {
+public:
+    using size_type = size_t;
+    using value_type = T;
+    using reference = T&;
+    using iterator = BasePointerIterator<T, false>;
+    using const_iterator = BasePointerIterator<T, true>;
+    using difference_type = ptrdiff_t;
+
+    TinyVector() = default;
+    ~TinyVector() { std::destroy(begin(), end()); }
+    TinyVector(const TinyVector& other) { std::copy(other.begin(), other.end(), std::back_inserter(*this)); }
+    TinyVector(TinyVector&& other) {
+        std::move(other.begin(), other.end(), std::back_inserter(*this));
+        other.clear();
+    }
+    TinyVector& operator=(const TinyVector& other) {
+        if (this == &other) {
+            return *this;
+        }
+        clear();
+        std::copy(other.begin(), other.end(), std::back_inserter(*this));
+        return *this;
+    }
+    TinyVector& operator=(TinyVector&& other) {
+        if (this == &other) {
+            return *this;
+        }
+        clear();
+        std::move(other.begin(), other.end(), std::back_inserter(*this));
+        other.clear();
+        return *this;
+    }
+
+    size_type size() const { return nb; }
+    bool empty() const { return nb == 0; }
+
+    T& front() { return *UninitializedStorage<T, N>::data(); }
+    const T& front() const { return *UninitializedStorage<T, N>::data(); }
+    T& back() { return *(UninitializedStorage<T, N>::data() + nb - 1); }
+    const T& back() const { return *(UninitializedStorage<T, N>::data() + nb - 1); }
+
+    template <class... Args>
+    void emplace_back(Args&&... args) {
+        xoj_assert(nb < N);
+        ::new (&UninitializedStorage<T, N>::dataArray[nb++]) T(std::forward<Args>(args)...);
+    }
+    void push_back(const T& value) { emplace_back(value); }
+    void push_back(T&& value) { emplace_back(std::move(value)); }
+    void pop_back() {
+        xoj_assert(nb != 0);
+        std::destroy_at(&back());
+        nb--;
+    }
+    void clear() {
+        std::destroy(begin(), end());
+        nb = 0;
+    }
+
+    void erase_from(const iterator& first) {
+        std::destroy(first, end());
+        nb = static_cast<size_type>(std::distance(begin(), first));
+    }
+
+    void swap(TinyVector& other) {
+        if (nb < other.nb) {
+            iterator it = std::swap_ranges(begin(), end(), other.begin());
+            std::move(it, other.end(), std::back_inserter(*this));
+            other.erase_from(it);
+        } else {
+            iterator it = std::swap_ranges(other.begin(), other.end(), begin());
+            std::move(it, end(), std::back_inserter(other));
+            erase_from(it);
+        }
+    }
+
+    iterator begin() { return UninitializedStorage<T, N>::data(); }
+    const_iterator begin() const { return UninitializedStorage<T, N>::data(); }
+    iterator end() { return UninitializedStorage<T, N>::data() + nb; }
+    const_iterator end() const { return UninitializedStorage<T, N>::data() + nb; }
+
+private:
+    size_type nb = 0;
+};
+
+namespace std {
+template <typename T, size_t N>
+void swap(TinyVector<T, N>& a, TinyVector<T, N>& b) {
+    a.swap(b);
+}
+}  // namespace std
diff --git a/entry/src/main/cpp/src/util/include/util/TypeIfThenElse.h b/entry/src/main/cpp/src/util/include/util/TypeIfThenElse.h
new file mode 100644
index 0000000..87e53f9
--- /dev/null
+++ b/entry/src/main/cpp/src/util/include/util/TypeIfThenElse.h
@@ -0,0 +1,35 @@
+/*
+ * Xournal++
+ *
+ * Helper structures to get various types depending on a boolean value
+ *
+ * @author Xournal++ Team
+ * https://github.com/xournalpp/xournalpp
+ *
+ * @license GNU GPLv2 or later
+ */
+
+#pragma once
+/**
+ * @brief Get `const T` if the boolean is true, `T` otherwise
+ */
+template <typename T, bool>
+struct const_if {
+    using type = T;
+};
+template <typename T>
+struct const_if<T, true> {
+    using type = const T;
+};
+
+/**
+ * @brief Get `T` if the boolean is true, `U` otherwise
+ */
+template <typename T, typename U, bool>
+struct type_or_type {
+    using type = T;
+};
+template <typename T, typename U>
+struct type_or_type<T, U, false> {
+    using type = U;
+};
diff --git a/entry/src/main/cpp/src/util/include/util/UnionOfIntervals.h b/entry/src/main/cpp/src/util/include/util/UnionOfIntervals.h
new file mode 100644
index 0000000..d82e4da
--- /dev/null
+++ b/entry/src/main/cpp/src/util/include/util/UnionOfIntervals.h
@@ -0,0 +1,223 @@
+/*
+ * Xournal++
+ *
+ * A data structure for unions of intervals of a numeric data type.
+ *
+ * @author Xournal++ Team
+ * https://github.com/xournalpp/xournalpp
+ *
+ * @license GNU GPLv2 or later
+ */
+
+#pragma once
+
+#include <algorithm>
+#include <iterator>
+#include <vector>
+
+#include "util/Assert.h"
+
+#include "Interval.h"
+
+/**
+ * @brief A data structure for unions of intervals of a numeric data type
+ *
+ * The intervals are stored as a sorted list of their bounds. The list must be of even length.
+ * This data structure makes the computation of the union/intersection/complement of those intervals very simple.
+ * The downside is: it makes iterating through the structure a bit weird. See cloneToIntervalVector below for an example
+ */
+template <class T>
+class UnionOfIntervals final {
+public:
+    UnionOfIntervals() = default;
+
+    /**
+     * @brief Reset the union of intervals to be the single interval [lowerBound, upperBound).
+     * Assumes lowerBound < upperBound
+     * @param lowerBound The lower bound
+     * @param upperBound The upper bound
+     */
+    [[maybe_unused]] void set(const T& lowerBound, const T& upperBound) { data = {lowerBound, upperBound}; }
+
+    /**
+     * @brief Add the intervals of other to this
+     * @param other Any forward-iteratable sorted container of type T of **even length**
+     * @return True if changes were made, false otherwise
+     */
+    template <class C>
+    [[maybe_unused]] bool unite(const C& other) {
+        bool changesMade = false;
+        bool insideThis = false;
+        bool insideOther = false;
+        auto itThis = this->data.begin();
+        auto itOther = other.cbegin();
+        while (itThis != this->data.end() && itOther != other.cend()) {
+            if (*itOther == *itThis) {
+                if (insideThis != insideOther) {
+                    // This bound is no longer needed
+                    // Remove and increment
+                    itThis = this->data.erase(itThis);
+                    changesMade = true;
+                } else {
+                    ++itThis;
+                }
+                itOther++;
+                insideThis = !insideThis;
+                insideOther = !insideOther;
+            } else if (*itOther < *itThis) {
+                insideOther = !insideOther;
+                if (!insideThis) {
+                    // Open or close an interval (depending on the value of insideOther)
+                    itThis = std::next(this->data.insert(itThis, *itOther));
+                    changesMade = true;
+                }
+                ++itOther;
+            } else {
+                insideThis = !insideThis;
+                if (insideOther) {
+                    // This bound is no longer needed
+                    // Remove and increment
+                    itThis = this->data.erase(itThis);
+                    changesMade = true;
+                } else {
+                    ++itThis;
+                }
+            }
+        }
+        if (itOther == other.cend()) {
+            return changesMade;
+        }
+        std::copy(itOther, other.cend(), std::back_inserter(this->data));
+        xoj_assert(this->data.size() % 2 == 0);
+        return true;
+    }
+
+    /**
+     * @brief Intersect the intervals of this with those of other
+     * @param other Any forward-iteratable sorted container of type T of **even length**
+     * @return True if changes were made, false otherwise
+     */
+    template <class C>
+    [[maybe_unused]] bool intersect(const C& other) {
+        bool changesMade = false;
+        bool insideThis = false;
+        bool insideOther = false;
+        auto itThis = this->data.begin();
+        auto itOther = other.cbegin();
+        while (itThis != this->data.end() && itOther != other.cend()) {
+            if (*itOther == *itThis) {
+                if (insideThis != insideOther) {
+                    // This bound is no longer needed
+                    // Remove and increment
+                    itThis = this->data.erase(itThis);
+                    changesMade = true;
+                } else {
+                    ++itThis;
+                }
+                ++itOther;
+                insideThis = !insideThis;
+                insideOther = !insideOther;
+            } else if (*itOther < *itThis) {
+                insideOther = !insideOther;
+                if (insideThis) {
+                    // Open or close an interval (depending on the value of insideOther)
+                    itThis = std::next(this->data.insert(itThis, *itOther));
+                    changesMade = true;
+                }
+                itOther++;
+            } else {
+                insideThis = !insideThis;
+                if (!insideOther) {
+                    // This bound is no longer needed
+                    // Remove and increment
+                    itThis = this->data.erase(itThis);
+                    changesMade = true;
+                } else {
+                    ++itThis;
+                }
+            }
+        }
+        data.erase(itThis, data.end());
+        xoj_assert(this->data.size() % 2 == 0);
+        return changesMade;
+    }
+
+    /**
+     * @brief Replace the union of intervals by its complement inside [lowerBound, upperBound].
+     * Assumes all values lie in this interval.
+     * @param lowerBound The lower bound
+     * @param upperBound The upper bound
+     */
+    void complement(const T& lowerBound, const T& upperBound) {
+        if (data.empty()) {
+            data = {lowerBound, upperBound};
+            return;
+        }
+
+        if (data.front() == lowerBound) {
+            data.erase(data.begin());
+        } else {
+            data.insert(data.begin(), lowerBound);
+        }
+        if (data.back() == upperBound) {
+            data.pop_back();
+        } else {
+            data.push_back(upperBound);
+        }
+        xoj_assert(this->data.size() % 2 == 0);
+    }
+
+    /**
+     * @brief Copy the data into a vector of type Interval
+     * @return The copied vector
+     */
+    std::vector<Interval<T>> cloneToIntervalVector() const {
+        std::vector<Interval<T>> result;
+        xoj_assert(this->data.size() % 2 == 0);
+        result.reserve(data.size() / 2);
+
+        auto itLowerBound = data.cbegin();
+        auto itUpperBound = itLowerBound;
+        auto itEnd = data.cend();
+        while (itLowerBound != itEnd) {
+            itUpperBound = std::next(itLowerBound);
+            result.emplace_back(*itLowerBound, *itUpperBound);
+            itLowerBound = std::next(itUpperBound);
+        }
+        return result;
+    }
+
+    /**
+     * @brief Determine if the union of intervals is empty or not
+     * @return true if it is empty, false otherwise
+     */
+    inline bool empty() const { return data.empty(); }
+
+    /**
+     * @brief Get a reference to the data
+     */
+    const std::vector<T>& getData() const { return data; }
+
+    /**
+     * @brief Swap the content with that of other
+     */
+    void swap(UnionOfIntervals<T>& other) { data.swap(other.data); }
+
+    /**
+     * @brief Append raw data to the union's data
+     * @param container Container with the added data
+     *
+     * This assumes:
+     *   * container is a container of type T of even length
+     *   * container is sorted
+     *   * container.front() > data.back()
+     */
+    template <typename container_type>
+    void appendData(const container_type& container) {
+        xoj_assert(container.size() % 2 == 0);
+        std::copy(container.begin(), container.end(), std::back_inserter(data));
+    }
+
+private:
+    std::vector<T> data;
+};
diff --git a/entry/src/main/cpp/src/util/include/util/Util.h b/entry/src/main/cpp/src/util/include/util/Util.h
new file mode 100644
index 0000000..df6bd12
--- /dev/null
+++ b/entry/src/main/cpp/src/util/include/util/Util.h
@@ -0,0 +1,90 @@
+/*
+ * Xournal++
+ *
+ * Xournal util functions
+ *
+ * @author Xournal++ Team
+ * https://github.com/xournalpp/xournalpp
+ *
+ * @license GNU GPLv2 or later
+ */
+
+#pragma once
+
+#include <cstdlib>     // size_t
+#include <functional>  // for function
+#include <limits>      // for numeric_limits
+#include <utility>
+
+#include <cairo.h>    // for cairo_t
+#include <glib.h>     // for G_PRIORITY_DEFAULT_IDLE, gboolean, gchar, gint
+#include <gtk/gtk.h>  // for GtkWidget
+
+#include "util/glib_casts.h"
+
+#include "Point.h"
+
+class OutputStream;
+
+namespace Util {
+
+#if defined(_MSC_VER)
+using PID = uint32_t;  // DWORD
+#else
+using PID = int32_t;  // pid
+#endif
+
+auto getPid() -> PID;
+
+/**
+ * Wrap the system call to redirect errors to a dialog
+ */
+void systemWithMessage(const char* command);
+
+/**
+ * Check if currently running in a Flatpak sandbox
+ */
+bool isFlatpakInstallation();
+
+/**
+ * Execute the callback in the UI Thread.
+ *
+ * Make sure the container class is not deleted before the UI stuff is finished!
+ */
+template <typename Fun>
+void execInUiThread(Fun&& callback, gint priority = G_PRIORITY_DEFAULT_IDLE) {
+    if constexpr (std::is_function_v<Fun>) {
+        gdk_threads_add_idle_full(priority, std::forward<Fun>(callback), nullptr, nullptr);
+    } else {
+        constexpr auto fn = +[](gpointer functor) -> int {
+            auto fun = static_cast<Fun*>(functor);
+            (*fun)();
+            return G_SOURCE_REMOVE;
+        };
+        gdk_threads_add_idle_full(priority, fn, new auto(std::forward<Fun>(callback)), &xoj::util::destroy_cb<Fun>);
+    }
+}
+
+gboolean paintBackgroundWhite(GtkWidget* widget, cairo_t* cr, void* unused);
+
+void cairo_set_dash_from_vector(cairo_t* cr, const std::vector<double>& dashes, double offset);
+
+/**
+ * Transform absolute coordinates into coordinates local to the specified widget.
+ * The top left corner of `widget` will have coordinates (0, 0).
+ */
+xoj::util::Point<double> toWidgetCoords(GtkWidget* widget, xoj::util::Point<double> absolute_coords);
+
+/**
+ * Format coordinates to use 8 digits of precision https://m.xkcd.com/2170/
+ * This function directly writes to the given OutputStream.
+ */
+extern void writeCoordinateString(OutputStream* out, double xVal, double yVal);
+
+constexpr const gchar* PRECISION_FORMAT_STRING = "%.8g";
+
+constexpr const auto DPI_NORMALIZATION_FACTOR = 72.0;
+
+}  // namespace Util
+
+constexpr auto npos = std::numeric_limits<size_t>::max();
diff --git a/entry/src/main/cpp/src/util/include/util/VersionInfo.h b/entry/src/main/cpp/src/util/include/util/VersionInfo.h
new file mode 100644
index 0000000..5e9e729
--- /dev/null
+++ b/entry/src/main/cpp/src/util/include/util/VersionInfo.h
@@ -0,0 +1,27 @@
+/*
+ * Xournal++
+ *
+ * get version info on various components and libraries
+ *
+ * @author Xournal++ Team
+ * https://github.com/xournalpp/xournalpp
+ *
+ * @license GNU GPLv2 or later
+ */
+#pragma once
+
+#include <string>
+
+namespace xoj::util {
+/// Get the running GDK backend (or nullptr if none)
+const char* getGdkBackend();
+
+/// Get a string "Xournal++ a.b.c + commit info"
+std::string getXournalppVersion();
+
+/// Get a string describing the OS
+std::string getOsInfo();
+
+/// Get a paragraph with all version info
+std::string getVersionInfo();
+};  // namespace xoj::util
diff --git a/entry/src/main/cpp/src/util/include/util/ViewIteratorBase.h b/entry/src/main/cpp/src/util/include/util/ViewIteratorBase.h
new file mode 100644
index 0000000..0b83acc
--- /dev/null
+++ b/entry/src/main/cpp/src/util/include/util/ViewIteratorBase.h
@@ -0,0 +1,77 @@
+/*
+ * Xournal++
+ *
+ * A C++20-style view for containers with values pointer
+ * Such a view is not allowed to modify the pointed objects.
+ *
+ * @author Xournal++ Team
+ * https://github.com/xournalpp/xournalpp
+ *
+ * @license GNU GPLv2 or later
+ */
+
+#pragma once
+
+#include <memory>
+#include <type_traits>
+
+#include "util/safe_casts.h"
+
+namespace xoj::util {
+/**
+ * template class for wrapping a base iterator into an iterator for a view
+ *
+ * Usage:
+ * class MyIterator: public ViewIteratorBase<MyIterator, BaseIterator> {
+ *    // Define value_type, pointer, reference member types
+ *    // Define default constructor + other contructor as needed
+ *    // Define operator*(), operator[](size_t n) (if random access), operator->()
+ * };
+ */
+template <typename iterator, std::input_iterator base_it>
+class ViewIteratorBase {
+public:
+    using iterator_category = std::iterator_traits<base_it>::iterator_category;
+    using difference_type = std::iterator_traits<base_it>::difference_type;
+
+    constexpr ViewIteratorBase() = default;
+    constexpr ViewIteratorBase(const ViewIteratorBase& o) = default;
+    constexpr ViewIteratorBase(ViewIteratorBase&& o) = default;
+    constexpr ViewIteratorBase& operator=(const ViewIteratorBase& o) = default;
+    constexpr ViewIteratorBase& operator=(ViewIteratorBase&& o) = default;
+
+    constexpr ViewIteratorBase(base_it it): it(it) {}
+
+    constexpr iterator& operator++() {
+        ++it;
+        return static_cast<iterator&>(*this);
+    }
+    constexpr iterator operator++(int) { return it++; }
+    constexpr iterator& operator--() {
+        --it;
+        return static_cast<iterator&>(*this);
+    }
+    constexpr iterator operator--(int) { return it--; }
+    constexpr iterator& operator+=(difference_type n) {
+        it += n;
+        return static_cast<iterator&>(*this);
+    }
+    constexpr iterator operator+(difference_type n) const { return it + n; }
+    friend constexpr iterator operator+(difference_type n, const iterator& self) { return self + n; }
+    constexpr iterator& operator-=(difference_type n) {
+        it -= n;
+        return static_cast<iterator&>(*this);
+    }
+    constexpr iterator operator-(difference_type n) const { return it - n; }
+    constexpr difference_type operator-(const ViewIteratorBase& o) const { return it - o.it; }
+
+    constexpr auto operator==(iterator const& other) const -> bool { return it == other.it; }
+    constexpr auto operator<(iterator const& other) const -> bool { return it < other.it; }
+    constexpr auto operator>(iterator const& other) const -> bool { return it > other.it; }
+    constexpr auto operator<=(iterator const& other) const -> bool { return it <= other.it; }
+    constexpr auto operator>=(iterator const& other) const -> bool { return it >= other.it; }
+    constexpr auto operator!=(iterator const& other) const -> bool { return it != other.it; }
+
+    base_it it;
+};
+}  // namespace xoj::util
diff --git a/entry/src/main/cpp/src/util/include/util/XojMsgBox.h b/entry/src/main/cpp/src/util/include/util/XojMsgBox.h
new file mode 100644
index 0000000..2f27a0a
--- /dev/null
+++ b/entry/src/main/cpp/src/util/include/util/XojMsgBox.h
@@ -0,0 +1,95 @@
+/*
+ * Xournal++
+ *
+ * Xournal util functions
+ *
+ * @author Xournal++ Team
+ * https://github.com/xournalpp/xournalpp
+ *
+ * @license GNU GPLv2 or later
+ */
+
+#pragma once
+
+#include <string>
+#include <vector>
+
+#include <gtk/gtk.h>
+
+#include "util/move_only_function.h"
+#include "util/raii/GtkWindowUPtr.h"
+
+#include "filesystem.h"
+
+class XojMsgBox final {
+public:
+    enum CallbackPolicy { IMMEDIATE, POSTPONED };
+    XojMsgBox(
+            GtkDialog* dialog, xoj::util::move_only_function<void(int)> callback = [](int) {},
+            CallbackPolicy pol = POSTPONED);
+    ~XojMsgBox() = default;
+
+    inline GtkWindow* getWindow() const { return window.get(); }
+
+private:
+    xoj::util::GtkWindowUPtr window;
+    xoj::util::move_only_function<void(int)> callback;  ///< The parameter is the dialog's response ID
+    gulong signalId;
+    /**
+     * If POSTPONED, the callback is called after the dialog has been closed. This is necessary when the callback can
+     * pop up another dialog.
+     * However, if POSTPONED, the dialog instance will have been destroyed by the time the callback is called, so any
+     * pointer to the GtkDialog instance will be dangling
+     */
+    CallbackPolicy policy;
+
+public:
+    struct Button {
+        Button(std::string l, int r): label(std::move(l)), response(r) {}
+        std::string label;
+        int response;
+    };
+
+    /**
+     * Set window for messages without window
+     */
+    static void setDefaultWindow(GtkWindow* win);
+
+    static void askQuestion(GtkWindow* win, const std::string& maintext, const std::string& secondarytext,
+                            const std::vector<Button>& buttons, xoj::util::move_only_function<void(int)> callback);
+    /**
+     * @brief same as askQuestion() but the string maintext is not escaped for Pango markups
+     */
+    static void askQuestionWithMarkup(GtkWindow* win, std::string_view maintext, const std::string& secondarytext,
+                                      const std::vector<Button>& buttons,
+                                      xoj::util::move_only_function<void(int)> callback);
+
+    /**
+     * @brief Shows a message with title markupTitle and message content msg.
+     * The title is formatted according to any Pango markups it contains.
+     */
+    static void showMarkupMessageToUser(GtkWindow* win, const std::string_view& markupTitle, const std::string& msg,
+                                        GtkMessageType type);
+    static void showMessageToUser(GtkWindow* win, const std::string& msg, GtkMessageType type);
+    static void showMessageToUser(GtkWindow* win, const std::string& title, const std::string& msg,
+                                  GtkMessageType type);
+    static void showErrorToUser(GtkWindow* win, const std::string& msg);
+
+    /// @brief This should be used for fatal errors, typically in early GUI startup (missing UI main file or so).
+    [[noreturn]] static void showErrorAndQuit(std::string& msg, int exitCode);
+
+    static void showPluginMessage(const std::string& pluginName, const std::string& msg, bool error = false);
+    [[deprecated("Will be removed when porting to gtk4")]] static int askPluginQuestion(
+            const std::string& pluginName, const std::string& msg, const std::vector<Button>& buttons,
+            bool error = false);
+
+    static void showHelp(GtkWindow* win);
+    static void openURL(GtkWindow* win, const char* url);
+
+    /**
+     * @brief Calls writeToFile(file) if either file is not already present in the filesystem, or is the user answers
+     * "Overwrite" to a popup dialog.
+     */
+    static void replaceFileQuestion(GtkWindow* win, fs::path file,
+                                    xoj::util::move_only_function<void(const fs::path&)> writeToFile);
+};
diff --git a/entry/src/main/cpp/src/util/include/util/XojPreviewExtractor.h b/entry/src/main/cpp/src/util/include/util/XojPreviewExtractor.h
new file mode 100644
index 0000000..4b43029
--- /dev/null
+++ b/entry/src/main/cpp/src/util/include/util/XojPreviewExtractor.h
@@ -0,0 +1,80 @@
+/*
+ * Xournal++
+ *
+ * Extracts a preview of an .xoj file, used by xournalpp-thumbnailer and xournalpp
+ * Because of this xournal type checks cannot be used
+ *
+ * @author Xournal++ Team
+ * https://github.com/xournalpp/xournalpp
+ *
+ * @license GNU GPLv2 or later
+ */
+
+#pragma once
+
+#include <glib.h>  // for gsize
+
+#include "filesystem.h"  // for path
+
+enum PreviewExtractResult {
+
+    /**
+     * Successfully read an image from file
+     */
+    PREVIEW_RESULT_IMAGE_READ = 0,
+
+    /**
+     * File extension is wrong
+     */
+    PREVIEW_RESULT_BAD_FILE_EXTENSION,
+
+    /**
+     * The file could not be openend / found
+     */
+    PREVIEW_RESULT_COULD_NOT_OPEN_FILE,
+
+    /**
+     * The preview could not be extracted
+     */
+    PREVIEW_RESULT_ERROR_READING_PREVIEW,
+
+    /**
+     * The file contains no preview
+     */
+    PREVIEW_RESULT_NO_PREVIEW,
+};
+
+class XojPreviewExtractor {
+public:
+    XojPreviewExtractor();
+    ~XojPreviewExtractor();
+
+public:
+    /**
+     * Try to read the preview from file
+     * @param file .xoj File
+     * @return If an image was read, or the error
+     */
+    PreviewExtractResult readFile(const fs::path& file);
+
+    /**
+     * Try to read the preview from byte buffer
+     * @param buffer Buffer
+     * @param len Buffer len
+     * @return If an image was read, or the error
+     */
+    PreviewExtractResult readPreview(char* buffer, int len);
+
+    /**
+     * @return The preview data, should be a binary PNG
+     */
+    unsigned char* getData(gsize& dataLen);
+
+    // Member
+private:
+    /**
+     * Preview data
+     */
+    unsigned char* data = nullptr;
+    gsize dataLen = 0;
+};
diff --git a/entry/src/main/cpp/src/util/include/util/gdk4_helper.h b/entry/src/main/cpp/src/util/include/util/gdk4_helper.h
new file mode 100644
index 0000000..b781142
--- /dev/null
+++ b/entry/src/main/cpp/src/util/include/util/gdk4_helper.h
@@ -0,0 +1,22 @@
+/*
+ * Xournal++
+ *
+ * header for missing gdk4 functions (part of the gtk4 port)
+ * will be removed later
+ *
+ * @author Xournal++ Team
+ * https://github.com/xournalpp/xournalpp
+ *
+ * @license GNU GPLv2 or later
+ */
+
+#pragma once
+
+#include <gdk/gdk.h>
+
+/*** GdkEvent ***/
+GdkModifierType gdk_event_get_modifier_state(GdkEvent* event);
+
+/*** GdkKeyEvent ***/
+GdkModifierType gdk_key_event_get_consumed_modifiers(GdkEvent* event);
+guint gdk_key_event_get_keyval(GdkEvent* event);
diff --git a/entry/src/main/cpp/src/util/include/util/glib_casts.h b/entry/src/main/cpp/src/util/include/util/glib_casts.h
new file mode 100644
index 0000000..a02ee13
--- /dev/null
+++ b/entry/src/main/cpp/src/util/include/util/glib_casts.h
@@ -0,0 +1,153 @@
+/*
+ * Xournal++
+ *
+ * header for casting c++ callbacks into gtk callbacks
+ * will be removed later
+ *
+ * @author Xournal++ Team
+ * https://github.com/xournalpp/xournalpp
+ *
+ * @license GNU GPLv2 or later
+ */
+
+#pragma once
+
+#include <cstdint>
+#include <tuple>
+#include <type_traits>
+
+#include <glib-object.h>
+#include <glib.h>
+
+namespace xoj::util {
+
+namespace detail {
+
+template <typename F>
+struct FunctionTraits;
+
+template <typename R, typename... Args>
+struct FunctionTraits<R (&)(Args...)> {
+    using Reference = R (&)(Args...);
+    using RetType = R;
+    using ArgTypes = std::tuple<Args...>;
+    static constexpr std::size_t ArgCount = sizeof...(Args);
+    template <std::size_t N>
+    using NthArg = std::tuple_element_t<N, ArgTypes>;
+    using FirstArg = NthArg<0>;
+    using LastArg = NthArg<ArgCount - 1>;
+};
+
+template <typename R, typename... Args>
+struct FunctionTraits<R (*)(Args...)> {
+    using Pointer = R (*)(Args...);
+    using RetType = R;
+    using ArgTypes = std::tuple<Args...>;
+    static constexpr std::size_t ArgCount = sizeof...(Args);
+    template <std::size_t N>
+    using NthArg = std::tuple_element_t<N, ArgTypes>;
+    using FirstArg = NthArg<0>;
+    using LastArg = NthArg<ArgCount - 1>;
+};
+
+template <typename F, size_t... Is>
+constexpr auto indices_impl(F f, std::index_sequence<Is...>) {
+    return f(std::integral_constant<size_t, Is>()...);
+}
+
+template <size_t N, typename F>
+constexpr auto indices(F f) {
+    return indices_impl(f, std::make_index_sequence<N>());
+}
+
+template <auto SrcFn, class ST, class... Args>
+constexpr auto callback_once_impl(Args... args, void* data) -> gboolean {
+    SrcFn(args..., static_cast<ST>(data));
+    return G_SOURCE_REMOVE;
+}
+
+template <auto SrcFn, class R, class ST, class... Args>
+constexpr auto wrap_impl(Args... args, void* data) -> std::conditional_t<std::is_same_v<bool, R>, gboolean, R> {
+    if constexpr (std::is_same_v<void, R>) {
+        SrcFn(args..., static_cast<ST>(data));
+        return;
+    } else if constexpr (std::is_same_v<bool, R>) {
+        return SrcFn(args..., static_cast<ST>(data)) ? G_SOURCE_CONTINUE : G_SOURCE_REMOVE;
+    } else {
+        return SrcFn(args..., static_cast<ST>(data));
+    }
+}
+
+}  // namespace detail
+
+/**
+ * wrap a C++ function into a C / glib compatible callback function
+ * for single execution. Usable for API's like g_timeout_add / g_idle_add
+ */
+template <auto SrcFn>
+constexpr auto wrap_for_once() -> auto {
+    using namespace detail;
+    using FTI = FunctionTraits<decltype(SrcFn)>;
+    return indices<FTI::ArgCount - 1>([&](auto... Is) {
+        return callback_once_impl<SrcFn, typename FTI::LastArg, std::tuple_element_t<Is, typename FTI::ArgTypes>...>;
+    });
+}
+
+template <auto SrcFn>
+constexpr inline auto wrap_for_once_v = wrap_for_once<SrcFn>();
+
+/**
+ * Generally wrap a C++ function into a C / glib compatible callback function.
+ * Removes warnings for functionpointer casts due to UB without reinterpreting the functionpointer.
+ * Preserves type checking behavior of the compiler.
+ * Replaces bool return values with gboolean.
+ * statically casts data pointer to the last argument type of the function.
+ * Use this whenever you would cast a functionpointer to any callback function.
+ */
+template <auto SrcFn>
+constexpr auto wrap() -> auto {
+    using namespace detail;
+    using FTI = FunctionTraits<decltype(SrcFn)>;
+    return indices<FTI::ArgCount - 1>([&](auto... Is) {
+        return wrap_impl<SrcFn, typename FTI::RetType, typename FTI::LastArg,
+                         std::tuple_element_t<Is, typename FTI::ArgTypes>...>;
+    });
+}
+
+template <auto SrcFn>
+constexpr inline auto wrap_v = wrap<SrcFn>();
+
+/**
+ * wrap a C++ function into a C / glib compatible callback function, just like wrap,
+ * but reinterpret casts the functionpointer to a GCallback, which can be used for dynamic callback dispatching.
+ * For example all g_signal_connect*, functions.
+ * This wrapper function must be used with caution, as the reinterpret cast removes all type checking capabilities of
+ * the compiler. The signature of the wrapper, must match the signature of the callback function.
+ * Possible improvements: add a template type parameter for the callback function signature, to check the signature of
+ * the target callback.
+ * Use this instead of G_CALLBACK
+ */
+template <auto SrcFn>
+inline auto const wrap_for_g_callback_v = G_CALLBACK(wrap_v<SrcFn>);
+
+
+template <typename T, std::enable_if_t<!std::is_same_v<T, void>, int> = 1>
+constexpr void destroy_cb(gpointer data) {
+    delete static_cast<T*>(data);
+};
+
+template <typename T, std::enable_if_t<!std::is_same_v<T, void>, int> = 1>
+constexpr void closure_notify_cb(gpointer data, GClosure*) {
+    delete static_cast<T*>(data);
+};
+
+#ifndef NDEBUG
+constexpr auto tester1(int*, double*, char*) -> bool { return true; }
+constexpr auto tester2(int*, double*, char*) -> uint64_t { return 1; }
+static_assert(std::is_same_v<decltype(wrap_for_once<tester1>()), gboolean (*)(int*, double*, void*)>);
+static_assert(std::is_same_v<decltype(wrap_for_once<tester2>()), gboolean (*)(int*, double*, void*)>);
+static_assert(std::is_same_v<decltype(wrap<tester1>()), gboolean (*)(int*, double*, void*)>);
+static_assert(std::is_same_v<decltype(wrap<tester2>()), uint64_t (*)(int*, double*, void*)>);
+#endif
+
+}  // namespace xoj::util
diff --git a/entry/src/main/cpp/src/util/include/util/gtk4_helper.h b/entry/src/main/cpp/src/util/include/util/gtk4_helper.h
new file mode 100644
index 0000000..85e7086
--- /dev/null
+++ b/entry/src/main/cpp/src/util/include/util/gtk4_helper.h
@@ -0,0 +1,103 @@
+/*
+ * Xournal++
+ *
+ * header for missing gtk4 functions (part of the gtk4 port)
+ * will be removed later
+ *
+ * @author Xournal++ Team
+ * https://github.com/xournalpp/xournalpp
+ *
+ * @license GNU GPLv2 or later
+ */
+
+#pragma once
+
+#include <gtk/gtk.h>
+
+/**** GtkBox ****/
+
+void gtk_box_append(GtkBox* box, GtkWidget* child);
+void gtk_box_prepend(GtkBox* box, GtkWidget* child);
+void gtk_box_remove(GtkBox* box, GtkWidget* child);
+
+/**** GtkWindow ****/
+
+void gtk_window_destroy(GtkWindow* win);
+
+/**** GtkWidget ****/
+
+void gtk_widget_add_css_class(GtkWidget* widget, const char* css_class);
+void gtk_widget_remove_css_class(GtkWidget* widget, const char* css_class);
+int gtk_widget_get_width(GtkWidget* widget);
+GtkClipboard* gtk_widget_get_clipboard(GtkWidget* widget);
+
+/*** GtkDrawingArea ****/
+
+typedef void (*GtkDrawingAreaDrawFunc)(GtkDrawingArea* drawing_area, cairo_t* cr, int width, int height,
+                                       gpointer user_data);
+/// WARNING: unsetting (via draw_func = nullptr) or replacing the function is not implemented here.
+void gtk_drawing_area_set_draw_func(GtkDrawingArea* area, GtkDrawingAreaDrawFunc draw_func, gpointer user_data,
+                                    GDestroyNotify destroy);
+
+/**** GtkScale ****/
+
+typedef char* (*GtkScaleFormatValueFunc)(GtkScale* scale, double value, gpointer user_data);
+/// WARNING: unsetting (via func = nullptr) or replacing the function is not implemented here.
+void gtk_scale_set_format_value_func(GtkScale* scale, GtkScaleFormatValueFunc func, gpointer user_data,
+                                     GDestroyNotify destroy_notify);
+
+/**** GtkScrolledWindow ****/
+
+GtkWidget* gtk_scrolled_window_new();
+void gtk_scrolled_window_set_child(GtkScrolledWindow* win, GtkWidget* child);
+GtkWidget* gtk_scrolled_window_get_child(GtkScrolledWindow* win);
+
+/**** GtkCheckButton ****/
+
+void gtk_check_button_set_child(GtkCheckButton* button, GtkWidget* child);
+void gtk_check_button_set_label(GtkCheckButton* button, const char* label);
+
+bool gtk_check_button_get_active(GtkCheckButton* bt);
+void gtk_check_button_set_active(GtkCheckButton* bt, bool state);
+
+/**** GtkMenuButton ***/
+void gtk_menu_button_set_label(GtkMenuButton* button, const char* label);
+
+/**** GtkButton ****/
+
+void gtk_button_set_child(GtkButton* button, GtkWidget* child);
+GtkWidget* gtk_button_get_child(GtkButton* button);
+void gtk_button_set_icon_name(GtkButton* button, const char* iconName);
+
+/**** GtkPopover ****/
+
+GtkWidget* gtk_popover_new();
+void gtk_popover_set_child(GtkPopover* popover, GtkWidget* child);
+GtkWidget* gtk_popover_menu_new_from_model(GMenuModel* model);
+
+/**** GtkLabel ****/
+void gtk_label_set_wrap(GtkLabel* label, gboolean wrap);
+void gtk_label_set_wrap_mode(GtkLabel* label, PangoWrapMode wrap_mode);
+
+/**** GtkIMContext ****/
+void gtk_im_context_set_client_widget(GtkIMContext* context, GtkWidget* widget);
+gboolean gtk_im_context_filter_keypress(GtkIMContext* context, GdkEvent* event);
+
+/**** GtkFileChooserDialog ****/
+gboolean gtk_file_chooser_add_shortcut_folder(GtkFileChooser* chooser, GFile* file, GError** error);
+gboolean gtk_file_chooser_set_current_folder(GtkFileChooser* chooser, GFile* file, GError** error);
+
+/**** GtkFixed ****/
+void gtk_fixed_remove(GtkFixed* fixed, GtkWidget* child);
+
+/**** GtkListBox ****/
+void gtk_list_box_append(GtkListBox* box, GtkWidget* widget);
+void gtk_list_box_row_set_child(GtkListBoxRow* row, GtkWidget* w);
+GtkWidget* gtk_list_box_row_get_child(GtkListBoxRow* row);
+
+/**** GtkEventController ****/
+GdkEvent* gtk_event_controller_get_current_event(GtkEventController*);
+
+/**** GtkEditable ****/
+const char* gtk_editable_get_text(GtkEditable* editable);
+void gtk_editable_set_text(GtkEditable* editable, const char* text);
diff --git a/entry/src/main/cpp/src/util/include/util/i18n.h b/entry/src/main/cpp/src/util/include/util/i18n.h
new file mode 100644
index 0000000..d6fe1fb
--- /dev/null
+++ b/entry/src/main/cpp/src/util/include/util/i18n.h
@@ -0,0 +1,46 @@
+/*
+ * Xournal++
+ *
+ * Internationalization module
+ *
+ * @author Xournal++ Team
+ * https://github.com/xournalpp/xournalpp
+ *
+ * @license GNU GPLv2 or later
+ */
+
+#pragma once
+
+#include <libintl.h>
+
+#include "util/PlaceholderString.h"
+
+#undef snprintf
+
+#define _(msg) gettext(msg)
+#define C_(context, msg) g_dpgettext2(nullptr, context, msg)
+
+/// The string is not looked for by xgettext and should be added to the .po files another way (e.g. with N_ below)
+#define fetch_translation(msg) gettext(msg)
+#define fetch_translation_context(context, msg) g_dpgettext2(nullptr, context, msg)
+
+// Formatted Translation
+#define _F(msg) PlaceholderString(_(msg))
+#define C_F(context, msg) PlaceholderString(C_(context, msg))
+
+// Formatted, not translated text
+#define FORMAT_STR(msg) PlaceholderString(msg)
+
+
+// No translation performed, but in the Translation string
+// So translation can be loaded dynamically at other place
+// in the code
+#define N_(msg) (msg)
+#define NC_(context, msg) (msg)
+
+/* Some helper macros */
+
+// PlaceholderString → std::string
+#define FS(format) (format).str()
+// PlaceholderString → const char*
+#define FC(format) FS(format).c_str()
diff --git a/entry/src/main/cpp/src/util/include/util/logger/Logger.h b/entry/src/main/cpp/src/util/include/util/logger/Logger.h
new file mode 100644
index 0000000..f06ddcb
--- /dev/null
+++ b/entry/src/main/cpp/src/util/include/util/logger/Logger.h
@@ -0,0 +1,26 @@
+/*
+ * Xournal++
+ *
+ * Logging class for debugging
+ *
+ * @author Xournal++ Team
+ * https://github.com/xournalpp/xournalpp
+ *
+ * @license GNU GPLv2 or later
+ */
+
+#pragma once
+
+class Log {
+private:
+    Log();
+    virtual ~Log();
+    Log(const Log&);
+    Log& operator=(const Log&);
+
+public:
+    static void initlog();
+    static void closelog();
+
+    static void trace(const char* callType, const char* clazz, const char* function, long obj);
+};
diff --git a/entry/src/main/cpp/src/util/include/util/move_only_function.h b/entry/src/main/cpp/src/util/include/util/move_only_function.h
new file mode 100644
index 0000000..f2215bb
--- /dev/null
+++ b/entry/src/main/cpp/src/util/include/util/move_only_function.h
@@ -0,0 +1,70 @@
+/*
+ * Xournal++
+ *
+ * Rudimentary port of C++23's std::move_only_function
+ *
+ * @author Xournal++ Team
+ * https://github.com/xournalpp/xournalpp
+ *
+ * @license GNU GPLv2 or later
+ */
+#pragma once
+
+#include <functional>
+#include <memory>
+#include <type_traits>
+#include <utility>
+
+namespace xoj::util {
+template <class T>
+class move_only_function final {};
+
+/**
+ * Rudimentary implementation of C++23's std::move_only_function
+ *
+ * Specialization of std::swap and bool operator==(const move_only_function&, std::nullptr_t) are not implemented.
+ * Add them if required.
+ */
+template <class R, class... Args>
+class move_only_function<R(Args...)> final {
+public:
+    move_only_function() = default;
+    move_only_function(move_only_function&& f) = default;
+    move_only_function& operator=(move_only_function&& f) = default;
+    move_only_function(const move_only_function&) = delete;
+    move_only_function& operator=(const move_only_function&) = delete;
+    move_only_function& operator=(std::nullptr_t) {
+        invoke = nullptr;
+        callable.reset();
+        return *this;
+    }
+
+    operator bool() const { return static_cast<bool>(invoke) && static_cast<bool>(callable); }
+
+    R operator()(Args... args) const {
+        if (!invoke || !callable) {
+            throw std::bad_function_call();
+        }
+        return invoke(callable.get(), std::forward<Args>(args)...);
+    }
+
+private:
+    template <class F, class... FArgs>
+    void bind(FArgs&&... fargs) {
+        invoke = +[](void* p, Args... args) -> R { return (*static_cast<F*>(p))(std::forward<Args>(args)...); };
+        callable = {new F(std::forward<FArgs>(fargs)...), [](void* pf) { delete static_cast<F*>(pf); }};
+    };
+
+public:
+    template <class F, std::enable_if_t<!std::is_same_v<std::decay_t<F>, move_only_function>, bool> = true,
+              std::enable_if_t<std::is_same_v<R, void> || std::is_convertible_v<std::invoke_result_t<F, Args...>, R>,
+                               bool> = true>
+    move_only_function(F&& f) {
+        bind<std::decay_t<F>>(std::forward<F>(f));
+    }
+
+private:
+    std::unique_ptr<void, void (*)(void*)> callable{nullptr, +[](void*) {}};
+    void (*invoke)(void*, Args...) = nullptr;
+};
+}  // namespace xoj::util
diff --git a/entry/src/main/cpp/src/util/include/util/raii/CLibrariesSPtr.h b/entry/src/main/cpp/src/util/include/util/raii/CLibrariesSPtr.h
new file mode 100644
index 0000000..e8f58cc
--- /dev/null
+++ b/entry/src/main/cpp/src/util/include/util/raii/CLibrariesSPtr.h
@@ -0,0 +1,115 @@
+/*
+ * Xournal++
+ *
+ * RAII smart pointers for C library classes
+ *
+ * @author Xournal++ Team
+ * https://github.com/xournalpp/xournalpp
+ *
+ * @license GNU GPLv2 or later
+ */
+
+#pragma once
+
+#include <utility>
+
+namespace xoj::util {
+/**
+ * @brief Placeholder type for C-lib smart pointer wrappers' contructors and reset methods: adopt the element
+ */
+constexpr static struct Adopt {
+} adopt = Adopt();
+
+/**
+ * @brief Placeholder type for C-lib smart pointer wrappers' contructors and reset methods: add a ref to the element
+ */
+constexpr static struct Ref {
+} ref = Ref();
+
+/**
+ * @brief Placeholder type for C-lib smart pointer wrappers' contructors and reset methods: ref_sink the element
+ */
+constexpr static struct RefSink {
+} refsink = RefSink();
+
+/**
+ * @brief Simple template class for RAII smart pointer (aimed at Cairo/GTK/Poppler ref-counting classes)
+ * @param T The wrapper will store a pointer of type T
+ * @param H Handler class containing at least
+ *              static T* ref(T*):
+ *              static void unref(T*);
+ *              static T* adopt(T*);  // What to do to a pointer when we adopt an instance (typically the identity)
+ *          and optionally (for floating refs)
+ *              static T* ref_sink(T*);
+ */
+template <typename T, class H>
+class CLibrariesSPtr {
+public:
+    CLibrariesSPtr() = default;
+    CLibrariesSPtr(std::nullptr_t) {}
+
+    using handler_type = H;
+
+private:
+    static auto safeAdopt(T* ptr) -> T* { return ptr ? H::adopt(ptr) : nullptr; }
+    static auto safeRef(T* ptr) -> T* { return ptr ? H::ref(ptr) : nullptr; }
+    static auto safeUnref(T* ptr) -> void {
+        if (ptr) {
+            H::unref(ptr);
+        }
+    }
+    static auto safeRefSink(T* ptr) -> T* { return ptr ? H::ref_sink(ptr) : nullptr; }
+    static auto safeReset(T*& ptr, T* val) -> void { safeUnref(std::exchange(ptr, val)); }
+
+public:
+    ~CLibrariesSPtr() { safeUnref(p); }
+
+    CLibrariesSPtr(const CLibrariesSPtr& other) { p = safeRef(other.p); }
+    CLibrariesSPtr(CLibrariesSPtr&& other) { p = std::exchange(other.p, nullptr); }
+
+    CLibrariesSPtr& operator=(const CLibrariesSPtr& other) {
+        if (this != &other) {
+            safeReset(p, safeRef(other.p));
+        }
+        return *this;
+    }
+    CLibrariesSPtr& operator=(CLibrariesSPtr&& other) {
+        if (this != &other) {
+            safeReset(p, std::exchange(other.p, nullptr));
+        }
+        return *this;
+    }
+
+    bool operator==(std::nullptr_t) { return p == nullptr; }
+    bool operator!=(std::nullptr_t) { return p != nullptr; }
+
+    explicit CLibrariesSPtr(T* p, Adopt): p(safeAdopt(p)) {}
+    explicit CLibrariesSPtr(T* p, Ref): p(safeRef(p)) {}
+    explicit CLibrariesSPtr(T* p, RefSink): p(safeRefSink(p)) {}
+
+    void reset() { safeReset(p, nullptr); }
+    void reset(T* other, Adopt) { safeReset(p, safeAdopt(other)); }
+    void reset(T* other, Ref) { safeReset(p, safeRef(other)); }
+    void reset(T* other, RefSink) { safeReset(p, safeRefSink(other)); }
+
+    operator bool() const { return p != nullptr; }
+
+    T* get() const { return p; }
+
+    T* release() { return std::exchange(p, nullptr); }
+
+    T* operator->() const { return p; }
+
+    void swap(CLibrariesSPtr& other) { std::swap(p, other.p); }
+
+private:
+    T* p = nullptr;
+};
+};  // namespace xoj::util
+
+namespace std {
+template <typename T, class H>
+void swap(xoj::util::CLibrariesSPtr<T, H>& first, xoj::util::CLibrariesSPtr<T, H>& second) {
+    first.swap(second);
+}
+};  // namespace std
diff --git a/entry/src/main/cpp/src/util/include/util/raii/CStringWrapper.h b/entry/src/main/cpp/src/util/include/util/raii/CStringWrapper.h
new file mode 100644
index 0000000..dfdf6a7
--- /dev/null
+++ b/entry/src/main/cpp/src/util/include/util/raii/CStringWrapper.h
@@ -0,0 +1,58 @@
+/*
+ * Xournal++
+ *
+ * C-type strings wrapper, taking ownership of the data.
+ *
+ * @author Xournal++ Team
+ * https://github.com/xournalpp/xournalpp
+ *
+ * @license GNU GPLv2 or later
+ */
+
+#pragma once
+
+#include <cstddef>  // for size_t
+#include <string_view>
+
+namespace xoj::util {
+inline namespace raii {
+class OwnedCString final {
+public:
+    OwnedCString() = default;
+    OwnedCString(const OwnedCString&) = delete;
+    OwnedCString(OwnedCString&& s);
+    OwnedCString& operator=(const OwnedCString&) = delete;
+    OwnedCString& operator=(OwnedCString&& s);
+    ~OwnedCString();
+
+    /**
+     * @brief Assume ownership
+     */
+    static OwnedCString assumeOwnership(char* s);
+
+    const char* get() const;
+    operator bool() const;
+    explicit operator std::string_view() const;
+
+    /*
+     * Why is this class implicitly convertible to const char& without this line?
+     * In any case: this is dangerous, as it makes
+     *   CString bar = "blob";
+     *   std::string foo = bar;
+     * compile without having the expected behaviour
+     */
+    operator const char&() const = delete;
+
+    const char& operator[](size_t n) const;
+
+    /**
+     * @brief Safely delete the content and return a pointer to the private data pointer
+     *      Use to set the data with some C-libraries functions taking a char** as argument
+     */
+    char** contentReplacer();
+
+private:
+    char* data = nullptr;
+};
+};  // namespace raii
+};  // namespace xoj::util
diff --git a/entry/src/main/cpp/src/util/include/util/raii/CairoWrappers.h b/entry/src/main/cpp/src/util/include/util/raii/CairoWrappers.h
new file mode 100644
index 0000000..a03393b
--- /dev/null
+++ b/entry/src/main/cpp/src/util/include/util/raii/CairoWrappers.h
@@ -0,0 +1,70 @@
+/*
+ * Xournal++
+ *
+ * RAII wrappers for C library classes
+ *
+ * @author Xournal++ Team
+ * https://github.com/xournalpp/xournalpp
+ *
+ * @license GNU GPLv2 or later
+ */
+
+#pragma once
+
+#include <utility>
+
+#include <cairo.h>
+
+#include "CLibrariesSPtr.h"
+#include "IdentityFunction.h"
+
+namespace xoj::util {
+
+inline namespace raii {
+namespace specialization {
+class CairoHandler {
+public:
+    constexpr static auto ref = [](cairo_t* cr) { return cairo_reference(cr); };
+    constexpr static auto unref = [](cairo_t* cr) { cairo_destroy(cr); };
+    constexpr static auto adopt = identity<cairo_t>;
+};
+
+class CairoSurfaceHandler {
+public:
+    constexpr static auto ref = [](cairo_surface_t* cs) { return cairo_surface_reference(cs); };
+    constexpr static auto unref = [](cairo_surface_t* cs) { cairo_surface_destroy(cs); };
+    constexpr static auto adopt = identity<cairo_surface_t>;
+};
+
+class CairoRegionHandler {
+public:
+    constexpr static auto ref = [](cairo_region_t* cr) { return cairo_region_reference(cr); };
+    constexpr static auto unref = [](cairo_region_t* cr) { cairo_region_destroy(cr); };
+    constexpr static auto adopt = identity<cairo_region_t>;
+};
+};  // namespace specialization
+
+using CairoSPtr = CLibrariesSPtr<cairo_t, raii::specialization::CairoHandler>;
+using CairoSurfaceSPtr = CLibrariesSPtr<cairo_surface_t, raii::specialization::CairoSurfaceHandler>;
+using CairoRegionSPtr = CLibrariesSPtr<cairo_region_t, raii::specialization::CairoRegionHandler>;
+
+/**
+ * @brief cairo_save(cr)/cairo_restore(cr) RAII implementation
+ */
+class CairoSaveGuard {
+public:
+    CairoSaveGuard() = delete;
+    [[nodiscard]] CairoSaveGuard(cairo_t* cr): cr(cr) { cairo_save(cr); }
+    ~CairoSaveGuard() { cairo_restore(cr); }
+
+    CairoSaveGuard(const CairoSaveGuard&) = delete;
+    CairoSaveGuard(CairoSaveGuard&&) = delete;
+    CairoSaveGuard& operator=(const CairoSaveGuard&) = delete;
+    CairoSaveGuard& operator=(CairoSaveGuard&&) = delete;
+
+private:
+    cairo_t* cr;
+};
+
+};  // namespace raii
+};  // namespace xoj::util
diff --git a/entry/src/main/cpp/src/util/include/util/raii/GLibGuards.h b/entry/src/main/cpp/src/util/include/util/raii/GLibGuards.h
new file mode 100644
index 0000000..a9c80b6
--- /dev/null
+++ b/entry/src/main/cpp/src/util/include/util/raii/GLibGuards.h
@@ -0,0 +1,62 @@
+/*
+ * Xournal++
+ *
+ * Basic memory RAII Guards for GLib objects
+ *
+ * @author Xournal++ Team
+ * https://github.com/xournalpp/xournalpp
+ *
+ * @license GNU GPLv2 or later
+ */
+
+#pragma once
+
+#include <memory>
+#include <type_traits>
+
+#include <gtk/gtk.h>
+namespace xoj::util {
+inline namespace raii {
+
+#define XOJ_GIO_GUARD_GENERATOR(class_name, type, deletion_func) \
+    namespace detail {                                           \
+    struct class_name##GuardDelete {                             \
+        auto operator()(type* ptr) const -> void {               \
+            if (ptr) {                                           \
+                deletion_func(ptr);                              \
+                ptr = nullptr;                                   \
+            }                                                    \
+        }                                                        \
+    };                                                           \
+    } /* namespace detail */                                     \
+    using class_name##Guard = std::unique_ptr<type, detail::class_name##GuardDelete>
+
+#define XOJ_GIO_GUARD_GENERATOR_TYPE(type, deletion_func) XOJ_GIO_GUARD_GENERATOR(type, type, deletion_func)
+
+XOJ_GIO_GUARD_GENERATOR(GStrv, gchar*, g_strfreev);
+XOJ_GIO_GUARD_GENERATOR_TYPE(GError, g_error_free);
+
+template <typename Smart, typename Pointer /* , typename ... Tuple */>
+struct out_ptr_t {
+    out_ptr_t(Smart& smart /* , Tuple tuple */): smart(smart) /* , tuple(tuple) */ {}
+    ~out_ptr_t() noexcept { smart.reset(ptr /*,  Todo: unpack tuble with indices trick if required*/); }
+    out_ptr_t(out_ptr_t const&) = delete;
+    auto operator=(out_ptr_t const&) -> out_ptr_t& = delete;
+
+    operator Pointer*() noexcept { return &ptr; }
+
+private:
+    Smart& smart;
+    Pointer ptr{};
+    // Tuple tuple;
+};
+
+
+template <typename Smart, typename... A>
+auto out_ptr(Smart& s /*, A&&... a */) noexcept -> out_ptr_t<Smart, typename Smart::pointer /* , std::tuple<A...> */> {
+    return out_ptr_t<Smart, typename Smart::pointer /* , std::tuple<A...> */>  //
+            (s /* , std::tuple<A...>(std::forward<A>(a)...) */);
+}
+
+}  // namespace raii
+}  // namespace xoj::util
\ No newline at end of file
diff --git a/entry/src/main/cpp/src/util/include/util/raii/GObjectSPtr.h b/entry/src/main/cpp/src/util/include/util/raii/GObjectSPtr.h
new file mode 100644
index 0000000..ef0d023
--- /dev/null
+++ b/entry/src/main/cpp/src/util/include/util/raii/GObjectSPtr.h
@@ -0,0 +1,48 @@
+/*
+ * Xournal++
+ *
+ * RAII wrappers for C library classes
+ *
+ * @author Xournal++ Team
+ * https://github.com/xournalpp/xournalpp
+ *
+ * @license GNU GPLv2 or later
+ */
+
+#pragma once
+
+#include <utility>
+
+#include <glib-object.h>
+#include <gtk/gtk.h>
+
+#include "CLibrariesSPtr.h"
+
+namespace xoj::util {
+
+inline namespace raii {
+namespace specialization {
+
+template <class object_type>
+class GObjectHandler {
+public:
+    static object_type* ref(object_type* p) { return static_cast<object_type*>(g_object_ref(p)); }
+    constexpr static auto unref = [](object_type* p) { g_object_unref(p); };
+    static object_type* ref_sink(object_type* p) { return static_cast<object_type*>(g_object_ref_sink(p)); }
+    static object_type* adopt(object_type* p) {
+#if (GLIB_MAJOR_VERSION > 2 || (GLIB_MAJOR_VERSION == 2 && GLIB_MINOR_VERSION >= 70))
+        return static_cast<object_type*>(g_object_take_ref(p));
+#else
+        return g_object_is_floating(p) ? static_cast<object_type*>(g_object_ref_sink(p)) : p;
+#endif
+    }
+};
+};  // namespace specialization
+
+template <typename GlibClass>
+using GObjectSPtr = CLibrariesSPtr<GlibClass, raii::specialization::GObjectHandler<GlibClass>>;
+
+using WidgetSPtr = GObjectSPtr<GtkWidget>;
+
+};  // namespace raii
+};  // namespace xoj::util
diff --git a/entry/src/main/cpp/src/util/include/util/raii/GSourceURef.h b/entry/src/main/cpp/src/util/include/util/raii/GSourceURef.h
new file mode 100644
index 0000000..5856704
--- /dev/null
+++ b/entry/src/main/cpp/src/util/include/util/raii/GSourceURef.h
@@ -0,0 +1,45 @@
+/*
+ * Xournal++
+ *
+ * RAII wrapper for g_source
+ *
+ * @author Xournal++ Team
+ * https://github.com/xournalpp/xournalpp
+ *
+ * @license GNU GPLv2 or later
+ */
+#pragma once
+
+#include <glib-2.0/glib.h>
+
+namespace xoj::util {
+struct GSourceURef {
+    GSourceURef(unsigned int id = 0): id(id) {}
+    GSourceURef(const GSourceURef&) = delete;
+    GSourceURef(GSourceURef&&) = delete;  // Implement if needed
+    GSourceURef& operator=(const GSourceURef&) = delete;
+    GSourceURef& operator=(GSourceURef&&) = delete;  // Implement if needed
+    GSourceURef& operator=(unsigned int newId) {
+        if (id) {
+            g_source_remove(id);
+        }
+        id = newId;
+        return *this;
+    }
+    ~GSourceURef() {
+        if (id) {
+            g_source_remove(id);
+        }
+    }
+
+    operator bool() const { return id != 0; }
+
+    /// When the GSource is run
+    void consume() { id = 0; }
+    /// To cancel the callback
+    void cancel() { *this = 0; }
+
+private:
+    unsigned int id = 0;  // handler id
+};
+};  // namespace xoj::util
diff --git a/entry/src/main/cpp/src/util/include/util/raii/GVariantSPtr.h b/entry/src/main/cpp/src/util/include/util/raii/GVariantSPtr.h
new file mode 100644
index 0000000..debf140
--- /dev/null
+++ b/entry/src/main/cpp/src/util/include/util/raii/GVariantSPtr.h
@@ -0,0 +1,44 @@
+/*
+ * Xournal++
+ *
+ * RAII wrappers for C library classes
+ *
+ * @author Xournal++ Team
+ * https://github.com/xournalpp/xournalpp
+ *
+ * @license GNU GPLv2 or later
+ */
+
+#pragma once
+
+#include <utility>
+
+#include <glib-object.h>
+
+#include "util/GVariantTemplate.h"
+
+#include "CLibrariesSPtr.h"
+
+namespace xoj::util {
+
+inline namespace raii {
+namespace specialization {
+
+class GVariantHandler {
+public:
+    constexpr static auto ref = [](GVariant* v) { return g_variant_ref(v); };
+    constexpr static auto unref = [](GVariant* v) { g_variant_unref(v); };
+    constexpr static auto ref_sink = [](GVariant* v) { return g_variant_ref_sink(v); };
+    constexpr static auto adopt = [](GVariant* v) { return g_variant_take_ref(v); };
+};
+};  // namespace specialization
+
+using GVariantSPtr = CLibrariesSPtr<GVariant, raii::specialization::GVariantHandler>;
+
+template <typename T>
+GVariantSPtr makeGVariantSPtr(T t) {
+    return GVariantSPtr(makeGVariant(t), adopt);
+}
+
+};  // namespace raii
+};  // namespace xoj::util
diff --git a/entry/src/main/cpp/src/util/include/util/raii/GtkPaperSizeUPtr.h b/entry/src/main/cpp/src/util/include/util/raii/GtkPaperSizeUPtr.h
new file mode 100644
index 0000000..bf8a911
--- /dev/null
+++ b/entry/src/main/cpp/src/util/include/util/raii/GtkPaperSizeUPtr.h
@@ -0,0 +1,34 @@
+/*
+ * Xournal++
+ *
+ * RAII wrappers for C library classes
+ *
+ * @author Xournal++ Team
+ * https://github.com/xournalpp/xournalpp
+ *
+ * @license GNU GPLv2 or later
+ */
+
+#pragma once
+
+#include <memory>
+
+#include <gtk/gtk.h>
+
+namespace xoj::util {
+
+inline namespace raii {
+namespace specialization {
+struct GtkPaperSizeDeleter {
+    void operator()(GtkPaperSize* ps) {
+        if (ps) {
+            gtk_paper_size_free(ps);
+        }
+    }
+};
+};  // namespace specialization
+using GtkPaperSizeUPtr = std::unique_ptr<GtkPaperSize, specialization::GtkPaperSizeDeleter>;
+
+
+};  // namespace raii
+};  // namespace xoj::util
\ No newline at end of file
diff --git a/entry/src/main/cpp/src/util/include/util/raii/GtkWindowUPtr.h b/entry/src/main/cpp/src/util/include/util/raii/GtkWindowUPtr.h
new file mode 100644
index 0000000..d754f50
--- /dev/null
+++ b/entry/src/main/cpp/src/util/include/util/raii/GtkWindowUPtr.h
@@ -0,0 +1,36 @@
+/*
+ * Xournal++
+ *
+ * RAII wrappers for C library classes
+ *
+ * @author Xournal++ Team
+ * https://github.com/xournalpp/xournalpp
+ *
+ * @license GNU GPLv2 or later
+ */
+
+#pragma once
+
+#include <memory>
+
+#include <gtk/gtk.h>
+
+#include "util/gtk4_helper.h"
+
+namespace xoj::util {
+
+inline namespace raii {
+namespace specialization {
+struct GtkWindowDeleter {
+    void operator()(GtkWindow* w) {
+        if (w) {
+            gtk_window_destroy(w);
+        }
+    }
+};
+};  // namespace specialization
+using GtkWindowUPtr = std::unique_ptr<GtkWindow, specialization::GtkWindowDeleter>;
+
+
+};  // namespace raii
+};  // namespace xoj::util
diff --git a/entry/src/main/cpp/src/util/include/util/raii/IdentityFunction.h b/entry/src/main/cpp/src/util/include/util/raii/IdentityFunction.h
new file mode 100644
index 0000000..4697a11
--- /dev/null
+++ b/entry/src/main/cpp/src/util/include/util/raii/IdentityFunction.h
@@ -0,0 +1,22 @@
+/*
+ * Xournal++
+ *
+ * Identity function
+ *
+ * @author Xournal++ Team
+ * https://github.com/xournalpp/xournalpp
+ *
+ * @license GNU GPLv2 or later
+ */
+
+#pragma once
+
+namespace xoj::util {
+
+inline namespace raii {
+namespace specialization {
+template <typename T>  // Todo(cpp20): use std:identity() and remove this header
+constexpr auto identity = [](T* p) { return p; };
+};
+};  // namespace raii
+};  // namespace xoj::util
diff --git a/entry/src/main/cpp/src/util/include/util/raii/PangoSPtr.h b/entry/src/main/cpp/src/util/include/util/raii/PangoSPtr.h
new file mode 100644
index 0000000..5123bd2
--- /dev/null
+++ b/entry/src/main/cpp/src/util/include/util/raii/PangoSPtr.h
@@ -0,0 +1,33 @@
+/*
+ * Xournal++
+ *
+ * RAII wrappers for C library classes
+ *
+ * @author Xournal++ Team
+ * https://github.com/xournalpp/xournalpp
+ *
+ * @license GNU GPLv2 or later
+ */
+
+#pragma once
+
+#include <pango/pango-attributes.h>  // for PangoAttrList, pango_attr_list_ref, pango_attr_list_unref
+
+#include "CLibrariesSPtr.h"
+#include "IdentityFunction.h"
+
+namespace xoj::util {
+inline namespace raii {
+
+namespace specialization {
+class PangoAttrListHandler {
+public:
+    constexpr static auto ref = pango_attr_list_ref;
+    constexpr static auto unref = pango_attr_list_unref;
+    constexpr static auto adopt = identity<PangoAttrList>;
+};
+};  // namespace specialization
+
+using PangoAttrListSPtr = CLibrariesSPtr<PangoAttrList, raii::specialization::PangoAttrListHandler>;
+};  // namespace raii
+};  // namespace xoj::util
diff --git a/entry/src/main/cpp/src/util/include/util/safe_casts.h b/entry/src/main/cpp/src/util/include/util/safe_casts.h
new file mode 100644
index 0000000..fa447dd
--- /dev/null
+++ b/entry/src/main/cpp/src/util/include/util/safe_casts.h
@@ -0,0 +1,150 @@
+/*
+ * This file is provided by Fabian Keßler <fabian_kessler@gmx.de> under the
+ * Boost Software License - Version 1.0 - August 17th, 2003 to the Xournal++
+ * project.
+ *
+ * Boost Software License - Version 1.0 - August 17th, 2003
+ *
+ * Permission is hereby granted, free of charge, to any person or organization
+ * obtaining a copy of the software and accompanying documentation covered by
+ * this license (the "Software") to use, reproduce, display, distribute,
+ * execute, and transmit the Software, and to prepare derivative works of the
+ * Software, and to permit third-parties to whom the Software is furnished to
+ * do so, all subject to the following:
+ *
+ * The copyright notices in the Software and this entire statement, including
+ * the above license grant, this restriction and the following disclaimer,
+ * must be included in all copies of the Software, in whole or in part, and
+ * all derivative works of the Software, unless such copies or derivative
+ * works are solely in the form of machine-executable object code generated by
+ * a source language processor.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
+ * SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
+ * FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
+ * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+ * DEALINGS IN THE SOFTWARE.
+ */
+
+#pragma once
+
+#include <cmath>
+#include <type_traits>
+#include <utility>
+
+#include "util/Assert.h"
+
+template <typename To, typename From>
+[[maybe_unused]] [[nodiscard]] constexpr auto is_safely_castable(From from) -> bool {
+    using Big = decltype(from * std::declval<To>());
+    auto to = static_cast<To>(from);
+    return Big(to) == Big(from) && ((to < 0 && from < 0) || (to >= 0 && from >= 0));
+}
+
+template <typename To, typename From>
+[[maybe_unused]] [[nodiscard]] constexpr auto strict_cast(From from) -> To {
+    xoj_assert(is_safely_castable<To>(from));
+    return static_cast<To>(from);
+}
+
+template <typename Integral>
+[[maybe_unused]] [[nodiscard]] constexpr auto as_signed(Integral i)
+        -> std::make_signed_t<std::remove_cv_t<std::remove_reference_t<Integral>>> {
+    return static_cast<std::make_signed_t<std::remove_cv_t<std::remove_reference_t<Integral>>>>(i);
+}
+
+template <typename Integral>
+[[maybe_unused]] [[nodiscard]] constexpr auto as_unsigned(Integral i)
+        -> std::make_unsigned_t<std::remove_cv_t<std::remove_reference_t<Integral>>> {
+    return static_cast<std::make_unsigned_t<std::remove_cv_t<std::remove_reference_t<Integral>>>>(i);
+}
+
+template <typename Integral>
+[[maybe_unused]] [[nodiscard]] constexpr auto as_signed_strict(Integral i)
+        -> std::make_signed_t<std::remove_cv_t<std::remove_reference_t<Integral>>> {
+    auto rv = static_cast<std::make_signed_t<std::remove_cv_t<std::remove_reference_t<Integral>>>>(i);
+    xoj_assert((i < 0 && rv < 0) || (i >= 0 && rv >= 0));
+    return rv;
+}
+
+template <typename Integral>
+[[maybe_unused]] [[nodiscard]] constexpr auto as_unsigned_strict(Integral i)
+        -> std::make_unsigned_t<std::remove_cv_t<std::remove_reference_t<Integral>>> {
+    xoj_assert(i > 0);
+    return static_cast<std::make_unsigned_t<std::remove_cv_t<std::remove_reference_t<Integral>>>>(i);
+}
+
+template <typename Integral, typename Float>
+inline auto round_cast(Float f) -> Integral {
+    auto rv0 = std::lround(f);
+    auto rv1 = static_cast<Integral>(rv0);
+    xoj_assert(rv0 == rv1);
+    return rv1;
+}
+
+template <typename Integral, typename Float>
+inline auto ceil_cast(Float f) -> Integral {
+    auto rv0 = std::ceil(f);
+    auto rv1 = Integral(rv0);
+    xoj_assert(rv0 == static_cast<Float>(rv1));
+    return rv1;
+}
+
+template <typename Integral, typename Float>
+inline auto floor_cast(Float f) -> Integral {
+    auto rv0 = std::floor(f);
+    auto rv1 = Integral(rv0);
+    xoj_assert(rv0 == static_cast<Float>(rv1));
+    return rv1;
+}
+
+namespace xoj {
+template <class Enum>
+constexpr std::underlying_type_t<Enum> to_underlying(Enum e) noexcept {
+    return static_cast<std::underlying_type_t<Enum>>(e);
+}
+}  // namespace xoj
+
+#if defined __has_include && !defined(XOJ_USE_STD_BIT_CAST)
+#if __has_include(<bit>)
+#include <bit>
+#if defined(__cpp_lib_bit_cast) && __cpp_lib_bit_cast >= 201806L
+#define XOJ_USE_STD_BIT_CAST 1
+#endif
+#endif
+#endif
+
+#if defined(XOJ_USE_STD_BIT_CAST) && XOJ_USE_STD_BIT_CAST == 1
+namespace xoj::util {
+using std::bit_cast;
+}  // namespace xoj::util
+#else
+#include <cstring>
+
+namespace xoj::util {
+/**
+ * A backport from C++20 of std::bit_cast()
+ */
+template <class To, class From>
+inline std::enable_if_t<
+        sizeof(To) == sizeof(From) && std::is_trivially_copyable_v<From> && std::is_trivially_copyable_v<To>, To>
+        // constexpr support needs compiler magic
+        bit_cast(const From& src) noexcept {
+    static_assert(std::is_trivially_constructible_v<To>,
+                  "backport of bit_cast requires destination type to be trivially constructible");
+    To dst;
+    std::memcpy(&dst, &src, sizeof(To));
+    return dst;
+}
+}  // namespace xoj::util
+#endif
+
+// static_assert(is_safely_castable<int>(std::numeric_limits<size_t>::max()) == false);
+// static_assert(is_safely_castable<int>(std::numeric_limits<int64_t>::min()) == false);
+// static_assert(is_safely_castable<int>(std::numeric_limits<double>::min()) == false);
+// static_assert(is_safely_castable<int>(std::numeric_limits<float>::min()) == false);
+// static_assert(is_safely_castable<int>(size_t(std::numeric_limits<int>::max())));
+// static_assert(is_safely_castable<int>(int64_t(std::numeric_limits<int>::min())));
+// static_assert(is_safely_castable<int>(double(std::numeric_limits<int>::min())));
diff --git a/entry/src/main/cpp/src/util/include/util/serdesstream.h b/entry/src/main/cpp/src/util/include/util/serdesstream.h
new file mode 100644
index 0000000..b58f832
--- /dev/null
+++ b/entry/src/main/cpp/src/util/include/util/serdesstream.h
@@ -0,0 +1,15 @@
+#pragma once
+
+#include <locale>
+#include <utility>
+
+/**
+ * @brief Serdes always requires the same locale. Independently of the local / C++ global locale.
+ */
+
+template <typename StdStream, typename... Args>
+StdStream serdes_stream(Args&&... args) {
+    StdStream ret(std::forward<Args>(args)...);
+    ret.imbue(std::locale::classic());
+    return ret;
+}
\ No newline at end of file
diff --git a/entry/src/main/cpp/src/util/include/util/serializing/BinObjectEncoding.h b/entry/src/main/cpp/src/util/include/util/serializing/BinObjectEncoding.h
new file mode 100644
index 0000000..a3fe49d
--- /dev/null
+++ b/entry/src/main/cpp/src/util/include/util/serializing/BinObjectEncoding.h
@@ -0,0 +1,25 @@
+/*
+ * Xournal++
+ *
+ * Binary encoded serialized stream
+ *
+ * @author Xournal++ Team
+ * https://github.com/xournalpp/xournalpp
+ *
+ * @license GNU GPLv2 or later
+ */
+
+#pragma once
+
+#include "ObjectEncoding.h"
+
+class BinObjectEncoding: public ObjectEncoding {
+public:
+    BinObjectEncoding();
+    ~BinObjectEncoding() override;
+
+public:
+    void addData(const void* data, size_t len) override;
+
+private:
+};
diff --git a/entry/src/main/cpp/src/util/include/util/serializing/HexObjectEncoding.h b/entry/src/main/cpp/src/util/include/util/serializing/HexObjectEncoding.h
new file mode 100644
index 0000000..fbfe029
--- /dev/null
+++ b/entry/src/main/cpp/src/util/include/util/serializing/HexObjectEncoding.h
@@ -0,0 +1,25 @@
+/*
+ * Xournal++
+ *
+ * Hex encoded serialized stream
+ *
+ * @author Xournal++ Team
+ * https://github.com/xournalpp/xournalpp
+ *
+ * @license GNU GPLv2 or later
+ */
+
+#pragma once
+
+#include "ObjectEncoding.h"
+
+class HexObjectEncoding: public ObjectEncoding {
+public:
+    HexObjectEncoding();
+    ~HexObjectEncoding() override;
+
+public:
+    void addData(const void* data, size_t len) override;
+
+private:
+};
diff --git a/entry/src/main/cpp/src/util/include/util/serializing/InputStreamException.h b/entry/src/main/cpp/src/util/include/util/serializing/InputStreamException.h
new file mode 100644
index 0000000..6949c12
--- /dev/null
+++ b/entry/src/main/cpp/src/util/include/util/serializing/InputStreamException.h
@@ -0,0 +1,28 @@
+/*
+ * Xournal++
+ *
+ * Input stream exception
+ *
+ * @author Xournal++ Team
+ * https://github.com/xournalpp/xournalpp
+ *
+ * @license GNU GPLv2 or later
+ */
+
+#pragma once
+
+#include <exception>  // for exception
+#include <string>     // for string
+
+
+class InputStreamException: public std::exception {
+public:
+    InputStreamException(const std::string& message, const std::string& filename, int line);
+    ~InputStreamException() override;
+
+public:
+    const char* what() const noexcept override;
+
+private:
+    std::string message;
+};
diff --git a/entry/src/main/cpp/src/util/include/util/serializing/ObjectEncoding.h b/entry/src/main/cpp/src/util/include/util/serializing/ObjectEncoding.h
new file mode 100644
index 0000000..4840f79
--- /dev/null
+++ b/entry/src/main/cpp/src/util/include/util/serializing/ObjectEncoding.h
@@ -0,0 +1,31 @@
+/*
+ * Xournal++
+ *
+ * Encoding for serialized streams
+ *
+ * @author Xournal++ Team
+ * https://github.com/xournalpp/xournalpp
+ *
+ * @license GNU GPLv2 or later
+ */
+
+#pragma once
+
+#include <glib.h>  // for GString
+
+
+class ObjectEncoding {
+public:
+    ObjectEncoding();
+    virtual ~ObjectEncoding();
+
+public:
+    void addStr(const char* str) const;
+    virtual void addData(const void* data, size_t len) = 0;
+
+    /// The caller takes ownership of the returned data
+    GString* stealData();
+
+public:
+    GString* data;
+};
diff --git a/entry/src/main/cpp/src/util/include/util/serializing/ObjectInputStream.h b/entry/src/main/cpp/src/util/include/util/serializing/ObjectInputStream.h
new file mode 100644
index 0000000..f12455c
--- /dev/null
+++ b/entry/src/main/cpp/src/util/include/util/serializing/ObjectInputStream.h
@@ -0,0 +1,90 @@
+/*
+ * Xournal++
+ *
+ * Serialized input stream
+ *
+ * @author Xournal++ Team
+ * https://github.com/xournalpp/xournalpp
+ *
+ * @license GNU GPLv2 or later
+ */
+
+#pragma once
+
+#include <cstddef>  // for size_t
+#include <cstdint>  // for uint32_t
+#include <sstream>  // for istringstream
+#include <string>   // for string
+#include <vector>   // for vector
+
+#include "util/safe_casts.h"  // for as_signed
+
+#include "InputStreamException.h"
+
+class ObjectInputStream {
+public:
+    ObjectInputStream() = default;
+    virtual ~ObjectInputStream() = default;
+
+public:
+    bool read(const char* data, size_t len);
+    /// @param length of the stream
+    bool read(std::stringstream istream, size_t length);
+
+    void readObject(const char* name);
+    std::string readObject();
+    std::string getNextObjectName();
+    void endObject();
+
+    int readInt();
+    uint32_t readUInt();
+    double readDouble();
+    size_t readSizeT();
+    std::string readString();
+
+    template <typename T>
+    void readData(std::vector<T>& data);
+
+    /// Reads raw image data from the stream.
+    std::string readImage();
+
+private:
+    void checkType(char type);
+
+    static std::string getType(char type);
+
+    template <class T>
+    T readType();
+
+private:
+    std::stringstream istream;
+    size_t pos();
+    size_t len = 0;
+};
+
+extern template size_t ObjectInputStream::readType<size_t>();
+
+template <typename T>
+void ObjectInputStream::readData(std::vector<T>& data) {
+    checkType('b');
+
+    if (istream.str().size() < 2 * sizeof(size_t)) {
+        throw InputStreamException("End reached, but try to read data len and width", __FILE__, __LINE__);
+    }
+
+    size_t len = readType<size_t>();
+    size_t width = readType<size_t>();
+
+    if (width != sizeof(T)) {
+        throw InputStreamException("Data width mismatch requested type width", __FILE__, __LINE__);
+    }
+
+    if (istream.str().size() < len * width) {
+        throw InputStreamException("End reached, but try to read data", __FILE__, __LINE__);
+    }
+
+    if (len) {
+        data.resize(len);
+        istream.read((char*)data.data(), as_signed(len * width));
+    }
+}
diff --git a/entry/src/main/cpp/src/util/include/util/serializing/ObjectOutputStream.h b/entry/src/main/cpp/src/util/include/util/serializing/ObjectOutputStream.h
new file mode 100644
index 0000000..cc851ed
--- /dev/null
+++ b/entry/src/main/cpp/src/util/include/util/serializing/ObjectOutputStream.h
@@ -0,0 +1,58 @@
+/*
+ * Xournal++
+ *
+ * Serialized output stream
+ *
+ * @author Xournal++ Team
+ * https://github.com/xournalpp/xournalpp
+ *
+ * @license GNU GPLv2 or later
+ */
+
+#pragma once
+
+#include <cstddef>      // for size_t
+#include <cstdint>      // for uint32_t
+#include <string>       // for string
+#include <string_view>  // for string_view
+#include <vector>       // for vector
+
+#include <glib.h>  // for GString
+
+class ObjectEncoding;
+
+class ObjectOutputStream {
+public:
+    ObjectOutputStream(ObjectEncoding* encoder);
+    virtual ~ObjectOutputStream();
+
+public:
+    void writeObject(const char* name);
+    void endObject();
+
+    void writeInt(int i);
+    void writeUInt(uint32_t u);
+    void writeDouble(double d);
+    void writeSizeT(size_t st);
+    void writeString(const char* str);
+    void writeString(std::string_view s);
+
+    void writeData(const void* data, size_t len, size_t width);
+
+    template <typename T>
+    void writeData(const std::vector<T>& data);
+
+    /// Writes the raw image data to the output stream.
+    void writeImage(const std::string_view& imgData);
+
+    /// The caller takes ownership of the returned data
+    GString* stealData();
+
+private:
+    ObjectEncoding* encoder = nullptr;
+};
+
+template <typename T>
+void ObjectOutputStream::writeData(const std::vector<T>& data) {
+    writeData(data.data(), data.size(), sizeof(T));
+}
diff --git a/entry/src/main/cpp/src/util/include/util/serializing/Serializable.h b/entry/src/main/cpp/src/util/include/util/serializing/Serializable.h
new file mode 100644
index 0000000..a2ea6e7
--- /dev/null
+++ b/entry/src/main/cpp/src/util/include/util/serializing/Serializable.h
@@ -0,0 +1,27 @@
+/*
+ * Xournal++
+ *
+ * Serializable interface
+ *
+ * @author Xournal++ Team
+ * https://github.com/xournalpp/xournalpp
+ *
+ * @license GNU GPLv2 or later
+ */
+
+#pragma once
+
+#include "InputStreamException.h"
+
+class ObjectInputStream;
+class ObjectOutputStream;
+
+const static char* const XML_VERSION_STR = "XojStrm1:";
+
+class Serializable {
+public:
+    virtual void serialize(ObjectOutputStream& out) const = 0;
+    virtual void readSerialized(ObjectInputStream& in) = 0;
+
+    virtual ~Serializable() = default;
+};
diff --git a/entry/src/main/cpp/src/util/include/util/utf8_view.h b/entry/src/main/cpp/src/util/include/util/utf8_view.h
new file mode 100644
index 0000000..364d888
--- /dev/null
+++ b/entry/src/main/cpp/src/util/include/util/utf8_view.h
@@ -0,0 +1,168 @@
+// UTF-8 string view
+#pragma once
+
+#include <iterator>
+#include <ranges>
+#include <type_traits>
+
+#include "util/ViewIteratorBase.h"
+
+namespace xoj::util {
+template <std::input_iterator InputIterator, std::sentinel_for<InputIterator> InputSentinel>
+struct utf8_view: std::ranges::view_interface<utf8_view<InputIterator, InputSentinel>> {
+    struct SentinelImpl {
+        constexpr SentinelImpl() = default;
+        constexpr SentinelImpl(InputSentinel it): it(it) {}
+
+        InputSentinel it{};
+    };
+
+    struct Iterator: public ViewIteratorBase<Iterator, InputIterator> {
+        using value_type = char8_t;
+        using pointer = char8_t;
+        using reference = char8_t;
+
+        constexpr Iterator() = default;
+        constexpr Iterator(InputIterator it): ViewIteratorBase<Iterator, InputIterator>(it) {}
+
+        friend constexpr auto operator==(Iterator const& lhs, SentinelImpl const& other) -> bool {
+            return lhs.it == other.it;
+        }
+
+        constexpr auto operator*() const -> reference {
+            return static_cast<reference>(*ViewIteratorBase<Iterator, InputIterator>::it);
+        }
+        constexpr auto operator[](size_t n) const -> reference {
+            return static_cast<reference>(ViewIteratorBase<Iterator, InputIterator>::it[n]);
+        }
+    };
+
+
+    using Sentinel = std::conditional_t<std::is_same_v<InputSentinel, InputIterator>, Iterator, SentinelImpl>;
+
+    constexpr utf8_view(InputIterator beginI, InputSentinel endI): beginI(beginI), endI(endI) {}
+
+    constexpr auto begin() const -> Iterator { return beginI; }
+    constexpr auto end() const -> Sentinel { return endI; }
+
+
+    constexpr auto str() const -> std::u8string {
+        // c++20 has no string constructor using iterator and sentinel.
+        // todo(cpp23) use std::u8string(std::from_range_t, ...)
+        auto [b, e] = toIteratorPair();
+        return std::u8string(b, e);
+    }
+
+    explicit operator fs::path() const {
+        // c++ has no fs::path constructor using iterator and sentinel.
+        auto [b, e] = toIteratorPair();
+        return fs::path(b, e);
+    }
+
+private:
+    constexpr auto toIteratorPair() const -> std::pair<Iterator, Iterator> {
+        if constexpr (std::is_same_v<InputIterator, InputSentinel>) {
+            return std::pair{beginI, std::next(beginI, std::distance(beginI.it, endI.it))};
+        } else {
+            auto it = beginI;
+            while (it != endI) {
+                ++it;
+            }
+            return std::pair{beginI, it};
+        }
+    }
+
+    Iterator beginI;
+    Sentinel endI;
+};
+
+template <typename T>
+concept is_byte = sizeof(T) == sizeof(char8_t) && std::convertible_to<T, char8_t>;
+
+template <is_byte T>
+struct CharSentinelClass {
+    constexpr auto operator==(T const* v) const -> bool { return *v == T('\0'); }
+};
+static_assert(std::sentinel_for<CharSentinelClass<char>, char const*>);
+static_assert(std::sentinel_for<utf8_view<char const*, CharSentinelClass<char>>::Sentinel,
+                                utf8_view<char const*, CharSentinelClass<char>>::Iterator>);
+static_assert(std::sentinel_for<CharSentinelClass<unsigned char>, unsigned char const*>);
+static_assert(std::sentinel_for<utf8_view<unsigned char const*, CharSentinelClass<unsigned char>>::Sentinel,
+                                utf8_view<unsigned char const*, CharSentinelClass<unsigned char>>::Iterator>);
+
+// RangeAdaptorClosureObject for utf8_view
+struct utf8_t {
+    template <std::ranges::viewable_range R>
+    auto operator()(R const& r) const {
+        return utf8_view{std::begin(r), std::end(r)};
+    }
+
+    // For some reason, gcc 11 (default on ubuntu 22 LTS) does not recognize std::string as a viewable_range
+    template <is_byte T>
+    auto operator()(std::basic_string<T> const& r) const {
+        return utf8_view{std::begin(r), std::end(r)};
+    }
+
+    template <is_byte T>
+    auto operator()(T const* r) const {
+        return utf8_view{r, CharSentinelClass<T>{}};
+    }
+};
+
+inline constexpr utf8_t utf8;
+
+template <std::ranges::viewable_range R>
+constexpr auto operator|(R r, utf8_t const&) {
+    return utf8_view{std::begin(r), std::end(r)};
+}
+
+template <is_byte T>
+inline constexpr auto operator|(T const* r, utf8_t const&) {
+    return utf8_view{r, CharSentinelClass<T>{}};
+}
+
+// template<class InI, class InS>
+// constexpr auto begin(utf8_view<InI, InS> const& view) -> utf8_view<InI, InS>::Iterator { return view.begin(); }
+
+// template<class InI, class InS>
+// constexpr auto end(utf8_view<InI, InS> const& view) -> utf8_view<InI, InS>::Sentinel { return view.end(); }
+
+namespace {
+constexpr auto* s = "Hello, world!";
+constexpr std::string_view sv = "Hello, world!";
+constexpr unsigned char us[] = {0xE2, 0x84, 0x8F,  // ℏ
+                                0xE2, 0x93, 0x94,  // ⓔ
+                                0xE2, 0x84, 0x93,  // ℓ
+                                0x6C,              // l
+                                0xC6, 0xA1,        // ơ
+                                0x00};
+
+constexpr utf8_view<char const*, char const*> view{sv.data(), sv.data() + sv.size()};
+
+static_assert(*std::begin(utf8_view(std::begin(sv), sv.end())) == char8_t(*std::begin(sv)));
+static_assert(*std::begin(utf8_view(std::begin(sv), sv.end())) == u8'H');
+static_assert(*(utf8_view<char const*, char const*>{sv.data(), sv.data() + sv.size()}.begin()) == u8'H');
+static_assert(std::random_access_iterator<std::string::iterator>);
+static_assert(std::random_access_iterator<char const*>);
+static_assert(std::random_access_iterator<unsigned char const*>);
+static_assert(std::random_access_iterator<utf8_view<std::string::iterator, std::string::iterator>::Iterator>);
+static_assert(std::random_access_iterator<utf8_view<char*, char*>::Iterator>);
+static_assert(std::ranges::random_access_range<utf8_view<std::string::iterator, std::string::iterator>>);
+static_assert(std::ranges::view<utf8_view<std::string::iterator, std::string::iterator>>);
+static_assert(std::ranges::view<utf8_view<char const*, char const*>>);
+
+static_assert(std::ranges::viewable_range<decltype(sv | utf8)>);
+static_assert(std::ranges::viewable_range<decltype(utf8(s))>);
+static_assert(std::ranges::viewable_range<decltype(s | utf8)>);
+static_assert(std::ranges::random_access_range<decltype(sv | utf8)>);
+static_assert(std::ranges::random_access_range<decltype(utf8(s))>);
+static_assert(std::ranges::random_access_range<decltype(s | utf8)>);
+static_assert(std::ranges::random_access_range<decltype(us | utf8)>);
+
+#if __cpp_lib_constexpr_string == 201907L
+static_assert(utf8_view<char const*, char const*>{sv.data(), sv.data() + sv.size()}.str() == u8"Hello, world!");
+static_assert(utf8_view{sv.data(), CharSentinelClass<char>{}}.str() == u8"Hello, world!");
+static_assert((us | utf8).str() == u8"ℏⓔℓlơ");
+#endif
+};  // namespace
+};  // namespace xoj::util
diff --git a/entry/src/main/cpp/src/util/logger/Logger.cpp b/entry/src/main/cpp/src/util/logger/Logger.cpp
new file mode 100644
index 0000000..f56e159
--- /dev/null
+++ b/entry/src/main/cpp/src/util/logger/Logger.cpp
@@ -0,0 +1,68 @@
+#include "util/logger/Logger.h"
+
+#include <ctime>  // for localtime_r, strftime, tm
+
+#include "config-dev.h"  // for DEV_CALL_LOG
+
+
+#ifdef DEV_CALL_LOG
+
+#include <cstdio>   // for snprintf
+#include <fstream>  // for operator<<, basic_ostream, ofstream, ostring...
+#include <sstream>  // for stringstream
+#include <string>   // for char_traits, operator<<, allocator, string
+
+#ifdef _WIN32
+
+#include <windows.h>
+
+inline std::string NowTime() {
+    const int MAX_LEN = 200;
+    char buffer[MAX_LEN];
+    if (GetTimeFormatA(LOCALE_USER_DEFAULT, 0, 0, "HH':'mm':'ss", buffer, MAX_LEN) == 0) {
+        return "Error in NowTime()";
+    }
+
+    char result[100] = {0};
+    static DWORD first = GetTickCount();
+    sprintf_s(result, 100, "%s.%06ld", buffer, (long)(GetTickCount() - first));
+    return result;
+}
+
+#else
+
+#include <sys/time.h>  // for gettimeofday, timeval
+
+inline std::string NowTime() {
+    struct timeval tv;
+    gettimeofday(&tv, 0);
+    char buffer[100];
+    tm r;
+    strftime(buffer, sizeof(buffer), "%X", localtime_r(&tv.tv_sec, &r));
+    char result[100];
+    snprintf(result, sizeof(result), "%s.%06ld", buffer, (long)tv.tv_usec);
+    return result;
+}
+
+#endif  //_WIN32
+
+Log::Log() {}
+
+Log::~Log() {}
+
+std::ofstream logfile;
+
+void Log::trace(const char* callType, const char* clazz, const char* function, long obj) {
+    std::ostringstream os;
+
+    os << NowTime() << " - ";
+    os << callType << " " << clazz << ":" << function << " (" << obj << ")" << std::endl;
+
+    logfile << os.str();
+}
+
+void Log::initlog() { logfile.open("xournalCalls.log"); }
+
+void Log::closelog() { logfile.close(); }
+
+#endif  // DEV_CALL_LOG
diff --git a/entry/src/main/cpp/src/util/raii/CStringWrapper.cpp b/entry/src/main/cpp/src/util/raii/CStringWrapper.cpp
new file mode 100644
index 0000000..0b40914
--- /dev/null
+++ b/entry/src/main/cpp/src/util/raii/CStringWrapper.cpp
@@ -0,0 +1,35 @@
+#include "util/raii/CStringWrapper.h"
+
+#include <utility>
+
+#include <glib.h>
+
+namespace xoj::util {
+inline namespace raii {
+OwnedCString::OwnedCString(OwnedCString&& s): data(std::exchange(s.data, nullptr)) {}
+OwnedCString& OwnedCString::operator=(OwnedCString&& s) {
+    g_free(data);
+    data = std::exchange(s.data, nullptr);
+    return *this;
+}
+
+OwnedCString OwnedCString::assumeOwnership(char* s) {
+    OwnedCString res;
+    res.data = s;
+    return res;
+}
+OwnedCString::~OwnedCString() { g_free(data); }
+
+const char* OwnedCString::get() const { return data; }
+OwnedCString::operator bool() const { return data && data[0]; }
+
+OwnedCString::operator std::string_view() const { return data ? data : std::string_view(); }
+
+const char& OwnedCString::operator[](size_t n) const { return data[n]; }
+
+char** OwnedCString::contentReplacer() {
+    g_free(std::exchange(data, nullptr));
+    return &data;
+}
+};  // namespace raii
+};  // namespace xoj::util
diff --git a/entry/src/main/cpp/src/util/serializing/BinObjectEncoding.cpp b/entry/src/main/cpp/src/util/serializing/BinObjectEncoding.cpp
new file mode 100644
index 0000000..8613157
--- /dev/null
+++ b/entry/src/main/cpp/src/util/serializing/BinObjectEncoding.cpp
@@ -0,0 +1,13 @@
+#include "util/serializing/BinObjectEncoding.h"
+
+#include <glib.h>  // for g_string_append_len
+
+#include "util/safe_casts.h"  // for as_signed
+
+BinObjectEncoding::BinObjectEncoding() = default;
+
+BinObjectEncoding::~BinObjectEncoding() = default;
+
+void BinObjectEncoding::addData(const void* data, size_t len) {
+    g_string_append_len(this->data, static_cast<const char*>(data), as_signed(len));
+}
diff --git a/entry/src/main/cpp/src/util/serializing/HexObjectEncoding.cpp b/entry/src/main/cpp/src/util/serializing/HexObjectEncoding.cpp
new file mode 100644
index 0000000..f90ba27
--- /dev/null
+++ b/entry/src/main/cpp/src/util/serializing/HexObjectEncoding.cpp
@@ -0,0 +1,26 @@
+#include "util/serializing/HexObjectEncoding.h"
+
+#include <cinttypes>  // for PRIx8
+#include <cstdint>    // for uint8_t
+#include <cstdio>     // for sprintf
+
+#include <glib.h>  // for g_free, g_malloc, g_string_append_len
+
+#include "util/safe_casts.h"  // for as_signed
+
+HexObjectEncoding::HexObjectEncoding() = default;
+
+HexObjectEncoding::~HexObjectEncoding() = default;
+
+void HexObjectEncoding::addData(const void* data, size_t len) {
+    char* buffer = static_cast<char*>(g_malloc(len * 2));
+
+    for (size_t i = 0; i < len; i++) {
+        uint8_t x = static_cast<uint8_t const*>(data)[i];
+        sprintf(&buffer[i * 2], "%02" PRIx8, x);
+    }
+
+    g_string_append_len(this->data, buffer, as_signed(len * 2));
+
+    g_free(buffer);
+}
diff --git a/entry/src/main/cpp/src/util/serializing/InputStreamException.cpp b/entry/src/main/cpp/src/util/serializing/InputStreamException.cpp
new file mode 100644
index 0000000..2717878
--- /dev/null
+++ b/entry/src/main/cpp/src/util/serializing/InputStreamException.cpp
@@ -0,0 +1,9 @@
+#include "util/serializing/InputStreamException.h"
+
+InputStreamException::InputStreamException(const std::string& message, const std::string& filename, int line) {
+    this->message = message + ", " + filename + ": " + std::to_string(line);
+}
+
+InputStreamException::~InputStreamException() = default;
+
+const char* InputStreamException::what() const noexcept { return this->message.c_str(); }
diff --git a/entry/src/main/cpp/src/util/serializing/ObjectEncoding.cpp b/entry/src/main/cpp/src/util/serializing/ObjectEncoding.cpp
new file mode 100644
index 0000000..d8625d0
--- /dev/null
+++ b/entry/src/main/cpp/src/util/serializing/ObjectEncoding.cpp
@@ -0,0 +1,13 @@
+#include "util/serializing/ObjectEncoding.h"
+
+ObjectEncoding::ObjectEncoding() { this->data = g_string_new(""); }
+
+ObjectEncoding::~ObjectEncoding() = default;
+
+void ObjectEncoding::addStr(const char* str) const { g_string_append(this->data, str); }
+
+auto ObjectEncoding::stealData() -> GString* {
+    GString* str = this->data;
+    this->data = nullptr;
+    return str;
+}
diff --git a/entry/src/main/cpp/src/util/serializing/ObjectInputStream.cpp b/entry/src/main/cpp/src/util/serializing/ObjectInputStream.cpp
new file mode 100644
index 0000000..44370d3
--- /dev/null
+++ b/entry/src/main/cpp/src/util/serializing/ObjectInputStream.cpp
@@ -0,0 +1,201 @@
+#include "util/serializing/ObjectInputStream.h"
+
+#include <cstdint>  // for uint32_t
+
+#include <glib.h>  // for g_free, g_strdup_...
+
+#include "util/PlaceholderString.h"                 // for PlaceholderString
+#include "util/i18n.h"                              // for FORMAT_STR, FS
+#include "util/safe_casts.h"                        // for as_signed
+#include "util/serializing/InputStreamException.h"  // for InputStreamException
+#include "util/serializing/Serializable.h"          // for XML_VERSION_STR
+
+static size_t getSize(std::stringstream& s) {
+    auto pos = s.tellg();
+    s.seekg(0, std::ios::end);
+    auto size = s.tellg() - pos;
+    s.seekg(pos);
+    return as_unsigned(size);
+}
+
+template size_t ObjectInputStream::readType<size_t>();
+
+// This function requires that T is read from its binary representation to work (e.g. integer type)
+template <typename T>
+T ObjectInputStream::readType() {
+    if (getSize(istream) < sizeof(T)) {
+        std::ostringstream oss;
+        oss << "End reached: trying to read " << sizeof(T) << " bytes while only " << getSize(istream)
+            << " bytes available";
+        throw InputStreamException(oss.str(), __FILE__, __LINE__);
+    }
+    T output;
+
+    istream.read((char*)&output, as_signed(sizeof(T)));
+
+    return output;
+}
+
+size_t ObjectInputStream::pos() { return static_cast<size_t>(istream.tellg()); }
+
+auto ObjectInputStream::read(const char* data, size_t data_len) -> bool {
+    if (data && data_len > 0) {
+        // std::string() constructor can throw is data == nullptr. cf https://github.com/xournalpp/xournalpp/issues/6964
+        return read(std::stringstream(std::string(data, data_len)), data_len);
+    }
+    return false;
+}
+
+auto ObjectInputStream::read(std::stringstream stream, size_t length) -> bool {
+    this->istream = std::move(stream);
+    this->len = length;
+
+    try {
+        std::string version = readString();
+        if (version != XML_VERSION_STR) {
+            g_warning("ObjectInputStream version mismatch... two different Xournal versions running? (%s / %s)",
+                      version.c_str(), XML_VERSION_STR);
+            return false;
+        }
+    } catch (const InputStreamException& e) {
+        g_warning("InputStreamException: %s", e.what());
+        return false;
+    }
+    return true;
+}
+
+void ObjectInputStream::readObject(const char* name) {
+    std::string type = readObject();
+    if (type != name) {
+        throw InputStreamException(FS(FORMAT_STR("Try to read object type {1} but read object type {2}") % name % type),
+                                   __FILE__, __LINE__);
+    }
+}
+
+auto ObjectInputStream::readObject() -> std::string {
+    checkType('{');
+    return readString();
+}
+
+auto ObjectInputStream::getNextObjectName() -> std::string {
+    auto position = istream.tellg();
+
+    checkType('{');
+    std::string name = readString();
+
+    istream.seekg(position);
+    return name;
+}
+
+void ObjectInputStream::endObject() { checkType('}'); }
+
+auto ObjectInputStream::readInt() -> int {
+    checkType('i');
+    return readType<int>();
+}
+
+auto ObjectInputStream::readUInt() -> uint32_t {
+    checkType('u');
+    return readType<uint32_t>();
+}
+
+auto ObjectInputStream::readDouble() -> double {
+    checkType('d');
+    return readType<double>();
+}
+
+auto ObjectInputStream::readSizeT() -> size_t {
+    checkType('l');
+    return readType<size_t>();
+}
+
+auto ObjectInputStream::readString() -> std::string {
+    checkType('s');
+
+    size_t lenString = readType<size_t>();
+
+    if (getSize(istream) < lenString) {
+        std::ostringstream oss;
+        oss << "End reached: trying to read a string of " << lenString << " bytes while only " << istream.str().size()
+            << " bytes are available";
+        throw InputStreamException(oss.str(), __FILE__, __LINE__);
+    }
+
+    std::string output;
+    output.resize(lenString);
+
+    istream.read(&output[0], as_signed(lenString));
+
+    return output;
+}
+
+auto ObjectInputStream::readImage() -> std::string {
+    checkType('m');
+
+    if (getSize(istream) < sizeof(size_t)) {
+        throw InputStreamException("End reached, but try to read an image's data's length", __FILE__, __LINE__);
+    }
+
+    const size_t lenString = readType<size_t>();
+    if (getSize(istream) < lenString) {
+        std::ostringstream oss;
+        oss << "End reached: trying to read an image of " << lenString << " bytes while only " << istream.str().size()
+            << " bytes are available";
+        throw InputStreamException(oss.str(), __FILE__, __LINE__);
+    }
+    std::string data;
+    data.resize(lenString);
+    istream.read(data.data(), as_signed(lenString));
+
+    return data;
+}
+
+void ObjectInputStream::checkType(char type) {
+    if (getSize(istream) < 2) {
+        throw InputStreamException(
+                FS(FORMAT_STR("End reached, but try to read {1}, index {2} of {3}") % getType(type) % pos() % len),
+                __FILE__, __LINE__);
+    }
+    char t = 0, underscore = 0;
+    istream >> underscore >> t;
+
+    if (underscore != '_') {
+        throw InputStreamException(FS(FORMAT_STR("Expected type signature of {1}, index {2} of {3}, but read '{4}'") %
+                                      getType(type) % (pos() + 1) % len % underscore),
+                                   __FILE__, __LINE__);
+    }
+
+    if (t != type) {
+        throw InputStreamException(FS(FORMAT_STR("Expected {1} but read {2}") % getType(type) % getType(t)), __FILE__,
+                                   __LINE__);
+    }
+}
+
+auto ObjectInputStream::getType(char type) -> std::string {
+    std::string ret;
+    if (type == '{') {
+        ret = "Object begin";
+    } else if (type == '}') {
+        ret = "Object end";
+    } else if (type == 'i') {
+        ret = "Number";
+    } else if (type == 'u') {
+        ret = "Unsigned Number";
+    } else if (type == 'd') {
+        ret = "Floating point";
+    } else if (type == 'l') {
+        ret = "Size";
+    } else if (type == 's') {
+        ret = "String";
+    } else if (type == 'b') {
+        ret = "Binary";
+    } else if (type == 'm') {
+        ret = "Image";
+    } else {
+        char* str = g_strdup_printf("Unknown type: %02hhx (%c)", type, type);
+        ret = str;
+        g_free(str);
+    }
+
+    return ret;
+}
diff --git a/entry/src/main/cpp/src/util/serializing/ObjectOutputStream.cpp b/entry/src/main/cpp/src/util/serializing/ObjectOutputStream.cpp
new file mode 100644
index 0000000..3a0278b
--- /dev/null
+++ b/entry/src/main/cpp/src/util/serializing/ObjectOutputStream.cpp
@@ -0,0 +1,78 @@
+#include "util/serializing/ObjectOutputStream.h"
+
+#include <string_view>
+
+#include <cairo.h>  // for CAIRO_STATUS_SUCCESS
+
+#include "util/Assert.h"                      // for xoj_assert
+#include "util/serializing/ObjectEncoding.h"  // for ObjectEncoding
+#include "util/serializing/Serializable.h"    // for XML_VERSION_STR
+
+ObjectOutputStream::ObjectOutputStream(ObjectEncoding* encoder) {
+    xoj_assert(encoder != nullptr);
+    this->encoder = encoder;
+
+    writeString(XML_VERSION_STR);
+}
+
+ObjectOutputStream::~ObjectOutputStream() {
+    delete this->encoder;
+    this->encoder = nullptr;
+}
+
+void ObjectOutputStream::writeObject(const char* name) {
+    this->encoder->addStr("_{");
+
+    writeString(name);
+}
+
+void ObjectOutputStream::endObject() { this->encoder->addStr("_}"); }
+
+void ObjectOutputStream::writeInt(int i) {
+    this->encoder->addStr("_i");
+    this->encoder->addData(&i, sizeof(int));
+}
+
+void ObjectOutputStream::writeUInt(uint32_t u) {
+    this->encoder->addStr("_u");
+    this->encoder->addData(&u, sizeof(uint32_t));
+}
+
+void ObjectOutputStream::writeDouble(double d) {
+    this->encoder->addStr("_d");
+    this->encoder->addData(&d, sizeof(double));
+}
+
+void ObjectOutputStream::writeSizeT(size_t st) {
+    this->encoder->addStr("_l");
+    this->encoder->addData(&st, sizeof(size_t));
+}
+
+void ObjectOutputStream::writeString(const char* str) { writeString(std::string_view(str)); }
+
+void ObjectOutputStream::writeString(std::string_view s) {
+    this->encoder->addStr("_s");
+    size_t len = s.length();
+    this->encoder->addData(&len, sizeof(size_t));
+    this->encoder->addData(s.data(), len);
+}
+
+void ObjectOutputStream::writeData(const void* data, size_t len, size_t width) {
+    this->encoder->addStr("_b");
+    this->encoder->addData(&len, sizeof(size_t));
+
+    // size of one element
+    this->encoder->addData(&width, sizeof(size_t));
+    if (data != nullptr) {
+        this->encoder->addData(data, len * width);
+    }
+}
+
+void ObjectOutputStream::writeImage(const std::string_view& imgData) {
+    this->encoder->addStr("_m");
+    size_t len = imgData.length();
+    this->encoder->addData(&len, sizeof(size_t));
+    this->encoder->addData(imgData.data(), len);
+}
+
+auto ObjectOutputStream::stealData() -> GString* { return this->encoder->stealData(); }
diff --git a/entry/src/main/cpp/src/xoj-preview-extractor/CMakeLists.txt b/entry/src/main/cpp/src/xoj-preview-extractor/CMakeLists.txt
new file mode 100644
index 0000000..d4ef416
--- /dev/null
+++ b/entry/src/main/cpp/src/xoj-preview-extractor/CMakeLists.txt
@@ -0,0 +1,65 @@
+## xournalpp-thumbnailer executable ##
+
+if (WIN32)
+  # Windows does not support the thumbnailer like this
+  return ()
+endif ()
+
+add_definitions (-DBUILD_THUMBNAILER)
+
+if (DEV_ENABLE_GCOV)
+  add_compile_options("--coverage")
+  add_link_options("--coverage")
+endif (DEV_ENABLE_GCOV)
+
+add_executable (xournalpp-thumbnailer
+        xournalpp-thumbnailer.cpp
+        "${PROJECT_SOURCE_DIR}/src/util/GzUtil.cpp"
+        "${PROJECT_SOURCE_DIR}/src/util/PlaceholderString.cpp"
+        "${PROJECT_SOURCE_DIR}/src/util/StringUtils.cpp"
+        "${PROJECT_SOURCE_DIR}/src/util/PathUtil.cpp"
+        "${PROJECT_SOURCE_DIR}/src/util/Stacktrace.cpp"
+        "${PROJECT_SOURCE_DIR}/src/util/XojPreviewExtractor.cpp"
+        )
+
+target_compile_features (xournalpp-thumbnailer PRIVATE cxx_std_20)
+target_link_libraries (xournalpp-thumbnailer
+  util
+  ${ZLIB_LIBRARIES}
+  ${librsvg_LDFLAGS}
+  ${Glib_LDFLAGS}
+  ${ZIP_LDFLAGS}
+  )
+
+target_include_directories (xournalpp-thumbnailer PRIVATE ${librsvg_INCLUDE_DIRS})
+
+set (THUMBNAILER_BIN "xournalpp-thumbnailer")
+
+add_custom_command (TARGET xournalpp-thumbnailer POST_BUILD
+  COMMAND ${CMAKE_STRIP} ${THUMBNAILER_BIN}
+)
+
+## Install ##
+
+install (TARGETS xournalpp-thumbnailer
+  RUNTIME DESTINATION bin
+  COMPONENT xournalpp-thumbnailer
+)
+
+## Desktop install targets ##
+
+configure_file (xournalpp-thumbnailer-xoj.schemas xournalpp-thumbnailer-xoj.schemas COPYONLY)
+
+add_custom_target (desktop-install-thumbnailer
+  COMMAND "${PROJECT_SOURCE_DIR}/src/xoj-preview-extractor/desktop-install.sh" install
+
+  COMMENT "Install xournalpp-thumbnailer as xoj file thumbnail generator"
+  SOURCES xournalpp-thumbnailer xournalpp-thumbnailer-xoj.schemas desktop-install.sh
+)
+
+add_custom_target (desktop-uninstall-thumbnailer
+  COMMAND "${PROJECT_SOURCE_DIR}/src/xoj-preview-extractor/desktop-install.sh" uninstall
+
+  COMMENT "Uninstall xournalpp-thumbnailer as xoj file thumbnail generator"
+  SOURCES xournalpp-thumbnailer xournalpp-thumbnailer-xoj.schemas desktop-install.sh
+)
diff --git a/entry/src/main/cpp/src/xoj-preview-extractor/desktop-install.sh b/entry/src/main/cpp/src/xoj-preview-extractor/desktop-install.sh
new file mode 100755
index 0000000..b1df543
--- /dev/null
+++ b/entry/src/main/cpp/src/xoj-preview-extractor/desktop-install.sh
@@ -0,0 +1,4 @@
+#!/bin/bash
+
+export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
+gconftool-2 --makefile-$1-rule xournalpp-thumbnailer-xoj.schemas
diff --git a/entry/src/main/cpp/src/xoj-preview-extractor/xournalpp-thumbnailer-xoj.schemas b/entry/src/main/cpp/src/xoj-preview-extractor/xournalpp-thumbnailer-xoj.schemas
new file mode 100644
index 0000000..eaaad44
--- /dev/null
+++ b/entry/src/main/cpp/src/xoj-preview-extractor/xournalpp-thumbnailer-xoj.schemas
@@ -0,0 +1,29 @@
+<gconfschemafile>
+	<schemalist>
+
+		<schema>
+			<key>/schemas/desktop/gnome/thumbnailers/application@x-xoj/enable</key>
+			<applyto>/desktop/gnome/thumbnailers/application@x-xoj/enable</applyto>
+			<owner>xournalpp</owner>
+			<type>bool</type>
+			<default>true</default>
+			<locale name="C">
+				<short></short>
+				<long></long>
+			</locale>
+		</schema>
+
+		<schema>
+			<key>/schemas/desktop/gnome/thumbnailers/application@x-xoj/command</key>
+			<applyto>/desktop/gnome/thumbnailers/application@x-xoj/command</applyto>
+			<owner>xournalpp</owner>
+			<type>string</type>
+			<default>xournalpp-thumbnailer %i %o</default>
+			<locale name="C">
+				<short></short>
+				<long></long>
+			</locale>
+		</schema>
+
+	</schemalist>
+</gconfschemafile>
diff --git a/entry/src/main/cpp/src/xoj-preview-extractor/xournalpp-thumbnailer.cpp b/entry/src/main/cpp/src/xoj-preview-extractor/xournalpp-thumbnailer.cpp
new file mode 100644
index 0000000..cd7f34b
--- /dev/null
+++ b/entry/src/main/cpp/src/xoj-preview-extractor/xournalpp-thumbnailer.cpp
@@ -0,0 +1,214 @@
+/*
+ * Xournal++
+ *
+ * This small program extracts a preview out of a xoj file
+ *
+ * @author Xournal++ Team
+ * https://github.com/xournalpp/xournalpp
+ *
+ * @license GPL
+ */
+
+// Set to true to write a log with errors and debug logs to /tmp/xojtmb.log
+#define DEBUG_THUMBNAILER false
+
+#include <algorithm>  // for max, min
+#include <cstdio>     // for fclose, fopen, fwrite, FILE
+#include <iostream>   // for endl, ostream, basic_ostream
+#include <locale>     // for locale
+#include <string>     // for string, basic_string, allocator
+#include <vector>     // for vector
+
+#include <cairo.h>         // for cairo_create, cairo_image_surf...
+#include <glib.h>          // for gchar, g_get_home_dir, g_getenv
+#include <libintl.h>       // for bindtextdomain, textdomain
+#include <librsvg/rsvg.h>  // for RsvgDimensionData, rsvg_handle...
+
+#include "util/PathUtil.h"             // for getLocalePath
+#include "util/PlaceholderString.h"    // for PlaceholderString
+#include "util/XojPreviewExtractor.h"  // for XojPreviewExtractor, PREVIEW_R...
+#include "util/i18n.h"                 // for _F, _
+
+#include "config.h"      // for GETTEXT_PACKAGE, ENABLE_NLS
+#include "filesystem.h"  // for path, operator/, exists
+
+#ifdef DEBUG_THUMBERNAILER
+#include <fstream>
+#endif
+
+using std::cerr;
+using std::cout;
+using std::endl;
+using std::string;
+
+void initLocalisation() {
+#ifdef ENABLE_NLS
+    bindtextdomain(GETTEXT_PACKAGE, char_cast(Util::getLocalePath().u8string().c_str()));
+    textdomain(GETTEXT_PACKAGE);
+#endif  // ENABLE_NLS
+
+    std::locale::global(std::locale(""));  //"" - system default locale
+    std::cout.imbue(std::locale());
+}
+
+void logMessage(string msg, bool error) {
+    if (error) {
+        cerr << msg << endl;
+    } else {
+        cout << msg << endl;
+    }
+
+#if DEBUG_THUMBNAILER
+    std::ofstream ofs;
+    ofs.open("/tmp/xojtmb.log", std::ofstream::out | std::ofstream::app);
+
+    if (error) {
+        ofs << "E: ";
+    } else {
+        ofs << "I: ";
+    }
+
+    ofs << msg << endl;
+
+    ofs.close();
+#endif
+}
+
+static const std::string iconName = "com.github.xournalpp.xournalpp";
+
+/**
+ * Search for Xournal++ icon based on the freedesktop icon theme specification
+ */
+fs::path findAppIcon() {
+    std::vector<fs::path> basedirs;
+#if DEBUG_THUMBNAILER
+    basedirs.emplace_back(fs::path("../ui/pixmaps"));
+#endif
+    // $HOME/.icons
+    basedirs.emplace_back(Util::GFilename(g_get_home_dir()).toPath().value_or(fs::path()) / ".icons");
+    // $XDG_DATA_DIRS/icons
+    if (const char* datadirs = g_getenv("XDG_DATA_DIRS")) {
+        std::string_view dds = datadirs;
+        std::string::size_type lastp = 0;
+        std::string::size_type p;
+        while ((p = dds.find(G_SEARCHPATH_SEPARATOR, lastp)) != std::string::npos) {
+            auto file = Util::GFilename::assumeOwnerhip(g_strndup(dds.data() + lastp, p - lastp));
+            basedirs.emplace_back(file.toPath().value_or(fs::path()) / "icons");
+            lastp = p + 1;
+        }
+    }
+    basedirs.emplace_back(fs::path("/usr/share/pixmaps"));
+
+    const auto iconFile = iconName + ".svg";
+    // Search through base directories
+    for (auto&& d: basedirs) {
+        fs::path svgPath;
+        if (fs::exists((svgPath = d / "hicolor/scalable/apps" / iconFile))) {
+            return svgPath;
+        } else if (fs::exists((svgPath = d / iconFile))) {
+            return svgPath;
+        }
+    }
+
+    return "";
+}
+
+int main(int argc, char* argv[]) {
+    initLocalisation();
+
+    // check args count
+    if (argc != 3) {
+        logMessage(_("xoj-preview-extractor: call with INPUT.xoj OUTPUT.png"), true);
+        return 1;
+    }
+
+    XojPreviewExtractor extractor;
+    PreviewExtractResult result = extractor.readFile(argv[1]);
+
+    switch (result) {
+        case PREVIEW_RESULT_IMAGE_READ:
+            // continue to write preview
+            break;
+
+        case PREVIEW_RESULT_BAD_FILE_EXTENSION:
+            logMessage((_F("xoj-preview-extractor: file \"{1}\" is not .xoj file") % argv[1]).str(), true);
+            return 2;
+
+        case PREVIEW_RESULT_COULD_NOT_OPEN_FILE:
+            logMessage((_F("xoj-preview-extractor: opening input file \"{1}\" failed") % argv[1]).str(), true);
+            return 3;
+
+        case PREVIEW_RESULT_NO_PREVIEW:
+            logMessage((_F("xoj-preview-extractor: file \"{1}\" contains no preview") % argv[1]).str(), true);
+            return 4;
+
+        case PREVIEW_RESULT_ERROR_READING_PREVIEW:
+        default:
+            logMessage(_("xoj-preview-extractor: no preview and page found, maybe an invalid file?"), true);
+            return 5;
+    }
+
+
+    gsize dataLen = 0;
+    unsigned char* imageData = extractor.getData(dataLen);
+
+    // The following code is for rendering the Xournal++ icon on top of thumbnails.
+
+    // Struct for reading imageData into a cairo surface
+    struct ReadClosure {
+        unsigned int pos;
+        unsigned char* data;
+        gsize maxLen;
+    };
+    cairo_read_func_t processRead =
+            (cairo_read_func_t) + [](ReadClosure* closure, unsigned char* data, unsigned int length) {
+                if (closure->pos + length > closure->maxLen) {
+                    return CAIRO_STATUS_READ_ERROR;
+                }
+
+                for (auto i = 0U; i < length; i++) {
+                    data[i] = closure->data[closure->pos + i];
+                }
+                closure->pos += length;
+                return CAIRO_STATUS_SUCCESS;
+            };
+    ReadClosure closure{0, imageData, dataLen};
+    cairo_surface_t* thumbnail = cairo_image_surface_create_from_png_stream(processRead, &closure);
+    // This application is short-lived, so we'll purposefully be sloppy and let the OS free memory.
+    if (cairo_surface_status(thumbnail) == CAIRO_STATUS_SUCCESS) {
+        GError* err = nullptr;
+        const auto width = cairo_image_surface_get_width(thumbnail);
+        const auto height = cairo_image_surface_get_height(thumbnail);
+        const auto iconSize = 0.5 * std::min(width, height);
+
+        const auto svgPath = findAppIcon();
+        RsvgHandle* handle = rsvg_handle_new_from_file(svgPath.c_str(), &err);
+        if (err) {
+            logMessage((_F("xoj-preview-extractor: could not find icon \"{1}\"") % iconName).str(), true);
+        } else {
+            rsvg_handle_set_dpi(handle, 90);  // does the dpi matter for an icon overlay?
+            // Render at bottom right
+            cairo_t* cr = cairo_create(thumbnail);
+            const RsvgRectangle viewport{width - iconSize, height - iconSize, iconSize, iconSize};
+            GError* error = nullptr;
+            rsvg_handle_render_document(handle, cr, &viewport, &error);
+            if (error != nullptr) {
+                g_warning("Could not render the icon");
+                g_clear_error(&error);
+            }
+        }
+        cairo_surface_write_to_png(thumbnail, argv[2]);
+    } else {
+        // Cairo was unable to load the image, so fallback to writing the PNG data to disk.
+        FILE* fp = fopen(argv[2], "wb");
+        if (!fp) {
+            logMessage((_F("xoj-preview-extractor: opening output file \"{1}\" failed") % argv[2]).str(), true);
+            return 6;
+        }
+        fwrite(imageData, dataLen, 1, fp);
+        fclose(fp);
+    }
+
+    logMessage(_("xoj-preview-extractor: successfully extracted"), false);
+    return 0;
+}