diff --git a/src/icons/flowTypes.js b/src/icons/flowTypes.js.flow
similarity index 100%
rename from src/icons/flowTypes.js
rename to src/icons/flowTypes.js.flow
diff --git a/src/icons/flowTypes.ts b/src/icons/flowTypes.ts
new file mode 100644
index 0000000000..2cfec682ac
--- /dev/null
+++ b/src/icons/flowTypes.ts
@@ -0,0 +1,25 @@
+import { ReactElement } from 'react';
+
+export interface Icon {
+    /** Class name for the icon */
+    className?: string;
+    /** A string describing the color for the icon */
+    color?: string;
+    /** A number specifying the height of the icon */
+    height?: number;
+    /** A string describing the icon if it's not purely decorative for accessibility */
+    title?: string | ReactElement;
+    /** A number specifying the width of the icon */
+    width?: number;
+}
+
+export interface TwoTonedIcon {
+    /** Class name for the icon */
+    className?: string;
+    /** A number specifying the height of the icon */
+    height?: number;
+    /** A string describing the icon if it's not purely decorative for accessibility */
+    title?: string | ReactElement;
+    /** A number specifying the width of the icon */
+    width?: number;
+}
diff --git a/src/icons/general/__tests__/IconShield.test.tsx b/src/icons/general/__tests__/IconShield.test.tsx
index 19db659891..33d0640538 100644
--- a/src/icons/general/__tests__/IconShield.test.tsx
+++ b/src/icons/general/__tests__/IconShield.test.tsx
@@ -1,4 +1,3 @@
-// @flow
 import * as React from 'react';
 import { shallow } from 'enzyme';
 
diff --git a/src/icons/states/__tests__/UsersEmptyState.test.tsx b/src/icons/states/__tests__/UsersEmptyState.test.tsx
index d3cf38f41e..b41d71e311 100644
--- a/src/icons/states/__tests__/UsersEmptyState.test.tsx
+++ b/src/icons/states/__tests__/UsersEmptyState.test.tsx
@@ -1,4 +1,3 @@
-// @flow
 import * as React from 'react';
 import { shallow } from 'enzyme';
 import UsersEmptyState from '../UsersEmptyState';