diff --git a/src/views/notification-center/common/NotificationUtilities.ts b/src/views/notification-center/common/NotificationUtilities.ts
index 25f82259..b41220fb 100644
--- a/src/views/notification-center/common/NotificationUtilities.ts
+++ b/src/views/notification-center/common/NotificationUtilities.ts
@@ -123,7 +123,7 @@ export class NotificationUtilities
         dispatchUiEvent(new NotificationConfirmEvent(type, this.cleanText(message), onConfirm, onCancel, confirmText, cancelText, title));
     }
 
-    public static simpleAlert(message: string, type: string, clickUrl: string = null, clickUrlText: string = null, title: string = null, imageUrl: string = null): void
+    public static simpleAlert(message: string, type: string = null, clickUrl: string = null, clickUrlText: string = null, title: string = null, imageUrl: string = null): void
     {
         if(!title || !title.length) title = LocalizeText('notifications.broadcast.title');
 
diff --git a/src/views/room/widgets/room-tools/RoomToolsWidgetView.scss b/src/views/room/widgets/room-tools/RoomToolsWidgetView.scss
index 044a286b..cebb0661 100644
--- a/src/views/room/widgets/room-tools/RoomToolsWidgetView.scss
+++ b/src/views/room/widgets/room-tools/RoomToolsWidgetView.scss
@@ -1,16 +1,12 @@
 .nitro-room-tools {
     position: absolute;
-    bottom: 125px;
-    left: -145px;
+    bottom: $toolbar-height + 65px;
+    left: 0;
     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;
     border-bottom-right-radius: $border-radius;
     transition: all .2s ease;
-    
-    &.open {
-        left: 0px;
-    }
 
     .list-group-item {
         background: transparent;
diff --git a/src/views/shared/currency-icon/CurrencyIcon.tsx b/src/views/shared/currency-icon/CurrencyIcon.tsx
index 5dc4551f..c2220150 100644
--- a/src/views/shared/currency-icon/CurrencyIcon.tsx
+++ b/src/views/shared/currency-icon/CurrencyIcon.tsx
@@ -1,10 +1,24 @@
-import { FC, useMemo } from 'react';
+import { CSSProperties, FC, useMemo } from 'react';
 import { GetConfiguration } from '../../../api';
-import { CurrencyIconProps } from './CurrencyIcon.types';
+import { Base, BaseProps } from '../../../common/Base';
+
+export interface CurrencyIconProps extends BaseProps<HTMLDivElement>
+{
+    type: number | string;
+}
 
 export const CurrencyIcon: FC<CurrencyIconProps> = props =>
 {
-    const { type = '', className = '', style = {}, ...rest } = props;
+    const { type = '', classNames = [], style = {}, ...rest } = props;
+
+    const getClassNames = useMemo(() =>
+    {
+        const newClassNames: string[] = [ 'nitro-currency-icon' ];
+
+        if(classNames.length) newClassNames.push(...classNames);
+
+        return newClassNames;
+    }, [ classNames ]);
 
     const urlString = useMemo(() =>
     {
@@ -15,7 +29,16 @@ export const CurrencyIcon: FC<CurrencyIconProps> = props =>
         return `url(${ url })`;
     }, [ type ]);
 
-    return (
-        <div className={ 'nitro-currency-icon ' + className } style={ { ...style, backgroundImage: urlString } } { ...rest } />
-    );
+    const getStyle = useMemo(() =>
+    {
+        let newStyle: CSSProperties = {};
+
+        newStyle.backgroundImage = urlString;
+
+        if(Object.keys(style).length) newStyle = { ...newStyle, ...style };
+
+        return newStyle;
+    }, [ style, urlString ]);
+
+    return <Base classNames={ getClassNames } style={ getStyle } { ...rest } />
 }
diff --git a/src/views/shared/currency-icon/CurrencyIcon.types.ts b/src/views/shared/currency-icon/CurrencyIcon.types.ts
deleted file mode 100644
index e6c34854..00000000
--- a/src/views/shared/currency-icon/CurrencyIcon.types.ts
+++ /dev/null
@@ -1,6 +0,0 @@
-import { DetailsHTMLAttributes } from 'react';
-
-export interface CurrencyIconProps extends DetailsHTMLAttributes<HTMLDivElement>
-{
-    type: number | string;
-}