diff --git a/src/assets/images/icons/chat-history.png b/src/assets/images/icons/chat-history.png
new file mode 100644
index 00000000..da51f37e
Binary files /dev/null and b/src/assets/images/icons/chat-history.png differ
diff --git a/src/assets/images/icons/cog.png b/src/assets/images/icons/cog.png
new file mode 100644
index 00000000..b7101d71
Binary files /dev/null and b/src/assets/images/icons/cog.png differ
diff --git a/src/assets/images/icons/like-room.png b/src/assets/images/icons/like-room.png
new file mode 100644
index 00000000..1c13cd85
Binary files /dev/null and b/src/assets/images/icons/like-room.png differ
diff --git a/src/assets/images/icons/room-link.png b/src/assets/images/icons/room-link.png
new file mode 100644
index 00000000..efbebf4a
Binary files /dev/null and b/src/assets/images/icons/room-link.png differ
diff --git a/src/assets/images/icons/small-room.png b/src/assets/images/icons/small-room.png
new file mode 100644
index 00000000..c8bbbccc
Binary files /dev/null and b/src/assets/images/icons/small-room.png differ
diff --git a/src/assets/images/icons/zoom-less.png b/src/assets/images/icons/zoom-less.png
new file mode 100644
index 00000000..36423da8
Binary files /dev/null and b/src/assets/images/icons/zoom-less.png differ
diff --git a/src/assets/images/icons/zoom-more.png b/src/assets/images/icons/zoom-more.png
new file mode 100644
index 00000000..c14a9e8d
Binary files /dev/null and b/src/assets/images/icons/zoom-more.png differ
diff --git a/src/assets/styles/icons.scss b/src/assets/styles/icons.scss
index a53d7b2b..e73bd296 100644
--- a/src/assets/styles/icons.scss
+++ b/src/assets/styles/icons.scss
@@ -303,6 +303,48 @@
         height: 15px;
     }
 
+    &.icon-small-room {
+        background: url("../images/icons/small-room.png");
+        width: 17px;
+        height: 16px;
+    }
+
+    &.icon-cog {
+        background: url("../images/icons/cog.png");
+        width: 21px;
+        height: 21px;
+    }
+
+    &.icon-chat-history {
+        background: url("../images/icons/chat-history.png");
+        width: 17px;
+        height: 21px;
+    }
+
+    &.icon-room-link {
+        background: url("../images/icons/room-link.png");
+        width: 17px;
+        height: 15px;
+    }
+
+    &.icon-zoom-more {
+        background: url("../images/icons/zoom-more.png");
+        width: 12px;
+        height: 22px;
+    }
+
+    &.icon-zoom-less {
+        background: url("../images/icons/zoom-less.png");
+        width: 12px;
+        height: 22px;
+    }
+
+    &.icon-like-room {
+        background: url("../images/icons/like-room.png");
+        width: 20px;
+        height: 22px;
+    }
+
     &.icon-arrows {
         background: url("../images/icons/arrows.png");
         width: 17px;
diff --git a/src/views/chat-history/ChatHistoryView.tsx b/src/views/chat-history/ChatHistoryView.tsx
index f80ddbbd..acb432ea 100644
--- a/src/views/chat-history/ChatHistoryView.tsx
+++ b/src/views/chat-history/ChatHistoryView.tsx
@@ -80,18 +80,19 @@ export const ChatHistoryView: FC<{}> = props =>
                 parent={props.parent}
                 rowIndex={props.index}
             >
-                <div key={props.key} style={props.style} className="row chathistory-entry justify-content-start">
+                <div key={props.key} style={props.style} className="chathistory-entry justify-content-start">
                     {(item.type === ChatEntryType.TYPE_CHAT) &&
-                    <div className={`col d-flex flex-wrap text-break text-wrap ${isDark ? 'dark' : 'light'}`}>
-                        <div className="p-1">{item.timestamp}</div>
-                        <div className="p-1 fw-bold cursor-pointer" dangerouslySetInnerHTML={ { __html: (item.name + ':') }} />
-                        <div className="p-1 text-break text-wrap">{item.message}</div>
+                    <div className={`p-1 d-flex gap-1 ${isDark ? 'dark' : 'light'}`}>
+                        <div className="text-muted">{item.timestamp}</div>
+                        <div className="cursor-pointer d-flex text-nowrap" dangerouslySetInnerHTML={ { __html: (item.name + ':') }} />
+                        <div className="text-break text-wrap flex-grow-1">{item.message}</div>
                     </div>
                     }
                     {(item.type === ChatEntryType.TYPE_ROOM_INFO) &&
-                    <div className={`col d-flex flex-wrap text-break text-wrap ${isDark ? 'dark' : 'light'}`}>
-                        <div className="p-1">{item.timestamp}</div>
-                        <div className="p-1 fw-bold cursor-pointer">{item.name}</div>
+                    <div className={`p-1 d-flex gap-1 ${isDark ? 'dark' : 'light'}`}>
+                        <div className="text-muted">{item.timestamp}</div>
+                        <i className="icon icon-small-room" />
+                        <div className="cursor-pointer text-break text-wrap">{item.name}</div>
                     </div>
                     }
                     
@@ -134,9 +135,9 @@ export const ChatHistoryView: FC<{}> = props =>
         <ChatHistoryContextProvider value={ { chatHistoryState, roomHistoryState } }>
             <ChatHistoryMessageHandler />
             {isVisible &&
-            <NitroCardView uniqueKey="chat-history" className="nitro-chat-history" simple={ false }  theme={'dark'} >
+            <NitroCardView uniqueKey="chat-history" className="nitro-chat-history" simple={ false } theme={'dark'} >
                 <NitroCardHeaderView headerText={ 'Chat History' } onCloseClick={ event => setIsVisible(false) } theme={'dark'}/>
-                <NitroCardContentView className="chat-history-content" theme={'dark'}>
+                <NitroCardContentView className="chat-history-content p-0" theme={'dark'}>
                     <div className="row w-100 h-100 chat-history-container">
                             <AutoSizer defaultWidth={300} defaultHeight={200} onResize={onResize}>
                                 {({ height, width }) => 
diff --git a/src/views/floorplan-editor/FloorplanEditorView.tsx b/src/views/floorplan-editor/FloorplanEditorView.tsx
index 48a7d34b..67778b47 100644
--- a/src/views/floorplan-editor/FloorplanEditorView.tsx
+++ b/src/views/floorplan-editor/FloorplanEditorView.tsx
@@ -122,7 +122,7 @@ export const FloorplanEditorView: FC<{}> = props =>
         <>
             <FloorplanEditorContextProvider value={{ originalFloorplanSettings: originalFloorplanSettings, setOriginalFloorplanSettings: setOriginalFloorplanSettings, visualizationSettings: visualizationSettings, setVisualizationSettings: setVisualizationSettings }}>
                 {isVisible &&
-                    <NitroCardView className="nitro-floorplan-editor">
+                    <NitroCardView uniqueKey="floorpan-editor" className="nitro-floorplan-editor" simple={ true }>
                         <NitroCardHeaderView headerText={LocalizeText('floor.plan.editor.title')} onCloseClick={() => setIsVisible(false)} />
                         <NitroCardContentView>
                             <NitroLayoutGrid>
diff --git a/src/views/floorplan-editor/common/FloorplanEditor.ts b/src/views/floorplan-editor/common/FloorplanEditor.ts
index 7d1aad13..06e37db6 100644
--- a/src/views/floorplan-editor/common/FloorplanEditor.ts
+++ b/src/views/floorplan-editor/common/FloorplanEditor.ts
@@ -30,7 +30,7 @@ export class FloorplanEditor extends PixiApplicationProxy
         super({
             width: width,
             height: height,
-            backgroundColor: 0x2b2b2b,
+            backgroundColor: 0x000000,
             antialias: true,
             autoDensity: true,
             resolution: 1,
diff --git a/src/views/floorplan-editor/views/FloorplanCanvasView.tsx b/src/views/floorplan-editor/views/FloorplanCanvasView.tsx
index a52fae94..870b8c79 100644
--- a/src/views/floorplan-editor/views/FloorplanCanvasView.tsx
+++ b/src/views/floorplan-editor/views/FloorplanCanvasView.tsx
@@ -105,7 +105,9 @@ export const FloorplanCanvasView: FC<{}> = props =>
         </NitroLayoutFlex>
         <NitroLayoutFlex className="align-items-center justify-content-center">
             <div className="arrow-button"><button className="btn btn-primary" onClick={() => onClickArrowButton('left')}><i className="fas fa-arrow-left"/></button></div>
-            <div ref={elementRef} className="editor-area" />
+            <div className="rounded-2 overflow-hidden">
+                <div ref={elementRef} className="editor-area" />
+            </div>
             <div className="arrow-button"><button className="btn btn-primary" onClick={() => onClickArrowButton('right')}><i className="fas fa-arrow-right"/></button></div>
         </NitroLayoutFlex>
         <NitroLayoutFlex className="align-items-center justify-content-center">
diff --git a/src/views/room/widgets/room-tools/RoomToolsWidgetView.scss b/src/views/room/widgets/room-tools/RoomToolsWidgetView.scss
index 51e42d8f..044a286b 100644
--- a/src/views/room/widgets/room-tools/RoomToolsWidgetView.scss
+++ b/src/views/room/widgets/room-tools/RoomToolsWidgetView.scss
@@ -1,7 +1,7 @@
 .nitro-room-tools {
     position: absolute;
     bottom: 125px;
-    left: -133px;
+    left: -145px;
     background: rgba($dark,.95);
     box-shadow: inset 0px 5px lighten(rgba($dark,.6),2.5), inset 0 -4px darken(rgba($dark,.6),4);
     border-top-right-radius: $border-radius;
@@ -36,4 +36,16 @@
             opacity: .5;
         }
     }
+
+    .tools-item {
+        .icon {
+            width: 22px;
+            background-repeat: no-repeat;
+            background-position: center;
+        }
+
+        &:hover {
+            text-decoration: underline;
+        }
+    }
 }
diff --git a/src/views/room/widgets/room-tools/RoomToolsWidgetView.tsx b/src/views/room/widgets/room-tools/RoomToolsWidgetView.tsx
index d52ef382..d9e9b6e8 100644
--- a/src/views/room/widgets/room-tools/RoomToolsWidgetView.tsx
+++ b/src/views/room/widgets/room-tools/RoomToolsWidgetView.tsx
@@ -45,21 +45,21 @@ export const RoomToolsWidgetView: FC<{}> = props =>
     
     return (
         <div className={'nitro-room-tools ps-3 d-flex' + classNames({ ' open': isExpended })}>
-            <div className="list-group list-group-flush w-100 me-1">
-                <div className="list-group-item" onClick={ () => handleToolClick('settings') }>
-                    <i className="fas fa-cog me-2" />{ LocalizeText('room.settings.button.text') }
+            <div className="d-flex flex-column gap-2 w-100 py-2 pe-2">
+                <div className="d-flex align-items-center gap-2 cursor-pointer tools-item" onClick={ () => handleToolClick('settings') }>
+                    <i className="icon icon-cog" /> { LocalizeText('room.settings.button.text') }
                 </div>
-                <div className="list-group-item" onClick={ () => handleToolClick('zoom') }>
-                    <i className={ 'fas me-2 ' +classNames({ 'fa-search-minus': !isZoomedIn, 'fa-search-plus': isZoomedIn }) } />{ LocalizeText('room.zoom.button.text') }
+                <div className="d-flex align-items-center gap-2 cursor-pointer tools-item" onClick={ () => handleToolClick('zoom') }>
+                    <i className={ 'icon ' +classNames({ 'icon-zoom-less': !isZoomedIn, 'icon-zoom-more': isZoomedIn }) } />{ LocalizeText('room.zoom.button.text') }
                 </div>
-                <div className="list-group-item" onClick={ () => handleToolClick('chat_history') }>
-                    <i className="fas fa-comment-alt me-2" />{ LocalizeText('room.chathistory.button.text') }
+                <div className="d-flex align-items-center gap-2 cursor-pointer tools-item" onClick={ () => handleToolClick('chat_history') }>
+                    <i className="icon icon-chat-history" />{ LocalizeText('room.chathistory.button.text') }
                 </div>
-                <div className={ 'list-group-item' + classNames({ ' disabled': isLiked })} onClick={ () => handleToolClick('like_room') }>
-                    <i className="fas fa-heart me-2" />{ LocalizeText('room.like.button.text') }
+                <div className={ 'd-flex align-items-center gap-2 cursor-pointer tools-item' + classNames({ ' disabled': isLiked })} onClick={ () => handleToolClick('like_room') }>
+                    <i className="icon icon-like-room" /> { LocalizeText('room.like.button.text') }
                 </div>
-                <div className="list-group-item" onClick={ () => handleToolClick('toggle_room_link') }>
-                    <i className="fas fa-link me-2" />{ LocalizeText('navigator.embed.caption') }
+                <div className="d-flex align-items-center gap-2 cursor-pointer tools-item" onClick={ () => handleToolClick('toggle_room_link') }>
+                    <i className="icon icon-room-link" />{ LocalizeText('navigator.embed.caption') }
                 </div>
             </div>
             <div className="cursor-pointer d-flex align-items-center px-2" onClick={() => setIsExpanded(value => !value)}>