diff --git a/kahuna/public/js/components/gr-my-uploads/gr-my-uploads.css b/kahuna/public/js/components/gr-my-uploads/gr-my-uploads.css
index a73b9327a1..0226549f33 100644
--- a/kahuna/public/js/components/gr-my-uploads/gr-my-uploads.css
+++ b/kahuna/public/js/components/gr-my-uploads/gr-my-uploads.css
@@ -31,7 +31,7 @@
   border: 1px solid grey;
   display: inline-block;
   background: white;
-  margin-left: 7px;
+  margin-right: 7px;
 }
 
 .custom-label-short {
diff --git a/kahuna/public/js/components/gr-my-uploads/gr-my-uploads.tsx b/kahuna/public/js/components/gr-my-uploads/gr-my-uploads.tsx
index 9b8350710f..01bd487eec 100644
--- a/kahuna/public/js/components/gr-my-uploads/gr-my-uploads.tsx
+++ b/kahuna/public/js/components/gr-my-uploads/gr-my-uploads.tsx
@@ -40,9 +40,9 @@ const MyUploads: React.FC<MyUploadsWrapperProps> = ({ props }) => {
       <label className="custom-checkbox">
         <input type="checkbox" checked={myUploads} onChange={handleCheckboxClick}/>
         <div className="label-wrapper" >
+          <span className="custom-span"></span>
           <span className="custom-label no-select">{MY_UPLOADS}</span>
           <span className="custom-label-short no-select">{MY_UPLOADS_SHORT}</span>
-          <span className="custom-span"></span>
         </div>
       </label>
     </div>
diff --git a/kahuna/public/js/components/gr-permissions-filter/gr-permissions-filter.tsx b/kahuna/public/js/components/gr-permissions-filter/gr-permissions-filter.tsx
index da6a79ccde..9e8684eeaa 100644
--- a/kahuna/public/js/components/gr-permissions-filter/gr-permissions-filter.tsx
+++ b/kahuna/public/js/components/gr-permissions-filter/gr-permissions-filter.tsx
@@ -223,8 +223,8 @@ const PermissionsFilter: React.FC<PermissionsWrapperProps> = ({ props }) => {
           <label className="chargeable-checkbox">
             <input type="checkbox" checked={isChargeable} onChange={handleToggle}/>
             <div className="chargeable-label-wrapper" >
-              <span className="chargeable-label no-select">{SHOW_CHARGEABLE_SHORT}</span>
               <span className="chargeable-span"></span>
+              <span className="chargeable-label no-select">{SHOW_CHARGEABLE_SHORT}</span>
             </div>
           </label>
         </div>
diff --git a/kahuna/public/js/components/gr-permissions-filter/gr-toggle-switch.css b/kahuna/public/js/components/gr-permissions-filter/gr-toggle-switch.css
index 572ee193d1..cdfd5c0a92 100644
--- a/kahuna/public/js/components/gr-permissions-filter/gr-toggle-switch.css
+++ b/kahuna/public/js/components/gr-permissions-filter/gr-toggle-switch.css
@@ -81,7 +81,7 @@ input:checked + .ts-slider:before {
   border: 1px solid grey;
   display: inline-block;
   background: white;
-  margin-left: 4px;
+  margin-right: 7px;
 }
 
 [type=checkbox]:checked + .chargeable-label-wrapper .chargeable-span {