diff --git a/lib/UI/exercise/add_new_exercise_alert.dart b/lib/UI/exercise/add_new_exercise_alert.dart
index 0d70b6b..7b7f9b1 100644
--- a/lib/UI/exercise/add_new_exercise_alert.dart
+++ b/lib/UI/exercise/add_new_exercise_alert.dart
@@ -36,7 +36,7 @@ class AddExerciseAlert extends StatelessWidget {
                   padding: const EdgeInsets.only(left: 20, right: 20),
                   child: nameWidget,
                 ),
-                Container(
+                SizedBox(
                   height: screenHeight * 0.05,
                   width: screenWidth * 0.5,
                   child: addExercise,
diff --git a/lib/UI/exercise/exercise_card.dart b/lib/UI/exercise/exercise_card.dart
index 3e554b1..d668df7 100644
--- a/lib/UI/exercise/exercise_card.dart
+++ b/lib/UI/exercise/exercise_card.dart
@@ -100,7 +100,7 @@ class _ExerciseCardState extends State<ExerciseCard> with AutomaticKeepAliveClie
     super.build(context);
     return ThemeProvider(
       builder: (BuildContext context, AppTheme theme) {
-        return Container(
+        return SizedBox(
           height: height + screenHeight * 0.06,
           child: Stack(
             children: <Widget> [
@@ -126,7 +126,7 @@ class _ExerciseCardState extends State<ExerciseCard> with AutomaticKeepAliveClie
                       child: Row(
                         mainAxisAlignment: MainAxisAlignment.spaceBetween,
                         children: <Widget> [
-                          Container(
+                          SizedBox(
                             height: getHeight(),
                             width: screenWidth * 0.45,
                             child: Text(
@@ -213,7 +213,7 @@ class _ExerciseCardState extends State<ExerciseCard> with AutomaticKeepAliveClie
                 right: screenWidth * 0.43,
                 left: screenWidth * 0.43,
                 top: height - 15,
-                child: Container(
+                child: SizedBox(
                   height: screenHeight * 0.07,
                   child: DecoratedBox(
                     decoration: BoxDecoration(
diff --git a/lib/UI/exercise/set_widget.dart b/lib/UI/exercise/set_widget.dart
index 04b1c97..986a3fc 100644
--- a/lib/UI/exercise/set_widget.dart
+++ b/lib/UI/exercise/set_widget.dart
@@ -94,7 +94,8 @@ class _SetWidgetState extends State<SetWidget>
             ),
           ],
         ),
-        child: Container(
+
+        child: SizedBox(
           height: screenHeight * 0.05,
           child: Row(
             mainAxisAlignment: MainAxisAlignment.spaceBetween,
diff --git a/lib/UI/exercise/totals_widget.dart b/lib/UI/exercise/totals_widget.dart
index ce0e515..6e2dd5c 100644
--- a/lib/UI/exercise/totals_widget.dart
+++ b/lib/UI/exercise/totals_widget.dart
@@ -25,7 +25,7 @@ class _ExerciseTotalsWidgetState extends State<ExerciseTotalsWidget> {
       widget.totals.totalWeight,
       widget.totals.avgWeight
     ];
-    return Container(
+    return SizedBox(
       height: screenHeight * 0.04,
       width: screenWidth * 0.3,
       child: RaisedGradientButton(
diff --git a/lib/UI/prev_workout/delete_prev_workout_dialog.dart b/lib/UI/prev_workout/delete_prev_workout_dialog.dart
index c2aae61..a8881a7 100644
--- a/lib/UI/prev_workout/delete_prev_workout_dialog.dart
+++ b/lib/UI/prev_workout/delete_prev_workout_dialog.dart
@@ -39,7 +39,7 @@ class _DeleteWorkoutAlertState extends State<DeleteWorkoutAlert> {
                 style: mediumTitleStyleWhite,
                 textAlign: TextAlign.center,
               ),
-              Container(
+              SizedBox(
                 height: screenHeight * 0.05,
                 width: screenWidth * 0.5,
                 child: widget.deleteWorkoutButton,
diff --git a/lib/UI/prev_workout/prev_exercise_card.dart b/lib/UI/prev_workout/prev_exercise_card.dart
index bce0403..6d46662 100644
--- a/lib/UI/prev_workout/prev_exercise_card.dart
+++ b/lib/UI/prev_workout/prev_exercise_card.dart
@@ -64,7 +64,7 @@ class _PrevExerciseCardState extends State<PrevExerciseCard> with AutomaticKeepA
     totalWidget = ExerciseTotalsWidget(totals: totalData, index: index);
     return ThemeProvider(
       builder: (BuildContext context, AppTheme theme) {
-        return Container(
+        return SizedBox(
           height: height + screenHeight * 0.06,
           child: Stack(
             children: <Widget>[
@@ -90,7 +90,7 @@ class _PrevExerciseCardState extends State<PrevExerciseCard> with AutomaticKeepA
                       child: Row(
                         mainAxisAlignment: MainAxisAlignment.spaceBetween,
                         children: <Widget>[
-                          Container(
+                          SizedBox(
                             height: getHeight(),
                             width: screenWidth * 0.45,
                             child: Text(
@@ -116,7 +116,7 @@ class _PrevExerciseCardState extends State<PrevExerciseCard> with AutomaticKeepA
                               Container(
                                 width: screenWidth * 0.08,
                               ),
-                              Container(
+                              SizedBox(
                                 width: screenWidth * 0.15,
                                 child: Center(
                                   child: Text(
@@ -125,7 +125,7 @@ class _PrevExerciseCardState extends State<PrevExerciseCard> with AutomaticKeepA
                                   ),
                                 ),
                               ),
-                              Container(
+                              SizedBox(
                                 width: screenWidth * 0.15,
                                 child: Center(
                                   child: Text(
@@ -134,7 +134,7 @@ class _PrevExerciseCardState extends State<PrevExerciseCard> with AutomaticKeepA
                                   ),
                                 ),
                               ),
-                              Container(
+                              SizedBox(
                                 width: screenWidth * 0.15,
                                 child: Center(
                                   child: Text(
@@ -143,7 +143,7 @@ class _PrevExerciseCardState extends State<PrevExerciseCard> with AutomaticKeepA
                                   ),
                                 ),
                               ),
-                              Container(
+                              SizedBox(
                                 width: screenWidth * 0.15,
                                 child: Center(
                                   child: Text(
diff --git a/lib/UI/prev_workout/prev_set_widget.dart b/lib/UI/prev_workout/prev_set_widget.dart
index 5dc56f7..159b7c3 100644
--- a/lib/UI/prev_workout/prev_set_widget.dart
+++ b/lib/UI/prev_workout/prev_set_widget.dart
@@ -52,13 +52,13 @@ class _PrevSetWidgetState extends State<PrevSetWidget>
     return getSetWidget();
   }
 
-  Container getSetWidget() {
-    return Container(
+  SizedBox getSetWidget() {
+    return SizedBox(
       height: screenHeight * 0.05,
       child: Row(
         mainAxisAlignment: MainAxisAlignment.spaceBetween,
         children: <Widget> [
-          Container(
+          SizedBox(
             width: screenWidth * 0.08,
             child: Center(
               child: Text(
@@ -67,23 +67,23 @@ class _PrevSetWidgetState extends State<PrevSetWidget>
               ),
             ),
           ),
-          Container(
+          SizedBox(
             width: screenWidth * 0.145,
             child: getText(0),
           ),
-          Container(
+          SizedBox(
             width: screenWidth * 0.145,
             child: getText(1),
           ),
-          Container(
+          SizedBox(
             width: screenWidth * 0.145,
             child: getText(2),
           ),
-          Container(
+          SizedBox(
             width: screenWidth * 0.145,
             child: getText(3),
           ),
-          Container(
+          SizedBox(
             width: screenWidth * 0.08,
             child: getText(4),
           ),
diff --git a/lib/UI/workout/add_new_workout_alert.dart b/lib/UI/workout/add_new_workout_alert.dart
index 17324f0..b431a38 100644
--- a/lib/UI/workout/add_new_workout_alert.dart
+++ b/lib/UI/workout/add_new_workout_alert.dart
@@ -37,7 +37,7 @@ class AddWorkoutAlert extends StatelessWidget {
                   padding: const EdgeInsets.only(left: 20, right: 20),
                   child: nameWidget,
                 ),
-                Container(
+                SizedBox(
                   height: screenHeight * 0.05,
                   width: screenWidth * 0.5,
                   child: addWorkout,
diff --git a/lib/UI/workout/redo_workout_alert.dart b/lib/UI/workout/redo_workout_alert.dart
index 549b3f0..f1ed310 100644
--- a/lib/UI/workout/redo_workout_alert.dart
+++ b/lib/UI/workout/redo_workout_alert.dart
@@ -37,12 +37,12 @@ class RedoWorkoutAlert extends StatelessWidget {
                   mainAxisAlignment: MainAxisAlignment.spaceEvenly,
                   crossAxisAlignment: CrossAxisAlignment.center,
                   children: <Widget> [
-                    Container(
+                    SizedBox(
                       height: screenHeight * 0.05,
                       width: screenWidth * 0.3,
                       child: viewWorkout,
                     ),
-                    Container(
+                    SizedBox(
                       height: screenHeight * 0.05,
                       width: screenWidth * 0.3,
                       child: redoWorkout,
diff --git a/lib/UI/workout/save_workout_dialog.dart b/lib/UI/workout/save_workout_dialog.dart
index 19f78b1..338166a 100644
--- a/lib/UI/workout/save_workout_dialog.dart
+++ b/lib/UI/workout/save_workout_dialog.dart
@@ -100,7 +100,7 @@ class _SaveWorkoutAlertState extends State<SaveWorkoutAlert> {
                     ],
                   ),
                 ),
-                Container(
+                SizedBox(
                   height: screenHeight * 0.05,
                   width: screenWidth * 0.5,
                   child: widget.saveWorkout,
diff --git a/lib/UI/workout/workout_name_selection_widget.dart b/lib/UI/workout/workout_name_selection_widget.dart
index faf8c17..51e7aff 100644
--- a/lib/UI/workout/workout_name_selection_widget.dart
+++ b/lib/UI/workout/workout_name_selection_widget.dart
@@ -45,7 +45,7 @@ class _WorkoutNameSelectionWidgetState extends State<WorkoutTemplateSelectionWid
                 subtitle1: setStyle,
               ),
             ),
-            child: Container(
+            child: SizedBox(
               width: screenWidth * 0.5,
               child: DropdownButton<String>(
                 value: dropDownValue,
diff --git a/lib/src/feature/authentication/view/landing_screen.dart b/lib/src/feature/authentication/view/landing_screen.dart
index 44d9bbf..75990a3 100644
--- a/lib/src/feature/authentication/view/landing_screen.dart
+++ b/lib/src/feature/authentication/view/landing_screen.dart
@@ -82,7 +82,7 @@ class _LandingScreenState extends ConsumerState<LandingScreen> with SingleTicker
             child: Column(
               mainAxisAlignment: MainAxisAlignment.start,
               children: <Widget>[
-                Container(
+                SizedBox(
                   height: 40,
                   child: TabBar(
                     tabs: tabs,
diff --git a/lib/src/widgets/custom_floating_action_button.dart b/lib/src/widgets/custom_floating_action_button.dart
index 5c7eb38..43880a3 100644
--- a/lib/src/widgets/custom_floating_action_button.dart
+++ b/lib/src/widgets/custom_floating_action_button.dart
@@ -33,7 +33,7 @@ class CustomFloatingActionButton extends StatelessWidget {
             child: InkWell(
               onTap: onTap,
               borderRadius: BorderRadius.circular(size),
-              child: Container(
+              child: SizedBox(
                 width: size,
                 height: size,
                 child: Center(
diff --git a/lib/src/widgets/text_field.dart b/lib/src/widgets/text_field.dart
index 1bf8c1f..8bf3c7e 100644
--- a/lib/src/widgets/text_field.dart
+++ b/lib/src/widgets/text_field.dart
@@ -39,7 +39,7 @@ class OutlinedTextField extends StatelessWidget {
               hintStyle: setHintStyle.copyWith(
                 color: Colors.white.withOpacity(0.5),
               ),
-              prefixIcon: Container(
+              prefixIcon: SizedBox(
                 width: 40,
                 child: Icon(
                   leadingIcon,