diff --git a/README.md b/README.md index 28e82735f0..c0f95144b4 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -
+
diff --git a/domain-server/resources/web/web-new/dist/spa/favicon.ico b/domain-server/resources/web/web-new/dist/spa/favicon.ico
index a74299c83d..da5ec2ef6f 100644
Binary files a/domain-server/resources/web/web-new/dist/spa/favicon.ico and b/domain-server/resources/web/web-new/dist/spa/favicon.ico differ
diff --git a/domain-server/resources/web/web-new/dist/spa/icons/favicon-128x128.png b/domain-server/resources/web/web-new/dist/spa/icons/favicon-128x128.png
index 8113a603c0..422a329b66 100644
Binary files a/domain-server/resources/web/web-new/dist/spa/icons/favicon-128x128.png and b/domain-server/resources/web/web-new/dist/spa/icons/favicon-128x128.png differ
diff --git a/domain-server/resources/web/web-new/dist/spa/icons/favicon-16x16.png b/domain-server/resources/web/web-new/dist/spa/icons/favicon-16x16.png
index 7f2ab3cf82..8064e65990 100644
Binary files a/domain-server/resources/web/web-new/dist/spa/icons/favicon-16x16.png and b/domain-server/resources/web/web-new/dist/spa/icons/favicon-16x16.png differ
diff --git a/domain-server/resources/web/web-new/dist/spa/icons/favicon-32x32.png b/domain-server/resources/web/web-new/dist/spa/icons/favicon-32x32.png
index 0b9c7aed25..b71cf2c576 100644
Binary files a/domain-server/resources/web/web-new/dist/spa/icons/favicon-32x32.png and b/domain-server/resources/web/web-new/dist/spa/icons/favicon-32x32.png differ
diff --git a/domain-server/resources/web/web-new/dist/spa/icons/favicon-96x96.png b/domain-server/resources/web/web-new/dist/spa/icons/favicon-96x96.png
index 52b28f771c..7a93ba5a62 100644
Binary files a/domain-server/resources/web/web-new/dist/spa/icons/favicon-96x96.png and b/domain-server/resources/web/web-new/dist/spa/icons/favicon-96x96.png differ
diff --git a/domain-server/resources/web/web-new/public/favicon.ico b/domain-server/resources/web/web-new/public/favicon.ico
index a74299c83d..da5ec2ef6f 100644
Binary files a/domain-server/resources/web/web-new/public/favicon.ico and b/domain-server/resources/web/web-new/public/favicon.ico differ
diff --git a/domain-server/resources/web/web-new/public/icons/favicon-128x128.png b/domain-server/resources/web/web-new/public/icons/favicon-128x128.png
index 8113a603c0..422a329b66 100644
Binary files a/domain-server/resources/web/web-new/public/icons/favicon-128x128.png and b/domain-server/resources/web/web-new/public/icons/favicon-128x128.png differ
diff --git a/domain-server/resources/web/web-new/public/icons/favicon-16x16.png b/domain-server/resources/web/web-new/public/icons/favicon-16x16.png
index 7f2ab3cf82..8064e65990 100644
Binary files a/domain-server/resources/web/web-new/public/icons/favicon-16x16.png and b/domain-server/resources/web/web-new/public/icons/favicon-16x16.png differ
diff --git a/domain-server/resources/web/web-new/public/icons/favicon-32x32.png b/domain-server/resources/web/web-new/public/icons/favicon-32x32.png
index 0b9c7aed25..b71cf2c576 100644
Binary files a/domain-server/resources/web/web-new/public/icons/favicon-32x32.png and b/domain-server/resources/web/web-new/public/icons/favicon-32x32.png differ
diff --git a/domain-server/resources/web/web-new/public/icons/favicon-96x96.png b/domain-server/resources/web/web-new/public/icons/favicon-96x96.png
index 52b28f771c..7a93ba5a62 100644
Binary files a/domain-server/resources/web/web-new/public/icons/favicon-96x96.png and b/domain-server/resources/web/web-new/public/icons/favicon-96x96.png differ
diff --git a/domain-server/resources/web/web-new/src/assets/brand-icon-1024.png b/domain-server/resources/web/web-new/src/assets/brand-icon-1024.png
new file mode 100644
index 0000000000..9fed7d47c7
Binary files /dev/null and b/domain-server/resources/web/web-new/src/assets/brand-icon-1024.png differ
diff --git a/interface/icon/interface-beta.icns b/interface/icon/interface-beta.icns
index 9044dbfbf7..b0306726e7 100644
Binary files a/interface/icon/interface-beta.icns and b/interface/icon/interface-beta.icns differ
diff --git a/interface/icon/interface-beta.ico b/interface/icon/interface-beta.ico
index 5c279fd5c1..e7a2203688 100644
Binary files a/interface/icon/interface-beta.ico and b/interface/icon/interface-beta.ico differ
diff --git a/interface/icon/interface.icns b/interface/icon/interface.icns
index 4e4df39d69..2620113979 100644
Binary files a/interface/icon/interface.icns and b/interface/icon/interface.icns differ
diff --git a/interface/icon/interface.ico b/interface/icon/interface.ico
index d0d5c4ac96..19db4a1f4a 100644
Binary files a/interface/icon/interface.ico and b/interface/icon/interface.ico differ
diff --git a/interface/resources/html/img/tablet-help-gamepad.jpg b/interface/resources/html/img/tablet-help-gamepad.jpg
index 49fd99b141..32449eff07 100644
Binary files a/interface/resources/html/img/tablet-help-gamepad.jpg and b/interface/resources/html/img/tablet-help-gamepad.jpg differ
diff --git a/interface/resources/html/img/tablet-help-keyboard.jpg b/interface/resources/html/img/tablet-help-keyboard.jpg
index 7e706187f7..fd17fc7e93 100644
Binary files a/interface/resources/html/img/tablet-help-keyboard.jpg and b/interface/resources/html/img/tablet-help-keyboard.jpg differ
diff --git a/interface/resources/html/img/tablet-help-oculus.jpg b/interface/resources/html/img/tablet-help-oculus.jpg
index 5ebc66b75f..4a4ae934eb 100644
Binary files a/interface/resources/html/img/tablet-help-oculus.jpg and b/interface/resources/html/img/tablet-help-oculus.jpg differ
diff --git a/interface/resources/html/img/tablet-help-vive.jpg b/interface/resources/html/img/tablet-help-vive.jpg
index c9a5e0da7a..e660183fb8 100644
Binary files a/interface/resources/html/img/tablet-help-vive.jpg and b/interface/resources/html/img/tablet-help-vive.jpg differ
diff --git a/interface/resources/html/img/tablet-help-windowsMR.jpg b/interface/resources/html/img/tablet-help-windowsMR.jpg
index 2db23a0b89..7bec8cfa91 100644
Binary files a/interface/resources/html/img/tablet-help-windowsMR.jpg and b/interface/resources/html/img/tablet-help-windowsMR.jpg differ
diff --git a/interface/resources/images/Loading-Inner-H.png b/interface/resources/images/Loading-Inner-H.png
index 06359f0c35..6f6222c719 100644
Binary files a/interface/resources/images/Loading-Inner-H.png and b/interface/resources/images/Loading-Inner-H.png differ
diff --git a/interface/resources/images/brand-banner-black.svg b/interface/resources/images/brand-banner-black.svg
new file mode 100644
index 0000000000..e4ccdf8b3a
--- /dev/null
+++ b/interface/resources/images/brand-banner-black.svg
@@ -0,0 +1,75 @@
+
+
+
+
diff --git a/interface/resources/images/brand-banner.svg b/interface/resources/images/brand-banner.svg
new file mode 100644
index 0000000000..e05c5e7017
--- /dev/null
+++ b/interface/resources/images/brand-banner.svg
@@ -0,0 +1,75 @@
+
+
+
+
diff --git a/interface/resources/images/brand-logo.svg b/interface/resources/images/brand-logo.svg
new file mode 100644
index 0000000000..bc7cc83b38
--- /dev/null
+++ b/interface/resources/images/brand-logo.svg
@@ -0,0 +1,76 @@
+
+
+
+
diff --git a/interface/resources/images/steam-min-spec-failed.png b/interface/resources/images/steam-min-spec-failed.png
index 0061167a92..fd28b5785e 100644
Binary files a/interface/resources/images/steam-min-spec-failed.png and b/interface/resources/images/steam-min-spec-failed.png differ
diff --git a/interface/resources/qml/LoginDialog.qml b/interface/resources/qml/LoginDialog.qml
index a27bf0c3bb..26166d78b4 100644
--- a/interface/resources/qml/LoginDialog.qml
+++ b/interface/resources/qml/LoginDialog.qml
@@ -85,9 +85,9 @@ FocusScope {
Image {
id: banner
anchors.centerIn: parent
- sourceSize.width: 500
+ sourceSize.width: 272
sourceSize.height: 91
- source: "../images/vircadia-banner.svg"
+ source: "../images/brand-banner.svg"
horizontalAlignment: Image.AlignHCenter
}
}
diff --git a/interface/resources/qml/OverlayLoginDialog.qml b/interface/resources/qml/OverlayLoginDialog.qml
index 5fb72f2689..533635916d 100644
--- a/interface/resources/qml/OverlayLoginDialog.qml
+++ b/interface/resources/qml/OverlayLoginDialog.qml
@@ -81,9 +81,9 @@ FocusScope {
Image {
id: banner
anchors.centerIn: parent
- sourceSize.width: 500
+ sourceSize.width: 272
sourceSize.height: 91
- source: "../images/vircadia-banner.svg"
+ source: "../images/brand-banner.svg"
horizontalAlignment: Image.AlignHCenter
}
}
diff --git a/interface/resources/qml/UpdateDialog.qml b/interface/resources/qml/UpdateDialog.qml
index c3a7a45c69..4aaefb5cce 100644
--- a/interface/resources/qml/UpdateDialog.qml
+++ b/interface/resources/qml/UpdateDialog.qml
@@ -47,7 +47,7 @@ ScrollingWindow {
Image {
id: logo
- source: "../images/vircadia-logo.svg"
+ source: "../images/brand-logo.svg"
width: updateDialog.logoSize
height: updateDialog.logoSize
anchors {
diff --git a/interface/resources/qml/dialogs/TabletLoginDialog.qml b/interface/resources/qml/dialogs/TabletLoginDialog.qml
index f794fea66a..78e624798c 100644
--- a/interface/resources/qml/dialogs/TabletLoginDialog.qml
+++ b/interface/resources/qml/dialogs/TabletLoginDialog.qml
@@ -129,9 +129,9 @@ FocusScope {
Image {
id: banner
anchors.centerIn: parent
- sourceSize.width: 400
+ sourceSize.width: 218
sourceSize.height: 73
- source: "../../images/vircadia-banner.svg"
+ source: "../../images/brand-banner.svg"
horizontalAlignment: Image.AlignHCenter
}
}
diff --git a/interface/resources/qml/hifi/dialogs/TabletAboutDialog.qml b/interface/resources/qml/hifi/dialogs/TabletAboutDialog.qml
index d8f157c813..aa92a9f404 100644
--- a/interface/resources/qml/hifi/dialogs/TabletAboutDialog.qml
+++ b/interface/resources/qml/hifi/dialogs/TabletAboutDialog.qml
@@ -24,9 +24,9 @@ Rectangle {
spacing: 5
Image {
- width: 400; height: 73
+ width: 218; height: 73
fillMode: Image.PreserveAspectFit
- source: "../../../images/vircadia-banner.svg"
+ source: "../../../images/brand-banner.svg"
}
Item { height: 25; width: 1 }
Column {
diff --git a/interface/resources/serverless/Models/logo_overte.fbx b/interface/resources/serverless/Models/logo_overte.fbx
new file mode 100644
index 0000000000..4331c379ac
Binary files /dev/null and b/interface/resources/serverless/Models/logo_overte.fbx differ
diff --git a/interface/resources/serverless/Models/logo_overte_white-color-emissive.fst b/interface/resources/serverless/Models/logo_overte_white-color-emissive.fst
new file mode 100644
index 0000000000..9449aa3e1b
--- /dev/null
+++ b/interface/resources/serverless/Models/logo_overte_white-color-emissive.fst
@@ -0,0 +1,3 @@
+name = LOGO-OVERTE
+filename = qrc:///serverless/Models/logo_overte.fbx
+materialMap = [{"mat::MAIN": {"materials":[{ "name": "MAIN", "albedo": [1.0 ,1.0 ,1.0], "roughness": 0.5, "metallic": 0.01, "emissive": [1.55, 1.55, 1.55], "cullFaceMode": "CULL_NONE", "model": "hifi_pbr"}]}}, {"mat::SECONDARY": {"materials":[{ "name": "SECONDARY", "albedo": [0.3843, 0.39213, 0.8901], "roughness": 0.5, "metallic": 0.01, "emissive": [0.6988, 0.5611, 2.6047], "cullFaceMode": "CULL_NONE", "model": "hifi_pbr"}]}}]
diff --git a/interface/resources/serverless/tutorial.json b/interface/resources/serverless/tutorial.json
index 90d7e91aa3..d58f49c273 100644
--- a/interface/resources/serverless/tutorial.json
+++ b/interface/resources/serverless/tutorial.json
@@ -319,63 +319,32 @@
"faceCamera": false,
"isFacingAvatar": false
},
- {
- "id": "{0436152a-b188-4608-abe9-a3fb1c4b283d}",
+{
"type": "Model",
- "lastEdited": 1617140818158676,
- "name": "Vircadia Sign",
- "locked": true,
- "position": {
- "x": 43.52519226074219,
- "y": 4.912969589233398,
- "z": 8.236417770385742
- },
+ "name": "LOGO",
"dimensions": {
- "x": 4.443090915679932,
- "y": 0.7363157868385315,
- "z": 0.16073395311832428
+ "x": 13.745243072509766,
+ "y": 3.6150240898132324,
+ "z": 0.5063754320144653
},
"rotation": {
- "x": -0.0000152587890625,
- "y": -0.7019302845001221,
- "z": 0.0000152587890625,
- "w": 0.7122453451156616
+ "x": 0,
+ "y": -0.7933533787727356,
+ "z": 0,
+ "w": 0.6087614297866821
},
- "created": 1614198986205729,
- "lastEditedBy": "{7f097416-1c40-4cba-aa7c-6e20a7281823}",
- "queryAACube": {
- "x": 41.271915435791016,
- "y": 2.659691333770752,
- "z": 5.983139514923096,
- "scale": 4.506556510925293
+ "position": {
+ "x":60.310699462890625,
+ "y":4.58831787109375,
+ "z":18.133499145507812
},
+ "canCastShadow": false,
"grab": {
- "grabbable": false,
- "equippableLeftRotation": {
- "x": -0.0000152587890625,
- "y": -0.0000152587890625,
- "z": -0.0000152587890625,
- "w": 1
- },
- "equippableRightRotation": {
- "x": -0.0000152587890625,
- "y": -0.0000152587890625,
- "z": -0.0000152587890625,
- "w": 1
- }
+ "grabbable": false
},
- "damping": 0,
- "angularDamping": 0,
- "modelURL": "qrc:///serverless/Models/VircadiaLogo.fbx",
- "blendshapeCoefficients": "{\n}\n",
- "animation": {
- "allowTranslation": false
- },
- "clientOnly": false,
- "avatarEntity": false,
- "localEntity": false,
- "faceCamera": false,
- "isFacingAvatar": false
+ "modelURL": "qrc:///serverless/Models/logo_overte_white-color-emissive.fst",
+ "useOriginalPivot": true,
+ "locked": true
},
{
"id": "{06b826d4-5385-4c49-92c2-47e24f97b35a}",
@@ -451,67 +420,6 @@
"localEntity": false,
"faceCamera": true,
"isFacingAvatar": false
-},
- {
- "id": "{159f2743-d862-47e3-9f27-5de062b09941}",
- "type": "Material",
- "lastEdited": 1617140810844450,
- "parentID": "{0436152a-b188-4608-abe9-a3fb1c4b283d}",
- "parentJointIndex": 0,
- "name": "VClogo",
- "locked": true,
- "userData": "{\"verticalOffset\":0,\"segments\":16,\"updateInterval\":1000}",
- "position": {
- "x": -0.00001823902130126953,
- "y": -0.0002636909484863281,
- "z": 0.10145187377929688
- },
- "rotation": {
- "x": 0.0012969970703125,
- "y": 0.0000152587890625,
- "z": 0.0000457763671875,
- "w": 0.999969482421875
- },
- "created": 1614198986205783,
- "lastEditedBy": "{7f097416-1c40-4cba-aa7c-6e20a7281823}",
- "queryAACube": {
- "x": 47.7151985168457,
- "y": 1.0358200073242188,
- "z": 24.254812240600586,
- "scale": 4.506557464599609
- },
- "canCastShadow": false,
- "grab": {
- "grabbable": false,
- "equippableLeftRotation": {
- "x": -0.0000152587890625,
- "y": -0.0000152587890625,
- "z": -0.0000152587890625,
- "w": 1
- },
- "equippableRightRotation": {
- "x": -0.0000152587890625,
- "y": -0.0000152587890625,
- "z": -0.0000152587890625,
- "w": 1
- }
- },
- "collisionMask": 23,
- "collidesWith": "static,dynamic,kinematic,otherAvatar,",
- "scriptTimestamp": 1597610738986,
- "materialURL": "materialData",
- "priority": 3,
- "parentMaterialName": "[mat::NeonTubes]",
- "materialMappingPos": {
- "x": 0.8125,
- "y": 0
- },
- "materialData": "{\"materialVersion\":1,\"materials\":[{\"name\":\"baseMaterial2\",\"model\":\"hifi_pbr\",\"opacity\":1,\"albedo\":[0,0,0],\"roughness\":1,\"metallic\":0,\"emissive\":[2.3,2,2],\"scattering\":0,\"unlit\":false,\"opacityMapMode\":\"OPACITY_MAP_MASK\",\"cullFaceMode\":\"CULL_BACK\",\"defaultFallthrough\":false}]}",
- "clientOnly": false,
- "avatarEntity": false,
- "localEntity": false,
- "faceCamera": false,
- "isFacingAvatar": false
},
{
"id": "{5b6443c5-ec22-4c8a-9581-85134ceb6856}",
diff --git a/interface/resources/serverless/tutorialqrc.json b/interface/resources/serverless/tutorialqrc.json
index 90d7e91aa3..d58f49c273 100644
--- a/interface/resources/serverless/tutorialqrc.json
+++ b/interface/resources/serverless/tutorialqrc.json
@@ -319,63 +319,32 @@
"faceCamera": false,
"isFacingAvatar": false
},
- {
- "id": "{0436152a-b188-4608-abe9-a3fb1c4b283d}",
+{
"type": "Model",
- "lastEdited": 1617140818158676,
- "name": "Vircadia Sign",
- "locked": true,
- "position": {
- "x": 43.52519226074219,
- "y": 4.912969589233398,
- "z": 8.236417770385742
- },
+ "name": "LOGO",
"dimensions": {
- "x": 4.443090915679932,
- "y": 0.7363157868385315,
- "z": 0.16073395311832428
+ "x": 13.745243072509766,
+ "y": 3.6150240898132324,
+ "z": 0.5063754320144653
},
"rotation": {
- "x": -0.0000152587890625,
- "y": -0.7019302845001221,
- "z": 0.0000152587890625,
- "w": 0.7122453451156616
+ "x": 0,
+ "y": -0.7933533787727356,
+ "z": 0,
+ "w": 0.6087614297866821
},
- "created": 1614198986205729,
- "lastEditedBy": "{7f097416-1c40-4cba-aa7c-6e20a7281823}",
- "queryAACube": {
- "x": 41.271915435791016,
- "y": 2.659691333770752,
- "z": 5.983139514923096,
- "scale": 4.506556510925293
+ "position": {
+ "x":60.310699462890625,
+ "y":4.58831787109375,
+ "z":18.133499145507812
},
+ "canCastShadow": false,
"grab": {
- "grabbable": false,
- "equippableLeftRotation": {
- "x": -0.0000152587890625,
- "y": -0.0000152587890625,
- "z": -0.0000152587890625,
- "w": 1
- },
- "equippableRightRotation": {
- "x": -0.0000152587890625,
- "y": -0.0000152587890625,
- "z": -0.0000152587890625,
- "w": 1
- }
+ "grabbable": false
},
- "damping": 0,
- "angularDamping": 0,
- "modelURL": "qrc:///serverless/Models/VircadiaLogo.fbx",
- "blendshapeCoefficients": "{\n}\n",
- "animation": {
- "allowTranslation": false
- },
- "clientOnly": false,
- "avatarEntity": false,
- "localEntity": false,
- "faceCamera": false,
- "isFacingAvatar": false
+ "modelURL": "qrc:///serverless/Models/logo_overte_white-color-emissive.fst",
+ "useOriginalPivot": true,
+ "locked": true
},
{
"id": "{06b826d4-5385-4c49-92c2-47e24f97b35a}",
@@ -451,67 +420,6 @@
"localEntity": false,
"faceCamera": true,
"isFacingAvatar": false
-},
- {
- "id": "{159f2743-d862-47e3-9f27-5de062b09941}",
- "type": "Material",
- "lastEdited": 1617140810844450,
- "parentID": "{0436152a-b188-4608-abe9-a3fb1c4b283d}",
- "parentJointIndex": 0,
- "name": "VClogo",
- "locked": true,
- "userData": "{\"verticalOffset\":0,\"segments\":16,\"updateInterval\":1000}",
- "position": {
- "x": -0.00001823902130126953,
- "y": -0.0002636909484863281,
- "z": 0.10145187377929688
- },
- "rotation": {
- "x": 0.0012969970703125,
- "y": 0.0000152587890625,
- "z": 0.0000457763671875,
- "w": 0.999969482421875
- },
- "created": 1614198986205783,
- "lastEditedBy": "{7f097416-1c40-4cba-aa7c-6e20a7281823}",
- "queryAACube": {
- "x": 47.7151985168457,
- "y": 1.0358200073242188,
- "z": 24.254812240600586,
- "scale": 4.506557464599609
- },
- "canCastShadow": false,
- "grab": {
- "grabbable": false,
- "equippableLeftRotation": {
- "x": -0.0000152587890625,
- "y": -0.0000152587890625,
- "z": -0.0000152587890625,
- "w": 1
- },
- "equippableRightRotation": {
- "x": -0.0000152587890625,
- "y": -0.0000152587890625,
- "z": -0.0000152587890625,
- "w": 1
- }
- },
- "collisionMask": 23,
- "collidesWith": "static,dynamic,kinematic,otherAvatar,",
- "scriptTimestamp": 1597610738986,
- "materialURL": "materialData",
- "priority": 3,
- "parentMaterialName": "[mat::NeonTubes]",
- "materialMappingPos": {
- "x": 0.8125,
- "y": 0
- },
- "materialData": "{\"materialVersion\":1,\"materials\":[{\"name\":\"baseMaterial2\",\"model\":\"hifi_pbr\",\"opacity\":1,\"albedo\":[0,0,0],\"roughness\":1,\"metallic\":0,\"emissive\":[2.3,2,2],\"scattering\":0,\"unlit\":false,\"opacityMapMode\":\"OPACITY_MAP_MASK\",\"cullFaceMode\":\"CULL_BACK\",\"defaultFallthrough\":false}]}",
- "clientOnly": false,
- "avatarEntity": false,
- "localEntity": false,
- "faceCamera": false,
- "isFacingAvatar": false
},
{
"id": "{5b6443c5-ec22-4c8a-9581-85134ceb6856}",
diff --git a/interface/src/main.cpp b/interface/src/main.cpp
index 9d751d2d5d..96477eb68b 100644
--- a/interface/src/main.cpp
+++ b/interface/src/main.cpp
@@ -380,7 +380,7 @@ int main(int argc, const char* argv[]) {
PROFILE_SYNC_END(startup, "app full ctor", "");
#if defined(Q_OS_LINUX)
- app.setWindowIcon(QIcon(PathUtils::resourcesPath() + "images/vircadia-logo.svg"));
+ app.setWindowIcon(QIcon(PathUtils::resourcesPath() + "images/brand-logo.svg"));
#endif
startCrashHookMonitor(&app);
diff --git a/server-console/resources/console-beta.icns b/server-console/resources/console-beta.icns
index 9044dbfbf7..aa97037991 100644
Binary files a/server-console/resources/console-beta.icns and b/server-console/resources/console-beta.icns differ
diff --git a/server-console/resources/console-beta.ico b/server-console/resources/console-beta.ico
index 22cd370d72..1d89e91224 100644
Binary files a/server-console/resources/console-beta.ico and b/server-console/resources/console-beta.ico differ
diff --git a/server-console/resources/console-beta.png b/server-console/resources/console-beta.png
index b7c6ad4889..7088261f6a 100644
Binary files a/server-console/resources/console-beta.png and b/server-console/resources/console-beta.png differ
diff --git a/server-console/resources/console-notification.png b/server-console/resources/console-notification.png
index 80fc9dd3a9..01d9d1cfda 100644
Binary files a/server-console/resources/console-notification.png and b/server-console/resources/console-notification.png differ
diff --git a/server-console/resources/console-tray-osx-stopped.png b/server-console/resources/console-tray-osx-stopped.png
index e8df123f20..e322ff7fa4 100644
Binary files a/server-console/resources/console-tray-osx-stopped.png and b/server-console/resources/console-tray-osx-stopped.png differ
diff --git a/server-console/resources/console-tray-osx-stopped@2x.png b/server-console/resources/console-tray-osx-stopped@2x.png
index 3671365aa1..cf9d92cdf6 100644
Binary files a/server-console/resources/console-tray-osx-stopped@2x.png and b/server-console/resources/console-tray-osx-stopped@2x.png differ
diff --git a/server-console/resources/console-tray-osx-stopping.png b/server-console/resources/console-tray-osx-stopping.png
index fe8a1932bd..367f2efb69 100644
Binary files a/server-console/resources/console-tray-osx-stopping.png and b/server-console/resources/console-tray-osx-stopping.png differ
diff --git a/server-console/resources/console-tray-osx-stopping@2x.png b/server-console/resources/console-tray-osx-stopping@2x.png
index 1982102e5d..3f8771cc87 100644
Binary files a/server-console/resources/console-tray-osx-stopping@2x.png and b/server-console/resources/console-tray-osx-stopping@2x.png differ
diff --git a/server-console/resources/console-tray-osx.png b/server-console/resources/console-tray-osx.png
index 13dd30430c..33d67f88d4 100644
Binary files a/server-console/resources/console-tray-osx.png and b/server-console/resources/console-tray-osx.png differ
diff --git a/server-console/resources/console-tray-osx@2x.png b/server-console/resources/console-tray-osx@2x.png
index f8636fdd29..9f02e0b0eb 100644
Binary files a/server-console/resources/console-tray-osx@2x.png and b/server-console/resources/console-tray-osx@2x.png differ
diff --git a/server-console/resources/console-tray-stopped.ico b/server-console/resources/console-tray-stopped.ico
index d1f48a8862..c7b07a39ab 100644
Binary files a/server-console/resources/console-tray-stopped.ico and b/server-console/resources/console-tray-stopped.ico differ
diff --git a/server-console/resources/console-tray-win-stopped.png b/server-console/resources/console-tray-win-stopped.png
index 07db771652..79a3d83875 100644
Binary files a/server-console/resources/console-tray-win-stopped.png and b/server-console/resources/console-tray-win-stopped.png differ
diff --git a/server-console/resources/console-tray-win-stopped@2x.png b/server-console/resources/console-tray-win-stopped@2x.png
index 81f4fd4f10..0916677e38 100644
Binary files a/server-console/resources/console-tray-win-stopped@2x.png and b/server-console/resources/console-tray-win-stopped@2x.png differ
diff --git a/server-console/resources/console-tray-win-stopping.png b/server-console/resources/console-tray-win-stopping.png
index 30ab381158..f135a54558 100644
Binary files a/server-console/resources/console-tray-win-stopping.png and b/server-console/resources/console-tray-win-stopping.png differ
diff --git a/server-console/resources/console-tray-win-stopping@2x.png b/server-console/resources/console-tray-win-stopping@2x.png
index a72cdc1209..1f3448a9b0 100644
Binary files a/server-console/resources/console-tray-win-stopping@2x.png and b/server-console/resources/console-tray-win-stopping@2x.png differ
diff --git a/server-console/resources/console-tray-win.png b/server-console/resources/console-tray-win.png
index 1ed710c880..1edfb0c6ef 100644
Binary files a/server-console/resources/console-tray-win.png and b/server-console/resources/console-tray-win.png differ
diff --git a/server-console/resources/console-tray-win@2x.png b/server-console/resources/console-tray-win@2x.png
index abe7bb0b93..21d79f09a0 100644
Binary files a/server-console/resources/console-tray-win@2x.png and b/server-console/resources/console-tray-win@2x.png differ
diff --git a/server-console/resources/console-tray.ico b/server-console/resources/console-tray.ico
index cf25b69083..688488d59f 100644
Binary files a/server-console/resources/console-tray.ico and b/server-console/resources/console-tray.ico differ
diff --git a/server-console/resources/console.icns b/server-console/resources/console.icns
index 4e4df39d69..24e05a4be1 100644
Binary files a/server-console/resources/console.icns and b/server-console/resources/console.icns differ
diff --git a/server-console/resources/console.ico b/server-console/resources/console.ico
index 34b48a029d..db31f3c065 100644
Binary files a/server-console/resources/console.ico and b/server-console/resources/console.ico differ
diff --git a/server-console/resources/console.png b/server-console/resources/console.png
index 677ce293c4..062a04e46a 100644
Binary files a/server-console/resources/console.png and b/server-console/resources/console.png differ
diff --git a/server-console/src/images/console-hf-logo-2x.png b/server-console/src/images/console-hf-logo-2x.png
index e8b048fae0..25d74f760d 100644
Binary files a/server-console/src/images/console-hf-logo-2x.png and b/server-console/src/images/console-hf-logo-2x.png differ
diff --git a/server-console/src/images/console-menubar-osx-2x.png b/server-console/src/images/console-menubar-osx-2x.png
index e8b3c11e29..f0fe3aa140 100644
Binary files a/server-console/src/images/console-menubar-osx-2x.png and b/server-console/src/images/console-menubar-osx-2x.png differ
diff --git a/server-console/src/images/console-menubar-windows-2x.png b/server-console/src/images/console-menubar-windows-2x.png
index 5057da17d4..0ec0561770 100644
Binary files a/server-console/src/images/console-menubar-windows-2x.png and b/server-console/src/images/console-menubar-windows-2x.png differ
diff --git a/server-console/src/images/step1.jpg b/server-console/src/images/step1.jpg
index cd80ae5537..0dacd30f3e 100644
Binary files a/server-console/src/images/step1.jpg and b/server-console/src/images/step1.jpg differ
diff --git a/server-console/src/images/step4.jpg b/server-console/src/images/step4.jpg
index 27694aee74..d597e2f73b 100644
Binary files a/server-console/src/images/step4.jpg and b/server-console/src/images/step4.jpg differ
diff --git a/tools/doxygen/Doxyfile b/tools/doxygen/Doxyfile
index de001ea220..1cb6d609fb 100644
--- a/tools/doxygen/Doxyfile
+++ b/tools/doxygen/Doxyfile
@@ -51,7 +51,7 @@ PROJECT_BRIEF =
# pixels and the maximum width should not exceed 200 pixels. Doxygen will copy
# the logo to the output directory.
-PROJECT_LOGO = vircadia.png
+PROJECT_LOGO = brand.png
# The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute) path
# into which the generated documentation will be written. If a relative path is
diff --git a/tools/doxygen/brand.png b/tools/doxygen/brand.png
new file mode 100644
index 0000000000..41298ad04e
Binary files /dev/null and b/tools/doxygen/brand.png differ
diff --git a/tools/jsdoc/hifi-jsdoc-template/static/images/brand-logo-512.png b/tools/jsdoc/hifi-jsdoc-template/static/images/brand-logo-512.png
new file mode 100644
index 0000000000..71c000f87b
Binary files /dev/null and b/tools/jsdoc/hifi-jsdoc-template/static/images/brand-logo-512.png differ
diff --git a/tools/jsdoc/hifi-jsdoc-template/static/images/fav-icon.ico b/tools/jsdoc/hifi-jsdoc-template/static/images/fav-icon.ico
index 5c09071822..19db4a1f4a 100644
Binary files a/tools/jsdoc/hifi-jsdoc-template/static/images/fav-icon.ico and b/tools/jsdoc/hifi-jsdoc-template/static/images/fav-icon.ico differ
diff --git a/tools/jsdoc/hifi-jsdoc-template/tmpl/layout.tmpl b/tools/jsdoc/hifi-jsdoc-template/tmpl/layout.tmpl
index 49ab106347..5389d76723 100644
--- a/tools/jsdoc/hifi-jsdoc-template/tmpl/layout.tmpl
+++ b/tools/jsdoc/hifi-jsdoc-template/tmpl/layout.tmpl
@@ -3,7 +3,7 @@