Merge branch 'fix-icon-opacity'

10 files changed, 19 insertions, 19 deletions

diff --git a/gui/assets/images/icon-add.svg b/gui/assets/images/icon-add.svg
index a5a4aadf19..331bf4d273 100644
--- a/gui/assets/images/icon-add.svg
+++ b/gui/assets/images/icon-add.svg
@@ -2,7 +2,7 @@
     <title>icon-close</title>
     <desc>Mullvad VPN app</desc>
     <defs></defs>
-    <g id="icon" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" fill-opacity="0.6" style="transform-origin: center; transform: rotate(45deg);">
+    <g id="icon" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" style="transform-origin: center; transform: rotate(45deg);">
         <path d="M12,24 C5.37312,24 -3.2900871e-16,18.62688 -7.34788079e-16,12 C-1.14056745e-15,5.37312 5.37312,0 12,0 C18.62688,0 24,5.37312 24,12 C24,18.62688 18.62688,24 12,24 Z M13.5,12 L17.2947612,8.20523878 C17.6857559,7.81424414 17.6838785,7.18387854 17.293923,6.79392296 L17.206077,6.70607704 C16.8181114,6.31811142 16.1842538,6.31574616 15.7947612,6.70523878 L12,10.5 L8.20523878,6.70523878 C7.81574616,6.31574616 7.18188858,6.31811142 6.79392296,6.70607704 L6.70607704,6.79392296 C6.31612146,7.18387854 6.31424414,7.81424414 6.70523878,8.20523878 L10.5,12 L6.70523878,15.7947612 C6.31424414,16.1857559 6.31612146,16.8161215 6.70607704,17.206077 L6.79392296,17.293923 C7.18188858,17.6818886 7.81574616,17.6842538 8.20523878,17.2947612 L12,13.5 L15.7947612,17.2947612 C16.1842538,17.6842538 16.8181114,17.6818886 17.206077,17.293923 L17.293923,17.206077 C17.6838785,16.8161215 17.6857559,16.1857559 17.2947612,15.7947612 L13.5,12 L13.5,12 Z" id="path" fill="#FFFFFF"></path>
     </g>
 </svg>
diff --git a/gui/assets/images/icon-back.svg b/gui/assets/images/icon-back.svg
index 5ec98cbee6..fabf78530d 100644
--- a/gui/assets/images/icon-back.svg
+++ b/gui/assets/images/icon-back.svg
@@ -2,7 +2,7 @@
     <title>icon-back</title>
     <desc>Mullvad VPN app</desc>
     <defs></defs>
-    <g id="icon" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" fill-opacity="0.6">
+    <g id="icon" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
         <path d="M12,24 C5.37312,24 -3.2900871e-16,18.62688 -7.34788079e-16,12 C-1.14056745e-15,5.37312 5.37312,0 12,0 C18.62688,0 24,5.37312 24,12 C24,18.62688 18.62688,24 12,24 Z M7.00548958,11.9978652 C6.97547323,12.2732292 7.06852694,12.5603856 7.28524783,12.7773547 L13.2129013,18.7117979 C13.5936146,19.0929473 14.2231287,19.090784 14.6233317,18.7027276 L14.6942341,18.6339771 C15.09248,18.2478183 15.1055305,17.6195657 14.7108992,17.2180331 L9.58045095,11.9978652 L14.7108992,6.77769718 C15.1055305,6.37616462 15.09248,5.74791199 14.6942341,5.36175323 L14.6233317,5.29300272 C14.2231287,4.90494629 13.5936146,4.90278303 13.2129013,5.28393238 L7.28524783,11.2183756 C7.06852694,11.4353448 6.97547323,11.7225011 7.00548958,11.9978652 L7.00548958,11.9978652 Z" id="path" fill="#FFFFFF"></path>
     </g>
-</svg>
\ No newline at end of file
+</svg>
diff --git a/gui/assets/images/icon-close-down.svg b/gui/assets/images/icon-close-down.svg
index 4ef12ed6eb..e81ded8acf 100644
--- a/gui/assets/images/icon-close-down.svg
+++ b/gui/assets/images/icon-close-down.svg
@@ -2,7 +2,7 @@
     <title>icon-close-down</title>
     <desc>Mullvad VPN app</desc>
     <defs></defs>
-    <g id="icon" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" fill-opacity="0.6">
+    <g id="icon" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
         <path d="M12,24 C5.37312,24 -3.2900871e-16,18.62688 -7.34788079e-16,12 C-1.14056745e-15,5.37312 5.37312,0 12,0 C18.62688,0 24,5.37312 24,12 C24,18.62688 18.62688,24 12,24 Z M7.00548958,11.9978652 C6.97547323,12.2732292 7.06852694,12.5603856 7.28524783,12.7773547 L13.2129013,18.7117979 C13.5936146,19.0929473 14.2231287,19.090784 14.6233317,18.7027276 L14.6942341,18.6339771 C15.09248,18.2478183 15.1055305,17.6195657 14.7108992,17.2180331 L9.58045095,11.9978652 L14.7108992,6.77769718 C15.1055305,6.37616462 15.09248,5.74791199 14.6942341,5.36175323 L14.6233317,5.29300272 C14.2231287,4.90494629 13.5936146,4.90278303 13.2129013,5.28393238 L7.28524783,11.2183756 C7.06852694,11.4353448 6.97547323,11.7225011 7.00548958,11.9978652 L7.00548958,11.9978652 Z" id="path" fill="#FFFFFF" transform="rotate(-90 12 12)"></path>
     </g>
 </svg>
diff --git a/gui/assets/images/icon-close.svg b/gui/assets/images/icon-close.svg
index df23259a13..334ccb4ad4 100644
--- a/gui/assets/images/icon-close.svg
+++ b/gui/assets/images/icon-close.svg
@@ -2,7 +2,7 @@
     <title>icon-close</title>
     <desc>Mullvad VPN app</desc>
     <defs></defs>
-    <g id="icon" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" fill-opacity="0.6">
+    <g id="icon" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
         <path d="M12,24 C5.37312,24 -3.2900871e-16,18.62688 -7.34788079e-16,12 C-1.14056745e-15,5.37312 5.37312,0 12,0 C18.62688,0 24,5.37312 24,12 C24,18.62688 18.62688,24 12,24 Z M13.5,12 L17.2947612,8.20523878 C17.6857559,7.81424414 17.6838785,7.18387854 17.293923,6.79392296 L17.206077,6.70607704 C16.8181114,6.31811142 16.1842538,6.31574616 15.7947612,6.70523878 L12,10.5 L8.20523878,6.70523878 C7.81574616,6.31574616 7.18188858,6.31811142 6.79392296,6.70607704 L6.70607704,6.79392296 C6.31612146,7.18387854 6.31424414,7.81424414 6.70523878,8.20523878 L10.5,12 L6.70523878,15.7947612 C6.31424414,16.1857559 6.31612146,16.8161215 6.70607704,17.206077 L6.79392296,17.293923 C7.18188858,17.6818886 7.81574616,17.6842538 8.20523878,17.2947612 L12,13.5 L15.7947612,17.2947612 C16.1842538,17.6842538 16.8181114,17.6818886 17.206077,17.293923 L17.293923,17.206077 C17.6838785,16.8161215 17.6857559,16.1857559 17.2947612,15.7947612 L13.5,12 L13.5,12 Z" id="path" fill="#FFFFFF"></path>
     </g>
-</svg>
\ No newline at end of file
+</svg>
diff --git a/gui/assets/images/icon-remove.svg b/gui/assets/images/icon-remove.svg
index e293425ee5..17e3a5130c 100644
--- a/gui/assets/images/icon-remove.svg
+++ b/gui/assets/images/icon-remove.svg
@@ -11,7 +11,7 @@
                             <mask id="wzem7yftrb" fill="#fff">
                                 <use xlink:href="#lypxbt7e6a"/>
                             </mask>
-                            <g fill="#FFF" fill-opacity=".4" mask="url(#wzem7yftrb)">
+                            <g fill="#FFF" mask="url(#wzem7yftrb)">
                                 <path d="M0 0H24V24H0z"/>
                             </g>
                         </g>
diff --git a/gui/assets/images/icon-settings.svg b/gui/assets/images/icon-settings.svg
index 6b31b51979..392841687b 100755
--- a/gui/assets/images/icon-settings.svg
+++ b/gui/assets/images/icon-settings.svg
@@ -3,7 +3,7 @@
     <title>icon-settings</title>
     <desc>Mullvad VPN app</desc>
     <defs></defs>
-    <g id="Page-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" fill-opacity="0.8">
+    <g id="Page-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
         <path d="M21.2552027,12.0000012 C21.2552027,12.4080002 21.2181943,12.792001 21.1688441,13.1760007 L23.7718756,15.1560004 C24.0062723,15.3360012 24.0679568,15.6600006 23.9199162,15.924001 L21.4525887,20.0760014 C21.304548,20.3400006 20.9837951,20.4480008 20.700053,20.3400006 L17.6282305,19.1400005 C16.9867248,19.6079998 16.2958725,20.016 15.5433381,20.316 L15.0745457,23.4959999 C15.037536,23.7839996 14.7784667,24 14.4700507,24 L9.53539566,24 C9.22697972,24 8.96791028,23.7839996 8.9309007,23.4959999 L8.46210833,20.316 C7.70957385,20.016 7.01872221,19.62 6.37721707,19.1400005 L3.30539454,20.3400006 C3.03398819,20.4360005 2.700899,20.3400006 2.55285948,20.0760014 L0.0855319329,15.924001 C-0.062507572,15.6600006 -0.000824444944,15.336 0.233571734,15.1560004 L2.83660217,13.1760007 C2.78725567,12.792001 2.7502455,12.3960011 2.7502455,12.0000012 C2.7502455,11.6040012 2.78725567,11.2080012 2.83660217,10.8240016 L0.23357145,8.84400074 C-0.000824444944,8.66400004 -0.0748444934,8.34000059 0.0855319329,8.07600026 L2.55285948,3.92400037 C2.70089958,3.66000059 3.02165186,3.55200039 3.30539454,3.66000059 L6.37721765,4.86000071 C7.01872279,4.39200082 7.70957502,3.9840006 8.4621095,3.68400057 L8.93090187,0.504000134 C8.96791146,0.216000094 9.2269809,0 9.53539685,0 L14.4700519,0 C14.7784679,0 15.0375373,0.216000094 15.0745481,0.50400071 L15.5433404,3.68400114 C16.2958761,3.98400117 16.9867272,4.38000112 17.6282328,4.86000128 L20.7000554,3.66000116 C20.9714629,3.56400067 21.3045504,3.66000116 21.452591,3.92400093 L23.9199186,8.0760014 C24.0679568,8.34000175 24.0062746,8.66400233 23.7718779,8.84400188 L21.1688466,10.8240016 C21.2181919,11.2080012 21.2552027,11.5920021 21.2552027,12.0000012 Z M12,17 C14.7571433,17 17,14.7571433 17,12 C17,9.24285657 14.7571433,7 12,7 C9.24285657,7 7,9.24285657 7,12 C7,14.7571433 9.24285657,17 12,17 Z" id="icon" fill="#FFFFFF"></path>
     </g>
-</svg>
\ No newline at end of file
+</svg>
diff --git a/gui/src/renderer/components/AdvancedSettings.tsx b/gui/src/renderer/components/AdvancedSettings.tsx
index dce018d02a..142477d951 100644
--- a/gui/src/renderer/components/AdvancedSettings.tsx
+++ b/gui/src/renderer/components/AdvancedSettings.tsx
@@ -258,8 +258,8 @@ export default class AdvancedSettings extends React.Component<IProps, IState> {
                       source="icon-add"
                       width={22}
                       height={22}
-                      tintColor={colors.white60}
-                      tintHoverColor={colors.white80}
+                      tintColor={colors.white40}
+                      tintHoverColor={colors.white60}
                       tabIndex={-1}
                     />
                   </StyledAddCustomDnsButton>
diff --git a/gui/src/renderer/components/NavigationBar.tsx b/gui/src/renderer/components/NavigationBar.tsx
index 65a1e991ad..9af5a4b615 100644
--- a/gui/src/renderer/components/NavigationBar.tsx
+++ b/gui/src/renderer/components/NavigationBar.tsx
@@ -200,8 +200,8 @@ export function CloseBarItem(props: ICloseBarItemProps) {
         height={24}
         width={24}
         source={'icon-close-down'}
-        tintColor={colors.white60}
-        tintHoverColor={colors.white80}
+        tintColor={colors.white40}
+        tintHoverColor={colors.white60}
       />
     </StyledCloseBarItemButton>
   );
@@ -215,7 +215,7 @@ interface IBackBarItemProps {
 export function BackBarItem(props: IBackBarItemProps) {
   return (
     <StyledBackBarItemButton onClick={props.action}>
-      <StyledBackBarItemIcon source="icon-back" tintColor={colors.white60} />
+      <StyledBackBarItemIcon source="icon-back" tintColor={colors.white40} />
       <StyledBackBarItemLabel>{props.children}</StyledBackBarItemLabel>
     </StyledBackBarItemButton>
   );
diff --git a/gui/src/renderer/components/SplitTunnelingSettings.tsx b/gui/src/renderer/components/SplitTunnelingSettings.tsx
index e60cfb243e..64faf178f2 100644
--- a/gui/src/renderer/components/SplitTunnelingSettings.tsx
+++ b/gui/src/renderer/components/SplitTunnelingSettings.tsx
@@ -530,8 +530,8 @@ function ApplicationRow<T extends IApplication>(props: IApplicationRowProps<T>)
           width={24}
           height={24}
           onClick={onSelect}
-          tintColor={colors.white60}
-          tintHoverColor={colors.white80}
+          tintColor={colors.white40}
+          tintHoverColor={colors.white60}
         />
       )}
       {props.onRemove && (
@@ -540,8 +540,8 @@ function ApplicationRow<T extends IApplication>(props: IApplicationRowProps<T>)
           width={24}
           height={24}
           onClick={onRemove}
-          tintColor={colors.white60}
-          tintHoverColor={colors.white80}
+          tintColor={colors.white40}
+          tintHoverColor={colors.white60}
         />
       )}
     </Cell.CellButton>
diff --git a/gui/src/renderer/components/cell/List.tsx b/gui/src/renderer/components/cell/List.tsx
index cd99a052cb..69c9fff427 100644
--- a/gui/src/renderer/components/cell/List.tsx
+++ b/gui/src/renderer/components/cell/List.tsx
@@ -112,7 +112,7 @@ function CellListItem<T>(props: ICellListItemProps<T>) {
                 source="icon-close"
                 width={22}
                 height={22}
-                tintColor={colors.white60}
+                tintColor={colors.white40}
               />
             </StyledRemoveButton>
           </AriaDescribed>