diff --git a/ts/components/calling/CallButtons.tsx b/ts/components/calling/CallButtons.tsx
index fee0d3170..ac877568d 100644
--- a/ts/components/calling/CallButtons.tsx
+++ b/ts/components/calling/CallButtons.tsx
@@ -10,6 +10,47 @@ import { DropDownAndToggleButton } from '../icon/DropDownAndToggleButton';
 import styled from 'styled-components';
 import { SessionContextMenuContainer } from '../SessionContextMenuContainer';
 
+const VideoInputMenu = ({
+  triggerId,
+  camerasList,
+}: {
+  triggerId: string;
+  camerasList: Array<InputItem>;
+}) => {
+  return (
+    <SessionContextMenuContainer>
+      <Menu id={triggerId} animation={animation.fade}>
+        {camerasList.map(m => {
+          return (
+            <Item
+              key={m.deviceId}
+              onClick={() => {
+                void CallManager.selectCameraByDeviceId(m.deviceId);
+              }}
+            >
+              {m.label.substr(0, 40)}
+            </Item>
+          );
+        })}
+      </Menu>
+    </SessionContextMenuContainer>
+  );
+};
+
+const showVideoInputMenu = (
+  currentConnectedCameras: Array<InputItem>,
+  e: React.MouseEvent<HTMLDivElement>
+) => {
+  if (currentConnectedCameras.length === 0) {
+    ToastUtils.pushNoCameraFound();
+    return;
+  }
+  contextMenu.show({
+    id: videoTriggerId,
+    event: e,
+  });
+};
+
 const videoTriggerId = 'video-menu-trigger-id';
 const audioTriggerId = 'audio-menu-trigger-id';
 const audioOutputTriggerId = 'audio-output-menu-trigger-id';
@@ -42,6 +83,47 @@ export const VideoInputButton = ({
   );
 };
 
+const AudioInputMenu = ({
+  triggerId,
+  audioInputsList,
+}: {
+  triggerId: string;
+  audioInputsList: Array<InputItem>;
+}) => {
+  return (
+    <SessionContextMenuContainer>
+      <Menu id={triggerId} animation={animation.fade}>
+        {audioInputsList.map(m => {
+          return (
+            <Item
+              key={m.deviceId}
+              onClick={() => {
+                void CallManager.selectAudioInputByDeviceId(m.deviceId);
+              }}
+            >
+              {m.label.substr(0, 40)}
+            </Item>
+          );
+        })}
+      </Menu>
+    </SessionContextMenuContainer>
+  );
+};
+
+const showAudioInputMenu = (
+  currentConnectedAudioInputs: Array<any>,
+  e: React.MouseEvent<HTMLDivElement>
+) => {
+  if (currentConnectedAudioInputs.length === 0) {
+    ToastUtils.pushNoAudioInputFound();
+    return;
+  }
+  contextMenu.show({
+    id: audioTriggerId,
+    event: e,
+  });
+};
+
 export const AudioInputButton = ({
   currentConnectedAudioInputs,
   isAudioMuted,
@@ -70,6 +152,47 @@ export const AudioInputButton = ({
   );
 };
 
+const AudioOutputMenu = ({
+  triggerId,
+  audioOutputsList,
+}: {
+  triggerId: string;
+  audioOutputsList: Array<InputItem>;
+}) => {
+  return (
+    <SessionContextMenuContainer>
+      <Menu id={triggerId} animation={animation.fade}>
+        {audioOutputsList.map(m => {
+          return (
+            <Item
+              key={m.deviceId}
+              onClick={() => {
+                void CallManager.selectAudioOutputByDeviceId(m.deviceId);
+              }}
+            >
+              {m.label.substr(0, 40)}
+            </Item>
+          );
+        })}
+      </Menu>
+    </SessionContextMenuContainer>
+  );
+};
+
+const showAudioOutputMenu = (
+  currentConnectedAudioOutputs: Array<any>,
+  e: React.MouseEvent<HTMLDivElement>
+) => {
+  if (currentConnectedAudioOutputs.length === 0) {
+    ToastUtils.pushNoAudioOutputFound();
+    return;
+  }
+  contextMenu.show({
+    id: audioOutputTriggerId,
+    event: e,
+  });
+};
+
 export const AudioOutputButton = ({
   currentConnectedAudioOutputs,
   isAudioOutputMuted,
@@ -101,87 +224,6 @@ export const AudioOutputButton = ({
   );
 };
 
-const VideoInputMenu = ({
-  triggerId,
-  camerasList,
-}: {
-  triggerId: string;
-  camerasList: Array<InputItem>;
-}) => {
-  return (
-    <SessionContextMenuContainer>
-      <Menu id={triggerId} animation={animation.fade}>
-        {camerasList.map(m => {
-          return (
-            <Item
-              key={m.deviceId}
-              onClick={() => {
-                void CallManager.selectCameraByDeviceId(m.deviceId);
-              }}
-            >
-              {m.label.substr(0, 40)}
-            </Item>
-          );
-        })}
-      </Menu>
-    </SessionContextMenuContainer>
-  );
-};
-
-const AudioInputMenu = ({
-  triggerId,
-  audioInputsList,
-}: {
-  triggerId: string;
-  audioInputsList: Array<InputItem>;
-}) => {
-  return (
-    <SessionContextMenuContainer>
-      <Menu id={triggerId} animation={animation.fade}>
-        {audioInputsList.map(m => {
-          return (
-            <Item
-              key={m.deviceId}
-              onClick={() => {
-                void CallManager.selectAudioInputByDeviceId(m.deviceId);
-              }}
-            >
-              {m.label.substr(0, 40)}
-            </Item>
-          );
-        })}
-      </Menu>
-    </SessionContextMenuContainer>
-  );
-};
-
-const AudioOutputMenu = ({
-  triggerId,
-  audioOutputsList,
-}: {
-  triggerId: string;
-  audioOutputsList: Array<InputItem>;
-}) => {
-  return (
-    <SessionContextMenuContainer>
-      <Menu id={triggerId} animation={animation.fade}>
-        {audioOutputsList.map(m => {
-          return (
-            <Item
-              key={m.deviceId}
-              onClick={() => {
-                void CallManager.selectAudioOutputByDeviceId(m.deviceId);
-              }}
-            >
-              {m.label.substr(0, 40)}
-            </Item>
-          );
-        })}
-      </Menu>
-    </SessionContextMenuContainer>
-  );
-};
-
 const ShowInFullScreenButton = ({ isFullScreen }: { isFullScreen: boolean }) => {
   const dispatch = useDispatch();
 
@@ -198,10 +240,10 @@ const ShowInFullScreenButton = ({ isFullScreen }: { isFullScreen: boolean }) =>
       iconSize={60}
       iconPadding="20px"
       iconType="fullscreen"
-      backgroundColor="white"
+      backgroundColor="var(--white-color)"
       borderRadius="50%"
       onClick={showInFullScreen}
-      iconColor="black"
+      iconColor="var(--black-color)"
       margin="10px"
     />
   );
@@ -222,57 +264,15 @@ export const HangUpButton = () => {
       iconSize={60}
       iconPadding="20px"
       iconType="hangup"
-      backgroundColor="white"
+      backgroundColor="var(--white-color)"
       borderRadius="50%"
       onClick={handleEndCall}
-      iconColor="red"
+      iconColor="var(--red-color)"
       margin="10px"
     />
   );
 };
 
-const showAudioInputMenu = (
-  currentConnectedAudioInputs: Array<any>,
-  e: React.MouseEvent<HTMLDivElement>
-) => {
-  if (currentConnectedAudioInputs.length === 0) {
-    ToastUtils.pushNoAudioInputFound();
-    return;
-  }
-  contextMenu.show({
-    id: audioTriggerId,
-    event: e,
-  });
-};
-
-const showAudioOutputMenu = (
-  currentConnectedAudioOutputs: Array<any>,
-  e: React.MouseEvent<HTMLDivElement>
-) => {
-  if (currentConnectedAudioOutputs.length === 0) {
-    ToastUtils.pushNoAudioOutputFound();
-    return;
-  }
-  contextMenu.show({
-    id: audioOutputTriggerId,
-    event: e,
-  });
-};
-
-const showVideoInputMenu = (
-  currentConnectedCameras: Array<InputItem>,
-  e: React.MouseEvent<HTMLDivElement>
-) => {
-  if (currentConnectedCameras.length === 0) {
-    ToastUtils.pushNoCameraFound();
-    return;
-  }
-  contextMenu.show({
-    id: videoTriggerId,
-    event: e,
-  });
-};
-
 const handleCameraToggle = async (
   currentConnectedCameras: Array<InputItem>,
   localStreamVideoIsMuted: boolean
diff --git a/ts/components/calling/CallInFullScreenContainer.tsx b/ts/components/calling/CallInFullScreenContainer.tsx
index 282200655..15763be6d 100644
--- a/ts/components/calling/CallInFullScreenContainer.tsx
+++ b/ts/components/calling/CallInFullScreenContainer.tsx
@@ -21,8 +21,8 @@ const CallInFullScreenVisible = styled.div`
   left: 0;
   display: flex;
   flex-direction: column;
-  background-color: black;
-  border: var(--session-border);
+  background-color: var(--black-color);
+  border: var(--border-color);
   opacity: 1;
 `;
 
diff --git a/ts/components/calling/DraggableCallContainer.tsx b/ts/components/calling/DraggableCallContainer.tsx
index 3de4ed894..47f93083c 100644
--- a/ts/components/calling/DraggableCallContainer.tsx
+++ b/ts/components/calling/DraggableCallContainer.tsx
@@ -15,13 +15,13 @@ import { SectionType } from '../../state/ducks/section';
 export const DraggableCallWindow = styled.div`
   position: absolute;
   z-index: 9;
-  box-shadow: 0px 0px 10px 0px #000000;
+  box-shadow: 0px 0px 10px 0px var(--black-color);
   max-height: 300px;
   width: 12vw;
   display: flex;
   flex-direction: column;
-  background-color: var(--color-modal-background);
-  border: var(--session-border);
+  background-color: var(--modal-background-color);
+  border: var(--border-color);
 `;
 
 export const StyledVideoElement = styled.video<{ isVideoMuted: boolean }>`
diff --git a/ts/components/calling/InConversationCallContainer.tsx b/ts/components/calling/InConversationCallContainer.tsx
index cdac965a9..731a1d957 100644
--- a/ts/components/calling/InConversationCallContainer.tsx
+++ b/ts/components/calling/InConversationCallContainer.tsx
@@ -34,6 +34,7 @@ const InConvoCallWindow = styled.div`
   padding: 1rem;
   display: flex;
 
+  /* TODO Theming - Update? */
   background-color: hsl(0, 0%, 15.7%);
 
   flex-shrink: 1;
@@ -68,7 +69,8 @@ const StyledCenteredLabel = styled.div`
   transform: translateX(-50%);
   height: min-content;
   white-space: nowrap;
-  color: white;
+  /* TODO Theming - Update? */
+  color: var(--white-color);
   text-shadow: 0px 0px 8px white;
   z-index: 5;
 `;
diff --git a/ts/components/calling/IncomingCallDialog.tsx b/ts/components/calling/IncomingCallDialog.tsx
index d47169c59..e7a662752 100644
--- a/ts/components/calling/IncomingCallDialog.tsx
+++ b/ts/components/calling/IncomingCallDialog.tsx
@@ -20,8 +20,8 @@ export const CallWindow = styled.div`
   transform: translate(-50%, -50%);
   display: flex;
   flex-direction: column;
-  background-color: var(--color-modal-background);
-  border: var(--session-border);
+  background-color: var(--modal-background-color);
+  border: var(--border-color);
 `;
 
 const IncomingCallAvatarContainer = styled.div`
diff --git a/ts/components/dialog/SessionConfirm.tsx b/ts/components/dialog/SessionConfirm.tsx
index 7294f3a23..1814fec37 100644
--- a/ts/components/dialog/SessionConfirm.tsx
+++ b/ts/components/dialog/SessionConfirm.tsx
@@ -140,7 +140,7 @@ export const SessionConfirm = (props: SessionConfirmDialogProps) => {
         {!hideCancel && (
           <SessionButton
             text={cancelText}
-            buttonColor={closeTheme}
+            buttonColor={!okTheme ? closeTheme : undefined}
             buttonType={SessionButtonType.Simple}
             onClick={onClickCancelHandler}
             dataTestId="session-confirm-cancel-button"
diff --git a/ts/components/icon/DropDownAndToggleButton.tsx b/ts/components/icon/DropDownAndToggleButton.tsx
index 1558e8e3f..74e49e38e 100644
--- a/ts/components/icon/DropDownAndToggleButton.tsx
+++ b/ts/components/icon/DropDownAndToggleButton.tsx
@@ -12,8 +12,8 @@ type SProps = {
 };
 
 const StyledRoundedButton = styled.div<{ isMuted: boolean }>`
-  background-color: ${props => (props.isMuted ? 'hsl(0,0%,40%)' : 'white')};
-  color: ${props => (props.isMuted ? 'white' : 'black')};
+  background-color: ${props => (props.isMuted ? 'hsl(0,0%,40%)' : 'var(--white-color)')};
+  color: ${props => (props.isMuted ? 'var(--white-color)' : 'var(--black-color)')};
   border-radius: 50%;
   cursor: pointer;
 
diff --git a/ts/components/icon/SessionIcon.tsx b/ts/components/icon/SessionIcon.tsx
index d4bba15a6..dda4a5741 100644
--- a/ts/components/icon/SessionIcon.tsx
+++ b/ts/components/icon/SessionIcon.tsx
@@ -101,7 +101,7 @@ const animation = (props: {
 }) => {
   if (props.rotateDuration) {
     return css`
-      ${rotate} ${props.rotateDuration}s infinite linear;
+      ${rotate} ${props.rotateDuration}s linear infinite;
     `;
   }
   if (props.noScale) {