diff --git a/open_earable/lib/controls_tab/views/audio_player.dart b/open_earable/lib/controls_tab/views/audio_player.dart
index 5bd041e..02a31ae 100644
--- a/open_earable/lib/controls_tab/views/audio_player.dart
+++ b/open_earable/lib/controls_tab/views/audio_player.dart
@@ -301,7 +301,7 @@ class _AudioPlayerCardState extends State<AudioPlayerCard> {
               obscureText: false,
               placeholder: placeholder,
               style: TextStyle(
-                color: connected ? Colors.black : Colors.grey,
+                color: connected ? Colors.black : Colors.grey[700],
               ),
               padding: EdgeInsets.fromLTRB(8, 0, 0, 0),
               textAlignVertical: TextAlignVertical.center,
@@ -310,7 +310,7 @@ class _AudioPlayerCardState extends State<AudioPlayerCard> {
                 FocusScope.of(context).requestFocus(FocusNode());
               },
               decoration: BoxDecoration(
-                color: Colors.white,
+                color: connected ? Colors.white : Colors.grey,
                 borderRadius: BorderRadius.circular(4.0),
               ),
               placeholderStyle: TextStyle(
@@ -325,16 +325,17 @@ class _AudioPlayerCardState extends State<AudioPlayerCard> {
               controller: textController,
               obscureText: false,
               enabled: connected,
-              style: TextStyle(color: connected ? Colors.black : Colors.grey),
+              style:
+                  TextStyle(color: connected ? Colors.black : Colors.grey[700]),
               decoration: InputDecoration(
                 labelText: placeholder,
                 contentPadding: EdgeInsets.fromLTRB(8, 0, 0, 0),
                 border: OutlineInputBorder(),
                 floatingLabelBehavior: FloatingLabelBehavior.never,
-                labelStyle:
-                    TextStyle(color: connected ? Colors.black : Colors.grey),
+                labelStyle: TextStyle(
+                    color: connected ? Colors.black : Colors.grey[700]),
                 filled: true,
-                fillColor: connected ? Colors.white : Colors.grey[200],
+                fillColor: connected ? Colors.white : Colors.grey,
               ),
               keyboardType: keyboardType,
               maxLength: maxLength,
@@ -365,7 +366,7 @@ class _AudioPlayerCardState extends State<AudioPlayerCard> {
                 decoration: BoxDecoration(
                   color: Provider.of<BluetoothController>(context).connected
                       ? Colors.white
-                      : Colors.grey[200],
+                      : Colors.grey,
                   borderRadius: BorderRadius.circular(4.0),
                 ),
                 child: SizedBox(
@@ -442,20 +443,27 @@ class _AudioPlayerCardState extends State<AudioPlayerCard> {
             ),
           ),
           Spacer(),
-          SizedBox(
-            height: 38.0,
-            width: 107,
-            child: DynamicValuePicker(
-                context,
-                OpenEarableSettings().waveFormMap.keys.toList(),
-                OpenEarableSettings().selectedWaveForm, (newValue) {
-              setState(
-                () {
-                  OpenEarableSettings().selectedWaveForm = newValue;
-                },
-              );
-            }, Provider.of<BluetoothController>(context).connected, false),
-          ),
+          Container(
+              decoration: BoxDecoration(
+                color: Provider.of<BluetoothController>(context).connected
+                    ? Colors.white
+                    : Colors.grey,
+                borderRadius: BorderRadius.circular(4.0),
+              ),
+              child: SizedBox(
+                height: 38.0,
+                width: 107,
+                child: DynamicValuePicker(
+                    context,
+                    OpenEarableSettings().waveFormMap.keys.toList(),
+                    OpenEarableSettings().selectedWaveForm, (newValue) {
+                  setState(
+                    () {
+                      OpenEarableSettings().selectedWaveForm = newValue;
+                    },
+                  );
+                }, Provider.of<BluetoothController>(context).connected, false),
+              )),
         ],
       )
     ]);
diff --git a/open_earable/lib/controls_tab/views/connect.dart b/open_earable/lib/controls_tab/views/connect.dart
index c420f39..4f9e803 100644
--- a/open_earable/lib/controls_tab/views/connect.dart
+++ b/open_earable/lib/controls_tab/views/connect.dart
@@ -67,7 +67,7 @@ class _ConnectCard extends State<ConnectCard> {
     _openEarableRight = Provider.of<BluetoothController>(context, listen: false)
         .openEarableRight;
     return Padding(
-        padding: const EdgeInsets.symmetric(horizontal: 0.0),
+        padding: const EdgeInsets.symmetric(horizontal: 5.0),
         child: Card(
             color: Platform.isIOS
                 ? CupertinoTheme.of(context).primaryContrastingColor
diff --git a/open_earable/lib/controls_tab/views/v1_sensor_configuration.dart b/open_earable/lib/controls_tab/views/v1_sensor_configuration.dart
index eef0fd7..3bcbece 100644
--- a/open_earable/lib/controls_tab/views/v1_sensor_configuration.dart
+++ b/open_earable/lib/controls_tab/views/v1_sensor_configuration.dart
@@ -242,7 +242,7 @@ class _V1SensorConfigurationCardState extends State<V1SensorConfigurationCard> {
             decoration: BoxDecoration(
               color: Provider.of<BluetoothController>(context).connected
                   ? Colors.white
-                  : Colors.grey[200],
+                  : Colors.grey,
               borderRadius: BorderRadius.circular(4.0),
             ),
             child: SizedBox(
diff --git a/open_earable/lib/shared/dynamic_value_picker.dart b/open_earable/lib/shared/dynamic_value_picker.dart
index 0c5f47e..67b191f 100644
--- a/open_earable/lib/shared/dynamic_value_picker.dart
+++ b/open_earable/lib/shared/dynamic_value_picker.dart
@@ -46,8 +46,7 @@ class DynamicValuePicker extends StatelessWidget {
       );
     } else {
       return DropdownButton<String>(
-        dropdownColor:
-            this.isFakeDisabled || !isConnected ? Colors.grey : Colors.white,
+        dropdownColor: Colors.white,
         alignment: Alignment.centerRight,
         value: currentValue,
         onChanged: isConnected
@@ -73,7 +72,7 @@ class DynamicValuePicker extends StatelessWidget {
         underline: Container(),
         icon: Icon(
           Icons.arrow_drop_down,
-          color: isConnected ? Colors.black : Colors.grey,
+          color: isConnected ? Colors.black : Colors.grey[700],
         ),
       );
     }