diff --git a/src/components/Login/index.tsx b/src/components/Login/index.tsx
index 052b72e44..12d238406 100644
--- a/src/components/Login/index.tsx
+++ b/src/components/Login/index.tsx
@@ -94,7 +94,7 @@ const Login = () => {
   }
 
   return (
-    <div className="relative flex flex-col min-h-screen bg-gray-900 py-14">
+    <div className="relative flex min-h-screen flex-col bg-gray-900 py-14">
       <PageTitle title={intl.formatMessage(messages.signin)} />
       <ImageFader
         backgroundImages={
@@ -103,12 +103,12 @@ const Login = () => {
           ) ?? []
         }
       />
-      <div className="absolute z-50 top-4 right-4">
+      <div className="absolute top-4 right-4 z-50">
         <LanguagePicker />
       </div>
-      <div className="relative z-40 flex flex-col items-center px-4 mt-10 sm:mx-auto sm:w-full sm:max-w-md">
-        <img src="/logo_stacked.svg" className="max-w-full mb-10" alt="Logo" />
-        <h2 className="mt-2 text-3xl font-extrabold leading-9 text-center text-gray-100">
+      <div className="relative z-40 mt-10 flex flex-col items-center px-4 sm:mx-auto sm:w-full sm:max-w-md">
+        <img src="/logo_stacked.svg" className="mb-10 max-w-full" alt="Logo" />
+        <h2 className="mt-2 text-center text-3xl font-extrabold leading-9 text-gray-100">
           {intl.formatMessage(messages.signinheader)}
         </h2>
       </div>
@@ -128,10 +128,10 @@ const Login = () => {
               leaveFrom="opacity-100"
               leaveTo="opacity-0"
             >
-              <div className="p-4 mb-4 bg-red-600 rounded-md">
+              <div className="mb-4 rounded-md bg-red-600 p-4">
                 <div className="flex">
                   <div className="flex-shrink-0">
-                    <XCircleIcon className="w-5 h-5 text-red-300" />
+                    <XCircleIcon className="h-5 w-5 text-red-300" />
                   </div>
                   <div className="ml-3">
                     <h3 className="text-sm font-medium text-red-300">
diff --git a/src/components/NotificationTypeSelector/NotificationType/index.tsx b/src/components/NotificationTypeSelector/NotificationType/index.tsx
index da2474295..07bdb962a 100644
--- a/src/components/NotificationTypeSelector/NotificationType/index.tsx
+++ b/src/components/NotificationTypeSelector/NotificationType/index.tsx
@@ -45,7 +45,7 @@ const NotificationType = ({
             }
           />
         </div>
-        <label htmlFor={option.id} className="flex flex-col ml-3 text-sm">
+        <label htmlFor={option.id} className="ml-3 flex flex-col text-sm">
           <span className="font-semibold leading-6 text-white">
             {option.name}
           </span>
diff --git a/src/components/PermissionOption/index.tsx b/src/components/PermissionOption/index.tsx
index 3205cc19e..c88ed1cc1 100644
--- a/src/components/PermissionOption/index.tsx
+++ b/src/components/PermissionOption/index.tsx
@@ -122,7 +122,7 @@ const PermissionOption = ({
             checked={checked}
           />
         </div>
-        <label htmlFor={option.id} className="flex flex-col ml-3 text-sm">
+        <label htmlFor={option.id} className="ml-3 flex flex-col text-sm">
           <span className="font-semibold leading-6 text-white">
             {option.name}
           </span>
diff --git a/src/components/UserProfile/UserSettings/UserGeneralSettings/index.tsx b/src/components/UserProfile/UserSettings/UserGeneralSettings/index.tsx
index aa365946a..93da7af87 100644
--- a/src/components/UserProfile/UserSettings/UserGeneralSettings/index.tsx
+++ b/src/components/UserProfile/UserSettings/UserGeneralSettings/index.tsx
@@ -189,7 +189,7 @@ const UserGeneralSettings = () => {
                   {intl.formatMessage(messages.accounttype)}
                 </label>
                 <div className="mb-1 text-sm font-medium leading-5 text-gray-400 sm:mt-2">
-                  <div className="flex items-center max-w-lg">
+                  <div className="flex max-w-lg items-center">
                     {user?.userType === UserType.PLEX ? (
                       <Badge badgeType="warning">
                         {intl.formatMessage(messages.plexuser)}
@@ -207,7 +207,7 @@ const UserGeneralSettings = () => {
                   {intl.formatMessage(messages.role)}
                 </label>
                 <div className="mb-1 text-sm font-medium leading-5 text-gray-400 sm:mt-2">
-                  <div className="flex items-center max-w-lg">
+                  <div className="flex max-w-lg items-center">
                     {user?.id === 1
                       ? intl.formatMessage(messages.owner)
                       : hasPermission(Permission.ADMIN)
@@ -514,7 +514,7 @@ const UserGeneralSettings = () => {
                 )}
               <div className="actions">
                 <div className="flex justify-end">
-                  <span className="inline-flex ml-3 rounded-md shadow-sm">
+                  <span className="ml-3 inline-flex rounded-md shadow-sm">
                     <Button
                       buttonType="primary"
                       type="submit"