diff --git a/plugin-api/alpha/client/components/index.js b/plugin-api/alpha/client/components/index.js
new file mode 100644
index 000000000..e69de29bb
diff --git a/plugin-api/beta/client/components/index.js b/plugin-api/beta/client/components/index.js
index 5d76732fc..0330892bf 100644
--- a/plugin-api/beta/client/components/index.js
+++ b/plugin-api/beta/client/components/index.js
@@ -1 +1,2 @@
 export {Slot} from 'coral-framework/components';
+export {Icon} from 'coral-ui';
diff --git a/plugin-api/beta/client/services/index.js b/plugin-api/beta/client/services/index.js
new file mode 100644
index 000000000..16872b9f3
--- /dev/null
+++ b/plugin-api/beta/client/services/index.js
@@ -0,0 +1 @@
+export {t} from 'coral-framework/services/i18n';
diff --git a/plugins/coral-plugin-offtopic/client/components/OffTopicCheckbox.js b/plugins/coral-plugin-offtopic/client/components/OffTopicCheckbox.js
index 89d8224f8..70876f739 100644
--- a/plugins/coral-plugin-offtopic/client/components/OffTopicCheckbox.js
+++ b/plugins/coral-plugin-offtopic/client/components/OffTopicCheckbox.js
@@ -1,7 +1,7 @@
 import React from 'react';
 import styles from './styles.css';
 
-import t from 'coral-framework/services/i18n';
+import {t} from 'plugin-api/beta/client/services';
 
 export default class OffTopicCheckbox extends React.Component {
 
diff --git a/plugins/coral-plugin-offtopic/client/components/OffTopicTag.js b/plugins/coral-plugin-offtopic/client/components/OffTopicTag.js
index 62d8e1a0f..e8029ce5e 100644
--- a/plugins/coral-plugin-offtopic/client/components/OffTopicTag.js
+++ b/plugins/coral-plugin-offtopic/client/components/OffTopicTag.js
@@ -1,7 +1,7 @@
 import React from 'react';
 import styles from './styles.css';
 
-import t from 'coral-framework/services/i18n';
+import {t} from 'plugin-api/beta/client/services';
 
 const isOffTopic = (tags) => {
   return !!tags.filter((tag) => tag.name === 'OFF_TOPIC').length;
diff --git a/plugins/coral-plugin-viewing-options/client/components/ViewingOptions.js b/plugins/coral-plugin-viewing-options/client/components/ViewingOptions.js
index a247aef18..513d9340b 100644
--- a/plugins/coral-plugin-viewing-options/client/components/ViewingOptions.js
+++ b/plugins/coral-plugin-viewing-options/client/components/ViewingOptions.js
@@ -1,8 +1,7 @@
 import React from 'react';
 import cn from 'classnames';
-import {Icon} from 'coral-ui';
 import styles from './ViewingOptions.css';
-import {Slot} from 'plugin-api/beta/client/components';
+import {Slot, Icon} from 'plugin-api/beta/client/components';
 
 const ViewingOptions = (props) => {
   const toggleOpen = () => {