diff --git a/profile_bps/src/main/java/no/nordicsemi/android/bps/view/BPSScreen.kt b/profile_bps/src/main/java/no/nordicsemi/android/bps/view/BPSScreen.kt
index 0ea647a1..03d19b54 100644
--- a/profile_bps/src/main/java/no/nordicsemi/android/bps/view/BPSScreen.kt
+++ b/profile_bps/src/main/java/no/nordicsemi/android/bps/view/BPSScreen.kt
@@ -74,8 +74,8 @@ fun BPSScreen() {
         Column(
             modifier = Modifier
                 .padding(it)
-                .padding(16.dp)
                 .verticalScroll(rememberScrollState())
+                .padding(16.dp)
         ) {
             if (state.deviceName == null) {
                 DeviceConnectingView { NavigateUpButton(navigateUp) }
diff --git a/profile_cgms/src/main/java/no/nordicsemi/android/cgms/view/CGMScreen.kt b/profile_cgms/src/main/java/no/nordicsemi/android/cgms/view/CGMScreen.kt
index f777463a..3fb0e623 100644
--- a/profile_cgms/src/main/java/no/nordicsemi/android/cgms/view/CGMScreen.kt
+++ b/profile_cgms/src/main/java/no/nordicsemi/android/cgms/view/CGMScreen.kt
@@ -78,8 +78,8 @@ fun CGMScreen() {
         Column(
             modifier = Modifier
                 .padding(it)
-                .padding(16.dp)
                 .verticalScroll(rememberScrollState())
+                .padding(16.dp)
         ) {
             if (state.deviceName == null) {
                 DeviceConnectingView { NavigateUpButton(navigateUp) }
diff --git a/profile_csc/src/main/java/no/nordicsemi/android/csc/view/CSCScreen.kt b/profile_csc/src/main/java/no/nordicsemi/android/csc/view/CSCScreen.kt
index 9e745a5e..e8967219 100644
--- a/profile_csc/src/main/java/no/nordicsemi/android/csc/view/CSCScreen.kt
+++ b/profile_csc/src/main/java/no/nordicsemi/android/csc/view/CSCScreen.kt
@@ -74,8 +74,8 @@ fun CSCScreen() {
         Column(
             modifier = Modifier
                 .padding(it)
-                .padding(16.dp)
                 .verticalScroll(rememberScrollState())
+                .padding(16.dp)
         ) {
             if (state.deviceName == null) {
                 DeviceConnectingView { NavigateUpButton(navigateUp) }
diff --git a/profile_gls/src/main/java/no/nordicsemi/android/gls/main/view/GLSScreen.kt b/profile_gls/src/main/java/no/nordicsemi/android/gls/main/view/GLSScreen.kt
index 3a4a0f07..8e105581 100644
--- a/profile_gls/src/main/java/no/nordicsemi/android/gls/main/view/GLSScreen.kt
+++ b/profile_gls/src/main/java/no/nordicsemi/android/gls/main/view/GLSScreen.kt
@@ -75,8 +75,8 @@ fun GLSScreen() {
         Column(
             modifier = Modifier
                 .padding(it)
-                .padding(16.dp)
                 .verticalScroll(rememberScrollState())
+                .padding(16.dp)
         ) {
             if (state.deviceName == null) {
                 DeviceConnectingView { NavigateUpButton(navigateUp) }
diff --git a/profile_hrs/src/main/java/no/nordicsemi/android/hrs/view/HRSScreen.kt b/profile_hrs/src/main/java/no/nordicsemi/android/hrs/view/HRSScreen.kt
index daffe174..3219714d 100644
--- a/profile_hrs/src/main/java/no/nordicsemi/android/hrs/view/HRSScreen.kt
+++ b/profile_hrs/src/main/java/no/nordicsemi/android/hrs/view/HRSScreen.kt
@@ -74,8 +74,8 @@ fun HRSScreen() {
         Column(
             modifier = Modifier
                 .padding(it)
-                .padding(16.dp)
                 .verticalScroll(rememberScrollState())
+                .padding(16.dp)
         ) {
             if (state.deviceName == null) {
                 DeviceConnectingView { NavigateUpButton(navigateUp) }
diff --git a/profile_hts/src/main/java/no/nordicsemi/android/hts/view/HTSScreen.kt b/profile_hts/src/main/java/no/nordicsemi/android/hts/view/HTSScreen.kt
index ef657c7a..9e921911 100644
--- a/profile_hts/src/main/java/no/nordicsemi/android/hts/view/HTSScreen.kt
+++ b/profile_hts/src/main/java/no/nordicsemi/android/hts/view/HTSScreen.kt
@@ -78,8 +78,8 @@ fun HTSScreen() {
         Column(
             modifier = Modifier
                 .padding(it)
-                .padding(16.dp)
                 .verticalScroll(rememberScrollState())
+                .padding(16.dp)
         ) {
             if (state.deviceName == null) {
                 DeviceConnectingView { NavigateUpButton(navigateUp) }
diff --git a/profile_prx/src/main/java/no/nordicsemi/android/prx/view/PRXScreen.kt b/profile_prx/src/main/java/no/nordicsemi/android/prx/view/PRXScreen.kt
index 2aca046d..64140408 100644
--- a/profile_prx/src/main/java/no/nordicsemi/android/prx/view/PRXScreen.kt
+++ b/profile_prx/src/main/java/no/nordicsemi/android/prx/view/PRXScreen.kt
@@ -74,8 +74,8 @@ fun PRXScreen() {
         Column(
             modifier = Modifier
                 .padding(it)
-                .padding(16.dp)
                 .verticalScroll(rememberScrollState())
+                .padding(16.dp)
         ) {
             if (state.deviceName == null) {
                 DeviceConnectingView { NavigateUpButton(navigateUp) }
diff --git a/profile_rscs/src/main/java/no/nordicsemi/android/rscs/view/RSCSScreen.kt b/profile_rscs/src/main/java/no/nordicsemi/android/rscs/view/RSCSScreen.kt
index c9706b05..06e9c1a0 100644
--- a/profile_rscs/src/main/java/no/nordicsemi/android/rscs/view/RSCSScreen.kt
+++ b/profile_rscs/src/main/java/no/nordicsemi/android/rscs/view/RSCSScreen.kt
@@ -74,8 +74,8 @@ fun RSCSScreen() {
         Column(
             modifier = Modifier
                 .padding(it)
-                .padding(16.dp)
                 .verticalScroll(rememberScrollState())
+                .padding(16.dp)
         ) {
             if (state.deviceName == null) {
                 DeviceConnectingView { NavigateUpButton(navigateUp) }