diff --git a/interface/resources/qml/hifi/simplifiedUI/avatarApp/AvatarApp.qml b/interface/resources/qml/hifi/simplifiedUI/avatarApp/AvatarApp.qml
index 4c6615ebdc..957df6d584 100644
--- a/interface/resources/qml/hifi/simplifiedUI/avatarApp/AvatarApp.qml
+++ b/interface/resources/qml/hifi/simplifiedUI/avatarApp/AvatarApp.qml
@@ -88,7 +88,7 @@ Rectangle {
Image {
id: accent
- source: "../images/accent.svg"
+ source: "images/accent.svg"
anchors.top: parent.top
anchors.right: parent.right
width: 60
diff --git a/interface/resources/qml/hifi/simplifiedUI/images/accent.svg b/interface/resources/qml/hifi/simplifiedUI/avatarApp/images/accent.svg
similarity index 100%
rename from interface/resources/qml/hifi/simplifiedUI/images/accent.svg
rename to interface/resources/qml/hifi/simplifiedUI/avatarApp/images/accent.svg
diff --git a/interface/resources/qml/hifi/simplifiedUI/settingsApp/SettingsApp.qml b/interface/resources/qml/hifi/simplifiedUI/settingsApp/SettingsApp.qml
index da3a6ab57c..60703a8062 100644
--- a/interface/resources/qml/hifi/simplifiedUI/settingsApp/SettingsApp.qml
+++ b/interface/resources/qml/hifi/simplifiedUI/settingsApp/SettingsApp.qml
@@ -165,11 +165,21 @@ Rectangle {
}
Image {
- source: "../images/accent.svg"
+ source: {
+ if (root.activeTabView === "generalTabView") {
+ "images/accent1.svg"
+ } else if (root.activeTabView === "audioTabView") {
+ "images/accent2.svg"
+ } else if (root.activeTabView === "vrTabView") {
+ "images/accent3.svg"
+ } else {
+ "images/accent3.svg"
+ }
+ }
anchors.right: parent.right
- anchors.bottom: parent.bottom
- width: 94
- height: 175
+ anchors.top: tabContainer.bottom
+ width: 106
+ height: 200
}
diff --git a/interface/resources/qml/hifi/simplifiedUI/settingsApp/audio/Audio.qml b/interface/resources/qml/hifi/simplifiedUI/settingsApp/audio/Audio.qml
index 7a19ab1a0f..4dc5e973fc 100644
--- a/interface/resources/qml/hifi/simplifiedUI/settingsApp/audio/Audio.qml
+++ b/interface/resources/qml/hifi/simplifiedUI/settingsApp/audio/Audio.qml
@@ -57,7 +57,7 @@ Flickable {
Layout.preferredWidth: parent.width
spacing: 0
- HifiStylesUit.GraphikRegular {
+ HifiStylesUit.GraphikSemiBold {
id: volumeControlsTitle
text: "Volume Controls"
Layout.preferredWidth: parent.width
@@ -154,7 +154,7 @@ Flickable {
Layout.preferredWidth: parent.width
spacing: 0
- HifiStylesUit.GraphikRegular {
+ HifiStylesUit.GraphikSemiBold {
id: micControlsTitle
text: "Default Mute Controls"
Layout.maximumWidth: parent.width
@@ -196,7 +196,7 @@ Flickable {
Layout.preferredWidth: parent.width
spacing: 0
- HifiStylesUit.GraphikRegular {
+ HifiStylesUit.GraphikSemiBold {
id: inputDeviceTitle
text: "Which input device?"
Layout.maximumWidth: parent.width
@@ -291,7 +291,7 @@ Flickable {
Layout.preferredWidth: parent.width
spacing: 0
- HifiStylesUit.GraphikRegular {
+ HifiStylesUit.GraphikSemiBold {
id: outputDeviceTitle
text: "Which output device?"
Layout.maximumWidth: parent.width
diff --git a/interface/resources/qml/hifi/simplifiedUI/settingsApp/dev/Dev.qml b/interface/resources/qml/hifi/simplifiedUI/settingsApp/dev/Dev.qml
index 996abc3bb6..a8c0a8f158 100644
--- a/interface/resources/qml/hifi/simplifiedUI/settingsApp/dev/Dev.qml
+++ b/interface/resources/qml/hifi/simplifiedUI/settingsApp/dev/Dev.qml
@@ -47,7 +47,7 @@ Flickable {
Layout.preferredWidth: parent.width
spacing: 0
- HifiStylesUit.GraphikRegular {
+ HifiStylesUit.GraphikSemiBold {
id: uiControlsTitle
text: "User Interface"
Layout.maximumWidth: parent.width
diff --git a/interface/resources/qml/hifi/simplifiedUI/settingsApp/general/General.qml b/interface/resources/qml/hifi/simplifiedUI/settingsApp/general/General.qml
index 4ec3f59598..f56d0f33bd 100644
--- a/interface/resources/qml/hifi/simplifiedUI/settingsApp/general/General.qml
+++ b/interface/resources/qml/hifi/simplifiedUI/settingsApp/general/General.qml
@@ -51,7 +51,7 @@ Flickable {
Layout.preferredWidth: parent.width
spacing: 0
- HifiStylesUit.GraphikRegular {
+ HifiStylesUit.GraphikSemiBold {
id: avatarNameTagsTitle
text: "Avatar Name Tags"
Layout.maximumWidth: parent.width
@@ -99,7 +99,7 @@ Flickable {
Layout.preferredWidth: parent.width
spacing: 0
- HifiStylesUit.GraphikRegular {
+ HifiStylesUit.GraphikSemiBold {
id: performanceTitle
text: "Graphics Settings"
Layout.maximumWidth: parent.width
@@ -147,7 +147,7 @@ Flickable {
Layout.preferredWidth: parent.width
spacing: 0
- HifiStylesUit.GraphikRegular {
+ HifiStylesUit.GraphikSemiBold {
id: cameraTitle
text: "Camera View"
Layout.maximumWidth: parent.width
@@ -199,7 +199,7 @@ Flickable {
wrapMode: Text.Wrap
width: paintedWidth
height: paintedHeight
- size: 22
+ size: 14
color: simplifiedUI.colors.text.lightBlue
MouseArea {
diff --git a/interface/resources/qml/hifi/simplifiedUI/settingsApp/images/accent1.svg b/interface/resources/qml/hifi/simplifiedUI/settingsApp/images/accent1.svg
new file mode 100644
index 0000000000..885edef5ac
--- /dev/null
+++ b/interface/resources/qml/hifi/simplifiedUI/settingsApp/images/accent1.svg
@@ -0,0 +1,4 @@
+
diff --git a/interface/resources/qml/hifi/simplifiedUI/settingsApp/images/accent2.svg b/interface/resources/qml/hifi/simplifiedUI/settingsApp/images/accent2.svg
new file mode 100644
index 0000000000..027d9bb623
--- /dev/null
+++ b/interface/resources/qml/hifi/simplifiedUI/settingsApp/images/accent2.svg
@@ -0,0 +1,4 @@
+
diff --git a/interface/resources/qml/hifi/simplifiedUI/settingsApp/images/accent3.svg b/interface/resources/qml/hifi/simplifiedUI/settingsApp/images/accent3.svg
new file mode 100644
index 0000000000..07cc23ef1e
--- /dev/null
+++ b/interface/resources/qml/hifi/simplifiedUI/settingsApp/images/accent3.svg
@@ -0,0 +1,4 @@
+
diff --git a/interface/resources/qml/hifi/simplifiedUI/settingsApp/vr/VR.qml b/interface/resources/qml/hifi/simplifiedUI/settingsApp/vr/VR.qml
index c7e3cc9fc2..9f5ed3ff8f 100644
--- a/interface/resources/qml/hifi/simplifiedUI/settingsApp/vr/VR.qml
+++ b/interface/resources/qml/hifi/simplifiedUI/settingsApp/vr/VR.qml
@@ -57,7 +57,7 @@ Flickable {
Layout.preferredWidth: parent.width
spacing: 0
- HifiStylesUit.GraphikRegular {
+ HifiStylesUit.GraphikSemiBold {
id: controlsTitle
text: "VR Movement Controls"
Layout.maximumWidth: parent.width
@@ -143,7 +143,7 @@ Flickable {
Layout.preferredWidth: parent.width
spacing: 0
- HifiStylesUit.GraphikRegular {
+ HifiStylesUit.GraphikSemiBold {
id: micControlsTitle
text: "Default Mute Controls"
Layout.maximumWidth: parent.width
@@ -185,7 +185,7 @@ Flickable {
Layout.preferredWidth: parent.width
spacing: 0
- HifiStylesUit.GraphikRegular {
+ HifiStylesUit.GraphikSemiBold {
id: inputDeviceTitle
text: "Which input device?"
Layout.maximumWidth: parent.width
@@ -280,7 +280,7 @@ Flickable {
Layout.preferredWidth: parent.width
spacing: 0
- HifiStylesUit.GraphikRegular {
+ HifiStylesUit.GraphikSemiBold {
id: outputDeviceTitle
text: "Which output device?"
Layout.maximumWidth: parent.width
diff --git a/interface/resources/qml/hifi/simplifiedUI/simplifiedConstants/SimplifiedConstants.qml b/interface/resources/qml/hifi/simplifiedUI/simplifiedConstants/SimplifiedConstants.qml
index 1f628b041d..5aa94d798e 100644
--- a/interface/resources/qml/hifi/simplifiedUI/simplifiedConstants/SimplifiedConstants.qml
+++ b/interface/resources/qml/hifi/simplifiedUI/simplifiedConstants/SimplifiedConstants.qml
@@ -183,7 +183,7 @@ QtObject {
readonly property QtObject settings: QtObject {
property int subtitleTopMargin: 2
- property int settingsGroupTopMargin: 24
+ property int settingsGroupTopMargin: 14
property int spacingBetweenSettings: 48
property int spacingBetweenRadiobuttons: 14
}