diff --git a/frontend/src/components/TradeBox/index.js b/frontend/src/components/TradeBox/index.js
index 18821ba8..fa632450 100644
--- a/frontend/src/components/TradeBox/index.js
+++ b/frontend/src/components/TradeBox/index.js
@@ -1434,7 +1434,16 @@ class TradeBox extends Component {
         {/* Make confirmation sound for Chat Open. */}
         {this.Sound('locked-invoice')}
         <Grid item xs={12} align='center'>
-          <div style={{ position: 'fixed', right: '-4em', top: '2.5em' }}>
+          <div
+            style={{
+              display: 'flex',
+              justifyContent: 'flex-end',
+              position: 'relative',
+              right: '0em',
+              top: '0em',
+              height: '0em',
+            }}
+          >
             <Tooltip
               enterTouchDelay={0}
               placement='top'
diff --git a/frontend/src/models/Chat.model.ts b/frontend/src/models/Chat.model.ts
deleted file mode 100644
index 9d5f9ddb..00000000
--- a/frontend/src/models/Chat.model.ts
+++ /dev/null
@@ -1,23 +0,0 @@
-export interface WebSocketsChatMessage {
-  userNick: string;
-  validSignature: boolean;
-  plainTextMessage: string;
-  encryptedMessage: string;
-  time: Date;
-  index: number;
-}
-
-export interface APIChatMessage {
-  nick: string;
-  time: Date;
-  message: string;
-  index: number;
-}
-
-export interface APIChat {
-  peer_pubkey: string;
-  peer_connected: boolean;
-  messages: APIChatMessage[];
-}
-
-export default APIChat;
diff --git a/frontend/src/models/Order.model.ts b/frontend/src/models/Order.model.ts
index 4819091c..2b875c86 100644
--- a/frontend/src/models/Order.model.ts
+++ b/frontend/src/models/Order.model.ts
@@ -1,5 +1,3 @@
-import { APIChat } from '.';
-
 export interface TradeRobotSummary {
   sent_fiat: number;
   received_sats: number;
@@ -85,7 +83,7 @@ export interface Order {
   trade_fee_percent: number;
   bond_size_sats: number;
   bond_size_percent: number;
-  chat: APIChat;
+  chat_last_index: number;
   maker_summary: TradeRobotSummary;
   taker_summary: TradeRobotSummary;
   platform_summary: TradeCoordinatorSummary;
diff --git a/frontend/src/models/index.ts b/frontend/src/models/index.ts
index c41dfae2..fb5210a4 100644
--- a/frontend/src/models/index.ts
+++ b/frontend/src/models/index.ts
@@ -12,7 +12,6 @@ export type { Info } from './Info.model';
 export type { Language } from './Settings.model';
 export type { Favorites } from './Favorites.model';
 export type { Coordinator } from './Coordinator.model';
-export type { APIChat, WebSocketsChatMessage, APIChatMessage } from './Chat.model';
 
 export { defaultMaker } from './Maker.model';
 export { defaultInfo } from './Info.model';