diff --git a/src/gui/common/common.gresource.xml b/src/gui/common/common.gresource.xml
new file mode 100644
index 00000000..4d64f0a1
--- /dev/null
+++ b/src/gui/common/common.gresource.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<gresources>
+  <gresource prefix="/org/gnome/calendar/ui/common">
+    <file compressed="true">gcal-calendar-combo-row-item.ui</file>
+    <file compressed="true">gcal-calendar-combo-row.ui</file>
+  </gresource>
+</gresources>
diff --git a/src/gui/gcal-calendar-combo-row-item.c b/src/gui/common/gcal-calendar-combo-row-item.c
similarity index 98%
rename from src/gui/gcal-calendar-combo-row-item.c
rename to src/gui/common/gcal-calendar-combo-row-item.c
index 2dd52b4b..a3d0fa52 100644
--- a/src/gui/gcal-calendar-combo-row-item.c
+++ b/src/gui/common/gcal-calendar-combo-row-item.c
@@ -168,7 +168,7 @@ gcal_calendar_combo_row_item_class_init (GcalCalendarComboRowItemClass *klass)
 
   g_object_class_install_properties (object_class, N_PROPS, properties);
 
-  gtk_widget_class_set_template_from_resource (widget_class, "/org/gnome/calendar/ui/gui/gcal-calendar-combo-row-item.ui");
+  gtk_widget_class_set_template_from_resource (widget_class, "/org/gnome/calendar/ui/common/gcal-calendar-combo-row-item.ui");
 
   gtk_widget_class_bind_template_child (widget_class, GcalCalendarComboRowItem, color_image);
   gtk_widget_class_bind_template_child (widget_class, GcalCalendarComboRowItem, visibility_image);
diff --git a/src/gui/gcal-calendar-combo-row-item.h b/src/gui/common/gcal-calendar-combo-row-item.h
similarity index 100%
rename from src/gui/gcal-calendar-combo-row-item.h
rename to src/gui/common/gcal-calendar-combo-row-item.h
diff --git a/src/gui/gcal-calendar-combo-row-item.ui b/src/gui/common/gcal-calendar-combo-row-item.ui
similarity index 100%
rename from src/gui/gcal-calendar-combo-row-item.ui
rename to src/gui/common/gcal-calendar-combo-row-item.ui
diff --git a/src/gui/gcal-calendar-combo-row.c b/src/gui/common/gcal-calendar-combo-row.c
similarity index 99%
rename from src/gui/gcal-calendar-combo-row.c
rename to src/gui/common/gcal-calendar-combo-row.c
index 7cdc1c6a..0383eafb 100644
--- a/src/gui/gcal-calendar-combo-row.c
+++ b/src/gui/common/gcal-calendar-combo-row.c
@@ -190,7 +190,7 @@ gcal_calendar_combo_row_class_init (GcalCalendarComboRowClass *klass)
 
   g_object_class_install_properties (object_class, N_PROPS, properties);
 
-  gtk_widget_class_set_template_from_resource (widget_class, "/org/gnome/calendar/ui/gui/gcal-calendar-combo-row.ui");
+  gtk_widget_class_set_template_from_resource (widget_class, "/org/gnome/calendar/ui/common/gcal-calendar-combo-row.ui");
 
   gtk_widget_class_bind_template_callback (widget_class, calendar_item_setup_cb);
   gtk_widget_class_bind_template_callback (widget_class, calendar_item_bind_cb);
diff --git a/src/gui/gcal-calendar-combo-row.h b/src/gui/common/gcal-calendar-combo-row.h
similarity index 100%
rename from src/gui/gcal-calendar-combo-row.h
rename to src/gui/common/gcal-calendar-combo-row.h
diff --git a/src/gui/gcal-calendar-combo-row.ui b/src/gui/common/gcal-calendar-combo-row.ui
similarity index 100%
rename from src/gui/gcal-calendar-combo-row.ui
rename to src/gui/common/gcal-calendar-combo-row.ui
diff --git a/src/gui/common/meson.build b/src/gui/common/meson.build
new file mode 100644
index 00000000..510a90e9
--- /dev/null
+++ b/src/gui/common/meson.build
@@ -0,0 +1,12 @@
+calendar_incs +=  include_directories('.')
+
+built_sources += gnome.compile_resources(
+  'common-resources',
+  'common.gresource.xml',
+  c_name: 'common',
+)
+
+sources += files(
+  'gcal-calendar-combo-row-item.c',
+  'gcal-calendar-combo-row.c',
+)
diff --git a/src/gui/gui.gresource.xml b/src/gui/gui.gresource.xml
index 1eb6437c..1abfeff8 100644
--- a/src/gui/gui.gresource.xml
+++ b/src/gui/gui.gresource.xml
@@ -2,8 +2,6 @@
 <gresources>
   <gresource prefix="/org/gnome/calendar/ui/gui">
     <file compressed="true">gcal-calendar-button.ui</file>
-    <file compressed="true">gcal-calendar-combo-row.ui</file>
-    <file compressed="true">gcal-calendar-combo-row-item.ui</file>
     <file compressed="true">gcal-event-popover.ui</file>
     <file compressed="true">gcal-event-widget.ui</file>
     <file compressed="true">gcal-meeting-row.ui</file>
diff --git a/src/gui/meson.build b/src/gui/meson.build
index 9cb5cc0c..930500cb 100644
--- a/src/gui/meson.build
+++ b/src/gui/meson.build
@@ -1,4 +1,5 @@
 subdir('calendar-management')
+subdir('common')
 subdir('event-editor')
 subdir('gtk')
 subdir('icons')
@@ -16,8 +17,6 @@ built_sources += gnome.compile_resources(
 sources += files(
   'gcal-application.c',
   'gcal-calendar-button.c',
-  'gcal-calendar-combo-row.c',
-  'gcal-calendar-combo-row-item.c',
   'gcal-drop-overlay.c',
   'gcal-event-popover.c',
   'gcal-event-widget.c',