diff --git a/Clocker/Floating Window/CLFloatingWindowController.m b/Clocker/Floating Window/CLFloatingWindowController.m
index 5865fc4..8328d23 100644
--- a/Clocker/Floating Window/CLFloatingWindowController.m	
+++ b/Clocker/Floating Window/CLFloatingWindowController.m	
@@ -128,8 +128,6 @@ NSString *const CLTimezoneCellIdentifier = @"timeZoneCell";
         customLabel.insertionPointColor = [NSColor whiteColor];
         cell.sunriseSetImage.image = dataObject.sunriseOrSunset ?
         [NSImage imageNamed:@"White Sunrise"] : [NSImage imageNamed:@"White Sunset"];
-        cell.sunriseSetImage.image = dataObject.sunriseOrSunset ?
-        [NSImage imageNamed:@"Sunrise"] : [NSImage imageNamed:@"Sunset"];
     }
     else
     {
@@ -139,6 +137,8 @@ NSString *const CLTimezoneCellIdentifier = @"timeZoneCell";
         [self.mainTableview setBackgroundColor:[NSColor whiteColor]];
         self.window.alphaValue = 1;
         customLabel.insertionPointColor = [NSColor blackColor];
+        cell.sunriseSetImage.image = dataObject.sunriseOrSunset ?
+        [NSImage imageNamed:@"Sunrise"] : [NSImage imageNamed:@"Sunset"];
     }
     
     cell.relativeDate.stringValue = [dataObject getDateForTimeZoneWithFutureSliderValue:self.futureSliderValue andDisplayType:CLPanelDisplay];
diff --git a/Clocker/Floating Window/en.lproj/CLFloatingWindow.xib b/Clocker/Floating Window/en.lproj/CLFloatingWindow.xib
index 7f1b6c6..1f27e58 100644
--- a/Clocker/Floating Window/en.lproj/CLFloatingWindow.xib	
+++ b/Clocker/Floating Window/en.lproj/CLFloatingWindow.xib	
@@ -58,7 +58,7 @@
                                                     <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                                     <subviews>
                                                         <imageView horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="7Tq-t6-KS6">
-                                                            <rect key="frame" x="203" y="4" width="20" height="20"/>
+                                                            <rect key="frame" x="203" y="5" width="20" height="20"/>
                                                             <constraints>
                                                                 <constraint firstAttribute="width" constant="20" id="JLt-So-9GB"/>
                                                                 <constraint firstAttribute="height" constant="20" id="gQ5-I6-hfW"/>
@@ -66,7 +66,7 @@
                                                             <imageCell key="cell" refusesFirstResponder="YES" alignment="left" imageScaling="proportionallyDown" id="aeR-XC-8J2"/>
                                                         </imageView>
                                                         <textField verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="w0H-z4-Qmv">
-                                                            <rect key="frame" x="224" y="7" width="49" height="17"/>
+                                                            <rect key="frame" x="224" y="8" width="49" height="17"/>
                                                             <constraints>
                                                                 <constraint firstAttribute="width" constant="45" id="v6B-Bv-Ye1"/>
                                                                 <constraint firstAttribute="height" constant="17" id="zYu-u6-R0W"/>
@@ -106,7 +106,7 @@
                                                             </textFieldCell>
                                                         </textField>
                                                         <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" tag="101" preferredMaxLayoutWidth="110" translatesAutoresizingMaskIntoConstraints="NO" id="DSw-uJ-JCx">
-                                                            <rect key="frame" x="159" y="24" width="114" height="35"/>
+                                                            <rect key="frame" x="159" y="20" width="114" height="35"/>
                                                             <constraints>
                                                                 <constraint firstAttribute="width" constant="110" id="seR-NV-Bdf"/>
                                                                 <constraint firstAttribute="height" constant="35" id="wBx-lE-7e5"/>
@@ -123,11 +123,11 @@
                                                         <constraint firstItem="Zyy-Fw-K7Z" firstAttribute="top" secondItem="8mq-8K-c34" secondAttribute="top" constant="5" id="B0D-ik-bxk"/>
                                                         <constraint firstAttribute="trailing" secondItem="DSw-uJ-JCx" secondAttribute="trailing" constant="8" id="IA6-vj-gHR"/>
                                                         <constraint firstItem="Zyy-Fw-K7Z" firstAttribute="leading" secondItem="8mq-8K-c34" secondAttribute="leading" constant="9" id="JFG-Yz-esL"/>
-                                                        <constraint firstItem="w0H-z4-Qmv" firstAttribute="top" secondItem="DSw-uJ-JCx" secondAttribute="bottom" id="XQh-GT-9wS"/>
-                                                        <constraint firstItem="DSw-uJ-JCx" firstAttribute="top" secondItem="8mq-8K-c34" secondAttribute="top" constant="1" id="Zib-Mn-8DY"/>
+                                                        <constraint firstItem="w0H-z4-Qmv" firstAttribute="top" secondItem="DSw-uJ-JCx" secondAttribute="bottom" constant="-5" id="XQh-GT-9wS"/>
+                                                        <constraint firstItem="DSw-uJ-JCx" firstAttribute="top" secondItem="8mq-8K-c34" secondAttribute="top" constant="5" id="Zib-Mn-8DY"/>
                                                         <constraint firstItem="w0H-z4-Qmv" firstAttribute="leading" secondItem="7Tq-t6-KS6" secondAttribute="trailing" constant="3" id="lla-8q-Xtc"/>
                                                         <constraint firstItem="wFR-Xg-kpb" firstAttribute="leading" secondItem="8mq-8K-c34" secondAttribute="leading" constant="10" id="p0N-YR-EDR"/>
-                                                        <constraint firstItem="7Tq-t6-KS6" firstAttribute="top" secondItem="DSw-uJ-JCx" secondAttribute="bottom" id="wrv-xK-4wC"/>
+                                                        <constraint firstItem="7Tq-t6-KS6" firstAttribute="top" secondItem="DSw-uJ-JCx" secondAttribute="bottom" constant="-5" id="wrv-xK-4wC"/>
                                                         <constraint firstAttribute="trailing" secondItem="w0H-z4-Qmv" secondAttribute="trailing" constant="8" id="wtp-3R-eGY"/>
                                                     </constraints>
                                                     <connections>
diff --git a/Clocker/Floating Window/ja.lproj/CLFloatingWindow.xib b/Clocker/Floating Window/ja.lproj/CLFloatingWindow.xib
index 1544e71..8d7ca64 100644
--- a/Clocker/Floating Window/ja.lproj/CLFloatingWindow.xib	
+++ b/Clocker/Floating Window/ja.lproj/CLFloatingWindow.xib	
@@ -58,7 +58,7 @@
                                                     <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                                     <subviews>
                                                         <imageView horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="6y0-xP-bPZ">
-                                                            <rect key="frame" x="203" y="4" width="20" height="20"/>
+                                                            <rect key="frame" x="203" y="9" width="20" height="20"/>
                                                             <constraints>
                                                                 <constraint firstAttribute="height" constant="20" id="VIH-zs-bLn"/>
                                                                 <constraint firstAttribute="width" constant="20" id="XM2-nG-5aU"/>
@@ -66,7 +66,7 @@
                                                             <imageCell key="cell" refusesFirstResponder="YES" alignment="left" imageScaling="proportionallyDown" id="ciN-Xz-hJ0"/>
                                                         </imageView>
                                                         <textField verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="xiB-ab-VRH">
-                                                            <rect key="frame" x="224" y="7" width="49" height="17"/>
+                                                            <rect key="frame" x="224" y="12" width="49" height="17"/>
                                                             <constraints>
                                                                 <constraint firstAttribute="width" constant="45" id="hMZ-YQ-cjr"/>
                                                                 <constraint firstAttribute="height" constant="17" id="rcL-hY-BVT"/>
@@ -123,8 +123,8 @@
                                                         <constraint firstAttribute="trailing" secondItem="DSw-uJ-JCx" secondAttribute="trailing" constant="8" id="IA6-vj-gHR"/>
                                                         <constraint firstItem="Zyy-Fw-K7Z" firstAttribute="leading" secondItem="8mq-8K-c34" secondAttribute="leading" constant="9" id="JFG-Yz-esL"/>
                                                         <constraint firstAttribute="trailing" secondItem="xiB-ab-VRH" secondAttribute="trailing" constant="8" id="Y9Q-dK-MDF"/>
-                                                        <constraint firstItem="xiB-ab-VRH" firstAttribute="top" secondItem="DSw-uJ-JCx" secondAttribute="bottom" id="n9x-SU-3qn"/>
-                                                        <constraint firstItem="6y0-xP-bPZ" firstAttribute="top" secondItem="DSw-uJ-JCx" secondAttribute="bottom" id="o7T-Rh-F7U"/>
+                                                        <constraint firstItem="xiB-ab-VRH" firstAttribute="top" secondItem="DSw-uJ-JCx" secondAttribute="bottom" constant="-5" id="n9x-SU-3qn"/>
+                                                        <constraint firstItem="6y0-xP-bPZ" firstAttribute="top" secondItem="DSw-uJ-JCx" secondAttribute="bottom" constant="-5" id="o7T-Rh-F7U"/>
                                                         <constraint firstItem="wFR-Xg-kpb" firstAttribute="leading" secondItem="8mq-8K-c34" secondAttribute="leading" constant="10" id="p0N-YR-EDR"/>
                                                         <constraint firstItem="DSw-uJ-JCx" firstAttribute="top" secondItem="8mq-8K-c34" secondAttribute="top" constant="1" id="sEf-eg-HVT"/>
                                                         <constraint firstItem="xiB-ab-VRH" firstAttribute="leading" secondItem="6y0-xP-bPZ" secondAttribute="trailing" constant="3" id="xid-jT-U1b"/>
diff --git a/Clocker/Floating Window/zh-Hans.lproj/CLFloatingWindow.xib b/Clocker/Floating Window/zh-Hans.lproj/CLFloatingWindow.xib
index 17f1b9a..3596c4c 100644
--- a/Clocker/Floating Window/zh-Hans.lproj/CLFloatingWindow.xib	
+++ b/Clocker/Floating Window/zh-Hans.lproj/CLFloatingWindow.xib	
@@ -73,7 +73,7 @@
                                                             </connections>
                                                         </textField>
                                                         <imageView horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="xs9-YL-kjz">
-                                                            <rect key="frame" x="203" y="4" width="20" height="20"/>
+                                                            <rect key="frame" x="203" y="9" width="20" height="20"/>
                                                             <constraints>
                                                                 <constraint firstAttribute="width" constant="20" id="Obq-Oh-WXk"/>
                                                                 <constraint firstAttribute="height" constant="20" id="reh-nM-X2T"/>
@@ -81,7 +81,7 @@
                                                             <imageCell key="cell" refusesFirstResponder="YES" alignment="left" imageScaling="proportionallyDown" id="s4Y-Ea-vG5"/>
                                                         </imageView>
                                                         <textField verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="4gs-C2-sJo">
-                                                            <rect key="frame" x="224" y="7" width="49" height="17"/>
+                                                            <rect key="frame" x="224" y="12" width="49" height="17"/>
                                                             <constraints>
                                                                 <constraint firstAttribute="width" constant="45" id="lao-W5-nM7"/>
                                                                 <constraint firstAttribute="height" constant="17" id="wVS-6m-nWK"/>
@@ -119,11 +119,11 @@
                                                     </subviews>
                                                     <constraints>
                                                         <constraint firstItem="wFR-Xg-kpb" firstAttribute="top" secondItem="Zyy-Fw-K7Z" secondAttribute="bottom" constant="2" id="2BN-TO-QwP"/>
-                                                        <constraint firstItem="4gs-C2-sJo" firstAttribute="top" secondItem="DSw-uJ-JCx" secondAttribute="bottom" id="ArU-Hf-FT8"/>
+                                                        <constraint firstItem="4gs-C2-sJo" firstAttribute="top" secondItem="DSw-uJ-JCx" secondAttribute="bottom" constant="-5" id="ArU-Hf-FT8"/>
                                                         <constraint firstItem="Zyy-Fw-K7Z" firstAttribute="top" secondItem="8mq-8K-c34" secondAttribute="top" constant="5" id="B0D-ik-bxk"/>
                                                         <constraint firstAttribute="trailing" secondItem="DSw-uJ-JCx" secondAttribute="trailing" constant="8" id="IA6-vj-gHR"/>
                                                         <constraint firstItem="Zyy-Fw-K7Z" firstAttribute="leading" secondItem="8mq-8K-c34" secondAttribute="leading" constant="9" id="JFG-Yz-esL"/>
-                                                        <constraint firstItem="xs9-YL-kjz" firstAttribute="top" secondItem="DSw-uJ-JCx" secondAttribute="bottom" id="KY7-eL-ZbD"/>
+                                                        <constraint firstItem="xs9-YL-kjz" firstAttribute="top" secondItem="DSw-uJ-JCx" secondAttribute="bottom" constant="-5" id="KY7-eL-ZbD"/>
                                                         <constraint firstItem="4gs-C2-sJo" firstAttribute="leading" secondItem="xs9-YL-kjz" secondAttribute="trailing" constant="3" id="Kuv-5o-LHK"/>
                                                         <constraint firstAttribute="trailing" secondItem="4gs-C2-sJo" secondAttribute="trailing" constant="8" id="keh-iW-7So"/>
                                                         <constraint firstItem="wFR-Xg-kpb" firstAttribute="leading" secondItem="8mq-8K-c34" secondAttribute="leading" constant="10" id="p0N-YR-EDR"/>
diff --git a/Clocker/Floating Window/zh-Hant.lproj/CLFloatingWindow.xib b/Clocker/Floating Window/zh-Hant.lproj/CLFloatingWindow.xib
index 6f4acc7..75ed828 100644
--- a/Clocker/Floating Window/zh-Hant.lproj/CLFloatingWindow.xib	
+++ b/Clocker/Floating Window/zh-Hant.lproj/CLFloatingWindow.xib	
@@ -74,7 +74,7 @@
                                                             </connections>
                                                         </textField>
                                                         <imageView horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="Urg-5y-Zdn">
-                                                            <rect key="frame" x="203" y="4" width="20" height="20"/>
+                                                            <rect key="frame" x="203" y="9" width="20" height="20"/>
                                                             <constraints>
                                                                 <constraint firstAttribute="width" constant="20" id="5ea-gY-HZ1"/>
                                                                 <constraint firstAttribute="height" constant="20" id="6Ir-U7-lbX"/>
@@ -82,7 +82,7 @@
                                                             <imageCell key="cell" refusesFirstResponder="YES" alignment="left" imageScaling="proportionallyDown" id="gKv-kD-9FC"/>
                                                         </imageView>
                                                         <textField verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="XyF-3h-GbI">
-                                                            <rect key="frame" x="224" y="7" width="49" height="17"/>
+                                                            <rect key="frame" x="224" y="12" width="49" height="17"/>
                                                             <constraints>
                                                                 <constraint firstAttribute="width" constant="45" id="8zt-C5-2xb"/>
                                                                 <constraint firstAttribute="height" constant="17" id="dVD-Q8-tsO"/>
@@ -121,14 +121,14 @@
                                                     <constraints>
                                                         <constraint firstItem="wFR-Xg-kpb" firstAttribute="top" secondItem="Zyy-Fw-K7Z" secondAttribute="bottom" constant="2" id="2BN-TO-QwP"/>
                                                         <constraint firstAttribute="trailing" secondItem="XyF-3h-GbI" secondAttribute="trailing" constant="8" id="2Cz-zm-2AY"/>
-                                                        <constraint firstItem="Urg-5y-Zdn" firstAttribute="top" secondItem="DSw-uJ-JCx" secondAttribute="bottom" id="80T-WB-Gos"/>
+                                                        <constraint firstItem="Urg-5y-Zdn" firstAttribute="top" secondItem="DSw-uJ-JCx" secondAttribute="bottom" constant="-5" id="80T-WB-Gos"/>
                                                         <constraint firstItem="Zyy-Fw-K7Z" firstAttribute="top" secondItem="8mq-8K-c34" secondAttribute="top" constant="5" id="B0D-ik-bxk"/>
                                                         <constraint firstItem="DSw-uJ-JCx" firstAttribute="top" secondItem="8mq-8K-c34" secondAttribute="top" constant="1" id="C7x-Fx-C3E"/>
                                                         <constraint firstAttribute="trailing" secondItem="DSw-uJ-JCx" secondAttribute="trailing" constant="8" id="IA6-vj-gHR"/>
                                                         <constraint firstItem="Zyy-Fw-K7Z" firstAttribute="leading" secondItem="8mq-8K-c34" secondAttribute="leading" constant="9" id="JFG-Yz-esL"/>
                                                         <constraint firstItem="wFR-Xg-kpb" firstAttribute="leading" secondItem="8mq-8K-c34" secondAttribute="leading" constant="10" id="p0N-YR-EDR"/>
                                                         <constraint firstItem="XyF-3h-GbI" firstAttribute="leading" secondItem="Urg-5y-Zdn" secondAttribute="trailing" constant="3" id="sh1-RK-bLs"/>
-                                                        <constraint firstItem="XyF-3h-GbI" firstAttribute="top" secondItem="DSw-uJ-JCx" secondAttribute="bottom" id="u5A-7t-5sJ"/>
+                                                        <constraint firstItem="XyF-3h-GbI" firstAttribute="top" secondItem="DSw-uJ-JCx" secondAttribute="bottom" constant="-5" id="u5A-7t-5sJ"/>
                                                     </constraints>
                                                     <connections>
                                                         <outlet property="customName" destination="Zyy-Fw-K7Z" id="X1r-mx-tOf"/>
diff --git a/Clocker/ja.lproj/Panel.xib b/Clocker/ja.lproj/Panel.xib
index a1bf63b..54e422a 100755
--- a/Clocker/ja.lproj/Panel.xib
+++ b/Clocker/ja.lproj/Panel.xib
@@ -78,7 +78,7 @@
                                                                 <constraint firstAttribute="height" constant="20" id="LN0-5e-Uw7"/>
                                                                 <constraint firstAttribute="width" constant="20" id="Txb-Xo-JPl"/>
                                                             </constraints>
-                                                            <imageCell key="cell" refusesFirstResponder="YES" alignment="left" imageScaling="proportionallyDown" image="Sunrise" id="eLr-Js-g3E"/>
+                                                            <imageCell key="cell" refusesFirstResponder="YES" alignment="left" imageScaling="proportionallyDown" id="eLr-Js-g3E"/>
                                                         </imageView>
                                                         <textField verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="6CM-3s-ZNr">
                                                             <rect key="frame" x="224" y="4" width="49" height="17"/>
@@ -86,7 +86,7 @@
                                                                 <constraint firstAttribute="height" constant="17" id="Mho-dg-5yL"/>
                                                                 <constraint firstAttribute="width" constant="45" id="zNy-He-GNo"/>
                                                             </constraints>
-                                                            <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" selectable="YES" editable="YES" sendsActionOnEndEditing="YES" state="on" alignment="center" placeholderString="07:00 PM" id="Yxf-ti-4jB">
+                                                            <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" selectable="YES" editable="YES" sendsActionOnEndEditing="YES" state="on" alignment="center" placeholderString="" id="Yxf-ti-4jB">
                                                                 <font key="font" size="11" name="SFUIDisplay-Ultralight"/>
                                                                 <color key="textColor" name="textColor" catalog="System" colorSpace="catalog"/>
                                                                 <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
@@ -290,6 +290,5 @@
         <image name="ClockerIcon-16" width="16" height="16"/>
         <image name="NSActionTemplate" width="14" height="14"/>
         <image name="PowerIcon" width="270" height="270"/>
-        <image name="Sunrise" width="512" height="512"/>
     </resources>
 </document>