diff --git a/src/components/views/elements/InlineSpinner.tsx b/src/components/views/elements/InlineSpinner.tsx
index 934f19205f..b7d0829acd 100644
--- a/src/components/views/elements/InlineSpinner.tsx
+++ b/src/components/views/elements/InlineSpinner.tsx
@@ -19,8 +19,9 @@ import {_t} from "../../../languageHandler";
 import {replaceableComponent} from "../../../utils/replaceableComponent";
 
 interface IProps {
-    w?: number,
-    h?: number,
+    w?: number;
+    h?: number;
+    children?: React.ReactNode;
 }
 
 @replaceableComponent("views.elements.InlineSpinner")
@@ -37,7 +38,9 @@ export default class InlineSpinner extends React.PureComponent<IProps> {
                     className="mx_InlineSpinner_icon mx_Spinner_icon"
                     style={{width: this.props.w, height: this.props.h}}
                     aria-label={_t("Loading...")}
-                />
+                >
+                    {this.props.children}
+                </div>
             </div>
         );
     }
diff --git a/src/components/views/elements/TooltipButton.js b/src/components/views/elements/TooltipButton.tsx
similarity index 90%
rename from src/components/views/elements/TooltipButton.js
rename to src/components/views/elements/TooltipButton.tsx
index c5ebb3b1aa..1232f48695 100644
--- a/src/components/views/elements/TooltipButton.js
+++ b/src/components/views/elements/TooltipButton.tsx
@@ -19,8 +19,16 @@ import React from 'react';
 import * as sdk from '../../../index';
 import {replaceableComponent} from "../../../utils/replaceableComponent";
 
+interface IProps {
+    helpText: string;
+}
+
+interface IState {
+    hover: boolean;
+}
+
 @replaceableComponent("views.elements.TooltipButton")
-export default class TooltipButton extends React.Component {
+export default class TooltipButton extends React.Component<IProps, IState> {
     state = {
         hover: false,
     };