diff --git a/src/editor-view/actions/actions-toolbar.scss b/src/editor-view/actions/actions-toolbar.scss
index d3b6079..4803006 100644
--- a/src/editor-view/actions/actions-toolbar.scss
+++ b/src/editor-view/actions/actions-toolbar.scss
@@ -20,12 +20,6 @@ phred-actions-toolbar {
 		flex: 1 0 auto;
 	}
 
-	.reference-image-group {
-		display: flex;
-		align-items: stretch;
-		justify-content: stretch;
-	}
-
 	.panel-toggle {
 		position: absolute;
 		width: 20px;
diff --git a/src/editor-view/actions/actions-toolbar.ts b/src/editor-view/actions/actions-toolbar.ts
index 413e964..4f4dd9d 100644
--- a/src/editor-view/actions/actions-toolbar.ts
+++ b/src/editor-view/actions/actions-toolbar.ts
@@ -1,28 +1,18 @@
 import { Action, ActionHandler } from 'core/action-handler';
 import { Actions } from 'core/actions';
-import { Editor } from 'core/editor';
 import { PreferenceKey } from 'core/preferences/preferences.model';
 import { PreferencesUtil } from 'core/preferences/preferences.util';
 import { Widget } from 'editor-view/widget/widget';
 import './actions-toolbar.scss';
 import { ActionButton } from './button/action-button';
+import { ReferenceImageGroup } from './reference-image/group/reference-image-group';
 import { ResponsiveGroup } from './responsive/responsive-group';
 
-// TODO adding orientation and reference image to their groups, they can implement an
-// interface with `updateState()` method, same as `ActionButton`
 export class ActionsToolbar extends Widget {
 	public static readonly tagName = 'phred-actions-toolbar';
 
 	private readonly buttons: ActionButton[] = [];
 
-	// TODO add these to a dedicated HTMLElement
-	// private orientationBtn: ActionButton;
-	// private orientationTemplates: SizeTemplatesPanel;
-
-	// TODO add these to a dedicated HTMLElement
-	private referenceImageGroup: HTMLElement;
-	private referenceImageGroupButton: HTMLElement;
-
 	private leftPanelToggle: HTMLElement;
 	private rightPanelToggle: HTMLElement;
 
@@ -46,7 +36,7 @@ export class ActionsToolbar extends Widget {
 
 		this.createSeparator();
 		this.createButton(actions.getAction(Actions.PRINT_OBJECT));
-		this.createReferenceImagePanel(actions.getAction(Actions.TOGGLE_REF_IMAGE));
+		this.createReferenceImageGroup(actions);
 		this.createSeparator();
 		this.createButton(actions.getAction(Actions.UNDO));
 		this.createSeparator();
@@ -84,26 +74,6 @@ export class ActionsToolbar extends Widget {
 		return btn;
 	}
 
-	private createReferenceImagePanel(action: Action) {
-		const panel = this.appendChild(document.createElement('div'));
-		panel.classList.add('reference-image-group');
-
-		this.createButton(action, panel);
-
-		const optionsButton = panel.appendChild(document.createElement('div'));
-		optionsButton.classList.add('open-options-button', 'button', 'action-button');
-
-		optionsButton.appendChild(document.createElement('i'))
-			.classList.add('fas', 'fa-caret-down');
-
-		optionsButton.addEventListener('click', () => {
-			Editor.referenceImageController.openOptionsPanel(optionsButton);
-		});
-
-		this.referenceImageGroupButton = optionsButton;
-		this.referenceImageGroup = panel;
-	}
-
 	private createSeparator() {
 		this.appendChild(document.createElement('div'))
 			.classList.add('separator');
@@ -121,6 +91,13 @@ export class ActionsToolbar extends Widget {
 		this.appendChild(group);
 	}
 
+	private createReferenceImageGroup(actions: ActionHandler) {
+		const group = document.createElement(ReferenceImageGroup.tagName) as ReferenceImageGroup;
+		group.init(actions);
+		// this.buttons.push(group);
+		this.appendChild(group);
+	}
+
 	private onPreferencesChanged(key: PreferenceKey, value: any) {
 		switch (key) {
 			case 'leftPanelVisible':
@@ -129,14 +106,6 @@ export class ActionsToolbar extends Widget {
 			case 'rightPanelVisible':
 				this.rightPanelToggle.classList.addOrRemove('is-hidden', value !== true);
 				break;
-			case 'referenceImageEnabled':
-				this.referenceImageGroup.classList
-					.addOrRemove('disabled', value !== true);
-				break;
-			case 'referenceImageVisible':
-				this.referenceImageGroupButton.classList
-					.addOrRemove('disabled', value !== true);
-				break;
 		}
 	}
 }
diff --git a/src/editor-view/actions/reference-image/group/reference-image-group.scss b/src/editor-view/actions/reference-image/group/reference-image-group.scss
new file mode 100644
index 0000000..b3efa46
--- /dev/null
+++ b/src/editor-view/actions/reference-image/group/reference-image-group.scss
@@ -0,0 +1,5 @@
+phred-reference-image-group {
+	display: flex;
+	align-items: stretch;
+	justify-content: stretch;
+}
diff --git a/src/editor-view/actions/reference-image/group/reference-image-group.ts b/src/editor-view/actions/reference-image/group/reference-image-group.ts
new file mode 100644
index 0000000..80b28a7
--- /dev/null
+++ b/src/editor-view/actions/reference-image/group/reference-image-group.ts
@@ -0,0 +1,58 @@
+import { Action, ActionHandler } from 'core/action-handler';
+import { Actions } from 'core/actions';
+import { Editor } from 'core/editor';
+import { PreferenceKey } from 'core/preferences/preferences.model';
+import { PreferencesUtil } from 'core/preferences/preferences.util';
+import { ActionButton } from 'editor-view/actions/button/action-button';
+import './reference-image-group.scss';
+
+export class ReferenceImageGroup extends HTMLElement {
+	public static readonly tagName = 'phred-reference-image-group';
+
+	private optionsButton: HTMLElement;
+
+	public init(actions: ActionHandler) {
+		this.classList.add('reference-image-group');
+
+		this.createButton(actions.getAction(Actions.TOGGLE_REF_IMAGE));
+
+		const optionsButton = this.appendChild(document.createElement('div'));
+		optionsButton.classList.add('open-options-button', 'button', 'action-button');
+
+		optionsButton.appendChild(document.createElement('i'))
+			.classList.add('fas', 'fa-caret-down');
+
+		optionsButton.addEventListener('click', () => {
+			Editor.referenceImageController.openOptionsPanel(optionsButton);
+		});
+
+		this.optionsButton = optionsButton;
+
+		PreferencesUtil.setupPreferences(
+			['referenceImageEnabled', 'referenceImageVisible'],
+			this.onPreferencesChanged,
+			this
+		);
+	}
+
+	private createButton(action: Action) {
+		if (!action) return null;
+		const btn = document.createElement(ActionButton.tagName) as ActionButton;
+		btn.setAction(action);
+		this.appendChild(btn);
+		return btn;
+	}
+
+	private onPreferencesChanged(pref: PreferenceKey, value: any) {
+		if (pref === 'referenceImageEnabled') {
+			this.classList.addOrRemove('disabled', value !== true);
+			return;
+		}
+
+		if (pref === 'referenceImageVisible') {
+			this.optionsButton.classList.addOrRemove('disabled', value !== true);
+		}
+	}
+}
+
+customElements.define(ReferenceImageGroup.tagName, ReferenceImageGroup);
diff --git a/src/editor-view/actions/reference-image/reference-image.options.scss b/src/editor-view/actions/reference-image/options/reference-image.options.scss
similarity index 100%
rename from src/editor-view/actions/reference-image/reference-image.options.scss
rename to src/editor-view/actions/reference-image/options/reference-image.options.scss
diff --git a/src/editor-view/actions/reference-image/reference-image.options.ts b/src/editor-view/actions/reference-image/options/reference-image.options.ts
similarity index 100%
rename from src/editor-view/actions/reference-image/reference-image.options.ts
rename to src/editor-view/actions/reference-image/options/reference-image.options.ts