diff --git a/res/css/views/messages/_MLocationBody.scss b/res/css/views/messages/_MLocationBody.scss
index de2a330522..eefb39004e 100644
--- a/res/css/views/messages/_MLocationBody.scss
+++ b/res/css/views/messages/_MLocationBody.scss
@@ -58,12 +58,11 @@ limitations under the License.
 
     .mx_MLocationBody_markerContents {
         background-color: $location-marker-color;
-        margin: 4px;
-        width: 24px;
-        height: 24px;
-        padding-top: 8px;
+        margin: 0;
+        width: 31px;
+        height: 31px;
         mask-repeat: no-repeat;
-        mask-size: contain;
+        mask-size: 16px;
         mask-position: center;
         mask-image: url('$(res)/img/element-icons/location.svg');
     }
diff --git a/src/components/views/messages/MLocationBody.tsx b/src/components/views/messages/MLocationBody.tsx
index 5d58822bfb..0d3ce4eebd 100644
--- a/src/components/views/messages/MLocationBody.tsx
+++ b/src/components/views/messages/MLocationBody.tsx
@@ -20,7 +20,7 @@ import { logger } from "matrix-js-sdk/src/logger";
 import { MatrixEvent } from 'matrix-js-sdk/src/models/event';
 import {
     ASSET_NODE_TYPE,
-    ASSET_TYPE_SELF,
+    LocationAssetType,
     ILocationContent,
     LOCATION_EVENT_TYPE,
 } from 'matrix-js-sdk/src/@types/location';
@@ -130,8 +130,8 @@ export default class MLocationBody extends React.Component<IBodyProps, IState> {
 
 export function isSelfLocation(locationContent: ILocationContent): boolean {
     const asset = ASSET_NODE_TYPE.findIn(locationContent) as { type: string };
-    const assetType = asset?.type ?? ASSET_TYPE_SELF;
-    return assetType == ASSET_TYPE_SELF;
+    const assetType = asset?.type ?? LocationAssetType.Self;
+    return assetType == LocationAssetType.Self;
 }
 
 interface ILocationBodyContentProps {
diff --git a/test/components/views/messages/MLocationBody-test.tsx b/test/components/views/messages/MLocationBody-test.tsx
index ced6cea3f8..d5b9665f3a 100644
--- a/test/components/views/messages/MLocationBody-test.tsx
+++ b/test/components/views/messages/MLocationBody-test.tsx
@@ -17,6 +17,7 @@ limitations under the License.
 import { makeLocationContent } from "matrix-js-sdk/src/content-helpers";
 import {
     ASSET_NODE_TYPE,
+    LocationAssetType,
     ILocationContent,
     LOCATION_EVENT_TYPE,
     TIMESTAMP_NODE_TYPE,
@@ -235,7 +236,7 @@ describe("MLocationBody", () => {
         });
 
         it("Returns false for an unknown asset type", () => {
-            const content = makeLocationContent("", "", 0, "", "org.example.unknown");
+            const content = makeLocationContent("", "", 0, "", "org.example.unknown" as unknown as LocationAssetType);
             expect(isSelfLocation(content)).toBe(false);
         });
     });