diff --git a/lib/graphql/Fragments/MyPages/AccountPageContentShortcuts.graphql b/lib/graphql/Fragments/MyPages/AccountPageContentShortcuts.graphql
index 14b37eff0..968df11f8 100644
--- a/lib/graphql/Fragments/MyPages/AccountPageContentShortcuts.graphql
+++ b/lib/graphql/Fragments/MyPages/AccountPageContentShortcuts.graphql
@@ -1,3 +1,7 @@
+#import "../PageLinks/AccountPageLink.graphql"
+#import "../PageLinks/ContentPageLink.graphql"
+#import "../PageLinks/LoyaltyPageLink.graphql"
+
 fragment AccountPageContentShortcuts on AccountPageContentShortcuts {
   shortcuts {
     title
@@ -16,30 +20,3 @@ fragment AccountPageContentShortcuts on AccountPageContentShortcuts {
     }
   }
 }
-
-fragment AccountPageLink on AccountPage {
-  system {
-    locale
-    uid
-  }
-  title
-  url
-}
-
-fragment LoyaltyPageLink on LoyaltyPage {
-  system {
-    locale
-    uid
-  }
-  title
-  url
-}
-
-fragment ContentPageLink on ContentPage {
-  system {
-    locale
-    uid
-  }
-  title
-  url
-}
diff --git a/lib/graphql/Fragments/PageLinks/AccountPageLink.graphql b/lib/graphql/Fragments/PageLinks/AccountPageLink.graphql
new file mode 100644
index 000000000..dc5ed6667
--- /dev/null
+++ b/lib/graphql/Fragments/PageLinks/AccountPageLink.graphql
@@ -0,0 +1,8 @@
+fragment AccountPageLink on AccountPage {
+  system {
+    locale
+    uid
+  }
+  title
+  url
+}
diff --git a/lib/graphql/Fragments/PageLinks/ContentPageLink.graphql b/lib/graphql/Fragments/PageLinks/ContentPageLink.graphql
new file mode 100644
index 000000000..f550300be
--- /dev/null
+++ b/lib/graphql/Fragments/PageLinks/ContentPageLink.graphql
@@ -0,0 +1,8 @@
+fragment ContentPageLink on ContentPage {
+  system {
+    locale
+    uid
+  }
+  title
+  url
+}
diff --git a/lib/graphql/Fragments/PageLinks/CurrentBlocksPageLink.graphql b/lib/graphql/Fragments/PageLinks/CurrentBlocksPageLink.graphql
new file mode 100644
index 000000000..1b82b2a59
--- /dev/null
+++ b/lib/graphql/Fragments/PageLinks/CurrentBlocksPageLink.graphql
@@ -0,0 +1,8 @@
+fragment CurrentBlocksPageLink on CurrentBlocksPage {
+  system {
+    locale
+    uid
+  }
+  title
+  url
+}
diff --git a/lib/graphql/Fragments/PageLinks/LoyaltyPageLink.graphql b/lib/graphql/Fragments/PageLinks/LoyaltyPageLink.graphql
new file mode 100644
index 000000000..d0c6ac0a9
--- /dev/null
+++ b/lib/graphql/Fragments/PageLinks/LoyaltyPageLink.graphql
@@ -0,0 +1,8 @@
+fragment LoyaltyPageLink on LoyaltyPage {
+  system {
+    locale
+    uid
+  }
+  title
+  url
+}